dsh-tiddlywiki 0.16.19 → 0.16.21

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.16.19",
+  "version": "0.16.21",
   "type": "module",
   "keywords": [
     "dsh",

package/src/client/endpoints.ts

@@ -1,10 +1,10 @@
-/**
- * Same-origin DSH endpoints the client calls. The authoritative route table
- * lives in src/host/routes.ts (see AGENTS.md §1「DSH 路由」) — this is just the
- * client-side mirror, so the path string exists once per endpoint instead of
- * being re-typed in every widget.
- *
- * @module dsh-tiddlywiki/client/endpoints
- */
-export const STATUS_ENDPOINT = '/dsh-tiddlywiki/status'
-export const GET_ENDPOINT = '/dsh-tiddlywiki/get'
+/**
+ * Same-origin DSH endpoints the client calls. The authoritative route table
+ * lives in src/host/routes.ts (see AGENTS.md §1「DSH 路由」) — this is just the
+ * client-side mirror, so the path string exists once per endpoint instead of
+ * being re-typed in every widget.
+ *
+ * @module dsh-tiddlywiki/client/endpoints
+ */
+export const STATUS_ENDPOINT = '/dsh-tiddlywiki/status'
+export const GET_ENDPOINT = '/dsh-tiddlywiki/get'

package/src/client/index.ts

@@ -24,6 +24,7 @@ import { mountSessionSummaryView } from './session-summary.ts'
 import { disposeEditorPopup } from './editor-popup.ts'
 import { SettingsSection } from './settings-page.ts'
 import { registerToolViews, installWikiLinkInterceptor } from './tool-views.ts'
+import { mountRightbarTab, type RightbarSlotsFace } from './rightbar-tab.ts'
 
 /** Client plugin name. */
 export const name = 'dsh-tiddlywiki/client'
@@ -40,9 +41,16 @@ interface ClientContextFace {
       component: unknown,
     ): () => void
   }
+  /** Optional service read without the inject requirement (cordis ctx.get). */
+  get?: (name: string) => unknown
   effect?(fn: () => unknown, label?: string): void
 }
 
+/** Structural face over the rightbar tab registry (dsh-client-ui-sidebar-right). */
+interface SidebarRightTabsFace {
+  register(definition: unknown): () => void
+}
+
 /**
  * Client entry: installs styles and mounts the DOM seats + settings page.
  * @param ctx - the cordis client context.
@@ -91,6 +99,34 @@ export function apply(ctx: ClientContextFace): void {
       // DOM failures degrade the plugin, never the GUI.
       console.error('[dsh-tiddlywiki] mount failed:', error)
     }
+    try {
+      // 右侧边栏（DSH new rightbar）集成：可选挂载——仅当
+      // dsh-client-ui-sidebar-right 提供了 sidebarRightTabs 服务时才启用
+      // （老版本 DSH / 无右侧栏时静默跳过，插件其余功能不受影响）。注册 TW
+      // tab 类型 + guide 首页入口盒；由 ui.showRightbarTab 控制（默认开）。
+      let retryTimer: number | undefined
+      const tryMountRightbar = (attempt: number): void => {
+        const tabs = ctx.get?.('sidebarRightTabs') as SidebarRightTabsFace | undefined
+        if (tabs === undefined) {
+          // rightbar 插件可能在本次 apply 之后才就绪：有限重试几次即可。
+          if (attempt < 6 && !clientDisposed) {
+            retryTimer = window.setTimeout(() => tryMountRightbar(attempt + 1), 500 * (attempt + 1))
+          }
+          return
+        }
+        void fetchUiConfig().then((cfg) => {
+          if (clientDisposed) return
+          if (!cfg.showRightbarTab) return
+          const removeRightbar = mountRightbarTab(tabs, ctx.slots as unknown as RightbarSlotsFace)
+          if (removeRightbar !== undefined) disposers.push(removeRightbar)
+        })
+      }
+      tryMountRightbar(0)
+      disposers.push(() => { if (retryTimer !== undefined) window.clearTimeout(retryTimer) })
+    } catch (error) {
+      // 右侧栏集成失败只影响该功能本身，绝不让整个插件挂掉。
+      console.error('[dsh-tiddlywiki] rightbar mount failed:', error)
+    }
     try {
       // Reply-stream native tool cards: keyed `tool.call.toolview` slots for
       // every tiddlywiki_* tool (additive — our keys are unclaimed).

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

@@ -23,6 +23,7 @@
 import type { PanelState } from './state.ts'
 import { ENTRY_SELECTOR } from './sidebar-entry.ts'
 import { attachThemeSync, setThemeSyncConfig } from './theme-sync.ts'
+import { openTiddlerInRightbar } from './rightbar-tab.ts'
 
 export const PANEL_RELOAD_EVENT = 'dsh-tw-panel-reload'
 
@@ -316,6 +317,9 @@ export function mountPanel(state: PanelState): () => void {
     const detail = (event as CustomEvent).detail as { title?: unknown } | undefined
     const title = typeof detail?.title === 'string' && detail.title.length > 0 ? detail.title : ''
     if (title.length === 0) return
+    // 右侧栏的 TW tab 可见时，链接直接在那里打开（与聊天并排）；否则退回
+    // 中央面板。互斥由 rightbar-tab 的 dsh-panel-activate 协议保证。
+    if (openTiddlerInRightbar(title)) return
     pendingHash = `#${encodeURIComponent(title)}`
     state.openPanel()
     applyPendingHash()