dsh-tiddlywiki 0.26.5 → 0.26.7

package/lib/index.js

@@ -2574,10 +2574,40 @@ function rejectCrossSiteWrite(req, res, allowedMethods) {
 	}, 403);
 	return true;
 }
-/** Read-only route guard: GET/HEAD only, no side effects on any other method. */
+/**
+* Read-only route guard: GET/HEAD only, no side effects on any other method. */
 function rejectNonRead(req, res) {
 	return rejectCrossSiteWrite(req, res, ["GET", "HEAD"]);
 }
+/**
+* Absolute loopback base for a same-origin proxy path, from a request's `Host`
+* header (v0.26.7). Returns undefined when the header is unusable, in which
+* case the caller simply omits the absolute twin and clients keep using the
+* relative path.
+*
+* WHY THIS EXISTS: the DSH **desktop** app serves its renderer from the custom
+* `dsh-app:` scheme, and TiddlyWiki's own TiddlyWeb sync adaptor refuses to load
+* on a document whose protocol does not start with `http`
+* (`plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js`:
+* `if($tw.browser && document.location.protocol.substr(0,4) === "http")`).
+* Embedded from `dsh-app://app/…` the wiki therefore had NO sync adaptor:
+* `$:/status/IsReadOnly` was never written, TW's read-only stylesheet (which
+* treats a MISSING status as read-only) hid 添加条目 / 日志 / 导入 / 管理器 /
+* 编辑 …, and the saver fell back to local-only dirty tracking — an edit made
+* there could not be saved either. The client falls back to this absolute URL
+* only while its own document is not on http(s) (see `resolveTwUrl` in
+* `src/client/endpoints.ts`), so http(s) embedders — loopback, LAN, Tailscale,
+* domain, HTTPS — are never moved off their own origin.
+*
+* `http` is deliberate rather than `x-forwarded-proto`: the desktop app's host
+* always listens on plain HTTP loopback, and only a renderer able to reach it
+* ever reads this value.
+*/
+function absoluteHostBase(hostHeader, proxyPath) {
+	const host = typeof hostHeader === "string" ? hostHeader.trim() : Array.isArray(hostHeader) ? String(hostHeader[0] ?? "").trim() : "";
+	if (!/^[A-Za-z0-9.\-[\]:]+$/.test(host)) return void 0;
+	return `http://${host}${proxyPath}`;
+}
 //#endregion
 //#region src/host/sanitize.ts
 /**
@@ -6679,6 +6709,14 @@ function registerRoutes(ctx, deps) {
 	* tags, it cannot know the text is a secret.
 	*/
 	const referencesBlockedTitle = (value) => value !== void 0 && BLOCKED_PROXY_TITLE_PREFIXES.some((prefix) => value.includes(prefix));
+	/**
+	* Absolute twin of `twProxy` for embedders whose own document is not on
+	* http(s) — the DSH desktop app's `dsh-app:` renderer (v0.26.7). See
+	* `absoluteHostBase()` in http.ts for the full why; clients only consult it
+	* while their own page is not http(s), so nothing changes for http(s)
+	* deployments.
+	*/
+	const twProxyAbsoluteBase = (req) => absoluteHostBase(req.headers.host, TW_PROXY_PATH);
 	const handleStatus = async (req, res) => {
 		if (rejectNonRead(req, res)) return;
 		const view = deps.server.status();
@@ -6688,6 +6726,7 @@ function registerRoutes(ctx, deps) {
 			...view,
 			logs: redactLogLines(view.logs),
 			twProxy: TW_PROXY_PATH,
+			twProxyAbsolute: twProxyAbsoluteBase(req),
 			git: gitSummary,
 			note: { tag: deps.noteDefaults().tag },
 			ui: deps.uiDefaults()
@@ -6765,7 +6804,8 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: true,
 				...await pendingSummary,
-				twUrl: TW_PROXY_PATH
+				twUrl: TW_PROXY_PATH,
+				twUrlAbsolute: twProxyAbsoluteBase(req)
 			});
 		} catch (err) {
 			json(res, {
@@ -7186,7 +7226,8 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: true,
 				...result,
-				twUrl: TW_PROXY_PATH
+				twUrl: TW_PROXY_PATH,
+				twUrlAbsolute: twProxyAbsoluteBase(req)
 			});
 		} catch (err) {
 			if (err instanceof WriteConflictError) {
@@ -10316,22 +10357,44 @@ function rewriteRefs(text, oldTitle, newTitle) {
 	};
 }
 /**
-* Insert `addition` at the end of the section introduced by `heading` (Markdown
-* `#`/`##`… or wikitext `!`/`!!`…). Falls back to appending at the end of the
-* document when the heading is not found. Used by tiddlywiki_append so an agent
-* can add to one section of a long note without rewriting the whole file.
+* Insert `addition` into the section introduced by `heading` (Markdown `#`/`##`…
+* or wikitext `!`/`!!`…). Used by tiddlywiki_append so an agent can add to one
+* section of a long note without rewriting the whole file.
+*
+* **落点语义**：插在「该标题之后、**下一个任意级别的标题**之前」。所以当标题后面
+* 紧跟子标题时（`## 4. 定时任务` + `### 槽位表`），内容落在两者**之间**，也就是
+* 「章节开头」而不是「整节末尾」——这一点以前只在 schema 里写成「段落的末尾」，
+* 容易让调用方误会（v0.26.6 起描述与回执都写清楚了）。
+*
+* **返回 `matched`**：`false` = 没找到该标题，文本被追加到**文末**。调用方**必须**
+* 把它透出去（v0.26.6 之前这个回退是静默的，回执照样打「段落「X」」，
+* 于是一次定位失败看起来像成功——Agent 没有任何办法自检）。
+*
+* **CRLF（v0.26.6 修复）**：tiddler 正文可能是 CRLF（Windows 上写的/同步来的笔记），
+* 而 `split('\n')` 会让每行结尾都留着 `\r`。JS 里 `(.*)` 不匹配 `\r`、`$` 也不匹配
+* `\r` 之前的位置，于是 `/^#{1,6}\s+(.*)$/` 对**每一个**标题都匹配失败 ⇒ 所有带
+* `heading` 的 append 都静默落到了文末。**只在 CRLF 笔记上复现**（纯 LF 笔记一切正常），
+* 这就是它像「偶发」的原因。现在只在**匹配时**剥掉行尾 CR，原文行尾一个字节都不动；
+* 并且新块用**文档自己的行尾**写入，避免 CRLF 笔记被越写越乱（混入 LF 块）。
 */
 function insertIntoSection(base, heading, addition) {
 	const lines = base.split("\n");
 	const headingText = (line) => {
-		const md = /^#{1,6}\s+(.*)$/.exec(line);
+		const s = line.replace(/\r$/, "");
+		const md = /^#{1,6}\s+(.*)$/.exec(s);
 		if (md !== null) return (md[1] ?? "").trim();
-		const tw = /^!{1,6}\s*(.*)$/.exec(line);
+		const tw = /^!{1,6}\s*(.*)$/.exec(s);
 		if (tw !== null) return (tw[1] ?? "").trim();
 		return null;
 	};
 	const start = lines.findIndex((line) => headingText(line) === heading);
-	if (start < 0) return base.trim().length === 0 ? addition : `${base.replace(/\s+$/, "")}\n\n${addition}`;
+	const eol = base.includes("\r\n") ? "\r\n" : "\n";
+	const adapt = (s) => eol === "\n" ? s.replace(/\r\n/g, "\n") : s.replace(/\r\n/g, "\n").split("\n").join("\r\n");
+	const block = adapt(addition);
+	if (start < 0) return {
+		text: base.trim().length === 0 ? block : `${base.replace(/\s+$/, "")}${eol}${eol}${block}`,
+		matched: false
+	};
 	let end = lines.length;
 	for (let i = start + 1; i < lines.length; i++) if (headingText(lines[i] ?? "") !== null) {
 		end = i;
@@ -10339,8 +10402,11 @@ function insertIntoSection(base, heading, addition) {
 	}
 	const before = lines.slice(0, end).join("\n").replace(/\s+$/, "");
 	const after = lines.slice(end).join("\n");
-	const head = `${before}\n\n${addition}`;
-	return after.trim().length === 0 ? head : `${head}\n\n${after.replace(/^\s+/, "")}`;
+	const head = `${before}${eol}${eol}${block}`;
+	return {
+		text: after.trim().length === 0 ? head : `${head}${eol}${eol}${after.replace(/^\s+/, "")}`,
+		matched: true
+	};
 }
 function registerTiddlywikiTools(ctx, deps) {
 	const disposers = [];
@@ -11110,7 +11176,7 @@ function registerTiddlywikiTools(ctx, deps) {
 	}));
 	register(defineTool({
 		name: "tiddlywiki_append",
-		description: "向已有 tiddler 追加/前插文本，或写入指定标题段落的末尾（无需先读全文、不会整篇覆盖）——适合日志、批注、清单的增量写入。条目不存在时默认新建（createIfMissing=false 则报错）。**写入既有条目走与 tiddlywiki_put 同一套写策略**：原有 tags、自定义字段与**内容类型**全部保留（不会把 Markdown 笔记改成 wikitext、也不会把 CSS 改成 Markdown）；可用 fields 显式覆盖字段/类型。新建条目未指定内容类型时才默认 text/markdown（并像 tiddlywiki_put 一样自动补 agent-written 与 `ws/<项目名>` 工作区标记）。⚠️ 本工具内部是「读全文 → 整篇回写」，属于覆盖写入：改前请先 `tiddlywiki_get`，并把读到的 `modified` 作为 `expectedModified` 传回（v0.25.0 起支持），否则人类在 TW 编辑器里的并发修改会被静默回滚。",
+		description: "向已有 tiddler 追加/前插文本，或写入指定标题段落的末尾（无需先读全文、不会整篇覆盖）——适合日志、批注、清单的增量写入。条目不存在时默认新建（createIfMissing=false 则报错）。**写入既有条目走与 tiddlywiki_put 同一套写策略**：原有 tags、自定义字段与**内容类型**全部保留（不会把 Markdown 笔记改成 wikitext、也不会把 CSS 改成 Markdown）；可用 fields 显式覆盖字段/类型。新建条目未指定内容类型时才默认 text/markdown（并像 tiddlywiki_put 一样自动补 agent-written 与 `ws/<项目名>` 工作区标记）。⚠️ 本工具内部是「读全文 → 整篇回写」，属于覆盖写入：改前请先 `tiddlywiki_get`，并把读到的 `modified` 作为 `expectedModified` 传回（v0.25.0 起支持），否则人类在 TW 编辑器里的并发修改会被静默回滚。带 `heading` 时返回 `headingMatched`：`false` = 没找到该标题、文本已追加到**文末**（CRLF 行尾的笔记也能正确定位）。",
 		parameters: {
 			title: {
 				type: "string",
@@ -11129,7 +11195,7 @@ function registerTiddlywikiTools(ctx, deps) {
 			},
 			heading: {
 				type: "string",
-				description: "可选：append 时改为插入到该标题（Markdown # 或 wikitext ! 标题，按标题文本匹配）对应段落的末尾"
+				description: "可选：append 时改为写入指定标题的位置（Markdown # 或 wikitext ! 标题，按标题文本匹配、忽略标题级别）。**落点 = 该标题之后、下一个任意级别标题之前**：若该标题后紧跟子标题，内容插在两者之间（即章节开头），**不是整节末尾**。标题不存在时不报错，改为追加到文末，并在回执与返回的 headingMatched=false 里明确说明（别把「没命中」当「写进去了」）"
 			},
 			createIfMissing: {
 				type: "boolean",
@@ -11160,7 +11226,8 @@ function registerTiddlywikiTools(ctx, deps) {
 		},
 		normalizeArgs: normalizeFieldsInArgs,
 		output: { render: (_args, value) => {
-			const lines = [`${value.created ? "已新建并写入" : "已增量写入"} tiddler「${value.title}」（${value.mode}${value.heading !== null ? ` · 段落「${value.heading}」` : ""}）：新增 ${value.added} 字符，现共 ${value.total} 字符。`];
+			const headingNote = value.heading === null ? "" : value.headingMatched === false ? ` · ⚠️ 未找到标题「${value.heading}」，已改为追加到文末` : ` · 段落「${value.heading}」`;
+			const lines = [`${value.created ? "已新建并写入" : "已增量写入"} tiddler「${value.title}」（${value.mode}${headingNote}）：新增 ${value.added} 字符，现共 ${value.total} 字符。`];
 			if (value.type !== null) lines.push(`类型: ${value.type}${value.typeDefaulted === true ? "（新建且未指定，已默认 markdown）" : ""}`);
 			if (value.typeChanged !== void 0) lines.push(`⚠️ 内容类型已从 ${value.typeChanged.from} 改为 ${value.typeChanged.to}`);
 			if (value.workspace !== void 0) lines.push(`已自动标记工作区: ws/${value.workspace}（字段 ${WORKSPACE_FIELD}）`);
@@ -11184,8 +11251,12 @@ function registerTiddlywikiTools(ctx, deps) {
 			const base = existing?.text ?? "";
 			const addition = args.text;
 			let next;
-			if (mode === "append" && typeof args.heading === "string" && args.heading.trim().length > 0) next = insertIntoSection(base, args.heading.trim(), addition);
-			else if (mode === "prepend") next = base.trim().length === 0 ? addition : `${addition}\n\n${base}`;
+			let headingMatched;
+			if (mode === "append" && typeof args.heading === "string" && args.heading.trim().length > 0) {
+				const placed = insertIntoSection(base, args.heading.trim(), addition);
+				next = placed.text;
+				headingMatched = placed.matched;
+			} else if (mode === "prepend") next = base.trim().length === 0 ? addition : `${addition}\n\n${base}`;
 			else next = base.trim().length === 0 ? addition : `${base.replace(/\s+$/, "")}\n\n${addition}`;
 			const appendMarked = existing === void 0 && !title.startsWith("$:/") ? withWorkspaceMark(workspaceMarkFor(deps, exec), normalizeTagArg(args.tags), args.fields) : {
 				tags: normalizeTagArg(args.tags),
@@ -11203,6 +11274,7 @@ function registerTiddlywikiTools(ctx, deps) {
 				title,
 				mode,
 				heading: mode === "append" && typeof args.heading === "string" && args.heading.trim().length > 0 ? args.heading.trim() : null,
+				...headingMatched !== void 0 ? { headingMatched } : {},
 				created: existing === void 0,
 				added: addition.length,
 				total: next.length,