dsh-image-gen 0.4.1 → 0.5.0

package/lib/index.js

@@ -16,39 +16,6 @@ var __exportAll = (all, no_symbols) => {
 	return target;
 };
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-credential_07859f6f9ce036fd17600077e6a695b1/node_modules/@deepseek-ai/dsh-credentials/lib/index.js
-/**
-* Service Definition for the credential-reference capability seam (`ctx.credentials`). Settings and composition files carry
-* *references* to secrets — environment-variable names — while providers own
-* the actual values and their storage. Consumers resolve a reference once per
-* operation, so a changed credential reaches the next operation without any
-* plugin restart, and configuration surfaces describe a reference without
-* ever seeing its value.
-* @module @deepseek-ai/dsh-credentials
-*/
-const REF_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
-/**
-* Brand a raw string as a {@link CredentialRef}.
-* @param value - candidate reference; a POSIX shell identifier such as `DEEPSEEK_API_KEY`.
-* @returns the branded reference.
-*/
-function credentialRef(value) {
-	if (!isCredentialRefName(value)) throw new TypeError(`credential ref "${value}" must match ${String(REF_PATTERN)}`);
-	return value;
-}
-/**
-* Whether a raw string could name a reference at all. Consumers that receive
-* environment-variable names from somewhere else — a provider library's own
-* ambient discovery, a hook payload — ask this before resolving, because a name
-* outside the grammar has no reference to miss and should read as "not set"
-* rather than as a thrown error.
-* @param value - candidate reference.
-* @returns true when {@link credentialRef} would accept it.
-*/
-function isCredentialRefName(value) {
-	return REF_PATTERN.test(value);
-}
-//#endregion
 //#region node_modules/.pnpm/@deepseek-ai+dsh-util-value_e176751d487506fbf1ea91463d745d9b/node_modules/@deepseek-ai/dsh-util-values/lib/index.js
 /**
 * Compare JSON-compatible values structurally.
@@ -117,7 +84,7 @@ var lib_exports = /* @__PURE__ */ __exportAll({
 	SettingsConflictError: () => SettingsConflictError,
 	SettingsProvider: () => SettingsProvider,
 	default: () => SettingsProvider,
-	redactSecrets: () => redactSecrets
+	redactSecrets: () => redactSecrets$1
 });
 /**
 * Structural secret redaction for settings values. `role('secret')` fields are
@@ -181,7 +148,7 @@ function walk(node, value, path, secrets) {
 *   object-property secret slots still enumerated.
 * @returns the stripped detached value and the ordered secret positions.
 */
-function redactSecrets(schema, value) {
+function redactSecrets$1(schema, value) {
 	const secrets = [];
 	return {
 		value: walk(schema, value, [], secrets),
@@ -485,12 +452,12 @@ var SettingsProvider = class extends Service {
 			};
 			if (options?.redactSecrets !== true) return descriptor;
 			const schema = registration.schema;
-			const redacted = redactSecrets(schema, registration.resolved);
+			const redacted = redactSecrets$1(schema, registration.resolved);
 			return {
 				...descriptor,
 				value: redacted.value,
-				...base === void 0 ? {} : { base: redactSecrets(schema, base).value },
-				...detachedUser === void 0 ? {} : { user: redactSecrets(schema, detachedUser).value },
+				...base === void 0 ? {} : { base: redactSecrets$1(schema, base).value },
+				...detachedUser === void 0 ? {} : { user: redactSecrets$1(schema, detachedUser).value },
 				secrets: redacted.secrets
 			};
 		});
@@ -4872,28 +4839,82 @@ const STUDIO_ROUTE = "/plugins/dsh-image-gen/studio";
 const INSPIRATION_ROUTE = "/plugins/dsh-image-gen/inspiration";
 /** Browser route used for saving generated images to workspace on demand. */
 const SAVE_WORKSPACE_ROUTE = "/plugins/dsh-image-gen/save-workspace";
+/** Browser route the settings card probes provider connectivity through. */
+const TEST_CONNECTION_ROUTE = "/plugins/dsh-image-gen/test";
 /** Namespace persisted through DSH Settings. */
 const IMAGE_GENERATION_NAMESPACE = "image-generation";
 /** Supported providers. */
 const IMAGE_PROVIDERS = [
 	"google",
 	"openai",
+	"openai-compat",
 	"seedream",
 	"dashscope",
+	"xai",
+	"zhipu",
 	"comfyui"
 ];
 /** Providers supported by the first browser workbench release. */
 const CLOUD_IMAGE_PROVIDERS = [
 	"google",
 	"openai",
+	"openai-compat",
 	"seedream",
-	"dashscope"
+	"dashscope",
+	"xai",
+	"zhipu"
 ];
+/**
+* Credential references resolved through the DSH Credentials service (BYOK).
+* These are POSIX-style reference names, not environment variables: the host
+* layers the process environment and its managed store behind them, so a name
+* like OPENAI_API_KEY is shared with any other plugin resolving the same ref.
+*/
+const GOOGLE_API_KEY_ENV = "GEMINI_API_KEY";
+/** OpenAI Platform credential reference. */
+const OPENAI_API_KEY_ENV = "OPENAI_API_KEY";
+/**
+* OpenAI-compatible relay credential reference. Deliberately distinct from
+* OPENAI_API_KEY so an official key and a relay key can coexist without
+* overwriting each other.
+*/
+const OPENAI_COMPAT_API_KEY_ENV = "DSH_IMAGE_GEN_OPENAI_COMPAT_KEY";
+/** Volcengine Ark credential reference. */
+const SEEDREAM_API_KEY_ENV = "ARK_API_KEY";
+/** DashScope credential reference. */
+const DASHSCOPE_API_KEY_ENV = "DASHSCOPE_API_KEY";
+/** xAI credential reference; matches the official xAI SDK environment name. */
+const XAI_API_KEY_ENV = "XAI_API_KEY";
+/** Zhipu credential reference; matches the official Zhipu SDK environment name. */
+const ZHIPU_API_KEY_ENV = "ZHIPUAI_API_KEY";
+/** The credential reference each cloud provider's API key is stored under. */
+const CLOUD_CREDENTIAL_REFS = {
+	google: GOOGLE_API_KEY_ENV,
+	openai: OPENAI_API_KEY_ENV,
+	"openai-compat": OPENAI_COMPAT_API_KEY_ENV,
+	seedream: SEEDREAM_API_KEY_ENV,
+	dashscope: DASHSCOPE_API_KEY_ENV,
+	xai: XAI_API_KEY_ENV,
+	zhipu: ZHIPU_API_KEY_ENV
+};
+/** Locale-neutral provider names for user-facing errors and status lines. */
+const PROVIDER_DISPLAY_NAMES = {
+	google: "Google Gemini",
+	openai: "OpenAI",
+	"openai-compat": "OpenAI 兼容",
+	seedream: "Seedream",
+	dashscope: "DashScope",
+	xai: "xAI Grok",
+	zhipu: "智谱 GLM",
+	comfyui: "ComfyUI"
+};
 /** 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";
 const DEFAULT_SEEDREAM_BASE_URL = "https://ark.cn-beijing.volces.com/api/v3";
 const DEFAULT_DASHSCOPE_ENDPOINT = "https://dashscope.aliyuncs.com/api/v1";
+const DEFAULT_XAI_BASE_URL = "https://api.x.ai/v1";
+const DEFAULT_ZHIPU_BASE_URL = "https://open.bigmodel.cn/api/paas/v4";
 const DEFAULT_COMFYUI_BASE_URL = "http://127.0.0.1:8188";
 const DEFAULT_COMFYUI_TIMEOUT_MS = 3e5;
 const DEFAULT_COMFYUI_WORKFLOW_LABEL = "API workflow";
@@ -4902,6 +4923,8 @@ const DEFAULT_GOOGLE_MODEL = "gemini-3.1-flash-image";
 const DEFAULT_OPENAI_MODEL = "gpt-image-2";
 const DEFAULT_SEEDREAM_MODEL = "doubao-seedream-5-0-260128";
 const DEFAULT_DASHSCOPE_MODEL = "qwen-image-3.0";
+const DEFAULT_XAI_MODEL = "grok-imagine-image";
+const DEFAULT_ZHIPU_MODEL = "glm-image";
 /** Named workflows, falling back to the legacy single-workflow fields when the list is empty. */
 function resolveComfyUIWorkflows(source) {
 	const named = [];
@@ -4953,14 +4976,6 @@ function mergeComfyUIPrompt(preset, user) {
 /** User-facing configuration for supported image providers. */
 /** Default workspace subfolder that receives generated image files. */
 const DEFAULT_WORKSPACE_FOLDER = "dsh-image-gen";
-/** Google API credential reference. */
-const GOOGLE_API_KEY_ENV = "GEMINI_API_KEY";
-/** OpenAI Platform or compatible relay credential reference. */
-const OPENAI_API_KEY_ENV = "OPENAI_API_KEY";
-/** Volcengine Ark credential reference. */
-const SEEDREAM_API_KEY_ENV = "ARK_API_KEY";
-/** DashScope credential reference. */
-const DASHSCOPE_API_KEY_ENV = "DASHSCOPE_API_KEY";
 /** Google tool-level controls. */
 const ASPECT_RATIOS = [
 	"1:1",
@@ -4983,10 +4998,16 @@ const Config = z.object({
 	googleEndpoint: z.string().default(DEFAULT_GOOGLE_ENDPOINT),
 	openaiBaseURL: z.string().default(DEFAULT_OPENAI_BASE_URL),
 	openaiModel: z.string().default(DEFAULT_OPENAI_MODEL),
+	openaiCompatBaseURL: z.string().default(""),
+	openaiCompatModel: z.string().default(""),
 	seedreamBaseURL: z.string().default(DEFAULT_SEEDREAM_BASE_URL),
 	seedreamModel: z.string().default(DEFAULT_SEEDREAM_MODEL),
 	dashscopeEndpoint: z.string().default(DEFAULT_DASHSCOPE_ENDPOINT),
 	dashscopeModel: z.string().default(DEFAULT_DASHSCOPE_MODEL),
+	xaiBaseURL: z.string().default(DEFAULT_XAI_BASE_URL),
+	xaiModel: z.string().default(DEFAULT_XAI_MODEL),
+	zhipuBaseURL: z.string().default(DEFAULT_ZHIPU_BASE_URL),
+	zhipuModel: z.string().default(DEFAULT_ZHIPU_MODEL),
 	comfyuiBaseURL: z.string().default(DEFAULT_COMFYUI_BASE_URL),
 	comfyuiWorkflows: z.array(z.object({
 		name: z.string(),
@@ -5010,6 +5031,19 @@ function resolveProvider(config) {
 			baseURL: config.openaiBaseURL ?? "https://api.openai.com/v1",
 			imageSize: "1024x1024"
 		};
+		case "openai-compat": {
+			const baseURL = config.openaiCompatBaseURL?.trim();
+			if (baseURL === void 0 || baseURL.length === 0) throw new Error("OpenAI 兼容 provider requires a base URL; set it in Settings > Plugins > Image generation.");
+			const model = config.openaiCompatModel?.trim();
+			if (model === void 0 || model.length === 0) throw new Error("OpenAI 兼容 provider requires a model name; set it in Settings > Plugins > Image generation.");
+			return {
+				provider: "openai-compat",
+				apiKeyEnv: OPENAI_COMPAT_API_KEY_ENV,
+				model,
+				baseURL,
+				imageSize: "1024x1024"
+			};
+		}
 		case "seedream": return {
 			provider: "seedream",
 			apiKeyEnv: SEEDREAM_API_KEY_ENV,
@@ -5024,6 +5058,20 @@ function resolveProvider(config) {
 			endpoint: config.dashscopeEndpoint ?? "https://dashscope.aliyuncs.com/api/v1",
 			imageSize: "1024*1024"
 		};
+		case "xai": return {
+			provider: "xai",
+			apiKeyEnv: XAI_API_KEY_ENV,
+			model: config.xaiModel ?? "grok-imagine-image",
+			baseURL: config.xaiBaseURL ?? "https://api.x.ai/v1",
+			imageSize: "1024x1024"
+		};
+		case "zhipu": return {
+			provider: "zhipu",
+			apiKeyEnv: ZHIPU_API_KEY_ENV,
+			model: config.zhipuModel ?? "glm-image",
+			baseURL: config.zhipuBaseURL ?? "https://open.bigmodel.cn/api/paas/v4",
+			imageSize: "1024x1024"
+		};
 		case "comfyui": {
 			const workflows = resolveComfyUIWorkflows(config);
 			const workflow = activeComfyUIWorkflow(config);
@@ -5045,6 +5093,78 @@ function resolveProvider(config) {
 		};
 	}
 }
+/**
+* Apply a per-call provider and/or model override on top of the saved config.
+* `model` is ignored for ComfyUI, whose per-call equivalent is `workflow`.
+*/
+function withProviderOverrides(config, provider, model) {
+	const base = provider === void 0 ? { ...config } : {
+		...config,
+		provider
+	};
+	if (model === void 0) return base;
+	const trimmed = model.trim();
+	if (trimmed.length === 0) return base;
+	switch (base.provider ?? "google") {
+		case "google": return {
+			...base,
+			googleModel: trimmed
+		};
+		case "openai": return {
+			...base,
+			openaiModel: trimmed
+		};
+		case "openai-compat": return {
+			...base,
+			openaiCompatModel: trimmed
+		};
+		case "seedream": return {
+			...base,
+			seedreamModel: trimmed
+		};
+		case "dashscope": return {
+			...base,
+			dashscopeModel: trimmed
+		};
+		case "xai": return {
+			...base,
+			xaiModel: trimmed
+		};
+		case "zhipu": return {
+			...base,
+			zhipuModel: trimmed
+		};
+		case "comfyui": return base;
+	}
+}
+/**
+* One-time migration: when the legacy single OpenAI slot points at a relay
+* (non-official base URL) and the compat row is empty, move the relay config
+* to the compat row so both can coexist. Returns the input untouched when
+* nothing needs moving.
+*/
+function migrateOpenAICompatConfig(config) {
+	const legacyBase = config.openaiBaseURL?.trim() ?? "";
+	if (legacyBase.length === 0 || legacyBase === "https://api.openai.com/v1") return config;
+	if (hostOf(legacyBase) === "api.openai.com") return config;
+	if ((config.openaiCompatBaseURL?.trim() ?? "").length > 0) return config;
+	const compatModel = config.openaiCompatModel?.trim() ?? "";
+	return {
+		...config,
+		openaiCompatBaseURL: legacyBase,
+		...compatModel.length > 0 ? {} : { openaiCompatModel: config.openaiModel },
+		openaiBaseURL: DEFAULT_OPENAI_BASE_URL,
+		...config.provider === "openai" ? { provider: "openai-compat" } : {}
+	};
+}
+/** Host part of a URL, or null when it cannot be parsed. */
+function hostOf(raw) {
+	try {
+		return new URL(raw).host;
+	} catch {
+		return null;
+	}
+}
 /** The workflow a ComfyUI call runs: the requested name when given, else the active one. */
 function selectComfyUIWorkflow(active, requested) {
 	if (active.workflow === void 0) throw new Error("ComfyUI image generation requires an imported workflow; import one in Settings > Plugins > Image generation.");
@@ -5055,6 +5175,62 @@ function selectComfyUIWorkflow(active, requested) {
 	return workflow;
 }
 //#endregion
+//#region node_modules/.pnpm/@deepseek-ai+dsh-credential_07859f6f9ce036fd17600077e6a695b1/node_modules/@deepseek-ai/dsh-credentials/lib/index.js
+/**
+* Service Definition for the credential-reference capability seam (`ctx.credentials`). Settings and composition files carry
+* *references* to secrets — environment-variable names — while providers own
+* the actual values and their storage. Consumers resolve a reference once per
+* operation, so a changed credential reaches the next operation without any
+* plugin restart, and configuration surfaces describe a reference without
+* ever seeing its value.
+* @module @deepseek-ai/dsh-credentials
+*/
+const REF_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+/**
+* Brand a raw string as a {@link CredentialRef}.
+* @param value - candidate reference; a POSIX shell identifier such as `DEEPSEEK_API_KEY`.
+* @returns the branded reference.
+*/
+function credentialRef(value) {
+	if (!isCredentialRefName(value)) throw new TypeError(`credential ref "${value}" must match ${String(REF_PATTERN)}`);
+	return value;
+}
+/**
+* Whether a raw string could name a reference at all. Consumers that receive
+* environment-variable names from somewhere else — a provider library's own
+* ambient discovery, a hook payload — ask this before resolving, because a name
+* outside the grammar has no reference to miss and should read as "not set"
+* rather than as a thrown error.
+* @param value - candidate reference.
+* @returns true when {@link credentialRef} would accept it.
+*/
+function isCredentialRefName(value) {
+	return REF_PATTERN.test(value);
+}
+//#endregion
+//#region lib/types/credentials.js
+/** Shared BYOK credential resolution for the Agent tools and the Studio route. */
+/**
+* Resolve one provider's stored API key to a non-blank value. Blank values
+* never count as configured: the host treats an empty stored value as absent,
+* and a whitespace-only key is never sent to a provider.
+*/
+async function resolveApiKey(ctx, provider) {
+	const value = (await ctx.credentials.resolve(credentialRef(CLOUD_CREDENTIAL_REFS[provider])))?.value.trim() ?? "";
+	return value.length > 0 ? value : void 0;
+}
+/**
+* Resolve one provider's API key or fail with a user-facing message that says
+* where to configure it. Passing `tool` selects the Agent-facing English
+* wording; without it the message is the browser-facing Chinese one used by
+* the Studio route.
+*/
+async function requireApiKey(ctx, provider, tool) {
+	const value = await resolveApiKey(ctx, provider);
+	if (value !== void 0) return value;
+	throw new Error(tool === void 0 ? `${PROVIDER_DISPLAY_NAMES[provider]} 尚未配置 API Key，请先到 设置 > 插件 > 图像生成 配置` : `${tool} requires the ${PROVIDER_DISPLAY_NAMES[provider]} API key; configure it in Settings > Plugins > Image generation.`);
+}
+//#endregion
 //#region lib/types/comfyui-workflow.js
 /** Pure ComfyUI API-workflow validation and placeholder injection. */
 const COMFYUI_PROMPT_PLACEHOLDER = "{{prompt}}";
@@ -5095,8 +5271,8 @@ function prepareComfyUIWorkflow(workflowJson, prompt, seed = randomSeed(), image
 	};
 	let imageInputs = 0;
 	const prepared = Object.fromEntries(Object.entries(workflow).map(([nodeId, value]) => {
-		const node = record$6(value);
-		const inputs = node === void 0 ? void 0 : record$6(node.inputs);
+		const node = record$7(value);
+		const inputs = node === void 0 ? void 0 : record$7(node.inputs);
 		if (inputs === void 0) return [nodeId, value];
 		const nextInputs = inject(inputs);
 		if (isImagePlaceholder(nextInputs[IMAGE_INPUT_KEY])) {
@@ -5132,7 +5308,7 @@ function parseWorkflow(workflowJson) {
 	}
 	if (!isRecord(value) || Object.keys(value).length === 0) throw new Error("ComfyUI workflow must be a non-empty API-format JSON object");
 	if (!Object.values(value).some((node) => {
-		const inputs = record$6(node)?.inputs;
+		const inputs = record$7(node)?.inputs;
 		return inputs !== void 0 && containsPromptPlaceholder(inputs);
 	})) throw new Error(`ComfyUI workflow must contain ${COMFYUI_PROMPT_PLACEHOLDER} (or ${LEGACY_PROMPT_PLACEHOLDER}) in a text input`);
 	return value;
@@ -5148,10 +5324,36 @@ function containsPromptPlaceholder(value) {
 function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function record$6(value) {
+function record$7(value) {
 	return isRecord(value) ? value : void 0;
 }
 //#endregion
+//#region lib/types/redact.js
+/**
+* Redact secret-shaped content from provider error messages.
+*
+* Error bodies from providers and relays surface in the conversation and in
+* the settings UI. A relay may echo request headers — including the API key —
+* inside its error body, so every adapter passes response text through here
+* before embedding it in a thrown error, and also passes the live key so its
+* exact value cannot survive even in non-standard formats.
+*/
+const REDACTED = "[REDACTED]";
+const KEY_SHAPED_PATTERNS = [
+	/\bsk-[A-Za-z0-9_-]{8,}/g,
+	/\bAIza[A-Za-z0-9_-]{10,}/g,
+	/\bBearer\s+[A-Za-z0-9._~+/=-]{8,}/gi,
+	/\b(?:api[_-]?key|apikey|token|secret)["']?\s*[:=]\s*["']?[A-Za-z0-9._~+/=-]{8,}/gi,
+	/\b(?:api[_-]?key|apikey|token|secret)\s*["'][A-Za-z0-9._~+/=-]{8,}["']/gi
+];
+/** Replace every occurrence of a known secret plus key-shaped values. */
+function redactSecrets(text, ...secrets) {
+	let redacted = text;
+	for (const secret of secrets) if (secret !== void 0 && secret.length >= 8) redacted = redacted.split(secret).join(REDACTED);
+	for (const pattern of KEY_SHAPED_PATTERNS) redacted = redacted.replace(pattern, REDACTED);
+	return redacted;
+}
+//#endregion
 //#region lib/types/comfyui.js
 const ERROR_LIMIT$3 = 4096;
 const POLL_INTERVAL_MS = 500;
@@ -5217,9 +5419,9 @@ async function uploadSourceImage(baseURL, image, signal) {
 		body: form
 	});
 	const text = await readBoundedText$3(response, ERROR_LIMIT$3);
-	if (!response.ok) throw new Error(`ComfyUI image upload failed (${response.status}): ${text}`);
+	if (!response.ok) throw new Error(`ComfyUI image upload failed (${response.status}): ${redactSecrets(text)}`);
 	const payload = parseJsonRecord(text, "ComfyUI /upload/image returned invalid JSON");
-	if (typeof payload.name !== "string" || payload.name.length === 0) throw new Error(`ComfyUI /upload/image returned no name: ${text}`);
+	if (typeof payload.name !== "string" || payload.name.length === 0) throw new Error(`ComfyUI /upload/image returned no name: ${redactSecrets(text)}`);
 	const subfolder = typeof payload.subfolder === "string" ? payload.subfolder : "";
 	return subfolder.length > 0 ? `${subfolder}/${payload.name}` : payload.name;
 }
@@ -5241,9 +5443,9 @@ async function submitWorkflow(baseURL, workflow, signal) {
 		body: JSON.stringify({ prompt: workflow })
 	});
 	const text = await readBoundedText$3(response, ERROR_LIMIT$3);
-	if (!response.ok) throw new Error(`ComfyUI rejected the workflow (${response.status}): ${text}`);
+	if (!response.ok) throw new Error(`ComfyUI rejected the workflow (${response.status}): ${redactSecrets(text)}`);
 	const payload = parseJsonRecord(text, "ComfyUI /prompt returned invalid JSON");
-	if (typeof payload.prompt_id !== "string" || payload.prompt_id.length === 0) throw new Error(`ComfyUI /prompt returned no prompt_id: ${text}`);
+	if (typeof payload.prompt_id !== "string" || payload.prompt_id.length === 0) throw new Error(`ComfyUI /prompt returned no prompt_id: ${redactSecrets(text)}`);
 	return payload.prompt_id;
 }
 async function waitForOutput(baseURL, promptId, signal) {
@@ -5255,11 +5457,11 @@ async function waitForOutput(baseURL, promptId, signal) {
 			headers: { accept: "application/json" }
 		});
 		const text = await readBoundedText$3(response, MAX_HISTORY_BYTES);
-		if (!response.ok) throw new Error(`ComfyUI history request failed (${response.status}): ${text.slice(0, ERROR_LIMIT$3)}`);
-		const entry = record$5(parseJsonRecord(text, "ComfyUI history returned invalid JSON")[promptId]);
+		if (!response.ok) throw new Error(`ComfyUI history request failed (${response.status}): ${redactSecrets(text).slice(0, ERROR_LIMIT$3)}`);
+		const entry = record$6(parseJsonRecord(text, "ComfyUI history returned invalid JSON")[promptId]);
 		if (entry !== void 0) {
-			const status = record$5(entry.status);
-			if (status?.status_str === "error") throw new Error(`ComfyUI workflow failed: ${JSON.stringify(status.messages ?? status).slice(0, ERROR_LIMIT$3)}`);
+			const status = record$6(entry.status);
+			if (status?.status_str === "error") throw new Error(`ComfyUI workflow failed: ${redactSecrets(JSON.stringify(status.messages ?? status)).slice(0, ERROR_LIMIT$3)}`);
 			const output = firstOutputImage(entry.outputs);
 			if (output !== void 0) return output;
 			if (status?.completed === true) throw new Error("ComfyUI workflow completed without an output image");
@@ -5268,13 +5470,13 @@ async function waitForOutput(baseURL, promptId, signal) {
 	}
 }
 function firstOutputImage(value) {
-	const outputs = record$5(value);
+	const outputs = record$6(value);
 	if (outputs === void 0) return void 0;
 	for (const nodeOutput of Object.values(outputs)) {
-		const images = record$5(nodeOutput)?.images;
+		const images = record$6(nodeOutput)?.images;
 		if (!Array.isArray(images)) continue;
 		for (const image of images) {
-			const item = record$5(image);
+			const item = record$6(image);
 			if (typeof item?.filename !== "string" || item.filename.length === 0) continue;
 			const output = {
 				filename: item.filename,
@@ -5315,7 +5517,7 @@ function comfyUIBaseURL(value) {
 function endpoint(baseURL, path) {
 	return new URL(path, baseURL);
 }
-function record$5(value) {
+function record$6(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 }
 function parseJsonRecord(text, message) {
@@ -5325,7 +5527,7 @@ function parseJsonRecord(text, message) {
 	} catch {
 		throw new Error(message);
 	}
-	const parsed = record$5(value);
+	const parsed = record$6(value);
 	if (parsed === void 0) throw new Error(message);
 	return parsed;
 }
@@ -5441,12 +5643,12 @@ async function requestQwenImage(options) {
 		body: JSON.stringify(options.requestBody)
 	});
 	if (!response.ok) {
-		const errorText = await response.text();
+		const errorText = redactSecrets(await response.text(), options.apiKey);
 		throw new Error(`DashScope image ${options.operation} failed (${String(response.status)}): ${errorText}`);
 	}
 	const payload = await response.json();
 	const imageUrl = extractImageUrl(payload);
-	if (imageUrl === void 0) throw new Error(`DashScope image ${options.operation} returned no image URL: ${payload.message ?? JSON.stringify(payload)}`);
+	if (imageUrl === void 0) throw new Error(`DashScope image ${options.operation} returned no image URL: ${redactSecrets(payload.message ?? JSON.stringify(payload), options.apiKey)}`);
 	return downloadImageBlob(imageUrl, options);
 }
 function extractImageUrl(response) {
@@ -5531,7 +5733,7 @@ async function requestGoogleImage(input) {
 		})
 	});
 	const text = await readBoundedText$2(response, Math.ceil(input.maxBytes * 1.4) + ERROR_LIMIT$2, label);
-	if (!response.ok) throw new Error(`${label} failed (${response.status}): ${text.slice(0, ERROR_LIMIT$2)}`);
+	if (!response.ok) throw new Error(`${label} failed (${response.status}): ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT$2)}`);
 	let payload;
 	try {
 		payload = JSON.parse(text);
@@ -5539,7 +5741,7 @@ async function requestGoogleImage(input) {
 		throw new Error(`${label} returned invalid JSON`);
 	}
 	const image = outputImage(payload);
-	if (image === void 0) throw new Error(`${label} returned no image: ${text.slice(0, ERROR_LIMIT$2)}`);
+	if (image === void 0) throw new Error(`${label} returned no image: ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT$2)}`);
 	const mediaType = mediaTypeOf(image.mime_type ?? REQUESTED_MEDIA_TYPE);
 	if (mediaType === void 0) throw new Error(`${label} returned unsupported media type ${JSON.stringify(image.mime_type)}`);
 	const data = decodeBase64$2(image.data, label);
@@ -5550,13 +5752,13 @@ async function requestGoogleImage(input) {
 	};
 }
 function outputImage(value) {
-	const interaction = record$4(value);
+	const interaction = record$5(value);
 	if (interaction === void 0) return void 0;
 	const direct = imageContent(interaction.output_image, false);
 	if (direct !== void 0) return direct;
 	if (!Array.isArray(interaction.steps)) return void 0;
 	for (const step of interaction.steps) {
-		const modelOutput = record$4(step);
+		const modelOutput = record$5(step);
 		if (modelOutput?.type !== "model_output" || !Array.isArray(modelOutput.content)) continue;
 		for (const content of modelOutput.content) {
 			const image = imageContent(content, true);
@@ -5565,14 +5767,14 @@ function outputImage(value) {
 	}
 }
 function imageContent(value, requiresImageType) {
-	const image = record$4(value);
+	const image = record$5(value);
 	if (image === void 0 || requiresImageType && image.type !== "image" || typeof image.data !== "string") return void 0;
 	return {
 		data: image.data,
 		mime_type: image.mime_type
 	};
 }
-function record$4(value) {
+function record$5(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 }
 function mediaTypeOf(value) {
@@ -5716,7 +5918,7 @@ function findReferenceImage(messages, sourceAttachmentId) {
 }
 /** Validate an untrusted serialized image reference at an HTTP/UI boundary. */
 function parseImageAttachmentRef(value) {
-	const ref = record$3(value);
+	const ref = record$4(value);
 	if (ref === void 0) return void 0;
 	if (typeof ref.attachmentId !== "string" || !imageMediaType$3(ref.mediaType)) return void 0;
 	if (!nonNegativeInteger(ref.bytes) || !positiveInteger(ref.width) || !positiveInteger(ref.height)) return void 0;
@@ -5748,7 +5950,7 @@ function findInBlocks(blocks, sourceAttachmentId) {
 	}
 }
 function parseDimensions(value) {
-	const dimensions = record$3(value);
+	const dimensions = record$4(value);
 	if (dimensions === void 0 || !positiveInteger(dimensions.width) || !positiveInteger(dimensions.height)) return void 0;
 	return {
 		width: dimensions.width,
@@ -5820,7 +6022,7 @@ function positiveInteger(value) {
 function nonNegativeInteger(value) {
 	return typeof value === "number" && Number.isInteger(value) && value >= 0;
 }
-function record$3(value) {
+function record$4(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 }
 //#endregion
@@ -6049,22 +6251,22 @@ async function deleteImageFromWorkspace(filePath, allowedWorkspaceRoots) {
 }
 //#endregion
 //#region lib/types/image-route.js
-const MAX_BODY_BYTES = 65536;
+const MAX_BODY_BYTES$1 = 65536;
 /** Serve one verified durable image reference to a same-origin browser request. */
 async function serveImage(req, res, deps) {
-	if (req.method !== "POST") return jsonError$2(res, 405, "method-not-allowed");
-	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError$2(res, 415, "json-required");
+	if (req.method !== "POST") return jsonError$3(res, 405, "method-not-allowed");
+	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError$3(res, 415, "json-required");
 	const origin = req.headers.origin;
 	const host = req.headers.host;
-	if (origin !== void 0 && host !== void 0 && origin !== `http://${host}` && origin !== `https://${host}`) return jsonError$2(res, 403, "origin-rejected");
+	if (origin !== void 0 && host !== void 0 && origin !== `http://${host}` && origin !== `https://${host}`) return jsonError$3(res, 403, "origin-rejected");
 	let body;
 	try {
-		body = JSON.parse(await readBody$1(req));
+		body = JSON.parse(await readBody$2(req));
 	} catch {
-		return jsonError$2(res, 400, "invalid-request");
+		return jsonError$3(res, 400, "invalid-request");
 	}
 	const attachment = attachmentFromRequest(body);
-	if (attachment === void 0) return jsonError$2(res, 400, "invalid-attachment");
+	if (attachment === void 0) return jsonError$3(res, 400, "invalid-attachment");
 	try {
 		const stored = await deps.readImage(attachment);
 		res.writeHead(200, {
@@ -6075,10 +6277,10 @@ async function serveImage(req, res, deps) {
 		});
 		res.end(stored.data);
 	} catch {
-		jsonError$2(res, 404, "image-unavailable");
+		jsonError$3(res, 404, "image-unavailable");
 	}
 }
-function sameOrigin$2(req) {
+function sameOrigin$3(req) {
 	const origin = req.headers.origin;
 	const host = req.headers.host;
 	if (origin !== void 0 && host !== void 0 && origin !== `http://${host}` && origin !== `https://${host}`) return false;
@@ -6086,14 +6288,14 @@ function sameOrigin$2(req) {
 }
 /** Safely delete one or more generated image files from the workspace disk. */
 async function serveDelete(req, res, deps) {
-	if (req.method !== "POST") return jsonError$2(res, 405, "method-not-allowed");
-	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError$2(res, 415, "json-required");
-	if (!sameOrigin$2(req)) return jsonError$2(res, 403, "origin-rejected");
+	if (req.method !== "POST") return jsonError$3(res, 405, "method-not-allowed");
+	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError$3(res, 415, "json-required");
+	if (!sameOrigin$3(req)) return jsonError$3(res, 403, "origin-rejected");
 	let body;
 	try {
-		body = JSON.parse(await readBody$1(req));
+		body = JSON.parse(await readBody$2(req));
 	} catch {
-		return jsonError$2(res, 400, "invalid-request");
+		return jsonError$3(res, 400, "invalid-request");
 	}
 	const rawPaths = typeof body === "object" && body !== null && "paths" in body && Array.isArray(body.paths) ? body.paths : [];
 	const deletedFiles = [];
@@ -6123,13 +6325,13 @@ async function serveDelete(req, res, deps) {
 }
 /** Serve on-demand image persistence into the workspace. */
 async function serveSaveWorkspace(req, res, deps) {
-	if (!sameOrigin$2(req)) return jsonError$2(res, 403, "origin-rejected");
-	if (req.method !== "POST") return jsonError$2(res, 405, "method-not-allowed");
-	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError$2(res, 415, "json-required");
+	if (!sameOrigin$3(req)) return jsonError$3(res, 403, "origin-rejected");
+	if (req.method !== "POST") return jsonError$3(res, 405, "method-not-allowed");
+	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError$3(res, 415, "json-required");
 	try {
-		const raw = JSON.parse(await readBody$1(req));
+		const raw = JSON.parse(await readBody$2(req));
 		const attachment = parseImageAttachmentRef(raw.attachment);
-		if (!attachment) return jsonError$2(res, 400, "invalid-attachment");
+		if (!attachment) return jsonError$3(res, 400, "invalid-attachment");
 		if (!deps.isSaveEnabled()) {
 			res.writeHead(200, {
 				"content-type": "application/json",
@@ -6147,10 +6349,10 @@ async function serveSaveWorkspace(req, res, deps) {
 		try {
 			targetRoot = await assertWorkspaceAllowed(rawTarget, allowedRoots);
 		} catch {
-			return jsonError$2(res, 403, "workspace-root-not-allowed");
+			return jsonError$3(res, 403, "workspace-root-not-allowed");
 		}
 		const stored = await deps.readImage(attachment);
-		if (!stored || !stored.data) return jsonError$2(res, 404, "image-not-found");
+		if (!stored || !stored.data) return jsonError$3(res, 404, "image-not-found");
 		const savedTo = await deps.saveToWorkspace({
 			workspaceRoot: targetRoot,
 			attachmentId: String(attachment.attachmentId),
@@ -6178,28 +6380,28 @@ async function serveSaveWorkspace(req, res, deps) {
 }
 /** Validate the persisted reference carried by a tool presentation. */
 function imageAttachmentFromMeta(meta) {
-	const value = record$2(meta);
+	const value = record$3(meta);
 	if (value?.kind !== "dsh-image-gen") return void 0;
 	return parseImageAttachmentRef(value.attachment);
 }
 function attachmentFromRequest(value) {
-	return parseImageAttachmentRef(record$2(value)?.attachment);
+	return parseImageAttachmentRef(record$3(value)?.attachment);
 }
-function record$2(value) {
+function record$3(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 }
-async function readBody$1(req) {
+async function readBody$2(req) {
 	const chunks = [];
 	let bytes = 0;
 	for await (const chunk of req) {
 		const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
 		bytes += buffer.byteLength;
-		if (bytes > MAX_BODY_BYTES) throw new Error("request too large");
+		if (bytes > MAX_BODY_BYTES$1) throw new Error("request too large");
 		chunks.push(buffer);
 	}
 	return Buffer.concat(chunks).toString("utf8");
 }
-function jsonError$2(res, status, code) {
+function jsonError$3(res, status, code) {
 	res.writeHead(status, {
 		"content-type": "application/json",
 		"cache-control": "no-store"
@@ -6248,7 +6450,7 @@ async function editOpenAICompatibleImage(input) {
 }
 async function parseImageResponse(response, provider, input) {
 	const text = await readBoundedText$1(response, Math.ceil(input.maxBytes * 1.4) + ERROR_LIMIT$1);
-	if (!response.ok) throw new Error(`${provider} image request failed (${response.status}): ${text.slice(0, ERROR_LIMIT$1)}`);
+	if (!response.ok) throw new Error(`${provider} image request failed (${response.status}): ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT$1)}`);
 	let payload;
 	try {
 		payload = JSON.parse(text);
@@ -6256,7 +6458,7 @@ async function parseImageResponse(response, provider, input) {
 		throw new Error(`${provider} image request returned invalid JSON`);
 	}
 	const image = firstImage$1(payload);
-	if (image === void 0) throw new Error(`${provider} image request returned no image: ${text.slice(0, ERROR_LIMIT$1)}`);
+	if (image === void 0) throw new Error(`${provider} image request returned no image: ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT$1)}`);
 	if (image.b64_json !== void 0) return {
 		data: decodeBase64$1(image.b64_json, provider),
 		mediaType: imageMediaType$2(image.mime_type) ?? "image/png"
@@ -6385,7 +6587,7 @@ async function editSeedreamImage(input) {
 		})
 	});
 	const text = await readBoundedText(response, Math.ceil(input.maxBytes * 1.4) + ERROR_LIMIT);
-	if (!response.ok) throw new Error(`seedream image editing failed (${response.status}): ${text.slice(0, ERROR_LIMIT)}`);
+	if (!response.ok) throw new Error(`seedream image editing failed (${response.status}): ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT)}`);
 	let payload;
 	try {
 		payload = JSON.parse(text);
@@ -6393,7 +6595,7 @@ async function editSeedreamImage(input) {
 		throw new Error("seedream image editing returned invalid JSON");
 	}
 	const image = firstImage(payload);
-	if (image === void 0) throw new Error(`seedream image editing returned no image: ${text.slice(0, ERROR_LIMIT)}`);
+	if (image === void 0) throw new Error(`seedream image editing returned no image: ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT)}`);
 	if (image.b64_json !== void 0) return {
 		data: decodeBase64(image.b64_json),
 		mediaType: imageMediaType$1(image.mime_type) ?? "image/png"
@@ -16978,13 +17180,13 @@ const INSPIRATION_SOURCE_UPDATED_AT = "2026-08-28T10:24:55Z";
 const INSPIRATION_SOURCE_IMAGE_MIRROR = "https://gpt-image2.canghe.ai";
 /** Parse the upstream snapshot defensively before it becomes application data. */
 function parseInspirationSnapshot(value, version = INSPIRATION_SOURCE_VERSION, updatedAt = INSPIRATION_SOURCE_UPDATED_AT) {
-	const document = record$1(value);
+	const document = record$2(value);
 	const cases = Array.isArray(document?.cases) ? document.cases : [];
 	if (cases.length === 0 || cases.length > 2e3) throw new Error("素材索引案例数量无效");
 	const seen = /* @__PURE__ */ new Set();
 	const parsedCases = [];
 	for (const candidate of cases) {
-		const entry = record$1(candidate);
+		const entry = record$2(candidate);
 		const id = String(entry?.id ?? "").trim();
 		const title = text(entry?.title, 240);
 		const prompt = text(entry?.prompt, 8e3);
@@ -17037,7 +17239,7 @@ function findInspirationCase(catalog, sourceId, caseId) {
 	return catalog.sources.find((candidate) => candidate.id === sourceId)?.cases.find((candidate) => candidate.id === caseId);
 }
 const BUNDLED_INSPIRATION_CATALOG = parseInspirationSnapshot(awesome_gpt_image_2_default);
-function record$1(value) {
+function record$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 }
 function text(value, maxLength) {
@@ -17094,24 +17296,24 @@ function createInspirationRoute(deps = {}) {
 	let activeCatalog = BUNDLED_INSPIRATION_CATALOG;
 	let triedRefreshForUnknownCase = false;
 	return async function serveInspiration(req, res) {
-		if (!sameOrigin$1(req)) return jsonError$1(res, 403, "origin-rejected");
+		if (!sameOrigin$2(req)) return jsonError$2(res, 403, "origin-rejected");
 		const url = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
-		if (req.method === "GET" && url.pathname === "/catalog") return json$1(res, 200, publicInspirationCatalog(activeCatalog));
+		if (req.method === "GET" && url.pathname === "/catalog") return json$2(res, 200, publicInspirationCatalog(activeCatalog));
 		if (req.method === "POST" && url.pathname === "/refresh") try {
 			activeCatalog = await fetchSnapshot(request);
-			return json$1(res, 200, publicInspirationCatalog(activeCatalog));
+			return json$2(res, 200, publicInspirationCatalog(activeCatalog));
 		} catch (error) {
-			return jsonError$1(res, 502, message(error, "refresh-failed"));
+			return jsonError$2(res, 502, message(error, "refresh-failed"));
 		}
 		if (req.method === "POST" && url.pathname === "/cache/clear") {
 			diskCacheEpoch += 1;
 			await clearDiskCache();
-			return json$1(res, 200, { ok: true });
+			return json$2(res, 200, { ok: true });
 		}
 		const match = /^\/image\/([a-z0-9-]{1,80})\/([a-zA-Z0-9_-]{1,120})$/u.exec(url.pathname);
-		if (req.method !== "GET" || match === null) return jsonError$1(res, 404, "not-found");
+		if (req.method !== "GET" || match === null) return jsonError$2(res, 404, "not-found");
 		const [, sourceId, caseId] = match;
-		if (sourceId !== "awesome-gpt-image-2" || caseId === void 0) return jsonError$1(res, 404, "source-not-found");
+		if (sourceId !== "awesome-gpt-image-2" || caseId === void 0) return jsonError$2(res, 404, "source-not-found");
 		let item = findInspirationCase(activeCatalog, sourceId, caseId);
 		if (item === void 0 && !triedRefreshForUnknownCase) {
 			triedRefreshForUnknownCase = true;
@@ -17120,7 +17322,7 @@ function createInspirationRoute(deps = {}) {
 				item = findInspirationCase(activeCatalog, sourceId, caseId);
 			} catch {}
 		}
-		if (item === void 0) return jsonError$1(res, 404, "case-not-found");
+		if (item === void 0) return jsonError$2(res, 404, "case-not-found");
 		const cacheKey = `${sourceId}_${caseId}`;
 		const requestEpoch = diskCacheEpoch;
 		const cached = await readImageCache(cacheKey);
@@ -17162,7 +17364,7 @@ function createInspirationRoute(deps = {}) {
 			res.end(body);
 			return;
 		} catch {}
-		jsonError$1(res, 502, "source-image-unavailable");
+		jsonError$2(res, 502, "source-image-unavailable");
 	};
 }
 /**
@@ -17237,7 +17439,7 @@ function imageUrls(version, imagePath) {
 		`${REMOTE_RAW}/${commit}/data${imagePath}`
 	];
 }
-function sameOrigin$1(req) {
+function sameOrigin$2(req) {
 	const origin = req.headers.origin;
 	const host = req.headers.host;
 	return origin === void 0 || host === void 0 || origin === `http://${host}` || origin === `https://${host}`;
@@ -17245,7 +17447,7 @@ function sameOrigin$1(req) {
 function message(error, fallback) {
 	return error instanceof Error && error.message.trim() ? error.message : fallback;
 }
-function json$1(res, status, value) {
+function json$2(res, status, value) {
 	if (res.headersSent || res.writableEnded || res.destroyed) return;
 	res.writeHead(status, {
 		"content-type": "application/json; charset=utf-8",
@@ -17254,8 +17456,8 @@ function json$1(res, status, value) {
 	});
 	res.end(JSON.stringify(value));
 }
-function jsonError$1(res, status, error) {
-	json$1(res, status, { error });
+function jsonError$2(res, status, error) {
+	json$2(res, status, { error });
 }
 const MIME_TO_EXT = {
 	"image/jpeg": ".jpg",
@@ -17353,18 +17555,6 @@ async function clearDiskCache() {
 }
 //#endregion
 //#region lib/types/studio.js
-const PROVIDER_LABELS = {
-	google: "Google",
-	openai: "OpenAI",
-	seedream: "Seedream",
-	dashscope: "DashScope"
-};
-const CREDENTIALS = {
-	google: GOOGLE_API_KEY_ENV,
-	openai: OPENAI_API_KEY_ENV,
-	seedream: SEEDREAM_API_KEY_ENV,
-	dashscope: DASHSCOPE_API_KEY_ENV
-};
 const RATIO_LABELS = {
 	auto: "自动",
 	"1:1": "1:1 方形",
@@ -17378,8 +17568,7 @@ const RATIO_LABELS = {
 /** Return only browser-safe capability data. */
 async function describeStudio(ctx, config) {
 	const configuredEntries = await Promise.all(CLOUD_IMAGE_PROVIDERS.map(async (provider) => {
-		const credential = await ctx.credentials.resolve(credentialRef(CREDENTIALS[provider]));
-		return [provider, credential !== void 0 && credential.value.trim().length > 0];
+		return [provider, await resolveApiKey(ctx, provider) !== void 0];
 	}));
 	const configured = Object.fromEntries(configuredEntries);
 	const profiles = CLOUD_IMAGE_PROVIDERS.map((provider) => studioProfile(config, provider, configured[provider]));
@@ -17392,10 +17581,9 @@ async function describeStudio(ctx, config) {
 /** Execute one validated browser workbench request using the existing provider adapters. */
 async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceRoot) {
 	assertAllowed(studioProfile(config, input.provider, true), input);
-	const active = resolveProvider(providerConfig(config, input.provider, input.model));
+	const active = resolveProvider(withProviderOverrides(config, input.provider, input.model));
 	if (active.provider === "comfyui") throw new Error("ComfyUI 暂未接入工作台");
-	const credential = await ctx.credentials.resolve(credentialRef(active.apiKeyEnv));
-	if (credential === void 0 || credential.value.trim().length === 0) throw new Error(`${PROVIDER_LABELS[input.provider]} 尚未配置 API Key，请先到设置中配置`);
+	const credential = await requireApiKey(ctx, input.provider);
 	const rawRefs = input.references ?? (input.reference ? [input.reference] : []);
 	if (input.mode === "edit" && rawRefs.length === 0) throw new Error("图生图需要至少一张参考图");
 	const sourceImages = input.mode === "edit" ? await Promise.all(rawRefs.map((ref) => readStudioReference(ctx, ref, signal))) : [];
@@ -17408,7 +17596,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 			const aspectRatio = input.ratio;
 			const imageSize = input.quality;
 			generated = input.mode === "edit" ? await editGoogleImage({
-				apiKey: credential.value,
+				apiKey: credential,
 				endpoint: active.endpoint,
 				model: active.model,
 				prompt: input.prompt,
@@ -17418,7 +17606,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 				signal
 			}) : await generateGoogleImage({
-				apiKey: credential.value,
+				apiKey: credential,
 				endpoint: active.endpoint,
 				model: active.model,
 				prompt: input.prompt,
@@ -17428,10 +17616,10 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				signal
 			});
 			output = `${aspectRatio}, ${imageSize}`;
-		} else if (active.provider === "openai") {
+		} else if (active.provider === "openai" || active.provider === "openai-compat" || active.provider === "xai" || active.provider === "zhipu") {
 			const size = openAISize(input.ratio);
 			generated = input.mode === "edit" ? await editOpenAICompatibleImage({
-				apiKey: credential.value,
+				apiKey: credential,
 				baseURL: active.baseURL,
 				model: active.model,
 				prompt: input.prompt,
@@ -17440,8 +17628,8 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 				signal
 			}) : await generateOpenAICompatibleImage({
-				provider: "openai",
-				apiKey: credential.value,
+				provider: active.provider,
+				apiKey: credential,
 				baseURL: active.baseURL,
 				model: active.model,
 				prompt: input.prompt,
@@ -17453,7 +17641,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 		} else if (active.provider === "seedream") {
 			const size = input.quality;
 			generated = input.mode === "edit" ? await editSeedreamImage({
-				apiKey: credential.value,
+				apiKey: credential,
 				baseURL: active.baseURL,
 				model: active.model,
 				prompt: input.prompt,
@@ -17463,7 +17651,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				signal
 			}) : await generateOpenAICompatibleImage({
 				provider: "seedream",
-				apiKey: credential.value,
+				apiKey: credential,
 				baseURL: active.baseURL,
 				model: active.model,
 				prompt: input.prompt,
@@ -17476,7 +17664,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 			if (input.mode === "edit" && sourceImages.length > 3) throw new Error("DashScope (通义万相) 图生图目前最多支持 3 张参考图，请精简后重试");
 			const size = dashScopeSize(input.ratio);
 			generated = input.mode === "edit" ? await editDashScopeImage({
-				apiKey: credential.value,
+				apiKey: credential,
 				endpoint: active.endpoint,
 				model: active.model,
 				prompt: input.prompt,
@@ -17485,7 +17673,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 				signal
 			}) : await generateDashScopeImage({
-				apiKey: credential.value,
+				apiKey: credential,
 				endpoint: active.endpoint,
 				model: active.model,
 				prompt: input.prompt,
@@ -17578,14 +17766,26 @@ async function runPool(tasks, concurrency = 2) {
 	return results;
 }
 function studioProfile(config, provider, configured) {
-	const active = resolveProvider(providerConfig(config, provider));
+	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");
+	}
 	if (active.provider === "comfyui") throw new Error("Invalid cloud provider profile");
 	const model = active.model;
 	if (provider === "google") return profile(provider, model, configured, ASPECT_RATIOS.map(option), IMAGE_SIZES.map((value) => ({
 		value,
 		label: value
 	})), "1:1", "1K");
-	if (provider === "openai") return profile(provider, model, configured, [
+	if (provider === "openai" || provider === "openai-compat" || provider === "xai" || provider === "zhipu") return profile(provider, model, configured, [
 		"1:1",
 		"3:2",
 		"2:3"
@@ -17618,7 +17818,7 @@ function studioProfile(config, provider, configured) {
 function profile(provider, model, configured, ratioOptions, qualityOptions, defaultRatio, defaultQuality) {
 	return {
 		provider,
-		label: PROVIDER_LABELS[provider],
+		label: PROVIDER_DISPLAY_NAMES[provider],
 		model,
 		configured,
 		supportsEditing: true,
@@ -17634,34 +17834,6 @@ function option(value) {
 		label: RATIO_LABELS[value] ?? value
 	};
 }
-function providerConfig(config, provider, model) {
-	if (model === void 0) return {
-		...config,
-		provider
-	};
-	switch (provider) {
-		case "google": return {
-			...config,
-			provider,
-			googleModel: model
-		};
-		case "openai": return {
-			...config,
-			provider,
-			openaiModel: model
-		};
-		case "seedream": return {
-			...config,
-			provider,
-			seedreamModel: model
-		};
-		case "dashscope": return {
-			...config,
-			provider,
-			dashscopeModel: model
-		};
-	}
-}
 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 不支持所选比例");
@@ -17716,14 +17888,14 @@ function cloudProvider$1(value) {
 //#region lib/types/studio-route.js
 /** Serve workbench capabilities and generation requests without exposing provider credentials. */
 async function serveStudio(req, res, deps) {
-	if (!sameOrigin(req)) return jsonError(res, 403, "origin-rejected");
+	if (!sameOrigin$1(req)) return jsonError$1(res, 403, "origin-rejected");
 	if (req.method === "GET") try {
-		return json(res, 200, await deps.describe());
+		return json$1(res, 200, await deps.describe());
 	} catch (error) {
-		return jsonError(res, 500, errorMessage(error, "studio-unavailable"));
+		return jsonError$1(res, 500, errorMessage(error, "studio-unavailable"));
 	}
-	if (req.method !== "POST") return jsonError(res, 405, "method-not-allowed");
-	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError(res, 415, "json-required");
+	if (req.method !== "POST") return jsonError$1(res, 405, "method-not-allowed");
+	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError$1(res, 415, "json-required");
 	const controller = new AbortController();
 	const onConnectionClose = () => {
 		if (!res.writableEnded) controller.abort(/* @__PURE__ */ new Error("The browser closed the image generation request."));
@@ -17736,15 +17908,15 @@ async function serveStudio(req, res, deps) {
 	try {
 		let input;
 		try {
-			input = parseStudioGenerateRequest(JSON.parse(await readBody(req, deps.maxBodyBytes)));
+			input = parseStudioGenerateRequest(JSON.parse(await readBody$1(req, deps.maxBodyBytes)));
 		} catch (error) {
-			return jsonError(res, 400, errorMessage(error, "invalid-request"));
+			return jsonError$1(res, 400, errorMessage(error, "invalid-request"));
 		}
 		const output = await deps.generate(input, controller.signal);
-		if (!res.headersSent && !res.writableEnded && !res.destroyed) json(res, 200, output);
+		if (!res.headersSent && !res.writableEnded && !res.destroyed) json$1(res, 200, output);
 	} catch (error) {
 		if (res.headersSent || res.writableEnded || res.destroyed) return;
-		jsonError(res, controller.signal.aborted ? 499 : 502, errorMessage(error, "generation-failed"));
+		jsonError$1(res, controller.signal.aborted ? 499 : 502, errorMessage(error, "generation-failed"));
 	} finally {
 		res.off("close", onConnectionClose);
 		req.off("aborted", onReqAborted);
@@ -17752,7 +17924,7 @@ async function serveStudio(req, res, deps) {
 }
 /** Strictly validate the small untrusted workbench wire contract. */
 function parseStudioGenerateRequest(value) {
-	const input = record(value);
+	const input = record$1(value);
 	if (input === void 0) throw new Error("请求格式无效");
 	if (input.mode !== "generate" && input.mode !== "edit") throw new Error("请选择生成类型");
 	if (!cloudProvider(input.provider)) throw new Error("不支持该图像 Provider");
@@ -17785,7 +17957,7 @@ function parseStudioGenerateRequest(value) {
 	};
 }
 function parseReference(value) {
-	const reference = record(value);
+	const reference = record$1(value);
 	if (reference === void 0) throw new Error("参考图格式无效");
 	if ("attachment" in reference) {
 		const attachment = parseImageAttachmentRef(reference.attachment);
@@ -17813,15 +17985,15 @@ function cloudProvider(value) {
 function imageMediaType(value) {
 	return value === "image/png" || value === "image/jpeg" || value === "image/webp" || value === "image/gif";
 }
-function sameOrigin(req) {
+function sameOrigin$1(req) {
 	const origin = req.headers.origin;
 	const host = req.headers.host;
 	return origin === void 0 || host === void 0 || origin === `http://${host}` || origin === `https://${host}`;
 }
-function record(value) {
+function record$1(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 }
-async function readBody(req, maxBytes) {
+async function readBody$1(req, maxBytes) {
 	const chunks = [];
 	let bytes = 0;
 	for await (const chunk of req) {
@@ -17835,6 +18007,333 @@ async function readBody(req, maxBytes) {
 function errorMessage(error, fallback) {
 	return error instanceof Error && error.message.trim().length > 0 ? error.message : fallback;
 }
+function json$1(res, status, value) {
+	if (res.headersSent || res.writableEnded || res.destroyed) return;
+	res.writeHead(status, {
+		"content-type": "application/json; charset=utf-8",
+		"cache-control": "no-store"
+	});
+	res.end(JSON.stringify(value));
+}
+function jsonError$1(res, status, message) {
+	if (res.headersSent || res.writableEnded || res.destroyed) return;
+	json$1(res, status, { error: message });
+}
+//#endregion
+//#region lib/types/test-route.js
+const MAX_BODY_BYTES = 16384;
+const PROBE_TIMEOUT_MS = 1e4;
+/**
+* The endpoint each provider is probed on. All four cloud providers expose a
+* model-list GET that authenticates with the same credential image generation
+* uses; ComfyUI exposes its standard `system_stats` health endpoint.
+*/
+function probeTarget(provider, config, apiKey) {
+	if (provider === "comfyui") return {
+		url: joinUrl(config.comfyuiBaseURL ?? "http://127.0.0.1:8188", "system_stats"),
+		headers: {}
+	};
+	if (provider === "google") return {
+		url: googleModelsUrl(config),
+		headers: { "x-goog-api-key": apiKey ?? "" }
+	};
+	const headers = { authorization: `Bearer ${apiKey ?? ""}` };
+	if (provider === "dashscope") return {
+		url: joinUrl(config.dashscopeEndpoint ?? "https://dashscope.aliyuncs.com/api/v1", "models"),
+		headers
+	};
+	if (provider === "seedream") return {
+		url: joinUrl(config.seedreamBaseURL ?? "https://ark.cn-beijing.volces.com/api/v3", "models"),
+		headers
+	};
+	if (provider === "openai-compat") {
+		const base = config.openaiCompatBaseURL?.trim() ?? "";
+		if (base.length === 0) throw new Error("OpenAI-compatible base URL is not configured");
+		return {
+			url: joinUrl(base, "models"),
+			headers
+		};
+	}
+	if (provider === "xai") return {
+		url: joinUrl(config.xaiBaseURL ?? "https://api.x.ai/v1", "models"),
+		headers
+	};
+	if (provider === "zhipu") return {
+		url: joinUrl(config.zhipuBaseURL ?? "https://open.bigmodel.cn/api/paas/v4", "models"),
+		headers
+	};
+	return {
+		url: joinUrl(config.openaiBaseURL ?? "https://api.openai.com/v1", "models"),
+		headers
+	};
+}
+/** `…/v1beta/interactions` (or any trailing path) becomes `…/v1beta/models`. */
+function googleModelsUrl(config) {
+	const endpoint = config.googleEndpoint;
+	const fallback = "https://generativelanguage.googleapis.com/v1beta/models";
+	if (typeof endpoint !== "string" || endpoint.trim().length === 0) return fallback;
+	try {
+		const url = new URL(endpoint);
+		const segments = url.pathname.split("/").filter((segment) => segment.length > 0);
+		segments[segments.length - 1] = "models";
+		url.pathname = `/${segments.join("/")}`;
+		return url.toString();
+	} catch {
+		throw new Error("Google endpoint must be an absolute URL");
+	}
+}
+function joinUrl(base, path) {
+	return new URL(path, base.endsWith("/") ? base : `${base}/`).toString();
+}
+/** Extract bare model ids from a Google `list models` payload (`models/{id}`). */
+function parseGoogleModelIds(payload) {
+	if (typeof payload !== "object" || payload === null) return [];
+	const models = payload.models;
+	if (!Array.isArray(models)) return [];
+	const ids = [];
+	for (const entry of models) {
+		if (typeof entry !== "object" || entry === null) continue;
+		const name = entry.name;
+		if (typeof name !== "string" || name.length === 0) continue;
+		ids.push(name.startsWith("models/") ? name.slice(7) : name);
+	}
+	return ids;
+}
+/** Heuristic filter: Gemini image models carry `image`/`imagen` in the id. */
+function filterImageModelIds(ids) {
+	return ids.filter((id) => /image|imagen/i.test(id));
+}
+/** Narrow filter for the official OpenAI catalog: gpt-image and DALL·E families. */
+function filterOpenAIImageModelIds(ids) {
+	return ids.filter((id) => /^(gpt-image|dall-e)/i.test(id));
+}
+/** Broad filter for relays: common image-model id fragments across vendors. */
+function filterRelayImageModelIds(ids) {
+	return ids.filter((id) => /(^|[-_.])(image|imagen|flux|seedream|seededit|sd|sdxl|sd3|cogview|janus|wan|kolors|hunyuan-image)/i.test(id) || /^(dall-e|gpt-image)/i.test(id));
+}
+/** Ark catalog filter: the Seedream (generation) and SeedEdit (editing) families. */
+function filterSeedreamImageModelIds(ids) {
+	return ids.filter((id) => /seedream|seededit/i.test(id));
+}
+/** Zhipu catalog filter: GLM-Image and CogView families. */
+function filterZhipuImageModelIds(ids) {
+	return ids.filter((id) => /glm-image|cogview/i.test(id));
+}
+/** Extract model ids from an OpenAI-style `{data:[{id}]}` or xAI-style `{models:[{id}]}` payload. */
+function parseOpenAIModelIds(payload) {
+	if (typeof payload !== "object" || payload === null) return [];
+	const data = payload.data;
+	const models = payload.models;
+	const entries = Array.isArray(data) ? data : Array.isArray(models) ? models : void 0;
+	if (entries === void 0) return [];
+	const ids = [];
+	for (const entry of entries) {
+		if (typeof entry !== "object" || entry === null) continue;
+		const id = entry.id;
+		if (typeof id === "string" && id.length > 0) ids.push(id);
+	}
+	return ids;
+}
+/**
+* Extract image-capable model ids from a DashScope native
+* `{output:{models:[{model,capabilities}]}}` payload. The `capabilities`
+* array marks image generation as `IG`; name fragments are a fallback for
+* payloads that omit the field.
+*/
+function parseDashScopeImageModelIds(payload) {
+	if (typeof payload !== "object" || payload === null) return [];
+	const output = payload.output;
+	if (typeof output !== "object" || output === null) return [];
+	const models = output.models;
+	if (!Array.isArray(models)) return [];
+	const ids = [];
+	for (const entry of models) {
+		if (typeof entry !== "object" || entry === null) continue;
+		const model = entry.model;
+		if (typeof model !== "string" || model.length === 0) continue;
+		const capabilities = entry.capabilities;
+		if (Array.isArray(capabilities) && capabilities.includes("IG") || /wanx|qwen-image|wan2|image/i.test(model)) ids.push(model);
+	}
+	return ids;
+}
+/** Gemini list-models pagination cap; one page comfortably covers the catalog. */
+const GOOGLE_MODELS_PAGE_SIZE = 1e3;
+/** Fetch with the shared timeout and classify the outcome; secrets never leave redacted. */
+async function fetchClassifiedJson(url, headers, apiKey, signal) {
+	const response = await fetch(url, {
+		method: "GET",
+		headers,
+		signal: signal ?? AbortSignal.timeout(PROBE_TIMEOUT_MS),
+		redirect: "follow"
+	}).catch((error) => {
+		throw new Error(error instanceof Error ? error.message : String(error));
+	});
+	if (response.ok) return {
+		ok: true,
+		payload: await response.json().catch(() => null)
+	};
+	if (response.status === 401 || response.status === 403) return {
+		ok: false,
+		reason: "unauthorized"
+	};
+	const text = await response.text().catch(() => "");
+	return {
+		ok: false,
+		reason: "error",
+		message: `HTTP ${String(response.status)}${text.length > 0 ? `: ${redactSecrets(text, apiKey).slice(0, 300)}` : ""}`
+	};
+}
+/** Pull and filter the image-capable models from the Google endpoint. */
+async function fetchGoogleImageModels(config, apiKey, signal) {
+	if (apiKey === void 0) return {
+		ok: false,
+		reason: "missing-key"
+	};
+	const url = new URL(googleModelsUrl(config));
+	url.searchParams.set("pageSize", String(GOOGLE_MODELS_PAGE_SIZE));
+	const result = await fetchClassifiedJson(url, { "x-goog-api-key": apiKey }, apiKey, signal);
+	if (!result.ok) return result;
+	return {
+		ok: true,
+		models: filterImageModelIds(parseGoogleModelIds(result.payload))
+	};
+}
+/** Pull and filter image-capable models from an OpenAI-compatible endpoint (official, relay, Ark, xAI, Zhipu). */
+async function fetchOpenAIImageModels(provider, config, apiKey, signal) {
+	if (apiKey === void 0) return {
+		ok: false,
+		reason: "missing-key"
+	};
+	const configured = provider === "openai" ? config.openaiBaseURL?.trim() ?? "" : provider === "openai-compat" ? config.openaiCompatBaseURL?.trim() ?? "" : provider === "seedream" ? config.seedreamBaseURL?.trim() ?? "" : provider === "xai" ? config.xaiBaseURL?.trim() ?? "" : config.zhipuBaseURL?.trim() ?? "";
+	const fallback = provider === "openai" ? DEFAULT_OPENAI_BASE_URL : provider === "seedream" ? DEFAULT_SEEDREAM_BASE_URL : provider === "xai" ? DEFAULT_XAI_BASE_URL : provider === "zhipu" ? DEFAULT_ZHIPU_BASE_URL : "";
+	const base = configured.length > 0 ? configured : fallback;
+	if (base.length === 0) return {
+		ok: false,
+		reason: "error",
+		message: "Base URL is not configured"
+	};
+	const result = await fetchClassifiedJson(joinUrl(base, provider === "xai" ? "image-generation-models" : "models"), { authorization: `Bearer ${apiKey}` }, apiKey, signal);
+	if (!result.ok) return result;
+	const ids = parseOpenAIModelIds(result.payload);
+	return {
+		ok: true,
+		models: provider === "openai" ? filterOpenAIImageModelIds(ids) : provider === "openai-compat" ? filterRelayImageModelIds(ids) : provider === "seedream" ? filterSeedreamImageModelIds(ids) : provider === "xai" ? ids : filterZhipuImageModelIds(ids)
+	};
+}
+/** Pull and filter image-capable models from the DashScope native model list (`capabilities=IG`). */
+async function fetchDashScopeImageModels(config, apiKey, signal) {
+	if (apiKey === void 0) return {
+		ok: false,
+		reason: "missing-key"
+	};
+	const configured = config.dashscopeEndpoint?.trim() ?? "";
+	const base = configured.length > 0 ? configured : DEFAULT_DASHSCOPE_ENDPOINT;
+	const url = new URL(joinUrl(base, "models"));
+	url.searchParams.set("capabilities", "IG");
+	url.searchParams.set("page_no", "1");
+	url.searchParams.set("page_size", "100");
+	const result = await fetchClassifiedJson(url, { authorization: `Bearer ${apiKey}` }, apiKey, signal);
+	if (!result.ok) return result;
+	return {
+		ok: true,
+		models: parseDashScopeImageModelIds(result.payload)
+	};
+}
+/** Run one provider probe and classify the outcome; secrets never leave redacted. */
+async function probeProviderConnection(provider, config, apiKey, signal) {
+	if (apiKey === void 0) return {
+		ok: false,
+		reason: "missing-key"
+	};
+	if (provider === "openai-compat" && (config.openaiCompatBaseURL?.trim() ?? "").length === 0) return {
+		ok: false,
+		reason: "error",
+		message: "Base URL is not configured"
+	};
+	const target = probeTarget(provider, config, apiKey);
+	const result = await fetchClassifiedJson(target.url, target.headers, apiKey, signal);
+	return result.ok ? { ok: true } : result;
+}
+/** Probe the local ComfyUI service without any credential. */
+async function probeComfyUIConnection(config, signal) {
+	const target = probeTarget("comfyui", config);
+	const response = await fetch(target.url, {
+		method: "GET",
+		signal: signal ?? AbortSignal.timeout(PROBE_TIMEOUT_MS),
+		redirect: "follow"
+	}).catch((error) => {
+		throw new Error(error instanceof Error ? error.message : String(error));
+	});
+	if (response.ok) return { ok: true };
+	return {
+		ok: false,
+		reason: "error",
+		message: `HTTP ${String(response.status)}`
+	};
+}
+/** Serve the settings card's per-provider connectivity probe. */
+async function serveTestConnection(req, res, deps) {
+	if (!sameOrigin(req)) return jsonError(res, 403, "origin-rejected");
+	if (req.method !== "POST") return jsonError(res, 405, "method-not-allowed");
+	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError(res, 415, "json-required");
+	let body;
+	try {
+		body = JSON.parse(await readBody(req));
+	} catch {
+		return jsonError(res, 400, "invalid-request");
+	}
+	const provider = record(body)?.provider;
+	if (typeof provider !== "string" || !IMAGE_PROVIDERS.includes(provider)) return jsonError(res, 400, "invalid-provider");
+	if (record(body)?.action === "models") {
+		if (provider === "comfyui") return jsonError(res, 400, "models-unsupported");
+		let result;
+		try {
+			const apiKey = await deps.resolveKey(provider);
+			result = provider === "google" ? await fetchGoogleImageModels(deps.config(), apiKey) : provider === "dashscope" ? await fetchDashScopeImageModels(deps.config(), apiKey) : await fetchOpenAIImageModels(provider, deps.config(), apiKey);
+		} catch (error) {
+			result = {
+				ok: false,
+				reason: "error",
+				message: error instanceof Error ? error.message : String(error)
+			};
+		}
+		return json(res, 200, result);
+	}
+	let result;
+	try {
+		if (provider === "comfyui") result = await probeComfyUIConnection(deps.config());
+		else {
+			const apiKey = await deps.resolveKey(provider);
+			result = await probeProviderConnection(provider, deps.config(), apiKey);
+		}
+	} catch (error) {
+		result = {
+			ok: false,
+			reason: "error",
+			message: error instanceof Error ? error.message : String(error)
+		};
+	}
+	json(res, 200, result);
+}
+function sameOrigin(req) {
+	const origin = req.headers.origin;
+	const host = req.headers.host;
+	return origin === void 0 || host === void 0 || origin === `http://${host}` || origin === `https://${host}`;
+}
+function record(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+}
+async function readBody(req) {
+	const chunks = [];
+	let bytes = 0;
+	for await (const chunk of req) {
+		const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+		bytes += buffer.byteLength;
+		if (bytes > MAX_BODY_BYTES) throw new Error("request too large");
+		chunks.push(buffer);
+	}
+	return Buffer.concat(chunks).toString("utf8");
+}
 function json(res, status, value) {
 	if (res.headersSent || res.writableEnded || res.destroyed) return;
 	res.writeHead(status, {
@@ -17843,9 +18342,9 @@ function json(res, status, value) {
 	});
 	res.end(JSON.stringify(value));
 }
-function jsonError(res, status, message) {
+function jsonError(res, status, code) {
 	if (res.headersSent || res.writableEnded || res.destroyed) return;
-	json(res, status, { error: message });
+	json(res, status, { error: code });
 }
 //#endregion
 //#region lib/types/index.js
@@ -17856,12 +18355,18 @@ const inject = [
 	"credentials",
 	"webServer"
 ];
+/** Validate the untrusted per-call provider override from tool arguments. */
+function providerOverrideOf(value) {
+	if (value === void 0 || value === null || value === "") return void 0;
+	if (typeof value !== "string" || !IMAGE_PROVIDERS.includes(value)) throw new Error(`Unsupported provider ${JSON.stringify(value)}. Supported providers: ${IMAGE_PROVIDERS.join(", ")}.`);
+	return value;
+}
 function apply(ctx, config = {}) {
-	let current = () => config;
+	let current = () => migrateOpenAICompatConfig(config);
 	const knownWorkspaceRoots = /* @__PURE__ */ new Set();
 	installImageSettings(ctx, config, {
 		setSource: (source) => {
-			current = source;
+			current = () => migrateOpenAICompatConfig(source());
 		},
 		onChange: () => {}
 	});
@@ -17909,6 +18414,14 @@ function apply(ctx, config = {}) {
 			isSaveEnabled: () => current().saveToWorkspace !== false
 		})
 	}), "dsh-image-gen: save workspace route");
+	ctx.effect(() => ctx.webServer.register({
+		kind: "exact",
+		path: TEST_CONNECTION_ROUTE,
+		handler: (req, res) => serveTestConnection(req, res, {
+			resolveKey: (provider) => resolveApiKey(ctx, provider),
+			config: () => current()
+		})
+	}), "dsh-image-gen: test connection route");
 	ctx.effect(() => ctx.webServer.register({
 		kind: "exact",
 		path: STUDIO_ROUTE,
@@ -17942,13 +18455,31 @@ function apply(ctx, config = {}) {
 	}), "dsh-image-gen: inspiration route");
 	ctx.tools.register(defineTool({
 		name: "generate_image",
-		description: "Generate a new image with the configured provider. Use when the user asks to create or draw a new image; use edit_image instead when they want to change an existing image. Give a complete visual prompt including subject, composition, style, lighting, and any exact text that should appear. A successful image is attached directly to the conversation and may also be saved under the session workspace. Do not call read, glob, or other tools to locate or verify the image.",
+		description: "Generate a new image with the configured provider. Use when the user asks to create or draw a new image; use edit_image instead when they want to change an existing image. Give a complete visual prompt including subject, composition, style, lighting, and any exact text that should appear. The optional provider/model arguments switch provider or model for this call only when the user asks for a specific one. A successful image is attached directly to the conversation and may also be saved under the session workspace. Do not call read, glob, or other tools to locate or verify the image.",
 		parameters: {
 			prompt: {
 				type: "string",
 				required: true,
 				description: "Complete description of the image to generate."
 			},
+			provider: {
+				type: "string",
+				enum: [
+					"google",
+					"openai",
+					"openai-compat",
+					"seedream",
+					"dashscope",
+					"xai",
+					"zhipu",
+					"comfyui"
+				],
+				description: "Optional provider for this call only (for example when the user asks to use a specific provider); omit to use the configured default."
+			},
+			model: {
+				type: "string",
+				description: "Optional model name for this call only, overriding the configured model. Not used by ComfyUI (use workflow instead)."
+			},
 			aspect_ratio: {
 				type: "string",
 				enum: [
@@ -17982,7 +18513,7 @@ function apply(ctx, config = {}) {
 		},
 		output: imageOutput("Generated"),
 		async execute(args, exec) {
-			const active = resolveProvider(current());
+			const active = resolveProvider(withProviderOverrides(current(), providerOverrideOf(args.provider), args.model));
 			if (active.provider === "comfyui") {
 				const workflow = selectComfyUIWorkflow(active, args.workflow);
 				return saveGenerated(ctx, await generateComfyUIImage({
@@ -17994,13 +18525,12 @@ function apply(ctx, config = {}) {
 					signal: exec.signal
 				}), active.provider, workflow.name, "API workflow", current(), exec, knownWorkspaceRoots);
 			}
-			const credential = await ctx.credentials.resolve(credentialRef(active.apiKeyEnv));
-			if (credential === void 0 || credential.value.length === 0) throw new Error(`generate_image requires the ${active.apiKeyEnv} credential; configure it in Settings > Plugins > Image generation.`);
+			const credential = await requireApiKey(ctx, active.provider, "generate_image");
 			if (active.provider === "google") {
 				const aspectRatio = args.aspect_ratio ?? active.aspectRatio;
 				const imageSize = args.image_size ?? active.imageSize;
 				return saveGenerated(ctx, await generateGoogleImage({
-					apiKey: credential.value,
+					apiKey: credential,
 					endpoint: active.endpoint,
 					model: active.model,
 					prompt: args.prompt,
@@ -18013,7 +18543,7 @@ function apply(ctx, config = {}) {
 			if (active.provider === "dashscope") {
 				const size = args.size ?? active.imageSize;
 				return saveGenerated(ctx, await generateDashScopeImage({
-					apiKey: credential.value,
+					apiKey: credential,
 					endpoint: active.endpoint,
 					model: active.model,
 					prompt: args.prompt,
@@ -18025,7 +18555,7 @@ function apply(ctx, config = {}) {
 			const size = args.size ?? active.imageSize;
 			return saveGenerated(ctx, await generateOpenAICompatibleImage({
 				provider: active.provider,
-				apiKey: credential.value,
+				apiKey: credential,
 				baseURL: active.baseURL,
 				model: active.model,
 				prompt: args.prompt,
@@ -18045,6 +18575,24 @@ function apply(ctx, config = {}) {
 				required: true,
 				description: "Describe the changes to make while preserving everything else that should remain."
 			},
+			provider: {
+				type: "string",
+				enum: [
+					"google",
+					"openai",
+					"openai-compat",
+					"seedream",
+					"dashscope",
+					"xai",
+					"zhipu",
+					"comfyui"
+				],
+				description: "Optional provider for this call only (for example when the user asks to use a specific provider); omit to use the configured default."
+			},
+			model: {
+				type: "string",
+				description: "Optional model name for this call only, overriding the configured model. Not used by ComfyUI (use workflow instead)."
+			},
 			source_attachment_id: {
 				type: "string",
 				description: "Optional attachment id of a specific image already present in the current conversation."
@@ -18096,7 +18644,7 @@ function apply(ctx, config = {}) {
 		},
 		output: imageOutput("Edited"),
 		async execute(args, exec) {
-			const active = resolveProvider(current());
+			const active = resolveProvider(withProviderOverrides(current(), providerOverrideOf(args.provider), args.model));
 			const sourceImages = await resolveReferenceImages({
 				...exec.agent === void 0 ? {} : { agent: exec.agent },
 				attachments: ctx.attachments,
@@ -18125,13 +18673,12 @@ function apply(ctx, config = {}) {
 					signal: exec.signal
 				}), active.provider, workflow.name, "API workflow", current(), exec, knownWorkspaceRoots);
 			}
-			const credential = await ctx.credentials.resolve(credentialRef(active.apiKeyEnv));
-			if (credential === void 0 || credential.value.length === 0) throw new Error(`edit_image requires the ${active.apiKeyEnv} credential; configure it in Settings > Plugins > Image generation.`);
+			const credential = await requireApiKey(ctx, active.provider, "edit_image");
 			if (active.provider === "google") {
 				const aspectRatio = args.aspect_ratio ?? active.aspectRatio;
 				const imageSize = args.image_size ?? active.imageSize;
 				return saveGenerated(ctx, await editGoogleImage({
-					apiKey: credential.value,
+					apiKey: credential,
 					endpoint: active.endpoint,
 					model: active.model,
 					prompt: args.prompt,
@@ -18143,8 +18690,8 @@ function apply(ctx, config = {}) {
 				}), active.provider, active.model, `${aspectRatio}, ${imageSize}`, current(), exec, knownWorkspaceRoots);
 			}
 			const size = args.size ?? active.imageSize;
-			if (active.provider === "openai") return saveGenerated(ctx, await editOpenAICompatibleImage({
-				apiKey: credential.value,
+			if (active.provider === "openai" || active.provider === "openai-compat" || active.provider === "xai" || active.provider === "zhipu") return saveGenerated(ctx, await editOpenAICompatibleImage({
+				apiKey: credential,
 				baseURL: active.baseURL,
 				model: active.model,
 				prompt: args.prompt,
@@ -18154,7 +18701,7 @@ function apply(ctx, config = {}) {
 				signal: exec.signal
 			}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 			if (active.provider === "seedream") return saveGenerated(ctx, await editSeedreamImage({
-				apiKey: credential.value,
+				apiKey: credential,
 				baseURL: active.baseURL,
 				model: active.model,
 				prompt: args.prompt,
@@ -18164,7 +18711,7 @@ function apply(ctx, config = {}) {
 				signal: exec.signal
 			}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 			return saveGenerated(ctx, await editDashScopeImage({
-				apiKey: credential.value,
+				apiKey: credential,
 				endpoint: active.endpoint,
 				model: active.model,
 				prompt: args.prompt,
@@ -18349,4 +18896,4 @@ function installImageSettings(ctx, config, hooks) {
 	ctx.logger.warn("dsh-image-gen: this DSH exposes neither settings API generation; settings UI stays on the composition entry");
 }
 //#endregion
-export { Config, DELETE_ROUTE, IMAGE_ROUTE, INSPIRATION_ROUTE, SAVE_WORKSPACE_ROUTE, STUDIO_ROUTE, apply, imageAttachmentFromMeta, inject, name };
+export { Config, DELETE_ROUTE, IMAGE_ROUTE, INSPIRATION_ROUTE, SAVE_WORKSPACE_ROUTE, STUDIO_ROUTE, TEST_CONNECTION_ROUTE, apply, imageAttachmentFromMeta, inject, name };