dsh-tiddlywiki 0.28.2 → 0.28.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-tiddlywiki",
   "description": "把 TiddlyWiki 5 变成你和 Agent 共用的本地文档中心（纯文本 + git）：你在 DSH 界面里阅读、写作、记日记，Agent 用 15 个 tiddlywiki_* 工具读写同一批笔记；每条笔记都是你能读、能改、能审计、能随时带走的文件——不是自动记忆插件，不做后台抓取。可选一键发布到微信公众号草稿箱。 Turn TiddlyWiki 5 into a document center you and your agent share, in plain text under git — a knowledge base you can read, edit, audit and take with you, not an auto-memory plugin. Mounts via the official dsh plugin system; no DSH source changes.",
-  "version": "0.28.2",
+  "version": "0.28.4",
   "type": "module",
   "keywords": [
     "dsh",

package/src/client/dock-align.ts

@@ -0,0 +1,121 @@
+/**
+ * Align a `conversation.input.dock` entry with the composer input card.
+ *
+ * WHY THIS EXISTS (v0.28.2)
+ * -------------------------
+ * The dock slot renders entries as a full-width flex column that is a SIBLING of
+ * the composer, not inside it. The composer's input card is centred and has its
+ * own max-width, so an entry's right edge sits far to the right of the input box
+ * — visibly misaligned.
+ *
+ * The fix is to measure the composer card and pad the entry's right side by the
+ * difference. That measurement used to live only inside `quick-note-dock.ts`, so
+ * the moment a SECOND dock entry was added (the per-session knowledge-base
+ * selector) it simply did not align — nobody had published the rule. This module
+ * is that rule, written once.
+ *
+ * HOW IT FINDS THE CARD
+ * ---------------------
+ * Climb from the entry until an ancestor's subtree contains a wide text field
+ * (>300px — the composer input; dock entries' own inputs are small), then take
+ * the widest box between that field and its containing column (the visible card).
+ *
+ * WHEN IT RE-MEASURES
+ * -------------------
+ * ResizeObserver on the whole ancestor chain up to the conversation root
+ * (`[data-phase]`), plus `resize` / `visibilitychange`, plus a short self-healing
+ * interval that stops once the layout has measured cleanly three times (or after
+ * 20 tries, so a shell we cannot understand never leaks a timer).
+ *
+ * @module dsh-tiddlywiki/client/dock-align
+ */
+
+/** The measurement/padding key, exported so the gate can assert on it. */
+export const DOCK_ALIGN_MIN_INPUT_WIDTH = 300
+
+/**
+ * Start aligning `wrap` with the composer input card. Returns the disposer; call
+ * it from the component's effect cleanup.
+ *
+ * A React ref is intentionally NOT taken: the caller passes its own element, so
+ * this works for any dock entry regardless of how it renders.
+ */
+export function alignDockEntry(wrap: HTMLElement): () => void {
+  /** Find the composer input CARD (see the module doc for the algorithm). */
+  const findCard = (): HTMLElement | null => {
+    let input: Element | null = null
+    let column: HTMLElement | null = null
+    let node: HTMLElement | null = wrap
+    while (node !== null && node !== document.documentElement) {
+      node = node.parentElement
+      if (node === null) break
+      for (const el of node.querySelectorAll('textarea, [contenteditable]:not([contenteditable="false"]), [role="textbox"]')) {
+        if (el.getBoundingClientRect().width > DOCK_ALIGN_MIN_INPUT_WIDTH) { input = el; column = node; break }
+      }
+      if (column !== null) break
+    }
+    if (input === null || column === null) return null
+    const colW = column.getBoundingClientRect().width
+    let cur: HTMLElement | null = input as HTMLElement
+    let card: HTMLElement | null = null
+    let cardW = 0
+    while (cur !== null && cur !== column) {
+      const w = cur.getBoundingClientRect().width
+      if (w > 0 && w < colW - 8 && w >= cardW) { cardW = w; card = cur }
+      cur = cur.parentElement
+    }
+    return card
+  }
+
+  /** Measure once; returns true when the composer card was found (valid measure). */
+  const align = (): boolean => {
+    const wrapRect = wrap.getBoundingClientRect()
+    const card = findCard()
+    const right = card !== null ? card.getBoundingClientRect().right : wrapRect.right
+    const pad = Math.max(0, wrapRect.right - right)
+    if (wrap.style.paddingRight !== `${pad}px`) wrap.style.paddingRight = `${pad}px`
+    return card !== null
+  }
+
+  align()
+  // A sidebar toggle changes the conversation column width → the centred,
+  // max-width composer card moves → the padding must be re-measured. Observing
+  // only the dock container misses that (it may not resize at all), so observe
+  // the whole ancestor chain up to the conversation root.
+  const ro = new ResizeObserver(() => { align() })
+  let node: Element | null = wrap
+  while (node !== null && node !== document.documentElement) {
+    ro.observe(node)
+    if (node instanceof HTMLElement && node.hasAttribute('data-phase')) break
+    node = node.parentElement
+  }
+  window.addEventListener('resize', align)
+  document.addEventListener('visibilitychange', align)
+
+  // Self-healing fallback for layout changes we cannot observe. Each tick is a
+  // few getBoundingClientRect reads. It stops after 3 clean measurements, and
+  // gives up after 20 tries so an unrecognisable shell cannot leak a timer.
+  let guardHits = 0
+  let guardTicks = 0
+  const guard = window.setInterval(() => {
+    guardTicks++
+    if (!align()) {
+      if (guardTicks >= 20) window.clearInterval(guard)
+      return
+    }
+    guardHits++
+    if (guardHits >= 3) window.clearInterval(guard)
+  }, 1500)
+  // The composer card may mount slightly later; re-measure a couple of times.
+  const t1 = window.setTimeout(align, 120)
+  const t2 = window.setTimeout(align, 600)
+
+  return () => {
+    ro.disconnect()
+    window.removeEventListener('resize', align)
+    document.removeEventListener('visibilitychange', align)
+    window.clearInterval(guard)
+    window.clearTimeout(t1)
+    window.clearTimeout(t2)
+  }
+}

package/src/client/knowledge-fab.ts

@@ -21,7 +21,7 @@ import type { NoteWidgetHandle } from './note-widget.ts'
 import type { SyncController } from './sync-button.ts'
 import { PANEL_RELOAD_EVENT } from './tw-frame.ts'
 import { ROUTE_PREFIX } from './endpoints.ts'
-import { resolveFocusWiki, setFocusWiki } from './wiki-focus.ts'
+import { resolveFocusWiki, setFocusWiki, subscribeFocusWiki } from './wiki-focus.ts'
 
 import { fetchStatus } from './status-cache.ts'
 import { fetchUiConfig } from './ui-config.ts'
@@ -91,6 +91,13 @@ export function mountKnowledgeFab(state: PanelState, note: NoteWidgetHandle, syn
   let tip: HTMLDivElement | undefined
   let panelLabel: HTMLSpanElement | undefined
   let menuOpen = false
+  /** 焦点库订阅（多库菜单需要，dispose 时回收）。 */
+  let focusOff: (() => void) | undefined
+  /**
+   * 重画"知识库"分组的选中标记。打开菜单前调用一次 —— 订阅负责切库时即时重画，
+   * 这里负责兜住"订阅建立之前的窗口"与外部改动（v0.28.3）。
+   */
+  let repaintWikiMenu: (() => void) | undefined
   /** Latest TW health snapshot, merged into the hover tip. */
   let twHealth: TwHealth = { state: 'unknown', text: 'TiddlyWiki 服务…', logs: [] }
 
@@ -196,17 +203,33 @@ export function mountKnowledgeFab(state: PanelState, note: NoteWidgetHandle, syn
       // 多知识库切换（v0.28.0）：只有多于一个库时才长出这一段，单库安装的菜单不变。
       // 点一下 = 把"焦点库"切过去并打开面板——面板会加载那个库自己的 /tw/<id>/。
       if (roster.wikis.length > 1) {
-        const focus = resolveFocusWiki(roster.wikis, roster.defaultId)
         const heading = document.createElement('div')
         heading.className = 'dsh-tw-fab-group'
         heading.textContent = '知识库'
         menu.append(heading)
+        /** 每个库的菜单项，便于焦点变化时就地刷新选中标记。 */
+        const wikiItems = new Map<string, HTMLButtonElement>()
+        /**
+         * 重画选中标记（v0.28.3）。
+         *
+         * 原来的实现只在**菜单构建时**算一次 focus，之后无论怎么切都不再更新 ——
+         * 于是"切了库、选中项还停在上一个"（作者报障）。这里改成从当前焦点重算，
+         * 并在 setFocusWiki 的订阅里重画；菜单关闭时也重画，保证下次打开是对的。
+         */
+        const paint = (): void => {
+          const current = resolveFocusWiki(roster.wikis, roster.defaultId)
+          for (const [id, el] of wikiItems) {
+            const isCurrent = id === current
+            el.dataset.current = isCurrent ? '1' : '0'
+            const wiki = roster.wikis.find((w) => w.id === id)
+            el.textContent = `${isCurrent ? '●' : '○'} ${wiki?.label ?? id}`
+          }
+        }
         for (const wiki of roster.wikis) {
           const item = document.createElement('button')
           item.type = 'button'
           item.className = 'dsh-tw-fab-item'
-          item.dataset.current = wiki.id === focus ? '1' : '0'
-          item.textContent = `${wiki.id === focus ? '●' : '○'} ${wiki.label}`
+          item.dataset.current = '0'
           item.title = `${wiki.path}${wiki.running ? '' : '（未运行，打开会启动）'}`
           item.addEventListener('click', () => {
             closeMenu()
@@ -224,8 +247,14 @@ export function mountKnowledgeFab(state: PanelState, note: NoteWidgetHandle, syn
             }
             state.openPanel()
           })
+          wikiItems.set(wiki.id, item)
           menu.append(item)
         }
+        paint()
+        // 焦点变化（可能来自别的入口：侧边栏某一行、快速笔记卡片）也要跟上。
+        focusOff = subscribeFocusWiki(() => { paint() })
+        // 每次打开菜单前重画一次，避免因为订阅时机错过而显示旧值。
+        repaintWikiMenu = paint
       }
 
       panelLabel = document.createElement('span')
@@ -280,6 +309,9 @@ export function mountKnowledgeFab(state: PanelState, note: NoteWidgetHandle, syn
       if (menuOpen) { closeMenu(); return }
       menuOpen = true
       menu.hidden = false
+      // 每次打开都重画一次选中标记（v0.28.3）：切库可能发生在菜单关着的时候
+      // （侧边栏入口、快速笔记卡片），不重画就会显示上一次的选中项。
+      repaintWikiMenu?.()
       renderDot()
       void refreshTwStatus()
     })
@@ -307,6 +339,8 @@ export function mountKnowledgeFab(state: PanelState, note: NoteWidgetHandle, syn
 
   return () => {
     disposed = true
+    focusOff?.()
+    focusOff = undefined
     document.removeEventListener('click', onDocumentClick, true)
     unsubPanel()
     unsubSync()

package/src/client/note-widget.ts

@@ -835,7 +835,16 @@ export function createNoteWidget(): NoteWidgetHandle {
       if (disposed) return
       rosterMode = typeof payload?.mode === 'string' ? payload.mode : 'single'
       roster = (Array.isArray(payload?.wikis) ? payload.wikis : []).map((item) => ({ id: item.id, label: item.label, running: item.running }))
-      if (roster.length <= 1) return
+      // 单库：连选择器都不该存在。这里**还有一个**兜底 —— 除 `hidden` 外把 select 禁用、
+      // 标签也藏掉，因为"能看见一个没有选项的下拉"比"什么都不显示"糟得多（v0.28.1 修）。
+      if (roster.length <= 1) {
+        wikiField.hidden = true
+        wikiField.style.display = 'none'
+        wikiSelect.disabled = true
+        return
+      }
+      wikiField.style.display = ''
+      wikiSelect.disabled = false
       const defaultId = typeof payload?.defaultId === 'string' ? payload.defaultId : undefined
       const followFocus = (): void => {
         if (!targetPicked) targetWiki = resolveFocusWiki(roster, defaultId)

package/src/client/quick-note-dock.ts

@@ -17,6 +17,7 @@
 import * as React from 'react'
 import { NOTE_STATE_EVENT, type NoteWidgetHandle } from './note-widget.ts'
 import { fetchUiConfig } from './ui-config.ts'
+import { alignDockEntry } from './dock-align.ts'
 import { isEditorPopupOpen, isEditorPopupBlank, closeEditorPopup } from './editor-popup.ts'
 
 /**
@@ -54,89 +55,13 @@ export function createQuickNoteDock(note: NoteWidgetHandle): () => React.ReactEl
         window.removeEventListener(NOTE_STATE_EVENT, onState)
       }
     }, [])
+    // 与 composer 输入框右缘对齐：测量逻辑已抽到 client/dock-align.ts（v0.28.2），
+    // 因为第二个 dock 条目（会话级知识库选择器）加进来时它没有对齐 —— 规则只写在
+    // 这里，别人看不见。
     React.useLayoutEffect(() => {
       const wrap = wrapRef.current
       if (wrap === null) return
-      /**
-       * Find the composer input CARD: climb from the dock entry until an
-       * ancestor's subtree contains a wide text field (>300px — the composer
-       * input; dock entries' own inputs are small), then take the widest box
-       * between that field and its containing column (the visible card).
-       */
-      const findCard = (): HTMLElement | null => {
-        let input: Element | null = null
-        let column: HTMLElement | null = null
-        let node: HTMLElement | null = wrap
-        while (node !== null && node !== document.documentElement) {
-          node = node.parentElement
-          if (node === null) break
-          for (const el of node.querySelectorAll('textarea, [contenteditable]:not([contenteditable="false"]), [role="textbox"]')) {
-            if (el.getBoundingClientRect().width > 300) { input = el; column = node; break }
-          }
-          if (column !== null) break
-        }
-        if (input === null || column === null) return null
-        const colW = column.getBoundingClientRect().width
-        let cur: HTMLElement | null = input as HTMLElement
-        let card: HTMLElement | null = null
-        let cardW = 0
-        while (cur !== null && cur !== column) {
-          const w = cur.getBoundingClientRect().width
-          if (w > 0 && w < colW - 8 && w >= cardW) { cardW = w; card = cur }
-          cur = cur.parentElement
-        }
-        return card
-      }
-      /** 测量一次对齐；返回 true = 找到了 composer 输入卡片（测量有效）。 */
-      const align = (): boolean => {
-        const wrapRect = wrap.getBoundingClientRect()
-        const card = findCard()
-        const right = card !== null ? card.getBoundingClientRect().right : wrapRect.right
-        const pad = Math.max(0, wrapRect.right - right)
-        if (wrap.style.paddingRight !== `${pad}px`) wrap.style.paddingRight = `${pad}px`
-        return card !== null
-      }
-      align()
-      // 侧边栏开/关会改变对话列宽度 → composer 输入卡片（居中、有 max-width）的
-      // 右缘随之移动。旧实现只观察了 dock 容器，侧边栏变化时它不一定触发 resize，
-      // 导致按钮停在上次的位置、不再对齐。这里观察「从 dock 条目一直到对话根节点
-      // （带 data-phase）的整条祖先链」，任一祖先尺寸变化都会重测对齐。
-      const ro = new ResizeObserver(align)
-      let node: Element | null = wrap
-      while (node !== null && node !== document.documentElement) {
-        ro.observe(node)
-        if (node instanceof HTMLElement && node.hasAttribute('data-phase')) break
-        node = node.parentElement
-      }
-      window.addEventListener('resize', align)
-      document.addEventListener('visibilitychange', align)
-      // 自愈兜底：任何未观测到的布局变化（侧边栏切换、插件重渲染等）也会在
-      // 1.5s 内被纠正；每帧只是几次 getBoundingClientRect 读取，开销可忽略。
-      // 但常驻定时器没有必要：连续 3 次测量成功（找到 composer 输入卡片）即认为
-      // 布局已稳定，清掉 interval；即使一直测不到（异常 shell），也在 20 次后
-      // 强制收手，之后由 ResizeObserver + resize + visibilitychange 覆盖。
-      let guardHits = 0
-      let guardTicks = 0
-      const guard = window.setInterval(() => {
-        guardTicks++
-        if (!align()) {
-          if (guardTicks >= 20) window.clearInterval(guard)
-          return
-        }
-        guardHits++
-        if (guardHits >= 3) window.clearInterval(guard)
-      }, 1500)
-      // The composer card may mount slightly later; re-measure a couple of times.
-      const t1 = window.setTimeout(align, 120)
-      const t2 = window.setTimeout(align, 600)
-      return () => {
-        ro.disconnect()
-        window.removeEventListener('resize', align)
-        document.removeEventListener('visibilitychange', align)
-        window.clearInterval(guard)
-        window.clearTimeout(t1)
-        window.clearTimeout(t2)
-      }
+      return alignDockEntry(wrap)
     }, [])
     const native = mode === 'native'
     const label = native ? '快速笔记' : (open ? '快速笔记（已打开）' : '快速笔记')

package/src/client/settings-page.ts

@@ -24,6 +24,7 @@
 import * as React from 'react'
 import { toast } from './toast.ts'
 import { invalidateUiConfig } from './ui-config.ts'
+import { ICON_NAMES } from './wiki-icon.ts'
 import {
   ADMIN_CONFIG_ENDPOINT as CONFIG_ENDPOINT,
   ADMIN_INFO_ENDPOINT as INFO_ENDPOINT,
@@ -943,8 +944,28 @@ interface WikiListItemView {
   autostart: boolean
   running: boolean
   status: string
+  /** Per-wiki entry icon (v0.28.4): a curated name or a short emoji. */
+  icon?: string
 }
 
+/**
+ * Icon picker labels (v0.28.4). The NAMES come from `wiki-icon.ts`, so the set
+ * the picker offers is exactly the set the sidebar can render.
+ */
+const ICON_LABELS: Record<string, string> = {
+  book: '📖 书（book）',
+  briefcase: '💼 公文包（briefcase）',
+  home: '🏠 房子（home）',
+  notebook: '📓 笔记本（notebook）',
+  flask: '🧪 实验（flask）',
+  globe: '🌐 地球（globe）',
+  star: '⭐ 星标（star）',
+  archive: '🗄 归档（archive）',
+}
+
+/** A few emoji that read well at sidebar size and are easy to tell apart. */
+const EMOJI_CHOICES = ['📚', '💼', '🏠', '✍️', '🧪', '🌱', '🎯', '🗂️']
+
 /** `GET`/`POST /dsh-tiddlywiki/admin/wikis` payload (v0.28.0). */
 interface WikisView {
   ok?: boolean
@@ -1111,6 +1132,29 @@ function renderWikiListSection(body: HTMLElement, isDisposed: () => boolean, ref
         const ok = window.confirm(`把「${wiki.label}」移出清单？\n\n**目录与内容不会被删除**（仍在 ${wiki.path}），只是插件不再管理它。`)
         if (ok) void post({ action: 'remove', id: wiki.id }, '移出中…')
       })
+      // 图标选择（v0.28.4）：下拉里是内置图形 + 一组常用 emoji；选「默认」即清除自定义。
+      // 它和 label 一样属于"库的身份"，所以在列表里改，而不是塞进常规配置区。
+      const iconPicker = make('select', 'dsh-tw-settings-icon-select')
+      iconPicker.setAttribute('aria-label', `「${wiki.label}」的入口图标`)
+      const currentIcon = typeof wiki.icon === 'string' ? wiki.icon : ''
+      const options: Array<[string, string]> = [['', '默认图标']]
+      for (const name of ICON_NAMES) options.push([name, ICON_LABELS[name] ?? name])
+      for (const emoji of EMOJI_CHOICES) options.push([emoji, emoji])
+      // 当前值不在候选里（用户填了自己的 emoji）：保留它，别让下拉把它抹掉。
+      if (currentIcon.length > 0 && !options.some(([v]) => v === currentIcon)) options.push([currentIcon, currentIcon])
+      for (const [value, text] of options) {
+        const opt = document.createElement('option')
+        opt.value = value
+        opt.textContent = text
+        iconPicker.append(opt)
+      }
+      iconPicker.value = currentIcon
+      iconPicker.addEventListener('change', () => {
+        const next = iconPicker.value
+        void post(next.length > 0
+          ? { action: 'update', wiki: { ...wiki, icon: next } }
+          : { action: 'update', wiki: { ...wiki, icon: '' } }, '保存中…')
+      })
       // 「改目录」只在多库模式出现（v0.28.1）：单库模式下这件事由「知识库位置」负责
       // （它写 wiki 之外的指针文件），两处并存会让用户不知道以哪个为准。
       if (view.mode === 'multi') {
@@ -1132,7 +1176,7 @@ function renderWikiListSection(body: HTMLElement, isDisposed: () => boolean, ref
         })
         actions.append(move)
       }
-      actions.append(configure, power, makeDefault, visibility, autostart, remove)
+      actions.append(configure, power, makeDefault, visibility, autostart, iconPicker, remove)
       row.append(actions)
       list.append(row)
     }

package/src/client/sidebar-entry.ts

@@ -11,12 +11,13 @@
  */
 import type { PanelState } from './state.ts'
 import { fetchUiConfig, subscribeUiConfig } from './ui-config.ts'
+import { fetchStatus } from './status-cache.ts'
+import { resolveFocusWiki, setFocusWiki, subscribeFocusWiki } from './wiki-focus.ts'
+import { applyWikiIcon } from './wiki-icon.ts'
 
 /** Stable data attribute identifying this entry row. */
 export const ENTRY_SELECTOR = '[data-dsh-tw-entry]'
 
-/** Inline icon: a wiki page with a TiddlyWiki-style "T" (nav-icon look). */
-const ICON = '<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>'
 
 /** Family entries from sibling plugins, kept in a stable relative order. */
 const FAMILY_SELECTOR = '[data-dsh-tw-entry], [data-dsh-atb-entry], [data-dsh-taskboard-entry], [data-dsh-ssh-entry]'
@@ -46,22 +47,38 @@ function newSessionButton(root: HTMLElement): HTMLButtonElement | undefined {
   return buttons.find(button => !button.matches(ENTRY_SELECTOR) && /新会话|新建会话|new session/i.test(button.textContent ?? ''))
 }
 
-/** Build the entry row (a detached button; insert once the shell is up). */
-function createEntry(state: PanelState, label: string): { entry: HTMLButtonElement; labelEl: HTMLSpanElement } {
+/**
+ * Build one entry row (a detached button; inserted once the shell is up).
+ *
+ * `wikiId` is optional and only used in multi-wiki mode: clicking the row focuses
+ * that knowledge base before toggling the panel, so the row a user clicks is the
+ * wiki they get. Single-wiki installs pass nothing and behave exactly as before.
+ */
+function createEntry(
+  state: PanelState,
+  label: string,
+  wikiId?: string,
+  icon?: string,
+): { entry: HTMLButtonElement; labelEl: HTMLSpanElement; iconEl: HTMLSpanElement } {
   const entry = document.createElement('button')
   entry.type = 'button'
   entry.dataset.dshTwEntry = ''
   entry.className = 'dsh-tw-entry'
-  entry.setAttribute('aria-label', 'TiddlyWiki 知识库')
-  const icon = document.createElement('span')
-  icon.className = 'dsh-tw-entry-icon'
-  icon.innerHTML = ICON
+  if (wikiId !== undefined) entry.dataset.wiki = wikiId
+  entry.setAttribute('aria-label', `TiddlyWiki 知识库：${label}`)
+  const iconEl = document.createElement('span')
+  iconEl.className = 'dsh-tw-entry-icon'
+  applyWikiIcon(iconEl, icon)
   const labelEl = document.createElement('span')
   labelEl.className = 'dsh-tw-entry-label'
   labelEl.textContent = label
-  entry.append(icon, labelEl)
-  entry.addEventListener('click', () => { state.toggle() })
-  return { entry, labelEl }
+  entry.append(iconEl, labelEl)
+  entry.addEventListener('click', () => {
+    // 多库：先把这个库设为「焦点库」，面板随后加载它自己的 /tw/<id>/。
+    if (wikiId !== undefined) setFocusWiki(wikiId)
+    state.toggle()
+  })
+  return { entry, labelEl, iconEl }
 }
 
 /** Re-insert the entry before the whole family block (stable ordering). */
@@ -98,7 +115,10 @@ function placeEntry(root: HTMLElement, entry: HTMLButtonElement): boolean {
  * @returns disposer removing the entry and its observers.
  */
 export function mountSidebarEntry(state: PanelState): () => void {
-  const { entry, labelEl } = createEntry(state, 'TiddlyWiki')
+  /** 多库：每个**在运行**的库一个入口行，用自己的显示名（作者 2026-09-28 要求）。 */
+  const rows = new Map<string, { entry: HTMLButtonElement; labelEl: HTMLSpanElement; iconEl: HTMLSpanElement }>()
+  const { entry, labelEl, iconEl } = createEntry(state, 'TiddlyWiki')
+  rows.set('', { entry, labelEl, iconEl })
   let disposed = false
   /**
    * 自定义显示名：/status 返回 ui.sidebarLabel（设置页「侧边栏入口显示名称」）。
@@ -114,6 +134,62 @@ export function mountSidebarEntry(state: PanelState): () => void {
   }
   void applyLabel()
   const unsubscribeLabel = subscribeUiConfig(() => { void applyLabel() })
+
+  /**
+   * 多库：给**每个在运行**的库挂一个入口行（v0.28.2，作者要求"有多少个 wiki 启动了就按
+   * 各自的展示名称显示入口"）。
+   *
+   * 为什么只列「在运行」的：一个入口行点了就该能打开那个库；没在跑的库点开会先卡在启动
+   * 上。没在跑的库仍可从右下角「知识库」菜单启动（那里会把它们列全，并标注"未运行"）。
+   *
+   * 单库模式（名册 ≤1）：沿用**原来那一个**行与 ui.sidebarLabel —— 行为逐字不变。
+   */
+  const applyRoster = async (): Promise<void> => {
+    const payload = await fetchStatus()
+    if (disposed) return
+    const list = Array.isArray(payload?.wikis) ? payload.wikis : []
+    const running = list.filter((w) => w.running)
+    // 单库：不建额外行，标签仍归 ui.sidebarLabel 管。
+    if (running.length <= 1) {
+      for (const [key, row] of rows) {
+        if (key === '') continue
+        row.entry.remove()
+        rows.delete(key)
+      }
+      entry.hidden = false
+      return
+    }
+    // 多库：默认那行让位给每个库自己的行（否则会出现一个没有库名的第 4 行）。
+    entry.hidden = true
+    const wanted = new Set(running.map((w) => w.id))
+    // 移除已不在运行/已删除的库
+    for (const [key, row] of rows) {
+      if (key === '' || wanted.has(key)) continue
+      row.entry.remove()
+      rows.delete(key)
+    }
+    // 新增/更新
+    for (const w of running) {
+      let row = rows.get(w.id)
+      if (row === undefined) {
+        row = createEntry(state, w.label, w.id, w.icon)
+        rows.set(w.id, row)
+      }
+      row.labelEl.textContent = w.label
+      // 图标每次同步（v0.28.4）：在设置页改完图标，10s 内的轮询就会把它换过来。
+      applyWikiIcon(row.iconEl, w.icon)
+      row.entry.setAttribute('aria-label', `TiddlyWiki 知识库：${w.label}`)
+      // 当前焦点库高亮
+      const focused = resolveFocusWiki(running, payload?.defaultId) === w.id
+      if (focused) row.entry.dataset.focus = 'true'
+      else delete row.entry.dataset.focus
+    }
+    // 让放置逻辑把新行插进去（复用同一个 root）
+    if (root !== undefined) { placed = false; tryPlace() }
+  }
+  void applyRoster()
+  const unsubscribeFocus = subscribeFocusWiki(() => { void applyRoster() })
+  const rosterTimer = window.setInterval(() => { void applyRoster() }, 10_000)
   let root: HTMLElement | undefined
   let placed = false
   /** 兜底轮询定时器：只在「尚未放置」或「shell 重建了 root」时运行。 */
@@ -135,6 +211,10 @@ export function mountSidebarEntry(state: PanelState): () => void {
     }, 2_000)
   }
 
+  /** 当前应该出现在侧边栏里的行（隐藏的默认行不算）。 */
+  const activeRows = (): HTMLButtonElement[] =>
+    [...rows.values()].map((r) => r.entry).filter((el) => !el.hidden)
+
   const tryPlace = (): void => {
     if (root !== undefined && !root.isConnected) {
       rootObserver.disconnect()
@@ -144,7 +224,7 @@ export function mountSidebarEntry(state: PanelState): () => void {
       startRetry()
     }
     if (placed) {
-      if (document.body.contains(entry)) return
+      if (activeRows().every((el) => document.body.contains(el))) return
       rootObserver.disconnect()
       root = undefined
       placed = false
@@ -152,7 +232,12 @@ export function mountSidebarEntry(state: PanelState): () => void {
     }
     root ??= sidebarRoot()
     if (root === undefined) return
-    placed = placeEntry(root, entry)
+    // 逐行放置：多库时每一行都要插进侧边栏（顺序按 rows 的插入序）。
+    let any = false
+    for (const el of activeRows()) {
+      if (placeEntry(root, el)) any = true
+    }
+    placed = any
     if (placed) {
       // 放置成功即停掉兜底轮询：后续自愈由 rootObserver/waitObserver 负责。
       stopRetry()
@@ -164,7 +249,7 @@ export function mountSidebarEntry(state: PanelState): () => void {
   const waitObserver = new MutationObserver(() => { tryPlace() })
   waitObserver.observe(document.body, { childList: true, subtree: true })
 
-  // Self-heal: re-insert in the same frame when a re-render displaces the row.
+  // Self-heal: re-insert in the same frame when a re-render displaces the rows.
   const rootObserver = new MutationObserver(() => {
     if (root === undefined || !root.isConnected) {
       placed = false
@@ -172,7 +257,9 @@ export function mountSidebarEntry(state: PanelState): () => void {
       tryPlace()
       return
     }
-    if (!root.contains(entry)) placed = placeEntry(root, entry)
+    for (const el of activeRows()) {
+      if (!root.contains(el)) placeEntry(root, el)
+    }
   })
 
   // Belt-and-braces: a late shell mount with no further mutations still heals.
@@ -180,8 +267,11 @@ export function mountSidebarEntry(state: PanelState): () => void {
   startRetry()
 
   const syncActive = (): void => {
-    if (state.isOpen()) entry.dataset.active = 'true'
-    else delete entry.dataset.active
+    // 面板是共享的：所有行一起高亮/取消，用户看到的"打开中"状态才一致。
+    for (const el of activeRows()) {
+      if (state.isOpen()) el.dataset.active = 'true'
+      else delete el.dataset.active
+    }
   }
   const unsubscribe = state.subscribe(syncActive)
   syncActive()
@@ -190,10 +280,13 @@ export function mountSidebarEntry(state: PanelState): () => void {
   return () => {
     disposed = true
     clearInterval(retry)
+    window.clearInterval(rosterTimer)
     waitObserver.disconnect()
     rootObserver.disconnect()
     unsubscribe()
     unsubscribeLabel()
-    entry.remove()
+    unsubscribeFocus()
+    for (const row of rows.values()) row.entry.remove()
+    rows.clear()
   }
 }

package/src/client/status-cache.ts

@@ -59,6 +59,8 @@ export interface StatusPayload {
     autostart: boolean
     running: boolean
     path: string
+    /** Per-wiki entry icon (v0.28.4): a curated name or a short emoji. */
+    icon?: string
   }>
   ui?: {
     showQuickNote?: boolean