dsh-tiddlywiki 0.7.4 → 0.8.0

package/src/host/config.ts

@@ -16,6 +16,12 @@ import type { TiddlyWebClient } from './tw-api.ts'
 /** Config tiddler (JSON string) where the settings page stores overrides. */
 export const CONFIG_TIDDLER = '$:/plugins/dsh-tiddlywiki/config'
 
+/**
+ * Default dark palette the embedded TW switches to when DSH is dark
+ * (mirrored in src/client/theme-sync.ts — the two bundles cannot share code).
+ */
+export const DARK_PALETTE_DEFAULT = '$:/palettes/CupertinoDark'
+
 /** Extensible, loose plugin config shape (future fields just appear here). */
 export interface PluginConfigShape {
   note?: { tag?: string }
@@ -27,6 +33,14 @@ export interface PluginConfigShape {
     showPanelStatus?: boolean
     /** 是否在界面右下角显示「同步」悬浮按钮（默认 true）。 */
     showSyncButton?: boolean
+    /**
+     * 嵌入式 TW 是否跟随 DSH 深浅主题（默认 true）：DSH 暗色时把 TW 活动
+     * palette 临时切到 `darkPalette`，浅色时恢复用户原 palette；仅内存生效，
+     * 不会写回 wiki。
+     */
+    followDshTheme?: boolean
+    /** DSH 暗色时 TW 使用的 palette tiddler 标题（默认 CupertinoDark）。 */
+    darkPalette?: string
     /**
      * 一键发送给 Agent（TW 笔记 → DSH 会话注入）。
      * `enabled: false` 时路由 403、TW 端按钮点击提示未启用；`token` 非空时

package/src/host/routes.ts

@@ -83,11 +83,15 @@ export interface WorkspaceRegistryFace {
   create(path: string, title?: string): Promise<{ id: string; path: string }>
 }
 
-/** Effective UI visibility flags returned by /status (mirror index.ts). */
+/** Effective UI flags returned by /status (mirror index.ts). */
 export interface UiDefaultsPublic {
   showQuickNote: boolean
   showPanelStatus: boolean
   showSyncButton: boolean
+  /** 嵌入式 TW 是否跟随 DSH 深浅主题（false 时客户端停止 palette 同步）。 */
+  followDshTheme: boolean
+  /** DSH 暗色时 TW 使用的 palette tiddler 标题。 */
+  darkPalette: string
 }
 
 export interface RouteDeps {

package/src/index.ts

@@ -23,7 +23,7 @@ import { writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { AutoCommitter, GitFace } from './host/git.ts'
 import { registerRoutes, type SessionControllerFace, type WebServerFace, type WorkspaceRegistryFace } from './host/routes.ts'
-import { ConfigStore, deepMerge, type PluginConfigShape } from './host/config.ts'
+import { ConfigStore, deepMerge, DARK_PALETTE_DEFAULT, 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'
 import { TiddlyWebClient } from './host/tw-api.ts'
@@ -56,7 +56,7 @@ export interface TiddlywikiConfig {
   port?: number
   git?: { autoCommit?: boolean; debounceMs?: number; remote?: string; branch?: string }
   note?: { tag?: string }
-  ui?: { showQuickNote?: boolean; showPanelStatus?: boolean; showSyncButton?: boolean }
+  ui?: { showQuickNote?: boolean; showPanelStatus?: boolean; showSyncButton?: boolean; followDshTheme?: boolean; darkPalette?: string }
   auth?: { username?: string; password?: string }
 }
 
@@ -77,7 +77,7 @@ interface ResolvedConfig {
   port: number
   git: { autoCommit: boolean; debounceMs: number; remote: string; branch: string }
   note: { tag: string }
-  ui: { showQuickNote: boolean; showPanelStatus: boolean; showSyncButton: boolean; sendToAgent: { enabled: boolean } }
+  ui: { showQuickNote: boolean; showPanelStatus: boolean; showSyncButton: boolean; followDshTheme: boolean; darkPalette: string; sendToAgent: { enabled: boolean } }
   auth: { username?: string; password?: string }
 }
 
@@ -87,7 +87,7 @@ const DEFAULTS: ResolvedConfig = {
   port: 0,
   git: { autoCommit: true, debounceMs: 60_000, remote: '', branch: 'main' },
   note: { tag: 'inbox' },
-  ui: { showQuickNote: true, showPanelStatus: true, showSyncButton: true, sendToAgent: { enabled: true } },
+  ui: { showQuickNote: true, showPanelStatus: true, showSyncButton: true, followDshTheme: true, darkPalette: DARK_PALETTE_DEFAULT, sendToAgent: { enabled: true } },
   auth: { username: '', password: '' },
 }
 
@@ -214,11 +214,17 @@ export function apply(ctx: HostCtx, rawConfig: TiddlywikiConfig = {}): void {
     const tag = eff().note?.tag
     return typeof tag === 'string' && tag.trim().length > 0 ? tag : config.note.tag
   }
-  const effectiveUi = (): { showQuickNote: boolean; showPanelStatus: boolean; showSyncButton: boolean } => ({
-    showQuickNote: eff().ui?.showQuickNote !== false,
-    showPanelStatus: eff().ui?.showPanelStatus !== false,
-    showSyncButton: eff().ui?.showSyncButton !== false,
-  })
+  const effectiveUi = (): { showQuickNote: boolean; showPanelStatus: boolean; showSyncButton: boolean; followDshTheme: boolean; darkPalette: string } => {
+    const ui = eff().ui ?? {}
+    const palette = typeof ui.darkPalette === 'string' && ui.darkPalette.trim().length > 0 ? ui.darkPalette.trim() : DARK_PALETTE_DEFAULT
+    return {
+      showQuickNote: ui.showQuickNote !== false,
+      showPanelStatus: ui.showPanelStatus !== false,
+      showSyncButton: ui.showSyncButton !== false,
+      followDshTheme: ui.followDshTheme !== false,
+      darkPalette: palette,
+    }
+  }
 
   const disposers: Array<() => void> = []
   const disposeAll = (): void => {