dsh-tiddlywiki 0.19.2 → 0.19.3

package/lib/index.js

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, readdirSync, statSync, watch } from "node:fs";
-import { access, mkdir, readFile, readdir, rename, stat, writeFile } from "node:fs/promises";
+import { mkdir, readFile, readdir, rename, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join, resolve } from "node:path";
 import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
@@ -1315,7 +1315,7 @@ function scanSnapshot(snap, subagent, collected) {
 							title: args.newTitle,
 							action: "produced",
 							time: t,
-							detail: old !== void 0 ? `重命名自「${old}」` : void 0,
+							detail: old !== void 0 && isPlausibleTitle(old) ? `重命名自「${old}」` : void 0,
 							subagent
 						});
 					}
@@ -1362,6 +1362,14 @@ function scanSnapshot(snap, subagent, collected) {
 		}
 	}
 }
+/**
+* 内联文本净化（v0.19.3）：汇总 wikitext 会被 TW 渲染成 HTML 片段再注入 DSH 页面，
+* 而 TW 的解析器**原样透传 HTML**。凡是来自会话日志/请求体的字符串（sessionId、
+* rename 的旧标题、检索词）都要先转义 HTML 元字符并去掉控制字符，别指望上层净化。
+*/
+function escapeInline(text, max = 200) {
+	return text.replace(/[\u0000-\u001f\u007f]/g, " ").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/[[\]|]/g, " ").slice(0, max);
+}
 /** 并发（8 路）查询每篇笔记的当前状态（404 → 不存在/已删除）。 */
 async function enrichTitles(client, titles) {
 	const out = /* @__PURE__ */ new Map();
@@ -1382,7 +1390,8 @@ async function enrichTitles(client, titles) {
 		} catch {
 			return [title, {
 				exists: false,
-				tags: []
+				tags: [],
+				unknown: true
 			}];
 		}
 	};
@@ -1410,7 +1419,7 @@ function buildWikitext(sessionId, collected, producedTitles, readTitles, stateBy
 	const lines = [];
 	lines.push("! 会话相关 wiki 汇总");
 	lines.push("");
-	lines.push(`本页列出会话 \`${sessionId}\`（含其后代子代理）在本会话中产生 / 读取 / 检索过的知识库笔记。`);
+	lines.push(`本页列出会话 \`${escapeInline(sessionId, 120)}\`（含其后代子代理）在本会话中产生 / 读取 / 检索过的知识库笔记。`);
 	lines.push("");
 	const producedCount = producedTitles.length;
 	const readCount = readTitles.length;
@@ -1426,15 +1435,16 @@ function buildWikitext(sessionId, collected, producedTitles, readTitles, stateBy
 	lines.push("");
 	const entryLine = (title, state, entry) => {
 		const bits = [`[[${title}]]`];
-		if (state === void 0 || !state.exists) bits.push("⚠️ 已删除/不存在");
+		if (state !== void 0 && state.unknown === true) bits.push("⚠️ 状态未知（查询失败）");
+		else if (state === void 0 || !state.exists) bits.push("⚠️ 已删除/不存在");
 		else {
-			if (state.tags.length > 0) bits.push(`标签 ${state.tags.slice(0, 6).join("、")}${state.tags.length > 6 ? "…" : ""}`);
+			if (state.tags.length > 0) bits.push(`标签 ${state.tags.slice(0, 6).map((tag) => escapeInline(tag, 40)).join("、")}${state.tags.length > 6 ? "…" : ""}`);
 			const mod = fmtModified(state.modified);
 			if (mod.length > 0) bits.push(`修改 ${mod}`);
 		}
 		const t = fmtTime(entry.time);
 		if (t.length > 0) bits.push(`会话内 ${t}`);
-		if (entry.detail !== void 0) bits.push(entry.detail);
+		if (entry.detail !== void 0) bits.push(escapeInline(entry.detail, 200));
 		if (entry.subagent) bits.push("（子代理）");
 		return `* ${bits.join(" · ")}`;
 	};
@@ -1459,8 +1469,8 @@ function buildWikitext(sessionId, collected, producedTitles, readTitles, stateBy
 		for (const r of collected.searches) {
 			const bits = [];
 			if (r.kind === "search") {
-				bits.push(`\`tiddlywiki_search\` query=「${r.query.length > 0 ? r.query : "(空)"}」`);
-				if (r.tags.length > 0) bits.push(`tags ${r.tags.join("、")}`);
+				bits.push(`\`tiddlywiki_search\` query=「${r.query.length > 0 ? escapeInline(r.query, 120) : "(空)"}」`);
+				if (r.tags.length > 0) bits.push(`tags ${r.tags.map((tag) => escapeInline(tag, 40)).join("、")}`);
 			} else bits.push("`tiddlywiki_recent`（最近修改）");
 			const t = fmtTime(r.time);
 			if (t.length > 0) bits.push(t);
@@ -1575,6 +1585,39 @@ function json(res, payload, status = 200) {
 	res.end(JSON.stringify(payload));
 }
 /**
+* Map a thrown error to an HTTP status. Oversized bodies are a client problem
+* (413), everything else is ours (500) — the routes used to answer 500 for
+* `/note` and `/admin/*` but 413 for `/upload` for the identical condition.
+*/
+function errorStatus(err) {
+	const message = err instanceof Error ? err.message : String(err);
+	return /body too large/i.test(message) ? 413 : 500;
+}
+/**
+* Wrap an async route handler so a rejected promise can never become an
+* unhandled rejection (v0.19.3).
+*
+* WHY: every registration used to be `void handleX(req, res)`, and the host
+* installs no `unhandledRejection` handler — Node's default policy then EXITS
+* the whole dsh web process, while the client request hangs with no response.
+* A handler that throws (including a sync throw before its own try block, e.g.
+* `new URL(req.url)` outside the try in the proxies) now always ends in a
+* response: 413/500 JSON, or a bare `end()` when headers are already sent.
+*/
+function guardHandler(handler) {
+	return (req, res) => {
+		handler(req, res).catch((err) => {
+			try {
+				if (!res.headersSent) json(res, {
+					ok: false,
+					error: err instanceof Error ? err.message : String(err)
+				}, errorStatus(err));
+				else res.end();
+			} catch {}
+		});
+	};
+}
+/**
 * True when a NON-GET/HEAD/OPTIONS request is a cross-site (CSRF) request.
 *
 * Every legitimate caller of these routes is same-origin: the DSH GUI, the
@@ -3667,6 +3710,8 @@ function sanitizeUploadName(input) {
 	if (typeof input !== "string") return "";
 	let name = basename(input.trim().replace(/[\\/]+/g, "/")).replace(/[\u0000-\u001f\u007f]/g, "").replace(/[<>:"|?*]/g, "_").replace(/^\.+/, "").trim();
 	if (name.length === 0 || name === "." || name === "..") return "";
+	name = name.replace(/[. ]+$/, "");
+	if (name.length === 0) return "";
 	if (WINDOWS_RESERVED_NAMES.test(name)) name = `_${name}`;
 	if (name.length > 160) name = name.slice(0, 160);
 	return name;
@@ -3868,6 +3913,13 @@ function registerRoutes(ctx, deps) {
 				}, 400);
 				return;
 			}
+			if (!/^[A-Za-z0-9._:-]{1,120}$/.test(session)) {
+				json(res, {
+					ok: false,
+					error: "session id has an unsupported format"
+				}, 400);
+				return;
+			}
 			const client = deps.getClient();
 			if (client === void 0) {
 				json(res, {
@@ -3893,7 +3945,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	/**
@@ -3937,7 +3989,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	/**
@@ -4015,7 +4067,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	/**
@@ -4073,7 +4125,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	/**
@@ -4129,6 +4181,32 @@ function registerRoutes(ctx, deps) {
 				}, 503);
 				return;
 			}
+			if (mode !== void 0) {
+				const ap = deps.getAgentPresets();
+				if (ap === void 0) {
+					json(res, {
+						ok: false,
+						error: "agent presets service unavailable"
+					}, 503);
+					return;
+				}
+				try {
+					const presets = await ap.list();
+					if (!presets.some((preset) => preset.id === mode)) {
+						json(res, {
+							ok: false,
+							error: `unknown agent preset "${mode}" (available: ${presets.map((preset) => preset.id).join(", ")})`
+						}, 400);
+						return;
+					}
+				} catch (err) {
+					json(res, {
+						ok: false,
+						error: `cannot validate agent preset: ${err instanceof Error ? err.message : String(err)}`
+					}, 503);
+					return;
+				}
+			}
 			const ws = deps.getWorkspaceRegistry();
 			if (cwd.length > 0) {
 				if (!isAbsolute(cwd)) {
@@ -4186,7 +4264,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	const handleNote = async (req, res) => {
@@ -4250,7 +4328,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	const handleEdit = async (req, res) => {
@@ -4296,7 +4374,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	/** Distinct non-system tags for the quick-note tag autocomplete. The flat
@@ -4330,7 +4408,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	/** Recent non-system tiddlers for the quick-note "最近" picker (newest first). */
@@ -4362,7 +4440,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	/** Full tiddler for the quick-note "最近" picker (load into the editor). */
@@ -4418,7 +4496,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	/**
@@ -4473,7 +4551,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	const handleRestart = async (req, res) => {
@@ -4499,7 +4577,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		}
 	};
 	/** One-click git sync for the floating button / settings page: pull →
@@ -4568,7 +4646,7 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 500);
+			}, errorStatus(err));
 		} finally {
 			endMutation();
 		}
@@ -4612,16 +4690,24 @@ function registerRoutes(ctx, deps) {
 			await mkdir(filesDir, { recursive: true });
 			const ext = extname(name);
 			const stem = ext.length > 0 ? name.slice(0, -ext.length) : name;
-			let candidate = name;
-			for (let i = 1; i <= 1e4; i++) {
+			let candidate = "";
+			let wrote = false;
+			for (let i = 0; i <= 1e4 && !wrote; i++) {
+				candidate = i === 0 ? name : `${stem}-${i}${ext}`;
 				try {
-					await access(join(filesDir, candidate));
-				} catch {
-					break;
+					await writeFile(join(filesDir, candidate), buf, { flag: "wx" });
+					wrote = true;
+				} catch (err) {
+					if (err.code !== "EEXIST") throw err;
 				}
-				candidate = `${stem}-${i}${ext}`;
 			}
-			await writeFile(join(filesDir, candidate), buf);
+			if (!wrote) {
+				json(res, {
+					ok: false,
+					error: "同名文件过多，请换一个文件名"
+				}, 409);
+				return;
+			}
 			deps.autoCommit();
 			invalidateGitStatus();
 			json(res, {
@@ -4714,6 +4800,29 @@ function registerRoutes(ctx, deps) {
 			}, 502);
 		}
 	};
+	/**
+	* Titles the browser-facing TW proxies must never serve (v0.19.3).
+	*
+	* `$:/plugins/dsh-tiddlywiki/config` holds the shared tokens and the git
+	* remote (possibly with a PAT); both `/tw` and `/api` forward ANY path to the
+	* loopback TW child, whose TiddlyWeb REST answers for `$:/…` titles — a
+	* route-level guard on `/get` was therefore trivially bypassed by
+	* `GET /dsh-tiddlywiki/tw/recipes/default/tiddlers/%24%3A%2Fplugins%2F…`
+	* (verified). The whole plugin namespace is blocked: nothing under it is
+	* needed by the TW frontend, and the host itself talks to TW directly.
+	*/
+	const BLOCKED_PROXY_TITLE_PREFIXES = ["$:/plugins/dsh-tiddlywiki/"];
+	/** True when a proxied pathname addresses a blocked (secret-bearing) tiddler. */
+	const isBlockedProxyPath = (pathname) => {
+		const at = pathname.indexOf("/tiddlers/");
+		if (at < 0) return false;
+		const raw = pathname.slice(at + 10);
+		let title = raw;
+		try {
+			title = decodeURIComponent(raw);
+		} catch {}
+		return BLOCKED_PROXY_TITLE_PREFIXES.some((prefix) => title.startsWith(prefix));
+	};
 	/** Passthrough /dsh-tiddlywiki/api/<rest> → TW root /<rest>. */
 	const handleApiProxy = async (req, res) => {
 		if (rejectCrossSiteWrite(req, res)) return;
@@ -4724,9 +4833,16 @@ function registerRoutes(ctx, deps) {
 			}, 503);
 			return;
 		}
-		const url = new URL(req.url ?? "/", "http://127.0.0.1");
-		const rest = url.pathname.replace(/^\/dsh-tiddlywiki\/api/, "") || "/";
 		try {
+			const url = new URL(req.url ?? "/", "http://127.0.0.1");
+			const rest = url.pathname.replace(/^\/dsh-tiddlywiki\/api/, "") || "/";
+			if (isBlockedProxyPath(rest)) {
+				json(res, {
+					ok: false,
+					error: "system tiddler not exposed"
+				}, 403);
+				return;
+			}
 			const headers = forwardHeaders(req.headers);
 			const method = (req.method ?? "GET").toUpperCase();
 			if (method === "PUT" || method === "DELETE" || method === "POST") headers["x-requested-with"] = "TiddlyWiki";
@@ -4770,14 +4886,23 @@ function registerRoutes(ctx, deps) {
 		}
 		const url = new URL(req.url ?? "/", "http://127.0.0.1");
 		const rest = url.pathname.replace(new RegExp(`^${TW_PROXY_PREFIX}(?=/|$)`), "") || "/";
+		if (isBlockedProxyPath(rest)) {
+			json(res, {
+				ok: false,
+				error: "system tiddler not exposed"
+			}, 403);
+			return;
+		}
 		try {
 			const method = (req.method ?? "GET").toUpperCase();
 			const headers = forwardHeaders(req.headers);
 			if (method === "PUT" || method === "DELETE" || method === "POST") headers["x-requested-with"] = "TiddlyWiki";
+			const abort = new AbortController();
+			const timeout = AbortSignal.timeout(3e4);
 			const init = {
 				method,
 				headers,
-				signal: AbortSignal.timeout(3e4)
+				signal: typeof AbortSignal.any === "function" ? AbortSignal.any([abort.signal, timeout]) : timeout
 			};
 			if (method === "PUT" || method === "POST") init.body = await readBodyBuffer(req, MAX_UPLOAD_BYTES);
 			const upstream = await fetch(`${deps.server.url}${rest}${url.search}`, init);
@@ -4805,7 +4930,15 @@ function registerRoutes(ctx, deps) {
 			await new Promise((resolveP, rejectP) => {
 				body.on("error", rejectP);
 				res.on("error", rejectP);
-				res.on("close", () => resolveP());
+				res.on("close", () => {
+					try {
+						abort.abort();
+					} catch {}
+					try {
+						body.destroy();
+					} catch {}
+					resolveP();
+				});
 				res.on("finish", () => resolveP());
 				body.pipe(res);
 			});
@@ -4824,128 +4957,92 @@ function registerRoutes(ctx, deps) {
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/status`,
-			handler: (req, res) => {
-				handleStatus(req, res);
-			}
+			handler: guardHandler(handleStatus)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/note`,
-			handler: (req, res) => {
-				handleNote(req, res);
-			}
+			handler: guardHandler(handleNote)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/edit`,
-			handler: (req, res) => {
-				handleEdit(req, res);
-			}
+			handler: guardHandler(handleEdit)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/tags`,
-			handler: (req, res) => {
-				handleTags(req, res);
-			}
+			handler: guardHandler(handleTags)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/recent`,
-			handler: (req, res) => {
-				handleRecent(req, res);
-			}
+			handler: guardHandler(handleRecent)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/get`,
-			handler: (req, res) => {
-				handleGet(req, res);
-			}
+			handler: guardHandler(handleGet)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/search`,
-			handler: (req, res) => {
-				handleSearch(req, res);
-			}
+			handler: guardHandler(handleSearch)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/render`,
-			handler: (req, res) => {
-				handleRender(req, res);
-			}
+			handler: guardHandler(handleRender)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/sync`,
-			handler: (req, res) => {
-				handleSync(req, res);
-			}
+			handler: guardHandler(handleSync)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/upload`,
-			handler: (req, res) => {
-				handleUpload(req, res);
-			}
+			handler: guardHandler(handleUpload)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/restart`,
-			handler: (req, res) => {
-				handleRestart(req, res);
-			}
+			handler: guardHandler(handleRestart)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/session/summary`,
-			handler: (req, res) => {
-				handleSessionSummary(req, res);
-			}
+			handler: guardHandler(handleSessionSummary)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/agent/sessions`,
-			handler: (req, res) => {
-				handleAgentSessions(req, res);
-			}
+			handler: guardHandler(handleAgentSessions)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/agent/modes`,
-			handler: (req, res) => {
-				handleAgentModes(req, res);
-			}
+			handler: guardHandler(handleAgentModes)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/agent/send`,
-			handler: (req, res) => {
-				handleAgentSend(req, res);
-			}
+			handler: guardHandler(handleAgentSend)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/agent/create`,
-			handler: (req, res) => {
-				handleAgentCreate(req, res);
-			}
+			handler: guardHandler(handleAgentCreate)
 		}),
 		ctx.webServer.register({
 			kind: "prefix",
 			path: `${ROUTE_PREFIX}/api`,
-			handler: (req, res) => {
-				handleApiProxy(req, res);
-			}
+			handler: guardHandler(handleApiProxy)
 		}),
 		ctx.webServer.register({
 			kind: "prefix",
 			path: `${TW_PROXY_PREFIX}`,
-			handler: (req, res) => {
-				handleTwProxy(req, res);
-			}
+			handler: guardHandler(handleTwProxy)
 		})
 	];
 	return () => {
@@ -5005,12 +5102,14 @@ async function readWikiInfo(wikiPath) {
 	} catch {
 		throw new Error("tiddlywiki.info 不是合法 JSON；请先修复该文件再保存设置（已保留原文件）");
 	}
+	if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("tiddlywiki.info 顶层不是对象；请先修复该文件再保存设置（已保留原文件）");
+	const obj = parsed;
 	return {
-		...parsed,
-		description: parsed.description,
-		plugins: Array.isArray(parsed.plugins) ? parsed.plugins : [],
-		themes: Array.isArray(parsed.themes) ? parsed.themes : [],
-		languages: Array.isArray(parsed.languages) ? parsed.languages : []
+		...obj,
+		description: obj.description,
+		plugins: Array.isArray(obj.plugins) ? obj.plugins : [],
+		themes: Array.isArray(obj.themes) ? obj.themes : [],
+		languages: Array.isArray(obj.languages) ? obj.languages : []
 	};
 }
 /**
@@ -5164,6 +5263,73 @@ async function ensureLanguage(wikiPath, twRoot, lang) {
 	await writeWikiInfo(wikiPath, info);
 	return true;
 }
+/**
+* Sentinel returned instead of a stored secret (`bridge.token` /
+* `ui.sendToAgent.token`) by `GET /admin/state` and by `POST /admin/config`'s
+* echo. `/admin/*` is an unauthenticated surface (only CSRF-hardened), and the
+* config tiddler legitimately carries shared tokens — handing them to any
+* caller of the loopback/LAN-reachable GUI is a real leak (v0.19.3). The
+* settings page renders the sentinel verbatim; posting it back is a no-op
+* (`stripMaskedSecrets` drops it), so the real value never leaves the host.
+*/
+const MASKED_SECRET = "********";
+/** Mask secrets (and credentials inside the git remote URL) for an HTTP caller. */
+function maskConfigSecrets(config) {
+	const bridge = config.bridge ?? {};
+	const ui = config.ui ?? {};
+	const sendToAgent = ui.sendToAgent ?? {};
+	const git = config.git ?? {};
+	const maskToken = (value) => typeof value === "string" && value.length > 0 ? MASKED_SECRET : "";
+	return {
+		...config,
+		git: {
+			...git,
+			remote: typeof git.remote === "string" ? redactRemoteUrl(git.remote) : git.remote
+		},
+		bridge: {
+			...bridge,
+			token: maskToken(bridge.token),
+			tokenSet: typeof bridge.token === "string" && bridge.token.length > 0
+		},
+		ui: {
+			...ui,
+			sendToAgent: {
+				...sendToAgent,
+				token: maskToken(sendToAgent.token),
+				tokenSet: typeof sendToAgent.token === "string" && sendToAgent.token.length > 0
+			}
+		}
+	};
+}
+/**
+* Drop the masked placeholders from an incoming config patch so saving the
+* settings page never overwrites a stored secret with `********` (or the
+* redacted git remote with `https://***@…`). `bridge.token`/`ui.sendToAgent.token`
+* are cleared only when the caller actually sends an empty string.
+*/
+function stripMaskedSecrets(patch, current) {
+	const copy = { ...patch };
+	const cleanToken = (container) => {
+		if (typeof container !== "object" || container === null) return container;
+		const obj = { ...container };
+		if (obj.token === "********") delete obj.token;
+		delete obj.tokenSet;
+		return obj;
+	};
+	if (copy.bridge !== void 0) copy.bridge = cleanToken(copy.bridge);
+	if (copy.ui !== void 0) {
+		const ui = typeof copy.ui === "object" && copy.ui !== null ? { ...copy.ui } : copy.ui;
+		if (typeof ui === "object" && ui !== null && ui.sendToAgent !== void 0) ui.sendToAgent = cleanToken(ui.sendToAgent);
+		copy.ui = ui;
+	}
+	if (copy.git !== void 0 && typeof copy.git === "object" && copy.git !== null) {
+		const git = { ...copy.git };
+		const storedRemote = typeof current.git?.remote === "string" ? current.git.remote : "";
+		if (typeof git.remote === "string" && storedRemote.length > 0 && git.remote === redactRemoteUrl(storedRemote)) delete git.remote;
+		copy.git = git;
+	}
+	return copy;
+}
 function registerAdminRoutes(ctx, deps) {
 	const handleState = async (req, res) => {
 		try {
@@ -5193,7 +5359,7 @@ function registerAdminRoutes(ctx, deps) {
 					languages: info.languages ?? []
 				},
 				catalog,
-				config: deps.config.get(),
+				config: maskConfigSecrets(deps.config.get()),
 				git
 			});
 		} catch (err) {
@@ -5221,6 +5387,10 @@ function registerAdminRoutes(ctx, deps) {
 			const catalog = await bundledCatalog(deps.twRoot());
 			const known = new Set([...catalog.plugins, ...catalog.themes].map((c) => c.name));
 			const knownLangs = new Set(catalog.languages.map((c) => c.name));
+			/** Snapshot for the no-op guard below (JSON compare is enough here). */
+			const beforeInfo = JSON.stringify(info);
+			/** Set only when the request carried a themes array with a resolvable active pick. */
+			let activatedTheme;
 			const applyList = (field, raw) => {
 				if (!Array.isArray(raw)) return info[field];
 				const next = [];
@@ -5241,33 +5411,45 @@ function registerAdminRoutes(ctx, deps) {
 				}
 				return next;
 			};
-			info.plugins = applyList("plugins", body.plugins);
-			let activatedTheme;
-			if (Array.isArray(body.themes)) {
-				const themeDeps = {};
-				for (const theme of catalog.themes) if (theme.dependents && theme.dependents.length > 0) themeDeps[theme.name] = theme.dependents;
-				let selected = applyList("themes", body.themes);
-				if (typeof body.themeActive === "string" && body.themeActive.length > 0) {
-					const activeName = body.themeActive;
-					if (known.has(activeName) || info.themes.includes(activeName)) {
-						if (!selected.includes(activeName)) selected.push(activeName);
-						activatedTheme = activeName;
+			try {
+				info.plugins = applyList("plugins", body.plugins);
+				if (Array.isArray(body.themes)) {
+					const themeDeps = {};
+					for (const theme of catalog.themes) if (theme.dependents && theme.dependents.length > 0) themeDeps[theme.name] = theme.dependents;
+					const selected = applyList("themes", body.themes);
+					if (typeof body.themeActive === "string" && body.themeActive.length > 0) {
+						const activeName = body.themeActive;
+						if (known.has(activeName) || info.themes.includes(activeName)) {
+							if (!selected.includes(activeName)) selected.push(activeName);
+							activatedTheme = activeName;
+						}
 					}
-				}
-				info.themes = normalizeThemes(selected, themeDeps);
-				if (activatedTheme === void 0 && info.themes.length > 0) activatedTheme = info.themes[info.themes.length - 1];
-			} else info.themes = applyList("themes", body.themes);
-			if (Array.isArray(body.languages)) info.languages = applyLanguages(body.languages);
-			await writeWikiInfo(wikiPath, info);
-			await deps.server.restart();
-			if (activatedTheme !== void 0) {
+					info.themes = normalizeThemes(selected, themeDeps);
+					if (activatedTheme === void 0 && info.themes.length > 0) activatedTheme = info.themes[info.themes.length - 1];
+				} else info.themes = applyList("themes", body.themes);
+				if (Array.isArray(body.languages)) info.languages = applyLanguages(body.languages);
+			} catch (err) {
+				json(res, {
+					ok: false,
+					error: err instanceof Error ? err.message : String(err)
+				}, 400);
+				return;
+			}
+			const changed = JSON.stringify(info) !== beforeInfo;
+			if (changed) {
+				await writeWikiInfo(wikiPath, info);
+				await deps.server.restart();
+			}
+			if (Array.isArray(body.themes) && activatedTheme !== void 0) {
 				const client = deps.getClient();
 				if (client !== void 0) await client.put({
 					title: "$:/theme",
 					text: `$:/themes/${activatedTheme}`,
 					type: "text/vnd.tiddlywiki",
 					tags: []
-				}).catch(() => void 0);
+				}).catch((err) => {
+					console.warn("[dsh-tiddlywiki] activating theme failed:", err);
+				});
 			}
 			if (Array.isArray(body.languages)) {
 				const client = deps.getClient();
@@ -5279,13 +5461,16 @@ function registerAdminRoutes(ctx, deps) {
 						text: active,
 						type: "text/plain",
 						tags: []
-					}).catch(() => void 0);
+					}).catch((err) => {
+						console.warn("[dsh-tiddlywiki] pinning $:/language failed:", err);
+					});
 					const hint = langs.length > 0 ? langs[0] : "";
 					if ((deps.config.get().uiLanguage ?? "") !== hint) await deps.config.set(client, { uiLanguage: hint }).catch(() => void 0);
 				}
 			}
 			json(res, {
 				ok: true,
+				changed,
 				info: {
 					plugins: info.plugins,
 					themes: info.themes,
@@ -5296,7 +5481,7 @@ function registerAdminRoutes(ctx, deps) {
 			json(res, {
 				ok: false,
 				error: err instanceof Error ? err.message : String(err)
-			}, 400);
+			}, 500);
 		}
 	};
 	const handleConfig = async (req, res) => {
@@ -5311,10 +5496,10 @@ function registerAdminRoutes(ctx, deps) {
 				}, 503);
 				return;
 			}
-			await deps.config.set(client, body);
+			await deps.config.set(client, stripMaskedSecrets(body, deps.config.get()));
 			json(res, {
 				ok: true,
-				config: deps.config.get()
+				config: maskConfigSecrets(deps.config.get())
 			});
 		} catch (err) {
 			json(res, {
@@ -5447,51 +5632,37 @@ function registerAdminRoutes(ctx, deps) {
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/admin/state`,
-			handler: (req, res) => {
-				handleState(req, res);
-			}
+			handler: guardHandler(handleState)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/admin/info`,
-			handler: (req, res) => {
-				handleInfo(req, res);
-			}
+			handler: guardHandler(handleInfo)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/admin/config`,
-			handler: (req, res) => {
-				handleConfig(req, res);
-			}
+			handler: guardHandler(handleConfig)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/admin/restart`,
-			handler: (req, res) => {
-				handleRestart(req, res);
-			}
+			handler: guardHandler(handleRestart)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/admin/seeds`,
-			handler: (req, res) => {
-				handleSeeds(req, res);
-			}
+			handler: guardHandler(handleSeeds)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/admin/seeds/run`,
-			handler: (req, res) => {
-				handleSeedsRun(req, res);
-			}
+			handler: guardHandler(handleSeedsRun)
 		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/admin/seeds/remove`,
-			handler: (req, res) => {
-				handleSeedsRemove(req, res);
-			}
+			handler: guardHandler(handleSeedsRemove)
 		})
 	];
 	return () => {
@@ -5565,8 +5736,16 @@ const PRIVATE_V4_PATTERNS = [
 	/^169\.254\./,
 	/^172\.(1[6-9]|2\d|3[01])\./,
 	/^192\.0\.0\./,
+	/^192\.0\.2\./,
+	/^192\.88\.99\./,
 	/^192\.168\./,
-	/^198\.1[89]\./
+	/^198\.1[89]\./,
+	/^198\.51\.100\./,
+	/^203\.0\.113\./,
+	/^22[4-9]\./,
+	/^23\d\./,
+	/^24\d\./,
+	/^25[0-5]\./
 ];
 /** Parse a dotted-quad IPv4 into 4 bytes, or null. */
 function parseIpv4(input) {
@@ -6045,6 +6224,9 @@ var ClipBridge = class {
 			};
 			const onListening = () => {
 				server.removeListener("error", onError);
+				server.on("error", (err) => {
+					this.deps.log?.(`server error after listen: ${err.message}`);
+				});
 				const addr = server.address();
 				this.boundPort = addr.port;
 				resolve();
@@ -6061,7 +6243,17 @@ var ClipBridge = class {
 		this.boundPort = 0;
 		if (server === void 0) return Promise.resolve();
 		return new Promise((resolve) => {
-			server.close(() => resolve());
+			let done = false;
+			const finish = () => {
+				if (done) return;
+				done = true;
+				resolve();
+			};
+			try {
+				server.closeAllConnections?.();
+			} catch {}
+			server.close(() => finish());
+			setTimeout(finish, 1e3).unref?.();
 		});
 	}
 	respond(res, payload, status = 200) {
@@ -8318,6 +8510,6 @@ function apply(ctx, rawConfig = {}) {
 	}, "dsh-tiddlywiki: host teardown");
 }
 //#endregion
-export { AGENT_WRITTEN_TAG, ALL_ARTICLES_MARKER_TITLE, ALL_ARTICLES_TEXT, ALL_ARTICLES_TITLE, AutoCommitter, CLIP_BRIDGE_BOOKMARKLET, CLIP_BRIDGE_DEFAULT_PORT, CLIP_BRIDGE_DOC_TEXT, CLIP_BRIDGE_DOC_TITLE, CLIP_BRIDGE_DRAG_HREF, CLIP_BRIDGE_MARKER_TITLE, ClipBridge, ConfigStore, DEFAULT_NOTE_TYPE, DOC_NOTE_TAG, DOC_NOTE_TEXT, DOC_NOTE_TITLE, DSH_DOCS_TAG, GitFace, HOME_DEFAULT_TIDDLERS, HOME_INDEX_ITEMS, HOME_INDEX_MARKER_TITLE, HUMAN_EDITED_TAG, MARKDOWN_PLUGIN, MENUBAR_THEME_MARKER_TITLE, MENUBAR_THEME_TEXT, MENUBAR_THEME_TIDDLER, MISSING_TYPE_FILTER, PATH_PREFIX, RENDER_BUNDLE_TEXT, RENDER_MARKER_TITLE, RENDER_PLUGIN_FILE, RENDER_PLUGIN_TITLE, SEED_DEFS, SEND_TO_AGENT_BUNDLE_TEXT, SEND_TO_AGENT_MARKER_TITLE, SEND_TO_AGENT_PLUGIN_TITLE, SESSION_SUMMARY_PREFIX, STARTER_DOCS_ITEMS, STARTER_DOCS_MARKER_TITLE, TEXT_LIST_FILTER, TW_PROXY_PATH, TW_PROXY_PREFIX, TW_WEB_HOST_DEFAULT, TW_WEB_HOST_TIDDLER, TiddlyWebClient, UI_STYLES_MARKER_TITLE, UI_STYLE_ITEMS, WikiServer, WriteConflictError, apply, assertNoConflict, assertPublicImageUrl, buildBinaryTiddler, buildClipTiddler, buildImageNoteTiddler, buildWriteTiddler, bundledCatalog, checkAllSeeds, cleanTiddler, deepMerge, defineTool, downloadClipImage, dshHomePath, ensureLanguage, ensurePlugin, ensureTwWebHost, flattenTiddlerFields, flushPendingWrites, hostAllowed, imageExtensionForMime, inject, isBinaryType, isPrivateAddress, isSafeUrl, name, needsRestartAfterSeeds, normalizeThemes, openInTwEditor, parseClipPayload, pickImageMime, readWikiInfo, registerAdminRoutes, registerRoutes, registerTiddlywikiTools, removeSeedById, resolveClipTitle, resolveTwRoot, runAllSeeds, runSeedById, sanitizeTwFragment, seedAllArticles, seedClipBridge, seedDocNote, seedHomeIndex, seedMenubarTheme, seedRenderRoute, seedSendToAgent, seedStarterDocs, seedUiStyles, unseedClipBridge, waitForFileWrite, writeSessionSummary, writeWikiInfo };
+export { AGENT_WRITTEN_TAG, ALL_ARTICLES_MARKER_TITLE, ALL_ARTICLES_TEXT, ALL_ARTICLES_TITLE, AutoCommitter, CLIP_BRIDGE_BOOKMARKLET, CLIP_BRIDGE_DEFAULT_PORT, CLIP_BRIDGE_DOC_TEXT, CLIP_BRIDGE_DOC_TITLE, CLIP_BRIDGE_DRAG_HREF, CLIP_BRIDGE_MARKER_TITLE, ClipBridge, ConfigStore, DEFAULT_NOTE_TYPE, DOC_NOTE_TAG, DOC_NOTE_TEXT, DOC_NOTE_TITLE, DSH_DOCS_TAG, GitFace, HOME_DEFAULT_TIDDLERS, HOME_INDEX_ITEMS, HOME_INDEX_MARKER_TITLE, HUMAN_EDITED_TAG, MARKDOWN_PLUGIN, MASKED_SECRET, MENUBAR_THEME_MARKER_TITLE, MENUBAR_THEME_TEXT, MENUBAR_THEME_TIDDLER, MISSING_TYPE_FILTER, PATH_PREFIX, RENDER_BUNDLE_TEXT, RENDER_MARKER_TITLE, RENDER_PLUGIN_FILE, RENDER_PLUGIN_TITLE, SEED_DEFS, SEND_TO_AGENT_BUNDLE_TEXT, SEND_TO_AGENT_MARKER_TITLE, SEND_TO_AGENT_PLUGIN_TITLE, SESSION_SUMMARY_PREFIX, STARTER_DOCS_ITEMS, STARTER_DOCS_MARKER_TITLE, TEXT_LIST_FILTER, TW_PROXY_PATH, TW_PROXY_PREFIX, TW_WEB_HOST_DEFAULT, TW_WEB_HOST_TIDDLER, TiddlyWebClient, UI_STYLES_MARKER_TITLE, UI_STYLE_ITEMS, WikiServer, WriteConflictError, apply, assertNoConflict, assertPublicImageUrl, buildBinaryTiddler, buildClipTiddler, buildImageNoteTiddler, buildWriteTiddler, bundledCatalog, checkAllSeeds, cleanTiddler, deepMerge, defineTool, downloadClipImage, dshHomePath, ensureLanguage, ensurePlugin, ensureTwWebHost, escapeInline, flattenTiddlerFields, flushPendingWrites, hostAllowed, imageExtensionForMime, inject, isBinaryType, isPrivateAddress, isSafeUrl, maskConfigSecrets, name, needsRestartAfterSeeds, normalizeThemes, openInTwEditor, parseClipPayload, pickImageMime, readWikiInfo, registerAdminRoutes, registerRoutes, registerTiddlywikiTools, removeSeedById, resolveClipTitle, resolveTwRoot, runAllSeeds, runSeedById, sanitizeTwFragment, seedAllArticles, seedClipBridge, seedDocNote, seedHomeIndex, seedMenubarTheme, seedRenderRoute, seedSendToAgent, seedStarterDocs, seedUiStyles, stripMaskedSecrets, unseedClipBridge, waitForFileWrite, writeSessionSummary, writeWikiInfo };
 
 //# sourceMappingURL=index.js.map