dsh-image-gen 0.2.4 → 0.2.6

package/lib/index.js

@@ -1,14 +1,16 @@
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
-import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
+import * as dshSettings from "@deepseek-ai/dsh-settings";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import z from "@deepseek-ai/schemastery";
-import { mkdir, readFile, realpath, rename, stat, unlink, writeFile } from "node:fs/promises";
+import { lstat, mkdir, readFile, realpath, rename, stat, unlink, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { randomUUID } from "node:crypto";
 //#region lib/types/shared.js
 /** Values shared by the Host and browser Bundle faces. */
 /** Browser route used by the generated-image card. */
 const IMAGE_ROUTE = "/plugins/dsh-image-gen/image";
+/** Browser route used for deleting generated images and workspace files. */
+const DELETE_ROUTE = "/plugins/dsh-image-gen/delete";
 /** Namespace persisted through DSH Settings. */
 const IMAGE_GENERATION_NAMESPACE = "image-generation";
 /** Supported providers. */
@@ -26,11 +28,58 @@ const DEFAULT_SEEDREAM_BASE_URL = "https://ark.cn-beijing.volces.com/api/v3";
 const DEFAULT_DASHSCOPE_ENDPOINT = "https://dashscope.aliyuncs.com/api/v1";
 const DEFAULT_COMFYUI_BASE_URL = "http://127.0.0.1:8188";
 const DEFAULT_COMFYUI_TIMEOUT_MS = 3e5;
+const DEFAULT_COMFYUI_WORKFLOW_LABEL = "API workflow";
 /** Default model names. */
 const DEFAULT_GOOGLE_MODEL = "gemini-3.1-flash-image";
 const DEFAULT_OPENAI_MODEL = "gpt-image-2";
 const DEFAULT_SEEDREAM_MODEL = "doubao-seedream-5-0-260128";
 const DEFAULT_DASHSCOPE_MODEL = "qwen-image-3.0";
+/** Named workflows, falling back to the legacy single-workflow fields when the list is empty. */
+function resolveComfyUIWorkflows(source) {
+	const named = [];
+	for (const entry of source.comfyuiWorkflows ?? []) {
+		const name = typeof entry?.name === "string" ? entry.name.trim() : "";
+		const json = typeof entry?.json === "string" ? entry.json : "";
+		if (name.length > 0 && json.trim().length > 0) {
+			const presetPrompt = typeof entry.presetPrompt === "string" ? entry.presetPrompt.trim() : "";
+			named.push(presetPrompt.length > 0 ? {
+				name,
+				json,
+				presetPrompt
+			} : {
+				name,
+				json
+			});
+		}
+	}
+	if (named.length > 0) return named;
+	const legacyJson = typeof source.comfyuiWorkflowJson === "string" ? source.comfyuiWorkflowJson : "";
+	if (legacyJson.trim().length === 0) return [];
+	const legacyName = typeof source.comfyuiWorkflowName === "string" ? source.comfyuiWorkflowName.trim() : "";
+	return [{
+		name: legacyName.length > 0 ? legacyName : DEFAULT_COMFYUI_WORKFLOW_LABEL,
+		json: legacyJson
+	}];
+}
+/** The workflow ComfyUI calls use by default: the configured active name, else the first entry. */
+function activeComfyUIWorkflow(source) {
+	const workflows = resolveComfyUIWorkflows(source);
+	if (workflows.length === 0) return void 0;
+	const activeName = typeof source.comfyuiActiveWorkflow === "string" ? source.comfyuiActiveWorkflow.trim() : "";
+	return workflows.find((workflow) => workflow.name === activeName) ?? workflows[0];
+}
+/**
+* Combine a workflow's preset with the user prompt: preset first, user second,
+* joined by one comma — never doubled when the preset already ends in a
+* separator, and reduced to the non-empty side when the other is blank.
+*/
+function mergeComfyUIPrompt(preset, user) {
+	const presetText = typeof preset === "string" ? preset.trim().replace(/[,;\s]+$/, "") : "";
+	const userText = user.trim();
+	if (presetText.length === 0) return userText;
+	if (userText.length === 0) return presetText;
+	return `${presetText}, ${userText}`;
+}
 //#endregion
 //#region lib/types/config.js
 /** User-facing configuration for supported image providers. */
@@ -56,6 +105,12 @@ const Config = z.object({
 	dashscopeEndpoint: z.string().default(DEFAULT_DASHSCOPE_ENDPOINT),
 	dashscopeModel: z.string().default(DEFAULT_DASHSCOPE_MODEL),
 	comfyuiBaseURL: z.string().default(DEFAULT_COMFYUI_BASE_URL),
+	comfyuiWorkflows: z.array(z.object({
+		name: z.string(),
+		json: z.string(),
+		presetPrompt: z.string().default("")
+	})).default([]),
+	comfyuiActiveWorkflow: z.string().default(""),
 	comfyuiWorkflowJson: z.string().default(""),
 	comfyuiWorkflowName: z.string().default(""),
 	comfyuiTimeoutMs: z.number().min(1e3).max(36e5).default(DEFAULT_COMFYUI_TIMEOUT_MS),
@@ -86,13 +141,17 @@ function resolveProvider(config) {
 			endpoint: config.dashscopeEndpoint ?? "https://dashscope.aliyuncs.com/api/v1",
 			imageSize: "1024*1024"
 		};
-		case "comfyui": return {
-			provider: "comfyui",
-			baseURL: config.comfyuiBaseURL ?? "http://127.0.0.1:8188",
-			workflowJson: config.comfyuiWorkflowJson ?? "",
-			workflowName: config.comfyuiWorkflowName?.trim() || "API workflow",
-			timeoutMs: config.comfyuiTimeoutMs ?? 3e5
-		};
+		case "comfyui": {
+			const workflows = resolveComfyUIWorkflows(config);
+			const workflow = activeComfyUIWorkflow(config);
+			return {
+				provider: "comfyui",
+				baseURL: config.comfyuiBaseURL ?? "http://127.0.0.1:8188",
+				workflows,
+				...workflow === void 0 ? {} : { workflow },
+				timeoutMs: config.comfyuiTimeoutMs ?? 3e5
+			};
+		}
 		case "google": return {
 			provider: "google",
 			apiKeyEnv: GOOGLE_API_KEY_ENV,
@@ -103,43 +162,82 @@ function resolveProvider(config) {
 		};
 	}
 }
+/** The workflow a ComfyUI call runs: the requested name when given, else the active one. */
+function selectComfyUIWorkflow(active, requested) {
+	if (active.workflow === void 0) throw new Error("ComfyUI image generation requires an imported workflow; import one in Settings > Plugins > Image generation.");
+	if (typeof requested !== "string" || requested.trim().length === 0) return active.workflow;
+	const name = requested.trim();
+	const workflow = active.workflows.find((candidate) => candidate.name === name);
+	if (workflow === void 0) throw new Error(`No ComfyUI workflow named "${name}" is configured. Available workflows: ${active.workflows.map((entry) => entry.name).join(", ")}.`);
+	return workflow;
+}
 //#endregion
 //#region lib/types/comfyui-workflow.js
 /** Pure ComfyUI API-workflow validation and placeholder injection. */
 const COMFYUI_PROMPT_PLACEHOLDER = "{{prompt}}";
 const COMFYUI_SEED_PLACEHOLDER = "{{seed}}";
-/** Parse, clone, and inject one prompt plus an optional randomized seed. */
-function prepareComfyUIWorkflow(workflowJson, prompt, seed = randomSeed()) {
+const COMFYUI_IMAGE_PLACEHOLDER = "{{image}}";
+/** Legacy single-percent placeholders from early releases, still accepted. */
+const LEGACY_PROMPT_PLACEHOLDER = "%prompt%";
+const LEGACY_SEED_PLACEHOLDER = "%seed%";
+const LEGACY_IMAGE_PLACEHOLDER = "%image%";
+/** LoadImage-style input key that receives the uploaded source image name. */
+const IMAGE_INPUT_KEY = "image";
+/**
+* Parse, clone, and inject one prompt plus an optional randomized seed.
+*
+* Prompt and seed placeholders are replaced inside any string so existing
+* workflows that embed them in longer text keep working. The image
+* placeholder is stricter: it only matches a dedicated `inputs.image` field
+* whose value is exactly the placeholder, and at most one may exist, because
+* the field must carry a single uploaded file name.
+*/
+function prepareComfyUIWorkflow(workflowJson, prompt, seed = randomSeed(), image) {
 	const workflow = parseWorkflow(workflowJson);
 	let promptReplacements = 0;
 	const inject = (value) => {
 		if (typeof value === "string") {
-			if (value === "{{prompt}}") {
-				promptReplacements += 1;
-				return prompt;
-			}
-			if (value === "{{seed}}") return seed;
-			if (value.includes("{{prompt}}")) {
+			let replaced = value;
+			if (replaced.includes("{{prompt}}") || replaced.includes(LEGACY_PROMPT_PLACEHOLDER)) {
 				promptReplacements += 1;
-				return value.replaceAll(COMFYUI_PROMPT_PLACEHOLDER, prompt);
+				replaced = replaced.replaceAll(COMFYUI_PROMPT_PLACEHOLDER, prompt).replaceAll(LEGACY_PROMPT_PLACEHOLDER, prompt);
 			}
-			return value.includes("{{seed}}") ? value.replaceAll(COMFYUI_SEED_PLACEHOLDER, String(seed)) : value;
+			if (replaced === "{{seed}}" || replaced === LEGACY_SEED_PLACEHOLDER) return seed;
+			if (replaced.includes("{{seed}}") || replaced.includes(LEGACY_SEED_PLACEHOLDER)) replaced = replaced.replaceAll(COMFYUI_SEED_PLACEHOLDER, String(seed)).replaceAll(LEGACY_SEED_PLACEHOLDER, String(seed));
+			return replaced;
 		}
 		if (Array.isArray(value)) return value.map(inject);
 		if (!isRecord(value)) return value;
 		return Object.fromEntries(Object.entries(value).map(([key, child]) => [key, inject(child)]));
 	};
+	let imageInputs = 0;
 	const prepared = Object.fromEntries(Object.entries(workflow).map(([nodeId, value]) => {
 		const node = record$4(value);
 		const inputs = node === void 0 ? void 0 : record$4(node.inputs);
-		return inputs === void 0 ? [nodeId, value] : [nodeId, {
+		if (inputs === void 0) return [nodeId, value];
+		const nextInputs = inject(inputs);
+		if (isImagePlaceholder(nextInputs[IMAGE_INPUT_KEY])) {
+			imageInputs += 1;
+			if (image !== void 0) nextInputs[IMAGE_INPUT_KEY] = image;
+		}
+		return [nodeId, {
 			...node,
-			inputs: inject(inputs)
+			inputs: nextInputs
 		}];
 	}));
 	if (promptReplacements === 0) throw new Error(`ComfyUI workflow must contain ${COMFYUI_PROMPT_PLACEHOLDER} in a text input`);
+	if (image === void 0) {
+		if (imageInputs > 0) throw new Error(`ComfyUI workflow contains an ${COMFYUI_IMAGE_PLACEHOLDER} image input, which requires edit_image with a source image`);
+		return prepared;
+	}
+	if (imageInputs === 0) throw new Error(`ComfyUI workflow must contain exactly one ${COMFYUI_IMAGE_PLACEHOLDER} image input to edit images`);
+	if (imageInputs > 1) throw new Error(`ComfyUI workflow must contain exactly one ${COMFYUI_IMAGE_PLACEHOLDER} image input; found ${String(imageInputs)}`);
 	return prepared;
 }
+/** Random seed in the 32-bit range ComfyUI samplers accept. */
+function randomSeed() {
+	return Math.floor(Math.random() * 4294967296);
+}
 function parseWorkflow(workflowJson) {
 	if (workflowJson.trim().length === 0) throw new Error("Import a ComfyUI API workflow JSON file in Settings before generating");
 	if (new TextEncoder().encode(workflowJson).byteLength > 5242880) throw new Error("ComfyUI workflow file must be no larger than 5 MB");
@@ -153,11 +251,14 @@ function parseWorkflow(workflowJson) {
 	if (!Object.values(value).some((node) => {
 		const inputs = record$4(node)?.inputs;
 		return inputs !== void 0 && containsPromptPlaceholder(inputs);
-	})) throw new Error(`ComfyUI workflow must contain ${COMFYUI_PROMPT_PLACEHOLDER} in a text input`);
+	})) throw new Error(`ComfyUI workflow must contain ${COMFYUI_PROMPT_PLACEHOLDER} (or ${LEGACY_PROMPT_PLACEHOLDER}) in a text input`);
 	return value;
 }
+function isImagePlaceholder(value) {
+	return value === "{{image}}" || value === LEGACY_IMAGE_PLACEHOLDER;
+}
 function containsPromptPlaceholder(value) {
-	if (typeof value === "string") return value.includes(COMFYUI_PROMPT_PLACEHOLDER);
+	if (typeof value === "string") return value.includes("{{prompt}}") || value.includes(LEGACY_PROMPT_PLACEHOLDER);
 	if (Array.isArray(value)) return value.some(containsPromptPlaceholder);
 	return isRecord(value) && Object.values(value).some(containsPromptPlaceholder);
 }
@@ -167,19 +268,37 @@ function isRecord(value) {
 function record$4(value) {
 	return isRecord(value) ? value : void 0;
 }
-function randomSeed() {
-	return Math.floor(Math.random() * 4294967296);
-}
 //#endregion
 //#region lib/types/comfyui.js
 const ERROR_LIMIT$3 = 4096;
 const POLL_INTERVAL_MS = 500;
 const MAX_HISTORY_BYTES = 16777216;
-/** Run one ComfyUI workflow and return its first final image. */
+/** Run one ComfyUI text-to-image workflow and return its first final image. */
 async function generateComfyUIImage(input) {
+	const seed = randomSeed();
+	const workflow = prepareComfyUIWorkflow(input.workflowJson, input.prompt, seed);
+	return {
+		...await runJob(input, async (baseURL, signal) => {
+			return await downloadOutput(baseURL, await waitForOutput(baseURL, await submitWorkflow(baseURL, workflow, signal), signal), input.maxBytes, signal);
+		}),
+		seed
+	};
+}
+/** Upload one source image, run the workflow, and return its first final image. */
+async function editComfyUIImage(input) {
+	const seed = randomSeed();
+	return {
+		...await runJob(input, async (baseURL, signal) => {
+			const imageName = await uploadSourceImage(baseURL, input.sourceImage, signal);
+			return await downloadOutput(baseURL, await waitForOutput(baseURL, await submitWorkflow(baseURL, prepareComfyUIWorkflow(input.workflowJson, input.prompt, seed, imageName), signal), signal), input.maxBytes, signal);
+		}),
+		seed
+	};
+}
+/** Share abort forwarding, the single timeout, and error normalization. */
+async function runJob(input, run) {
 	input.signal.throwIfAborted();
 	const baseURL = comfyUIBaseURL(input.baseURL);
-	const workflow = prepareComfyUIWorkflow(input.workflowJson, input.prompt);
 	const controller = new AbortController();
 	const forwardAbort = () => {
 		controller.abort(input.signal.reason);
@@ -189,7 +308,7 @@ async function generateComfyUIImage(input) {
 		controller.abort(/* @__PURE__ */ new Error("ComfyUI generation timed out"));
 	}, input.timeoutMs);
 	try {
-		return await downloadOutput(baseURL, await waitForOutput(baseURL, await submitWorkflow(baseURL, workflow, controller.signal), controller.signal), input.maxBytes, controller.signal);
+		return await run(baseURL, controller.signal);
 	} catch (error) {
 		input.signal.throwIfAborted();
 		if (controller.signal.aborted) throw new Error(`ComfyUI generation timed out after ${String(input.timeoutMs)} ms`);
@@ -200,6 +319,33 @@ async function generateComfyUIImage(input) {
 		input.signal.removeEventListener("abort", forwardAbort);
 	}
 }
+/** Upload the source image and return the LoadImage-compatible name ComfyUI stored it under. */
+async function uploadSourceImage(baseURL, image, signal) {
+	const filename = uploadFilename(image.mediaType);
+	const bytes = new Uint8Array(image.data.byteLength);
+	bytes.set(image.data);
+	const form = new FormData();
+	form.append("image", new Blob([bytes], { type: image.mediaType }), filename);
+	const response = await fetch(endpoint(baseURL, "upload/image"), {
+		method: "POST",
+		redirect: "error",
+		signal,
+		headers: { accept: "application/json" },
+		body: form
+	});
+	const text = await readBoundedText$3(response, ERROR_LIMIT$3);
+	if (!response.ok) throw new Error(`ComfyUI image upload failed (${response.status}): ${text}`);
+	const payload = parseJsonRecord(text, "ComfyUI /upload/image returned invalid JSON");
+	if (typeof payload.name !== "string" || payload.name.length === 0) throw new Error(`ComfyUI /upload/image returned no name: ${text}`);
+	const subfolder = typeof payload.subfolder === "string" ? payload.subfolder : "";
+	return subfolder.length > 0 ? `${subfolder}/${payload.name}` : payload.name;
+}
+/** LoadImage-style inputs need a file name with a decodable extension. */
+function uploadFilename(mediaType) {
+	const extension = mediaType === "image/png" ? "png" : mediaType === "image/jpeg" ? "jpg" : mediaType === "image/webp" ? "webp" : void 0;
+	if (extension === void 0) throw new Error(`ComfyUI edit_image accepts PNG, JPEG, or WebP source images; got ${mediaType}`);
+	return `dsh-image-gen-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}.${extension}`;
+}
 async function submitWorkflow(baseURL, workflow, signal) {
 	const response = await fetch(endpoint(baseURL, "prompt"), {
 		method: "POST",
@@ -785,7 +931,7 @@ function record$1(value) {
 }
 //#endregion
 //#region lib/types/image-route.js
-const MAX_BODY_BYTES = 4096;
+const MAX_BODY_BYTES = 65536;
 /** Serve one verified durable image reference to a same-origin browser request. */
 async function serveImage(req, res, deps) {
 	if (req.method !== "POST") return jsonError(res, 405, "method-not-allowed");
@@ -814,6 +960,54 @@ async function serveImage(req, res, deps) {
 		jsonError(res, 404, "image-unavailable");
 	}
 }
+/** Safely delete one or more generated image files from the workspace disk. */
+async function serveDelete(req, res, deps) {
+	if (req.method !== "POST") return jsonError(res, 405, "method-not-allowed");
+	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError(res, 415, "json-required");
+	const origin = req.headers.origin;
+	const host = req.headers.host;
+	if (origin !== void 0 && host !== void 0 && origin !== `http://${host}` && origin !== `https://${host}`) return jsonError(res, 403, "origin-rejected");
+	let body;
+	try {
+		body = JSON.parse(await readBody(req));
+	} catch {
+		return jsonError(res, 400, "invalid-request");
+	}
+	const rawPaths = typeof body === "object" && body !== null && "paths" in body && Array.isArray(body.paths) ? body.paths : [];
+	const rawAttachmentIds = typeof body === "object" && body !== null && "attachmentIds" in body && Array.isArray(body.attachmentIds) ? body.attachmentIds : [];
+	const deletedFiles = [];
+	const failedFiles = [];
+	for (const p of rawPaths) if (typeof p === "string" && p.trim()) try {
+		if (await deps.deleteWorkspaceImage(p)) deletedFiles.push(p);
+		else failedFiles.push({
+			path: p,
+			error: "File not found or rejected by safety checks"
+		});
+	} catch (err) {
+		failedFiles.push({
+			path: p,
+			error: err instanceof Error ? err.message : String(err)
+		});
+	}
+	for (const id of rawAttachmentIds) if (typeof id === "string" && id.trim()) try {
+		if (await deps.deleteWorkspaceImageByAttachmentId(id)) deletedFiles.push(id);
+	} catch (err) {
+		failedFiles.push({
+			path: id,
+			error: err instanceof Error ? err.message : String(err)
+		});
+	}
+	res.writeHead(200, {
+		"content-type": "application/json",
+		"cache-control": "no-store"
+	});
+	res.end(JSON.stringify({
+		ok: failedFiles.length === 0,
+		deletedCount: deletedFiles.length,
+		deletedFiles,
+		failedFiles
+	}));
+}
 /** Validate the persisted reference carried by a tool presentation. */
 function imageAttachmentFromMeta(meta) {
 	const value = record(meta);
@@ -1231,6 +1425,88 @@ async function saveImageToWorkspace(options) {
 	}
 	return target;
 }
+/** Regex pattern strictly matching generated image file names (e.g. image-01234567.png). */
+const GENERATED_IMAGE_NAME_REGEX = /^image-[0-9a-f]{8,}\.(png|jpg|jpeg|webp|gif)$/i;
+/**
+* Safely delete a generated image file from workspace disk by its path.
+* Enforces strict safety gates:
+* 1. Base name must match generated image pattern (`image-<hex>.<ext>`) to avoid touching user files.
+* 2. Path must be a regular file and NOT a symbolic link.
+* 3. Real canonical path's basename must also match the pattern.
+* 4. Real canonical path must reside within an allowed workspace root (or process.cwd()).
+*/
+async function deleteImageFromWorkspace(filePath, allowedWorkspaceRoots) {
+	const resolved = resolve(filePath);
+	const base = resolved.split(/[/\\]/).pop() ?? "";
+	if (!GENERATED_IMAGE_NAME_REGEX.test(base)) return false;
+	try {
+		const fileLstat = await lstat(resolved);
+		if (fileLstat.isSymbolicLink() || !fileLstat.isFile()) return false;
+	} catch (err) {
+		if (err?.code === "ENOENT") return true;
+		throw err;
+	}
+	try {
+		const realFile = await realpath(resolved);
+		const realBase = realFile.split(/[/\\]/).pop() ?? "";
+		if (!GENERATED_IMAGE_NAME_REGEX.test(realBase)) return false;
+		const rootsToCheck = /* @__PURE__ */ new Set();
+		if (allowedWorkspaceRoots) {
+			for (const r of allowedWorkspaceRoots) if (typeof r === "string" && r.trim()) rootsToCheck.add(resolve(r));
+		}
+		rootsToCheck.add(resolve(process.cwd()));
+		let withinAllowed = false;
+		for (const root of rootsToCheck) try {
+			if (containsPath(await realpath(root), realFile)) {
+				withinAllowed = true;
+				break;
+			}
+		} catch {}
+		if (!withinAllowed) return false;
+		await unlink(realFile);
+		return true;
+	} catch (err) {
+		if (err?.code === "ENOENT") return true;
+		throw err;
+	}
+}
+/**
+* Safely find and delete a generated image file by its attachment ID within a single workspace root.
+* Strictly checks sha256:64hex format and avoids scanning unrelated workspaces.
+* Only used as fallback for historical images where savedTo was not persisted.
+*/
+async function deleteImageByAttachmentIdFromWorkspace(attachmentId, options = {}) {
+	const match = attachmentId.match(/^sha256:([0-9a-f]{64})$/i);
+	if (!match || !match[1]) return false;
+	const prefix = match[1].slice(0, 8);
+	const rootsToCheck = /* @__PURE__ */ new Set();
+	if (options.workspaceRoot && options.workspaceRoot.trim()) rootsToCheck.add(resolve(options.workspaceRoot.trim()));
+	else if (options.allowedWorkspaceRoots) {
+		for (const r of options.allowedWorkspaceRoots) if (typeof r === "string" && r.trim()) rootsToCheck.add(resolve(r));
+	}
+	rootsToCheck.add(resolve(process.cwd()));
+	const candidateDirs = /* @__PURE__ */ new Set();
+	if (options.folder && options.folder.trim()) candidateDirs.add(options.folder.trim());
+	candidateDirs.add("dsh-image-gen");
+	candidateDirs.add("image");
+	candidateDirs.add("images");
+	candidateDirs.add("");
+	const candidateExtensions = [
+		"png",
+		"jpg",
+		"jpeg",
+		"webp",
+		"gif"
+	];
+	let deleted = false;
+	for (const root of rootsToCheck) for (const dir of candidateDirs) for (const ext of candidateExtensions) {
+		const targetPath = join(root, dir, `image-${prefix}.${ext}`);
+		try {
+			if (await deleteImageFromWorkspace(targetPath, rootsToCheck)) deleted = true;
+		} catch {}
+	}
+	return deleted;
+}
 //#endregion
 //#region lib/types/index.js
 const name = "dsh-image-gen";
@@ -1242,7 +1518,8 @@ const inject = [
 ];
 function apply(ctx, config = {}) {
 	let current = () => config;
-	installSettingsSection(ctx, settingsNamespace(IMAGE_GENERATION_NAMESPACE), Config, config, {
+	const knownWorkspaceRoots = /* @__PURE__ */ new Set();
+	installImageSettings(ctx, config, {
 		setSource: (source) => {
 			current = source;
 		},
@@ -1253,6 +1530,17 @@ function apply(ctx, config = {}) {
 		path: IMAGE_ROUTE,
 		handler: (req, res) => serveImage(req, res, { readImage: (ref) => ctx.attachments.readImage(ref) })
 	}), "dsh-image-gen: image route");
+	ctx.effect(() => ctx.webServer.register({
+		kind: "exact",
+		path: DELETE_ROUTE,
+		handler: (req, res) => serveDelete(req, res, {
+			deleteWorkspaceImage: (filePath) => deleteImageFromWorkspace(filePath, knownWorkspaceRoots),
+			deleteWorkspaceImageByAttachmentId: (attachmentId) => deleteImageByAttachmentIdFromWorkspace(attachmentId, {
+				folder: current().workspaceFolder,
+				allowedWorkspaceRoots: knownWorkspaceRoots
+			})
+		})
+	}), "dsh-image-gen: delete route");
 	ctx.tools.register(defineTool({
 		name: "generate_image",
 		description: "Generate a new image with the configured provider. Use when the user asks to create or draw a new image; use edit_image instead when they want to change an existing image. Give a complete visual prompt including subject, composition, style, lighting, and any exact text that should appear. A successful image is attached directly to the conversation and may also be saved under the session workspace. Do not call read, glob, or other tools to locate or verify the image.",
@@ -1287,19 +1575,26 @@ function apply(ctx, config = {}) {
 			size: {
 				type: "string",
 				description: "Optional dimensions or size tier for OpenAI, Seedream, or DashScope."
+			},
+			workflow: {
+				type: "string",
+				description: "Optional name of the ComfyUI workflow to run; omit to use the active workflow from settings. Only meaningful when the ComfyUI provider is selected."
 			}
 		},
 		output: imageOutput("Generated"),
 		async execute(args, exec) {
 			const active = resolveProvider(current());
-			if (active.provider === "comfyui") return saveGenerated(ctx, await generateComfyUIImage({
-				baseURL: active.baseURL,
-				workflowJson: active.workflowJson,
-				prompt: args.prompt,
-				timeoutMs: active.timeoutMs,
-				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-				signal: exec.signal
-			}), active.provider, active.workflowName, "API workflow", current(), exec);
+			if (active.provider === "comfyui") {
+				const workflow = selectComfyUIWorkflow(active, args.workflow);
+				return saveGenerated(ctx, await generateComfyUIImage({
+					baseURL: active.baseURL,
+					workflowJson: workflow.json,
+					prompt: mergeComfyUIPrompt(workflow.presetPrompt, args.prompt),
+					timeoutMs: active.timeoutMs,
+					maxBytes: ctx.attachments.imageLimits.maxImageBytes,
+					signal: exec.signal
+				}), active.provider, workflow.name, "API workflow", current(), exec, knownWorkspaceRoots);
+			}
 			const credential = await ctx.credentials.resolve(credentialRef(active.apiKeyEnv));
 			if (credential === void 0 || credential.value.length === 0) throw new Error(`generate_image requires the ${active.apiKeyEnv} credential; configure it in Settings > Plugins > Image generation.`);
 			if (active.provider === "google") {
@@ -1314,7 +1609,7 @@ function apply(ctx, config = {}) {
 					imageSize,
 					maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 					signal: exec.signal
-				}), active.provider, active.model, `${aspectRatio}, ${imageSize}`, current(), exec);
+				}), active.provider, active.model, `${aspectRatio}, ${imageSize}`, current(), exec, knownWorkspaceRoots);
 			}
 			if (active.provider === "dashscope") {
 				const size = args.size ?? active.imageSize;
@@ -1326,7 +1621,7 @@ function apply(ctx, config = {}) {
 					size,
 					maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 					signal: exec.signal
-				}), active.provider, active.model, size, current(), exec);
+				}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 			}
 			const size = args.size ?? active.imageSize;
 			return saveGenerated(ctx, await generateOpenAICompatibleImage({
@@ -1338,7 +1633,7 @@ function apply(ctx, config = {}) {
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 				signal: exec.signal
-			}), active.provider, active.model, size, current(), exec);
+			}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 		},
 		presentResult: (_args, result) => imagePresentation(result)
 	}));
@@ -1394,14 +1689,15 @@ function apply(ctx, config = {}) {
 			size: {
 				type: "string",
 				description: "Optional output size for OpenAI, Seedream, or DashScope."
+			},
+			workflow: {
+				type: "string",
+				description: "Optional name of the ComfyUI workflow to run; omit to use the active workflow from settings. Only meaningful when the ComfyUI provider is selected."
 			}
 		},
 		output: imageOutput("Edited"),
 		async execute(args, exec) {
 			const active = resolveProvider(current());
-			if (active.provider === "comfyui") throw new Error("edit_image is not yet supported by the ComfyUI provider; switch providers or use generate_image");
-			const credential = await ctx.credentials.resolve(credentialRef(active.apiKeyEnv));
-			if (credential === void 0 || credential.value.length === 0) throw new Error(`edit_image requires the ${active.apiKeyEnv} credential; configure it in Settings > Plugins > Image generation.`);
 			const sourceImages = await resolveReferenceImages({
 				...exec.agent === void 0 ? {} : { agent: exec.agent },
 				attachments: ctx.attachments,
@@ -1412,6 +1708,26 @@ function apply(ctx, config = {}) {
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 				signal: exec.signal
 			});
+			if (active.provider === "comfyui") {
+				if (sourceImages.length > 1) throw new Error(`ComfyUI edit_image supports exactly one source image per call; this call resolved ${String(sourceImages.length)} images. Call edit_image again with source_attachment_id set to the single attachment ID of the image to edit.`);
+				const sourceImage = sourceImages[0];
+				if (sourceImage === void 0) throw new Error("edit_image requires a reference image");
+				const workflow = selectComfyUIWorkflow(active, args.workflow);
+				return saveGenerated(ctx, await editComfyUIImage({
+					baseURL: active.baseURL,
+					workflowJson: workflow.json,
+					prompt: mergeComfyUIPrompt(workflow.presetPrompt, args.prompt),
+					sourceImage: {
+						data: sourceImage.data,
+						mediaType: sourceImage.mediaType
+					},
+					timeoutMs: active.timeoutMs,
+					maxBytes: ctx.attachments.imageLimits.maxImageBytes,
+					signal: exec.signal
+				}), active.provider, workflow.name, "API workflow", current(), exec, knownWorkspaceRoots);
+			}
+			const credential = await ctx.credentials.resolve(credentialRef(active.apiKeyEnv));
+			if (credential === void 0 || credential.value.length === 0) throw new Error(`edit_image requires the ${active.apiKeyEnv} credential; configure it in Settings > Plugins > Image generation.`);
 			if (active.provider === "google") {
 				const aspectRatio = args.aspect_ratio ?? active.aspectRatio;
 				const imageSize = args.image_size ?? active.imageSize;
@@ -1425,7 +1741,7 @@ function apply(ctx, config = {}) {
 					imageSize,
 					maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 					signal: exec.signal
-				}), active.provider, active.model, `${aspectRatio}, ${imageSize}`, current(), exec);
+				}), active.provider, active.model, `${aspectRatio}, ${imageSize}`, current(), exec, knownWorkspaceRoots);
 			}
 			const size = args.size ?? active.imageSize;
 			if (active.provider === "openai") return saveGenerated(ctx, await editOpenAICompatibleImage({
@@ -1437,7 +1753,7 @@ function apply(ctx, config = {}) {
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 				signal: exec.signal
-			}), active.provider, active.model, size, current(), exec);
+			}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 			if (active.provider === "seedream") return saveGenerated(ctx, await editSeedreamImage({
 				apiKey: credential.value,
 				baseURL: active.baseURL,
@@ -1447,7 +1763,7 @@ function apply(ctx, config = {}) {
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 				signal: exec.signal
-			}), active.provider, active.model, size, current(), exec);
+			}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 			return saveGenerated(ctx, await editDashScopeImage({
 				apiKey: credential.value,
 				endpoint: active.endpoint,
@@ -1457,7 +1773,7 @@ function apply(ctx, config = {}) {
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 				signal: exec.signal
-			}), active.provider, active.model, size, current(), exec);
+			}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 		},
 		presentResult: (_args, result) => imagePresentation(result)
 	}));
@@ -1545,6 +1861,7 @@ function imageOutput(verb) {
 			output: value.output,
 			...verb === "Edited" ? { operation: "edit" } : {},
 			...typeof value.savedTo === "string" ? { savedTo: value.savedTo } : {},
+			...typeof value.seed === "number" ? { seed: value.seed } : {},
 			prompt: args.prompt
 		})
 	};
@@ -1563,7 +1880,7 @@ function attachmentMeta(ref) {
 		} }
 	};
 }
-async function saveGenerated(ctx, generated, provider, model, output, config, exec) {
+async function saveGenerated(ctx, generated, provider, model, output, config, exec, knownRoots) {
 	if (!ctx.attachments.imageLimits.mediaTypes.includes(generated.mediaType)) throw new Error(`This DSH deployment does not accept ${generated.mediaType} generated images`);
 	const attachment = await ctx.attachments.saveImage({
 		data: generated.data,
@@ -1574,11 +1891,13 @@ async function saveGenerated(ctx, generated, provider, model, output, config, ex
 		attachment,
 		provider,
 		model,
-		output
+		output,
+		...typeof generated.seed === "number" ? { seed: generated.seed } : {}
 	};
 	if (config.saveToWorkspace === false) return value;
 	const workspaceRoot = exec.agent?.session.header.cwd;
 	if (workspaceRoot === void 0) return value;
+	knownRoots?.add(workspaceRoot);
 	try {
 		value.savedTo = await saveImageToWorkspace({
 			workspaceRoot,
@@ -1606,5 +1925,28 @@ function imagePresentation(result) {
 		}]
 	};
 }
+/**
+* Wire the settings namespace across both dsh-settings API generations.
+* A namespace import keeps module loading safe on either version; the branch
+* picks the service method (0.1.2+) or the legacy top-level relay (<= rc.2),
+* and falls back to the composition entry with a warning when neither exists
+* so an incompatible host degrades the settings UI instead of failing boot.
+*/
+function installImageSettings(ctx, config, hooks) {
+	const namespace = dshSettings;
+	if (typeof namespace.SettingsProvider?.prototype?.installSection === "function") {
+		ctx.inject(["settings"], (settingsCtx) => {
+			settingsCtx.settings.installSection(ctx, IMAGE_GENERATION_NAMESPACE, Config, config, hooks);
+		});
+		return;
+	}
+	const legacyInstall = namespace.installSettingsSection;
+	const legacyNamespace = namespace.settingsNamespace;
+	if (typeof legacyInstall === "function" && typeof legacyNamespace === "function") {
+		legacyInstall(ctx, legacyNamespace(IMAGE_GENERATION_NAMESPACE), Config, config, hooks);
+		return;
+	}
+	ctx.logger.warn("dsh-image-gen: this DSH exposes neither settings API generation; settings UI stays on the composition entry");
+}
 //#endregion
-export { Config, IMAGE_ROUTE, apply, imageAttachmentFromMeta, inject, name };
+export { Config, DELETE_ROUTE, IMAGE_ROUTE, apply, imageAttachmentFromMeta, inject, name };