dsh-tiddlywiki 0.2.1 → 0.3.1

package/lib/index.js

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import { existsSync, watch } from "node:fs";
-import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
-import { dirname, join, resolve } from "node:path";
+import { access, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
+import { basename, dirname, extname, join, resolve } from "node:path";
 import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
 import { createServer } from "node:net";
@@ -199,8 +199,16 @@ var GitFace = class {
 			...behind !== void 0 ? { behind } : {}
 		};
 	}
-	/** `git pull --rebase --autostash`; on conflict: abort + report files. */
+	/** `git pull --rebase --autostash`; on conflict: abort + report files.
+	*  On success, `changed: true` means HEAD actually moved (files came in /
+	*  commits were replayed) — callers use it to decide whether a running TW
+	*  child needs a restart to drop its stale in-memory snapshot. */
 	async pull(dir) {
+		const before = await this.exec(["rev-parse", "HEAD"], {
+			cwd: dir,
+			timeout: QUICK_TIMEOUT_MS
+		});
+		const beforeHead = before.ok ? before.stdout.trim() : "";
 		const r = await this.exec([
 			"pull",
 			"--rebase",
@@ -209,10 +217,19 @@ var GitFace = class {
 			cwd: dir,
 			timeout: HEAVY_TIMEOUT_MS
 		});
-		if (r.ok) return {
-			ok: true,
-			message: r.stdout.trim() || "pull ok"
-		};
+		if (r.ok) {
+			const after = await this.exec(["rev-parse", "HEAD"], {
+				cwd: dir,
+				timeout: QUICK_TIMEOUT_MS
+			});
+			const afterHead = after.ok ? after.stdout.trim() : "";
+			const changed = beforeHead.length > 0 && beforeHead !== afterHead;
+			return {
+				ok: true,
+				message: r.stdout.trim() || "pull ok",
+				...changed ? { changed: true } : {}
+			};
+		}
 		const conflictFiles = await this.unmergedFiles(dir);
 		await this.exec(["rebase", "--abort"], {
 			cwd: dir,
@@ -621,6 +638,12 @@ const ROUTE_PREFIX = PATH_PREFIX;
 const MAX_BODY_BYTES = 2 * 1024 * 1024;
 /** Max passthrough body (tiddler content can be large). */
 const MAX_PROXY_BODY_BYTES = 16 * 1024 * 1024;
+/** Max uploaded file body. */
+const MAX_UPLOAD_BYTES = 64 * 1024 * 1024;
+/** Tiddler type for quick-notes: Markdown, so the uploaded images/links and
+*  any Markdown in the note actually render in TW (a type-less tiddler is
+*  treated as plain wiki text and shows raw `![..]`/`[..]` instead). */
+const NOTE_TYPE = "text/markdown";
 function readBody$1(req, limit = MAX_BODY_BYTES) {
 	return new Promise((resolveP, rejectP) => {
 		let size = 0;
@@ -638,6 +661,35 @@ function readBody$1(req, limit = MAX_BODY_BYTES) {
 		req.on("error", rejectP);
 	});
 }
+/** Read a raw (binary-safe) request body up to `limit` bytes. */
+function readBodyBuffer(req, limit = MAX_UPLOAD_BYTES) {
+	return new Promise((resolveP, rejectP) => {
+		let size = 0;
+		const chunks = [];
+		req.on("data", (chunk) => {
+			size += chunk.length;
+			if (size > limit) {
+				rejectP(/* @__PURE__ */ new Error("file too large"));
+				req.destroy();
+				return;
+			}
+			chunks.push(chunk);
+		});
+		req.on("end", () => resolveP(Buffer.concat(chunks)));
+		req.on("error", rejectP);
+	});
+}
+/**
+* Sanitize an uploaded filename into a safe bare name (no path separators,
+* no `..`, no control characters). Returns '' when nothing usable remains.
+*/
+function sanitizeUploadName(input) {
+	if (typeof input !== "string") return "";
+	const name = basename(input.trim().replace(/[\\/]+/g, "/")).replace(/[\u0000-\u001f\u007f]/g, "").replace(/[<>:"|?*]/g, "_").replace(/^\.+/, "").trim();
+	if (name.length === 0 || name === "." || name === "..") return "";
+	if (name.length > 160) return name.slice(0, 160);
+	return name;
+}
 function json$1(res, payload, status = 200) {
 	const body = JSON.stringify(payload);
 	res.writeHead(status, {
@@ -655,16 +707,20 @@ function timestampTitle(date = /* @__PURE__ */ new Date()) {
 }
 /**
 * Open a tiddler in TW's NATIVE editor: save the tiddler (when text is
-* non-empty), reuse or create a DRAFT tiddler carrying `draft.of`/`draft.title`
-* (TW's story view renders drafts with the EditTemplate — list.js:
-* `isDraft && editTemplate`), and return the draft title so the client can
-* navigate the panel iframe to `#<draftTitle>`.
+* non-empty) as Markdown, reuse or create a DRAFT tiddler carrying
+* `draft.of`/`draft.title` (TW's story view renders drafts with the
+* EditTemplate — list.js: `isDraft && editTemplate`), and return the draft
+* title so the client can navigate the panel iframe to `#<draftTitle>`.
+* The draft carries the same `text/markdown` type as the note so saving it in
+* TW keeps Markdown (a draft without a matching type would overwrite the
+* note's type back to plain wiki text).
 */
 async function openInTwEditor(client, title, text, tags) {
 	if (text.trim().length > 0) await client.put({
 		title,
 		text,
-		tags
+		tags,
+		type: NOTE_TYPE
 	});
 	let draftText = text;
 	if (draftText.trim().length === 0) draftText = (await client.get(title))?.text ?? "";
@@ -682,7 +738,7 @@ async function openInTwEditor(client, title, text, tags) {
 		text: draftText,
 		"draft.of": title,
 		"draft.title": title,
-		type: "text/vnd.tiddlywiki"
+		type: NOTE_TYPE
 	});
 	return {
 		title,
@@ -740,7 +796,8 @@ function registerRoutes(ctx, deps) {
 			await client.put({
 				title,
 				text,
-				tags
+				tags,
+				type: NOTE_TYPE
 			});
 			deps.autoCommit();
 			json$1(res, {
@@ -748,7 +805,8 @@ function registerRoutes(ctx, deps) {
 				title,
 				tag: tags.join(" "),
 				tags,
-				text
+				text,
+				type: NOTE_TYPE
 			});
 		} catch (err) {
 			json$1(res, {
@@ -823,6 +881,120 @@ function registerRoutes(ctx, deps) {
 			}, 500);
 		}
 	};
+	/** One-click git sync for the floating button / settings page: pull →
+	*  commit → push, then return the fresh status. Mirrors the agent tool's
+	*  `action=sync` (design doc §7 conflict policy — rebase conflict aborts).
+	*  When the pull actually changed the working tree, the running TW child
+	*  still holds the old in-memory snapshot — restart it (same port) so the
+	*  UI reflects the pulled files instead of looking stale. */
+	const handleSync = async (_req, res) => {
+		const dir = deps.getWikiPath();
+		const status = async () => {
+			try {
+				return await deps.git.status(dir);
+			} catch {
+				return null;
+			}
+		};
+		try {
+			const pulled = await deps.git.pull(dir);
+			if (!pulled.ok) {
+				json$1(res, {
+					ok: false,
+					action: "sync",
+					message: pulled.message,
+					...pulled.conflictFiles !== void 0 ? { conflictFiles: pulled.conflictFiles } : {},
+					status: await status()
+				}, 409);
+				return;
+			}
+			let restarted = false;
+			let restartError;
+			if (pulled.changed === true) try {
+				await deps.server.restart();
+				restarted = true;
+			} catch (err) {
+				restartError = err instanceof Error ? err.message : String(err);
+			}
+			const committed = await deps.git.commit(dir, `sync ${(/* @__PURE__ */ new Date()).toISOString()}`);
+			const pushed = await deps.git.push(dir);
+			const fresh = await status();
+			json$1(res, {
+				ok: pushed.ok,
+				action: "sync",
+				message: pushed.ok ? "同步完成" : pushed.message,
+				pull: "ok",
+				...pulled.changed === true ? { changed: true } : {},
+				restarted,
+				...restartError !== void 0 ? { restartError } : {},
+				commit: committed.message,
+				push: pushed.message,
+				status: fresh,
+				lastSync: (/* @__PURE__ */ new Date()).toISOString()
+			}, pushed.ok ? 200 : 502);
+		} catch (err) {
+			json$1(res, {
+				ok: false,
+				error: err instanceof Error ? err.message : String(err)
+			}, 500);
+		}
+	};
+	/**
+	* Save an uploaded file into the wiki's `files/` folder (git-tracked; TW's
+	* core server serves it at `/files/<name>`, get-file.js — no restart
+	* needed). Body is the raw file; the name arrives in `X-Filename`. A
+	* collision appends `-1`, `-2`, … so nothing is ever overwritten.
+	*/
+	const handleUpload = async (req, res) => {
+		try {
+			const buf = await readBodyBuffer(req);
+			let name = sanitizeUploadName(new URL(req.url ?? "/", "http://127.0.0.1").searchParams.get("name") ?? "");
+			if (name.length === 0 && typeof req.headers["x-filename"] === "string") {
+				let decoded = "";
+				try {
+					decoded = decodeURIComponent(req.headers["x-filename"]);
+				} catch {
+					decoded = req.headers["x-filename"];
+				}
+				name = sanitizeUploadName(decoded);
+			}
+			if (name.length === 0) {
+				json$1(res, {
+					ok: false,
+					error: "missing or invalid filename"
+				}, 400);
+				return;
+			}
+			const filesDir = join(deps.getWikiPath(), "files");
+			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++) {
+				try {
+					await access(join(filesDir, candidate));
+				} catch {
+					break;
+				}
+				candidate = `${stem}-${i}${ext}`;
+			}
+			await writeFile(join(filesDir, candidate), buf);
+			deps.autoCommit();
+			json$1(res, {
+				ok: true,
+				name: candidate,
+				path: `files/${candidate}`,
+				url: `/files/${encodeURIComponent(candidate)}`,
+				size: buf.length,
+				type: req.headers["content-type"] ?? "application/octet-stream"
+			});
+		} catch (err) {
+			json$1(res, {
+				ok: false,
+				error: err instanceof Error ? err.message : String(err)
+			}, err instanceof Error && /too large/.test(err.message) ? 413 : 500);
+		}
+	};
 	/** Passthrough /dsh-tiddlywiki/api/<rest> → TW root /<rest>. */
 	const handleApiProxy = async (req, res) => {
 		if (deps.getClient() === void 0) {
@@ -889,6 +1061,20 @@ function registerRoutes(ctx, deps) {
 				handleTags(req, res);
 			}
 		}),
+		ctx.webServer.register({
+			kind: "exact",
+			path: `${ROUTE_PREFIX}/sync`,
+			handler: (req, res) => {
+				handleSync(req, res);
+			}
+		}),
+		ctx.webServer.register({
+			kind: "exact",
+			path: `${ROUTE_PREFIX}/upload`,
+			handler: (req, res) => {
+				handleUpload(req, res);
+			}
+		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/restart`,
@@ -1888,14 +2074,27 @@ function registerTiddlywikiTools(ctx, deps) {
 		},
 		execute: async (args) => {
 			const dir = deps.wikiPath();
+			/** Restart TW after a pull that changed the tree (stale snapshot drop). */
+			const restartIfChanged = async (pulled) => {
+				if (pulled.changed !== true || deps.restartWiki === void 0) return {};
+				try {
+					await deps.restartWiki();
+					return { restarted: true };
+				} catch (err) {
+					return { restartError: err instanceof Error ? err.message : String(err) };
+				}
+			};
 			switch (args.action) {
 				case "pull": {
 					const r = await deps.git.pull(dir);
+					const restart = await restartIfChanged(r);
 					return {
 						action: args.action,
 						ok: r.ok,
 						message: r.message,
-						...r.conflictFiles !== void 0 ? { conflictFiles: r.conflictFiles } : {}
+						...r.conflictFiles !== void 0 ? { conflictFiles: r.conflictFiles } : {},
+						...r.changed === true ? { changed: true } : {},
+						...restart
 					};
 				}
 				case "push": {
@@ -1914,6 +2113,7 @@ function registerTiddlywikiTools(ctx, deps) {
 						message: pulled.message,
 						...pulled.conflictFiles !== void 0 ? { conflictFiles: pulled.conflictFiles } : {}
 					};
+					const restart = await restartIfChanged(pulled);
 					const committed = await deps.git.commit(dir, args.message ?? `sync ${(/* @__PURE__ */ new Date()).toISOString()}`);
 					const pushed = await deps.git.push(dir);
 					const status = await deps.git.status(dir);
@@ -1922,6 +2122,8 @@ function registerTiddlywikiTools(ctx, deps) {
 						ok: pushed.ok,
 						message: pushed.ok ? "同步完成" : pushed.message,
 						pull: "ok",
+						...pulled.changed === true ? { changed: true } : {},
+						...restart,
 						commit: committed.message,
 						push: pushed.message,
 						status
@@ -1942,6 +2144,8 @@ function renderSync(value) {
 	}
 	if (value.commit !== void 0) lines.push(`本地 commit: ${value.commit}`);
 	if (value.push !== void 0) lines.push(`远端 push: ${value.push}`);
+	if (value.changed === true) lines.push(value.restarted === true ? "本次 pull 拉取了新内容，TW 服务已自动重启（同端口），读取/搜索均为最新快照。" : "本次 pull 拉取了新内容，但 TW 服务未能自动重启（如需最新快照，请手动重启 TW）。");
+	if (value.restartError !== void 0) lines.push(`TW 重启失败: ${value.restartError}`);
 	if (value.status !== void 0) {
 		const s = value.status;
 		const bits = [`分支 ${s.branch}`];
@@ -1996,7 +2200,8 @@ const DEFAULTS = {
 	note: { tag: "inbox" },
 	ui: {
 		showQuickNote: true,
-		showPanelStatus: true
+		showPanelStatus: true,
+		showSyncButton: true
 	},
 	auth: {
 		username: "",
@@ -2051,7 +2256,9 @@ const PROMPT_TEXT = `## TiddlyWiki 持久知识库
 2. 收工 commit + push：\`tiddlywiki_git_sync action=sync\`（pull → commit → push）。
 3. 插件会自动防抖 commit（默认 60s），手动同步用上面的工具。
 
-把 wiki 当作长期记忆与知识沉淀的地方：会议纪要、决策记录、调研笔记、随手的想法都可存成独立 tiddler（tag 建议用 inbox/meeting/decision 等便于检索）。`;
+把 wiki 当作长期记忆与知识沉淀的地方：会议纪要、决策记录、调研笔记、随手的想法都可存成独立 tiddler（tag 建议用 inbox/meeting/decision 等便于检索）。
+
+用本插件自动创建笔记时，除了业务性 tag 外，请把「当前工作区（项目）的名字」也作为标签之一加上去（例如 \`tiddlywiki_put\` 的 tags 里带上当前 workspace 名），这样笔记能按项目归集、检索。`;
 /**
 * Mount the host half.
 * @param ctx - the plugin context (tools + systemPrompt injected).
@@ -2093,7 +2300,8 @@ function apply(ctx, rawConfig = {}) {
 	};
 	const effectiveUi = () => ({
 		showQuickNote: eff().ui?.showQuickNote !== false,
-		showPanelStatus: eff().ui?.showPanelStatus !== false
+		showPanelStatus: eff().ui?.showPanelStatus !== false,
+		showSyncButton: eff().ui?.showSyncButton !== false
 	});
 	const disposers = [];
 	const disposeAll = () => {
@@ -2159,7 +2367,10 @@ function apply(ctx, rawConfig = {}) {
 		git,
 		wikiPath: () => wikiPath,
 		noteTag: effectiveNoteTag,
-		autoCommit: () => committer?.touch()
+		autoCommit: () => committer?.touch(),
+		restartWiki: async () => {
+			await server.restart();
+		}
 	};
 	disposers.push(...registerTiddlywikiTools(ctx, toolsDeps));
 	(async () => {
@@ -2221,6 +2432,6 @@ function apply(ctx, rawConfig = {}) {
 	}, "dsh-tiddlywiki: host teardown");
 }
 //#endregion
-export { AutoCommitter, ConfigStore, DOC_NOTE_TAG, DOC_NOTE_TEXT, DOC_NOTE_TITLE, GitFace, PATH_PREFIX, TiddlyWebClient, WikiServer, apply, bundledCatalog, deepMerge, defineTool, dshHomePath, ensureLanguage, inject, name, normalizeThemes, openInTwEditor, readWikiInfo, registerAdminRoutes, resolveTwRoot, seedDocNote, writeWikiInfo };
+export { AutoCommitter, ConfigStore, DOC_NOTE_TAG, DOC_NOTE_TEXT, DOC_NOTE_TITLE, GitFace, PATH_PREFIX, TiddlyWebClient, WikiServer, apply, bundledCatalog, deepMerge, defineTool, dshHomePath, ensureLanguage, inject, name, normalizeThemes, openInTwEditor, readWikiInfo, registerAdminRoutes, registerRoutes, resolveTwRoot, seedDocNote, writeWikiInfo };
 
 //# sourceMappingURL=index.js.map