@dickpy/dsh-imagegen 1.0.20 → 1.1.0

package/lib/index.js

@@ -15,7 +15,7 @@ import { spawn } from "node:child_process";
 /** 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.0.20";
+const PLUGIN_VERSION = "1.1.0";
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 const SETTINGS_API = {
 	describe: "/api/dsh-imagegen/settings/describe",
@@ -23,6 +23,18 @@ const SETTINGS_API = {
 };
 /** The image-generation proxy route. */
 const GENERATE_API = "/api/dsh-imagegen/generate";
+/** Host-mediated OpenAI-compatible prompt enhancement endpoints. */
+const PROMPT_ENHANCE_API = {
+	models: "/api/dsh-imagegen/prompt-enhance/models",
+	enhance: "/api/dsh-imagegen/prompt-enhance"
+};
+/** Host-resident generation queue endpoints. */
+const TASK_API = {
+	submit: "/api/dsh-imagegen/tasks/submit",
+	list: "/api/dsh-imagegen/tasks/list",
+	cancel: "/api/dsh-imagegen/tasks/cancel",
+	retry: "/api/dsh-imagegen/tasks/retry"
+};
 /** Host-mediated GitHub Release update routes. */
 const UPDATE_API = {
 	check: "/api/dsh-imagegen/update/check",
@@ -51,6 +63,7 @@ const GALLERY_API = {
 	append: "/api/dsh-imagegen/gallery/append",
 	remove: "/api/dsh-imagegen/gallery/remove",
 	clear: "/api/dsh-imagegen/gallery/clear",
+	tags: "/api/dsh-imagegen/gallery/tags",
 	image: "/api/dsh-imagegen/gallery/image"
 };
 /**
@@ -217,7 +230,7 @@ async function normalizeItem(item, upstream) {
 * Issue one single-image request (never sends `n`). The response is kept as a
 * list so a gateway that happens to return several images per call still works.
 */
-async function requestOneImage(baseUrl, upstream, request, params) {
+async function requestOneImage(baseUrl, upstream, request, params, signal) {
 	const headers = { authorization: `Bearer ${upstream.apiKey.trim()}` };
 	let body;
 	if (request.mode === "edit") {
@@ -266,7 +279,7 @@ async function requestOneImage(baseUrl, upstream, request, params) {
 			method: "POST",
 			headers,
 			body,
-			signal: AbortSignal.timeout(UPSTREAM_TIMEOUT_MS)
+			signal: signal === void 0 ? AbortSignal.timeout(UPSTREAM_TIMEOUT_MS) : AbortSignal.any([signal, AbortSignal.timeout(UPSTREAM_TIMEOUT_MS)])
 		});
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
@@ -295,13 +308,13 @@ async function requestOneImage(baseUrl, upstream, request, params) {
 * parameter is never sent, because Responses-API-based gateways reject it as
 * `tools[0].n`), then the results are flattened in order.
 */
-async function generateImage(upstream, request) {
+async function generateImage(upstream, request, options = {}) {
 	const baseUrl = upstream.apiUrl.trim().replace(/\/+$/, "");
 	if (baseUrl === "") throw new ImageGenError("api_url 未配置：请先在「设置 → 插件 → 可配置」中填写", "config-missing");
 	if (upstream.apiKey.trim() === "") throw new ImageGenError("api_key 未配置：请先在「设置 → 插件 → 可配置」中填写", "config-missing");
 	const params = effectiveParams(request);
 	const count = effectiveCount(request);
-	return { images: (await Promise.all(Array.from({ length: count }, () => requestOneImage(baseUrl, upstream, request, params)))).flat() };
+	return { images: (await Promise.all(Array.from({ length: count }, () => requestOneImage(baseUrl, upstream, request, params, options.signal)))).flat() };
 }
 /** Human-readable failure message from an upstream error payload. */
 function upstreamMessage(payload, status) {
@@ -327,6 +340,128 @@ function extensionOf$2(mime) {
 	}
 }
 //#endregion
+//#region src/prompt-enhancer.ts
+function endpoint(base, suffix) {
+	return `${base.replace(/\/+$/, "")}${suffix}`;
+}
+function headers(apiKey) {
+	return {
+		"content-type": "application/json",
+		...apiKey.trim() === "" ? {} : { authorization: `Bearer ${apiKey.trim()}` }
+	};
+}
+async function responseJson(response) {
+	const body = await response.json().catch(() => void 0);
+	if (!response.ok || body === void 0 || body === null || typeof body !== "object") {
+		const message = body !== null && typeof body === "object" && typeof body.error?.message === "string" ? body.error.message : `HTTP ${response.status}`;
+		throw new Error(message);
+	}
+	return body;
+}
+/** List chat models exposed by an OpenAI-compatible endpoint. */
+async function listPromptModels(config) {
+	if (config.apiUrl.trim() === "") throw new Error("prompt enhancement API URL is required");
+	const body = await responseJson(await fetch(endpoint(config.apiUrl, "/models"), { headers: headers(config.apiKey) }));
+	return (Array.isArray(body.data) ? body.data : []).flatMap((item) => item !== null && typeof item === "object" && typeof item.id === "string" ? [item.id] : []).sort((a, b) => a.localeCompare(b));
+}
+/** Expand a concise image request into a production-ready image prompt. */
+async function enhancePrompt(config, prompt) {
+	if (config.apiUrl.trim() === "" || config.model.trim() === "") throw new Error("prompt enhancement model is not configured");
+	const body = await responseJson(await fetch(endpoint(config.apiUrl, "/chat/completions"), {
+		method: "POST",
+		headers: headers(config.apiKey),
+		body: JSON.stringify({
+			model: config.model.trim(),
+			temperature: .7,
+			messages: [{
+				role: "system",
+				content: "You are an expert image-prompt editor. Expand the user request into one vivid, specific image-generation prompt. Preserve intent and language. Add only useful visual detail: subject, composition, lighting, materials, color, camera/style and quality. Return only the finished prompt, with no preface or markdown."
+			}, {
+				role: "user",
+				content: prompt
+			}]
+		})
+	}));
+	const choices = Array.isArray(body.choices) ? body.choices : [];
+	const content = choices[0] !== null && typeof choices[0] === "object" ? choices[0].message?.content : void 0;
+	if (typeof content !== "string" || content.trim() === "") throw new Error("chat model returned an empty prompt");
+	return content.trim();
+}
+//#endregion
+//#region src/task-queue.ts
+/** In-memory, host-resident image generation queue. */
+var GenerationTaskQueue = class {
+	run;
+	tasks = [];
+	controllers = /* @__PURE__ */ new Map();
+	running = false;
+	constructor(run) {
+		this.run = run;
+	}
+	list() {
+		return this.tasks.map((task) => ({
+			...task,
+			request: { ...task.request },
+			...task.result === void 0 ? {} : { result: task.result }
+		}));
+	}
+	submit(request) {
+		const task = {
+			id: randomUUID(),
+			request: { ...request },
+			status: "queued",
+			createdAt: Date.now()
+		};
+		this.tasks.unshift(task);
+		this.drain();
+		return task;
+	}
+	cancel(id) {
+		const task = this.tasks.find((item) => item.id === id);
+		if (task === void 0 || task.status === "completed" || task.status === "failed" || task.status === "cancelled") return task;
+		task.status = "cancelled";
+		task.finishedAt = Date.now();
+		this.controllers.get(id)?.abort();
+		return task;
+	}
+	retry(id) {
+		const previous = this.tasks.find((item) => item.id === id);
+		return previous === void 0 ? void 0 : this.submit(previous.request);
+	}
+	async drain() {
+		if (this.running) return;
+		this.running = true;
+		try {
+			for (;;) {
+				const task = this.tasks.find((item) => item.status === "queued");
+				if (task === void 0) return;
+				task.status = "running";
+				task.startedAt = Date.now();
+				const controller = new AbortController();
+				this.controllers.set(task.id, controller);
+				try {
+					const result = await this.run(task.request, controller.signal);
+					if (this.tasks.find((item) => item.id === task.id)?.status !== "cancelled") {
+						task.status = "completed";
+						task.result = result;
+						task.finishedAt = Date.now();
+					}
+				} catch (error) {
+					if (this.tasks.find((item) => item.id === task.id)?.status !== "cancelled") {
+						task.status = "failed";
+						task.error = error instanceof Error ? error.message : String(error);
+						task.finishedAt = Date.now();
+					}
+				} finally {
+					this.controllers.delete(task.id);
+				}
+			}
+		} finally {
+			this.running = false;
+		}
+	}
+};
+//#endregion
 //#region src/history-store.ts
 /**
 * Host-persisted generation history: images are stored as individual files
@@ -616,7 +751,8 @@ function toWire(entry) {
 			mime: image.mime,
 			...image.revisedPrompt === void 0 ? {} : { revisedPrompt: image.revisedPrompt }
 		})),
-		...entry.refName === void 0 ? {} : { refName: entry.refName }
+		...entry.refName === void 0 ? {} : { refName: entry.refName },
+		...entry.tags === void 0 ? {} : { tags: entry.tags }
 	};
 }
 /** List the persisted gallery, newest first, as wire entries. */
@@ -686,6 +822,17 @@ async function removeGallery(id) {
 		return kept.map(toWire);
 	});
 }
+/** Replace the user-managed labels for one gallery entry. */
+async function updateGalleryTags(id, tags) {
+	return mutateGallery(async () => {
+		const normalized = [...new Set(tags.map((tag) => tag.trim()).filter(Boolean))].slice(0, 20);
+		const entries = await readIndex();
+		const target = entries.find((entry) => entry.id === id);
+		if (target !== void 0) target.tags = normalized;
+		await writeIndex(entries);
+		return entries.map(toWire);
+	});
+}
 /** Remove every entry (and all image files). */
 async function clearGallery() {
 	return mutateGallery(async () => {
@@ -1134,6 +1281,21 @@ async function readJsonBody(req, maxBytes = MAX_JSON_BODY_BYTES) {
 function messageOf(error) {
 	return error instanceof Error ? error.message : String(error);
 }
+function parseGenerateRequest(body) {
+	const prompt = typeof body.prompt === "string" ? body.prompt.trim() : "";
+	if (prompt === "") return void 0;
+	return {
+		mode: body.mode === "edit" ? "edit" : "text",
+		model: typeof body.model === "string" ? body.model : "gpt-image-2",
+		prompt,
+		size: typeof body.size === "string" ? body.size : "auto",
+		quality: typeof body.quality === "string" ? body.quality : "auto",
+		n: typeof body.n === "number" ? body.n : 1,
+		detail: typeof body.detail === "string" ? body.detail : "",
+		...typeof body.image === "string" && body.image !== "" ? { image: body.image } : {},
+		...typeof body.refName === "string" && body.refName !== "" ? { refName: body.refName } : {}
+	};
+}
 /** Validate a submitted history entry (images carry base64). */
 function parseHistoryEntryInput(body) {
 	const raw = body.entry;
@@ -1228,6 +1390,7 @@ function makeRoutes(deps) {
 		append: appendGallery,
 		remove: removeGallery,
 		clear: clearGallery,
+		updateTags: updateGalleryTags,
 		readImage: readGalleryImage
 	};
 	const templates = deps.templates ?? {
@@ -1235,6 +1398,39 @@ function makeRoutes(deps) {
 		refresh: refreshTemplates,
 		readImage: readTemplateImage
 	};
+	const resolvePrompt = deps.resolvePrompt ?? (() => ({
+		apiUrl: "",
+		apiKey: "",
+		model: ""
+	}));
+	const runGeneration = async (request, signal) => {
+		const result = await generateImage(deps.resolve(), request, { signal });
+		try {
+			const entries = await history.append({
+				id: randomUUID(),
+				createdAt: Date.now(),
+				mode: request.mode,
+				model: request.model,
+				prompt: request.prompt,
+				size: request.size,
+				quality: request.quality,
+				detail: request.detail,
+				n: request.n,
+				images: result.images,
+				...request.refName === void 0 ? {} : { refName: request.refName }
+			});
+			return {
+				...result,
+				history: entries
+			};
+		} catch (error) {
+			return {
+				...result,
+				historyError: messageOf(error)
+			};
+		}
+	};
+	const taskQueue = new GenerationTaskQueue((request, signal) => runGeneration(request, signal));
 	const guard = (req, res, method) => {
 		if (!isLoopbackRequest(req)) {
 			writeJson(res, 403, { error: "forbidden: loopback-only" });
@@ -1247,6 +1443,54 @@ function makeRoutes(deps) {
 		return true;
 	};
 	return [
+		{
+			kind: "exact",
+			path: PROMPT_ENHANCE_API.models,
+			handler: async (req, res) => {
+				if (!guard(req, res, "POST")) return;
+				try {
+					writeJson(res, 200, {
+						ok: true,
+						models: await listPromptModels(resolvePrompt())
+					});
+				} catch (error) {
+					writeJson(res, 200, {
+						ok: false,
+						code: "prompt-models-failed",
+						message: messageOf(error)
+					});
+				}
+			}
+		},
+		{
+			kind: "exact",
+			path: PROMPT_ENHANCE_API.enhance,
+			handler: async (req, res) => {
+				if (!guard(req, res, "POST")) return;
+				const body = await readJsonBody(req);
+				const prompt = typeof body?.prompt === "string" ? body.prompt.trim() : "";
+				if (prompt === "") {
+					writeJson(res, 200, {
+						ok: false,
+						code: "bad-request",
+						message: "prompt is required"
+					});
+					return;
+				}
+				try {
+					writeJson(res, 200, {
+						ok: true,
+						prompt: await enhancePrompt(resolvePrompt(), prompt)
+					});
+				} catch (error) {
+					writeJson(res, 200, {
+						ok: false,
+						code: "prompt-enhance-failed",
+						message: messageOf(error)
+					});
+				}
+			}
+		},
 		{
 			kind: "exact",
 			path: SETTINGS_API.describe,
@@ -1321,8 +1565,8 @@ function makeRoutes(deps) {
 					});
 					return;
 				}
-				const prompt = typeof body.prompt === "string" ? body.prompt.trim() : "";
-				if (prompt === "") {
+				const request = parseGenerateRequest(body);
+				if (request === void 0) {
 					writeJson(res, 200, {
 						ok: false,
 						code: "bad-request",
@@ -1330,53 +1574,11 @@ function makeRoutes(deps) {
 					});
 					return;
 				}
-				if (prompt.length > 2e3) {
+				try {
 					writeJson(res, 200, {
-						ok: false,
-						code: "bad-request",
-						message: "prompt exceeds 2000 characters"
+						ok: true,
+						...await runGeneration(request)
 					});
-					return;
-				}
-				const request = {
-					mode: body.mode === "edit" ? "edit" : "text",
-					model: typeof body.model === "string" ? body.model : "gpt-image-2",
-					prompt,
-					size: typeof body.size === "string" ? body.size : "auto",
-					quality: typeof body.quality === "string" ? body.quality : "auto",
-					n: typeof body.n === "number" ? body.n : 1,
-					detail: typeof body.detail === "string" ? body.detail : "",
-					...typeof body.image === "string" && body.image !== "" ? { image: body.image } : {},
-					...typeof body.refName === "string" && body.refName !== "" ? { refName: body.refName } : {}
-				};
-				try {
-					const result = await generateImage(deps.resolve(), request);
-					try {
-						const entries = await history.append({
-							id: randomUUID(),
-							createdAt: Date.now(),
-							mode: request.mode,
-							model: request.model,
-							prompt: request.prompt,
-							size: request.size,
-							quality: request.quality,
-							detail: request.detail,
-							n: request.n,
-							images: result.images,
-							...request.refName === void 0 ? {} : { refName: request.refName }
-						});
-						writeJson(res, 200, {
-							ok: true,
-							...result,
-							history: entries
-						});
-					} catch (error) {
-						writeJson(res, 200, {
-							ok: true,
-							...result,
-							historyError: messageOf(error)
-						});
-					}
 				} catch (error) {
 					const message = error instanceof Error ? error.message : String(error);
 					writeJson(res, 200, {
@@ -1387,6 +1589,80 @@ function makeRoutes(deps) {
 				}
 			}
 		},
+		{
+			kind: "exact",
+			path: TASK_API.submit,
+			handler: async (req, res) => {
+				if (!guard(req, res, "POST")) return;
+				const body = await readJsonBody(req);
+				const request = body === void 0 ? void 0 : parseGenerateRequest(body);
+				if (request === void 0) {
+					writeJson(res, 200, {
+						ok: false,
+						code: "bad-request",
+						message: "prompt is required"
+					});
+					return;
+				}
+				writeJson(res, 200, {
+					ok: true,
+					task: taskQueue.submit(request)
+				});
+			}
+		},
+		{
+			kind: "exact",
+			path: TASK_API.list,
+			handler: async (req, res) => {
+				if (!guard(req, res, "POST")) return;
+				writeJson(res, 200, {
+					ok: true,
+					tasks: taskQueue.list()
+				});
+			}
+		},
+		{
+			kind: "exact",
+			path: TASK_API.cancel,
+			handler: async (req, res) => {
+				if (!guard(req, res, "POST")) return;
+				const body = await readJsonBody(req);
+				const task = typeof body?.id === "string" ? taskQueue.cancel(body.id) : void 0;
+				if (task === void 0) {
+					writeJson(res, 200, {
+						ok: false,
+						code: "not-found",
+						message: "task not found"
+					});
+					return;
+				}
+				writeJson(res, 200, {
+					ok: true,
+					task
+				});
+			}
+		},
+		{
+			kind: "exact",
+			path: TASK_API.retry,
+			handler: async (req, res) => {
+				if (!guard(req, res, "POST")) return;
+				const body = await readJsonBody(req);
+				const task = typeof body?.id === "string" ? taskQueue.retry(body.id) : void 0;
+				if (task === void 0) {
+					writeJson(res, 200, {
+						ok: false,
+						code: "not-found",
+						message: "task not found"
+					});
+					return;
+				}
+				writeJson(res, 200, {
+					ok: true,
+					task
+				});
+			}
+		},
 		{
 			kind: "exact",
 			path: UPDATE_API.check,
@@ -1671,6 +1947,36 @@ function makeRoutes(deps) {
 				}
 			}
 		},
+		{
+			kind: "exact",
+			path: GALLERY_API.tags,
+			handler: async (req, res) => {
+				if (!guard(req, res, "POST")) return;
+				const body = await readJsonBody(req);
+				const id = typeof body?.id === "string" ? body.id : "";
+				const tags = Array.isArray(body?.tags) ? body.tags.filter((tag) => typeof tag === "string") : void 0;
+				if (id === "" || tags === void 0 || gallery.updateTags === void 0) {
+					writeJson(res, 200, {
+						ok: false,
+						code: "bad-request",
+						message: "gallery id and tags are required"
+					});
+					return;
+				}
+				try {
+					writeJson(res, 200, {
+						ok: true,
+						entries: await gallery.updateTags(id, tags)
+					});
+				} catch (error) {
+					writeJson(res, 200, {
+						ok: false,
+						code: "gallery-failed",
+						message: messageOf(error)
+					});
+				}
+			}
+		},
 		{
 			kind: "exact",
 			path: GALLERY_API.clear,
@@ -1802,7 +2108,10 @@ const Config = z.object({
 	enabled: z.boolean().default(true),
 	announceToAgent: z.boolean().default(true),
 	apiUrl: z.string().default(""),
-	apiKey: z.string().role("secret").default("")
+	apiKey: z.string().role("secret").default(""),
+	promptApiUrl: z.string().default(""),
+	promptApiKey: z.string().role("secret").default(""),
+	promptModel: z.string().default("")
 });
 /** Schema defaults, re-read for hand-built contexts (the loader applies them normally). */
 const DEFAULT_ENABLED = true;
@@ -1824,7 +2133,10 @@ function apply(ctx, config) {
 			enabled: value.enabled ?? DEFAULT_ENABLED,
 			announceToAgent: value.announceToAgent ?? DEFAULT_ANNOUNCE,
 			apiUrl: value.apiUrl ?? "",
-			apiKey: value.apiKey ?? ""
+			apiKey: value.apiKey ?? "",
+			promptApiUrl: value.promptApiUrl ?? "",
+			promptApiKey: value.promptApiKey ?? "",
+			promptModel: value.promptModel ?? ""
 		};
 	};
 	ctx.inject(["settings"], (sctx) => {
@@ -1838,6 +2150,14 @@ function apply(ctx, config) {
 						apiUrl: value.apiUrl,
 						apiKey: value.apiKey
 					};
+				},
+				resolvePrompt: () => {
+					const value = resolve();
+					return {
+						apiUrl: value.promptApiUrl.trim() || value.apiUrl,
+						apiKey: value.promptApiKey.trim() || value.apiKey,
+						model: value.promptModel
+					};
 				}
 			}).map((route) => ctx.webServer.register(route));
 			return () => {
@@ -1869,4 +2189,4 @@ function apply(ctx, config) {
 	sync();
 }
 //#endregion
-export { CURRENT_VERSION, Config, IMAGEGEN_GUIDANCE, ImageGenError, ImageGenSettingsNamespace, appendGallery, apply, checkForUpdate, clearGallery, clearTemplateMemo, clearUpdateCache, compareVersions, generateImage, inject, installUpdate, listGallery, listTemplates, makeRoutes, name, profileFromProcess, readGalleryImage, readTemplateImage, refreshTemplates, removeGallery };
+export { CURRENT_VERSION, Config, IMAGEGEN_GUIDANCE, ImageGenError, ImageGenSettingsNamespace, appendGallery, apply, checkForUpdate, clearGallery, clearTemplateMemo, clearUpdateCache, compareVersions, generateImage, inject, installUpdate, listGallery, listTemplates, makeRoutes, name, profileFromProcess, readGalleryImage, readTemplateImage, refreshTemplates, removeGallery, updateGalleryTags };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dickpy/dsh-imagegen",
   "description": "AI 鐢熷浘 (image generation) plugin for the dsh web GUI: text-to-image and image-to-image through a configurable OpenAI-compatible endpoint (gpt-image-2 / grok-imagine-image / dall-e-3, with native xAI Grok Imagine request shaping), with a settings card for api_url / api_key and a sidebar entry opening a split-pane generation studio.",
-  "version": "1.0.20",
+  "version": "1.1.0",
   "type": "module",
   "main": "lib/index.js",
   "exports": {