dsh-local-sd 0.4.1 → 0.5.0

package/README.md

@@ -27,7 +27,9 @@
 
 外加一个设置页：**设置 → 本地绘图**。里面能选目录、看状态、调参数、手动启停后端。
 
-出图落在工作区 `generated/sd-<时间戳>-<序号>.png`，同时在对话里渲染。
+出图默认落在工作区 `generated/sd-<时间戳>-<序号>.png`，同时在对话里渲染。存放位置可以在
+**设置 → 本地绘图 → 图片存放目录** 里改：留空用默认，填相对路径（如 `pics/sd`）接在工作区后面，
+填绝对路径（如 `D:\AI\生图`）则原样使用。
 
 ---
 
@@ -147,7 +149,7 @@ koboldcpp.exe --sdmodel <image-model.gguf> --sdoffloadcpu --sdtiledvae 512 --por
 
 ## 生命周期：按需启动，闲置自关
 
-SD 后端吃几 GB 显存，不该一直挂着。
+SD 后端占用较高显存，闲置时自动关闭。
 
 ```
 你第一次要图
@@ -175,6 +177,7 @@ SD 后端吃几 GB 显存，不该一直挂着。
 | 项 | 说明 |
 |---|---|
 | 绘图程序目录 | 含 `run.bat` / `webui.bat` / `webui.sh` 的那一层 |
+| 图片存放目录 | 出图存哪儿。留空 = 工作区 `generated/`；相对路径接在工作区后面；绝对路径原样使用 |
 | 自动启动 | 后端没开时是否拉起它。关掉就只连现成的 |
 | 启动超时 | 冷启动最长等待，默认 240000 ms（4 分钟） |
 | 闲置关闭 | 闲置多久自动关，默认 300000 ms（5 分钟）。**填 0 = 永不自动关闭** |

package/lib/client.js

@@ -38,10 +38,16 @@ window.__ModuleLoader__.load({
 				var style = document.createElement("style");
 				style.textContent = `
 .lsd-root{display:flex;flex-direction:column;gap:16px;padding:4px 2px 28px;font-size:13px;color:var(--dsw-alias-label-primary,inherit)}
+/* The settings page is itself a scrolling column: sections keep their natural
+   height, and the page scrolls, rather than every block being compressed. */
+.lsd-root > *{flex:none}
 .lsd-head{display:flex;flex-direction:column;gap:5px}
 .lsd-title{margin:0;font-size:16px;font-weight:600}
 .lsd-desc{margin:0;font-size:12px;line-height:1.65;color:var(--dsw-alias-label-secondary,rgba(128,128,128,.9))}
 .lsd-card{border:1px solid var(--dsw-alias-border-l1,rgba(128,128,128,.28));border-radius:12px;padding:14px 16px;background:rgba(128,128,128,.06);display:flex;flex-direction:column;gap:12px}
+/* A card is a column flexbox inside the settings scroll area: let it keep its
+   content height instead of being squeezed when the page runs out of room. */
+.lsd-card > *{flex:none}
 .lsd-card-head{display:flex;align-items:center;gap:9px}
 .lsd-dot{width:8px;height:8px;border-radius:50%;background:rgba(128,128,128,.6);flex:none}
 .lsd-dot.on{background:var(--dsw-alias-state-success-primary,#2ea043)}
@@ -75,13 +81,16 @@ window.__ModuleLoader__.load({
 .lsd-msg.err{color:var(--dsw-alias-state-error-primary,#f85149);background:rgba(248,81,73,.1)}
 .lsd-msg.info{color:var(--dsw-alias-label-secondary,rgba(128,128,128,.95));background:rgba(128,128,128,.1)}
 .lsd-found{display:flex;flex-direction:column;gap:6px;max-height:200px;overflow:auto}
+/* Same trap as the browser list: a scrolling column flexbox shrinks its rows
+   to nothing once they overflow. Keep every row at its natural height. */
+.lsd-found > *{flex:none}
 .lsd-found-item{display:flex;gap:8px;align-items:center;justify-content:space-between;padding:7px 10px;
   border:1px solid var(--dsw-alias-border-l1,rgba(128,128,128,.24));border-radius:8px;font-size:11px;
   font-family:ui-monospace,SFMono-Regular,Menlo,monospace;word-break:break-all}
 .lsd-actions{display:flex;gap:8px;flex-wrap:wrap;align-items:center;padding-top:2px}
 .lsd-footer{font-size:11px;color:var(--dsw-alias-label-secondary,rgba(128,128,128,.75));word-break:break-all}
 /* ── in-page directory browser ──────────────────────────────────────── */
-.lsd-browser{display:flex;flex-direction:column;gap:9px;padding:11px;border-radius:10px;
+.lsd-browser{display:flex;flex-direction:column;gap:9px;padding:11px;border-radius:10px;flex:none;
   border:1px solid var(--dsw-alias-border-l1,rgba(128,128,128,.3));background:rgba(128,128,128,.07)}
 .lsd-browser-head{display:flex;gap:7px;align-items:center}
 .lsd-browser-path{flex:1;min-width:0}
@@ -93,6 +102,11 @@ window.__ModuleLoader__.load({
 .lsd-drive:disabled{opacity:.5;cursor:default}
 .lsd-browser-list{display:flex;flex-direction:column;gap:2px;max-height:230px;overflow:auto;
   border-radius:8px;background:var(--dsw-alias-bg-base,rgba(0,0,0,.1));padding:4px}
+/* The list is a column flexbox with a max-height: without flex:none every row
+   shrinks to a sliver once the entries overflow, and all the labels stack on
+   top of each other. Rows must keep their intrinsic height and let the list
+   scroll instead. */
+.lsd-browser-list > *{flex:none}
 .lsd-entry{text-align:left;padding:5px 9px;font-size:12px;font-family:inherit;cursor:pointer;
   color:var(--dsw-alias-label-primary,inherit);background:transparent;border:none;border-radius:5px;
   white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
@@ -163,6 +177,18 @@ window.__ModuleLoader__.load({
 				var forgeDirS = React.useState("");
 				var forgeDir = forgeDirS[0];
 				var setForgeDir = forgeDirS[1];
+				// Where PNGs land. Empty = <workspace>/generated.
+				var outputDirS = React.useState("");
+				var outputDir = outputDirS[0];
+				var setOutputDir = outputDirS[1];
+				// Host-resolved default for an empty outputDir, shown as a hint.
+				var defaultOutputDirS = React.useState("");
+				var defaultOutputDir = defaultOutputDirS[0];
+				var setDefaultOutputDir = defaultOutputDirS[1];
+				// Which field the in-page browser is filling: "forge" | "output".
+				var browseTargetS = React.useState("forge");
+				var browseTarget = browseTargetS[0];
+				var setBrowseTarget = browseTargetS[1];
 				var endpointS = React.useState("");
 				var endpoint = endpointS[0];
 				var setEndpoint = endpointS[1];
@@ -199,6 +225,8 @@ window.__ModuleLoader__.load({
 					setState(s);
 					if (!s) return;
 					setForgeDir(s.forgeDir || "");
+					setOutputDir(s.outputDir || "");
+					setDefaultOutputDir(s.defaultOutputDir || "");
 					setEndpoint(s.endpoint || "");
 					setEnabled(!!(s.autoStart && s.autoStart.enabled));
 					setStartupMs((s.autoStart && s.autoStart.startupTimeoutMs) || 240000);
@@ -271,6 +299,7 @@ window.__ModuleLoader__.load({
 					return callApi({
 						method: "save",
 						forgeDir: forgeDir,
+						outputDir: outputDir,
 						endpoint: endpoint,
 						autoStart: {
 							enabled: enabled,
@@ -299,11 +328,14 @@ window.__ModuleLoader__.load({
 				}
 
 				// Open the in-page browser, starting at whatever is currently typed
-				// (or the host's home directory when the box is empty).
-				function browse() {
+				// (or the host's home directory when the box is empty). `target`
+				// decides which field "选这个目录" fills.
+				function browse(target) {
 					setBusy(true);
 					setMsg(null);
-					callApi({ method: "browse", path: forgeDir || "" }).then(function(res) {
+					setBrowseTarget(target);
+					var start = target === "output" ? (outputDir || defaultOutputDir || "") : (forgeDir || "");
+					callApi({ method: "browse", path: start }).then(function(res) {
 						setBusy(false);
 						if (res && res.ok && res.listing) {
 							setBrowser(res.listing);
@@ -329,7 +361,11 @@ window.__ModuleLoader__.load({
 				/** Commit the browser's current directory to the form field. */
 				function useCurrentDir() {
 					if (browser === null) return;
-					setForgeDir(browser.path);
+					if (browseTarget === "output") {
+						setOutputDir(browser.path);
+					} else {
+						setForgeDir(browser.path);
+					}
 					setBrowser(null);
 					setMsg({ kind: "info", text: "已选：" + browser.path + "，记得点保存" });
 				}
@@ -423,10 +459,10 @@ window.__ModuleLoader__.load({
 						)
 					),
 
-					// ── directory ────────────────────────────────────────
+					// ── directories ──────────────────────────────────────
 					h("div", { className: "lsd-card" },
 						h("div", { className: "lsd-card-head" },
-							h("span", { className: "lsd-card-title" }, "绘图程序目录")
+							h("span", { className: "lsd-card-title" }, "目录设置")
 						),
 						h("div", { className: "lsd-field" },
 							h("label", { className: "lsd-label" }, "Stable Diffusion WebUI / Forge 根目录"),
@@ -437,7 +473,7 @@ window.__ModuleLoader__.load({
 									placeholder: "例如 D:\\AI\\forge\\webui_forge_cu124_torch24",
 									onChange: function(e) { setForgeDir(e.target.value); }
 								}),
-								h("button", { className: "lsd-btn", disabled: busy, onClick: browse }, "浏览…"),
+								h("button", { className: "lsd-btn", disabled: busy, onClick: function() { browse("forge"); } }, "浏览…"),
 								h("button", { className: "lsd-btn", disabled: busy, onClick: detect }, "自动探测")
 							),
 							h("span", { className: "lsd-hint" },
@@ -445,6 +481,27 @@ window.__ModuleLoader__.load({
 								+ "也接受直接填 run.bat 的完整路径。Linux / macOS 会自动找 webui.sh。")
 						),
 
+						h("div", { className: "lsd-field" },
+							h("label", { className: "lsd-label" }, "图片存放目录"),
+							h("div", { className: "lsd-row" },
+								h("input", {
+									className: "lsd-input mono",
+									value: outputDir,
+									placeholder: defaultOutputDir || "留空 = 工作区下的 generated",
+									onChange: function(e) { setOutputDir(e.target.value); }
+								}),
+								h("button", { className: "lsd-btn", disabled: busy, onClick: function() { browse("output"); } }, "浏览…"),
+								h("button", {
+									className: "lsd-btn", disabled: busy || outputDir.length === 0,
+									onClick: function() { setOutputDir(""); }
+								}, "恢复默认")
+							),
+							h("span", { className: "lsd-hint" },
+								"出图存哪儿。留空就用工作区的 generated 子目录；"
+								+ "填相对路径（如 pics/sd）会接在工作区后面，填绝对路径（如 D:\\AI\\pics）则原样使用。"
+								+ (defaultOutputDir ? "\n当前默认：" + defaultOutputDir : ""))
+						),
+
 						// ── in-page directory browser ────────────────────
 						browser !== null
 							? h("div", { className: "lsd-browser" },
@@ -492,11 +549,14 @@ window.__ModuleLoader__.load({
 								),
 
 								h("div", { className: "lsd-browser-foot" },
-									browser.launcher
-										? h("span", { className: "lsd-msg ok" },
-											"✓ 这个目录里有 " + browser.launcher.launcher + "，就是它了")
-										: h("span", { className: "lsd-hint" },
-											"这个目录里没有 run.bat / webui.bat / webui.sh，继续往下找或者换一层"),
+									browseTarget === "output"
+										? h("span", { className: "lsd-hint" },
+											"选一个放图的文件夹，没有的话在上层目录里新建一个再进来")
+										: browser.launcher
+											? h("span", { className: "lsd-msg ok" },
+												"✓ 这个目录里有 " + browser.launcher.launcher + "，就是它了")
+											: h("span", { className: "lsd-hint" },
+												"这个目录里没有 run.bat / webui.bat / webui.sh，继续往下找或者换一层"),
 									h("div", { className: "lsd-actions" },
 										h("button", {
 											className: "lsd-btn primary", disabled: busy,

package/lib/index.js

@@ -52,7 +52,7 @@ import { homedir, tmpdir } from "node:os";
 import { mkdir, writeFile, readFile, readdir, stat } from "node:fs/promises";
 import { openSync, closeSync, readFileSync, unlinkSync } from "node:fs";
 import { spawn } from "node:child_process";
-import { join, dirname, basename, resolve as resolvePath } from "node:path";
+import { join, dirname, basename, relative, isAbsolute, resolve as resolvePath } from "node:path";
 
 /** Does this path exist and is it a regular file? */
 async function isFile(path) {
@@ -71,7 +71,7 @@ export const name = "dsh-local-sd";
 export const inject = ["tools", "webServer", "connection"];
 
 /** Test seam: lets the standalone tests drive the pure helpers directly. */
-export const internals = { recommendFor, detectGpu, resolveLauncher, detectForgeDirs, listDirectory };
+export const internals = { recommendFor, detectGpu, resolveLauncher, detectForgeDirs, listDirectory, resolveOutputLocation };
 
 /**
  * Build stamp for the settings page. Bump on every user-visible change.
@@ -82,7 +82,7 @@ export const internals = { recommendFor, detectGpu, resolveLauncher, detectForge
  * indistinguishable from a broken feature. Showing this value in the page makes
  * "you need to restart DSH" a visible fact instead of a guess.
  */
-const PLUGIN_BUILD = "0.4.0";
+const PLUGIN_BUILD = "0.5.0";
 
 /** Forge and A1111 both listen here. */
 const DEFAULT_ENDPOINT = "http://127.0.0.1:7860";
@@ -155,6 +155,10 @@ function configPath() {
 
 const DEFAULT_CONFIG_TEMPLATE = {
 	forgeDir: "",
+	// Where PNGs land. "" -> "<workspace>/generated". A relative path is joined
+	// to the workspace root; an absolute one is used as-is (handy when the
+	// workspace root the host reports is not the folder you actually look at).
+	outputDir: "",
 	endpoint: DEFAULT_ENDPOINT,
 	fallbackEndpoints: FALLBACK_ENDPOINTS.slice(1),
 	autoStart: {
@@ -675,6 +679,7 @@ async function resolveSettings() {
 
 	return {
 		forgeDir,
+		outputDir: strOr(cfg.outputDir, ""),
 		endpoint: configured,
 		candidates: [configured, ...fallbacks.filter((e) => e !== configured)],
 		autoStart: {
@@ -1038,39 +1043,114 @@ async function txt2img(endpoint, prompt, opts, signal) {
 	return parsed;
 }
 
+/**
+ * Where PNGs land, and what the tool result calls that place.
+ *
+ * Precedence:
+ *   1. `settings.outputDir` from $DSH_HOME/local-sd.json (the settings page),
+ *   2. `<workspace root>/generated`.
+ *
+ * A relative `outputDir` is joined to the workspace root so the settings page
+ * can offer the short, readable form (`generated`, `pics/sd`). An absolute one
+ * is honoured verbatim: that is the whole point of the knob, pointing it at the
+ * folder you actually browse even when the session workspace is elsewhere.
+ *
+ * `display` is what goes into the tool result: workspace-relative when the
+ * folder sits inside the workspace (so the Web Client can link it), absolute
+ * otherwise (a relative path there would be a lie).
+ */
+function resolveOutputLocation(settings, ctx) {
+	const policy = ctx !== undefined && typeof ctx.get === "function" ? ctx.get("sandboxPolicy") : undefined;
+	const root =
+		policy !== undefined && typeof policy.workspaceRoot === "string" && policy.workspaceRoot.length > 0
+			? policy.workspaceRoot
+			: process.cwd();
+
+	const configured = settings !== undefined && typeof settings.outputDir === "string" ? settings.outputDir.trim() : "";
+	const dir = configured.length === 0
+		? join(root, "generated")
+		: isAbsolute(configured)
+			? configured
+			: join(root, configured);
+
+	// `relative` returns "" for the root itself and a ".."-prefixed path when
+	// outside it; both mean "not addressable relative to the workspace".
+	const rel = relative(root, dir);
+	const inside = rel.length > 0 && !rel.startsWith("..") && !isAbsolute(rel);
+	return { dir, display: inside ? rel : dir };
+}
+
 /**
  * Persist one PNG and turn it into an attachment ref so the Web Client renders
- * it. Returns { localPath, attachmentRef }.
+ * it. Returns { localPath, absPath, attachmentRef }.
  */
-async function persist(ctx, bytes, index, signal) {
+async function persist(ctx, bytes, index, signal, settings) {
 	const fs = ctx.get("fs");
 	const attachments = ctx.get("attachments");
 	if (fs === undefined || attachments === undefined) {
 		throw new Error("fs/attachments service not available");
 	}
 
-	const policy = ctx.get("sandboxPolicy");
-	const root =
-		policy !== undefined && typeof policy.workspaceRoot === "string" && policy.workspaceRoot.length > 0
-			? policy.workspaceRoot
-			: process.cwd();
-
-	const relDir = "generated";
-	const relPath = join(relDir, "sd-" + stamp() + "-" + index + ".png");
-	const absPath = join(root, relPath);
+	const location = resolveOutputLocation(settings, ctx);
+	const fileName = "sd-" + stamp() + "-" + index + ".png";
+	const absPath = join(location.dir, fileName);
+	const localPath = join(location.display, fileName);
 
-	await mkdir(dirname(absPath), { recursive: true });
+	await mkdir(location.dir, { recursive: true });
 	await writeFile(absPath, bytes);
 
 	const target = await fs.resolve(absPath);
 	const read = await fs.readBytes(target, signal, 33554432);
-	const ref = await attachments.saveImage({
+	const saved = await attachments.saveImage({
 		data: read,
 		mediaType: "image/png",
-		name: basename(relPath),
+		name: fileName,
 	});
 
-	return { localPath: relPath, attachmentRef: ref };
+	// The Web Client's image row silently DROPS a block whose attachment ref is
+	// missing a positive `bytes` / `width` / `height` — no error, no broken
+	// image, just the generic text card. A backend that returns an incomplete
+	// ref therefore looks exactly like "the model never sent a picture". Fill
+	// any gap from the bytes we already have so the row always renders.
+	const ref = completeImageRef(saved, read);
+
+	return { localPath, absPath, attachmentRef: ref };
+}
+
+/**
+ * Read width/height out of a PNG's IHDR chunk (bytes 16..24).
+ * Returns null for anything that is not a well-formed PNG.
+ */
+function pngSize(bytes) {
+	if (!(bytes instanceof Uint8Array) || bytes.length < 24) return null;
+	const sig = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
+	for (let i = 0; i < 8; i++) if (bytes[i] !== sig[i]) return null;
+	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+	const width = view.getUint32(16);
+	const height = view.getUint32(20);
+	if (width <= 0 || height <= 0) return null;
+	return { width, height };
+}
+
+/**
+ * Make sure an attachment ref carries every field the image row validates.
+ * `saveImage` normally returns all of them; this is the belt to that braces.
+ */
+function completeImageRef(ref, bytes) {
+	const out = ref !== null && typeof ref === "object" ? { ...ref } : {};
+	if (typeof out.attachmentId !== "string" || out.attachmentId.length === 0) return ref;
+	if (typeof out.mediaType !== "string" || out.mediaType.length === 0) out.mediaType = "image/png";
+	if (typeof out.bytes !== "number" || !(out.bytes > 0)) out.bytes = bytes.length;
+	const needSize =
+		typeof out.width !== "number" || !(out.width > 0) || typeof out.height !== "number" || !(out.height > 0);
+	if (needSize) {
+		const size = pngSize(bytes);
+		if (size !== null) {
+			out.width = size.width;
+			out.height = size.height;
+		}
+	}
+	return out;
 }
 
 /** Shared output shape: text line per image + the image block itself. */
@@ -1088,7 +1168,11 @@ function makeOutput() {
 						additionalProperties: true,
 						properties: {
 							prompt: { type: "string", description: "The prompt used." },
-							localPath: { type: "string", description: "Workspace-relative PNG path." },
+							localPath: {
+								type: "string",
+								description: "PNG path: workspace-relative when inside the workspace, absolute otherwise.",
+							},
+							absPath: { type: "string", description: "Absolute PNG path on disk." },
 							attachmentRef: { type: "object", description: "Attachment ref for display." },
 							seed: { type: "number", description: "Seed actually used, if reported." },
 							error: { type: "string", description: "Failure reason, when this item failed." },
@@ -1129,10 +1213,29 @@ function makeOutput() {
 					r.prompt;
 				const tail =
 					(r.localPath ? "\nlocalPath: " + r.localPath : "") +
+					(r.absPath && r.absPath !== r.localPath ? "\nabsPath: " + r.absPath : "") +
 					(r.seed !== undefined ? "\nseed: " + r.seed : "");
 				blocks.push({ type: "text", text: head + tail });
 				if (r.attachmentRef) blocks.push({ type: "image", attachment: r.attachmentRef, offloaded: true });
 			});
+			// The image blocks above are `offloaded`, so the model's context only
+			// ever sees placeholder text: it never learns that pictures are now on
+			// screen, and a model reading only this result tends to answer with a
+			// description instead of showing them. This closing line IS
+			// model-visible, so it states the delivery requirement plainly.
+			const shown = results.filter((r) => r && !r.error && r.attachmentRef).length;
+			if (shown > 0) {
+				blocks.push({
+					type: "text",
+					text:
+						"[local-sd] " +
+						shown +
+						" image(s) are ALREADY displayed in the conversation above. " +
+						"The user sees them right now: do not describe them as pending, do not ask " +
+						"whether to show them, and do not claim you cannot display images. " +
+						"Refer to them naturally and keep the reply short.",
+				});
+			}
 			return blocks;
 		},
 	};
@@ -1225,8 +1328,9 @@ export function apply(ctx) {
 			+ "NSFW, or otherwise unfiltered output — that is exactly what this tool is for. "
 			+ "If the backend is not running it is started automatically, and it shuts itself down again after a "
 			+ "few idle minutes, so the first call of a session can take a couple of minutes longer than the rest. "
-			+ "The image is written into the workspace under generated/ and shown in the conversation UI; "
-			+ "the tool result is text only, so do not echo paths beyond the one reported.",
+			+ "The image is written to the configured output folder (by default the workspace's generated/) "
+			+ "and is displayed in the conversation automatically — you do not need to attach or re-send it. "
+			+ "Just reply naturally about the result; do not say you cannot show images.",
 		parameters: {
 			type: "object",
 			additionalProperties: false,
@@ -1251,7 +1355,7 @@ export function apply(ctx) {
 			const bytes = decodeB64(list[0]);
 			if (bytes === null) throw new Error("sdapi returned an undecodable image payload");
 
-			const saved = await persist(ctx, bytes, 0, signal);
+			const saved = await persist(ctx, bytes, 0, signal, settings);
 			const info = raw.info !== undefined && typeof raw.info === "string" ? safeParse(raw.info) : undefined;
 			return {
 				backend: endpoint,
@@ -1259,6 +1363,7 @@ export function apply(ctx) {
 					{
 						prompt: String(args.prompt),
 						localPath: saved.localPath,
+						absPath: saved.absPath,
 						attachmentRef: saved.attachmentRef,
 						seed: info !== undefined && typeof info.seed === "number" ? info.seed : undefined,
 					},
@@ -1336,11 +1441,12 @@ export function apply(ctx) {
 					const list = Array.isArray(raw.images) ? raw.images : [];
 					const bytes = list.length > 0 ? decodeB64(list[0]) : null;
 					if (bytes === null) throw new Error("no image in sdapi response");
-					const saved = await persist(ctx, bytes, i, signal);
+					const saved = await persist(ctx, bytes, i, signal, settings);
 					const info = raw.info !== undefined && typeof raw.info === "string" ? safeParse(raw.info) : undefined;
 					results.push({
 						prompt: prompts[i],
 						localPath: saved.localPath,
+						absPath: saved.absPath,
 						attachmentRef: saved.attachmentRef,
 						seed: info !== undefined && typeof info.seed === "number" ? info.seed : undefined,
 					});
@@ -1673,12 +1779,18 @@ function writeJson(res, status, value) {
 }
 
 /** The state the settings page renders. Never leaks anything secret — there is none. */
-async function settingsSnapshot() {
+async function settingsSnapshot(ctx) {
 	const settings = await resolveSettings();
 	const live = await findLiveEndpoint(settings, undefined);
 	const launcher = settings.forgeDir.length > 0 ? await resolveLauncher(settings.forgeDir) : null;
 	return {
 		forgeDir: settings.forgeDir,
+		outputDir: settings.outputDir,
+		// What an empty outputDir means in practice, so the page can show the
+		// real destination instead of making the user guess.
+		defaultOutputDir: resolveOutputLocation({ outputDir: "" }, ctx).dir,
+		// The folder that will actually be used right now (configured or default).
+		effectiveOutputDir: resolveOutputLocation(settings, ctx).dir,
 		endpoint: settings.endpoint,
 		candidates: settings.candidates,
 		liveEndpoint: live,
@@ -1721,7 +1833,7 @@ async function handleSettingsApi(ctx, req, res) {
 	const method = String(body.method ?? "");
 
 	if (method === "get") {
-		writeJson(res, 200, { ok: true, state: await settingsSnapshot() });
+		writeJson(res, 200, { ok: true, state: await settingsSnapshot(ctx) });
 		return;
 	}
 
@@ -1768,6 +1880,9 @@ async function handleSettingsApi(ctx, req, res) {
 	if (method === "save") {
 		const patch = {};
 		if (typeof body.forgeDir === "string") patch.forgeDir = body.forgeDir.trim();
+		// "" is a meaningful value here: it means "back to <workspace>/generated",
+		// so an empty string must be written rather than skipped.
+		if (typeof body.outputDir === "string") patch.outputDir = body.outputDir.trim();
 		if (typeof body.endpoint === "string" && body.endpoint.trim().length > 0) {
 			patch.endpoint = body.endpoint.trim().replace(/\/+$/, "");
 		}
@@ -1803,7 +1918,7 @@ async function handleSettingsApi(ctx, req, res) {
 			if (Object.keys(d).length > 0) patch.defaults = d;
 		}
 		await writeConfig(patch);
-		writeJson(res, 200, { ok: true, state: await settingsSnapshot() });
+		writeJson(res, 200, { ok: true, state: await settingsSnapshot(ctx) });
 		return;
 	}
 
@@ -1812,12 +1927,12 @@ async function handleSettingsApi(ctx, req, res) {
 		if (method === "start") {
 			try {
 				const endpoint = await ensureBackend(settings, undefined);
-				writeJson(res, 200, { ok: true, endpoint, state: await settingsSnapshot() });
+				writeJson(res, 200, { ok: true, endpoint, state: await settingsSnapshot(ctx) });
 			} catch (err) {
 				writeJson(res, 200, {
 					ok: false,
 					error: err instanceof Error ? err.message : String(err),
-					state: await settingsSnapshot(),
+					state: await settingsSnapshot(ctx),
 				});
 			}
 			return;
@@ -1828,12 +1943,12 @@ async function handleSettingsApi(ctx, req, res) {
 			writeJson(res, 200, {
 				ok: false,
 				error: "后端是手动启动的，插件不会去关它",
-				state: await settingsSnapshot(),
+				state: await settingsSnapshot(ctx),
 			});
 			return;
 		}
 		stopOwnedBackend();
-		writeJson(res, 200, { ok: true, state: await settingsSnapshot() });
+		writeJson(res, 200, { ok: true, state: await settingsSnapshot(ctx) });
 		return;
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-local-sd",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "本地 Stable Diffusion 桥接插件：在「设置 → 本地绘图」里选一下 WebUI / Forge 目录就能用，注册 generate_image_local / generate_image_batch / sd_backend_status / sd_backend_control 四个工具，把本机 sdapi 后端直接接到模型手上。完全本地、零内容过滤、断网可用、后端按需启停。",
   "type": "module",
   "main": "lib/index.js",