dsh-tiddlywiki 0.27.2 → 0.28.0

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.27.2",
+  "version": "0.28.0",
   "type": "module",
   "keywords": [
     "dsh",
@@ -47,6 +47,7 @@
     "lib/client.js",
     "src",
     "docs",
+    "skills",
     "tools",
     "cordis.patch.yml",
     "LICENSE",
@@ -90,9 +91,9 @@
     "typecheck": "tsc --noEmit",
     "smoke:client": "node scripts/smoke-client.mjs",
     "selftest": "node scripts/selftest.mjs",
-    "verify:static": "node scripts/verify-send-to-agent-bundle.mjs && node scripts/verify-render-bundle.mjs && node scripts/verify-wechat-publish-bundle.mjs && node scripts/verify-package-contents.mjs && node scripts/verify-version-consistency.mjs && node scripts/verify-constants.mjs",
-    "verify:unit": "node scripts/verify-clip-bridge.mjs && node scripts/verify-seed-error-policy.mjs && node scripts/verify-render-sanitizer.mjs && node scripts/verify-secret-masking.mjs && node scripts/verify-write-policy.mjs && node scripts/verify-workspace.mjs && node scripts/verify-restart-drain.mjs && node scripts/verify-language-pin.mjs && node scripts/verify-prompt.mjs && node scripts/verify-conflict-config-guards.mjs && node scripts/verify-config-patch.mjs && node scripts/verify-tool-views.mjs && npx tsx scripts/verify-plugin-runtime.mjs && node scripts/verify-wechat-adapters.mjs && node scripts/verify-wechat-docs-seed.mjs && node scripts/verify-wechat-publish.mjs && npx tsx scripts/verify-tw-origin.mjs && node scripts/verify-frame-guards.mjs && npx tsx scripts/verify-ready-policy.mjs && npx tsx scripts/verify-frame-surface.mjs && npx tsx scripts/verify-editor-popup.mjs && npx tsx scripts/verify-status-cache.mjs",
-    "verify:e2e": "node scripts/verify-auth.mjs && node scripts/verify-anon-username.mjs && node scripts/verify-tools.mjs && node scripts/verify-audit-fixes.mjs && node scripts/verify-git-resolve.mjs && node scripts/verify-resilience.mjs && node scripts/verify-seed-send-to-agent.mjs && node scripts/verify-seeds-admin.mjs && node scripts/verify-wiki-switch.mjs",
+    "verify:static": "node scripts/verify-send-to-agent-bundle.mjs && node scripts/verify-render-bundle.mjs && node scripts/verify-wechat-publish-bundle.mjs && node scripts/verify-package-contents.mjs && node scripts/verify-version-consistency.mjs && node scripts/verify-constants.mjs && node scripts/verify-doc-links.mjs",
+    "verify:unit": "node scripts/verify-clip-bridge.mjs && node scripts/verify-seed-error-policy.mjs && node scripts/verify-render-sanitizer.mjs && node scripts/verify-secret-masking.mjs && node scripts/verify-write-policy.mjs && node scripts/verify-workspace.mjs && node scripts/verify-wiki-registry.mjs && node scripts/verify-wiki-farm.mjs && node scripts/verify-session-scope.mjs && node scripts/verify-skill-install.mjs && node scripts/verify-repo-keying.mjs && node scripts/verify-restart-drain.mjs && node scripts/verify-language-pin.mjs && node scripts/verify-prompt.mjs && node scripts/verify-conflict-config-guards.mjs && node scripts/verify-config-patch.mjs && node scripts/verify-tool-views.mjs && npx tsx scripts/verify-plugin-runtime.mjs && node scripts/verify-wechat-adapters.mjs && node scripts/verify-wechat-docs-seed.mjs && node scripts/verify-wechat-publish.mjs && npx tsx scripts/verify-tw-origin.mjs && node scripts/verify-frame-guards.mjs && npx tsx scripts/verify-ready-policy.mjs && npx tsx scripts/verify-frame-surface.mjs && npx tsx scripts/verify-editor-popup.mjs && npx tsx scripts/verify-status-cache.mjs && npx tsx scripts/verify-wiki-focus.mjs",
+    "verify:e2e": "node scripts/verify-auth.mjs && node scripts/verify-anon-username.mjs && node scripts/verify-tools.mjs && node scripts/verify-audit-fixes.mjs && node scripts/verify-git-resolve.mjs && node scripts/verify-resilience.mjs && node scripts/verify-seed-send-to-agent.mjs && node scripts/verify-seeds-admin.mjs && node scripts/verify-wiki-switch.mjs && node scripts/verify-wiki-farm-boot.mjs",
     "verify:large": "node scripts/verify-large-wiki.mjs",
     "verify": "npm run verify:static && npm run verify:unit && npm run verify:e2e && npm run verify:large",
     "prepublishOnly": "npm run typecheck && npm run build && npm run verify:static && npm run verify:unit"

package/skills/wiki-split/SKILL.md

@@ -0,0 +1,106 @@
+---
+name: dsh-tiddlywiki-wiki-split
+description: 把已有的 dsh-tiddlywiki 知识库按用户意愿拆成几个独立的库（语料/归档与工作集分开），并登记进插件的多知识库清单。当用户说「知识库太大了 / 检索被语料淹没 / 想把书和笔记分开 / 拆库 / 帮我拆开这个 wiki」时使用。
+whenToUse: 用户要求拆分、整理或隔离一个已有的 TiddlyWiki 知识库，通常是因为 Agent 检索被只读语料淹没，或想分别备份到不同的 git 远端。
+metadata:
+  dsh-tiddlywiki-skill: wiki-split
+  requires: dsh-tiddlywiki >= 0.28.0
+---
+
+<!-- dsh-tiddlywiki-skill:wiki-split v1
+     上面这行是"这份 SKILL.md 是插件写的"的标记：安装器只会覆盖带标记的文件，
+     你自己改过的（去掉标记即可）永远不被覆盖。 -->
+
+# 拆分知识库（把语料/归档从工作集里分出去）
+
+目标：把用户现有的一坨内容按**用途**拆成几个独立的库，每个库有自己的目录、自己的 git
+仓库（或共用仓库里的一个子目录）、自己的插件配置，以及**是否对 Agent 可见**。
+
+## 铁律（违反任何一条都停下，问用户）
+
+1. **确认前不动任何文件。** 先只读体检 + 出方案表格，等用户明确确认再执行。
+2. **先备份**：给现有仓库打一个 tag（或 clone 一份）。没有备份不动手。
+3. **旧库一个都不许删。** 拆分是"复制/移动 + 重新登记"，不是删除。搬完让用户自己确认后再清理。
+4. **用 `git mv` 保住历史**，不要 `mv` + `git add`（那样历史会断）。
+5. **分步可中断**：每一步都告诉用户做到哪了、下一步是什么。
+
+## 步骤
+
+### 1. 只读体检（不改任何东西）
+
+- **tag 分布**：`tiddlywiki_list_tags`（limit 调大），找出体量大又"只读"的簇（语料、导入归档）。
+- **规模与体积**（shell）：`tiddlers/` 下的文件数、`files/` 的体积、`git rev-parse --show-toplevel`
+  （判断是"独立仓库"还是"共用仓库"）、`git count-objects -vH`（仓库体积）。
+- **一句话结论**：向用户说明"多少条里有多少条是语料/归档，它们是不是只读"。
+
+### 2. 一次问完这五个问题（每个都给建议默认值）
+
+| 问题 | 你要的答案 | 建议默认 |
+|---|---|---|
+| 拆成几个库，各叫什么？ | 显示名 | 按体检发现的簇命名（书籍/工作/个人） |
+| 每个库收什么？ | 按 tag / 关键词 / 目录 / 时间段 | 语料按 tag；工作与个人按项目/主题 |
+| git 怎么分？ | 共用现有仓库（按文件夹物理划分）/ 各自独立仓库 | 只读语料独立仓库，其余共用 |
+| 哪些库对 Agent 可见？ | 可见 = 能检索/写入；隐身 = 永不触及 | **语料/归档建议隐身**（这正是拆分的目的） |
+| 现在就搬，还是先出报告？ | 先出报告 = 只读 dry-run | 先出报告 |
+
+### 3. 出方案表格，等确认
+
+每个库一行：**显示名 | 收纳规则 | 目标目录 | git 仓库 | agentVisible | autostart**，
+附"预计搬多少条"，并明确指出**不可逆点**（哪些操作改历史、哪些不能自动回滚）。
+
+### 4. 备份
+
+`git tag pre-split-<日期>`（或 clone 到另一个目录）。告诉用户怎么回滚：
+`git reset --hard pre-split-<日期>`。
+
+### 5. 搬迁
+
+- 建目标目录，必要时 `git init`（独立仓库）或直接作为现有仓库的子目录（共用仓库）。
+- `git mv <旧路径> <新路径>` 逐批搬，**保持提交历史**。
+- 每个库补一个 `tiddlywiki.info`（新库可以让插件首次启动时 `--init server` 自动生成）。
+- 共用仓库的情况下：**不要**在两个子目录里各配一个远端（一个仓库只有一个 `origin`）。
+
+### 6. 登记进插件
+
+**优先用设置页**：`知识库列表` → 「添加知识库」（根目录 + 文件夹名 + 显示名），然后逐行设置
+「设为默认 / 对 Agent 可见·隐身 / 开局自启」。运行模式选「多库」。
+
+需要手写时，文件是 `$DSH_HOME/dsh-tiddlywiki/wikis.json`：
+
+```json
+{
+  "version": 1,
+  "mode": "multi",
+  "defaultId": "work",
+  "wikis": [
+    { "id": "work",     "label": "工作", "root": "D:/notes", "name": "work",     "agentVisible": true,  "autostart": true },
+    { "id": "personal", "label": "个人", "root": "D:/notes", "name": "personal", "agentVisible": true,  "autostart": true },
+    { "id": "books",    "label": "书籍", "root": "D:/corpus", "name": "books",   "agentVisible": false, "autostart": false }
+  ]
+}
+```
+
+约束（写错会被插件拒绝并告诉你原因）：
+
+- `id`：小写字母/数字开头，只含 `a-z0-9._-`，≤64 字符；**不能**是 `status` / `files` / `recipes`
+  / `bags` / `render` / `login` / `logout` / `index.html` / `favicon.ico`（会和 TW 自己的根路径撞名）。
+- **两个库不能指向同一个目录**，**也不能互相嵌套**（外层库的 `git add -A` 会把内层内容一起提交）。
+- `mode` 缺省是 `single`（只跑 `defaultId` 那个库）。
+
+### 7. 校验（逐条给用户看结果）
+
+- 每个库的 tiddler 计数与方案里的预期一致。
+- 工作库里 `tiddlywiki_search` **不再命中**语料（这是拆分的目的）。
+- 每个库能独立打开编辑器、能提交（`tiddlywiki_git_sync action=status` 或看 git 状态）。
+- Agent 侧：会话选择器里只出现 `agentVisible` 的库；选一个库后工具回执上会标着库名。
+
+### 8. 收尾
+
+- 把体检数字与最终布局记成一条笔记（方便几个月后回看为什么这么分）。
+- 提示用户：旧库还在，确认无误后再自行清理。
+
+## 旧版本（插件 < 0.28.0）
+
+没有多库模式，只有「切换知识库位置」（同一时刻只有一个库是活的）。降级做法：建好目录 →
+用 `git mv` 搬 → 在设置页「知识库位置」里指向它。**但它做不到同时在线**：用户切到语料库翻资料
+时 Agent 也跟着切过去了。先建议升级。

package/src/client/endpoints.ts

@@ -47,6 +47,14 @@ export const ADMIN_SEEDS_REMOVE_ENDPOINT = `${ROUTE_PREFIX}/admin/seeds/remove`
 export const ADMIN_WIKI_LOCATION_ENDPOINT = `${ROUTE_PREFIX}/admin/wiki/location`
 export const ADMIN_WIKI_SWITCH_ENDPOINT = `${ROUTE_PREFIX}/admin/wiki/switch`
 export const ADMIN_WIKI_RESET_ENDPOINT = `${ROUTE_PREFIX}/admin/wiki/reset`
+/**
+ * The knowledge-base LIST (v0.28.0): GET reads the control file (mode + list +
+ * default), POST applies ONE action (add / update / remove / set-default /
+ * set-mode, plus the runtime-only start / stop).
+ */
+export const ADMIN_WIKIS_ENDPOINT = `${ROUTE_PREFIX}/admin/wikis`
+/** Per-session knowledge-base scope (v0.28.0). */
+export const SESSION_WIKI_ENDPOINT = `${ROUTE_PREFIX}/session/wiki`
 
 /**
  * Resolve a TW proxy URL for THIS document (v0.26.7).
@@ -75,6 +83,35 @@ export function resolveTwUrl(relative: string, absolute?: string): string {
   return new URL(relative, origin).href
 }
 
+/**
+ * Point BOTH proxy bases at one knowledge base (v0.28.0).
+ *
+ * In multi mode the panel must load `/tw/<id>/…`: a wiki's TW frontend builds
+ * every API URL from the base it was served under, and the bare path means "the
+ * default wiki" — so a non-default wiki embedded under it would show one wiki's
+ * UI while reading and writing another's data. Single mode (or no roster) keeps
+ * the bare path, so an existing install is untouched.
+ *
+ * The ABSOLUTE base carries the same suffix: it exists for the desktop app's
+ * `dsh-app:` renderer (see resolveTwUrl), and a per-wiki path is just as
+ * necessary there.
+ */
+export function twProxyFor(
+  mode: string | undefined,
+  wikiId: string | undefined,
+  relative: string,
+  absolute?: string,
+): { relative: string; absolute?: string } {
+  if (mode !== 'multi' || typeof wikiId !== 'string' || wikiId.length === 0) {
+    return { relative, ...(absolute !== undefined ? { absolute } : {}) }
+  }
+  const suffix = `${encodeURIComponent(wikiId)}/`
+  return {
+    relative: `${relative}${suffix}`,
+    ...(absolute !== undefined ? { absolute: `${absolute}${suffix}` } : {}),
+  }
+}
+
 /** The subset of the `/sync` JSON body both client callers report on. */
 export interface SyncResultPayload {
   ok?: boolean

package/src/client/index.ts

@@ -19,6 +19,7 @@ import { createNoteWidget } from './note-widget.ts'
 import { createSyncController } from './sync-button.ts'
 import { mountKnowledgeFab } from './knowledge-fab.ts'
 import { createQuickNoteDock } from './quick-note-dock.ts'
+import { createWikiScopeDock } from './wiki-scope-dock.ts'
 import { fetchUiConfig } from './ui-config.ts'
 import { mountSessionSummaryView } from './session-summary.ts'
 import { disposeEditorPopup } from './editor-popup.ts'
@@ -105,6 +106,19 @@ export function apply(ctx: ClientContextFace): void {
     // 是官方为「输入框上方的全宽条目」预留的挂载点，todo/cost-meter/goal/
     // queue/git-graph 等插件内容都渲染在这里、按纵向 flex 排列，天然不重叠。
     // 由 ui.showQuickNoteDock 配置控制（默认开）。
+    //
+    // 同一槽位还挂「会话级知识库选择器」（v0.28.0，需求：会话栏上面动态选 wiki）：
+    // 它**不需要**开关——组件自己在"可见库 ≤ 1"时返回 null，所以单库安装看不到任何
+    // 东西，而多库安装一装上就能选。order 比快速笔记小，排在它前面。
+    safeMount('wiki scope dock', () => {
+      const removeDock = ctx.slots?.inject('conversation.input.dock', () =>
+        ctx.slots?.register(
+          { name: 'conversation.input.dock', id: 'wiki-scope', order: 4, label: '知识库作用域' },
+          createWikiScopeDock(),
+        ),
+      )
+      if (removeDock !== undefined) disposers.push(removeDock)
+    })
     if (ctx.slots !== undefined) {
       void fetchUiConfig().then((cfg) => {
         if (clientDisposed) return

package/src/client/knowledge-fab.ts

@@ -20,6 +20,8 @@ import type { PanelState } from './state.ts'
 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 { fetchStatus } from './status-cache.ts'
 import { fetchUiConfig } from './ui-config.ts'
@@ -29,6 +31,28 @@ const BOOK_ICON = '<svg viewBox="0 0 16 16" width="17" height="17" fill="none" s
 
 interface UiFlags { showQuickNote: boolean; showPanelStatus: boolean; showSyncButton: boolean }
 
+/** One knowledge base as the FAB's switcher lists it (v0.28.0). */
+interface FabWiki { id: string; label: string; running: boolean; path: string }
+
+/** The knowledge-base roster for the FAB switcher. */
+interface FabRoster { mode: string; defaultId?: string; wikis: FabWiki[] }
+
+/**
+ * Fetch the roster (v0.28.0). The switcher only appears when there is MORE THAN
+ * ONE wiki, so a single-wiki install keeps exactly the menu it always had.
+ */
+async function fetchRoster(): Promise<FabRoster> {
+  const payload = await fetchStatus()
+  const wikis = Array.isArray(payload?.wikis)
+    ? payload.wikis.map((wiki) => ({ id: wiki.id, label: wiki.label, running: wiki.running, path: wiki.path }))
+    : []
+  return {
+    mode: typeof payload?.mode === 'string' ? payload.mode : 'single',
+    ...(typeof payload?.defaultId === 'string' ? { defaultId: payload.defaultId } : {}),
+    wikis,
+  }
+}
+
 /** Read the three FAB-menu gates from the shared, TTL-cached ui config.
  *
  *  Used to be a private `fetchStatus()` projection (v0.22.8): the `/status`
@@ -114,7 +138,7 @@ export function mountKnowledgeFab(state: PanelState, note: NoteWidgetHandle, syn
     renderTip()
   }
 
-  const build = (flags: UiFlags): void => {
+  const build = (flags: UiFlags, roster: FabRoster): void => {
     if (disposed) return
     root = document.createElement('div')
     root.className = 'dsh-tw-fab-wrap'
@@ -169,6 +193,41 @@ export function mountKnowledgeFab(state: PanelState, note: NoteWidgetHandle, syn
     }
 
     if (flags.showPanelStatus) {
+      // 多知识库切换（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)
+        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.title = `${wiki.path}${wiki.running ? '' : '（未运行，打开会启动）'}`
+          item.addEventListener('click', () => {
+            closeMenu()
+            setFocusWiki(wiki.id)
+            // 打开面板前把它起起来（v0.28.0）：`/tw/<id>/` 对没在跑的库回 503，
+            // 而这条菜单项的提示恰恰写着"打开会启动"。启动是显式 POST——代理路由
+            // 绝不能在 GET 里顺手 spawn 子进程。
+            if (!wiki.running) {
+              void fetch(`${ROUTE_PREFIX}/admin/wikis`, {
+                method: 'POST',
+                headers: { 'content-type': 'application/json' },
+                body: JSON.stringify({ action: 'start', id: wiki.id }),
+                signal: AbortSignal.timeout(120_000),
+              }).catch(() => undefined)
+            }
+            state.openPanel()
+          })
+          menu.append(item)
+        }
+      }
+
       panelLabel = document.createElement('span')
       panelLabel.textContent = '打开 TW 面板'
       const item = document.createElement('button')
@@ -240,10 +299,10 @@ export function mountKnowledgeFab(state: PanelState, note: NoteWidgetHandle, syn
   const unsubSync = sync.subscribe(renderDot)
 
   void (async () => {
-    const flags = await fetchUiFlags()
+    const [flags, roster] = await Promise.all([fetchUiFlags(), fetchRoster()])
     if (disposed) return
     if (!flags.showQuickNote && !flags.showPanelStatus && !flags.showSyncButton) return
-    build(flags)
+    build(flags, roster)
   })()
 
   return () => {

package/src/client/markdown-editor.ts

@@ -1,128 +1,128 @@
-/**
- * CodeMirror 6 Markdown editor for the quick-note widget (replaces the
- * hand-rolled regex highlighter in the old markdown.ts — real Lezer syntax
- * tree, proper GFM coverage, undo/redo, and a native editing surface).
- *
- * The widget stays a plain-DOM product: CodeMirror is framework-agnostic, so
- * no React is pulled in. The editor is built into a wrapper `<div>`
- * (`.dsh-tw-note-editor`) that the widget can append, drag-drop onto, and
- * re-read via `getValue()`/`setValue()`.
- *
- * Theming follows the DSH design tokens (`--dsw-alias-*`) through a
- * `HighlightStyle` that maps Markdown tags onto the same palette the old
- * `.md-*` rules used, so light/dark both look right.
- *
- * @module dsh-tiddlywiki/client/markdown-editor
- */
-import { EditorView, keymap, placeholder, drawSelection } from '@codemirror/view'
-import { EditorState } from '@codemirror/state'
-import { markdown, markdownLanguage } from '@codemirror/lang-markdown'
-import { syntaxHighlighting, HighlightStyle } from '@codemirror/language'
-import { defaultKeymap, history, historyKeymap } from '@codemirror/commands'
-import { tags as t } from '@lezer/highlight'
-
-/** Design-token aliases (same values as styles.ts / the old .md-* rules). */
-const BRAND = 'var(--dsw-alias-brand-primary, #3e63dd)'
-const BRAND_DIM = 'color-mix(in srgb, var(--dsw-alias-brand-primary, #3e63dd) 55%, transparent)'
-const SECONDARY = 'var(--dsw-alias-label-secondary, #888)'
-const DIMMED = 'var(--dsw-alias-label-dimmed, #999)'
-const MONO = 'ui-monospace, "Cascadia Mono", Consolas, "SF Mono", Menlo, monospace'
-const CODE_BG = 'color-mix(in srgb, var(--dsw-alias-label-secondary, #888) 12%, transparent)'
-const CODE_BLOCK_BG = 'color-mix(in srgb, var(--dsw-alias-label-secondary, #888) 8%, transparent)'
-
-/** Markdown token → design-token style map (mirrors the old .md-* palette). */
-const mdHighlight = HighlightStyle.define([
-  // Headings (# … ######) — brand + bold.
-  { tag: [t.heading1, t.heading2, t.heading3, t.heading4, t.heading5, t.heading6], color: BRAND, fontWeight: '700' },
-  // Markers: #, >, -, *, `, [ ] etc.
-  { tag: t.processingInstruction, color: BRAND_DIM },
-  // Inline code + fenced code text — monospace, tinted background.
-  { tag: t.monospace, fontFamily: MONO, backgroundColor: CODE_BG, borderRadius: '4px', padding: '0 3px' },
-  // Code block content (inside a fence) gets a slightly wider tint.
-  { tag: t.content, fontFamily: MONO, backgroundColor: CODE_BLOCK_BG },
-  { tag: t.strong, fontWeight: '700' },
-  { tag: t.emphasis, fontStyle: 'italic' },
-  { tag: t.strikethrough, textDecoration: 'line-through', opacity: '.75' },
-  { tag: t.link, color: BRAND, textDecoration: 'underline' },
-  { tag: t.url, color: BRAND_DIM, textDecoration: 'underline dotted' },
-  { tag: t.quote, fontStyle: 'italic', color: SECONDARY },
-  { tag: t.contentSeparator, color: DIMMED, textDecoration: 'line-through' },
-  { tag: t.comment, color: DIMMED },
-])
-
-/** Public editor surface the quick-note widget consumes. */
-export interface MarkdownEditor {
-  /** Wrapper element (append/drag-target). */
-  el: HTMLDivElement
-  /** The CodeMirror EditorView (advanced use / future extensions). */
-  view: EditorView
-  getValue(): string
-  setValue(value: string): void
-  /** Insert a Markdown line at the current caret (used by file upload). */
-  insertAtCaret(markdown: string): void
-  focus(): void
-}
-
-export interface MarkdownEditorOptions {
-  /** Placeholder text shown when the doc is empty. */
-  placeholder?: string
-  /** Called on Ctrl/Cmd+Enter (wired after save is defined by the widget). */
-  onSave?: () => void
-  /** Called after every doc change (used for draft auto-save). */
-  onChange?: () => void
-}
-
-/**
- * Build a CodeMirror 6 Markdown editor inside `.dsh-tw-note-editor`.
- * GFM base language (strikethrough, tables, task lists, autolinks) — strictly
- * more coverage than the old regex highlighter.
- */
-export function buildMarkdownEditor(opts: MarkdownEditorOptions = {}): MarkdownEditor {
-  const wrap = document.createElement('div')
-  wrap.className = 'dsh-tw-note-editor'
-
-  const view = new EditorView({
-    parent: wrap,
-    state: EditorState.create({
-      doc: '',
-      extensions: [
-        EditorView.lineWrapping,
-        history(),
-        markdown({ base: markdownLanguage }),
-        syntaxHighlighting(mdHighlight),
-        drawSelection(),
-        placeholder(opts.placeholder ?? ''),
-        keymap.of([
-          ...defaultKeymap,
-          ...historyKeymap,
-          { key: 'Mod-Enter', run: () => { opts.onSave?.(); return true } },
-        ]),
-        EditorView.updateListener.of((update) => {
-          if (update.docChanged) opts.onChange?.()
-        }),
-      ],
-    }),
-  })
-
-  return {
-    el: wrap,
-    view,
-    getValue: () => view.state.doc.toString(),
-    setValue(value: string) {
-      view.dispatch({ changes: { from: 0, to: view.state.doc.length, insert: value } })
-    },
-    insertAtCaret(markdownLine: string) {
-      const { from } = view.state.selection.main
-      const line = view.state.doc.lineAt(from)
-      const atLineStart = from === line.from
-      const insert = `${atLineStart ? '' : '\n'}${markdownLine}\n`
-      view.dispatch({
-        changes: { from, insert },
-        selection: { anchor: from + insert.length },
-        scrollIntoView: true,
-      })
-      view.focus()
-    },
-    focus: () => view.focus(),
-  }
-}
+/**
+ * CodeMirror 6 Markdown editor for the quick-note widget (replaces the
+ * hand-rolled regex highlighter in the old markdown.ts — real Lezer syntax
+ * tree, proper GFM coverage, undo/redo, and a native editing surface).
+ *
+ * The widget stays a plain-DOM product: CodeMirror is framework-agnostic, so
+ * no React is pulled in. The editor is built into a wrapper `<div>`
+ * (`.dsh-tw-note-editor`) that the widget can append, drag-drop onto, and
+ * re-read via `getValue()`/`setValue()`.
+ *
+ * Theming follows the DSH design tokens (`--dsw-alias-*`) through a
+ * `HighlightStyle` that maps Markdown tags onto the same palette the old
+ * `.md-*` rules used, so light/dark both look right.
+ *
+ * @module dsh-tiddlywiki/client/markdown-editor
+ */
+import { EditorView, keymap, placeholder, drawSelection } from '@codemirror/view'
+import { EditorState } from '@codemirror/state'
+import { markdown, markdownLanguage } from '@codemirror/lang-markdown'
+import { syntaxHighlighting, HighlightStyle } from '@codemirror/language'
+import { defaultKeymap, history, historyKeymap } from '@codemirror/commands'
+import { tags as t } from '@lezer/highlight'
+
+/** Design-token aliases (same values as styles.ts / the old .md-* rules). */
+const BRAND = 'var(--dsw-alias-brand-primary, #3e63dd)'
+const BRAND_DIM = 'color-mix(in srgb, var(--dsw-alias-brand-primary, #3e63dd) 55%, transparent)'
+const SECONDARY = 'var(--dsw-alias-label-secondary, #888)'
+const DIMMED = 'var(--dsw-alias-label-dimmed, #999)'
+const MONO = 'ui-monospace, "Cascadia Mono", Consolas, "SF Mono", Menlo, monospace'
+const CODE_BG = 'color-mix(in srgb, var(--dsw-alias-label-secondary, #888) 12%, transparent)'
+const CODE_BLOCK_BG = 'color-mix(in srgb, var(--dsw-alias-label-secondary, #888) 8%, transparent)'
+
+/** Markdown token → design-token style map (mirrors the old .md-* palette). */
+const mdHighlight = HighlightStyle.define([
+  // Headings (# … ######) — brand + bold.
+  { tag: [t.heading1, t.heading2, t.heading3, t.heading4, t.heading5, t.heading6], color: BRAND, fontWeight: '700' },
+  // Markers: #, >, -, *, `, [ ] etc.
+  { tag: t.processingInstruction, color: BRAND_DIM },
+  // Inline code + fenced code text — monospace, tinted background.
+  { tag: t.monospace, fontFamily: MONO, backgroundColor: CODE_BG, borderRadius: '4px', padding: '0 3px' },
+  // Code block content (inside a fence) gets a slightly wider tint.
+  { tag: t.content, fontFamily: MONO, backgroundColor: CODE_BLOCK_BG },
+  { tag: t.strong, fontWeight: '700' },
+  { tag: t.emphasis, fontStyle: 'italic' },
+  { tag: t.strikethrough, textDecoration: 'line-through', opacity: '.75' },
+  { tag: t.link, color: BRAND, textDecoration: 'underline' },
+  { tag: t.url, color: BRAND_DIM, textDecoration: 'underline dotted' },
+  { tag: t.quote, fontStyle: 'italic', color: SECONDARY },
+  { tag: t.contentSeparator, color: DIMMED, textDecoration: 'line-through' },
+  { tag: t.comment, color: DIMMED },
+])
+
+/** Public editor surface the quick-note widget consumes. */
+export interface MarkdownEditor {
+  /** Wrapper element (append/drag-target). */
+  el: HTMLDivElement
+  /** The CodeMirror EditorView (advanced use / future extensions). */
+  view: EditorView
+  getValue(): string
+  setValue(value: string): void
+  /** Insert a Markdown line at the current caret (used by file upload). */
+  insertAtCaret(markdown: string): void
+  focus(): void
+}
+
+export interface MarkdownEditorOptions {
+  /** Placeholder text shown when the doc is empty. */
+  placeholder?: string
+  /** Called on Ctrl/Cmd+Enter (wired after save is defined by the widget). */
+  onSave?: () => void
+  /** Called after every doc change (used for draft auto-save). */
+  onChange?: () => void
+}
+
+/**
+ * Build a CodeMirror 6 Markdown editor inside `.dsh-tw-note-editor`.
+ * GFM base language (strikethrough, tables, task lists, autolinks) — strictly
+ * more coverage than the old regex highlighter.
+ */
+export function buildMarkdownEditor(opts: MarkdownEditorOptions = {}): MarkdownEditor {
+  const wrap = document.createElement('div')
+  wrap.className = 'dsh-tw-note-editor'
+
+  const view = new EditorView({
+    parent: wrap,
+    state: EditorState.create({
+      doc: '',
+      extensions: [
+        EditorView.lineWrapping,
+        history(),
+        markdown({ base: markdownLanguage }),
+        syntaxHighlighting(mdHighlight),
+        drawSelection(),
+        placeholder(opts.placeholder ?? ''),
+        keymap.of([
+          ...defaultKeymap,
+          ...historyKeymap,
+          { key: 'Mod-Enter', run: () => { opts.onSave?.(); return true } },
+        ]),
+        EditorView.updateListener.of((update) => {
+          if (update.docChanged) opts.onChange?.()
+        }),
+      ],
+    }),
+  })
+
+  return {
+    el: wrap,
+    view,
+    getValue: () => view.state.doc.toString(),
+    setValue(value: string) {
+      view.dispatch({ changes: { from: 0, to: view.state.doc.length, insert: value } })
+    },
+    insertAtCaret(markdownLine: string) {
+      const { from } = view.state.selection.main
+      const line = view.state.doc.lineAt(from)
+      const atLineStart = from === line.from
+      const insert = `${atLineStart ? '' : '\n'}${markdownLine}\n`
+      view.dispatch({
+        changes: { from, insert },
+        selection: { anchor: from + insert.length },
+        scrollIntoView: true,
+      })
+      view.focus()
+    },
+    focus: () => view.focus(),
+  }
+}

package/src/client/panel.ts

@@ -30,6 +30,7 @@ import type { PanelState } from './state.ts'
 import { ENTRY_SELECTOR } from './sidebar-entry.ts'
 // 事件名与 frame 生命周期助手都只有一份，住在 tw-frame.ts（内核）。
 import { ACTIVATE_EVENT, createTwFrameSurface, openTiddlerInLiveTab, type TwFrameSkin } from './tw-frame.ts'
+import { getFocusWiki } from './wiki-focus.ts'
 
 /**
  * Center-column targets, most-specific shell generation first. The official
@@ -125,7 +126,7 @@ export function mountPanel(state: PanelState): () => void {
   let lastHasHost: boolean | undefined
 
   /** iframe + /status lifecycle (shared with the rightbar tab, tw-frame.ts). */
-  const surface = createTwFrameSurface(PANEL_SKIN)
+  const surface = createTwFrameSurface(PANEL_SKIN, { wikiId: getFocusWiki })
 
   /** Pin the overlay to the center column's current viewport rect. */
   const syncRect = (): void => {