dsh-tiddlywiki 0.7.2 → 0.7.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-tiddlywiki",
   "description": "TiddlyWiki 5 as the DSH persistent knowledge base: tiddlywiki_* agent tools (search with filters/recent/tags/batch/rename + git sync & conflict resolve), a full TiddlyWiki editor embedded in the GUI center column (same-origin proxy, works over Tailscale/LAN/domain), a quick-note card with draft auto-save & recent-notes picker behind a single knowledge FAB, and git-based sync with auto-commit. Mounts via the official dsh plugin system — no DSH source changes.",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "type": "module",
   "keywords": [
     "dsh",
@@ -48,7 +48,7 @@
   "homepage": "https://github.com/bbqisbbq/dsh-tiddlywiki#readme",
   "repository": {
     "type": "git",
-    "url": "https://github.com/bbqisbbq/dsh-tiddlywiki.git"
+    "url": "git+https://github.com/bbqisbbq/dsh-tiddlywiki.git"
   },
   "bugs": {
     "url": "https://github.com/bbqisbbq/dsh-tiddlywiki/issues"

package/src/host/routes.ts

@@ -73,6 +73,16 @@ export interface SessionControllerFace {
   create(request: { cwd?: string; workspaceId?: string }): Promise<{ sessionId: string }>
 }
 
+/**
+ * Structural face over the DSH `workspaceRegistry` service (a subset of
+ * dsh-workspace). Only what the agent-create route needs is declared; the
+ * runtime instance is a real Service, never inspected data.
+ */
+export interface WorkspaceRegistryFace {
+  /** Resolve or create the workspace owning `path` — idempotent by canonical path. */
+  create(path: string, title?: string): Promise<{ id: string; path: string }>
+}
+
 /** Effective UI visibility flags returned by /status (mirror index.ts). */
 export interface UiDefaultsPublic {
   showQuickNote: boolean
@@ -91,6 +101,10 @@ export interface RouteDeps {
   /** Optional DSH sessionController service (agent-send routes only); resolved
    *  lazily per request because it may register after webServer appears. */
   getSessionController: () => SessionControllerFace | undefined
+  /** Optional DSH workspaceRegistry service (agent-create route); resolves a
+   *  cwd to a real Workspace so new sessions land inside it instead of the
+   *  ungrouped bucket. */
+  getWorkspaceRegistry: () => WorkspaceRegistryFace | undefined
   /** Whether the one-click send-to-agent feature is enabled (config switch). */
   sendToAgentEnabled: () => boolean
   /** Optional shared token that must match `x-send-to-agent-token` when set. */
@@ -334,10 +348,14 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
   }
 
   /**
-   * 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: IncomingMessage, res: ServerResponse): Promise<void> => {
     try {
@@ -361,10 +379,18 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
         json(res, { ok: false, error: 'session service unavailable' }, 503)
         return
       }
+      const ws = deps.getWorkspaceRegistry()
       if (cwd.length > 0) {
         await mkdir(cwd, { recursive: true })
       }
-      const created = await sc.create({ cwd: cwd.length > 0 ? cwd : undefined })
+      let created: { sessionId: string }
+      if (cwd.length > 0 && ws !== undefined) {
+        const workspace = await ws.create(cwd)
+        created = await sc.create({ workspaceId: workspace.id })
+        json(res, { ok: true, sessionId: created.sessionId, cwd, workspaceId: workspace.id })
+        return
+      }
+      created = await sc.create({ cwd: cwd.length > 0 ? cwd : undefined })
       json(res, { ok: true, sessionId: created.sessionId, cwd: cwd || null })
     } catch (err) {
       json(res, { ok: false, error: err instanceof Error ? err.message : String(err) }, 500)

package/src/host/tools.ts

@@ -18,6 +18,19 @@ import { defineTool } from '../sdk.ts'
 import type { TiddlyWebClient, Tiddler } from './tw-api.ts'
 import type { GitFace } from './git.ts'
 
+/**
+ * 约定标签：标记「由 Agent 撰写」的笔记。
+ * 新建（title 不存在）时由 tiddlywiki_put / tiddlywiki_batch_put 自动补打；
+ * 首页据此把这类笔记单独列在「Agent 区块」并从主标签列表排除。
+ */
+export const AGENT_WRITTEN_TAG = 'agent-written'
+
+/**
+ * 约定标签：标记「Agent 撰写后又经人类编辑」的笔记（双标签分级第二档）。
+ * 人类在编辑某篇 Agent 笔记时手动补打，首页把这类笔记归入「Agent + 人工」档。
+ */
+export const HUMAN_EDITED_TAG = 'human-edited'
+
 /** Structural tool-registry face (subset of the dsh tools service). */
 export interface ToolsCtx {
   tools: { register(tool: unknown): () => void }
@@ -83,6 +96,21 @@ function rewriteRefs(text: string, oldTitle: string, newTitle: string): { text:
   return { text: out, 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: string, existing: Tiddler | undefined, tags: string[]): string[] {
+  if (existing !== undefined) return tags
+  if (title.startsWith('$:/')) return tags
+  if (tags.includes(AGENT_WRITTEN_TAG)) return tags
+  return [...tags, AGENT_WRITTEN_TAG]
+}
+
 export function registerTiddlywikiTools(ctx: ToolsCtx, deps: ToolsDeps): Array<() => void> {
   const disposers: Array<() => void> = []
   const register = (tool: unknown): void => { disposers.push(ctx.tools.register(tool)) }
@@ -227,7 +255,7 @@ export function registerTiddlywikiTools(ctx: ToolsCtx, deps: ToolsDeps): Array<(
   // ── tiddlywiki_put ───────────────────────────────────────────────────────
   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', description: 'tiddler 标题（精确匹配，覆盖同名）', required: true },
       text: { type: 'string', description: 'tiddler 全文（wiki 文本）', required: true },
@@ -249,19 +277,21 @@ export function registerTiddlywikiTools(ctx: ToolsCtx, deps: ToolsDeps): Array<(
     execute: async (args: { title: string; text: string; tags?: string[]; fields?: Record<string, unknown> }): Promise<PutResult> => {
       const wiki = deps.wiki()
       if (wiki === undefined) throw new Error('TiddlyWiki 服务未运行（tiddlywiki_status 可查）')
+      const existing = await wiki.get(args.title).catch(() => undefined)
+      const tags = finalTagsForWrite(args.title, existing, Array.isArray(args.tags) ? args.tags.filter((t) => typeof t === 'string' && t.trim().length > 0) : [])
       const tiddler: 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 !== undefined && 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 ?? [], fields: args.fields ?? null }
+      return { ok: true, title: args.title, tags, fields: args.fields ?? null }
     },
   }))
 
   // ── tiddlywiki_batch_put ─────────────────────────────────────────────────
   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',
@@ -301,16 +331,15 @@ export function registerTiddlywikiTools(ctx: ToolsCtx, deps: ToolsDeps): Array<(
       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) {
-          const existing = await wiki.get(item.title).catch(() => undefined)
-          if (existing !== undefined) {
-            skipped++
-            results.push({ title: item.title, written: false, skipped: true })
-            continue
-          }
+        const existing = await wiki.get(item.title).catch(() => undefined)
+        if (!overwrite && existing !== undefined) {
+          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: 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 !== undefined && typeof item.fields === 'object' && item.fields !== null) Object.assign(tiddler, item.fields)
         await wiki.put(tiddler)
         written++
@@ -366,7 +395,7 @@ export function registerTiddlywikiTools(ctx: ToolsCtx, deps: ToolsDeps): Array<(
           }
         }
       }
-      await wiki.put(cleanTiddler(existing))
+      await wiki.put({ ...cleanTiddler(existing), title: newTitle })
       await wiki.delete(oldTitle)
       if (refsTiddlers === 0) {
         warning = '未找到任何其他 tiddler 引用旧标题；如确实需要，可手动补充链接。'

package/src/index.ts

@@ -22,7 +22,7 @@ import { watch, type FSWatcher } from 'node:fs'
 import { writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { AutoCommitter, GitFace } from './host/git.ts'
-import { registerRoutes, type SessionControllerFace, type WebServerFace } from './host/routes.ts'
+import { registerRoutes, type SessionControllerFace, type WebServerFace, type WorkspaceRegistryFace } from './host/routes.ts'
 import { ConfigStore, deepMerge, type PluginConfigShape } from './host/config.ts'
 import { registerAdminRoutes, ensureLanguage, resolveTwRoot, type AdminDeps } from './host/admin.ts'
 import { seedDocNote, DOC_NOTE_TITLE } from './host/seed-notes.ts'
@@ -43,6 +43,7 @@ export { ConfigStore, deepMerge } from './host/config.ts'
 export { openInTwEditor, registerRoutes } from './host/routes.ts'
 export { registerAdminRoutes, resolveTwRoot, readWikiInfo, writeWikiInfo, bundledCatalog, ensureLanguage, normalizeThemes } from './host/admin.ts'
 export { seedDocNote, DOC_NOTE_TITLE, DOC_NOTE_TAG, DOC_NOTE_TEXT } from './host/seed-notes.ts'
+export { registerTiddlywikiTools } from './host/tools.ts'
 export type { PluginConfigShape } from './host/config.ts'
 export type { GitStatusView } from './host/git.ts'
 export type { Tiddler } from './host/tw-api.ts'
@@ -182,7 +183,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.
@@ -358,6 +361,8 @@ export function apply(ctx: HostCtx, rawConfig: TiddlywikiConfig = {}): void {
     // agent routes must work whenever a request actually arrives.
     const getSessionController = (): SessionControllerFace | undefined =>
       ctx.get('sessionController') as SessionControllerFace | undefined
+    const getWorkspaceRegistry = (): WorkspaceRegistryFace | undefined =>
+      ctx.get('workspaceRegistry') as WorkspaceRegistryFace | undefined
     const disposeRoutes = registerRoutes({ webServer: ws }, {
       server,
       getClient: client,
@@ -367,6 +372,7 @@ export function apply(ctx: HostCtx, rawConfig: TiddlywikiConfig = {}): void {
       uiDefaults: () => effectiveUi(),
       getWikiPath: () => wikiPath,
       getSessionController,
+      getWorkspaceRegistry,
       sendToAgentEnabled: () => eff().ui?.sendToAgent?.enabled !== false,
       sendToAgentToken: () => {
         const token = eff().ui?.sendToAgent?.token