@dickpy/dsh-imagegen 1.3.0 → 1.5.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.5.0";
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 const SETTINGS_API = {
 	describe: "/api/dsh-imagegen/settings/describe",
@@ -35,6 +35,8 @@ const IMAGE_MODEL_API = { models: "/api/dsh-imagegen/image-models" };
 const PRESETS_API = "/api/dsh-imagegen/presets";
 /** Loopback-only image reader for Agent tool-result previews. */
 const AGENT_IMAGE_API = "/api/dsh-imagegen/agent-image";
+/** Store the current composer image for the direct edit_image command. */
+const CONVERSATION_IMAGE_API = "/api/dsh-imagegen/conversation-image";
 /**
 * Host-computed per-channel usage counters (generation-count badges in the
 * settings card): entries are tallied from the persisted history and gallery
@@ -91,94 +93,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 +142,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 +184,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 +198,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 +411,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 +494,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 +541,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 +563,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 +586,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 +712,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() };
@@ -707,7 +813,7 @@ async function writeIndex$1(entries) {
 function isStoredEntry$1(value) {
 	if (value === null || typeof value !== "object") return false;
 	const entry = value;
-	return typeof entry.id === "string" && typeof entry.createdAt === "number" && (entry.mode === "text" || entry.mode === "edit") && typeof entry.prompt === "string" && Array.isArray(entry.images) && entry.images.every((image) => {
+	return typeof entry.id === "string" && typeof entry.createdAt === "number" && (entry.mode === "text" || entry.mode === "edit") && (entry.workflow === void 0 || entry.workflow === "ecommerce") && (entry.projectId === void 0 || typeof entry.projectId === "string") && (entry.projectName === void 0 || typeof entry.projectName === "string") && (entry.slotKey === void 0 || typeof entry.slotKey === "string") && (entry.slotLabel === void 0 || typeof entry.slotLabel === "string") && typeof entry.prompt === "string" && Array.isArray(entry.images) && entry.images.every((image) => {
 		if (image === null || typeof image !== "object") return false;
 		const record = image;
 		return typeof record.file === "string" && typeof record.mime === "string";
@@ -738,7 +844,14 @@ 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 },
+		...entry.workflow === void 0 ? {} : { workflow: entry.workflow },
+		...entry.projectId === void 0 ? {} : { projectId: entry.projectId },
+		...entry.projectName === void 0 ? {} : { projectName: entry.projectName },
+		...entry.slotKey === void 0 ? {} : { slotKey: entry.slotKey },
+		...entry.slotLabel === void 0 ? {} : { slotLabel: entry.slotLabel }
 	};
 }
 /** List the persisted history, newest first, as wire entries. */
@@ -779,7 +892,14 @@ 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 },
+			...input.workflow === void 0 ? {} : { workflow: input.workflow },
+			...input.projectId === void 0 ? {} : { projectId: input.projectId },
+			...input.projectName === void 0 ? {} : { projectName: input.projectName },
+			...input.slotKey === void 0 ? {} : { slotKey: input.slotKey },
+			...input.slotLabel === void 0 ? {} : { slotLabel: input.slotLabel }
 		}, ...await readIndex$1()];
 		const kept = merged.slice(0, 50);
 		for (const dropped of merged.slice(50)) await removeEntryFiles$1(dropped);
@@ -824,12 +944,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 +983,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 +1061,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 +1085,14 @@ 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 },
+				...request.workflow === void 0 ? {} : { workflow: request.workflow },
+				...request.projectId === void 0 ? {} : { projectId: request.projectId },
+				...request.projectName === void 0 ? {} : { projectName: request.projectName },
+				...request.slotKey === void 0 ? {} : { slotKey: request.slotKey },
+				...request.slotLabel === void 0 ? {} : { slotLabel: request.slotLabel }
 			});
 			return {
 				...result,
@@ -1052,7 +1186,7 @@ async function writeIndex(entries) {
 function isStoredEntry(value) {
 	if (value === null || typeof value !== "object") return false;
 	const entry = value;
-	return typeof entry.id === "string" && typeof entry.createdAt === "number" && (entry.mode === "text" || entry.mode === "edit") && typeof entry.prompt === "string" && Array.isArray(entry.images) && entry.images.every((image) => {
+	return typeof entry.id === "string" && typeof entry.createdAt === "number" && (entry.mode === "text" || entry.mode === "edit") && (entry.workflow === void 0 || entry.workflow === "ecommerce") && (entry.projectId === void 0 || typeof entry.projectId === "string") && (entry.projectName === void 0 || typeof entry.projectName === "string") && (entry.slotKey === void 0 || typeof entry.slotKey === "string") && (entry.slotLabel === void 0 || typeof entry.slotLabel === "string") && typeof entry.prompt === "string" && Array.isArray(entry.images) && entry.images.every((image) => {
 		if (image === null || typeof image !== "object") return false;
 		const record = image;
 		return typeof record.file === "string" && typeof record.mime === "string";
@@ -1084,7 +1218,12 @@ function toWire(entry) {
 		...entry.refName === void 0 ? {} : { refName: entry.refName },
 		...entry.tags === void 0 ? {} : { tags: entry.tags },
 		...entry.channel === void 0 ? {} : { channel: entry.channel },
-		...entry.channelId === void 0 ? {} : { channelId: entry.channelId }
+		...entry.channelId === void 0 ? {} : { channelId: entry.channelId },
+		...entry.workflow === void 0 ? {} : { workflow: entry.workflow },
+		...entry.projectId === void 0 ? {} : { projectId: entry.projectId },
+		...entry.projectName === void 0 ? {} : { projectName: entry.projectName },
+		...entry.slotKey === void 0 ? {} : { slotKey: entry.slotKey },
+		...entry.slotLabel === void 0 ? {} : { slotLabel: entry.slotLabel }
 	};
 }
 /** List the persisted gallery, newest first, as wire entries. */
@@ -1136,7 +1275,12 @@ async function appendGallery(input) {
 			...hash === void 0 ? {} : { hash },
 			...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.workflow === void 0 ? {} : { workflow: input.workflow },
+			...input.projectId === void 0 ? {} : { projectId: input.projectId },
+			...input.projectName === void 0 ? {} : { projectName: input.projectName },
+			...input.slotKey === void 0 ? {} : { slotKey: input.slotKey },
+			...input.slotLabel === void 0 ? {} : { slotLabel: input.slotLabel }
 		}, ...await readIndex()];
 		await writeIndex(merged);
 		return {
@@ -1584,13 +1728,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 +1820,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 +1831,14 @@ 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 } : {},
+		...body.workflow === "ecommerce" ? { workflow: "ecommerce" } : {},
+		...typeof body.projectId === "string" && body.projectId !== "" ? { projectId: body.projectId } : {},
+		...typeof body.projectName === "string" && body.projectName !== "" ? { projectName: body.projectName } : {},
+		...typeof body.slotKey === "string" && body.slotKey !== "" ? { slotKey: body.slotKey } : {},
+		...typeof body.slotLabel === "string" && body.slotLabel !== "" ? { slotLabel: body.slotLabel } : {}
 	};
 }
 /** Validate a submitted history entry (images carry base64). */
@@ -1704,6 +1863,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 +1877,14 @@ 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 } : {},
+		...entry.workflow === "ecommerce" ? { workflow: "ecommerce" } : {},
+		...typeof entry.projectId === "string" ? { projectId: entry.projectId } : {},
+		...typeof entry.projectName === "string" ? { projectName: entry.projectName } : {},
+		...typeof entry.slotKey === "string" ? { slotKey: entry.slotKey } : {},
+		...typeof entry.slotLabel === "string" ? { slotLabel: entry.slotLabel } : {}
 	};
 }
 /** Extract the image file name from a history-image request URL. */
@@ -1759,6 +1926,15 @@ function agentImageRefFrom(rawUrl) {
 function isImageMediaType(value) {
 	return value === "image/png" || value === "image/jpeg" || value === "image/webp" || value === "image/gif";
 }
+function imageDataUrl$1(value) {
+	const match = /^data:(image\/(?:png|jpeg|webp|gif));base64,(.*)$/su.exec(value.trim());
+	if (match === null || match[1] === void 0 || match[2] === void 0) return void 0;
+	const data = Buffer.from(match[2], "base64");
+	return data.byteLength === 0 ? void 0 : {
+		mediaType: match[1],
+		data
+	};
+}
 /** Project one settings descriptor onto the bridge wire view. */
 function toView(descriptor) {
 	return {
@@ -1910,6 +2086,39 @@ function makeRoutes(deps) {
 		return true;
 	};
 	return [
+		...deps.attachments?.saveImage === void 0 || deps.pendingConversationImages === void 0 ? [] : [{
+			kind: "exact",
+			path: CONVERSATION_IMAGE_API,
+			handler: async (req, res) => {
+				if (!guard(req, res, "POST")) return;
+				const body = await readJsonBody(req, MAX_JSON_BODY_BYTES);
+				const sessionId = typeof body?.sessionId === "string" ? body.sessionId.trim() : "";
+				const dataUrl = typeof body?.dataUrl === "string" ? imageDataUrl$1(body.dataUrl) : void 0;
+				if (sessionId === "" || dataUrl === void 0) {
+					writeJson(res, 200, {
+						ok: false,
+						code: "bad-request",
+						message: "sessionId and image data are required"
+					});
+					return;
+				}
+				try {
+					const ref = await deps.attachments.saveImage({
+						data: dataUrl.data,
+						mediaType: dataUrl.mediaType,
+						...typeof body?.name === "string" && body.name.trim() !== "" ? { name: body.name.trim() } : {}
+					});
+					deps.pendingConversationImages.set(sessionId, ref);
+					writeJson(res, 200, { ok: true });
+				} catch (error) {
+					writeJson(res, 200, {
+						ok: false,
+						code: "image-save-failed",
+						message: messageOf(error)
+					});
+				}
+			}
+		}],
 		...deps.attachments === void 0 ? [] : [{
 			kind: "prefix",
 			path: AGENT_IMAGE_API,
@@ -1955,7 +2164,7 @@ function makeRoutes(deps) {
 				try {
 					writeJson(res, 200, {
 						ok: true,
-						models: await listOpenAIModels(upstream)
+						models: await listImageModels(upstream)
 					});
 				} catch (error) {
 					writeJson(res, 200, {
@@ -2733,6 +2942,113 @@ const taskResultSchema = {
 };
 /** Agent calls stay pending until the provider and history write settle. */
 const AGENT_GENERATION_TIMEOUT_MS = 3e5;
+function ensureAgentImageConfigured(config) {
+	if (!config.enabled) throw new ImageGenError("AI image generation is disabled. Open Settings > Plugins > AI Image and enable it.", "plugin-disabled");
+	if (!config.allowAgentImageGeneration) throw new ImageGenError("Agent image generation is disabled in Settings > Plugins > AI Image.", "agent-generation-disabled");
+	if (!config.channels.some((channel) => channel.apiUrl.trim() !== "" && channel.apiKey.trim() !== "")) throw new ImageGenError("Image API credentials are not configured. Open Settings > Plugins > AI Image, add a channel and fill in its API URL and API key.", "image-api-not-configured");
+}
+/** Resolve a configured image alias and its owning channel. */
+function resolveAgentImageModel(config, requested) {
+	const entries = config.channels.flatMap((channel) => channel.models.map((model) => ({
+		channel,
+		alias: model.alias,
+		upstream: model.id
+	})));
+	if (entries.length === 0) throw new ImageGenError("No image models are configured. Open Settings > Plugins > AI Image and add a channel with at least one model.", "no-models-configured");
+	const wanted = typeof requested === "string" && requested.trim() !== "" ? requested.trim() : "";
+	if (wanted === "") {
+		if (entries.length === 1) return entries[0];
+		throw new ImageGenError(`Multiple image models are available — ask the user which channel and model to use, then call this tool again with that exact model name. Options: ${config.channels.flatMap((channel) => channel.models.map((model) => `"${channel.name} · ${model.alias}"`)).join(", ")}.`, "model-choice-required");
+	}
+	const hosting = entries.filter((entry) => entry.alias === wanted);
+	if (hosting.length === 0) throw new ImageGenError(`Image model "${wanted}" is not configured in any channel. Choose one of: ${[...new Set(entries.map((entry) => entry.alias))].join(", ")}.`, "image-model-not-configured");
+	return hosting.find((entry) => entry.channel.id === config.defaultChannelId) ?? hosting[0];
+}
+function findAgentImageTask(runtime, id) {
+	const task = runtime.queue.list().find((candidate) => candidate.id === id);
+	if (task === void 0) throw new ImageGenError(`Image generation task ${id} was not found.`, "task-not-found");
+	return task;
+}
+/** Wait for a queue task without sending anything through the chat model. */
+function waitForAgentImageTask(runtime, id, signal) {
+	return new Promise((resolveTask, rejectTask) => {
+		let settled = false;
+		let dispose = () => {};
+		let timer;
+		let abort = () => {};
+		const cleanup = () => {
+			dispose();
+			if (timer !== void 0) clearTimeout(timer);
+			signal?.removeEventListener("abort", abort);
+		};
+		const resolve = (task) => {
+			if (settled) return;
+			settled = true;
+			cleanup();
+			resolveTask(task);
+		};
+		const reject = (error) => {
+			if (settled) return;
+			settled = true;
+			cleanup();
+			rejectTask(error);
+		};
+		abort = () => {
+			if (settled) return;
+			const reason = signal?.reason instanceof Error ? signal.reason : /* @__PURE__ */ new Error("Image generation was cancelled.");
+			settled = true;
+			cleanup();
+			runtime.queue.cancel(id);
+			rejectTask(reason);
+		};
+		const onChange = (updated) => {
+			if (updated.id === id && isFinalTask(updated)) resolve(updated);
+		};
+		if (signal?.aborted === true) {
+			abort();
+			return;
+		}
+		dispose = runtime.queue.subscribe(onChange);
+		signal?.addEventListener("abort", abort, { once: true });
+		timer = setTimeout(() => {
+			if (settled) return;
+			const timeout = new ImageGenError(`Image generation task ${id} timed out after ${AGENT_GENERATION_TIMEOUT_MS / 1e3} seconds.`, "generation-timeout");
+			settled = true;
+			cleanup();
+			runtime.queue.cancel(id);
+			rejectTask(timeout);
+		}, AGENT_GENERATION_TIMEOUT_MS);
+		let current;
+		try {
+			current = findAgentImageTask(runtime, id);
+		} catch (error) {
+			reject(error);
+			return;
+		}
+		if (isFinalTask(current)) resolve(current);
+	});
+}
+/** Submit the same image-edit request used by the Agent tool. */
+async function submitAgentImageEdit(attachments, runtime, resolve, input) {
+	const config = resolve();
+	ensureAgentImageConfigured(config);
+	const reference = await attachments.readImage(input.sourceImage, input.signal);
+	const picked = resolveAgentImageModel(config, (config.channels.find((channel) => channel.id === config.defaultChannelId) ?? config.channels[0])?.models[0]?.alias ?? config.channels.flatMap((channel) => channel.models)[0]?.alias);
+	return waitForAgentImageTask(runtime, runtime.queue.submit({
+		mode: "edit",
+		model: picked.alias,
+		upstream: picked.upstream,
+		channelId: picked.channel.id,
+		channel: picked.channel.name,
+		prompt: input.prompt.trim(),
+		size: "auto",
+		quality: "auto",
+		n: 1,
+		detail: "",
+		image: imageDataUrl(reference),
+		...reference.ref.name === void 0 ? {} : { refName: reference.ref.name }
+	}).id, input.signal);
+}
 function acceptedMediaType(value) {
 	return value === "image/png" || value === "image/jpeg" || value === "image/webp" || value === "image/gif";
 }
@@ -2818,36 +3134,9 @@ function presentImageResult(_args, result) {
 function registerAgentImageTools(ctx, runtime, resolve) {
 	const attachmentRefs = /* @__PURE__ */ new Map();
 	const ensureConfigured = () => {
-		const config = resolve();
-		if (!config.enabled) throw new ImageGenError("AI image generation is disabled. Open Settings > Plugins > AI Image and enable it.", "plugin-disabled");
-		if (!config.allowAgentImageGeneration) throw new ImageGenError("Agent image generation is disabled in Settings > Plugins > AI Image.", "agent-generation-disabled");
-		if (!config.channels.some((channel) => channel.apiUrl.trim() !== "" && channel.apiKey.trim() !== "")) throw new ImageGenError("Image API credentials are not configured. Open Settings > Plugins > AI Image, add a channel and fill in its API URL and API key.", "image-api-not-configured");
-	};
-	/**
-	* Resolve the requested model alias onto a channel. Rules:
-	*  - a named alias must exist in some channel's catalog (several channels
-	*    may host it; the default channel wins);
-	*  - with no alias, a single configured model is used directly, while
-	*    multiple models require the Agent to ask the user first.
-	* @returns the channel plus the alias and its upstream id.
-	*/
-	const resolveModel = (requested) => {
-		const config = resolve();
-		const entries = config.channels.flatMap((channel) => channel.models.map((model) => ({
-			channel,
-			alias: model.alias,
-			upstream: model.id
-		})));
-		if (entries.length === 0) throw new ImageGenError("No image models are configured. Open Settings > Plugins > AI Image and add a channel with at least one model.", "no-models-configured");
-		const wanted = typeof requested === "string" && requested.trim() !== "" ? requested.trim() : "";
-		if (wanted === "") {
-			if (entries.length === 1) return entries[0];
-			throw new ImageGenError(`Multiple image models are available — ask the user which channel and model to use, then call this tool again with that exact model name. Options: ${config.channels.flatMap((channel) => channel.models.map((model) => `"${channel.name} · ${model.alias}"`)).join(", ")}.`, "model-choice-required");
-		}
-		const hosting = entries.filter((entry) => entry.alias === wanted);
-		if (hosting.length === 0) throw new ImageGenError(`Image model "${wanted}" is not configured in any channel. Choose one of: ${[...new Set(entries.map((entry) => entry.alias))].join(", ")}.`, "image-model-not-configured");
-		return hosting.find((entry) => entry.channel.id === config.defaultChannelId) ?? hosting[0];
+		ensureAgentImageConfigured(resolve());
 	};
+	const resolveModel = (requested) => resolveAgentImageModel(resolve(), requested);
 	const materializeTaskImages = (task) => {
 		if (task.status !== "completed") return Promise.resolve([]);
 		const existing = attachmentRefs.get(task.id);
@@ -2869,67 +3158,8 @@ function registerAgentImageTools(ctx, runtime, resolve) {
 			images
 		};
 	};
-	const findTask = (id) => {
-		const task = runtime.queue.list().find((candidate) => candidate.id === id);
-		if (task === void 0) throw new ImageGenError(`Image generation task ${id} was not found.`, "task-not-found");
-		return task;
-	};
-	const waitForTask = (id, signal) => new Promise((resolveTask, rejectTask) => {
-		let settled = false;
-		let dispose = () => {};
-		let timer;
-		let abort = () => {};
-		const cleanup = () => {
-			dispose();
-			if (timer !== void 0) clearTimeout(timer);
-			signal?.removeEventListener("abort", abort);
-		};
-		const resolve = (task) => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			resolveTask(task);
-		};
-		const reject = (error) => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			rejectTask(error);
-		};
-		abort = () => {
-			if (settled) return;
-			const reason = signal?.reason instanceof Error ? signal.reason : /* @__PURE__ */ new Error("Image generation was cancelled.");
-			settled = true;
-			cleanup();
-			runtime.queue.cancel(id);
-			rejectTask(reason);
-		};
-		const onChange = (updated) => {
-			if (updated.id === id && isFinalTask(updated)) resolve(updated);
-		};
-		if (signal?.aborted === true) {
-			abort();
-			return;
-		}
-		dispose = runtime.queue.subscribe(onChange);
-		signal?.addEventListener("abort", abort, { once: true });
-		timer = setTimeout(() => {
-			if (settled) return;
-			const timeout = new ImageGenError(`Image generation task ${id} timed out after ${AGENT_GENERATION_TIMEOUT_MS / 1e3} seconds.`, "generation-timeout");
-			settled = true;
-			cleanup();
-			runtime.queue.cancel(id);
-			rejectTask(timeout);
-		}, AGENT_GENERATION_TIMEOUT_MS);
-		let current;
-		try {
-			current = findTask(id);
-		} catch (error) {
-			reject(error);
-			return;
-		}
-		if (isFinalTask(current)) resolve(current);
-	});
+	const findTask = (id) => findAgentImageTask(runtime, id);
+	const waitForTask = (id, signal) => waitForAgentImageTask(runtime, id, signal);
 	const disposers = [
 		ctx.tools.register(defineTool({
 			name: "generate_image",
@@ -3114,11 +3344,107 @@ function toSaveImage(image, taskId, index) {
 	};
 }
 //#endregion
+//#region src/edit-image-command.ts
+function isImageReference(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+	const ref = value;
+	return typeof ref.attachmentId === "string" && (ref.mediaType === "image/png" || ref.mediaType === "image/jpeg" || ref.mediaType === "image/webp" || ref.mediaType === "image/gif") && Number.isInteger(ref.bytes) && ref.bytes > 0 && Number.isInteger(ref.width) && ref.width > 0 && Number.isInteger(ref.height) && ref.height > 0;
+}
+function imageInContent(value) {
+	if (!Array.isArray(value)) return void 0;
+	for (let index = value.length - 1; index >= 0; index -= 1) {
+		const block = value[index];
+		if (typeof block !== "object" || block === null || Array.isArray(block)) continue;
+		const raw = block;
+		if (raw.type === "image" && isImageReference(raw.attachment)) return raw.attachment;
+		if (raw.type === "tool-result") {
+			const nested = imageInContent(raw.content);
+			if (nested !== void 0) return nested;
+		}
+	}
+}
+/** Pick the newest image explicitly attached to this command invocation. */
+function imageInInvocation(value) {
+	if (!Array.isArray(value)) return void 0;
+	for (let index = value.length - 1; index >= 0; index -= 1) {
+		const block = value[index];
+		if (typeof block !== "object" || block === null || Array.isArray(block)) continue;
+		const raw = block;
+		if (raw.type === "image" && isImageReference(raw.attachment)) return raw.attachment;
+	}
+}
+/** Find the newest durable image reference, including nested tool results. */
+function latestSessionImage(messages) {
+	for (let index = messages.length - 1; index >= 0; index -= 1) {
+		const message = messages[index];
+		if (typeof message !== "object" || message === null || Array.isArray(message)) continue;
+		const image = imageInContent(message.content);
+		if (image !== void 0) return image;
+	}
+}
+function commandError(error) {
+	const text = error instanceof Error ? error.message : String(error);
+	return {
+		kind: "error",
+		text: text.trim() === "" ? "图片编辑失败。" : text
+	};
+}
+/** Register the host-side command; it never sends the command line to a chat model. */
+function registerEditImageCommand(ctx, runtime, resolve, pendingImages) {
+	return ctx.commands.register({
+		name: "edit_image",
+		description: "Edit the latest image in this conversation with the plugin image model",
+		input: {
+			hint: "Describe how to modify the latest image",
+			images: true
+		},
+		async handler(invocation) {
+			const prompt = invocation.rawInput.trim();
+			if (prompt === "") return {
+				kind: "error",
+				text: "请提供图片修改描述，例如：/edit_image 把背景改成夜景"
+			};
+			const invocationImage = imageInInvocation(invocation.attachments);
+			const pendingImage = pendingImages?.get(String(invocation.agent.id));
+			const durableImage = latestSessionImage(invocation.agent.session.deriveMessages());
+			const sourceImage = invocationImage ?? pendingImage ?? durableImage;
+			if (sourceImage === void 0) return {
+				kind: "error",
+				text: "当前对话没有可用图片，请先上传图片或把画廊图片加入对话。"
+			};
+			try {
+				const task = await submitAgentImageEdit(ctx.attachments, runtime, resolve, {
+					prompt,
+					sourceImage,
+					signal: invocation.signal
+				});
+				if (task.status === "completed") {
+					if (pendingImage !== void 0) pendingImages?.consume(String(invocation.agent.id), pendingImage);
+					return {
+						kind: "success",
+						text: "图片编辑已完成，可在 AI 生图面板查看结果。"
+					};
+				}
+				return {
+					kind: "error",
+					text: task.error ?? `图片编辑${task.status === "cancelled" ? "已取消" : "失败"}。`
+				};
+			} catch (error) {
+				return commandError(error);
+			}
+		}
+	});
+}
+//#endregion
 //#region src/index.ts
 /** Stable cordis plugin name. */
 const name = "imagegen";
 /** Services required before the surfaces can mount. */
-const inject = ["webServer", "systemPrompt"];
+const inject = [
+	"webServer",
+	"systemPrompt",
+	"commands"
+];
 /** The branded settings namespace of this plugin (the card edits it). */
 const ImageGenSettingsNamespace = settingsNamespace(IMAGEGEN_SETTINGS_NAMESPACE);
 const Config = z.object({
@@ -3151,7 +3477,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` 图生图；默认保持工具调用等待直到任务完成，完成图片显示在工具调用对应的左侧结果区域，模型收到状态和附件引用，不会额外伪造用户消息。用户也可以使用 `/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 地址与密钥。`;
@@ -3251,6 +3577,7 @@ function apply(ctx, config) {
 		};
 	};
 	const runtime = new ImageGenerationRuntime(channelsView);
+	const pendingConversationImages = /* @__PURE__ */ new Map();
 	ctx.inject(["settings", "attachments"], (sctx) => {
 		const seam = sctx.get("settings");
 		sctx.effect(() => {
@@ -3279,6 +3606,7 @@ function apply(ctx, config) {
 					return [...new Set(value.channels.flatMap((channel) => channel.models.map((model) => model.alias)))];
 				},
 				attachments: sctx.attachments,
+				pendingConversationImages,
 				runtime
 			}).map((route) => ctx.webServer.register(route));
 			return () => {
@@ -3286,16 +3614,33 @@ function apply(ctx, config) {
 			};
 		}, "dsh-imagegen: routes");
 	});
-	ctx.inject(["tools", "attachments"], (tctx) => {
-		tctx.effect(() => registerAgentImageTools(tctx, runtime, () => {
-			const value = resolve();
-			return {
-				enabled: value.enabled,
-				allowAgentImageGeneration: value.allowAgentImageGeneration,
-				channels: value.channels,
-				defaultChannelId: value.defaultChannelId
+	ctx.inject([
+		"tools",
+		"attachments",
+		"commands"
+	], (tctx) => {
+		tctx.effect(() => {
+			const resolveAgentConfig = () => {
+				const value = resolve();
+				return {
+					enabled: value.enabled,
+					allowAgentImageGeneration: value.allowAgentImageGeneration,
+					channels: value.channels,
+					defaultChannelId: value.defaultChannelId
+				};
+			};
+			const disposeTools = registerAgentImageTools(tctx, runtime, resolveAgentConfig);
+			const disposeCommand = registerEditImageCommand(tctx, runtime, resolveAgentConfig, {
+				get: (sessionId) => pendingConversationImages.get(sessionId),
+				consume: (sessionId, ref) => {
+					if (pendingConversationImages.get(sessionId)?.attachmentId === ref.attachmentId) pendingConversationImages.delete(sessionId);
+				}
+			});
+			return () => {
+				disposeCommand();
+				disposeTools();
 			};
-		}), "dsh-imagegen: agent image tools");
+		}, "dsh-imagegen: agent image tools and commands");
 	});
 	let disposeSection;
 	const sync = () => {
@@ -3321,4 +3666,4 @@ function apply(ctx, config) {
 	sync();
 }
 //#endregion
-export { CURRENT_VERSION, Config, IMAGEGEN_GUIDANCE, ImageGenError, ImageGenSettingsNamespace, ImageGenerationRuntime, appendGallery, apply, checkForUpdate, clearGallery, clearTemplateMemo, clearUpdateCache, compareVersions, generateImage, inject, installUpdate, listGallery, listTemplates, makeRoutes, name, profileFromProcess, readGalleryImage, readTemplateImage, refreshTemplates, registerAgentImageTools, removeGallery, updateGalleryTags };
+export { CURRENT_VERSION, Config, IMAGEGEN_GUIDANCE, ImageGenError, ImageGenSettingsNamespace, ImageGenerationRuntime, appendGallery, apply, checkForUpdate, clearGallery, clearTemplateMemo, clearUpdateCache, compareVersions, generateImage, inject, installUpdate, latestSessionImage, listGallery, listTemplates, makeRoutes, name, profileFromProcess, readGalleryImage, readTemplateImage, refreshTemplates, registerAgentImageTools, registerEditImageCommand, removeGallery, updateGalleryTags };