dsh-image-gen 0.8.6 → 0.8.7

package/lib/client.js

@@ -72,6 +72,27 @@ window.__ModuleLoader__.load({
 		}
 		if (typeof CSS !== "undefined") ensureCssSupports(CSS);
 		//#endregion
+		//#region lib/types/watermark.js
+		/** 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";
+		}
+		//#endregion
 		//#region lib/types/shared.js
 		/** Browser route used by the generated-image card. */
 		const IMAGE_ROUTE = "/plugins/dsh-image-gen/image";
@@ -155,6 +176,17 @@ window.__ModuleLoader__.load({
 		function cloudCredentialRef(provider) {
 			return CLOUD_IMAGE_PROVIDERS.includes(provider) ? CLOUD_CREDENTIAL_REFS[provider] : void 0;
 		}
+		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";
@@ -1991,21 +2023,119 @@ window.__ModuleLoader__.load({
 			], { type: "application/zip" });
 		}
 		//#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`);
+		}
+		//#endregion
 		//#region lib/types/client/multi-model-compare.js
 		/** Map one shared output intent to settings accepted by every target model. */
-		function buildComparisonTargets(profiles, selectedProviders, ratio, quality) {
+		function buildComparisonTargets(profiles, selectedProviders, ratio, quality, output) {
 			const selected = new Set(selectedProviders);
 			return profiles.filter((profile) => profile.configured && selected.has(profile.provider)).map((profile) => {
 				const targetRatio = profile.ratioOptions.some((option) => option.value === ratio) ? ratio : profile.defaultRatio;
-				const targetQuality = profile.qualityOptions.some((option) => option.value === quality) ? quality : profile.defaultQuality;
+				const generationOptions = generationQualityOptions(profile);
+				const qualityIntent = output === void 0 ? quality : profile.provider === "openai" || profile.provider === "chatgpt-sub" || profile.provider === "zhipu" ? output.generationQuality : output.resolution;
+				const targetQuality = profile.qualityOptions.some((option) => option.value === qualityIntent) ? qualityIntent : profile.defaultQuality;
+				const resolutions = profile.resolutionOptions?.[targetRatio];
+				const targetResolution = output && resolutions ? resolutions.some((option) => option.value === output.resolution) ? output.resolution : resolutions[0]?.value : void 0;
+				const targetGenerationQuality = output && profile.provider === "openai-compat" ? generationOptions.some((option) => option.value === output.generationQuality) ? output.generationQuality : profile.defaultGenerationQuality ?? "__default__" : void 0;
 				return {
 					profile,
 					ratio: targetRatio,
-					quality: targetQuality,
-					adjusted: targetRatio !== ratio || targetQuality !== quality
+					quality: profile.provider === "openai-compat" ? targetResolution ?? targetQuality : targetQuality,
+					adjusted: targetRatio !== ratio || targetQuality !== qualityIntent || targetResolution !== void 0 && targetResolution !== output?.resolution || targetGenerationQuality !== void 0 && targetGenerationQuality !== output?.generationQuality,
+					...targetResolution === void 0 ? {} : { resolution: targetResolution },
+					...targetGenerationQuality === void 0 ? {} : { generationQuality: targetGenerationQuality }
 				};
 			});
 		}
+		function generationQualityOptions(profile) {
+			return profile.generationQualityOptions ?? ([
+				"openai",
+				"chatgpt-sub",
+				"zhipu"
+			].includes(profile.provider) ? profile.qualityOptions : []);
+		}
+		/** Keep pixel tiers separate from upstream quality values in comparison mode. */
+		function comparisonOutputOptions(profiles, ratio, kind) {
+			const options = /* @__PURE__ */ new Map();
+			for (const profile of profiles) {
+				if (!profile.configured) continue;
+				const entries = kind === "generationQuality" ? generationQualityOptions(profile) : profile.resolutionOptions ? profile.resolutionOptions[ratio] ?? profile.resolutionOptions[profile.defaultRatio] ?? [] : ["chatgpt-sub", "zhipu"].includes(profile.provider) ? [] : profile.qualityOptions;
+				for (const entry of entries) if (!options.has(entry.value)) options.set(entry.value, {
+					value: entry.value,
+					label: entry.value === "__default__" ? entry.label : entry.value
+				});
+			}
+			return [...options.values()];
+		}
 		/** Start with two models, not every configured API, to avoid surprise spend. */
 		function initialComparisonProviders(profiles, activeProvider) {
 			const configured = profiles.filter((profile) => profile.configured);
@@ -2056,6 +2186,75 @@ window.__ModuleLoader__.load({
 			return [...seen.values()].sort((a, b) => rank(a.value) - rank(b.value));
 		}
 		//#endregion
+		//#region lib/types/client/watermark-control.js
+		const REASONS = {
+			"channel-unconfirmed": {
+				zh: "此渠道尚未确认水印支持，可按接口文档配置对应操作的水印字段。",
+				en: "Watermark support is unconfirmed. Configure the matching operation using the channel documentation."
+			},
+			"model-unconfirmed": {
+				zh: "当前模型尚未确认水印支持。",
+				en: "Watermark support is unconfirmed for this model."
+			},
+			"account-unconfirmed": {
+				zh: "此接口的水印参数和账号开通条件尚未确认。",
+				en: "The watermark parameter and account requirements are unconfirmed for this API."
+			},
+			"edit-format": {
+				zh: "当前图生图请求格式不支持已配置的水印字段。",
+				en: "The configured watermark field is unavailable in this editing format."
+			},
+			"no-api-control": {
+				zh: "此接口没有已确认的可见水印开关。",
+				en: "No visible-watermark control has been confirmed for this API."
+			}
+		};
+		/** Keep the control discoverable while clearly distinguishing confirmed and unknown contracts. */
+		const WatermarkControl = ({ capability, value, onChange, lang }) => {
+			const noteId = (0, react.useId)();
+			const supported = capability.status === "supported";
+			const reason = REASONS[capability.reason ?? "channel-unconfirmed"][lang];
+			return (0, react_jsx_runtime.jsxs)("label", {
+				className: "dsh-ig-field-select",
+				children: [
+					(0, react_jsx_runtime.jsx)("span", {
+						id: `${noteId}-label`,
+						children: lang === "en" ? "Visible watermark" : "可见水印"
+					}),
+					(0, react_jsx_runtime.jsx)("select", {
+						value: supported ? value : "default",
+						disabled: !supported,
+						"aria-labelledby": `${noteId}-label`,
+						"aria-describedby": supported ? void 0 : noteId,
+						title: supported ? lang === "en" ? "Controls the visible watermark added during generation." : "控制生成图片时添加的可见水印。" : reason,
+						onChange: (event) => onChange(event.target.value),
+						children: supported ? (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+							(0, react_jsx_runtime.jsx)("option", {
+								value: "default",
+								children: lang === "en" ? "Channel default" : "渠道默认"
+							}),
+							(0, react_jsx_runtime.jsx)("option", {
+								value: "off",
+								children: lang === "en" ? "Off" : "关闭"
+							}),
+							(0, react_jsx_runtime.jsx)("option", {
+								value: "on",
+								children: lang === "en" ? "On" : "开启"
+							})
+						] }) : (0, react_jsx_runtime.jsx)("option", {
+							value: "default",
+							children: capability.status === "unknown" ? lang === "en" ? "Support unconfirmed" : "支持未确认" : lang === "en" ? "No confirmed control" : "无已确认开关"
+						})
+					}),
+					!supported ? (0, react_jsx_runtime.jsx)("small", {
+						id: noteId,
+						className: "dsh-ig-inline-note",
+						children: reason
+					}) : null
+				]
+			});
+		};
+		//#endregion
 		//#region node_modules/.pnpm/@tldraw+utils@5.3.0/node_modules/@tldraw/utils/dist-esm/lib/version.mjs
 		const TLDRAW_LIBRARY_VERSION_KEY = "__TLDRAW_LIBRARY_VERSIONS__";
 		function getLibraryVersions() {
@@ -117181,6 +117380,9 @@ img.ProseMirror-separator {
 			const [model, setModel] = (0, react.useState)("");
 			const [ratio, setRatio] = (0, react.useState)("1:1");
 			const [quality, setQuality] = (0, react.useState)("1K");
+			const [resolution, setResolution] = (0, react.useState)("1K");
+			const [generationQuality, setGenerationQuality] = (0, react.useState)(PROVIDER_DEFAULT_QUALITY);
+			const [watermark, setWatermark] = (0, react.useState)("default");
 			const [prompt, setPrompt] = (0, react.useState)("");
 			const [references, setReferences] = (0, react.useState)([]);
 			const [count, setCount] = (0, react.useState)(1);
@@ -117422,19 +117624,43 @@ img.ProseMirror-separator {
 			const subscriptionSignedInCount = config?.providers.filter((item) => item.configured && isSubscriptionProvider(item.provider)).length ?? 0;
 			const displayItems = (0, react.useMemo)(() => items.slice(0, visibleLimit), [items, visibleLimit]);
 			const comparisonProfiles = (0, react.useMemo)(() => (config?.providers ?? []).filter((item) => item.configured && (mode === "generate" || item.supportsEditing)), [config, mode]);
-			const comparisonTargets = (0, react.useMemo)(() => buildComparisonTargets(comparisonProfiles, comparisonProviders, ratio, quality), [
+			const selectedComparisonProfiles = (0, react.useMemo)(() => comparisonProfiles.filter((profile) => comparisonProviders.includes(profile.provider)), [comparisonProfiles, comparisonProviders]);
+			const comparisonResolutionOpts = (0, react.useMemo)(() => comparisonOutputOptions(selectedComparisonProfiles, ratio, "resolution"), [selectedComparisonProfiles, ratio]);
+			const comparisonGenerationQualityOpts = (0, react.useMemo)(() => localizeQualityOptions(comparisonOutputOptions(selectedComparisonProfiles, ratio, "generationQuality"), lang), [
+				selectedComparisonProfiles,
+				ratio,
+				lang
+			]);
+			const comparisonResolution = comparisonResolutionOpts.some((option) => option.value === resolution) ? resolution : comparisonResolutionOpts[0]?.value ?? "standard";
+			const comparisonGenerationQuality = comparisonGenerationQualityOpts.some((option) => option.value === generationQuality) ? generationQuality : comparisonGenerationQualityOpts[0]?.value ?? "__default__";
+			const comparisonTargets = (0, react.useMemo)(() => buildComparisonTargets(comparisonProfiles, comparisonProviders, ratio, quality, {
+				resolution: comparisonResolution,
+				generationQuality: comparisonGenerationQuality
+			}), [
 				comparisonProfiles,
 				comparisonProviders,
 				ratio,
-				quality
+				quality,
+				comparisonResolution,
+				comparisonGenerationQuality
 			]);
+			const resolutionOpts = provider === "openai" ? activeProfile?.resolutionOptions?.[ratio] ?? [] : [];
+			const singleQualityOpts = provider === "openai-compat" ? activeProfile?.resolutionOptions?.[ratio] ?? activeProfile?.qualityOptions ?? [] : activeProfile?.qualityOptions ?? [];
+			const selectedQuality = singleQualityOpts.some((option) => option.value === quality) ? quality : singleQualityOpts[0]?.value ?? quality;
+			const selectedResolution = resolutionOpts.some((option) => option.value === resolution) ? resolution : resolutionOpts[0]?.value;
+			const selectedGenerationQuality = activeProfile?.generationQualityOptions?.some((option) => option.value === generationQuality) ? generationQuality : activeProfile?.defaultGenerationQuality ?? "__default__";
+			const watermarkCapability = studioWatermarkCapability(activeProfile, mode);
+			const comparisonWatermarkCapabilities = selectedComparisonProfiles.map((profile) => studioWatermarkCapability(profile, mode));
+			const comparisonWatermarkCapability = comparisonWatermarkCapabilities.find((capability) => capability.status === "supported") ?? comparisonWatermarkCapabilities.find((capability) => capability.status === "unknown") ?? studioWatermarkCapability(selectedComparisonProfiles[0], mode);
 			const comparisonRatioOpts = (0, react.useMemo)(() => localizeRatioOptions(comparisonOptionUnion(comparisonProfiles, "ratioOptions"), lang), [comparisonProfiles, lang]);
-			const comparisonQualityOpts = (0, react.useMemo)(() => localizeQualityOptions(comparisonOptionUnion(comparisonProfiles, "qualityOptions"), lang), [comparisonProfiles, lang]);
 			const applyProvider = (profile) => {
 				setProvider(profile.provider);
 				setModel(profile.model);
 				setRatio(profile.defaultRatio);
 				setQuality(profile.defaultQuality);
+				setResolution(profile.defaultResolution ?? profile.defaultQuality);
+				setGenerationQuality(profile.defaultGenerationQuality ?? profile.defaultQuality);
+				setWatermark("default");
 				setError(null);
 			};
 			const changeProvider = (value) => {
@@ -117474,6 +117700,23 @@ img.ProseMirror-separator {
 				setSelected(null);
 				resetFit();
 			};
+			const prepareRegeneration = (item) => {
+				setMode("generate");
+				setComparisonEnabled(false);
+				setPrompt(item.prompt);
+				const profile = config?.providers.find((entry) => entry.provider === item.provider);
+				if (!profile) return;
+				applyProvider(profile);
+				const nextRatio = profile.ratioOptions.some((option) => option.value === item.aspectRatio) ? item.aspectRatio : profile.defaultRatio;
+				setRatio(nextRatio);
+				if (profile.qualityOptions.some((option) => option.value === item.imageSize)) {
+					setQuality(item.imageSize);
+					if (profile.provider === "openai") setGenerationQuality(item.imageSize);
+				}
+				if (profile.resolutionOptions?.[nextRatio]?.some((option) => option.value === item.resolution)) setResolution(item.resolution);
+				if (profile.generationQualityOptions?.some((option) => option.value === item.generationQuality)) setGenerationQuality(item.generationQuality);
+				if (item.watermark && studioWatermarkCapability(profile, "generate").status === "supported") setWatermark(item.watermark);
+			};
 			const handleCanvasMouseDown = (e) => {
 				if (e.button !== 0 && e.button !== 1) return;
 				if (selected === null && (!currentBatch || currentBatch.length === 0)) return;
@@ -117723,6 +117966,9 @@ img.ProseMirror-separator {
 									prompt: prompt.trim(),
 									ratio: target.ratio,
 									quality: target.quality,
+									...target.resolution === void 0 ? {} : { resolution: target.resolution },
+									...target.generationQuality === void 0 ? {} : { generationQuality: target.generationQuality },
+									...studioWatermarkCapability(target.profile, mode).status === "supported" ? { watermark } : {},
 									...workspace?.path ? { workspaceRoot: workspace.path } : {},
 									...referencesPayload === void 0 ? {} : { references: referencesPayload }
 								})
@@ -117750,6 +117996,9 @@ img.ProseMirror-separator {
 							createdAt: value.payload.createdAt + idx,
 							aspectRatio: value.target.ratio,
 							imageSize: value.target.quality,
+							resolution: value.target.resolution,
+							generationQuality: value.target.generationQuality,
+							watermark: studioWatermarkCapability(value.target.profile, mode).status === "supported" ? watermark : void 0,
 							output: value.payload.output,
 							...value.payload.savedTo ? { savedTo: value.payload.savedTo } : {},
 							...workspace?.path ? { workspacePath: workspace.path } : {},
@@ -117785,7 +118034,10 @@ img.ProseMirror-separator {
 							model,
 							prompt: prompt.trim(),
 							ratio,
-							quality,
+							quality: selectedQuality,
+							...selectedResolution === void 0 ? {} : { resolution: selectedResolution },
+							...provider === "openai-compat" ? { generationQuality: selectedGenerationQuality } : {},
+							...watermarkCapability.status === "supported" ? { watermark } : {},
 							...count > 1 ? { count } : {},
 							...workspace?.path ? { workspaceRoot: workspace.path } : {},
 							...referencesPayload === void 0 ? {} : { references: referencesPayload }
@@ -117806,7 +118058,10 @@ img.ProseMirror-separator {
 						model: payload.model,
 						createdAt: payload.createdAt + idx,
 						aspectRatio: ratio,
-						imageSize: quality,
+						imageSize: selectedQuality,
+						resolution: selectedResolution,
+						generationQuality: provider === "openai-compat" ? selectedGenerationQuality : void 0,
+						watermark: watermarkCapability.status === "supported" ? watermark : void 0,
 						output: gen.output,
 						...gen.savedTo ? { savedTo: gen.savedTo } : {},
 						...workspace?.path ? { workspacePath: workspace.path } : {},
@@ -118537,10 +118792,7 @@ img.ProseMirror-separator {
 												children: [(0, react_jsx_runtime.jsx)(PencilLine, { size: 15 }), t("continueEdit")]
 											}), (0, react_jsx_runtime.jsxs)("button", {
 												type: "button",
-												onClick: () => {
-													setMode("generate");
-													setPrompt(selected.prompt);
-												},
+												onClick: () => prepareRegeneration(selected),
 												children: [(0, react_jsx_runtime.jsx)(RefreshCw, { size: 15 }), t("regenerate")]
 											})] })]
 										}),
@@ -118804,12 +119056,12 @@ img.ProseMirror-separator {
 																	}),
 																	target && (0, react_jsx_runtime.jsxs)("span", {
 																		className: "dsh-ig-model-settings",
-																		children: [
+																		children: [[
 																			target.ratio,
-																			" · ",
-																			target.quality,
-																			target.adjusted ? (0, react_jsx_runtime.jsx)("em", { children: t("compareAdjusted") }) : null
-																		]
+																			target.resolution,
+																			target.quality === target.resolution ? void 0 : target.quality,
+																			target.generationQuality === "__default__" ? void 0 : target.generationQuality
+																		].filter(Boolean).join(" · "), target.adjusted ? (0, react_jsx_runtime.jsx)("em", { children: t("compareAdjusted") }) : null]
 																	})
 																]
 															}, item.provider);
@@ -118819,19 +119071,38 @@ img.ProseMirror-separator {
 												]
 											}),
 											(0, react_jsx_runtime.jsxs)("div", {
-												className: "dsh-ig-field-grid",
-												children: [(0, react_jsx_runtime.jsx)(FieldSelect, {
-													label: t("ratio"),
-													value: ratio,
-													onChange: setRatio,
-													options: comparisonRatioOpts
-												}), (0, react_jsx_runtime.jsx)(FieldSelect, {
-													label: t("quality"),
-													value: quality,
-													onChange: setQuality,
-													options: comparisonQualityOpts
-												})]
+												className: "dsh-ig-field-grid is-output-grid",
+												children: [
+													(0, react_jsx_runtime.jsx)(FieldSelect, {
+														label: t("ratio"),
+														value: ratio,
+														onChange: setRatio,
+														options: comparisonRatioOpts
+													}),
+													comparisonResolutionOpts.length > 0 ? (0, react_jsx_runtime.jsx)(FieldSelect, {
+														label: lang === "en" ? "Resolution" : "分辨率",
+														value: comparisonResolution,
+														onChange: setResolution,
+														options: comparisonResolutionOpts
+													}) : null,
+													comparisonGenerationQualityOpts.length > 0 ? (0, react_jsx_runtime.jsx)(FieldSelect, {
+														label: lang === "en" ? "Generation quality" : "生成质量",
+														value: comparisonGenerationQuality,
+														onChange: setGenerationQuality,
+														options: comparisonGenerationQualityOpts
+													}) : null,
+													(0, react_jsx_runtime.jsx)(WatermarkControl, {
+														capability: comparisonWatermarkCapability,
+														value: watermark,
+														onChange: setWatermark,
+														lang
+													})
+												]
 											}),
+											comparisonWatermarkCapability.status === "supported" ? (0, react_jsx_runtime.jsx)("div", {
+												className: "dsh-ig-inline-note",
+												children: lang === "en" ? "Watermark applies only to models with confirmed support for this operation." : "水印选项仅用于已确认支持当前操作的模型。"
+											}) : null,
 											comparisonTargets.some((target) => target.profile.provider === "chatgpt-sub") && (0, react_jsx_runtime.jsx)("div", {
 												className: "dsh-ig-inline-note",
 												children: t("subscriptionParameterHint")
@@ -118858,18 +119129,47 @@ img.ProseMirror-separator {
 												})]
 											}),
 											(0, react_jsx_runtime.jsxs)("div", {
-												className: "dsh-ig-field-grid",
-												children: [(0, react_jsx_runtime.jsx)(FieldSelect, {
-													label: t("ratio"),
-													value: ratio,
-													onChange: setRatio,
-													options: localizeRatioOptions(activeProfile?.ratioOptions ?? [], lang)
-												}), (0, react_jsx_runtime.jsx)(FieldSelect, {
-													label: t("quality"),
-													value: quality,
-													onChange: setQuality,
-													options: localizeQualityOptions(activeProfile?.qualityOptions ?? [], lang)
-												})]
+												className: "dsh-ig-field-grid is-output-grid",
+												children: [
+													(0, react_jsx_runtime.jsx)(FieldSelect, {
+														label: t("ratio"),
+														value: ratio,
+														onChange: setRatio,
+														options: localizeRatioOptions(activeProfile?.ratioOptions ?? [], lang)
+													}),
+													resolutionOpts.length > 0 ? (0, react_jsx_runtime.jsx)(FieldSelect, {
+														label: lang === "en" ? "Resolution" : "分辨率",
+														value: selectedResolution ?? "",
+														onChange: setResolution,
+														options: resolutionOpts
+													}) : null,
+													(0, react_jsx_runtime.jsx)(FieldSelect, {
+														label: [
+															"openai",
+															"chatgpt-sub",
+															"zhipu"
+														].includes(provider) ? lang === "en" ? "Generation quality" : "生成质量" : lang === "en" ? "Resolution" : "分辨率",
+														value: selectedQuality,
+														onChange: (value) => {
+															setQuality(value);
+															if (provider === "openai") setGenerationQuality(value);
+															else setResolution(value);
+														},
+														options: provider === "openai-compat" ? singleQualityOpts : localizeQualityOptions(singleQualityOpts, lang)
+													}),
+													activeProfile?.generationQualityOptions ? (0, react_jsx_runtime.jsx)(FieldSelect, {
+														label: lang === "en" ? "Generation quality" : "生成质量",
+														value: selectedGenerationQuality,
+														onChange: setGenerationQuality,
+														options: localizeQualityOptions(activeProfile.generationQualityOptions, lang)
+													}) : null,
+													(0, react_jsx_runtime.jsx)(WatermarkControl, {
+														capability: watermarkCapability,
+														value: watermark,
+														onChange: setWatermark,
+														lang
+													})
+												]
 											}),
 											provider === "chatgpt-sub" && (0, react_jsx_runtime.jsx)("div", {
 												className: "dsh-ig-inline-note",
@@ -119299,7 +119599,7 @@ img.ProseMirror-separator {
 		function localizeQualityOptions(options, lang) {
 			return options.map((opt) => ({
 				value: opt.value,
-				label: LOCALIZED_QUALITIES[opt.value]?.[lang] ?? opt.label
+				label: opt.value === "__default__" ? lang === "en" ? "Provider default (omit)" : "渠道默认（不发送）" : LOCALIZED_QUALITIES[opt.value]?.[lang] ?? opt.label
 			}));
 		}
 		const RecentItem = ({ item, active, onClick }) => {
@@ -121812,17 +122112,20 @@ img.ProseMirror-separator {
 		function conversationRegenerateRequest(image, prompt, remembered) {
 			if (!CLOUD_IMAGE_PROVIDERS.includes(image.provider)) throw new Error("当前图片使用的 Provider 暂不支持重新生成");
 			const provider = image.provider;
-			const settings = remembered ?? outputSettings(provider, image.output);
+			const settings = remembered ?? outputSettings(provider, image.output, image.model);
 			return {
 				mode: "generate",
 				provider,
 				model: image.model,
 				prompt: prompt.trim(),
 				ratio: settings.ratio,
-				quality: settings.quality
+				quality: settings.quality,
+				...settings.resolution === void 0 ? {} : { resolution: settings.resolution },
+				...settings.generationQuality === void 0 ? {} : { generationQuality: settings.generationQuality },
+				...settings.watermark === void 0 ? {} : { watermark: settings.watermark }
 			};
 		}
-		function outputSettings(provider, output) {
+		function outputSettings(provider, output, model = "") {
 			const normalized = (output ?? "").trim();
 			if (provider === "google") {
 				const [rawRatio, rawQuality] = normalized.split(",").map((value) => value.trim());
@@ -121835,16 +122138,39 @@ img.ProseMirror-separator {
 				ratio: "auto",
 				quality: normalized === "1K" || normalized === "4K" ? normalized : "2K"
 			};
-			if (provider === "openai" || provider === "openai-compat" || provider === "xai" || provider === "zhipu") return {
-				ratio: ratioFromSize(normalized, "x"),
-				quality: "standard"
-			};
+			if (provider === "openai" || provider === "openai-compat" || provider === "xai" || provider === "zhipu") {
+				const [size, qualityPart] = normalized.split(",").map((value) => value.trim());
+				const requestedQuality = qualityPart?.startsWith("quality=") ? qualityPart.slice(8) : void 0;
+				const resolution = provider === "openai" ? Object.values(officialSizeTable({}, model)).flatMap((tiers) => Object.entries(tiers)).find(([, pixels]) => pixels === size)?.[0] : void 0;
+				return {
+					ratio: ratioFromSize(size ?? "", "x"),
+					quality: provider === "openai" ? requestedQuality ?? "auto" : "standard",
+					...resolution === void 0 ? {} : { resolution },
+					...provider === "openai-compat" && requestedQuality ? { generationQuality: requestedQuality } : {}
+				};
+			}
 			return {
 				ratio: ratioFromSize(normalized, "*"),
 				quality: "standard"
 			};
 		}
 		function ratioFromSize(size, separator) {
+			const dimensions = size.split(separator).map(Number);
+			if (dimensions.length === 2 && dimensions.every((value) => Number.isFinite(value) && value > 0)) {
+				const target = dimensions[0] / dimensions[1];
+				for (const ratio of [
+					"1:1",
+					"3:2",
+					"2:3",
+					"4:3",
+					"3:4",
+					"16:9",
+					"9:16"
+				]) {
+					const [width, height] = ratio.split(":").map(Number);
+					if (Math.abs(target - width / height) < .015) return ratio;
+				}
+			}
 			return (separator === "x" ? {
 				"1024x1024": "1:1",
 				"1536x1024": "3:2",
@@ -122520,7 +122846,10 @@ img.ProseMirror-separator {
 				try {
 					const request = conversationRegenerateRequest(previewItem, regeneratePrompt, previewItem.aspectRatio ? {
 						ratio: previewItem.aspectRatio,
-						quality: previewItem.imageSize || "standard"
+						quality: previewItem.imageSize || "standard",
+						resolution: previewItem.resolution,
+						generationQuality: previewItem.generationQuality,
+						watermark: previewItem.watermark
 					} : void 0);
 					if (activeWorkspace?.path) request.workspaceRoot = activeWorkspace.path;
 					const response = await fetch(STUDIO_ROUTE, {
@@ -122541,6 +122870,9 @@ img.ProseMirror-separator {
 						createdAt: payload.createdAt,
 						aspectRatio: request.ratio,
 						imageSize: request.quality,
+						resolution: request.resolution,
+						generationQuality: request.generationQuality,
+						watermark: request.watermark,
 						output: payload.output,
 						...payload.savedTo ? { savedTo: payload.savedTo } : {},
 						...activeWorkspace?.path ? { workspacePath: activeWorkspace.path } : {},
@@ -124070,6 +124402,7 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 .dsh-ig-page-in-sidebar .dsh-ig-workbench-grid.is-sidebar-collapsed{grid-template-columns:minmax(0,1fr) minmax(206px,264px)}
 .dsh-ig-page-in-sidebar .dsh-ig-workbench-grid.is-generate-collapsed{grid-template-columns:minmax(150px,190px) minmax(0,1fr)}
 .dsh-ig-page-in-sidebar .dsh-ig-workbench-grid.is-sidebar-collapsed.is-generate-collapsed{grid-template-columns:minmax(0,1fr)}
+.dsh-ig-field-grid.is-output-grid{grid-template-columns:repeat(auto-fit,minmax(140px,1fr))}
 .dsh-ig-page-in-sidebar .dsh-ig-recent-item{min-width:0}
 .dsh-ig-page-in-sidebar .dsh-ig-generate-panel .dsh-ig-field-grid{grid-template-columns:1fr}
 .dsh-ig-page-in-sidebar .dsh-ig-tl-canvas{min-height:280px}
@@ -124366,7 +124699,7 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 		function isRevision(value) {
 			if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
 			const candidate = value;
-			return isAttachment(candidate.attachment) && typeof candidate.provider === "string" && STUDIO_PROVIDERS.includes(candidate.provider) && typeof candidate.prompt === "string" && typeof candidate.model === "string" && typeof candidate.output === "string" && typeof candidate.createdAt === "number" && Number.isFinite(candidate.createdAt) && typeof candidate.ratio === "string" && typeof candidate.quality === "string";
+			return isAttachment(candidate.attachment) && typeof candidate.provider === "string" && STUDIO_PROVIDERS.includes(candidate.provider) && typeof candidate.prompt === "string" && typeof candidate.model === "string" && typeof candidate.output === "string" && typeof candidate.createdAt === "number" && Number.isFinite(candidate.createdAt) && typeof candidate.ratio === "string" && typeof candidate.quality === "string" && (candidate.resolution === void 0 || typeof candidate.resolution === "string") && (candidate.generationQuality === void 0 || typeof candidate.generationQuality === "string") && (candidate.watermark === void 0 || STUDIO_WATERMARK_VALUES.some((value) => value === candidate.watermark));
 		}
 		function isAttachment(value) {
 			if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
@@ -124374,6 +124707,31 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 			return typeof candidate.attachmentId === "string" && (candidate.mediaType === "image/png" || candidate.mediaType === "image/jpeg" || candidate.mediaType === "image/webp" || candidate.mediaType === "image/gif") && typeof candidate.bytes === "number" && typeof candidate.width === "number" && typeof candidate.height === "number";
 		}
 		//#endregion
+		//#region lib/types/client/output-settings.js
+		/** Validate all advanced output fields before the settings form starts writing. */
+		function parseExtraFields(text, message) {
+			if (!text.trim()) return {};
+			let value;
+			try {
+				value = JSON.parse(text);
+			} catch {
+				throw new Error(message);
+			}
+			if (typeof value !== "object" || value === null || Array.isArray(value)) throw new Error(message);
+			return value;
+		}
+		function parseSizeTable(text, message) {
+			const value = parseExtraFields(text, message);
+			const table = {};
+			for (const [ratio, tiers] of Object.entries(value)) {
+				if (!/^\d+(?:\.\d+)?:\d+(?:\.\d+)?$/.test(ratio) || ratio.split(":").some((part) => Number(part) <= 0) || typeof tiers !== "object" || tiers === null || Array.isArray(tiers)) throw new Error(message);
+				const entries = Object.entries(tiers);
+				if (entries.length === 0 || entries.some(([tier, size]) => !/^(\d+(?:\.\d+)?)(K?)$/.test(tier) || Number.parseFloat(tier) <= 0 || typeof size !== "string" || !size.trim())) throw new Error(message);
+				table[ratio] = Object.fromEntries(entries.map(([tier, size]) => [tier, size.trim()]));
+			}
+			return table;
+		}
+		//#endregion
 		//#region lib/types/client/settings-write.js
 		/** DSH 0.1.7 resolves refused writes to false; older settings scopes resolve to void. */
 		async function writeSetting(scope, field, value, rejectedMessage) {
@@ -124817,7 +125175,7 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 `;
 		//#endregion
 		//#region lib/types/client/index.js
-		console.info(`[dsh-image-gen] canvas bundle 2026-10-08T04:58:18.947Z`);
+		console.info(`[dsh-image-gen] canvas bundle 2026-10-11T07:43:39.734Z`);
 		/** Right-sidebar tab-type registration id (DSH 0.1.5 `sidebarRightTabs`). */
 		const SIDEBAR_STUDIO_TAB_ID = "dsh-image-gen/studio";
 		/** The tab kind: a page type opened by kind, recognizing no resource address. */
@@ -124896,9 +125254,10 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 				endpointHintOpenAICompat: "中转站/自建服务的 OpenAI 兼容 /v1 地址（必填），例如 https://your-relay.example.com/v1。",
 				editFormat: "图生图请求形态",
 				editFormatMultipart: "标准 multipart（OpenAI 官方）",
+				editFormatAutomatic: "自动：官方接口 JSON 格式",
 				editFormatJsonImageUrlArray: "JSON images 数组（商汤等中转）",
 				editFormatFormReferenceImages: "multipart + reference_images JSON 数组（base64）",
-				editFormatHint: "文生图不受影响。仅当中转站的图生图接口使用自有契约（如商汤 SenseNova 的 JSON images 数组，或要求 reference_images base64 数组的中转）时才需要切换。",
+				editFormatHint: "商汤、通义已确认的官方接口自动使用对应 JSON 格式；其他中转按接口文档选择。文生图不受影响。",
 				editExtra: "附加 JSON 字段",
 				editExtraPlaceholder: "{\"watermark\": false, \"prompt_extend\": true}",
 				editExtraHint: "仅 JSON 形态生效；会合并到请求体末尾，可覆盖默认字段。留空表示不附加。",
@@ -124915,6 +125274,17 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 				arkBackgroundTransparent: "透明",
 				arkBackgroundHint: "仅图生图有效，且要求参考图本身带透明通道；文生图会被方舟拒绝，因此这一项只在图生图时发出。",
 				editExtraInvalid: "附加 JSON 字段必须是合法的 JSON 对象。",
+				sizeTable: "自定义分辨率表（JSON）",
+				sizeTableHint: "格式为「比例 → 档位 → 像素尺寸」。留空使用默认尺寸；例如 {\"16:9\":{\"2K\":\"2048x1152\"}}。",
+				sizeTableInvalid: "分辨率表须为「比例 → 数字档位（如 2K）→ 非空尺寸字符串」的 JSON 对象。",
+				defaultQuality: "默认生成质量",
+				defaultQualityHint: "留空不发送 quality。该参数与分辨率独立，上游须支持所填值。",
+				qualityOptions: "可选生成质量（逗号分隔）",
+				generateExtra: "文生图附加字段（JSON）",
+				generateExtraHint: "仅文生图生效，合并到请求体末尾，可覆盖 size 和 quality。关闭商汤水印可填 {\"watermark\":false}。",
+				editSizeMode: "JSON 图生图尺寸",
+				editSizeAuto: "自动（兼容商汤）",
+				editSizeSelected: "使用所选分辨率",
 				endpointHintSeedream: "火山方舟兼容的 /api/v3 地址。",
 				endpointHintDashScope: "阿里云百炼 DashScope 官方接口地址。",
 				endpointHintXAI: "xAI 官方 api.x.ai 的 /v1 地址。",
@@ -125049,9 +125419,10 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 				endpointHintOpenAICompat: "OpenAI-compatible /v1 base URL of your relay or self-hosted service (required), e.g. https://your-relay.example.com/v1.",
 				editFormat: "Edit request format",
 				editFormatMultipart: "Standard multipart (official OpenAI)",
+				editFormatAutomatic: "Automatic: official JSON contract",
 				editFormatJsonImageUrlArray: "JSON images array (SenseNova etc.)",
 				editFormatFormReferenceImages: "Multipart with a reference_images JSON array (base64)",
-				editFormatHint: "Text-to-image is unaffected. Only switch when the relay runs image edits on its own contract (e.g. SenseNova's JSON images array, or a relay that takes reference_images as a base64 JSON array); size is pinned to \"auto\" in the JSON images format (the only value SenseNova's edits endpoint accepts) and can be overridden via extra fields.",
+				editFormatHint: "Recognized official SenseNova and Qwen endpoints automatically use their JSON edit contracts. Choose other relay formats according to their documentation. Text-to-image is unaffected.",
 				editExtra: "Extra JSON fields",
 				editExtraPlaceholder: "{\"watermark\": false, \"prompt_extend\": true}",
 				editExtraHint: "Only used with the JSON format; merged into the request body last and may override defaults. Leave empty for none.",
@@ -125068,6 +125439,17 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 				arkBackgroundTransparent: "Transparent",
 				arkBackgroundHint: "Image-to-image only, and every reference image must already carry an alpha channel; Ark rejects it for text-to-image, so it is sent on edits alone.",
 				editExtraInvalid: "Extra JSON fields must be a valid JSON object.",
+				sizeTable: "Custom resolution table (JSON)",
+				sizeTableHint: "Aspect ratio → tier → pixel size. Leave empty for defaults; e.g. {\"16:9\":{\"2K\":\"2048x1152\"}}.",
+				sizeTableInvalid: "Use a JSON object mapping ratios to numeric tiers (e.g. 2K) and nonempty size strings.",
+				defaultQuality: "Default generation quality",
+				defaultQualityHint: "Leave empty to omit quality. Independent of resolution; the upstream must support this value.",
+				qualityOptions: "Available generation qualities (comma-separated)",
+				generateExtra: "Generation extra fields (JSON)",
+				generateExtraHint: "Generation only. Merged last; can override size and quality. Use {\"watermark\":false} for SenseNova.",
+				editSizeMode: "JSON edit dimensions",
+				editSizeAuto: "Auto (SenseNova compatible)",
+				editSizeSelected: "Use selected resolution",
 				endpointHintSeedream: "Volcengine Ark compatible /api/v3 base URL.",
 				endpointHintDashScope: "Official Aliyun DashScope endpoint.",
 				endpointHintXAI: "Official xAI api.x.ai /v1 base URL.",
@@ -125692,6 +126074,11 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 				timeoutSeconds: DEFAULT_COMFYUI_TIMEOUT_MS / 1e3,
 				editFormat: "multipart",
 				editExtraText: "",
+				sizeTableText: "",
+				generationQuality: "",
+				qualityOptionsText: DEFAULT_COMPAT_QUALITIES.join(", "),
+				generateExtraText: "",
+				editSizeMode: "auto",
 				outputFormat: "jpeg",
 				watermark: true,
 				background: "opaque"
@@ -125759,6 +126146,7 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 				...emptyProviderRow(),
 				model: modelOf(provider, value),
 				baseURL: baseURLOf(provider, value),
+				...provider === "openai" ? { sizeTableText: editExtraTextOf(value?.openaiSizes) } : {},
 				...provider === "comfyui" ? {
 					workflows: resolveComfyUIWorkflows(value ?? {}),
 					activeWorkflow: activeComfyUIWorkflow(value ?? {})?.name ?? "",
@@ -125766,7 +126154,12 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 				} : {},
 				...provider === "openai-compat" ? {
 					editFormat: parseEditFormat(value?.openaiCompatEditFormat),
-					editExtraText: editExtraTextOf(value?.openaiCompatEditExtra)
+					editExtraText: editExtraTextOf(value?.openaiCompatEditExtra),
+					sizeTableText: editExtraTextOf(value?.openaiCompatSizes),
+					generationQuality: value?.openaiCompatQuality ?? "",
+					qualityOptionsText: (value?.openaiCompatQualityOptions ?? DEFAULT_COMPAT_QUALITIES).join(", "),
+					generateExtraText: editExtraTextOf(value?.openaiCompatExtraBody),
+					editSizeMode: value?.openaiCompatEditSizeMode === "selected" ? "selected" : "auto"
 				} : {},
 				...provider === "seedream" ? {
 					outputFormat: value?.seedreamOutputFormat === "png" ? "png" : "jpeg",
@@ -126133,25 +126526,21 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 						await saveSetting("comfyuiTimeoutMs", Math.max(1, Math.round(row.timeoutSeconds)) * 1e3);
 					} else if (isSubscriptionProvider(provider)) await Promise.resolve();
 					else {
-						let editExtra = {};
-						if (provider === "openai-compat") {
-							const extraText = row.editExtraText.trim();
-							if (extraText.length > 0) {
-								let parsed;
-								try {
-									parsed = JSON.parse(extraText);
-								} catch {
-									throw new Error(t("editExtraInvalid"));
-								}
-								if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new Error(t("editExtraInvalid"));
-								editExtra = parsed;
-							}
-						}
+						const editExtra = provider === "openai-compat" ? parseExtraFields(row.editExtraText, t("editExtraInvalid")) : {};
+						const sizeTable = provider === "openai" || provider === "openai-compat" ? parseSizeTable(row.sizeTableText, t("sizeTableInvalid")) : {};
+						const generateExtra = provider === "openai-compat" ? parseExtraFields(row.generateExtraText, t("editExtraInvalid")) : {};
+						if (provider === "openai") for (const tiers of Object.values(sizeTable)) for (const size of Object.values(tiers)) validateOfficialSize(row.model, size);
 						await saveSetting(modelFieldOf(provider), row.model);
 						await saveSetting(baseURLFieldOf(provider), row.baseURL);
+						if (provider === "openai") await saveSetting("openaiSizes", sizeTable);
 						if (provider === "openai-compat") {
 							await saveSetting("openaiCompatEditFormat", row.editFormat);
 							await saveSetting("openaiCompatEditExtra", editExtra);
+							await saveSetting("openaiCompatSizes", sizeTable);
+							await saveSetting("openaiCompatQuality", row.generationQuality.trim());
+							await saveSetting("openaiCompatQualityOptions", [...new Set(row.qualityOptionsText.split(",").map((value) => value.trim()).filter(Boolean))]);
+							await saveSetting("openaiCompatExtraBody", generateExtra);
+							await saveSetting("openaiCompatEditSizeMode", row.editSizeMode);
 						}
 						if (provider === "seedream") {
 							await saveSetting("seedreamOutputFormat", row.outputFormat);
@@ -126493,6 +126882,12 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 			};
 			const renderCloudBody = (provider) => {
 				const row = rows[provider];
+				const officialEditFormat = provider === "openai-compat" ? compatEditFormat({
+					openaiCompatBaseURL: row.baseURL,
+					openaiCompatModel: row.model
+				}) : "multipart";
+				const automaticEditFormat = officialEditFormat !== "multipart";
+				const editFormat = automaticEditFormat ? officialEditFormat : row.editFormat;
 				const keyRef = cloudCredentialRef(provider) ?? "";
 				const keyReadOnly = row.keyInfo?.writable === false;
 				const keyUnavailable = !credentialsAvailable();
@@ -126625,12 +127020,16 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 									}),
 									(0, react_jsx_runtime.jsxs)("select", {
 										className: "dsh-ig-input",
-										value: row.editFormat,
+										value: automaticEditFormat ? "__official__" : row.editFormat,
 										onChange: (event) => {
 											updateRow(provider, { editFormat: parseEditFormat(event.target.value) });
 										},
-										disabled: !settingsWritable,
+										disabled: !settingsWritable || automaticEditFormat,
 										children: [
+											automaticEditFormat ? (0, react_jsx_runtime.jsx)("option", {
+												value: "__official__",
+												children: t("editFormatAutomatic")
+											}) : null,
 											(0, react_jsx_runtime.jsx)("option", {
 												value: "multipart",
 												children: t("editFormatMultipart")
@@ -126737,7 +127136,110 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 									]
 								})
 							] }) : null,
-							provider === "openai-compat" && row.editFormat === "jsonImageUrlArray" ? (0, react_jsx_runtime.jsxs)("label", {
+							provider === "openai" || provider === "openai-compat" ? (0, react_jsx_runtime.jsxs)("label", {
+								className: "dsh-ig-field",
+								children: [
+									(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-label",
+										children: t("sizeTable")
+									}),
+									(0, react_jsx_runtime.jsx)("textarea", {
+										className: "dsh-ig-input dsh-ig-textarea",
+										value: row.sizeTableText,
+										onChange: (event) => {
+											updateRow(provider, { sizeTableText: event.target.value });
+										},
+										rows: 3,
+										disabled: !settingsWritable
+									}),
+									(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-hint",
+										children: t("sizeTableHint")
+									})
+								]
+							}) : null,
+							provider === "openai-compat" ? (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+								(0, react_jsx_runtime.jsxs)("label", {
+									className: "dsh-ig-field",
+									children: [
+										(0, react_jsx_runtime.jsx)("span", {
+											className: "dsh-ig-label",
+											children: t("defaultQuality")
+										}),
+										(0, react_jsx_runtime.jsx)("input", {
+											className: "dsh-ig-input",
+											value: row.generationQuality,
+											onChange: (event) => {
+												updateRow(provider, { generationQuality: event.target.value });
+											},
+											placeholder: "high",
+											disabled: !settingsWritable
+										}),
+										(0, react_jsx_runtime.jsx)("span", {
+											className: "dsh-ig-hint",
+											children: t("defaultQualityHint")
+										})
+									]
+								}),
+								(0, react_jsx_runtime.jsxs)("label", {
+									className: "dsh-ig-field",
+									children: [(0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-ig-label",
+										children: t("qualityOptions")
+									}), (0, react_jsx_runtime.jsx)("input", {
+										className: "dsh-ig-input",
+										value: row.qualityOptionsText,
+										onChange: (event) => {
+											updateRow(provider, { qualityOptionsText: event.target.value });
+										},
+										disabled: !settingsWritable
+									})]
+								}),
+								(0, react_jsx_runtime.jsxs)("label", {
+									className: "dsh-ig-field",
+									children: [
+										(0, react_jsx_runtime.jsx)("span", {
+											className: "dsh-ig-label",
+											children: t("generateExtra")
+										}),
+										(0, react_jsx_runtime.jsx)("textarea", {
+											className: "dsh-ig-input dsh-ig-textarea",
+											value: row.generateExtraText,
+											onChange: (event) => {
+												updateRow(provider, { generateExtraText: event.target.value });
+											},
+											placeholder: "{\"watermark\":false}",
+											rows: 2,
+											disabled: !settingsWritable
+										}),
+										(0, react_jsx_runtime.jsx)("span", {
+											className: "dsh-ig-hint",
+											children: t("generateExtraHint")
+										})
+									]
+								})
+							] }) : null,
+							provider === "openai-compat" && (editFormat === "jsonImageUrlArray" || editFormat === "qwenJson") ? (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [editFormat === "jsonImageUrlArray" ? (0, react_jsx_runtime.jsxs)("label", {
+								className: "dsh-ig-field",
+								children: [(0, react_jsx_runtime.jsx)("span", {
+									className: "dsh-ig-label",
+									children: t("editSizeMode")
+								}), (0, react_jsx_runtime.jsxs)("select", {
+									className: "dsh-ig-input",
+									value: row.editSizeMode,
+									onChange: (event) => {
+										updateRow(provider, { editSizeMode: event.target.value === "selected" ? "selected" : "auto" });
+									},
+									disabled: !settingsWritable,
+									children: [(0, react_jsx_runtime.jsx)("option", {
+										value: "auto",
+										children: t("editSizeAuto")
+									}), (0, react_jsx_runtime.jsx)("option", {
+										value: "selected",
+										children: t("editSizeSelected")
+									})]
+								})]
+							}) : null, (0, react_jsx_runtime.jsxs)("label", {
 								className: "dsh-ig-field",
 								children: [
 									(0, react_jsx_runtime.jsx)("span", {
@@ -126759,7 +127261,7 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 										children: t("editExtraHint")
 									})
 								]
-							}) : null,
+							})] }) : null,
 							(0, react_jsx_runtime.jsxs)("div", {
 								className: "dsh-ig-row-actions",
 								children: [(0, react_jsx_runtime.jsx)("p", {
@@ -127535,7 +128037,10 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 				try {
 					const request = conversationRegenerateRequest(activeResult, regeneratePrompt, selectedRevision === void 0 ? void 0 : {
 						ratio: selectedRevision.ratio,
-						quality: selectedRevision.quality
+						quality: selectedRevision.quality,
+						resolution: selectedRevision.resolution,
+						generationQuality: selectedRevision.generationQuality,
+						watermark: selectedRevision.watermark
 					});
 					const response = await fetch(STUDIO_ROUTE, {
 						method: "POST",
@@ -127554,7 +128059,10 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 						output: payload.output,
 						createdAt: payload.createdAt,
 						ratio: request.ratio,
-						quality: request.quality
+						quality: request.quality,
+						...request.resolution === void 0 ? {} : { resolution: request.resolution },
+						...request.generationQuality === void 0 ? {} : { generationQuality: request.generationQuality },
+						...request.watermark === void 0 ? {} : { watermark: request.watermark }
 					};
 					const savedOk = await saveGalleryItem({
 						id: String(revision.attachment.attachmentId),
@@ -127565,6 +128073,9 @@ body[data-ds-dark-theme] .dsh-ig-workbench{--ig-danger:#f08c8c;--ig-warn:#e5b76a
 						createdAt: revision.createdAt,
 						aspectRatio: revision.ratio,
 						imageSize: revision.quality,
+						resolution: revision.resolution,
+						generationQuality: revision.generationQuality,
+						watermark: revision.watermark,
 						output: revision.output,
 						...savedTo ? { savedTo } : {},
 						...sessionId ? { sessionId } : {}