dsh-tiddlywiki 0.7.2 → 0.7.4

package/README.md

@@ -5,6 +5,7 @@
 [![npm](https://img.shields.io/npm/v/dsh-tiddlywiki)](https://www.npmjs.com/package/dsh-tiddlywiki)
 [![license](https://img.shields.io/npm/l/dsh-tiddlywiki)](https://github.com/bbqisbbq/dsh-tiddlywiki/blob/main/LICENSE)
 [![GitHub](https://img.shields.io/github/stars/bbqisbbq/dsh-tiddlywiki)](https://github.com/bbqisbbq/dsh-tiddlywiki)
+[![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
 
 等 Agent 干活的时候，人常是干坐着的——想随手写点什么，又不想切来切去。TiddlyWiki 单文件、纯文本、wiki 语法、自带 git 同步，天生适合**随手写点小东西**。于是把它做成 DSH 原生插件：不用离开当前界面，聊天区右下角就有快速笔记；要正经编辑，弹出 TW 原生编辑器；写下的内容自动进 git，既是知识库也是备份。
 

package/lib/index.js

@@ -949,10 +949,14 @@ function registerRoutes(ctx, deps) {
 		}
 	};
 	/**
-	* POST /dsh-tiddlywiki/agent/create — create (or adopt) one ordinary session,
-	* optionally inside a workspace path. The picker uses it for "new workspace /
-	* new session"; the created session's cwd becomes its workspace. The directory
-	* is materialised so a brand-new workspace actually exists on disk.
+	* POST /dsh-tiddlywiki/agent/create — create (or adopt) one ordinary session
+	* inside a real DSH workspace resolved from the requested path. The picker
+	* uses it for "new workspace / new session": the directory is materialised so
+	* a brand-new workspace actually exists on disk, the path is resolved to its
+	* (idempotent) Workspace, and the session is created with `workspaceId` so it
+	* lands under that workspace in the sidebar. Creating with bare `cwd` instead
+	* would leave the session in the ungrouped bucket even when its working
+	* directory matches an existing workspace path.
 	*/
 	const handleAgentCreate = async (req, res) => {
 		try {
@@ -984,10 +988,24 @@ function registerRoutes(ctx, deps) {
 				}, 503);
 				return;
 			}
+			const ws = deps.getWorkspaceRegistry();
 			if (cwd.length > 0) await mkdir(cwd, { recursive: true });
+			let created;
+			if (cwd.length > 0 && ws !== void 0) {
+				const workspace = await ws.create(cwd);
+				created = await sc.create({ workspaceId: workspace.id });
+				json$1(res, {
+					ok: true,
+					sessionId: created.sessionId,
+					cwd,
+					workspaceId: workspace.id
+				});
+				return;
+			}
+			created = await sc.create({ cwd: cwd.length > 0 ? cwd : void 0 });
 			json$1(res, {
 				ok: true,
-				sessionId: (await sc.create({ cwd: cwd.length > 0 ? cwd : void 0 })).sessionId,
+				sessionId: created.sessionId,
 				cwd: cwd || null
 			});
 		} catch (err) {
@@ -2327,6 +2345,12 @@ function defineTool(options) {
 *
 * @module dsh-tiddlywiki/host/tools
 */
+/**
+* 约定标签：标记「由 Agent 撰写」的笔记。
+* 新建（title 不存在）时由 tiddlywiki_put / tiddlywiki_batch_put 自动补打；
+* 首页据此把这类笔记单独列在「Agent 区块」并从主标签列表排除。
+*/
+const AGENT_WRITTEN_TAG = "agent-written";
 function snippetOf(text, max = 160) {
 	const flat = text.replace(/\s+/g, " ").trim();
 	return flat.length <= max ? flat : `${flat.slice(0, max)}…`;
@@ -2376,6 +2400,20 @@ function rewriteRefs(text, oldTitle, newTitle) {
 		count
 	};
 }
+/**
+* Compute the final tags for a write:
+* - NEW tiddler (created by this tool) → auto-append the agent-written tag,
+*   unless it is a `$:/` system tiddler (config/language/theme internals).
+* - Existing tiddler → keep the caller's tags as-is (an agent maintaining a
+*   human note must NOT silently claim authorship; an already agent-written
+*   note keeps its tag because the caller provides the full tag list).
+*/
+function finalTagsForWrite(title, existing, tags) {
+	if (existing !== void 0) return tags;
+	if (title.startsWith("$:/")) return tags;
+	if (tags.includes("agent-written")) return tags;
+	return [...tags, AGENT_WRITTEN_TAG];
+}
 function registerTiddlywikiTools(ctx, deps) {
 	const disposers = [];
 	const register = (tool) => {
@@ -2584,7 +2622,7 @@ function registerTiddlywikiTools(ctx, deps) {
 	}));
 	register(defineTool({
 		name: "tiddlywiki_put",
-		description: "写入（新建或覆盖）一个 TiddlyWiki tiddler。同名覆盖；tags 为标签数组，fields 为附加自定义字段（json 对象，会写入 tiddler 字段）。写入后触发自动 commit。",
+		description: "写入（新建或覆盖）一个 TiddlyWiki tiddler。同名覆盖；tags 为标签数组，fields 为附加自定义字段（json 对象，会写入 tiddler 字段）。写入后触发自动 commit。新建（title 不存在）时自动补打 agent-written 标签标记「由 Agent 撰写」，无需手动添加。",
 		parameters: {
 			title: {
 				type: "string",
@@ -2624,25 +2662,27 @@ function registerTiddlywikiTools(ctx, deps) {
 		execute: async (args) => {
 			const wiki = deps.wiki();
 			if (wiki === void 0) throw new Error("TiddlyWiki 服务未运行（tiddlywiki_status 可查）");
+			const existing = await wiki.get(args.title).catch(() => void 0);
+			const tags = finalTagsForWrite(args.title, existing, Array.isArray(args.tags) ? args.tags.filter((t) => typeof t === "string" && t.trim().length > 0) : []);
 			const tiddler = {
 				title: args.title,
 				text: args.text
 			};
-			if (Array.isArray(args.tags) && args.tags.length > 0) tiddler.tags = args.tags;
+			if (tags.length > 0) tiddler.tags = tags;
 			if (args.fields !== void 0 && typeof args.fields === "object" && args.fields !== null) Object.assign(tiddler, args.fields);
 			await wiki.put(tiddler);
 			deps.autoCommit();
 			return {
 				ok: true,
 				title: args.title,
-				tags: args.tags ?? [],
+				tags,
 				fields: args.fields ?? null
 			};
 		}
 	}));
 	register(defineTool({
 		name: "tiddlywiki_batch_put",
-		description: "批量写入/覆盖多个 TiddlyWiki tiddler（一次工具调用）。overwrite=false 时跳过已存在的标题；返回逐条结果。写入后触发自动 commit。",
+		description: "批量写入/覆盖多个 TiddlyWiki tiddler（一次工具调用）。overwrite=false 时跳过已存在的标题；返回逐条结果。写入后触发自动 commit。新建（title 不存在）的条目会自动补打 agent-written 标签，无需手动添加。",
 		parameters: {
 			items: {
 				type: "array",
@@ -2706,22 +2746,22 @@ function registerTiddlywikiTools(ctx, deps) {
 			for (const item of list) {
 				if (typeof item.title !== "string" || item.title.length === 0) throw new Error("batch_put: 每条 items 都需要非空 title");
 				if (typeof item.text !== "string") throw new Error(`batch_put: items「${item.title}」缺少 text`);
-				if (!overwrite) {
-					if (await wiki.get(item.title).catch(() => void 0) !== void 0) {
-						skipped++;
-						results.push({
-							title: item.title,
-							written: false,
-							skipped: true
-						});
-						continue;
-					}
+				const existing = await wiki.get(item.title).catch(() => void 0);
+				if (!overwrite && existing !== void 0) {
+					skipped++;
+					results.push({
+						title: item.title,
+						written: false,
+						skipped: true
+					});
+					continue;
 				}
+				const tags = finalTagsForWrite(item.title, existing, Array.isArray(item.tags) ? item.tags.filter((t) => typeof t === "string" && t.trim().length > 0) : []);
 				const tiddler = {
 					title: item.title,
 					text: item.text
 				};
-				if (Array.isArray(item.tags) && item.tags.length > 0) tiddler.tags = item.tags;
+				if (tags.length > 0) tiddler.tags = tags;
 				if (item.fields !== void 0 && typeof item.fields === "object" && item.fields !== null) Object.assign(tiddler, item.fields);
 				await wiki.put(tiddler);
 				written++;
@@ -2806,7 +2846,10 @@ function registerTiddlywikiTools(ctx, deps) {
 					}
 				}
 			}
-			await wiki.put(cleanTiddler(existing));
+			await wiki.put({
+				...cleanTiddler(existing),
+				title: newTitle
+			});
 			await wiki.delete(oldTitle);
 			if (refsTiddlers === 0) warning = "未找到任何其他 tiddler 引用旧标题；如确实需要，可手动补充链接。";
 			deps.autoCommit();
@@ -3179,7 +3222,9 @@ pull 冲突后：先 \`tiddlywiki_git_resolve files=[冲突文件] strategy=keep
 
 把 wiki 当作长期记忆与知识沉淀的地方：会议纪要、决策记录、调研笔记、随手的想法都可存成独立 tiddler（tag 建议用 inbox/meeting/decision 等便于检索）。
 
-用本插件自动创建笔记时，除了业务性 tag 外，请把「当前工作区（项目）的名字」也作为标签之一加上去（例如 \`tiddlywiki_put\` 的 tags 里带上当前 workspace 名），这样笔记能按项目归集、检索。`;
+用本插件自动创建笔记时，除了业务性 tag 外，请把「当前工作区（项目）的名字」也作为标签之一加上去（例如 \`tiddlywiki_put\` 的 tags 里带上当前 workspace 名），这样笔记能按项目归集、检索。
+
+**Agent 笔记标签约定**：\`tiddlywiki_put\` / \`tiddlywiki_batch_put\` 新建笔记时，插件会自动补打 \`agent-written\` 标签（标记「由 Agent 撰写」），无需手动添加，也不要手动移除它（除非用户明确要求）。首页会把 Agent 笔记单独列在「Agent 区块」，主标签列表只统计人类笔记。若某篇 Agent 笔记后续被人类编辑过，请在该笔记上补打 \`human-edited\` 标签，首页会把它归入「Agent + 人工」档。覆盖写入已有的（人类）笔记时不会自动加 agent-written，请保持笔记原本的归属。`;
 /**
 * Mount the host half.
 * @param ctx - the plugin context (tools + systemPrompt injected).
@@ -3332,6 +3377,7 @@ function apply(ctx, rawConfig = {}) {
 	ctx.inject(["webServer"], (webCtx) => {
 		const ws = webCtx.webServer;
 		const getSessionController = () => ctx.get("sessionController");
+		const getWorkspaceRegistry = () => ctx.get("workspaceRegistry");
 		const disposeRoutes = registerRoutes({ webServer: ws }, {
 			server,
 			getClient: client,
@@ -3341,6 +3387,7 @@ function apply(ctx, rawConfig = {}) {
 			uiDefaults: () => effectiveUi(),
 			getWikiPath: () => wikiPath,
 			getSessionController,
+			getWorkspaceRegistry,
 			sendToAgentEnabled: () => eff().ui?.sendToAgent?.enabled !== false,
 			sendToAgentToken: () => {
 				const token = eff().ui?.sendToAgent?.token;
@@ -3370,6 +3417,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, TW_PROXY_PATH, TW_PROXY_PREFIX, TW_WEB_HOST_TIDDLER, TiddlyWebClient, WikiServer, apply, bundledCatalog, deepMerge, defineTool, dshHomePath, ensureLanguage, ensureTwWebHost, inject, name, normalizeThemes, openInTwEditor, readWikiInfo, registerAdminRoutes, registerRoutes, resolveTwRoot, seedDocNote, writeWikiInfo };
+export { AutoCommitter, ConfigStore, DOC_NOTE_TAG, DOC_NOTE_TEXT, DOC_NOTE_TITLE, GitFace, PATH_PREFIX, TW_PROXY_PATH, TW_PROXY_PREFIX, TW_WEB_HOST_TIDDLER, TiddlyWebClient, WikiServer, apply, bundledCatalog, deepMerge, defineTool, dshHomePath, ensureLanguage, ensureTwWebHost, inject, name, normalizeThemes, openInTwEditor, readWikiInfo, registerAdminRoutes, registerRoutes, registerTiddlywikiTools, resolveTwRoot, seedDocNote, writeWikiInfo };
 
 //# sourceMappingURL=index.js.map