@dickpy/dsh-imagegen 1.3.0 → 1.4.0

package/lib/index.js

@@ -16,7 +16,7 @@ import { defineTool } from "@deepseek-ai/dsh-tools";
 /** Settings namespace this plugin owns (host settings seam + bridge). */
 const IMAGEGEN_SETTINGS_NAMESPACE = "dsh-imagegen";
 /** Published package version shared by the host updater and the client UI. */
-const PLUGIN_VERSION = "1.3.0";
+const PLUGIN_VERSION = "1.3.1";
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 const SETTINGS_API = {
 	describe: "/api/dsh-imagegen/settings/describe",
@@ -91,94 +91,6 @@ const TEMPLATES_API = {
 	image: "/api/dsh-imagegen/templates/image"
 };
 //#endregion
-//#region src/prompt-enhancer.ts
-function endpoint(base, suffix) {
-	return `${base.replace(/\/+$/, "")}${suffix}`;
-}
-function headers(apiKey) {
-	return {
-		"content-type": "application/json",
-		...apiKey.trim() === "" ? {} : { authorization: `Bearer ${apiKey.trim()}` }
-	};
-}
-async function responseJson(response) {
-	const body = await response.json().catch(() => void 0);
-	if (!response.ok || body === void 0 || body === null || typeof body !== "object") {
-		const message = body !== null && typeof body === "object" && typeof body.error?.message === "string" ? body.error.message : `HTTP ${response.status}`;
-		throw new Error(message);
-	}
-	return body;
-}
-/** List candidates exposed by an OpenAI-compatible endpoint. */
-async function listOpenAIModels(config) {
-	if (config.apiUrl.trim() === "") throw new Error("API URL is required");
-	const body = await responseJson(await fetch(endpoint(config.apiUrl, "/models"), { headers: headers(config.apiKey) }));
-	const data = Array.isArray(body.data) ? body.data : [];
-	return [...new Set(data.flatMap((item) => item !== null && typeof item === "object" && typeof item.id === "string" ? [item.id.trim()] : []).filter(Boolean))].sort((a, b) => a.localeCompare(b));
-}
-/** List chat models exposed by an OpenAI-compatible endpoint. */
-async function listPromptModels(config) {
-	return listOpenAIModels(config);
-}
-/** Expand a concise image request into a production-ready image prompt. */
-async function enhancePrompt(config, prompt) {
-	if (config.apiUrl.trim() === "" || config.model.trim() === "") throw new Error("prompt enhancement model is not configured");
-	const body = await responseJson(await fetch(endpoint(config.apiUrl, "/chat/completions"), {
-		method: "POST",
-		headers: headers(config.apiKey),
-		body: JSON.stringify({
-			model: config.model.trim(),
-			temperature: .7,
-			messages: [{
-				role: "system",
-				content: "You are an expert image-prompt editor. Expand the user request into one vivid, specific image-generation prompt. Preserve intent and language. Add only useful visual detail: subject, composition, lighting, materials, color, camera/style and quality. Return only the finished prompt, with no preface or markdown."
-			}, {
-				role: "user",
-				content: prompt
-			}]
-		})
-	}));
-	const choices = Array.isArray(body.choices) ? body.choices : [];
-	const content = choices[0] !== null && typeof choices[0] === "object" ? choices[0].message?.content : void 0;
-	if (typeof content !== "string" || content.trim() === "") throw new Error("chat model returned an empty prompt");
-	return content.trim();
-}
-//#endregion
-//#region src/image-models.ts
-/**
-* Image-model configuration shared by the host, panel, and Agent tools.
-* `/models` exposes candidates only: the configured list is the explicit
-* allow-list because OpenAI-compatible gateways rarely advertise modalities.
-*/
-const DEFAULT_IMAGE_MODELS = [
-	"gpt-image-2",
-	"grok-imagine-image",
-	"nanobanana2",
-	"nanobanana2-lite",
-	"nanobanana-pro",
-	"seedream-5.0-pro"
-];
-/** Normalize user-entered model identifiers and retain a usable legacy default. */
-function normalizeImageModels(value) {
-	const candidates = Array.isArray(value) ? value : [];
-	const unique = /* @__PURE__ */ new Set();
-	for (const candidate of candidates) {
-		if (typeof candidate !== "string") continue;
-		const model = candidate.trim();
-		if (model !== "") unique.add(model);
-	}
-	return unique.size > 0 ? [...unique] : [...DEFAULT_IMAGE_MODELS];
-}
-//#endregion
-//#region src/image-format.ts
-function detectImageMime(data) {
-	const startsWith = (...bytes) => bytes.every((value, index) => data[index] === value);
-	if (startsWith(137, 80, 78, 71, 13, 10, 26, 10)) return "image/png";
-	if (startsWith(255, 216, 255)) return "image/jpeg";
-	if (startsWith(71, 73, 70, 56, 55, 97) || startsWith(71, 73, 70, 56, 57, 97)) return "image/gif";
-	if (startsWith(82, 73, 70, 70) && data[8] === 87 && data[9] === 69 && data[10] === 66 && data[11] === 80) return "image/webp";
-}
-//#endregion
 //#region src/model-catalog.ts
 const ENTRIES = {
 	"gpt-image": {
@@ -228,6 +140,14 @@ const ENTRIES = {
 		supportsEdit: true,
 		supportsAspectRatio: true,
 		qualityTiers: ["1K", "2K"]
+	},
+	zhipu: {
+		label: "GLM-Image",
+		labelZh: "智谱图像",
+		known: true,
+		supportsEdit: false,
+		supportsAspectRatio: false,
+		qualityTiers: ["HD"]
 	}
 };
 /** Official Gemini image ids served by Nano Banana gateways. */
@@ -262,6 +182,10 @@ function describeModel(model) {
 		family: "seedream",
 		...ENTRIES.seedream
 	};
+	if (/^(?:glm-image|cogview(?:-|$))/i.test(id)) return {
+		family: "zhipu",
+		...ENTRIES.zhipu
+	};
 	return {
 		family: "unknown",
 		label: "unknown",
@@ -272,11 +196,165 @@ function describeModel(model) {
 		qualityTiers: []
 	};
 }
+/** Conservative fallback for providers whose /models response only has ids.
+*  Metadata-aware filtering lives in prompt-enhancer.ts; this catches common
+*  image model naming conventions without treating every unknown model as an
+*  image model. */
+function isLikelyImageModelId(model) {
+	return /(?:^|[-_.])(?:image|img|diffusion|flux|cogview|imagen|seedream|nanobanana|grok-imagine|dall-e|stable-diffusion|sdxl|pixart|kolors|ideogram|midjourney|recraft|hunyuan|jimeng|wanx|hidream|playground)(?:$|[-_.])/i.test(model.trim());
+}
 /** The family a model id routes its request through. */
 function modelFamily(model) {
 	return describeModel(model).family;
 }
 //#endregion
+//#region src/prompt-enhancer.ts
+/** OpenAI-compatible chat helpers used by the optional prompt-enhancement UI. */
+function endpoint(base, suffix) {
+	return `${base.replace(/\/+$/, "")}${suffix}`;
+}
+function headers(apiKey) {
+	return {
+		"content-type": "application/json",
+		...apiKey.trim() === "" ? {} : { authorization: `Bearer ${apiKey.trim()}` }
+	};
+}
+async function responseJson(response) {
+	const body = await response.json().catch(() => void 0);
+	if (!response.ok || body === void 0 || body === null || typeof body !== "object") {
+		const message = body !== null && typeof body === "object" && typeof body.error?.message === "string" ? body.error.message : `HTTP ${response.status}`;
+		throw new Error(message);
+	}
+	return body;
+}
+async function listModelRecords(config) {
+	if (config.apiUrl.trim() === "") throw new Error("API URL is required");
+	const body = await responseJson(await fetch(endpoint(config.apiUrl, "/models"), { headers: headers(config.apiKey) }));
+	return (Array.isArray(body.data) ? body.data : []).flatMap((item) => {
+		if (item === null || typeof item !== "object" || typeof item.id !== "string") return [];
+		const id = item.id.trim();
+		return id === "" ? [] : [{
+			...item,
+			id
+		}];
+	});
+}
+function textOf(value) {
+	if (typeof value === "string") return [value];
+	if (!Array.isArray(value)) return [];
+	return value.filter((item) => typeof item === "string");
+}
+function hasImageGenerationCapability(record) {
+	const capability = record.capabilities;
+	if (capability !== null && typeof capability === "object") {
+		const values = capability;
+		for (const key of [
+			"image_generation",
+			"imageGeneration",
+			"text_to_image",
+			"textToImage",
+			"image_gen"
+		]) if (typeof values[key] === "boolean") return values[key];
+		const serialized = JSON.stringify(values).toLowerCase();
+		if (/image[ _-]?generation|text[ _-]?to[ _-]?image/.test(serialized)) return true;
+	}
+	const taskText = [
+		...textOf(record.task),
+		...textOf(record.task_type),
+		...textOf(record.taskType),
+		...textOf(record.type),
+		...textOf(record.model_type),
+		...textOf(record.modelType),
+		...textOf(record.tasks),
+		...textOf(record.description)
+	].join(" ").toLowerCase();
+	if (/image[ _-]?generation|text[ _-]?to[ _-]?image|image[ _-]?gen/.test(taskText)) return true;
+	if (/^image(?:[ _-]?generation)?$/.test(taskText.trim())) return true;
+	if (/embedding|rerank|moderation|transcri|speech|audio|video|chat[ _-]?completion/.test(taskText)) return false;
+	for (const key of [
+		"output_modalities",
+		"outputModalities",
+		"supported_output_modalities"
+	]) {
+		const modalities = textOf(record[key]).map((value) => value.toLowerCase());
+		if (modalities.length > 0) return modalities.includes("image");
+	}
+}
+function isImageModelRecord(record) {
+	return hasImageGenerationCapability(record) ?? isLikelyImageModelId(record.id);
+}
+/** List candidates exposed by an OpenAI-compatible endpoint. */
+async function listOpenAIModels(config) {
+	return [...new Set((await listModelRecords(config)).map((record) => record.id))].sort((a, b) => a.localeCompare(b));
+}
+/** List only models that advertise or conventionally represent image generation. */
+async function listImageModels(config) {
+	return [...new Set((await listModelRecords(config)).filter(isImageModelRecord).map((record) => record.id))].sort((a, b) => a.localeCompare(b));
+}
+/** List chat models exposed by an OpenAI-compatible endpoint. */
+async function listPromptModels(config) {
+	return listOpenAIModels(config);
+}
+/** Expand a concise image request into a production-ready image prompt. */
+async function enhancePrompt(config, prompt) {
+	if (config.apiUrl.trim() === "" || config.model.trim() === "") throw new Error("prompt enhancement model is not configured");
+	const body = await responseJson(await fetch(endpoint(config.apiUrl, "/chat/completions"), {
+		method: "POST",
+		headers: headers(config.apiKey),
+		body: JSON.stringify({
+			model: config.model.trim(),
+			temperature: .7,
+			messages: [{
+				role: "system",
+				content: "You are an expert image-prompt editor. Expand the user request into one vivid, specific image-generation prompt. Preserve intent and language. Add only useful visual detail: subject, composition, lighting, materials, color, camera/style and quality. Return only the finished prompt, with no preface or markdown."
+			}, {
+				role: "user",
+				content: prompt
+			}]
+		})
+	}));
+	const choices = Array.isArray(body.choices) ? body.choices : [];
+	const content = choices[0] !== null && typeof choices[0] === "object" ? choices[0].message?.content : void 0;
+	if (typeof content !== "string" || content.trim() === "") throw new Error("chat model returned an empty prompt");
+	return content.trim();
+}
+//#endregion
+//#region src/image-models.ts
+/**
+* Image-model configuration shared by the host, panel, and Agent tools.
+* `/models` exposes candidates only: the configured list is the explicit
+* allow-list because OpenAI-compatible gateways rarely advertise modalities.
+*/
+const DEFAULT_IMAGE_MODELS = [
+	"gpt-image-2",
+	"grok-imagine-image",
+	"nanobanana2",
+	"nanobanana2-lite",
+	"nanobanana-pro",
+	"seedream-5.0-pro",
+	"glm-image"
+];
+/** Normalize user-entered model identifiers and retain a usable legacy default. */
+function normalizeImageModels(value) {
+	const candidates = Array.isArray(value) ? value : [];
+	const unique = /* @__PURE__ */ new Set();
+	for (const candidate of candidates) {
+		if (typeof candidate !== "string") continue;
+		const model = candidate.trim();
+		if (model !== "") unique.add(model);
+	}
+	return unique.size > 0 ? [...unique] : [...DEFAULT_IMAGE_MODELS];
+}
+//#endregion
+//#region src/image-format.ts
+function detectImageMime(data) {
+	const startsWith = (...bytes) => bytes.every((value, index) => data[index] === value);
+	if (startsWith(137, 80, 78, 71, 13, 10, 26, 10)) return "image/png";
+	if (startsWith(255, 216, 255)) return "image/jpeg";
+	if (startsWith(71, 73, 70, 56, 55, 97) || startsWith(71, 73, 70, 56, 57, 97)) return "image/gif";
+	if (startsWith(82, 73, 70, 70) && data[8] === 87 && data[9] === 69 && data[10] === 66 && data[11] === 80) return "image/webp";
+}
+//#endregion
 //#region src/engine.ts
 /** A generation failure with a user-presentable message. */
 var ImageGenError = class extends Error {
@@ -331,6 +409,13 @@ function isNanoBanana(model) {
 function isSeedream(model) {
 	return modelFamily(model) === "seedream";
 }
+/** Whether the model uses the official Zhipu image-generation contract. */
+function isZhipuImage(model) {
+	return modelFamily(model) === "zhipu";
+}
+function isGlmImage(model) {
+	return /^glm-image(?:-|$)/i.test(model.trim());
+}
 /** Whether this is the official Volcengine Ark model naming convention. */
 function isVolcSeedream(model) {
 	return /^doubao-seedream(?:-|$)/i.test(model.trim());
@@ -407,6 +492,19 @@ function bareBase64(value) {
 	const parsed = parseDataUrl(value);
 	return parsed !== void 0 && parsed.base64 !== void 0 ? parsed.base64 : value;
 }
+/** Whether a result URL carries cloud-storage signing credentials. */
+function isPresignedUrl(value) {
+	let url;
+	try {
+		url = new URL(value);
+	} catch {
+		return false;
+	}
+	const params = new Set(Array.from(url.searchParams.keys(), (key) => key.toLowerCase()));
+	if (params.has("x-goog-signature") || params.has("x-goog-credential")) return true;
+	if (params.has("x-amz-signature") || params.has("x-amz-credential")) return true;
+	return params.has("signature") && (params.has("expires") || params.has("googleaccessid") || params.has("awsaccesskeyid"));
+}
 /** Clamp the requested image count into the API-accepted range. */
 function clampCount(n) {
 	if (!Number.isFinite(n)) return 1;
@@ -441,6 +539,11 @@ function effectiveParams(request) {
 		size: seedreamSize(request.quality),
 		response_format: isVolcSeedream(model) ? "url" : "b64_json"
 	};
+	if (isZhipuImage(model)) return {
+		model,
+		...request.size !== "" && request.size !== "auto" && OPENAI_SIZE_BY_RATIO[request.size] !== void 0 ? { size: OPENAI_SIZE_BY_RATIO[request.size] } : {},
+		quality: isGlmImage(model) ? "hd" : "standard"
+	};
 	return {
 		model,
 		...request.size !== "" && request.size !== "auto" && OPENAI_SIZE_BY_RATIO[request.size] !== void 0 ? { size: OPENAI_SIZE_BY_RATIO[request.size] } : {},
@@ -458,9 +561,9 @@ function effectiveCount(request) {
 /** Normalize one upstream data item into a base64 image. */
 async function normalizeItem(item, upstream) {
 	const revisedPrompt = typeof item.revised_prompt === "string" ? item.revised_prompt : void 0;
-	if (typeof item.b64_json === "string") {
+	if (typeof item.b64_json === "string" && item.b64_json.trim() !== "") {
 		const b64 = bareBase64(item.b64_json);
-		return {
+		if (b64.trim() !== "") return {
 			b64,
 			mime: detectImageMime(Buffer.from(b64, "base64")) ?? "image/png",
 			revisedPrompt
@@ -481,7 +584,7 @@ async function normalizeItem(item, upstream) {
 	let response;
 	try {
 		response = await fetch(url, {
-			headers: { ...upstream.apiKey === "" ? {} : { authorization: `Bearer ${upstream.apiKey}` } },
+			...isPresignedUrl(url) || upstream.apiKey === "" ? {} : { headers: { authorization: `Bearer ${upstream.apiKey}` } },
 			signal: budget.signal
 		});
 	} catch (error) {
@@ -607,6 +710,7 @@ async function generateImage(upstream, request, options = {}) {
 	const baseUrl = upstream.apiUrl.trim().replace(/\/+$/, "");
 	if (baseUrl === "") throw new ImageGenError("api_url 未配置：请先在「设置 → 插件 → 可配置」中填写", "config-missing");
 	if (upstream.apiKey.trim() === "") throw new ImageGenError("api_key 未配置：请先在「设置 → 插件 → 可配置」中填写", "config-missing");
+	if (request.mode === "edit" && isZhipuImage(wireModel(request))) throw new ImageGenError("智谱 GLM-Image 当前仅支持文生图，请切换到文生图模式或选择支持图生图的模型", "edit-unsupported");
 	const params = effectiveParams(request);
 	const count = effectiveCount(request);
 	return { images: (await Promise.all(Array.from({ length: count }, () => requestOneImage(baseUrl, upstream, request, params, options.signal)))).flat() };
@@ -738,7 +842,9 @@ function toWire$1(entry) {
 		})),
 		...entry.refName === void 0 ? {} : { refName: entry.refName },
 		...entry.channel === void 0 ? {} : { channel: entry.channel },
-		...entry.channelId === void 0 ? {} : { channelId: entry.channelId }
+		...entry.channelId === void 0 ? {} : { channelId: entry.channelId },
+		...entry.comparisonId === void 0 ? {} : { comparisonId: entry.comparisonId },
+		...entry.comparisonModels === void 0 ? {} : { comparisonModels: entry.comparisonModels }
 	};
 }
 /** List the persisted history, newest first, as wire entries. */
@@ -779,7 +885,9 @@ async function appendHistory(input) {
 			images: storedImages,
 			...input.refName === void 0 ? {} : { refName: input.refName },
 			...input.channelId === void 0 ? {} : { channelId: input.channelId },
-			...input.channel === void 0 ? {} : { channel: input.channel }
+			...input.channel === void 0 ? {} : { channel: input.channel },
+			...input.comparisonId === void 0 ? {} : { comparisonId: input.comparisonId },
+			...input.comparisonModels === void 0 ? {} : { comparisonModels: input.comparisonModels }
 		}, ...await readIndex$1()];
 		const kept = merged.slice(0, 50);
 		for (const dropped of merged.slice(50)) await removeEntryFiles$1(dropped);
@@ -824,12 +932,15 @@ async function readHistoryImage(file) {
 /** In-memory, host-resident image generation queue. */
 var GenerationTaskQueue = class {
 	run;
+	concurrency;
 	tasks = [];
 	controllers = /* @__PURE__ */ new Map();
 	listeners = /* @__PURE__ */ new Set();
-	running = false;
-	constructor(run) {
+	running = 0;
+	serialRunning = false;
+	constructor(run, concurrency = 1) {
 		this.run = run;
+		this.concurrency = concurrency;
 	}
 	list() {
 		return this.tasks.map((task) => this.snapshot(task));
@@ -860,45 +971,49 @@ var GenerationTaskQueue = class {
 		task.finishedAt = Date.now();
 		this.controllers.get(id)?.abort();
 		this.publish(task);
+		this.drain();
 		return this.snapshot(task);
 	}
 	retry(id) {
 		const previous = this.tasks.find((item) => item.id === id);
 		return previous === void 0 ? void 0 : this.submit(previous.request);
 	}
-	async drain() {
-		if (this.running) return;
-		this.running = true;
+	drain() {
+		while (this.running < Math.max(1, this.concurrency)) {
+			const task = this.tasks.find((item) => item.status === "queued" && (this.running === 0 || item.request.comparisonId !== void 0 && !this.serialRunning));
+			if (task === void 0) return;
+			this.running += 1;
+			if (task.request.comparisonId === void 0) this.serialRunning = true;
+			this.runTask(task).finally(() => {
+				this.running -= 1;
+				if (task.request.comparisonId === void 0) this.serialRunning = false;
+				this.drain();
+			});
+		}
+	}
+	async runTask(task) {
+		task.status = "running";
+		task.startedAt = Date.now();
+		this.publish(task);
+		const controller = new AbortController();
+		this.controllers.set(task.id, controller);
 		try {
-			for (;;) {
-				const task = this.tasks.find((item) => item.status === "queued");
-				if (task === void 0) return;
-				task.status = "running";
-				task.startedAt = Date.now();
+			const result = await this.run(task.request, controller.signal);
+			if (this.tasks.find((item) => item.id === task.id)?.status !== "cancelled") {
+				task.status = "completed";
+				task.result = result;
+				task.finishedAt = Date.now();
+				this.publish(task);
+			}
+		} catch (error) {
+			if (this.tasks.find((item) => item.id === task.id)?.status !== "cancelled") {
+				task.status = "failed";
+				task.error = error instanceof Error ? error.message : String(error);
+				task.finishedAt = Date.now();
 				this.publish(task);
-				const controller = new AbortController();
-				this.controllers.set(task.id, controller);
-				try {
-					const result = await this.run(task.request, controller.signal);
-					if (this.tasks.find((item) => item.id === task.id)?.status !== "cancelled") {
-						task.status = "completed";
-						task.result = result;
-						task.finishedAt = Date.now();
-						this.publish(task);
-					}
-				} catch (error) {
-					if (this.tasks.find((item) => item.id === task.id)?.status !== "cancelled") {
-						task.status = "failed";
-						task.error = error instanceof Error ? error.message : String(error);
-						task.finishedAt = Date.now();
-						this.publish(task);
-					}
-				} finally {
-					this.controllers.delete(task.id);
-				}
 			}
 		} finally {
-			this.running = false;
+			this.controllers.delete(task.id);
 		}
 	}
 	publish(task) {
@@ -934,7 +1049,7 @@ var ImageGenerationRuntime = class {
 	constructor(resolve, history = { append: appendHistory }) {
 		this.resolve = resolve;
 		this.history = history;
-		this.queue = new GenerationTaskQueue((request, signal) => this.run(request, signal));
+		this.queue = new GenerationTaskQueue((request, signal) => this.run(request, signal), 4);
 	}
 	async run(request, signal) {
 		const view = this.resolve();
@@ -958,7 +1073,9 @@ var ImageGenerationRuntime = class {
 				images: result.images,
 				...request.refName === void 0 ? {} : { refName: request.refName },
 				...request.channelId === void 0 ? {} : { channelId: request.channelId },
-				...request.channel === void 0 ? {} : { channel: request.channel }
+				...request.channel === void 0 ? {} : { channel: request.channel },
+				...request.comparisonId === void 0 ? {} : { comparisonId: request.comparisonId },
+				...request.comparisonModels === void 0 ? {} : { comparisonModels: request.comparisonModels }
 			});
 			return {
 				...result,
@@ -1584,13 +1701,20 @@ const IMAGE_PRESETS = [
 		id: "openai-official",
 		name: "OpenAI 官方",
 		apiUrl: "https://api.openai.com/v1",
-		hint: "OpenAI 官方接口：gpt-image-2 / dall-e-3",
+		hint: "OpenAI 官方图像生成接口",
 		models: [{
 			alias: "gpt-image-2",
 			id: "gpt-image-2"
-		}, {
-			alias: "dall-e-3",
-			id: "dall-e-3"
+		}]
+	},
+	{
+		id: "zhipu-official",
+		name: "智谱 AI 官方",
+		apiUrl: "https://open.bigmodel.cn/api/paas/v4",
+		hint: "智谱官方 GLM-Image 图像生成接口",
+		models: [{
+			alias: "glm-image",
+			id: "glm-image"
 		}]
 	},
 	{
@@ -1669,6 +1793,7 @@ function messageOf(error) {
 function parseGenerateRequest(body) {
 	const prompt = typeof body.prompt === "string" ? body.prompt.trim() : "";
 	if (prompt === "") return void 0;
+	const comparisonModels = Array.isArray(body.comparisonModels) ? [...new Set(body.comparisonModels.filter((model) => typeof model === "string").map((model) => model.trim()).filter(Boolean))] : [];
 	return {
 		mode: body.mode === "edit" ? "edit" : "text",
 		model: typeof body.model === "string" ? body.model : "",
@@ -1679,7 +1804,9 @@ function parseGenerateRequest(body) {
 		detail: typeof body.detail === "string" ? body.detail : "",
 		...typeof body.image === "string" && body.image !== "" ? { image: body.image } : {},
 		...typeof body.refName === "string" && body.refName !== "" ? { refName: body.refName } : {},
-		...typeof body.channelId === "string" && body.channelId !== "" ? { channelId: body.channelId } : {}
+		...typeof body.channelId === "string" && body.channelId !== "" ? { channelId: body.channelId } : {},
+		...typeof body.comparisonId === "string" && body.comparisonId !== "" ? { comparisonId: body.comparisonId } : {},
+		...comparisonModels.length > 1 ? { comparisonModels } : {}
 	};
 }
 /** Validate a submitted history entry (images carry base64). */
@@ -1704,6 +1831,7 @@ function parseHistoryEntryInput(body) {
 			...typeof image.revisedPrompt === "string" ? { revisedPrompt: image.revisedPrompt } : {}
 		});
 	}
+	const comparisonModels = Array.isArray(entry.comparisonModels) ? [...new Set(entry.comparisonModels.filter((model) => typeof model === "string").map((model) => model.trim()).filter(Boolean))] : [];
 	return {
 		id: entry.id,
 		createdAt: entry.createdAt,
@@ -1717,7 +1845,9 @@ function parseHistoryEntryInput(body) {
 		images,
 		...typeof entry.refName === "string" ? { refName: entry.refName } : {},
 		...typeof entry.channelId === "string" ? { channelId: entry.channelId } : {},
-		...typeof entry.channel === "string" ? { channel: entry.channel } : {}
+		...typeof entry.channel === "string" ? { channel: entry.channel } : {},
+		...typeof entry.comparisonId === "string" ? { comparisonId: entry.comparisonId } : {},
+		...comparisonModels.length > 1 ? { comparisonModels } : {}
 	};
 }
 /** Extract the image file name from a history-image request URL. */
@@ -1955,7 +2085,7 @@ function makeRoutes(deps) {
 				try {
 					writeJson(res, 200, {
 						ok: true,
-						models: await listOpenAIModels(upstream)
+						models: await listImageModels(upstream)
 					});
 				} catch (error) {
 					writeJson(res, 200, {
@@ -3151,7 +3281,7 @@ const DEFAULT_ALLOW_AGENT_IMAGE_GENERATION = true;
 /** Order of the announcement section within the tool-guidance band. */
 const SECTION_ORDER = 150;
 /** Model-facing announcement: plugin presence, capabilities, and limits. */
-const IMAGEGEN_GUIDANCE = "本机已安装 dsh-imagegen 插件（DSH AI 生图）：侧边栏「AI 生图」入口。能力：通过「渠道」对接 OpenAI 兼容图像生成 API（每个渠道 = 一个 API 端点 + 各自的模型目录），支持文生图（/images/generations）与图生图（/images/edits，上传参考图，grok-imagine 模型按官方 JSON image_url 协议发送，nanobanana 系列按 aspect_ratio / image_size 参数协议发送；seedream 系列统一走 /images/generations，参考图以 JSON image 数组发送）。API 地址与密钥在 GUI 设置中按渠道配置，密钥仅存于本机设置文档；生成请求由本地宿主代理转发，结果以 base64 返回面板，可预览与下载。模型只能使用用户在各渠道配置目录中的模型；模型出现在 /models 中不等于其网关原生支持生图协议，遇到 Qwen、Gemini 等非 OpenAI 生图协议时应如实说明上游兼容性。可一键把满意的图片加入「画廊」。内置「提示词模板库」（面板提示词框左下角「模板库」按钮）：打包 awesome-gpt-image-2 的数百条提示词案例，可搜索、筛选与复用。Agent 可直接调用 `generate_image` 提交文生图，也可用 `edit_image` 图生图；默认保持工具调用等待直到任务完成，完成图片显示在工具调用对应的左侧结果区域，模型收到状态和附件引用，不会额外伪造用户消息。若明确需要后台执行，可传 `wait_for_completion: false`，之后再用 `get_image_generation_task` 查询；不要反复轮询。限制：生成消耗上游 API 额度；图片内容由上游模型生成，可能不符合预期或包含不适宜内容；api_key 以明文存储在设置文档中；参考图会发送至所配置的 API 服务；模板库在线刷新与参考图首次加载需要访问 vibeui.top。用户提到「生图 / 绘画 / 生成图片 / 文生图 / 图生图 / 画廊 / 提示词模板」时即指本插件，请据此协作。";
+const IMAGEGEN_GUIDANCE = "本机已安装 dsh-imagegen 插件（DSH AI 生图）：侧边栏「AI 生图」入口。能力：通过「渠道」对接 OpenAI 兼容图像生成 API（每个渠道 = 一个 API 端点 + 各自的模型目录），支持文生图（/images/generations）与图生图（/images/edits，上传参考图，grok-imagine 模型按官方 JSON image_url 协议发送，nanobanana 系列按 aspect_ratio / image_size 参数协议发送；seedream 系列统一走 /images/generations，参考图以 JSON image 数组发送；智谱 `glm-image` 使用官方 `/api/paas/v4/images/generations`，当前仅支持文生图）。API 地址与密钥在 GUI 设置中按渠道配置，密钥仅存于本机设置文档；生成请求由本地宿主代理转发，结果以 base64 返回面板，可预览与下载。模型只能使用用户在各渠道配置目录中的模型；检测模型时会过滤聊天、Embedding 等非图片模型，但模型出现在 /models 中仍不等于其网关原生支持生图协议，遇到 Qwen、Gemini 等非 OpenAI 生图协议时应如实说明上游兼容性。可一键把满意的图片加入「画廊」。内置「提示词模板库」（面板提示词框左下角「模板库」按钮）：打包 awesome-gpt-image-2 的数百条提示词案例，可搜索、筛选与复用。Agent 可直接调用 `generate_image` 提交文生图，也可用 `edit_image` 图生图；默认保持工具调用等待直到任务完成，完成图片显示在工具调用对应的左侧结果区域，模型收到状态和附件引用，不会额外伪造用户消息。若明确需要后台执行，可传 `wait_for_completion: false`，之后再用 `get_image_generation_task` 查询；不要反复轮询。限制：生成消耗上游 API 额度；图片内容由上游模型生成，可能不符合预期或包含不适宜内容；api_key 以明文存储在设置文档中；参考图会发送至所配置的 API 服务；模板库在线刷新与参考图首次加载需要访问 vibeui.top。用户提到「生图 / 绘画 / 生成图片 / 文生图 / 图生图 / 画廊 / 提示词模板」时即指本插件，请据此协作。";
 /** Append the live channel × model table so an Agent can honor user choices. */
 function guidanceFor(channels, defaultChannelId) {
 	if (channels.length === 0) return `${IMAGEGEN_GUIDANCE} 尚未配置任何渠道：请先在「设置 → 插件 → AI 生图」添加渠道并填写 API 地址与密钥。`;