dsh-tiddlywiki 0.28.2 → 0.28.4

package/src/client/styles.ts

@@ -23,7 +23,20 @@ const CSS_TEXT = `
   cursor: pointer; text-align: left;
 }
 .dsh-tw-entry:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,.12)); color: var(--dsw-alias-label-primary, inherit); }
+/* 每库自定义图标（v0.28.4）：emoji 走 textContent，尺寸与 SVG 图标对齐。 */
+.dsh-tw-entry-icon.dsh-tw-entry-emoji {
+  display: inline-flex; align-items: center; justify-content: center;
+  width: 14px; height: 14px; font-size: 13px; line-height: 1;
+}
+.dsh-tw-settings-icon-select {
+  border: 1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.18));
+  background: var(--dsw-alias-bg-layer-2, #fff); color: inherit; font: inherit; font-size: 12px;
+  padding: 3px 8px; border-radius: 999px; max-width: 180px;
+}
 .dsh-tw-entry[data-active="true"] { background: var(--dsw-alias-interactive-bg-active, rgba(128,128,128,.18)); color: var(--dsw-alias-label-primary, inherit); font-weight: 500; }
+/* 多库（v0.28.2）：每库一个入口行，当前焦点库加一条左侧标线，和「面板正打开哪个库」区分开
+   —— 面板是同一个，但焦点库决定它加载谁。 */
+.dsh-tw-entry[data-focus="true"] { box-shadow: inset 2px 0 0 0 var(--dsw-alias-brand-primary, #3e63dd); }
 .dsh-tw-entry svg { flex: none; }
 .dsh-tw-entry .dsh-tw-entry-label { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 /* Collapsed rail: the shell narrows the sidebar to a 56px icon rail (dual
@@ -501,8 +514,13 @@ html[data-dsh-tw-active] .dshDesktopConversationSurface > :not([data-dsh-tw-view
 /* ── 会话级知识库选择器（v0.28.0，同一个 conversation.input.dock 槽位）──
    与快速笔记按钮同区、纵向 flex 排列；只在"多于一个可见库"时渲染（组件自己返回
    null），所以单库安装这一整块都不存在。 */
+/* ── 会话级知识库选择器（v0.28.0，同一个 conversation.input.dock 槽位）──
+   与快速笔记按钮同区、纵向 flex 排列；只在"多于一个可见库"时渲染（组件自己返回
+   null），所以单库安装这一整块都不存在。
+   justify-content: flex-end 与 JS 测得的 paddingRight 一起把右缘对齐 composer
+   输入框（见 client/dock-align.ts）—— 与 .dsh-tw-dock-note 同一套做法。 */
 .dsh-tw-scope-dock {
-  display: flex; align-items: center; gap: 8px; flex-wrap: wrap;
+  display: flex; align-items: center; justify-content: flex-end; gap: 8px; flex-wrap: wrap;
   padding: 4px 8px 0; box-sizing: border-box; width: 100%; font-size: 12px;
 }
 .dsh-tw-scope-label { opacity: .7; }
@@ -515,6 +533,11 @@ html[data-dsh-tw-active] .dshDesktopConversationSurface > :not([data-dsh-tw-view
 .dsh-tw-scope-note { opacity: .75; }
 /* 快速笔记卡片的目标库选择（v0.28.0，R7）：只在多库时出现。 */
 .dsh-tw-note-wiki { display: inline-flex; align-items: center; gap: 6px; font-size: 12px; }
+/* ⚠️ hidden 属性在 CSS 里只是 display:none，**任何显式 display 都能盖掉它** ——
+   上面那条 display:inline-flex 就盖掉了，于是单库模式下这个空下拉照样显示出来
+   （作者 2026-09-28 报障："有个写入下拉，但是没有选项"）。显式尊重 hidden，
+   并把这一条写在后面（同优先级靠后者生效）。 */
+.dsh-tw-note-wiki[hidden] { display: none; }
 .dsh-tw-note-wiki-label { opacity: .7; }
 .dsh-tw-note-wiki-select {
   border: 1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.18));
@@ -522,6 +545,7 @@ html[data-dsh-tw-active] .dshDesktopConversationSurface > :not([data-dsh-tw-view
   padding: 2px 6px; border-radius: 999px; max-width: 220px;
 }
 .dsh-tw-note-wiki-hint { font-size: 12px; opacity: .75; }
+.dsh-tw-note-wiki-hint[hidden] { display: none; }
 
 /* ── input-dock quick-note button（聊天输入框上方，conversation.input.dock）──
    该槽位渲染为「输入框上方的全宽条目」纵向 flex 排列（todo/cost-meter/goal/

package/src/client/wiki-icon.ts

@@ -0,0 +1,65 @@
+/**
+ * Per-wiki entry icons (v0.28.4).
+ *
+ * A wiki's icon is part of its identity, stored next to `label` in the control
+ * file (`wikis.json`). A value is either one of {@link ICON_SVG}'s names — a
+ * curated set of hand-written 16×16 stroke SVGs that inherit `currentColor`, so
+ * they look right in both DSH themes with no assets to ship — or a short emoji
+ * literal (📚 / 💼 / 🏠), which costs nothing and tells four wikis apart at a
+ * glance.
+ *
+ * The host validates the same shape (`normalizeWikiIcon`); this module is only
+ * the rendering side, and it must never throw on a value it does not recognise —
+ * an unknown string falls back to the default icon rather than breaking the row.
+ *
+ * @module dsh-tiddlywiki/client/wiki-icon
+ */
+
+/** The default icon: a wiki page with a TiddlyWiki-style "T". */
+export const DEFAULT_ICON_SVG =
+  '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M4 2.5h8a1 1 0 0 1 1 1v9a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-9a1 1 0 0 1 1-1z"/><path d="M6 6h4M6 8.5h2.5"/></svg>'
+
+/** The curated name → SVG map. Names match `WIKI_ICON_NAMES` on the host. */
+export const ICON_SVG: Record<string, string> = {
+  book: '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M3.5 3h9v10h-9z"/><path d="M6.5 3v10"/><path d="M8.5 6h2.5M8.5 8.5h2"/></svg>',
+  briefcase: '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2.5 5.5h11v7h-11z"/><path d="M6 5.5V4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v1.5"/><path d="M2.5 8.5h11"/></svg>',
+  home: '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2.5 7.5 8 3l5.5 4.5"/><path d="M4 7v6h8V7"/></svg>',
+  notebook: '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M4 2.5h7.5v11H4z"/><path d="M6 2.5v11"/><path d="M8 6h2M8 8.5h2"/></svg>',
+  flask: '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M6.5 2.5v4L3.5 12a1 1 0 0 0 .9 1.5h7.2A1 1 0 0 0 12.5 12L9.5 6.5v-4"/><path d="M5.5 2.5h5"/><path d="M4.8 10h6.4"/></svg>',
+  globe: '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="8" cy="8" r="5.5"/><path d="M2.5 8h11"/><path d="M8 2.5c1.6 1.6 2.4 3.5 2.4 5.5S9.6 12 8 13.5C6.4 12 5.6 10 5.6 8s.8-3.9 2.4-5.5z"/></svg>',
+  star: '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m8 2.5 1.7 3.6 3.8.5-2.8 2.7.7 3.9L8 11.4l-3.4 1.8.7-3.9-2.8-2.7 3.8-.5z"/></svg>',
+  archive: '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2.5 3.5h11v3h-11z"/><path d="M3.5 6.5v6h9v-6"/><path d="M6.5 9h3"/></svg>',
+}
+
+/** The curated names, in picker order (mirrors the host's `WIKI_ICON_NAMES`). */
+export const ICON_NAMES: readonly string[] = Object.keys(ICON_SVG)
+
+/**
+ * Is this value a name we ship an SVG for? Anything else is treated as an emoji
+ * literal by {@link applyWikiIcon}.
+ */
+export function isIconName(value: string): boolean {
+  return Object.prototype.hasOwnProperty.call(ICON_SVG, value)
+}
+
+/**
+ * Put `icon` into `el` (an `.dsh-tw-entry-icon` span), falling back to the
+ * default. A name sets innerHTML to our own SVG; anything else is set as TEXT
+ * content, never HTML — the value comes from a file a user can edit, so it must
+ * not be able to inject markup into the sidebar.
+ */
+export function applyWikiIcon(el: HTMLElement, icon: string | undefined): void {
+  if (icon !== undefined && isIconName(icon)) {
+    el.innerHTML = ICON_SVG[icon] ?? DEFAULT_ICON_SVG
+    el.classList.remove('dsh-tw-entry-emoji')
+    return
+  }
+  if (icon !== undefined && icon.trim().length > 0) {
+    // textContent, deliberately: a control-file string must never be markup.
+    el.textContent = icon.trim()
+    el.classList.add('dsh-tw-entry-emoji')
+    return
+  }
+  el.innerHTML = DEFAULT_ICON_SVG
+  el.classList.remove('dsh-tw-entry-emoji')
+}

package/src/client/wiki-scope-dock.ts

@@ -21,6 +21,7 @@
  */
 import * as React from 'react'
 import { fetchStatus } from './status-cache.ts'
+import { alignDockEntry } from './dock-align.ts'
 import { SESSION_WIKI_ENDPOINT } from './endpoints.ts'
 
 interface WikiOption { id: string; label: string; running: boolean }
@@ -39,6 +40,16 @@ export function createWikiScopeDock(): (props: DockProps) => React.ReactElement
     const [scope, setScope] = React.useState('')
     const [note, setNote] = React.useState<string | undefined>(undefined)
     const [busy, setBusy] = React.useState(false)
+    const wrapRef = React.useRef<HTMLDivElement | null>(null)
+
+    // 与 composer 输入框右缘对齐（v0.28.2）：dock 槽位渲染成输入框的**兄弟节点**，
+    // 不做这一步这一行就悬在整列最右端（作者报障："没有和输入框对齐"）。测量逻辑
+    // 与快速笔记共用一份 —— client/dock-align.ts。
+    React.useLayoutEffect(() => {
+      const wrap = wrapRef.current
+      if (wrap === null) return
+      return alignDockEntry(wrap)
+    }, [])
 
     React.useEffect(() => {
       if (sessionId === undefined) return
@@ -91,7 +102,7 @@ export function createWikiScopeDock(): (props: DockProps) => React.ReactElement
 
     return React.createElement(
       'div',
-      { className: 'dsh-tw-scope-dock' },
+      { ref: wrapRef, className: 'dsh-tw-scope-dock' },
       React.createElement('span', { className: 'dsh-tw-scope-label' }, '知识库'),
       React.createElement(
         'select',

package/src/host/seed-notes.ts

@@ -64,6 +64,28 @@ const DOC_NOTE_TAIL = `* **TW 编辑器面板**：侧边栏「TiddlyWiki」按
 * **设置页**：DSH 设置 → 「TiddlyWiki 知识库」管理插件/主题/语言与运行配置（含「知识库」按钮相关显示开关）。
 * **注入给 Agent 的提示词可配置**（设置页「系统提示词」区块）：默认**精简版**只约定同步纪律/标签/链接格式（工具参数由工具 schema 提供，不重复）；可切完整版（附参数索引）、追加自定义规范（\`extra\`）、整段替换（\`override\`）或整体停用。保存即生效，无需重启 dsh web；点「查看当前注入文本」可预览下一步实际注入的全文。
 
+!! 多知识库（v0.28.0 起）
+
+同一个 dsh web 里可以**同时跑多个知识库**，每个库独立配置、独立 git，各自一个 TW 子进程。
+
+* **现在有几个库？**右下角「知识库」按钮的菜单会列出全部（● 是当前打开的那个）；输入框上方也会有「知识库」下拉，用来选**本会话**让 Agent 用哪个库（单选，选择会被记住）。
+* **加一个库**：DSH 设置 → 「TiddlyWiki 知识库」→ **知识库列表** → 填根目录 + 文件夹名 →「添加知识库」。目录不存在会自动初始化一个全新库；已存在的目录直接接管。
+* **让某个库对 Agent 隐身**：知识库列表里点该行「对 Agent 隐身」。隐身 = Agent 永远碰不到它（不进检索、不进工具、不进会话选择器），**你自己照常用**——适合只读语料、书籍扫描、导入归档。
+* **每个库一套设置**：笔记标签、语言、主题、提示词都在该库自己的配置里。设置页顶部会显示「**配置作用域**：…」，点某一行「配置」即可切换在编辑哪个库。
+* **git 按仓库生效**：多个库可以共用一个仓库（例如两个库是同一仓库下的两个子目录），也可以各自独立仓库。共用仓库时只有一个自动提交者，pull 后只重启内容真的变了的库。
+* **想拆分现有的大库**：见设置页文档或仓库里的 \`docs/wiki-split.md\`——那里有一段可以直接复制给 Agent 的话，它会先只读体检、再问你几个问题、出方案等你确认后才动手。
+
+!! 从旧版本升级上来（重要）
+
+**升级后不会自动变成多库**，仍然是单库模式（\`mode: single\`），行为与升级前完全一致。
+
+* **想继续用单库**：什么都不用做。设置页里「知识库位置（可切换）」只在单库模式出现，用法和以前一样。
+* **想开始用多库**：去设置页「知识库列表」添加第二个库，再把「运行模式」切到**多库**。此后清单里的库都会可用（标了「开局自启」的随 DSH 启动，其余在你打开或选中它时启动）。
+* **控制文件在哪**：\`$DSH_HOME/dsh-tiddlywiki/wikis.json\`（在每本 wiki **之外**，所以它不会随某个库被搬走）。模式、默认库、库清单都在里面；也可以在设置页里改，效果一样。
+* **旧的「知识库位置」指针文件**（\`location.json\`）在单库模式下仍然是权威的——多库模式下它不再参与，改由清单决定。
+* **每个库要有自己的 \`tiddlywiki.info\`**：把一个大库拆成多个目录时，每个目录都要有一个（缺了 TW 认不出它是库）。从旧库整体搬过来的目录通常已经有了。
+* **拆分大库的注意**：书籍/语料这类只读内容建议**独立仓库 + 对 Agent 隐身**；工作与个人笔记可以共用一个仓库、按子目录划分。搬运用 \`git mv\` 保留历史，别用\"复制粘贴再删\"。
+
 !! 知识库纪律（四条）
 
 1. 开工先 \`tiddlywiki_git_sync action=pull\`（rebase + autostash，真冲突会自动 abort 并报文件）。

package/src/host/wiki-registry.ts

@@ -108,6 +108,50 @@ export interface WikiEntry {
   agentVisible: boolean
   /** Start its TW child process at boot (default false; the default wiki is true). */
   autostart: boolean
+  /**
+   * Sidebar/entry icon (v0.28.4). Either a NAME from {@link WIKI_ICON_NAMES}
+   * (a curated set of built-in SVGs) or a short EMOJI literal.
+   *
+   * Why free-form-but-tiny instead of a fixed enum: a curated set covers the
+   * common cases without shipping a picker that needs its own assets, while an
+   * emoji lets someone tell four wikis apart at a glance (📚 / 💼 / 🏠) with
+   * nothing to download or maintain.
+   *
+   * It lives in the control file next to `label` because it is part of a wiki's
+   * IDENTITY — the same reason `label` is here and not in a tiddler. Absent =
+   * the built-in default icon (so upgrades see no change).
+   */
+  icon?: string
+}
+
+/**
+ * Built-in icon names (the picker's curated set). Deliberately small: each is a
+ * hand-written 16×16 stroke SVG inheriting `currentColor`, so it renders in both
+ * DSH themes with no asset pipeline.
+ */
+export const WIKI_ICON_NAMES = ['book', 'briefcase', 'home', 'notebook', 'flask', 'globe', 'star', 'archive'] as const
+
+/**
+ * Normalise an icon value: a known name, or a SHORT emoji-ish string, else
+ * undefined (= use the default).
+ *
+ * The length cap matters: the value can end up as text content in the sidebar,
+ * and an unbounded string would let a control file wreck the layout. Emoji are
+ * 1–2 code points; 8 UTF-16 units fits a ZWJ cluster without being a place to
+ * hide a paragraph.
+ */
+export function normalizeWikiIcon(value: unknown): string | undefined {
+  if (typeof value !== 'string') return undefined
+  const trimmed = value.trim()
+  if (trimmed.length === 0) return undefined
+  if ((WIKI_ICON_NAMES as readonly string[]).includes(trimmed)) return trimmed
+  if (trimmed.length > 8) return undefined
+  // A control character would be invisible or break the row.
+  for (const ch of trimmed) {
+    const code = ch.codePointAt(0) ?? 0
+    if (code < 0x20 || code === 0x7f) return undefined
+  }
+  return trimmed
 }
 
 /** The whole registry: the mode, a non-empty list, and the default-wiki pointer. */
@@ -268,6 +312,9 @@ export function normalizeEntry(input: unknown): { entry?: WikiEntry; error?: str
       name: normalized.location.name,
       agentVisible: input.agentVisible !== false,
       autostart: input.autostart === true,
+      // 图标可选：只在给了合法值时才带上，这样"没设过"的库在 JSON 里保持干净
+      // （也保证既有清单重新序列化后逐字不变）。
+      ...(normalizeWikiIcon(input.icon) !== undefined ? { icon: normalizeWikiIcon(input.icon) } : {}),
     },
   }
 }

package/src/index.ts

@@ -187,12 +187,14 @@ export {
   findEntry,
   findPathConflicts,
   normalizeEntry,
+  normalizeWikiIcon,
   normalizeWikiId,
   readRegistry,
   removeWiki,
   singleEntryRegistry,
   upsertWiki,
   validateRegistry,
+  WIKI_ICON_NAMES,
   writeRegistry,
   type RegistryReadResult,
   type RegistryValidation,
@@ -1133,6 +1135,8 @@ export function apply(ctx: HostCtx, rawConfig: TiddlywikiConfig = {}): void {
               autostart: entry.autostart,
               running: runtime !== undefined,
               path: entryPath(entry),
+              // 每库图标（v0.28.4）：侧边栏入口与设置页选择器共用这个来源。
+              icon: entry.icon,
             }
           }),
         }