dsh-image-gen 0.9.2 → 0.10.0

package/lib/index.js

@@ -5604,7 +5604,7 @@ function configuredField(extra) {
 }
 /** 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;
+	const model = (mode === "generate" ? config.openaiCompatExtraBody : config.openaiCompatEditExtra)?.model ?? (mode === "edit" ? config.openaiCompatEditModel?.trim() || config.openaiCompatModel : config.openaiCompatModel);
 	if (typeof model !== "string") return void 0;
 	try {
 		const url = new URL(config.openaiCompatBaseURL ?? "");
@@ -5616,6 +5616,10 @@ function officialContract(config, mode) {
 }
 /** Known official edit contracts take precedence over relay-specific format settings. */
 function compatEditFormat(config) {
+	try {
+		const url = new URL(config.openaiCompatBaseURL ?? "");
+		if (url.protocol === "https:" && !url.port && !url.search && !url.hash && (url.hostname === "api.siliconflow.cn" || url.hostname === "api.siliconflow.com") && url.pathname.replace(/\/+$/, "") === "/v1") return "siliconflowJson";
+	} catch {}
 	const contract = officialContract(config, "edit");
 	if (contract === "sensenova") return "jsonImageUrlArray";
 	if (contract === "qwen") return "qwenJson";
@@ -5760,12 +5764,80 @@ const CLOUD_IMAGE_PROVIDERS = [
 	"xai",
 	"zhipu"
 ];
+/** Normalize the relay model list while keeping the legacy default model selectable. */
+function resolveOpenAICompatModels(config) {
+	const defaultModel = config.openaiCompatModel?.trim() ?? "";
+	const models = [...new Set((config.openaiCompatModels ?? []).map((model) => model.trim()).filter(Boolean))];
+	if (defaultModel.length > 0 && !models.includes(defaultModel)) models.unshift(defaultModel);
+	return models;
+}
+const DEFAULT_OPENAI_COMPAT_CHANNEL_ID = "default";
+function openAICompatKeyRef(channelId) {
+	return channelId === "default" ? OPENAI_COMPAT_API_KEY_ENV : `${OPENAI_COMPAT_API_KEY_ENV}_${channelId.replace(/[^A-Za-z0-9]/g, "_").toUpperCase()}`;
+}
+/** The legacy flat fields remain the first channel; additional entries are fully independent. */
+function resolveOpenAICompatChannels(source) {
+	const legacy = {
+		id: DEFAULT_OPENAI_COMPAT_CHANNEL_ID,
+		label: source.openaiCompatLabel?.trim() || "OpenAI 兼容",
+		keyRef: OPENAI_COMPAT_API_KEY_ENV,
+		baseURL: source.openaiCompatBaseURL ?? "",
+		model: source.openaiCompatModel ?? "",
+		models: [...source.openaiCompatModels ?? []],
+		editModel: source.openaiCompatEditModel ?? "",
+		quality: source.openaiCompatQuality ?? "",
+		qualityOptions: [...source.openaiCompatQualityOptions ?? []],
+		extraBody: source.openaiCompatExtraBody ?? {},
+		editSizeMode: source.openaiCompatEditSizeMode ?? "auto",
+		editFormat: source.openaiCompatEditFormat ?? "multipart",
+		editExtra: source.openaiCompatEditExtra ?? {},
+		sizes: source.openaiCompatSizes ?? {}
+	};
+	const channels = [legacy];
+	const seen = /* @__PURE__ */ new Set([legacy.id]);
+	for (const [index, entry] of (source.openaiCompatChannels ?? []).entries()) {
+		const id = typeof entry?.id === "string" ? entry.id.trim() : "";
+		if (!/^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/.test(id) || seen.has(id)) continue;
+		seen.add(id);
+		const storedKeyRef = typeof entry.keyRef === "string" ? entry.keyRef.trim() : "";
+		channels.push({
+			id,
+			label: typeof entry.label === "string" && entry.label.trim().length > 0 ? entry.label.trim() : `OpenAI 兼容 ${index + 2}`,
+			keyRef: /^DSH_IMAGE_GEN_OPENAI_COMPAT_KEY_[A-Z0-9_]+$/.test(storedKeyRef) ? storedKeyRef : openAICompatKeyRef(id),
+			baseURL: typeof entry.baseURL === "string" ? entry.baseURL : "",
+			model: typeof entry.model === "string" ? entry.model : "",
+			models: Array.isArray(entry.models) ? entry.models.filter((model) => typeof model === "string") : [],
+			editModel: typeof entry.editModel === "string" ? entry.editModel : "",
+			quality: typeof entry.quality === "string" ? entry.quality : "",
+			qualityOptions: Array.isArray(entry.qualityOptions) ? entry.qualityOptions.filter((quality) => typeof quality === "string") : [],
+			extraBody: entry.extraBody ?? {},
+			editSizeMode: entry.editSizeMode === "selected" ? "selected" : "auto",
+			editFormat: entry.editFormat ?? "multipart",
+			editExtra: entry.editExtra ?? {},
+			sizes: entry.sizes ?? {}
+		});
+	}
+	return channels;
+}
+function resolveOpenAICompatChannel(source, channelId) {
+	const channels = resolveOpenAICompatChannels(source);
+	const explicit = channelId?.trim() ?? "";
+	if (explicit.length > 0) {
+		const selected = channels.find((channel) => channel.id === explicit);
+		if (selected === void 0) throw new Error(`Unknown OpenAI-compatible channel "${explicit}". Available channels: ${channels.map((channel) => channel.id).join(", ")}.`);
+		return selected;
+	}
+	const active = source.openaiCompatActiveChannel?.trim() ?? "";
+	return channels.find((channel) => channel.id === active) ?? channels[0];
+}
 /**
 * Providers the browser workbench can drive: the BYOK cloud set plus the
 * logged-in subscription channels. ComfyUI stays out; it has its own workflow
 * pipeline and no shared request shape.
 */
 const STUDIO_PROVIDERS = [...CLOUD_IMAGE_PROVIDERS, ...SUBSCRIPTION_PROVIDERS];
+/** Default timeout for API-key cloud generation in the browser workbench. */
+const DEFAULT_CLOUD_TIMEOUT_MS = 15e4;
 /** Timeout for one subscription image call, shared by the tool path and the
 * studio route so neither drifts from the other. */
 const SUBSCRIPTION_TIMEOUT_MS = 3e5;
@@ -5827,6 +5899,16 @@ const STUDIO_WATERMARK_VALUES = [
 	"off",
 	"on"
 ];
+function studioModelOptionsForMode(profile, mode) {
+	if (mode === "edit" && profile.editModel !== void 0) return [{
+		value: profile.editModel,
+		label: profile.editModel
+	}];
+	return profile.modelOptions ?? [{
+		value: profile.model,
+		label: profile.model
+	}];
+}
 function studioWatermarkCapability(profile, mode) {
 	return profile?.watermarkCapabilities?.[mode] ?? (mode === "generate" && profile?.watermarkOptions?.length ? { status: "supported" } : {
 		status: "unknown",
@@ -5953,14 +6035,40 @@ function volatile(schema) {
 */
 const Config = z.object({
 	provider: volatile(z.union(IMAGE_PROVIDERS).default("google")),
+	cloudTimeoutMs: volatile(z.number().min(5e3).max(36e5).default(DEFAULT_CLOUD_TIMEOUT_MS)),
 	googleModel: volatile(z.string().default(DEFAULT_GOOGLE_MODEL)),
 	googleEndpoint: volatile(z.string().default(DEFAULT_GOOGLE_ENDPOINT)),
 	googleNative: volatile(z.boolean().default(false)),
 	openaiBaseURL: volatile(z.string().default(DEFAULT_OPENAI_BASE_URL)),
 	openaiModel: volatile(z.string().default(DEFAULT_OPENAI_MODEL)),
 	openaiSizes: volatile(z.dict(z.dict(z.string())).default({})),
+	openaiCompatLabel: volatile(z.string().default("")),
 	openaiCompatBaseURL: volatile(z.string().default("")),
 	openaiCompatModel: volatile(z.string().default("")),
+	openaiCompatModels: volatile(z.array(z.string()).default([])),
+	openaiCompatChannels: volatile(z.array(z.object({
+		id: z.string(),
+		label: z.string().default(""),
+		keyRef: z.string(),
+		baseURL: z.string().default(""),
+		model: z.string().default(""),
+		models: z.array(z.string()).default([]),
+		editModel: z.string().default(""),
+		quality: z.string().default(""),
+		qualityOptions: z.array(z.string()).default([]),
+		extraBody: z.dict(z.any()).default({}),
+		editSizeMode: z.union(["auto", "selected"]).default("auto"),
+		editFormat: z.union([
+			z.const("multipart"),
+			z.const("jsonImageUrlArray"),
+			z.const("formReferenceImages"),
+			z.const("siliconflowJson")
+		]).default("multipart"),
+		editExtra: z.dict(z.any()).default({}),
+		sizes: z.dict(z.dict(z.string())).default({})
+	})).default([])),
+	openaiCompatActiveChannel: volatile(z.string().default("")),
+	openaiCompatEditModel: volatile(z.string().default("")),
 	openaiCompatQuality: volatile(z.string().default("")),
 	openaiCompatQualityOptions: volatile(z.array(z.string()).default([
 		"auto",
@@ -5973,7 +6081,8 @@ const Config = z.object({
 	openaiCompatEditFormat: volatile(z.union([
 		z.const("multipart"),
 		z.const("jsonImageUrlArray"),
-		z.const("formReferenceImages")
+		z.const("formReferenceImages"),
+		z.const("siliconflowJson")
 	]).default("multipart")),
 	openaiCompatEditExtra: volatile(z.dict(z.any()).default({})),
 	openaiCompatSizes: volatile(z.dict(z.dict(z.string())).default({})),
@@ -6097,17 +6206,40 @@ function resolveProvider(config) {
 		};
 	}
 }
+/** Project one named relay channel onto the legacy flat fields used by all provider adapters. */
+function withOpenAICompatChannel(config, channelId) {
+	const channel = resolveOpenAICompatChannel(config, channelId);
+	if (channel.id === "default") return {
+		...config,
+		openaiCompatActiveChannel: "default"
+	};
+	return {
+		...config,
+		openaiCompatLabel: channel.label,
+		openaiCompatBaseURL: channel.baseURL,
+		openaiCompatModel: channel.model,
+		openaiCompatModels: channel.models ?? [],
+		openaiCompatEditModel: channel.editModel ?? "",
+		openaiCompatQuality: channel.quality ?? "",
+		openaiCompatQualityOptions: channel.qualityOptions ?? [],
+		openaiCompatExtraBody: channel.extraBody ?? {},
+		openaiCompatEditSizeMode: channel.editSizeMode ?? "auto",
+		openaiCompatEditFormat: channel.editFormat ?? "multipart",
+		openaiCompatEditExtra: channel.editExtra ?? {},
+		openaiCompatSizes: channel.sizes ?? {},
+		openaiCompatActiveChannel: channel.id
+	};
+}
 /**
 * 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) {
+function withProviderOverrides(config, provider, model, mode = "generate") {
 	const base = provider === void 0 ? { ...config } : {
 		...config,
 		provider
 	};
-	if (model === void 0) return base;
-	const trimmed = model.trim();
+	const trimmed = model?.trim() || (mode === "edit" && base.provider === "openai-compat" ? base.openaiCompatEditModel?.trim() : "") || "";
 	if (trimmed.length === 0) return base;
 	switch (base.provider ?? "google") {
 		case "google": return {
@@ -6120,7 +6252,8 @@ function withProviderOverrides(config, provider, model) {
 		};
 		case "openai-compat": return {
 			...base,
-			openaiCompatModel: trimmed
+			openaiCompatModel: trimmed,
+			...mode === "edit" ? { openaiCompatEditModel: trimmed } : {}
 		};
 		case "seedream": return {
 			...base,
@@ -6160,6 +6293,7 @@ function migrateOpenAICompatConfig(config) {
 		...config,
 		openaiCompatBaseURL: legacyBase,
 		...compatModel.length > 0 ? {} : { openaiCompatModel: config.openaiModel },
+		...(config.openaiCompatModels?.length ?? 0) > 0 ? {} : { openaiCompatModels: [compatModel || config.openaiModel?.trim() || ""].filter(Boolean) },
 		openaiBaseURL: DEFAULT_OPENAI_BASE_URL,
 		...config.provider === "openai" ? { provider: "openai-compat" } : {}
 	};
@@ -6182,6 +6316,31 @@ function selectComfyUIWorkflow(active, requested) {
 	return workflow;
 }
 //#endregion
+//#region lib/types/generation-timeout.js
+const UPSTREAM_TIMEOUT_HINT = "上游可能已扣费或仍在生成，请到服务商后台确认";
+var GenerationTimeoutError = class extends Error {
+	constructor(timeoutMs) {
+		super(`生图超时（${String(timeoutMs / 1e3)} 秒未返回），请检查网络或代理后重试；${UPSTREAM_TIMEOUT_HINT}`);
+		this.name = "GenerationTimeoutError";
+	}
+};
+async function withGenerationTimeout(timeoutMs, signal, operation) {
+	const watchdog = new AbortController();
+	const combinedSignal = AbortSignal.any([signal, watchdog.signal]);
+	const timeout = setTimeout(() => {
+		watchdog.abort();
+	}, timeoutMs);
+	timeout.unref?.();
+	try {
+		return await operation(combinedSignal);
+	} catch (error) {
+		if (watchdog.signal.aborted && !signal.aborted) throw new GenerationTimeoutError(timeoutMs);
+		throw error;
+	} finally {
+		clearTimeout(timeout);
+	}
+}
+//#endregion
 //#region node_modules/.pnpm/@deepseek-ai+dsh-credential_98fa173416f048996704a605a96a2b0e/node_modules/@deepseek-ai/dsh-credentials/lib/index.js
 /**
 * Service Definition for the credential-reference capability seam (`ctx.credentials`). Settings and composition files carry
@@ -6222,8 +6381,8 @@ function isCredentialRefName(value) {
 * 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() ?? "";
+async function resolveApiKey(ctx, provider, keyRef) {
+	const value = (await ctx.credentials.resolve(credentialRef(keyRef ?? CLOUD_CREDENTIAL_REFS[provider])))?.value.trim() ?? "";
 	return value.length > 0 ? value : void 0;
 }
 /**
@@ -6232,8 +6391,8 @@ async function resolveApiKey(ctx, provider) {
 * 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);
+async function requireApiKey(ctx, provider, tool, keyRef) {
+	const value = await resolveApiKey(ctx, provider, keyRef);
 	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.`);
 }
@@ -8263,6 +8422,39 @@ async function generateOpenAICompatibleImage(input) {
 	}), input.apiKey), input.provider, input);
 }
 async function editOpenAICompatibleImage(input) {
+	if (input.editFormat === "siliconflowJson") {
+		const body = {
+			model: input.model,
+			prompt: input.prompt,
+			...input.editExtra ?? {},
+			...input.extraBody ?? {}
+		};
+		const model = typeof body.model === "string" ? body.model.trim() : "";
+		if (!model) throw new Error("硅基流动图生图需要编辑模型");
+		body.model = model;
+		if (model === "Qwen/Qwen-Image") throw new Error("Qwen/Qwen-Image 是文生图模型；请配置图生图模型，例如 Qwen/Qwen-Image-Edit");
+		const maxReferences = model === "Qwen/Qwen-Image-Edit-2509" ? 3 : 1;
+		if (input.sourceImages.length < 1 || input.sourceImages.length > maxReferences) throw new Error(`${model} 图生图支持 1–${String(maxReferences)} 张参考图，当前 ${String(input.sourceImages.length)} 张；请精简参考图或选择支持多图的编辑模型`);
+		if ([
+			"size",
+			"image_size",
+			"quality"
+		].some((key) => key in body)) throw new Error("此硅基流动图生图格式不发送 size、image_size 或 quality；请从图生图额外字段中移除这些字段");
+		delete body.image;
+		delete body.image2;
+		delete body.image3;
+		for (const [index, source] of input.sourceImages.entries()) body[index === 0 ? "image" : `image${String(index + 1)}`] = toDataUrl$2(source);
+		return parseImageResponse(await guardedFetch("siliconflow image edit request", input.signal, () => fetch(imageEndpoint$1(input.baseURL, "generations"), {
+			method: "POST",
+			redirect: "error",
+			signal: input.signal,
+			headers: {
+				authorization: `Bearer ${input.apiKey}`,
+				"content-type": "application/json"
+			},
+			body: JSON.stringify(body)
+		}), input.apiKey), "siliconflow", input);
+	}
 	if (input.editFormat === "qwenJson") return parseImageResponse(await guardedFetch("openai-compat image edit request", input.signal, () => fetch(imageEndpoint$1(input.baseURL, "generations"), {
 		method: "POST",
 		redirect: "error",
@@ -10158,16 +10350,18 @@ function jsonError$3(res, status, code) {
 //#region lib/types/subscription.js
 /** Translate image tool options into each subscription channel's wire inputs. */
 function subscriptionToolParameters(provider, options) {
-	if (options.size !== void 0 && options.aspectRatio !== void 0) throw new Error("size 与 aspect_ratio 请只选一个");
-	const ratio = options.aspectRatio;
+	const requestedSize = options.size?.trim() || void 0;
+	const ratio = options.aspectRatio?.trim() || void 0;
+	const imageSize = options.imageSize?.trim() || void 0;
+	if (requestedSize !== void 0 && ratio !== void 0) throw new Error("size 与 aspect_ratio 请只选一个；无关可选字段请省略，不要填写空字符串");
 	if (ratio !== void 0 && !SUBSCRIPTION_CAPABILITIES[provider].ratioOptions.some((option) => option.value === ratio)) throw new Error(`${provider} 不支持比例 ${ratio}`);
-	const size = options.size ?? (ratio === void 0 ? void 0 : provider === "chatgpt-sub" ? SUBSCRIPTION_CAPABILITIES[provider].sizeFor?.(ratio, "auto") : ratio);
+	const size = requestedSize ?? (ratio === void 0 ? void 0 : provider === "chatgpt-sub" ? SUBSCRIPTION_CAPABILITIES[provider].sizeFor?.(ratio, "auto") : ratio);
 	let quality;
-	if (options.imageSize !== void 0) {
-		if (provider === "grok-sub" && (options.imageSize === "1K" || options.imageSize === "2K")) quality = options.imageSize.toLowerCase();
-		else if (provider === "google-sub" && options.imageSize === "4K") quality = "hd";
-		else if (provider === "google-sub" && options.imageSize === "1K") quality = void 0;
-		else throw new Error(`${provider} 不支持清晰度 ${options.imageSize}`);
+	if (imageSize !== void 0) {
+		if (provider === "grok-sub" && (imageSize === "1K" || imageSize === "2K")) quality = imageSize.toLowerCase();
+		else if (provider === "google-sub" && imageSize === "4K") quality = "hd";
+		else if (provider === "google-sub" && imageSize === "1K") quality = void 0;
+		else throw new Error(`${provider} 不支持清晰度 ${imageSize}；${provider === "chatgpt-sub" ? "请省略 image_size，使用 size 或 aspect_ratio 指定尺寸" : `image_size 仅支持 ${provider === "grok-sub" ? "1K、2K" : "1K、4K"}`}`);
 	}
 	return {
 		...size === void 0 ? {} : { size },
@@ -27765,11 +27959,14 @@ function openAICompatStudioProfile(config, model, configured) {
 }
 /** Return only browser-safe capability data. */
 async function describeStudio(ctx, config, subscriptions) {
-	const configuredEntries = await Promise.all(CLOUD_IMAGE_PROVIDERS.map(async (provider) => {
+	const compatChannels = resolveOpenAICompatChannels(config);
+	const configuredEntries = await Promise.all([...CLOUD_IMAGE_PROVIDERS.filter((provider) => provider !== "openai-compat").map(async (provider) => {
 		return [provider, await resolveApiKey(ctx, provider) !== void 0];
-	}));
+	}), ...compatChannels.map(async (channel) => {
+		return [`openai-compat:${channel.id}`, await resolveApiKey(ctx, "openai-compat", channel.keyRef) !== void 0];
+	})]);
 	const configured = Object.fromEntries(configuredEntries);
-	const cloudProfiles = CLOUD_IMAGE_PROVIDERS.map((provider) => studioProfile(config, provider, configured[provider]));
+	const cloudProfiles = CLOUD_IMAGE_PROVIDERS.flatMap((provider) => provider === "openai-compat" ? compatChannels.map((channel) => studioProfile(config, provider, configured[`openai-compat:${channel.id}`] === true, channel.id)) : [studioProfile(config, provider, configured[provider] === true)]);
 	const subStatuses = await Promise.all(SUBSCRIPTION_PROVIDERS.map(async (provider) => {
 		return [provider, subscriptions !== void 0 && (await subscriptions.loginStatus(vendorOf(provider))).state === "logged-in"];
 	}));
@@ -27778,9 +27975,12 @@ async function describeStudio(ctx, config, subscriptions) {
 	});
 	const profiles = [...cloudProfiles, ...subProfiles];
 	const preferred = config.provider;
+	const activeProvider = isStudioPreferred(preferred) ? preferred : profiles.find((profile) => profile.configured)?.provider ?? "google";
+	const activeChannel = activeProvider === "openai-compat" ? profiles.find((profile) => profile.provider === activeProvider && profile.channel === resolveOpenAICompatChannel(config).id)?.channel ?? profiles.find((profile) => profile.provider === activeProvider)?.channel : void 0;
 	return {
 		providers: profiles,
-		activeProvider: isStudioPreferred(preferred) ? preferred : profiles.find((profile) => profile.configured)?.provider ?? "google"
+		activeProvider,
+		...activeChannel === void 0 ? {} : { activeChannel }
 	};
 }
 /** The persisted default provider is usable directly when the workbench can drive it. */
@@ -27816,12 +28016,14 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 		assertAllowed(subscriptionStudioProfile(input.provider, true), input);
 		return generateSubscriptionFromStudio(ctx, subscriptions, input, signal);
 	}
-	assertAllowed(studioProfile(config, input.provider, true), input);
-	const active = resolveProvider(withProviderOverrides(config, input.provider, input.model));
+	const channel = input.provider === "openai-compat" ? resolveOpenAICompatChannel(config, input.channel) : void 0;
+	const requestConfig = input.provider === "openai-compat" ? withOpenAICompatChannel(config, input.channel) : config;
+	assertAllowed(studioProfile(requestConfig, input.provider, true, channel?.id), input);
+	const active = resolveProvider(withProviderOverrides(requestConfig, input.provider, input.model));
 	if (active.provider === "comfyui") throw new Error("ComfyUI 暂未接入工作台");
 	if (isSubscriptionProvider(active.provider)) throw new Error("订阅生图应通过订阅渠道执行");
 	const wired = active;
-	const credential = await requireApiKey(ctx, input.provider);
+	const credential = await requireApiKey(ctx, input.provider, void 0, channel?.keyRef);
 	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))) : [];
@@ -27858,16 +28060,16 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 			output = `${aspectRatio}, ${imageSize}`;
 		} else if (wired.provider === "openai" || wired.provider === "openai-compat" || wired.provider === "xai" || wired.provider === "zhipu") {
 			const p = wired.provider;
-			const officialTable = p === "openai" ? officialSizeTable(config, wired.model) : void 0;
+			const officialTable = p === "openai" ? officialSizeTable(requestConfig, wired.model) : void 0;
 			const officialResolution = input.resolution ?? (officialTable ? openAICompatTable({ openaiCompatSizes: officialTable }).find((group) => group.ratio === input.ratio)?.tiers[0]?.tier : void 0) ?? "1K";
-			const size = p === "openai-compat" ? openAIRequestSize(config, input.ratio, input.resolution ?? input.quality) : p === "openai" ? openAIRequestSize({ openaiCompatSizes: officialTable }, input.ratio, officialResolution) : p === "xai" ? void 0 : CLOUD_CAPABILITIES[p].sizeFor?.(input.ratio, input.quality);
+			const size = p === "openai-compat" ? openAIRequestSize(requestConfig, input.ratio, input.resolution ?? input.quality) : p === "openai" ? openAIRequestSize({ openaiCompatSizes: officialTable }, input.ratio, officialResolution) : p === "xai" ? void 0 : CLOUD_CAPABILITIES[p].sizeFor?.(input.ratio, input.quality);
 			if (p === "openai" && size !== void 0) validateOfficialSize(wired.model, size);
 			const requestedQuality = input.generationQuality ?? input.quality;
-			const quality = p === "openai" ? requestedQuality === "auto" ? void 0 : requestedQuality : p === "openai-compat" ? compatRequestQuality(config, input.generationQuality) : p === "zhipu" ? "hd" : void 0;
+			const quality = p === "openai" ? requestedQuality === "auto" ? void 0 : requestedQuality : p === "openai-compat" ? compatRequestQuality(requestConfig, input.generationQuality) : p === "zhipu" ? "hd" : void 0;
 			const extraBody = p === "xai" ? {
 				aspect_ratio: input.ratio,
 				resolution: input.quality
-			} : p === "openai-compat" ? input.mode === "generate" ? compatGenerationExtraBody(config, input.watermark) : compatEditExtraBody(config, input.watermark) : void 0;
+			} : p === "openai-compat" ? input.mode === "generate" ? compatGenerationExtraBody(requestConfig, input.watermark) : compatEditExtraBody(requestConfig, input.watermark) : void 0;
 			generated = input.mode === "edit" ? await editOpenAICompatibleImage({
 				apiKey: credential,
 				baseURL: wired.baseURL,
@@ -27882,7 +28084,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				...p === "openai-compat" ? {
 					editFormat: wired.editFormat,
 					editExtra: wired.editExtra,
-					editSizeMode: config.openaiCompatEditSizeMode ?? "auto"
+					editSizeMode: requestConfig.openaiCompatEditSizeMode ?? "auto"
 				} : p === "xai" ? { editFormat: "xaiJson" } : {}
 			}) : await generateOpenAICompatibleImage({
 				provider: p,
@@ -27967,6 +28169,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 			attachment: single.attachment,
 			output: single.output,
 			provider: input.provider,
+			...channel === void 0 ? {} : { channel: channel.id },
 			model: input.model,
 			prompt: input.prompt,
 			createdAt: Date.now(),
@@ -27997,6 +28200,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 		attachment: first.attachment,
 		output: first.output,
 		provider: input.provider,
+		...channel === void 0 ? {} : { channel: channel.id },
 		model: input.model,
 		prompt: input.prompt,
 		createdAt: Date.now(),
@@ -28120,11 +28324,19 @@ function subscriptionResponse(input, startedAt, requestedCount, failedCount, ite
 		...errors !== void 0 && errors.length > 0 ? { errors } : {}
 	};
 }
-function studioProfile(config, provider, configured) {
-	const result = cloudStudioProfile(config, provider, configured);
+function studioProfile(config, provider, configured, channelId) {
+	const channel = provider === "openai-compat" && channelId !== void 0 ? resolveOpenAICompatChannel(config, channelId) : void 0;
+	const scoped = channel === void 0 ? config : withOpenAICompatChannel(config, channel.id);
+	const result = cloudStudioProfile(scoped, provider, configured);
+	const editModel = provider === "openai-compat" ? scoped.openaiCompatEditModel?.trim() : void 0;
 	return {
 		...result,
-		...watermarkProfile(config, provider, result.model)
+		...channel === void 0 ? {} : {
+			channel: channel.id,
+			label: channel.label
+		},
+		...editModel ? { editModel } : {},
+		...watermarkProfile(scoped, provider, result.model)
 	};
 }
 function cloudStudioProfile(config, provider, configured) {
@@ -28163,7 +28375,14 @@ function cloudStudioProfile(config, provider, configured) {
 /** Output capabilities remain visible before credentials, address or model are configured. */
 function compatibleStudioProfile(config, model, configured) {
 	const groups = openAICompatTable(config);
-	const qualityProfile = {
+	const capabilityProfile = {
+		modelOptions: resolveOpenAICompatModels({
+			...config,
+			openaiCompatModel: model
+		}).map((value) => ({
+			value,
+			label: value
+		})),
 		generationQualityOptions: compatQualityOptions(config),
 		defaultGenerationQuality: compatRequestQuality(config) ?? "__default__",
 		resolutionOptions: Object.fromEntries(groups.map((group) => [group.ratio, group.tiers.map((entry) => ({
@@ -28180,7 +28399,7 @@ function compatibleStudioProfile(config, model, configured) {
 			value: "standard",
 			label: "标准（推荐）"
 		}], "1:1", "standard"),
-		...qualityProfile,
+		...capabilityProfile,
 		resolutionOptions: Object.fromEntries(groups.map((group) => [group.ratio, [{
 			value: "standard",
 			label: `标准 · ${group.tiers[0].size}`
@@ -28188,7 +28407,7 @@ function compatibleStudioProfile(config, model, configured) {
 	};
 	return {
 		...openAICompatStudioProfile(config, model, configured),
-		...qualityProfile
+		...capabilityProfile
 	};
 }
 function profile(provider, model, configured, ratioOptions, qualityOptions, defaultRatio, defaultQuality) {
@@ -28221,7 +28440,7 @@ function option(value) {
 	};
 }
 function assertAllowed(profile, input) {
-	if (input.model !== profile.model) throw new Error("模型配置已变化，请刷新工作台后重试");
+	if (!studioModelOptionsForMode(profile, input.mode).some((option) => option.value === input.model)) throw new Error("模型配置已变化，请刷新工作台后重试");
 	if (!profile.ratioOptions.some((option) => option.value === input.ratio)) throw new Error("该 Provider 不支持所选比例");
 	const selectedQuality = input.provider === "openai" ? input.generationQuality ?? input.quality : input.resolution ?? input.quality;
 	if (!profile.qualityOptions.some((option) => option.value === selectedQuality)) throw new Error("该 Provider 不支持所选清晰度");
@@ -28272,8 +28491,6 @@ async function serveStudio(req, res, deps) {
 	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError$1(res, 415, "json-required");
 	const controller = new AbortController();
 	const watchdog = new AbortController();
-	const CLOUD_WATCHDOG_MS = 15e4;
-	let subscriptionChannel = false;
 	const signal = AbortSignal.any([controller.signal, watchdog.signal]);
 	const onConnectionClose = () => {
 		if (!res.writableEnded) controller.abort(/* @__PURE__ */ new Error("The browser closed the image generation request."));
@@ -28290,10 +28507,12 @@ async function serveStudio(req, res, deps) {
 		} catch (error) {
 			return jsonError$1(res, 400, errorMessage(error, "invalid-request"));
 		}
-		subscriptionChannel = isSubscriptionProvider(input.provider);
-		setTimeout(() => {
+		const subscriptionChannel = isSubscriptionProvider(input.provider);
+		const timeoutMs = subscriptionChannel ? SUBSCRIPTION_TIMEOUT_MS : deps.timeoutMs ?? 15e4;
+		const timeout = setTimeout(() => {
 			watchdog.abort();
-		}, subscriptionChannel ? SUBSCRIPTION_TIMEOUT_MS : CLOUD_WATCHDOG_MS).unref?.();
+		}, timeoutMs);
+		timeout.unref?.();
 		res.writeHead(200, {
 			"content-type": "application/json; charset=utf-8",
 			"cache-control": "no-store",
@@ -28308,11 +28527,12 @@ async function serveStudio(req, res, deps) {
 				res.end(JSON.stringify(output));
 			} catch (error) {
 				if (res.destroyed || res.writableEnded) return;
-				const message = watchdog.signal.aborted ? subscriptionChannel ? "上游生成超时（订阅通道 300 秒未返回），请稍后重试" : "上游生成超时（150 秒未返回），请检查网络或代理后重试" : errorMessage(error, "generation-failed");
+				const message = watchdog.signal.aborted ? subscriptionChannel ? `上游生成超时（订阅通道 ${String(Math.round(timeoutMs / 1e3))} 秒未返回），请稍后重试；${UPSTREAM_TIMEOUT_HINT}` : `上游生成超时（${String(Math.round(timeoutMs / 1e3))} 秒未返回），请检查网络或代理后重试；${UPSTREAM_TIMEOUT_HINT}` : errorMessage(error, "generation-failed");
 				res.end(JSON.stringify({ error: message }));
 			}
 		} finally {
 			clearInterval(heartbeat);
+			clearTimeout(timeout);
 		}
 	} catch (error) {
 		if (res.headersSent || res.writableEnded || res.destroyed) return;
@@ -28328,6 +28548,8 @@ function parseStudioGenerateRequest(value) {
 	if (input === void 0) throw new Error("请求格式无效");
 	if (input.mode !== "generate" && input.mode !== "edit") throw new Error("请选择生成类型");
 	if (!studioProvider(input.provider)) throw new Error("不支持该图像 Provider");
+	if (input.channel !== void 0 && input.provider !== "openai-compat") throw new Error("仅 OpenAI 兼容 Provider 支持选择渠道");
+	const channel = input.channel === void 0 ? void 0 : requiredText(input.channel, "请选择渠道", 100);
 	const prompt = requiredText(input.prompt, "请输入提示词");
 	const model = requiredText(input.model, "请选择模型", 200);
 	const ratio = requiredText(input.ratio, "请选择比例", 32);
@@ -28348,6 +28570,7 @@ function parseStudioGenerateRequest(value) {
 	return {
 		mode: input.mode,
 		provider: input.provider,
+		...channel === void 0 ? {} : { channel },
 		model,
 		prompt,
 		ratio,
@@ -28706,12 +28929,17 @@ async function serveTestConnection(req, res, deps) {
 	const provider = record(body)?.provider;
 	if (typeof provider !== "string" || !IMAGE_PROVIDERS.includes(provider)) return jsonError(res, 400, "invalid-provider");
 	const active = provider;
-	if (record(body)?.action === "models") {
+	const action = record(body)?.action;
+	const rawChannel = record(body)?.channel;
+	if (rawChannel !== void 0 && (typeof rawChannel !== "string" || rawChannel.trim().length === 0 || active !== "openai-compat")) return jsonError(res, 400, "invalid-channel");
+	const channel = typeof rawChannel === "string" ? rawChannel.trim() : void 0;
+	const requestConfig = () => active === "openai-compat" ? withOpenAICompatChannel(deps.config(), channel) : deps.config();
+	if (action === "models") {
 		if (active === "comfyui" || isSubscriptionProvider(active)) return jsonError(res, 400, "models-unsupported");
 		let result;
 		try {
-			const apiKey = await deps.resolveKey(active);
-			result = active === "google" ? await fetchGoogleImageModels(deps.config(), apiKey) : active === "dashscope" ? await fetchDashScopeImageModels(deps.config(), apiKey) : await fetchOpenAIImageModels(active, deps.config(), apiKey);
+			const apiKey = await deps.resolveKey(active, channel);
+			result = active === "google" ? await fetchGoogleImageModels(requestConfig(), apiKey) : active === "dashscope" ? await fetchDashScopeImageModels(requestConfig(), apiKey) : await fetchOpenAIImageModels(active, requestConfig(), apiKey);
 		} catch (error) {
 			result = {
 				ok: false,
@@ -28726,8 +28954,8 @@ async function serveTestConnection(req, res, deps) {
 		if (active === "comfyui") result = await probeComfyUIConnection(deps.config());
 		else if (isSubscriptionProvider(active)) result = await probeSubscriptionConnection(active, deps.subscriptionManager);
 		else {
-			const apiKey = await deps.resolveKey(active);
-			result = await probeProviderConnection(active, deps.config(), apiKey);
+			const apiKey = await deps.resolveKey(active, channel);
+			result = await probeProviderConnection(active, requestConfig(), apiKey);
 		}
 	} catch (error) {
 		result = {
@@ -28791,20 +29019,65 @@ function serveSettingsHealth(req, res, health) {
 	res.end(JSON.stringify(health));
 }
 //#endregion
+//#region lib/types/image-tool-context.js
+/** Live, credential-free instructions for the conversation model's image tools. */
+function imageToolContext(config) {
+	const provider = config.provider ?? "google";
+	let model = "not configured";
+	let editModel = model;
+	try {
+		const active = resolveProvider(config);
+		model = active.provider === "comfyui" ? active.workflow?.name ?? "workflow selected in settings" : active.model;
+		const edit = resolveProvider(withProviderOverrides(config, void 0, void 0, "edit"));
+		editModel = edit.provider === "comfyui" ? edit.workflow?.name ?? model : edit.model;
+	} catch {}
+	return [
+		`Image tools current default provider: ${provider}; generation model: ${JSON.stringify(model)}; editing model: ${JSON.stringify(editModel)}.`,
+		"Unless the user explicitly requests a different image provider or model, OMIT provider and model from generate_image, generate_images and edit_image. Do not guess a channel or switch channels after an error.",
+		"Omit unused optional arguments entirely; never fill them with empty strings. size and aspect_ratio are alternatives: provide at most one.",
+		"Subscription parameters: chatgpt-sub accepts size OR aspect_ratio, but NOT image_size. grok-sub image_size: 1K or 2K. google-sub image_size: 1K or 4K. Do not copy parameters from another provider.",
+		"Minimal calls: generate_image({\"prompt\":\"a sailboat\"}); edit_image({\"prompt\":\"make the sail blue\"}). A valid ChatGPT subscription ratio example is {\"prompt\":\"a sailboat\",\"aspect_ratio\":\"1:1\"} with image_size and size omitted."
+	].join("\n");
+}
+//#endregion
 //#region lib/types/index.js
 const name = "dsh-image-gen";
 const inject = [
 	"tools",
 	"attachments",
-	"credentials",
-	"webServer"
+	"credentials"
 ];
+/** Optional strings from tool callers may contain empty placeholders (#86). */
+function cleanImageToolArgs(args) {
+	const clean = { ...args };
+	const fields = clean;
+	for (const key of [
+		"model",
+		"channel",
+		"size",
+		"aspect_ratio",
+		"image_size",
+		"quality",
+		"workflow"
+	]) {
+		const value = fields[key];
+		if (typeof value !== "string") continue;
+		if (value.trim().length === 0) delete fields[key];
+		else fields[key] = value.trim();
+	}
+	return clean;
+}
 /** 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 configForToolCall(config, provider, channel) {
+	const selected = provider ?? config.provider ?? "google";
+	if (channel !== void 0 && selected !== "openai-compat") throw new Error("The channel argument is only supported with provider=openai-compat.");
+	return selected === "openai-compat" ? withOpenAICompatChannel(config, channel) : config;
+}
 function apply(ctx, config = {}) {
 	const plainConfig = (source) => {
 		const out = {};
@@ -28815,143 +29088,155 @@ function apply(ctx, config = {}) {
 	const knownWorkspaceRoots = /* @__PURE__ */ new Set();
 	const canvasMirror = new CanvasMirror();
 	const subscriptionManager = new SubscriptionManager(ctx);
-	registerSubscriptionRoutes(ctx, subscriptionManager);
 	const settingsHealth = installImageSettings(ctx, current(), {
 		setSource: (source) => {
 			current = () => migrateOpenAICompatConfig(plainConfig(source()));
 		},
 		onChange: () => {}
 	});
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: SETTINGS_HEALTH_ROUTE,
-		handler: (req, res) => serveSettingsHealth(req, res, settingsHealth())
-	}), "dsh-image-gen: settings health");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: IMAGE_ROUTE,
-		handler: (req, res) => serveImage(req, res, { readImage: (ref) => ctx.attachments.readImage(ref) })
-	}), "dsh-image-gen: image route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: IMPORT_ROUTE,
-		handler: (req, res) => serveImport(req, res, {
-			saveImage: (image) => ctx.attachments.saveImage(image),
-			maxImageBytes: ctx.attachments.imageLimits.maxImageBytes,
-			mediaTypes: ctx.attachments.imageLimits.mediaTypes
-		})
-	}), "dsh-image-gen: import route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: DELETE_ROUTE,
-		handler: (req, res) => serveDelete(req, res, { deleteWorkspaceImage: async (filePath) => {
-			const discovered = await getDshWorkspaceRoots().catch(() => []);
-			return deleteImageFromWorkspace(filePath, /* @__PURE__ */ new Set([
-				...knownWorkspaceRoots,
-				...discovered,
-				process.cwd()
-			]));
-		} })
-	}), "dsh-image-gen: delete route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: SAVE_WORKSPACE_ROUTE,
-		handler: (req, res) => serveSaveWorkspace(req, res, {
-			readImage: (ref) => ctx.attachments.readImage(ref),
-			saveToWorkspace: (options) => {
-				if (options.workspaceRoot) knownWorkspaceRoots.add(options.workspaceRoot);
-				return saveImageToWorkspace({
-					workspaceRoot: options.workspaceRoot,
-					folder: current().workspaceFolder,
-					attachmentId: options.attachmentId,
-					mediaType: options.mediaType,
-					data: options.data
-				});
-			},
-			getActiveWorkspaceRoot: () => Array.from(knownWorkspaceRoots)[0] || process.cwd(),
-			getAllowedWorkspaceRoots: async () => {
+	ctx.inject(["webServer"], (webCtx) => {
+		registerSubscriptionRoutes(webCtx, subscriptionManager);
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: SETTINGS_HEALTH_ROUTE,
+			handler: (req, res) => serveSettingsHealth(req, res, settingsHealth())
+		}), "dsh-image-gen: settings health");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: IMAGE_ROUTE,
+			handler: (req, res) => serveImage(req, res, { readImage: (ref) => ctx.attachments.readImage(ref) })
+		}), "dsh-image-gen: image route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: IMPORT_ROUTE,
+			handler: (req, res) => serveImport(req, res, {
+				saveImage: (image) => ctx.attachments.saveImage(image),
+				maxImageBytes: ctx.attachments.imageLimits.maxImageBytes,
+				mediaTypes: ctx.attachments.imageLimits.mediaTypes
+			})
+		}), "dsh-image-gen: import route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: DELETE_ROUTE,
+			handler: (req, res) => serveDelete(req, res, { deleteWorkspaceImage: async (filePath) => {
 				const discovered = await getDshWorkspaceRoots().catch(() => []);
-				return /* @__PURE__ */ new Set([
+				return deleteImageFromWorkspace(filePath, /* @__PURE__ */ new Set([
 					...knownWorkspaceRoots,
 					...discovered,
 					process.cwd()
-				]);
-			},
-			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(),
-			subscriptionManager
-		})
-	}), "dsh-image-gen: test connection route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: CANVAS_STATE_ROUTE,
-		handler: (req, res) => serveCanvasState(req, res, {
-			mirror: canvasMirror,
-			maxBodyBytes: Math.ceil(ctx.attachments.imageLimits.maxImageBytes * 1.4) + 262144,
-			maxImageBytes: ctx.attachments.imageLimits.maxImageBytes
-		})
-	}), "dsh-image-gen: canvas state route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: CANVAS_ASSET_ROUTE,
-		handler: (req, res) => serveCanvasAsset(req, res, {
-			maxImageBytes: ctx.attachments.imageLimits.maxImageBytes,
-			saveImage: (image) => ctx.attachments.saveImage(image)
-		})
-	}), "dsh-image-gen: canvas asset route");
+				]));
+			} })
+		}), "dsh-image-gen: delete route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: SAVE_WORKSPACE_ROUTE,
+			handler: (req, res) => serveSaveWorkspace(req, res, {
+				readImage: (ref) => ctx.attachments.readImage(ref),
+				saveToWorkspace: (options) => {
+					if (options.workspaceRoot) knownWorkspaceRoots.add(options.workspaceRoot);
+					return saveImageToWorkspace({
+						workspaceRoot: options.workspaceRoot,
+						folder: current().workspaceFolder,
+						attachmentId: options.attachmentId,
+						mediaType: options.mediaType,
+						data: options.data
+					});
+				},
+				getActiveWorkspaceRoot: () => Array.from(knownWorkspaceRoots)[0] || process.cwd(),
+				getAllowedWorkspaceRoots: async () => {
+					const discovered = await getDshWorkspaceRoots().catch(() => []);
+					return /* @__PURE__ */ new Set([
+						...knownWorkspaceRoots,
+						...discovered,
+						process.cwd()
+					]);
+				},
+				isSaveEnabled: () => current().saveToWorkspace !== false
+			})
+		}), "dsh-image-gen: save workspace route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: TEST_CONNECTION_ROUTE,
+			handler: (req, res) => serveTestConnection(req, res, {
+				resolveKey: (provider, channel) => resolveApiKey(ctx, provider, provider === "openai-compat" ? resolveOpenAICompatChannel(current(), channel).keyRef : void 0),
+				config: () => current(),
+				subscriptionManager
+			})
+		}), "dsh-image-gen: test connection route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: CANVAS_STATE_ROUTE,
+			handler: (req, res) => serveCanvasState(req, res, {
+				mirror: canvasMirror,
+				maxBodyBytes: Math.ceil(ctx.attachments.imageLimits.maxImageBytes * 1.4) + 262144,
+				maxImageBytes: ctx.attachments.imageLimits.maxImageBytes
+			})
+		}), "dsh-image-gen: canvas state route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: CANVAS_ASSET_ROUTE,
+			handler: (req, res) => serveCanvasAsset(req, res, {
+				maxImageBytes: ctx.attachments.imageLimits.maxImageBytes,
+				saveImage: (image) => ctx.attachments.saveImage(image)
+			})
+		}), "dsh-image-gen: canvas asset route");
+	});
 	ctx.inject(["systemPrompt"], (promptCtx) => {
-		promptCtx.systemPrompt.context({
+		promptCtx.effect(() => promptCtx.systemPrompt.context({
+			name: "dsh-image-gen:image-defaults",
+			order: 59,
+			text: () => imageToolContext(current())
+		}), "dsh-image-gen: image tool context");
+		promptCtx.effect(() => promptCtx.systemPrompt.context({
 			name: "dsh-image-gen:canvas",
 			order: 60,
 			text: () => canvasMirror.digest()
-		});
+		}), "dsh-image-gen: canvas context");
 	});
 	registerCanvasTools(ctx, canvasMirror, { persistSelectionImage: (image) => ctx.attachments.saveImage({
 		data: image.data,
 		mediaType: image.mediaType,
 		name: "canvas-selection"
 	}) });
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: STUDIO_ROUTE,
-		handler: (req, res) => serveStudio(req, res, {
-			describe: async () => {
-				const base = await describeStudio(ctx, current(), subscriptionManager);
-				const workspaces = await getDshWorkspacesFull().catch(() => []);
-				const activeRoot = Array.from(knownWorkspaceRoots)[0] || workspaces[0]?.path || process.cwd();
-				return {
-					...base,
-					workspaceRoot: activeRoot,
-					workspaces
-				};
-			},
-			generate: (input, signal) => {
-				const fallbackRoot = Array.from(knownWorkspaceRoots)[0] || process.cwd();
-				return generateFromStudio(ctx, current(), input, signal, fallbackRoot, subscriptionManager);
-			},
-			maxBodyBytes: Math.ceil(ctx.attachments.imageLimits.maxImageBytes * 1.4 * 5) + 262144
-		})
-	}), "dsh-image-gen: studio route");
-	const serveInspiration = createInspirationRoute();
-	ctx.effect(() => ctx.webServer.register({
-		kind: "prefix",
-		path: INSPIRATION_ROUTE,
-		handler: (req, res) => {
-			const originalUrl = req.url ?? "/";
-			req.url = originalUrl.startsWith("/plugins/dsh-image-gen/inspiration") ? originalUrl.slice(34) || "/" : originalUrl;
-			return serveInspiration(req, res);
-		}
-	}), "dsh-image-gen: inspiration route");
+	ctx.inject(["webServer"], (webCtx) => {
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: STUDIO_ROUTE,
+			handler: (req, res) => serveStudio(req, res, {
+				describe: async () => {
+					const base = await describeStudio(ctx, current(), subscriptionManager);
+					const workspaces = await getDshWorkspacesFull().catch(() => []);
+					const activeRoot = Array.from(knownWorkspaceRoots)[0] || workspaces[0]?.path || process.cwd();
+					return {
+						...base,
+						workspaceRoot: activeRoot,
+						workspaces
+					};
+				},
+				generate: (input, signal) => {
+					const fallbackRoot = Array.from(knownWorkspaceRoots)[0] || process.cwd();
+					return generateFromStudio(ctx, current(), input, signal, fallbackRoot, subscriptionManager);
+				},
+				maxBodyBytes: Math.ceil(ctx.attachments.imageLimits.maxImageBytes * 1.4 * 5) + 262144,
+				timeoutMs: current().cloudTimeoutMs ?? 15e4
+			})
+		}), "dsh-image-gen: studio route");
+		const serveInspiration = createInspirationRoute();
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "prefix",
+			path: INSPIRATION_ROUTE,
+			handler: (req, res) => {
+				const originalUrl = req.url ?? "/";
+				req.url = originalUrl.startsWith("/plugins/dsh-image-gen/inspiration") ? originalUrl.slice(34) || "/" : originalUrl;
+				return serveInspiration(req, res);
+			}
+		}), "dsh-image-gen: inspiration route");
+	});
 	/** Per-item generation request shared by generate_image and generate_images. */
-	const generateSingle = async (args, exec) => {
-		const active = resolveProvider(withProviderOverrides(current(), providerOverrideOf(args.provider), args.model));
+	const generateSingle = async (rawArgs, exec) => {
+		const args = cleanImageToolArgs(rawArgs);
+		const requestConfig = configForToolCall(current(), providerOverrideOf(args.provider), args.channel);
+		const active = resolveProvider(withProviderOverrides(requestConfig, providerOverrideOf(args.provider), args.model));
 		if (active.provider === "comfyui") {
 			const workflow = selectComfyUIWorkflow(active, args.workflow);
 			return saveGenerated(ctx, await generateComfyUIImage({
@@ -28978,11 +29263,12 @@ function apply(ctx, config = {}) {
 				signal: exec.signal
 			}), active.provider, active.model, "subscription", current(), exec, knownWorkspaceRoots);
 		}
-		const credential = await requireApiKey(ctx, active.provider, "generate_image");
+		const runCloud = (operation) => withGenerationTimeout(current().cloudTimeoutMs ?? 15e4, exec.signal, operation);
+		const credential = await requireApiKey(ctx, active.provider, "generate_image", active.provider === "openai-compat" ? resolveOpenAICompatChannel(requestConfig, args.channel).keyRef : void 0);
 		if (active.provider === "google") {
 			const aspectRatio = args.aspect_ratio ?? active.aspectRatio;
 			const imageSize = args.image_size ?? active.imageSize;
-			return saveGenerated(ctx, await generateGoogleImage({
+			return saveGenerated(ctx, await runCloud((signal) => generateGoogleImage({
 				apiKey: credential,
 				endpoint: active.endpoint,
 				native: active.native,
@@ -28991,20 +29277,20 @@ function apply(ctx, config = {}) {
 				aspectRatio,
 				imageSize,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-				signal: exec.signal
-			}), active.provider, active.model, `${aspectRatio}, ${imageSize}`, current(), exec, knownWorkspaceRoots);
+				signal
+			})), active.provider, active.model, `${aspectRatio}, ${imageSize}`, current(), exec, knownWorkspaceRoots);
 		}
 		if (active.provider === "dashscope") {
 			const size = args.size ?? active.imageSize;
-			return saveGenerated(ctx, await generateDashScopeImage({
+			return saveGenerated(ctx, await runCloud((signal) => generateDashScopeImage({
 				apiKey: credential,
 				endpoint: active.endpoint,
 				model: active.model,
 				prompt: args.prompt,
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-				signal: exec.signal
-			}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
+				signal
+			})), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 		}
 		if (active.provider === "xai") {
 			const extraBody = xaiToolParameters({
@@ -29012,7 +29298,7 @@ function apply(ctx, config = {}) {
 				...args.image_size !== void 0 ? { imageSize: args.image_size } : {},
 				...args.size !== void 0 ? { size: args.size } : {}
 			});
-			return saveGenerated(ctx, await generateOpenAICompatibleImage({
+			return saveGenerated(ctx, await runCloud((signal) => generateOpenAICompatibleImage({
 				provider: "xai",
 				apiKey: credential,
 				baseURL: active.baseURL,
@@ -29020,15 +29306,15 @@ function apply(ctx, config = {}) {
 				prompt: args.prompt,
 				extraBody,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-				signal: exec.signal
-			}), active.provider, active.model, extraBody.aspect_ratio ?? "auto", current(), exec, knownWorkspaceRoots);
+				signal
+			})), active.provider, active.model, extraBody.aspect_ratio ?? "auto", current(), exec, knownWorkspaceRoots);
 		}
 		const size = args.size ?? active.imageSize;
 		const arkOptions = active.provider === "seedream" ? active.arkOptions : void 0;
 		if (active.provider === "openai") validateOfficialSize(active.model, size);
-		const quality = active.provider === "openai-compat" ? compatRequestQuality(current(), args.quality) : active.provider === "openai" ? args.quality : void 0;
+		const quality = active.provider === "openai-compat" ? compatRequestQuality(requestConfig, args.quality) : active.provider === "openai" ? args.quality : void 0;
 		if (active.provider === "openai" && quality !== void 0 && !officialQualityOptions(active.model).some((option) => option.value === quality)) throw new Error("该 OpenAI 模型不支持所选生成质量");
-		return saveGenerated(ctx, await generateOpenAICompatibleImage({
+		const value = await saveGenerated(ctx, await runCloud((signal) => generateOpenAICompatibleImage({
 			provider: active.provider,
 			apiKey: credential,
 			baseURL: active.baseURL,
@@ -29036,11 +29322,15 @@ function apply(ctx, config = {}) {
 			prompt: args.prompt,
 			size,
 			maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-			signal: exec.signal,
+			signal,
 			...quality === void 0 ? {} : { quality },
-			...active.provider === "openai-compat" ? { extraBody: current().openaiCompatExtraBody ?? {} } : {},
+			...active.provider === "openai-compat" ? { extraBody: requestConfig.openaiCompatExtraBody ?? {} } : {},
 			...arkOptions === void 0 ? {} : { arkOptions }
-		}), active.provider, active.model, quality === void 0 ? size : `${size}, quality=${quality}`, current(), exec, knownWorkspaceRoots);
+		})), active.provider, active.model, quality === void 0 ? size : `${size}, quality=${quality}`, current(), exec, knownWorkspaceRoots);
+		return active.provider === "openai-compat" ? {
+			...value,
+			channel: resolveOpenAICompatChannel(requestConfig, args.channel).id
+		} : value;
 	};
 	ctx.tools.register(defineTool({
 		name: "generate_image",
@@ -29066,12 +29356,16 @@ function apply(ctx, config = {}) {
 					"grok-sub",
 					"google-sub"
 				],
-				description: "Optional provider for this call only (for example when the user asks to use a specific provider); omit to use the configured default. chatgpt-sub, grok-sub, and google-sub generate through the logged-in subscription account instead of an API key."
+				description: "OMIT unless the user explicitly requests a specific image provider. Omission uses the saved default; never guess a channel or fill this with an empty string. chatgpt-sub, grok-sub, and google-sub use logged-in subscription accounts instead of API keys."
 			},
 			model: {
 				type: "string",
 				description: "Optional model name for this call only, overriding the configured model. Not used by ComfyUI (use workflow instead) nor by the subscription providers (model fixed by the subscription)."
 			},
+			channel: {
+				type: "string",
+				description: "Optional configured OpenAI-compatible channel id for this call only. Only meaningful with provider=openai-compat; omit to use the active channel."
+			},
 			aspect_ratio: {
 				type: "string",
 				enum: [
@@ -29095,11 +29389,11 @@ function apply(ctx, config = {}) {
 					"2K",
 					"4K"
 				],
-				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K)."
+				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K). NEVER send this for chatgpt-sub; omit unused fields entirely."
 			},
 			size: {
 				type: "string",
-				description: "Optional dimensions or size tier for OpenAI, Seedream, or DashScope; WIDTHxHEIGHT maps to aspect_ratio for xAI Grok."
+				description: "Optional dimensions or size tier for OpenAI, Seedream, or DashScope; WIDTHxHEIGHT maps to aspect_ratio for xAI Grok. Do not combine with aspect_ratio; omit instead of using an empty string."
 			},
 			quality: {
 				type: "string",
@@ -29141,12 +29435,16 @@ function apply(ctx, config = {}) {
 					"grok-sub",
 					"google-sub"
 				],
-				description: "Optional provider for this call only, applied to every item; omit to use the configured default."
+				description: "OMIT unless the user explicitly requests a specific image provider. Uses the saved default for all items; never guess a channel or fill unused fields with empty strings."
 			},
 			model: {
 				type: "string",
 				description: "Optional model name for this call only, applied to every item."
 			},
+			channel: {
+				type: "string",
+				description: "Optional configured OpenAI-compatible channel id applied to every item; omit to use the active channel."
+			},
 			aspect_ratio: {
 				type: "string",
 				enum: [
@@ -29170,7 +29468,7 @@ function apply(ctx, config = {}) {
 					"2K",
 					"4K"
 				],
-				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K)."
+				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K). NEVER send this for chatgpt-sub; omit unused fields entirely."
 			},
 			size: {
 				type: "string",
@@ -29242,6 +29540,7 @@ function apply(ctx, config = {}) {
 									type: "string",
 									required: true
 								},
+								channel: { type: "string" },
 								model: {
 									type: "string",
 									required: true
@@ -29314,6 +29613,7 @@ function apply(ctx, config = {}) {
 						prompt,
 						...args.provider !== void 0 ? { provider: args.provider } : {},
 						...args.model !== void 0 ? { model: args.model } : {},
+						...args.channel !== void 0 ? { channel: args.channel } : {},
 						...args.aspect_ratio !== void 0 ? { aspect_ratio: args.aspect_ratio } : {},
 						...args.image_size !== void 0 ? { image_size: args.image_size } : {},
 						...args.size !== void 0 ? { size: args.size } : {},
@@ -29363,12 +29663,16 @@ function apply(ctx, config = {}) {
 					"grok-sub",
 					"google-sub"
 				],
-				description: "Optional provider for this call only (for example when the user asks to use a specific provider); omit to use the configured default. chatgpt-sub, grok-sub, and google-sub edit images through the logged-in subscription account instead of an API key."
+				description: "OMIT unless the user explicitly requests a specific image provider. Omission uses the saved default; never guess a channel or fill this with an empty string. Subscription providers edit through their logged-in accounts."
 			},
 			model: {
 				type: "string",
 				description: "Optional model name for this call only, overriding the configured model. Not used by ComfyUI (use workflow instead) nor by the subscription providers (model fixed by the subscription)."
 			},
+			channel: {
+				type: "string",
+				description: "Optional configured OpenAI-compatible channel id for this call only. Only meaningful with provider=openai-compat; omit to use the active channel."
+			},
 			source: {
 				type: "string",
 				enum: ["canvas_selection"],
@@ -29415,7 +29719,7 @@ function apply(ctx, config = {}) {
 					"2K",
 					"4K"
 				],
-				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K)."
+				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K). NEVER send this for chatgpt-sub; omit unused fields entirely."
 			},
 			size: {
 				type: "string",
@@ -29431,8 +29735,10 @@ function apply(ctx, config = {}) {
 			}
 		},
 		output: imageOutput("Edited"),
-		async execute(args, exec) {
-			const active = resolveProvider(withProviderOverrides(current(), providerOverrideOf(args.provider), args.model));
+		async execute(rawArgs, exec) {
+			const args = cleanImageToolArgs(rawArgs);
+			const requestConfig = configForToolCall(current(), providerOverrideOf(args.provider), args.channel);
+			const active = resolveProvider(withProviderOverrides(requestConfig, providerOverrideOf(args.provider), args.model, "edit"));
 			const canvasSelection = args.source === "canvas_selection";
 			if (canvasSelection && (args.source_attachment_id !== void 0 || Array.isArray(args.source_attachment_ids) || args.source_path !== void 0 || Array.isArray(args.source_paths))) throw new Error("edit_image source=canvas_selection cannot be combined with source_attachment_id, source_attachment_ids, source_path, or source_paths; provide exactly one selector");
 			const sourceImages = canvasSelection ? await resolveCanvasSelectionReferences({
@@ -29486,7 +29792,7 @@ function apply(ctx, config = {}) {
 					signal: exec.signal
 				}), active.provider, active.model, "subscription edit", current(), exec, knownWorkspaceRoots);
 			}
-			const credential = await requireApiKey(ctx, active.provider, "edit_image");
+			const credential = await requireApiKey(ctx, active.provider, "edit_image", active.provider === "openai-compat" ? resolveOpenAICompatChannel(requestConfig, args.channel).keyRef : void 0);
 			if (active.provider === "google") {
 				const aspectRatio = args.aspect_ratio ?? active.aspectRatio;
 				const imageSize = args.image_size ?? active.imageSize;
@@ -29506,14 +29812,14 @@ function apply(ctx, config = {}) {
 			const size = args.size ?? active.imageSize;
 			if (active.provider === "openai" || active.provider === "openai-compat" || active.provider === "xai" || active.provider === "zhipu") {
 				if (active.provider === "openai") validateOfficialSize(active.model, size);
-				const quality = active.provider === "openai-compat" ? compatRequestQuality(current(), args.quality) : active.provider === "openai" ? args.quality : void 0;
+				const quality = active.provider === "openai-compat" ? compatRequestQuality(requestConfig, args.quality) : active.provider === "openai" ? args.quality : void 0;
 				if (active.provider === "openai" && quality !== void 0 && !officialQualityOptions(active.model).some((option) => option.value === quality)) throw new Error("该 OpenAI 模型不支持所选生成质量");
 				const xaiExtraBody = active.provider === "xai" ? xaiToolParameters({
 					...args.aspect_ratio !== void 0 ? { aspectRatio: args.aspect_ratio } : {},
 					...args.image_size !== void 0 ? { imageSize: args.image_size } : {},
 					...args.size !== void 0 ? { size: args.size } : {}
 				}) : void 0;
-				return saveGenerated(ctx, await editOpenAICompatibleImage({
+				const value = await saveGenerated(ctx, await editOpenAICompatibleImage({
 					apiKey: credential,
 					baseURL: active.baseURL,
 					model: active.model,
@@ -29526,12 +29832,16 @@ function apply(ctx, config = {}) {
 					...active.provider === "openai-compat" ? {
 						editFormat: active.editFormat,
 						editExtra: active.editExtra,
-						editSizeMode: current().openaiCompatEditSizeMode ?? "auto"
+						editSizeMode: requestConfig.openaiCompatEditSizeMode ?? "auto"
 					} : active.provider === "xai" ? {
 						editFormat: "xaiJson",
 						...xaiExtraBody === void 0 ? {} : { extraBody: xaiExtraBody }
 					} : {}
 				}), active.provider, active.model, active.provider === "xai" ? xaiExtraBody?.aspect_ratio ?? "auto" : quality === void 0 ? size : `${size}, quality=${quality}`, current(), exec, knownWorkspaceRoots);
+				return active.provider === "openai-compat" ? {
+					...value,
+					channel: resolveOpenAICompatChannel(requestConfig, args.channel).id
+				} : value;
 			}
 			if (active.provider === "seedream") return saveGenerated(ctx, await editSeedreamImage({
 				apiKey: credential,
@@ -29696,6 +30006,7 @@ function imageOutput(verb) {
 					type: "string",
 					required: true
 				},
+				channel: { type: "string" },
 				model: {
 					type: "string",
 					required: true
@@ -29726,6 +30037,7 @@ function imageOutput(verb) {
 			provider: value.provider,
 			model: value.model,
 			output: value.output,
+			...value.channel === void 0 ? {} : { channel: value.channel },
 			...verb === "Edited" ? { operation: "edit" } : {},
 			...typeof value.savedTo === "string" ? { savedTo: value.savedTo } : {},
 			...typeof value.seed === "number" ? { seed: value.seed } : {},