@dickpy/dsh-imagegen 1.4.0 → 1.5.1

package/lib/index.js

@@ -1,4 +1,5 @@
-import { SettingsConflictError, installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
+import * as settingsModule from "@deepseek-ai/dsh-settings";
+import { SettingsConflictError } from "@deepseek-ai/dsh-settings";
 import z from "schemastery";
 import { createHash, randomUUID } from "node:crypto";
 import { promises } from "node:fs";
@@ -7,6 +8,29 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { spawn } from "node:child_process";
 import { defineTool } from "@deepseek-ai/dsh-tools";
+//#region src/settings-compat.ts
+const compatModule = settingsModule;
+/** Brand namespaces where the installed settings package still exposes it. */
+function settingsNamespaceCompat(value) {
+	return compatModule.settingsNamespace?.(value) ?? value;
+}
+/**
+* Register an optional settings section across the rc.7 and alpha.2 APIs.
+* rc.7 exposes a module helper; alpha.2 moves the helper onto the provider.
+*/
+function installSettingsSectionCompat(ctx, ns, schema, entry, hooks) {
+	const legacyInstaller = compatModule.installSettingsSection;
+	if (legacyInstaller !== void 0) {
+		legacyInstaller(ctx, ns, schema, entry, hooks);
+		return;
+	}
+	ctx.inject(["settings"], (sctx) => {
+		const provider = sctx.get("settings");
+		if (provider.installSection === void 0) throw new TypeError("dsh-settings does not expose installSection");
+		provider.installSection(ctx, ns, schema, entry, hooks);
+	});
+}
+//#endregion
 //#region src/protocol.ts
 /**
 * Wire contract shared by the host and client halves of dsh-imagegen: the
@@ -16,7 +40,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.1";
+const PLUGIN_VERSION = "1.5.1";
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 const SETTINGS_API = {
 	describe: "/api/dsh-imagegen/settings/describe",
@@ -35,6 +59,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
@@ -811,7 +837,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";
@@ -844,7 +870,12 @@ function toWire$1(entry) {
 		...entry.channel === void 0 ? {} : { channel: entry.channel },
 		...entry.channelId === void 0 ? {} : { channelId: entry.channelId },
 		...entry.comparisonId === void 0 ? {} : { comparisonId: entry.comparisonId },
-		...entry.comparisonModels === void 0 ? {} : { comparisonModels: entry.comparisonModels }
+		...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. */
@@ -887,7 +918,12 @@ async function appendHistory(input) {
 			...input.channelId === void 0 ? {} : { channelId: input.channelId },
 			...input.channel === void 0 ? {} : { channel: input.channel },
 			...input.comparisonId === void 0 ? {} : { comparisonId: input.comparisonId },
-			...input.comparisonModels === void 0 ? {} : { comparisonModels: input.comparisonModels }
+			...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);
@@ -1075,7 +1111,12 @@ var ImageGenerationRuntime = class {
 				...request.channelId === void 0 ? {} : { channelId: request.channelId },
 				...request.channel === void 0 ? {} : { channel: request.channel },
 				...request.comparisonId === void 0 ? {} : { comparisonId: request.comparisonId },
-				...request.comparisonModels === void 0 ? {} : { comparisonModels: request.comparisonModels }
+				...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,
@@ -1169,7 +1210,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";
@@ -1201,7 +1242,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. */
@@ -1253,7 +1299,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 {
@@ -1806,7 +1857,12 @@ function parseGenerateRequest(body) {
 		...typeof body.refName === "string" && body.refName !== "" ? { refName: body.refName } : {},
 		...typeof body.channelId === "string" && body.channelId !== "" ? { channelId: body.channelId } : {},
 		...typeof body.comparisonId === "string" && body.comparisonId !== "" ? { comparisonId: body.comparisonId } : {},
-		...comparisonModels.length > 1 ? { comparisonModels } : {}
+		...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). */
@@ -1847,7 +1903,12 @@ function parseHistoryEntryInput(body) {
 		...typeof entry.channelId === "string" ? { channelId: entry.channelId } : {},
 		...typeof entry.channel === "string" ? { channel: entry.channel } : {},
 		...typeof entry.comparisonId === "string" ? { comparisonId: entry.comparisonId } : {},
-		...comparisonModels.length > 1 ? { comparisonModels } : {}
+		...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. */
@@ -1889,6 +1950,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 {
@@ -2040,6 +2110,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,
@@ -2233,7 +2336,7 @@ function makeRoutes(deps) {
 				}
 				const expectedRevision = typeof body.expectedRevision === "number" ? body.expectedRevision : void 0;
 				try {
-					await deps.settings.mutate(settingsNamespace(ns), body.ops, expectedRevision);
+					await deps.settings.mutate(ns, body.ops, expectedRevision);
 				} catch (error) {
 					writeJson(res, 200, failureOf(error));
 					return;
@@ -2863,6 +2966,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";
 }
@@ -2948,36 +3158,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);
@@ -2999,67 +3182,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",
@@ -3244,13 +3368,109 @@ 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 ImageGenSettingsNamespace = settingsNamespaceCompat(IMAGEGEN_SETTINGS_NAMESPACE);
 const Config = z.object({
 	enabled: z.boolean().default(true),
 	announceToAgent: z.boolean().default(true),
@@ -3281,7 +3501,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 数组发送；智谱 `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。用户提到「生图 / 绘画 / 生成图片 / 文生图 / 图生图 / 画廊 / 提示词模板」时即指本插件，请据此协作。";
+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 地址与密钥。`;
@@ -3381,6 +3601,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(() => {
@@ -3409,6 +3630,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 () => {
@@ -3416,16 +3638,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 = () => {
@@ -3441,7 +3680,7 @@ function apply(ctx, config) {
 			text: guidanceFor(value.channels, value.defaultChannelId)
 		});
 	};
-	installSettingsSection(ctx, ImageGenSettingsNamespace, Config, config ?? {}, {
+	installSettingsSectionCompat(ctx, ImageGenSettingsNamespace, Config, config ?? {}, {
 		setSource: (source) => {
 			current = source;
 			sync();
@@ -3451,4 +3690,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 };