@dickpy/dsh-imagegen 1.5.4 → 1.5.6

package/lib/index.js

@@ -41,7 +41,7 @@ function installSettingsSectionCompat(ctx, ns, schema, entry, hooks) {
 /** 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.5.4";
+const PLUGIN_VERSION = "1.5.6";
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 const SETTINGS_API = {
 	describe: "/api/dsh-imagegen/settings/describe",
@@ -588,8 +588,13 @@ function requestSignal(source, timeoutMs) {
 		}
 	};
 }
-/** Content-type extension hints for URL-fetched images. */
-function mimeOfExtension(path) {
+/** Whether an error was produced by a requestSignal budget timeout. These can
+* surface from the fetch call itself or from reading the response body, so the
+* budget must stay armed until the body has been consumed. */
+function isBudgetTimeout(error) {
+	return (error instanceof DOMException || error instanceof Error) && error.name === "TimeoutError";
+}
+/** Content-type extension hints for URL-fetched images. */ function mimeOfExtension(path) {
 	const match = /\.([a-z0-9]+)$/i.exec(path);
 	if (match === null) return void 0;
 	switch (match[1].toLowerCase()) {
@@ -705,26 +710,28 @@ async function normalizeItem(item, upstream, signal) {
 		};
 	}
 	const budget = requestSignal(signal, IMAGE_FETCH_TIMEOUT_MS);
-	let response;
 	try {
-		response = await fetch(url, {
-			...isPresignedUrl(url) || upstream.apiKey === "" ? {} : { headers: { authorization: `Bearer ${upstream.apiKey}` } },
-			signal: budget.signal
-		});
-	} catch (error) {
-		throw new ImageGenError(`failed to fetch the generated image url: ${error instanceof Error ? error.message : String(error)}`);
+		let response;
+		try {
+			response = await fetch(url, {
+				...isPresignedUrl(url) || upstream.apiKey === "" ? {} : { headers: { authorization: `Bearer ${upstream.apiKey}` } },
+				signal: budget.signal
+			});
+		} catch (error) {
+			throw new ImageGenError(`failed to fetch the generated image url: ${error instanceof Error ? error.message : String(error)}`);
+		}
+		if (!response.ok) throw new ImageGenError(`failed to fetch the generated image url: HTTP ${response.status}`);
+		const buffer = Buffer.from(await response.arrayBuffer());
+		const contentType = response.headers.get("content-type");
+		const mime = detectImageMime(buffer) ?? (contentType !== null && contentType !== "" ? contentType.split(";")[0].trim() : mimeOfExtension(url) ?? "image/png");
+		return {
+			b64: buffer.toString("base64"),
+			mime,
+			revisedPrompt
+		};
 	} finally {
 		budget.dispose();
 	}
-	if (!response.ok) throw new ImageGenError(`failed to fetch the generated image url: HTTP ${response.status}`);
-	const buffer = Buffer.from(await response.arrayBuffer());
-	const contentType = response.headers.get("content-type");
-	const mime = detectImageMime(buffer) ?? (contentType !== null && contentType !== "" ? contentType.split(";")[0].trim() : mimeOfExtension(url) ?? "image/png");
-	return {
-		b64: buffer.toString("base64"),
-		mime,
-		revisedPrompt
-	};
 }
 /** Expand a provider image item whose URL may be a string or an array. */
 function imageItemsOf(value) {
@@ -821,43 +828,45 @@ async function pollAsyncTask(baseUrl, upstream, taskId, signal) {
 	while (Date.now() < deadline) {
 		const remaining = deadline - Date.now();
 		const budget = requestSignal(signal, Math.min(ASYNC_POLL_REQUEST_TIMEOUT_MS, remaining));
-		let response;
 		try {
-			response = await fetch(`${baseUrl}/tasks/${encodeURIComponent(taskId)}`, {
-				method: "GET",
-				headers: { authorization: `Bearer ${upstream.apiKey.trim()}` },
-				signal: budget.signal
-			});
-		} catch (error) {
-			if (signal?.aborted === true) throw new ImageGenError("任务已取消", "cancelled");
-			const message = error instanceof Error ? error.message : String(error);
-			if (/timeout|abort/i.test(message)) throw new ImageGenError("上游异步任务轮询超时", "upstream-timeout");
-			throw new ImageGenError(`无法轮询上游异步任务：${message}`, "upstream-unreachable");
+			let response;
+			try {
+				response = await fetch(`${baseUrl}/tasks/${encodeURIComponent(taskId)}`, {
+					method: "GET",
+					headers: { authorization: `Bearer ${upstream.apiKey.trim()}` },
+					signal: budget.signal
+				});
+			} catch (error) {
+				if (signal?.aborted === true) throw new ImageGenError("任务已取消", "cancelled");
+				if (isBudgetTimeout(error)) throw new ImageGenError("上游异步任务轮询超时", "upstream-timeout");
+				throw new ImageGenError(`无法轮询上游异步任务：${error instanceof Error ? error.message : String(error)}`, "upstream-unreachable");
+			}
+			let payload;
+			try {
+				payload = await response.json();
+			} catch (error) {
+				if (isBudgetTimeout(error)) throw new ImageGenError("上游异步任务轮询超时", "upstream-timeout");
+				throw new ImageGenError(`上游任务接口返回了非 JSON 响应（HTTP ${response.status}）`, "upstream-invalid");
+			}
+			if (!response.ok || payload === null || typeof payload !== "object") throw new ImageGenError(asyncErrorMessage(payload, `上游任务轮询失败（HTTP ${response.status}）`), "upstream-rejected");
+			const record = payload;
+			const data = record.data;
+			const statusRecord = Array.isArray(data) ? data[0] : data !== null && typeof data === "object" ? data : record;
+			const statusValue = statusRecord !== null && typeof statusRecord === "object" ? statusRecord.status : void 0;
+			const status = typeof statusValue === "string" ? statusValue.toLowerCase() : "";
+			if (ASYNC_FAILED_STATUSES.has(status)) throw new ImageGenError(asyncErrorMessage(payload, `上游异步任务失败（${status || "unknown"}）`), "upstream-rejected");
+			const nested = statusRecord !== null && typeof statusRecord === "object" ? statusRecord : record;
+			const result = nested.result ?? (nested.output !== null && typeof nested.output === "object" ? nested.output.result : void 0) ?? record.result;
+			const images = (result !== null && typeof result === "object" ? result : void 0)?.images ?? nested.images ?? record.images;
+			if (ASYNC_COMPLETED_STATUSES.has(status) || images !== void 0) {
+				const items = Array.isArray(images) ? images.flatMap(imageItemsOf) : imageItemsOf(images);
+				if (items.length > 0) return items;
+				if (ASYNC_COMPLETED_STATUSES.has(status)) throw new ImageGenError("上游异步任务完成但没有图片结果", "upstream-empty");
+			}
+			if (status !== "" && !ASYNC_PENDING_STATUSES.has(status) && !ASYNC_COMPLETED_STATUSES.has(status)) throw new ImageGenError(`上游返回了未知异步任务状态：${status}`, "upstream-invalid");
 		} finally {
 			budget.dispose();
 		}
-		let payload;
-		try {
-			payload = await response.json();
-		} catch {
-			throw new ImageGenError(`上游任务接口返回了非 JSON 响应（HTTP ${response.status}）`, "upstream-invalid");
-		}
-		if (!response.ok || payload === null || typeof payload !== "object") throw new ImageGenError(asyncErrorMessage(payload, `上游任务轮询失败（HTTP ${response.status}）`), "upstream-rejected");
-		const record = payload;
-		const data = record.data;
-		const statusRecord = Array.isArray(data) ? data[0] : data !== null && typeof data === "object" ? data : record;
-		const statusValue = statusRecord !== null && typeof statusRecord === "object" ? statusRecord.status : void 0;
-		const status = typeof statusValue === "string" ? statusValue.toLowerCase() : "";
-		if (ASYNC_FAILED_STATUSES.has(status)) throw new ImageGenError(asyncErrorMessage(payload, `上游异步任务失败（${status || "unknown"}）`), "upstream-rejected");
-		const nested = statusRecord !== null && typeof statusRecord === "object" ? statusRecord : record;
-		const result = nested.result ?? (nested.output !== null && typeof nested.output === "object" ? nested.output.result : void 0) ?? record.result;
-		const images = (result !== null && typeof result === "object" ? result : void 0)?.images ?? nested.images ?? record.images;
-		if (ASYNC_COMPLETED_STATUSES.has(status) || images !== void 0) {
-			const items = Array.isArray(images) ? images.flatMap(imageItemsOf) : imageItemsOf(images);
-			if (items.length > 0) return items;
-			if (ASYNC_COMPLETED_STATUSES.has(status)) throw new ImageGenError("上游异步任务完成但没有图片结果", "upstream-empty");
-		}
-		if (status !== "" && !ASYNC_PENDING_STATUSES.has(status) && !ASYNC_COMPLETED_STATUSES.has(status)) throw new ImageGenError(`上游返回了未知异步任务状态：${status}`, "upstream-invalid");
 		await waitForPoll(Math.min(delay, Math.max(1, deadline - Date.now())), signal);
 		delay = Math.min(5e3, delay * 2);
 	}
@@ -872,15 +881,24 @@ async function requestOneImage(baseUrl, upstream, request, params, signal) {
 	let body;
 	if (request.mode === "edit") {
 		if (typeof request.image !== "string" || request.image === "") throw new ImageGenError("图生图需要上传参考图片", "edit-image-missing");
-		const parsed = parseDataUrl(request.image);
-		if (parsed === void 0) throw new ImageGenError("参考图片格式无效", "edit-image-invalid");
-		let bytes;
-		try {
-			bytes = Buffer.from(parsed.base64, "base64");
-		} catch {
-			throw new ImageGenError("参考图片数据无法解码", "edit-image-invalid");
-		}
-		if (bytes.byteLength > MAX_EDIT_IMAGE_BYTES) throw new ImageGenError("参考图片超过 10MB 上限", "edit-image-too-large");
+		const decodeReference = (dataUrl) => {
+			const parsed = parseDataUrl(dataUrl);
+			if (parsed === void 0) throw new ImageGenError("参考图片格式无效", "edit-image-invalid");
+			let bytes;
+			try {
+				bytes = Buffer.from(parsed.base64, "base64");
+			} catch {
+				throw new ImageGenError("参考图片数据无法解码", "edit-image-invalid");
+			}
+			if (bytes.byteLength > MAX_EDIT_IMAGE_BYTES) throw new ImageGenError("参考图片超过 10MB 上限", "edit-image-too-large");
+			return {
+				bytes,
+				mime: parsed.mime,
+				filename: `reference.${extensionOf$3(parsed.mime)}`
+			};
+		};
+		const primary = decodeReference(request.image);
+		const extras = (request.images ?? []).filter((img) => typeof img === "string" && img !== "").slice(0, 4).map(decodeReference);
 		if (isGrokImagine(params.model)) {
 			headers["content-type"] = "application/json";
 			body = JSON.stringify({
@@ -895,7 +913,7 @@ async function requestOneImage(baseUrl, upstream, request, params, signal) {
 			});
 		} else if (isNanoBanana(params.model)) {
 			const form = new FormData();
-			form.append("image", new Blob([bytes], { type: parsed.mime }), `reference.${extensionOf$3(parsed.mime)}`);
+			form.append("image", new Blob([primary.bytes], { type: primary.mime }), primary.filename);
 			form.append("prompt", request.prompt);
 			form.append("model", params.model);
 			if (params.aspect_ratio !== void 0) form.append("aspect_ratio", params.aspect_ratio);
@@ -906,14 +924,15 @@ async function requestOneImage(baseUrl, upstream, request, params, signal) {
 			body = JSON.stringify({
 				model: params.model,
 				prompt: request.prompt,
-				image: [request.image],
+				image: [request.image, ...(request.images ?? []).filter((img) => typeof img === "string" && img !== "").slice(0, 4)],
 				...params.size !== void 0 ? { size: params.size } : {},
 				...params.resolution !== void 0 ? { resolution: params.resolution } : {},
 				response_format: isVolcSeedream(params.model) ? "url" : "b64_json"
 			});
 		} else {
 			const form = new FormData();
-			form.append("image", new Blob([bytes], { type: parsed.mime }), `reference.${extensionOf$3(parsed.mime)}`);
+			if (extras.length > 0) for (const [index, reference] of [primary, ...extras].entries()) form.append("image[]", new Blob([reference.bytes], { type: reference.mime }), `reference-${index}.${extensionOf$3(reference.mime)}`);
+			else form.append("image", new Blob([primary.bytes], { type: primary.mime }), primary.filename);
 			form.append("prompt", request.prompt);
 			form.append("model", params.model);
 			if (params.size !== void 0) form.append("size", params.size);
@@ -929,39 +948,43 @@ async function requestOneImage(baseUrl, upstream, request, params, signal) {
 		});
 	}
 	const budget = requestSignal(signal, UPSTREAM_TIMEOUT_MS);
-	let response;
 	try {
-		const endpoint = request.mode === "edit" && !isSeedream(params.model) ? "/images/edits" : "/images/generations";
-		response = await fetch(`${baseUrl}${endpoint}`, {
-			method: "POST",
-			headers,
-			body,
-			signal: budget.signal
-		});
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		if (/aborter/i.test(message) || /timeout/i.test(message)) throw new ImageGenError("上游接口响应超时（240 秒）", "upstream-timeout");
-		throw new ImageGenError(`无法连接上游接口：${message}`, "upstream-unreachable");
+		let response;
+		try {
+			const endpoint = request.mode === "edit" && !isSeedream(params.model) ? "/images/edits" : "/images/generations";
+			response = await fetch(`${baseUrl}${endpoint}`, {
+				method: "POST",
+				headers,
+				body,
+				signal: budget.signal
+			});
+		} catch (error) {
+			if (isBudgetTimeout(error)) throw new ImageGenError("上游接口响应超时（240 秒）", "upstream-timeout");
+			if (signal?.aborted === true) throw new ImageGenError("任务已取消", "cancelled");
+			throw new ImageGenError(`无法连接上游接口：${error instanceof Error ? error.message : String(error)}`, "upstream-unreachable");
+		}
+		let payload;
+		try {
+			payload = await response.json();
+		} catch (error) {
+			if (isBudgetTimeout(error)) throw new ImageGenError("上游接口响应超时（240 秒）", "upstream-timeout");
+			if (signal?.aborted === true) throw new ImageGenError("任务已取消", "cancelled");
+			throw new ImageGenError(`上游接口返回了非 JSON 响应（HTTP ${response.status}）`, "upstream-invalid");
+		}
+		if (!response.ok || payload === null || typeof payload !== "object") throw new ImageGenError(upstreamMessage(payload, response.status), "upstream-rejected");
+		const data = dataRecordsOf(payload);
+		if (data === void 0) throw new ImageGenError("上游响应缺少 data 数组", "upstream-invalid");
+		if (data.length === 0) throw new ImageGenError("上游返回了 0 张图片", "upstream-empty");
+		const asyncEntries = data.filter((entry) => typeof entry.task_id === "string" && entry.task_id.trim() !== "");
+		if (asyncEntries.length > 0) {
+			const asyncRecords = (await Promise.all(asyncEntries.map((entry) => pollAsyncTask(baseUrl, upstream, entry.task_id, signal)))).flat();
+			if (asyncRecords.length === 0) throw new ImageGenError("上游异步任务完成但没有图片结果", "upstream-empty");
+			return Promise.all(asyncRecords.flatMap(imageItemsOf).map((item) => normalizeItem(item, upstream, signal)));
+		}
+		return Promise.all(data.flatMap(imageItemsOf).map((item) => normalizeItem(item, upstream, signal)));
 	} finally {
 		budget.dispose();
 	}
-	let payload;
-	try {
-		payload = await response.json();
-	} catch {
-		throw new ImageGenError(`上游接口返回了非 JSON 响应（HTTP ${response.status}）`, "upstream-invalid");
-	}
-	if (!response.ok || payload === null || typeof payload !== "object") throw new ImageGenError(upstreamMessage(payload, response.status), "upstream-rejected");
-	const data = dataRecordsOf(payload);
-	if (data === void 0) throw new ImageGenError("上游响应缺少 data 数组", "upstream-invalid");
-	if (data.length === 0) throw new ImageGenError("上游返回了 0 张图片", "upstream-empty");
-	const asyncEntries = data.filter((entry) => typeof entry.task_id === "string" && entry.task_id.trim() !== "");
-	if (asyncEntries.length > 0) {
-		const asyncRecords = (await Promise.all(asyncEntries.map((entry) => pollAsyncTask(baseUrl, upstream, entry.task_id, signal)))).flat();
-		if (asyncRecords.length === 0) throw new ImageGenError("上游异步任务完成但没有图片结果", "upstream-empty");
-		return Promise.all(asyncRecords.flatMap(imageItemsOf).map((item) => normalizeItem(item, upstream, signal)));
-	}
-	return Promise.all(data.flatMap(imageItemsOf).map((item) => normalizeItem(item, upstream, signal)));
 }
 /**
 * Qwen-Image (DashScope native multimodal-generation): one chat-style request
@@ -995,50 +1018,54 @@ async function generateQwenImage(baseUrl, upstream, request, options) {
 		}
 	};
 	const budget = requestSignal(options.signal, UPSTREAM_TIMEOUT_MS);
-	let response;
 	try {
-		response = await fetch(`${baseUrl}/services/aigc/multimodal-generation/generation`, {
-			method: "POST",
-			headers: {
-				authorization: `Bearer ${upstream.apiKey.trim()}`,
-				"content-type": "application/json"
-			},
-			body: JSON.stringify(body),
-			signal: budget.signal
-		});
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		if (/aborter/i.test(message) || /timeout/i.test(message)) throw new ImageGenError("上游接口响应超时（240 秒）", "upstream-timeout");
-		throw new ImageGenError(`无法连接上游接口：${message}`, "upstream-unreachable");
+		let response;
+		try {
+			response = await fetch(`${baseUrl}/services/aigc/multimodal-generation/generation`, {
+				method: "POST",
+				headers: {
+					authorization: `Bearer ${upstream.apiKey.trim()}`,
+					"content-type": "application/json"
+				},
+				body: JSON.stringify(body),
+				signal: budget.signal
+			});
+		} catch (error) {
+			if (isBudgetTimeout(error)) throw new ImageGenError("上游接口响应超时（240 秒）", "upstream-timeout");
+			if (options.signal?.aborted === true) throw new ImageGenError("任务已取消", "cancelled");
+			throw new ImageGenError(`无法连接上游接口：${error instanceof Error ? error.message : String(error)}`, "upstream-unreachable");
+		}
+		let payload;
+		try {
+			payload = await response.json();
+		} catch (error) {
+			if (isBudgetTimeout(error)) throw new ImageGenError("上游接口响应超时（240 秒）", "upstream-timeout");
+			if (options.signal?.aborted === true) throw new ImageGenError("任务已取消", "cancelled");
+			throw new ImageGenError(`上游接口返回了非 JSON 响应（HTTP ${response.status}）`, "upstream-invalid");
+		}
+		if (!response.ok || payload === null || typeof payload !== "object") throw new ImageGenError(upstreamMessage(payload, response.status), "upstream-rejected");
+		const output = payload.output;
+		const choices = output !== void 0 && Array.isArray(output.choices) ? output.choices : [];
+		const urls = [];
+		for (const choice of choices) {
+			const message = choice !== null && typeof choice === "object" ? choice.message : void 0;
+			const items = message !== null && typeof message === "object" && Array.isArray(message.content) ? message.content : [];
+			for (const item of items) if (item !== null && typeof item === "object") {
+				const image = item.image;
+				if (typeof image === "string" && image !== "") urls.push(image);
+			}
+		}
+		if (urls.length === 0) throw new ImageGenError("上游响应缺少图片内容", "upstream-empty");
+		return { images: await Promise.all(urls.map(async (url) => {
+			const normalized = await normalizeItem({ url }, upstream);
+			return {
+				b64: normalized.b64,
+				mime: normalized.mime
+			};
+		})) };
 	} finally {
 		budget.dispose();
 	}
-	let payload;
-	try {
-		payload = await response.json();
-	} catch {
-		throw new ImageGenError(`上游接口返回了非 JSON 响应（HTTP ${response.status}）`, "upstream-invalid");
-	}
-	if (!response.ok || payload === null || typeof payload !== "object") throw new ImageGenError(upstreamMessage(payload, response.status), "upstream-rejected");
-	const output = payload.output;
-	const choices = output !== void 0 && Array.isArray(output.choices) ? output.choices : [];
-	const urls = [];
-	for (const choice of choices) {
-		const message = choice !== null && typeof choice === "object" ? choice.message : void 0;
-		const items = message !== null && typeof message === "object" && Array.isArray(message.content) ? message.content : [];
-		for (const item of items) if (item !== null && typeof item === "object") {
-			const image = item.image;
-			if (typeof image === "string" && image !== "") urls.push(image);
-		}
-	}
-	if (urls.length === 0) throw new ImageGenError("上游响应缺少图片内容", "upstream-empty");
-	return { images: await Promise.all(urls.map(async (url) => {
-		const normalized = await normalizeItem({ url }, upstream);
-		return {
-			b64: normalized.b64,
-			mime: normalized.mime
-		};
-	})) };
 }
 /**
 * Forward one generate request to the configured endpoint. The requested image
@@ -1161,6 +1188,17 @@ async function testStorage(config) {
 	};
 }
 //#endregion
+//#region src/image-storage-path.ts
+const DEFAULT_ROOT = path.join(process.env.DSH_HOME?.trim() || path.join(homedir(), ".dsh"), "dsh-imagegen");
+let root = DEFAULT_ROOT;
+function imageDataRoot() {
+	return root;
+}
+function setImageDataRoot(value) {
+	const trimmed = value?.trim();
+	root = trimmed === void 0 || trimmed === "" ? DEFAULT_ROOT : path.resolve(trimmed);
+}
+//#endregion
 //#region src/history-store.ts
 /**
 * Host-persisted generation history: images are stored as individual files
@@ -1171,9 +1209,15 @@ async function testStorage(config) {
 *
 * Framework-free (node:fs only) so the route layer can drive it directly.
 */
-const HISTORY_DIR$1 = path.join(homedir(), ".dsh", "dsh-imagegen");
-const INDEX_PATH$1 = path.join(HISTORY_DIR$1, "index.json");
-const IMAGES_DIR$1 = path.join(HISTORY_DIR$1, "images");
+function historyDir() {
+	return imageDataRoot();
+}
+function indexPath$1() {
+	return path.join(historyDir(), "index.json");
+}
+function imagesDir$1() {
+	return path.join(historyDir(), "images");
+}
 let pendingMutation$1 = Promise.resolve();
 function mutateHistory(operation) {
 	const next = pendingMutation$1.then(operation, operation);
@@ -1206,12 +1250,12 @@ function safeId$2(id) {
 }
 /** Ensure the storage directories exist. */
 async function ensureDirs$1() {
-	await promises.mkdir(IMAGES_DIR$1, { recursive: true });
+	await promises.mkdir(imagesDir$1(), { recursive: true });
 }
 /** Read the index, tolerating a missing/corrupt file. */
 async function readIndex$1() {
 	try {
-		const raw = await promises.readFile(INDEX_PATH$1, "utf8");
+		const raw = await promises.readFile(indexPath$1(), "utf8");
 		const parsed = JSON.parse(raw);
 		if (parsed === null || typeof parsed !== "object") return [];
 		const entries = parsed.entries;
@@ -1225,9 +1269,9 @@ async function readIndex$1() {
 async function writeIndex$1(entries) {
 	await ensureDirs$1();
 	const payload = { entries };
-	const tmp = `${INDEX_PATH$1}.tmp-${process.pid}`;
+	const tmp = `${indexPath$1()}.tmp-${process.pid}`;
 	await promises.writeFile(tmp, JSON.stringify(payload), "utf8");
-	await promises.rename(tmp, INDEX_PATH$1);
+	await promises.rename(tmp, indexPath$1());
 }
 /** Structural guard for a stored entry. */
 function isStoredEntry$1(value) {
@@ -1242,7 +1286,7 @@ function isStoredEntry$1(value) {
 /** Remove one entry's image files (best effort). */
 async function removeEntryFiles$1(entry) {
 	for (const image of entry.images) try {
-		await promises.rm(path.join(IMAGES_DIR$1, image.file), { force: true });
+		await promises.rm(path.join(imagesDir$1(), image.file), { force: true });
 	} catch {}
 }
 /** Project a stored entry onto the wire shape (image URLs). */
@@ -1289,8 +1333,8 @@ async function appendHistory(input) {
 			for (let index = 0; index < input.images.length; index++) {
 				const image = input.images[index];
 				const file = `${prefix}-${index}.${extensionOf$2(image.mime)}`;
-				await promises.writeFile(path.join(IMAGES_DIR$1, file), Buffer.from(image.b64, "base64"));
-				notifyImageSaved("history", path.join(IMAGES_DIR$1, file));
+				await promises.writeFile(path.join(imagesDir$1(), file), Buffer.from(image.b64, "base64"));
+				notifyImageSaved("history", path.join(imagesDir$1(), file));
 				storedImages.push({
 					file,
 					mime: image.mime,
@@ -1355,7 +1399,7 @@ async function readHistoryImage(file) {
 	if (!/^[a-zA-Z0-9][a-zA-Z0-9-]*-[0-9]+\.(png|jpg|jpeg|webp|gif)$/.test(file)) return void 0;
 	try {
 		return {
-			data: await promises.readFile(path.join(IMAGES_DIR$1, file)),
+			data: await promises.readFile(path.join(imagesDir$1(), file)),
 			mime: mimeOfFile$2(file)
 		};
 	} catch {
@@ -1372,7 +1416,6 @@ var GenerationTaskQueue = class {
 	controllers = /* @__PURE__ */ new Map();
 	listeners = /* @__PURE__ */ new Set();
 	running = 0;
-	serialRunning = false;
 	constructor(run, concurrency = 1) {
 		this.run = run;
 		this.concurrency = concurrency;
@@ -1413,15 +1456,16 @@ var GenerationTaskQueue = class {
 		const previous = this.tasks.find((item) => item.id === id);
 		return previous === void 0 ? void 0 : this.submit(previous.request);
 	}
+	/** Start queued tasks while capacity remains. Plain submissions and
+	* comparison batches alike run in parallel up to the host-wide limit, so one
+	* slow upstream can no longer hold back unrelated generations. */
 	drain() {
 		while (this.running < Math.max(1, this.concurrency)) {
-			const task = this.tasks.find((item) => item.status === "queued" && (this.running === 0 || item.request.comparisonId !== void 0 && !this.serialRunning));
+			const task = this.tasks.find((item) => item.status === "queued");
 			if (task === void 0) return;
 			this.running += 1;
-			if (task.request.comparisonId === void 0) this.serialRunning = true;
 			this.runTask(task).finally(() => {
 				this.running -= 1;
-				if (task.request.comparisonId === void 0) this.serialRunning = false;
 				this.drain();
 			});
 		}
@@ -1541,10 +1585,15 @@ var ImageGenerationRuntime = class {
 * Framework-free (node:fs + node:crypto only) so the route layer can drive it
 * directly.
 */
-const HISTORY_DIR = path.join(homedir(), ".dsh", "dsh-imagegen");
-const GALLERY_DIR = path.join(HISTORY_DIR, "gallery");
-const INDEX_PATH = path.join(GALLERY_DIR, "index.json");
-const IMAGES_DIR = path.join(GALLERY_DIR, "images");
+function galleryDir() {
+	return path.join(imageDataRoot(), "gallery");
+}
+function indexPath() {
+	return path.join(galleryDir(), "index.json");
+}
+function imagesDir() {
+	return path.join(galleryDir(), "images");
+}
 let pendingMutation = Promise.resolve();
 function mutateGallery(operation) {
 	const next = pendingMutation.then(operation, operation);
@@ -1583,12 +1632,12 @@ function fingerprint(input) {
 }
 /** Ensure the storage directories exist. */
 async function ensureDirs() {
-	await promises.mkdir(IMAGES_DIR, { recursive: true });
+	await promises.mkdir(imagesDir(), { recursive: true });
 }
 /** Read the index, tolerating a missing/corrupt file. */
 async function readIndex() {
 	try {
-		const raw = await promises.readFile(INDEX_PATH, "utf8");
+		const raw = await promises.readFile(indexPath(), "utf8");
 		const parsed = JSON.parse(raw);
 		if (parsed === null || typeof parsed !== "object") return [];
 		const entries = parsed.entries;
@@ -1602,9 +1651,9 @@ async function readIndex() {
 async function writeIndex(entries) {
 	await ensureDirs();
 	const payload = { entries };
-	const tmp = `${INDEX_PATH}.tmp-${process.pid}`;
+	const tmp = `${indexPath()}.tmp-${process.pid}`;
 	await promises.writeFile(tmp, JSON.stringify(payload), "utf8");
-	await promises.rename(tmp, INDEX_PATH);
+	await promises.rename(tmp, indexPath());
 }
 /** Structural guard for a stored entry. */
 function isStoredEntry(value) {
@@ -1619,7 +1668,7 @@ function isStoredEntry(value) {
 /** Remove one entry's image files (best effort). */
 async function removeEntryFiles(entry) {
 	for (const image of entry.images) try {
-		await promises.rm(path.join(IMAGES_DIR, image.file), { force: true });
+		await promises.rm(path.join(imagesDir(), image.file), { force: true });
 	} catch {}
 }
 /** Project a stored entry onto the wire shape (image URLs). */
@@ -1675,8 +1724,8 @@ async function appendGallery(input) {
 			for (let index = 0; index < input.images.length; index++) {
 				const image = input.images[index];
 				const file = `${prefix}-${index}.${extensionOf$1(image.mime)}`;
-				await promises.writeFile(path.join(IMAGES_DIR, file), Buffer.from(image.b64, "base64"));
-				notifyImageSaved("gallery", path.join(IMAGES_DIR, file));
+				await promises.writeFile(path.join(imagesDir(), file), Buffer.from(image.b64, "base64"));
+				notifyImageSaved("gallery", path.join(imagesDir(), file));
 				storedImages.push({
 					file,
 					mime: image.mime,
@@ -1752,7 +1801,7 @@ async function readGalleryImage(file) {
 	if (!/^[a-zA-Z0-9][a-zA-Z0-9-]*-[0-9]+\.(png|jpg|jpeg|webp|gif)$/.test(file)) return void 0;
 	try {
 		return {
-			data: await promises.readFile(path.join(IMAGES_DIR, file)),
+			data: await promises.readFile(path.join(imagesDir(), file)),
 			mime: mimeOfFile$1(file)
 		};
 	} catch {
@@ -1762,11 +1811,6 @@ async function readGalleryImage(file) {
 //#endregion
 //#region src/canvas-store.ts
 /** Host-persisted infinite canvas documents and content-addressed assets. */
-const DATA_ROOT = process.env.DSH_HOME?.trim() || path.join(homedir(), ".dsh");
-const CANVAS_ROOT = path.join(DATA_ROOT, "dsh-imagegen", "canvas");
-path.join(CANVAS_ROOT, "pages");
-path.join(CANVAS_ROOT, "assets");
-path.join(CANVAS_ROOT, "index.json");
 var CanvasConflictError = class extends Error {
 	code = "canvas-conflict";
 	constructor(message = "画布已在其他窗口更新，请重新加载后再保存。") {
@@ -1850,7 +1894,7 @@ function isNode(value) {
 function isDocument(value) {
 	if (value === null || typeof value !== "object") return false;
 	const document = value;
-	return document.version === 2 && typeof document.id === "string" && typeof document.title === "string" && typeof document.revision === "number" && document.viewport !== null && typeof document.viewport === "object" && typeof document.viewport.x === "number" && typeof document.viewport.y === "number" && typeof document.viewport.k === "number" && (document.background === "dots" || document.background === "lines" || document.background === "blank") && Array.isArray(document.nodes) && document.nodes.every(isNode) && Array.isArray(document.connections);
+	return document.version === 2 && typeof document.id === "string" && typeof document.title === "string" && typeof document.revision === "number" && document.viewport !== null && typeof document.viewport === "object" && typeof document.viewport.x === "number" && typeof document.viewport.y === "number" && typeof document.viewport.k === "number" && (document.background === "dots" || document.background === "lines" || document.background === "diagonal" || document.background === "checker" || document.background === "blank" || document.background === "image") && (document.backgroundImage === void 0 || typeof document.backgroundImage === "string") && Array.isArray(document.nodes) && document.nodes.every(isNode) && Array.isArray(document.connections);
 }
 /** Upgrade a v1 (image/text/annotation + edges) document to the v2 node-graph model.
 * Images and text notes keep their geometry; annotation prompt cards become plain
@@ -1970,17 +2014,17 @@ function serialize(operation) {
 }
 var CanvasStore = class {
 	root;
-	constructor(root = CANVAS_ROOT) {
+	constructor(root) {
 		this.root = root;
 	}
 	pagesDir() {
-		return path.join(this.root, "pages");
+		return path.join(this.root ?? path.join(imageDataRoot(), "canvas"), "pages");
 	}
 	assetsDir() {
-		return path.join(this.root, "assets");
+		return path.join(this.root ?? path.join(imageDataRoot(), "canvas"), "assets");
 	}
 	indexPath() {
-		return path.join(this.root, "index.json");
+		return path.join(this.root ?? path.join(imageDataRoot(), "canvas"), "index.json");
 	}
 	async ensure() {
 		await promises.mkdir(this.pagesDir(), { recursive: true });
@@ -2844,6 +2888,7 @@ function parseGenerateRequest(body) {
 		n: typeof body.n === "number" ? body.n : 1,
 		detail: typeof body.detail === "string" ? body.detail : "",
 		...typeof body.image === "string" && body.image !== "" ? { image: body.image } : {},
+		...Array.isArray(body.images) ? { images: body.images.filter((item) => typeof item === "string" && item !== "").slice(0, 4) } : {},
 		...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 } : {},
@@ -4959,6 +5004,7 @@ const Config = z.object({
 	promptApiUrl: z.string().default(""),
 	promptApiKey: z.string().role("secret").default(""),
 	promptModel: z.string().default(""),
+	localStoragePath: z.string().default(""),
 	storageEnabled: z.boolean().default(false),
 	storageEndpoint: z.string().default(""),
 	storageRegion: z.string().default(""),
@@ -5031,6 +5077,7 @@ function apply(ctx, config) {
 	let current = () => config ?? {};
 	const resolve = () => {
 		const value = current() ?? {};
+		setImageDataRoot(value.localStoragePath);
 		let channels = normalizeChannels(value.channels);
 		const secrets = { ...value.channelSecrets ?? {} };
 		if (channels.length === 0) {

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 configurable provider channels (gpt-image-2 / grok-imagine-image / nanobanana series / seedream-5.0-pro / dall-e-3, with native xAI Grok Imagine, Google Nano Banana and ByteDance Seedream request shaping), with per-channel model catalogs and a New Session / Image Generation tab entry opening a three-column studio beside the native conversation.",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "type": "module",
   "main": "lib/index.js",
   "exports": {