dsh-image-gen 0.2.4 → 0.2.5

package/lib/index.js

@@ -1,5 +1,5 @@
 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";
@@ -26,11 +26,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 +103,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 +139,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 +160,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 +249,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 +266,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 +306,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 +317,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",
@@ -1242,7 +1386,7 @@ const inject = [
 ];
 function apply(ctx, config = {}) {
 	let current = () => config;
-	installSettingsSection(ctx, settingsNamespace(IMAGE_GENERATION_NAMESPACE), Config, config, {
+	installImageSettings(ctx, config, {
 		setSource: (source) => {
 			current = source;
 		},
@@ -1287,19 +1431,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);
+			}
 			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") {
@@ -1394,14 +1545,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 +1564,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);
+			}
+			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;
@@ -1545,6 +1717,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
 		})
 	};
@@ -1574,7 +1747,8 @@ 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;
@@ -1606,5 +1780,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 };

package/lib/types/client/gallery-store.d.ts

@@ -15,6 +15,8 @@ export interface GalleryItem {
     aspectRatio?: string;
     imageSize?: string;
     output?: string;
+    /** Workflow seed reported by the ComfyUI provider. Optional so records written by older versions stay readable; the object store is schemaless, so no IndexedDB version bump is needed. */
+    seed?: number;
 }
 type GalleryListener = () => void;
 /**

package/lib/types/client/gallery-view.d.ts

@@ -18,6 +18,7 @@ declare const DICT: {
         readonly filterOpenAI: "OpenAI / 中转站";
         readonly filterSeedream: "字节 Seedream";
         readonly filterDashScope: "阿里 DashScope";
+        readonly filterComfyUI: "本地 ComfyUI";
         readonly emptyTitle: "暂无生图记录";
         readonly emptyDesc: "在对话中让 Agent 生图后，生成的图片会自动收录到这里。";
         readonly noMatchTitle: "未找到匹配结果";
@@ -44,6 +45,7 @@ declare const DICT: {
         readonly filterOpenAI: "OpenAI / Relay";
         readonly filterSeedream: "ByteDance Seedream";
         readonly filterDashScope: "Aliyun DashScope";
+        readonly filterComfyUI: "Local ComfyUI";
         readonly emptyTitle: "No images generated yet";
         readonly emptyDesc: "Images generated during conversations will automatically appear here.";
         readonly noMatchTitle: "No matching images";

package/lib/types/client/image-result-node.d.ts

@@ -8,6 +8,8 @@ export interface ImageResultPresentation {
     readonly model: string;
     readonly output: string;
     readonly savedTo?: string;
+    /** Workflow seed reported by the ComfyUI provider, when available. */
+    readonly seed?: number;
 }
 interface ImageResultState {
     readonly turn: number;
@@ -46,8 +48,23 @@ interface ConversationNodeDefinitionLike<State> {
     }, match: MatchLike): State;
     buildViewNode(context: ContextLike<State>): Record<string, unknown> | null;
 }
-/** One image result row per Turn, re-anchored to Turn end after the final answer settles. */
+/** Options controlling where the artifact anchors as its Turn progresses. */
+export interface ImageResultNodeOptions {
+    /**
+     * Whether the host transcript view folds completed-Turn process content
+     * (Compact mode). Omission or a thrown/unavailable read falls back to
+     * Compact-safe anchoring, which keeps the artifact always visible.
+     */
+    readonly isCompactTranscript?: () => boolean;
+}
+/** Default definition: unknown transcript mode falls back to Compact-safe anchoring. */
 export declare const imageResultDefinition: ConversationNodeDefinitionLike<ImageResultState>;
+/**
+ * One image result row per Turn, anchored at its own tool/result position while
+ * the Turn runs, then optionally re-anchored beside the final answer once the
+ * Turn closes (only needed under the folding Compact transcript view).
+ */
+export declare function createImageResultDefinition(options?: ImageResultNodeOptions): ConversationNodeDefinitionLike<ImageResultState>;
 /** Parse the plugin-owned durable presentation metadata from a Tool result event. */
 export declare function imageResultFromMeta(value: unknown): ImageResultPresentation | undefined;
 export {};

package/lib/types/client/index.d.ts

@@ -1,7 +1,7 @@
 import type { Context } from '@deepseek-ai/cordis';
 import type { SettingsScope } from '@deepseek-ai/dsh-client-runtime/client';
 import type { InjectFace, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
-import { type ImageProvider } from '../shared.js';
+import { type ComfyUIWorkflowEntry, type ImageProvider } from '../shared.js';
 import { type LocaleService } from './gallery-view.js';
 import { type ImageResultPresentation } from './image-result-node.js';
 type Provider = ImageProvider;
@@ -16,6 +16,8 @@ interface ImageSettings {
     dashscopeEndpoint?: string;
     dashscopeModel?: string;
     comfyuiBaseURL?: string;
+    comfyuiWorkflows?: ComfyUIWorkflowEntry[];
+    comfyuiActiveWorkflow?: string;
     comfyuiWorkflowJson?: string;
     comfyuiWorkflowName?: string;
     comfyuiTimeoutMs?: number;

package/lib/types/comfyui-workflow.d.ts

@@ -1,8 +1,19 @@
 export declare const COMFYUI_PROMPT_PLACEHOLDER = "{{prompt}}";
 export declare const COMFYUI_SEED_PLACEHOLDER = "{{seed}}";
+export declare const COMFYUI_IMAGE_PLACEHOLDER = "{{image}}";
 type JsonRecord = Record<string, unknown>;
 /** Validate imported JSON without exposing workflow graph details to callers. */
 export declare function validateComfyUIWorkflowJson(workflowJson: string): void;
-/** Parse, clone, and inject one prompt plus an optional randomized seed. */
-export declare function prepareComfyUIWorkflow(workflowJson: string, prompt: string, seed?: number): JsonRecord;
+/**
+ * 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.
+ */
+export declare function prepareComfyUIWorkflow(workflowJson: string, prompt: string, seed?: number, image?: string): JsonRecord;
+/** Random seed in the 32-bit range ComfyUI samplers accept. */
+export declare function randomSeed(): number;
 export {};

package/lib/types/comfyui.d.ts

@@ -1,15 +1,32 @@
-/** ComfyUI text-to-image adapter using an imported API-format workflow. */
+/** ComfyUI text-to-image and image-to-image adapters using an imported API-format workflow. */
 import type { ImageMediaType } from '@deepseek-ai/dsh-attachment';
 export interface GeneratedComfyUIImage {
     data: Uint8Array;
     mediaType: ImageMediaType;
+    /** Concrete seed injected into the workflow, surfaced for provenance metadata. */
+    seed: number;
 }
-/** Run one ComfyUI workflow and return its first final image. */
-export declare function generateComfyUIImage(input: {
+/** Source image bytes a ComfyUI workflow accepts through its image input. */
+export interface ComfyUISourceImage {
+    data: Uint8Array;
+    mediaType: ImageMediaType;
+}
+interface ComfyUIJobInput {
     baseURL: string;
+    timeoutMs: number;
+    signal: AbortSignal;
+}
+/** Run one ComfyUI text-to-image workflow and return its first final image. */
+export declare function generateComfyUIImage(input: ComfyUIJobInput & {
     workflowJson: string;
     prompt: string;
-    timeoutMs: number;
     maxBytes: number;
-    signal: AbortSignal;
 }): Promise<GeneratedComfyUIImage>;
+/** Upload one source image, run the workflow, and return its first final image. */
+export declare function editComfyUIImage(input: ComfyUIJobInput & {
+    workflowJson: string;
+    prompt: string;
+    sourceImage: ComfyUISourceImage;
+    maxBytes: number;
+}): Promise<GeneratedComfyUIImage>;
+export {};

package/lib/types/config.d.ts

@@ -1,7 +1,7 @@
 /** User-facing configuration for supported image providers. */
 import z from '@deepseek-ai/schemastery';
-import { DEFAULT_DASHSCOPE_ENDPOINT, DEFAULT_DASHSCOPE_MODEL, DEFAULT_COMFYUI_BASE_URL, DEFAULT_COMFYUI_TIMEOUT_MS, DEFAULT_COMFYUI_WORKFLOW_LABEL, DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, type ImageProvider } from './shared.js';
-export { DEFAULT_DASHSCOPE_ENDPOINT, DEFAULT_DASHSCOPE_MODEL, DEFAULT_COMFYUI_BASE_URL, DEFAULT_COMFYUI_TIMEOUT_MS, DEFAULT_COMFYUI_WORKFLOW_LABEL, DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, type ImageProvider, };
+import { DEFAULT_DASHSCOPE_ENDPOINT, DEFAULT_DASHSCOPE_MODEL, DEFAULT_COMFYUI_BASE_URL, DEFAULT_COMFYUI_TIMEOUT_MS, DEFAULT_COMFYUI_WORKFLOW_LABEL, DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, activeComfyUIWorkflow, resolveComfyUIWorkflows, type ComfyUIWorkflowEntry, type ImageProvider } from './shared.js';
+export { DEFAULT_DASHSCOPE_ENDPOINT, DEFAULT_DASHSCOPE_MODEL, DEFAULT_COMFYUI_BASE_URL, DEFAULT_COMFYUI_TIMEOUT_MS, DEFAULT_COMFYUI_WORKFLOW_LABEL, DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, activeComfyUIWorkflow, resolveComfyUIWorkflows, type ComfyUIWorkflowEntry, type ImageProvider, };
 /** Default workspace subfolder that receives generated image files. */
 export declare const DEFAULT_WORKSPACE_FOLDER = "dsh-image-gen";
 /** Google API credential reference. */
@@ -29,9 +29,13 @@ export interface Config {
     dashscopeEndpoint?: string;
     dashscopeModel?: string;
     comfyuiBaseURL?: string;
-    /** ComfyUI API-format workflow JSON imported through the Web settings page. */
+    /** Named ComfyUI workflows managed by the Web settings page. */
+    comfyuiWorkflows?: ComfyUIWorkflowEntry[];
+    /** Name of the workflow ComfyUI calls use by default. */
+    comfyuiActiveWorkflow?: string;
+    /** Legacy single-workflow storage; synced to the active entry for downgrades. */
     comfyuiWorkflowJson?: string;
-    /** Original imported file name, used as a human-readable result label. */
+    /** Original imported file name of the legacy single workflow. */
     comfyuiWorkflowName?: string;
     comfyuiTimeoutMs?: number;
     /** Also write every generated image as a file under the session workspace. */
@@ -70,7 +74,12 @@ export declare function resolveProvider(config: Config): {
 } | {
     provider: 'comfyui';
     baseURL: string;
-    workflowJson: string;
-    workflowName: string;
+    workflows: ComfyUIWorkflowEntry[];
+    workflow?: ComfyUIWorkflowEntry;
     timeoutMs: number;
 };
+/** The workflow a ComfyUI call runs: the requested name when given, else the active one. */
+export declare function selectComfyUIWorkflow(active: {
+    workflows: ComfyUIWorkflowEntry[];
+    workflow?: ComfyUIWorkflowEntry;
+}, requested?: string): ComfyUIWorkflowEntry;

package/lib/types/shared.d.ts

@@ -20,5 +20,36 @@ export declare const DEFAULT_GOOGLE_MODEL = "gemini-3.1-flash-image";
 export declare const DEFAULT_OPENAI_MODEL = "gpt-image-2";
 export declare const DEFAULT_SEEDREAM_MODEL = "doubao-seedream-5-0-260128";
 export declare const DEFAULT_DASHSCOPE_MODEL = "qwen-image-3.0";
+/** One named ComfyUI API-format workflow imported through settings. */
+export interface ComfyUIWorkflowEntry {
+    /** Unique human-readable label; used as the result model and by tool calls. */
+    name: string;
+    /** API-format workflow JSON with {{prompt}} / {{seed}} and optional {{image}} placeholders. */
+    json: string;
+    /** Optional preset prepended to the user prompt on every call of this workflow. */
+    presetPrompt?: string;
+}
+/** Raw ComfyUI workflow fields as persisted through DSH Settings. */
+export interface ComfyUIWorkflowSource {
+    /** Named workflows managed by the Web settings page. */
+    comfyuiWorkflows?: readonly ComfyUIWorkflowEntry[];
+    /** Name of the entry ComfyUI calls use by default. */
+    comfyuiActiveWorkflow?: string;
+    /** Legacy single-workflow storage; synced to the active entry for downgrades. */
+    comfyuiWorkflowJson?: string;
+    comfyuiWorkflowName?: string;
+}
+/** Named workflows, falling back to the legacy single-workflow fields when the list is empty. */
+export declare function resolveComfyUIWorkflows(source: ComfyUIWorkflowSource): ComfyUIWorkflowEntry[];
+/** The workflow ComfyUI calls use by default: the configured active name, else the first entry. */
+export declare function activeComfyUIWorkflow(source: ComfyUIWorkflowSource): ComfyUIWorkflowEntry | undefined;
+/** Derive a workflow label that does not collide with the given existing names. */
+export declare function uniqueComfyUIWorkflowName(name: string, existing: readonly string[]): string;
+/**
+ * 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.
+ */
+export declare function mergeComfyUIPrompt(preset: string | undefined, user: string): string;
 export declare const DEFAULT_MODELS: Record<ImageProvider, string>;
 export declare const DEFAULT_BASE_URLS: Record<ImageProvider, string>;