dsh-tiddlywiki 0.22.2 → 0.22.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-tiddlywiki",
   "description": "TiddlyWiki 5 as the DSH persistent knowledge base: fifteen tiddlywiki_* agent tools (filtered search/recent/tags/batch/rewrite/trash/lint + git sync & conflict resolve), a full TiddlyWiki editor embedded in the GUI center column (same-origin proxy, works over Tailscale/LAN/domain), a right-side wiki tab, a per-session summary tab, a quick-note card with draft auto-save behind a single knowledge FAB, an optional clip bookmarklet that also saves selected images as attachments, and git-based sync with auto-commit. Mounts via the official dsh plugin system — no DSH source changes.",
-  "version": "0.22.2",
+  "version": "0.22.3",
   "type": "module",
   "keywords": [
     "dsh",
@@ -85,7 +85,7 @@
     "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-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-prompt.mjs && npx tsx scripts/verify-status-cache.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-prompt.mjs && node scripts/verify-frame-guards.mjs && npx tsx scripts/verify-status-cache.mjs",
     "verify:e2e": "node scripts/verify-auth.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:large": "node scripts/verify-large-wiki.mjs",
     "verify": "npm run verify:static && npm run verify:unit && npm run verify:e2e && npm run verify:large",

package/src/client/note-widget.ts

@@ -356,7 +356,6 @@ interface BuiltUi {
   draftBanner: HTMLDivElement
   /** 草稿横幅文案（恢复「其它窗口草稿」时改写为带来源的提示）。 */
   bannerText: HTMLSpanElement
-  recentBtn: HTMLButtonElement
   recentWrap: HTMLDivElement
 }
 
@@ -820,7 +819,7 @@ export function createNoteWidget(): NoteWidgetHandle {
     root.append(card, recentWrap)
     document.body.append(root)
 
-    const handle: BuiltUi = { root, card, editor, titleInput, tagEditor, saveBtn, editBtn, draftBanner, bannerText, recentBtn, recentWrap }
+    const handle: BuiltUi = { root, card, editor, titleInput, tagEditor, saveBtn, editBtn, draftBanner, bannerText, recentWrap }
     ui = handle
 
     const close = (): void => {
@@ -1067,8 +1066,10 @@ export function createNoteWidget(): NoteWidgetHandle {
       ui?.tagEditor.dispose()
       ui?.editor.view.destroy()
       ui?.root.remove()
-      const toastEl = document.querySelector<HTMLElement>('.dsh-tw-toast')
-      toastEl?.remove()
+      // NOTE: `.dsh-tw-toast` is deliberately NOT removed here (v0.22.3). It is a
+      // page-level singleton owned by toast.ts and shared with the settings page;
+      // deleting it on this widget's unmount killed a toast another surface was
+      // showing (toast.ts would only re-create it on the next call).
       ui = undefined
     },
   }

package/src/client/panel.ts

@@ -23,8 +23,9 @@
 import type { PanelState } from './state.ts'
 import { ENTRY_SELECTOR } from './sidebar-entry.ts'
 import { attachThemeSync, setThemeSyncConfig } from './theme-sync.ts'
-// 事件名单一来源：两个协议常量由 tw-frame.ts 定义（panel/rightbar 共同依赖）。
-import { ACTIVATE_EVENT, openTiddlerInLiveTab, PANEL_RELOAD_EVENT } from './tw-frame.ts'
+// 事件名单一来源：两个协议常量与 frame 生命周期助手都由 tw-frame.ts 提供
+// （panel/rightbar 共同依赖）。requestRestart 也只此一份（v0.22.3 去重）。
+import { ACTIVATE_EVENT, loadableFrameUrl, openTiddlerInLiveTab, PANEL_RELOAD_EVENT, requestRestart } from './tw-frame.ts'
 
 /**
  * Center-column targets, most-specific shell generation first. The official
@@ -57,7 +58,6 @@ const APP_OVERLAY_Z_INDEX = 20
 /** Safety re-measure cadence for shell layout changes CSS can't see. */
 const SYNC_INTERVAL_MS = 2_000
 
-import { RESTART_ENDPOINT } from './endpoints.ts'
 import { fetchStatus } from './status-cache.ts'
 
 /**
@@ -99,15 +99,6 @@ function conversationColumn(): HTMLElement | undefined {
   return undefined
 }
 
-async function requestRestart(): Promise<boolean> {
-  try {
-    const res = await fetch(RESTART_ENDPOINT, { method: 'POST', signal: AbortSignal.timeout(8_000) })
-    return res.ok
-  } catch {
-    return false
-  }
-}
-
 export function mountPanel(state: PanelState): () => void {
   let container: HTMLDivElement | undefined
   let columnEl: HTMLElement | undefined
@@ -310,8 +301,12 @@ export function mountPanel(state: PanelState): () => void {
   const fallbackLoad = (hash: string): void => {
     if (disposed || iframe === undefined) return // never drive a detached frame
     if (pendingHash === hash) pendingHash = null
-    const base = iframe.src.split('#')[0]
-    if (iframe.src !== `${base}${hash}`) iframe.src = `${base}${hash}`
+    // dataset.loaded（showFrame 只写这个）而不是 iframe.src：src 为空时读出来
+    // 是**DSH 页面自己的 URL**，赋 `'' + '#标题'` 会把 DSH 载进 iframe（v0.22.3）。
+    const base = loadableFrameUrl(iframe.dataset)
+    if (base === null) return
+    const next = `${base.split('#')[0]}${hash}`
+    if (iframe.src !== next) iframe.src = next
   }
 
   const onOpenTiddler = (event: Event): void => {
@@ -439,10 +434,13 @@ export function mountPanel(state: PanelState): () => void {
   // The "知识库" FAB's 重载面板 entry dispatches this event to reload the
   // iframe (the panel itself no longer owns a floating status/reload button).
   const onReloadRequest = (): void => {
-    // `!iframe.hidden` 在 showFrame 修正后仍然成立：iframe 只在「面板打开 + 服务
-    // running」时被显示，因此 !hidden ⇒ 面板开着且已加载真实 twProxy 地址（也避免
-    // 对尚未设置 src 的 iframe 赋值空串把 DSH 页面载进自身）。
-    if (iframe !== undefined && !iframe.hidden) iframe.src = iframe.src
+    // 只有真的载入过 TW 代理地址的 iframe 才允许重载：`!iframe.hidden` 已经不足
+    // 以证明这一点（showFrame 之外，iframe 也可能是「面板打开但首个 /status 还在
+    // 途」），而 `iframe.src = iframe.src` 在 src 为空串时会把 **DSH 页面**载进
+    // iframe（v0.22.3）。判据统一用 dataset.loaded（只由 showFrame 写）。
+    if (iframe === undefined) return
+    const loaded = loadableFrameUrl(iframe.dataset)
+    if (loaded !== null && !iframe.hidden) iframe.src = loaded
   }
   document.addEventListener(PANEL_RELOAD_EVENT, onReloadRequest)
   document.addEventListener(OPEN_TIDDLER_EVENT, onOpenTiddler)

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

@@ -38,13 +38,21 @@ export function createQuickNoteDock(note: NoteWidgetHandle): () => React.ReactEl
     const wrapRef = React.useRef<HTMLDivElement | null>(null)
     const btnRef = React.useRef<HTMLButtonElement | null>(null)
     React.useEffect(() => {
+      // alive 守卫（v0.22.3）：卸载后不再 setState；fetchUiConfig 带 TTL 缓存但
+      // 首次调用会真的发请求，回调可能在组件卸载之后才 resolve。
+      let alive = true
       const onState = (event: Event): void => {
         const detail = (event as CustomEvent<{ open?: boolean }>).detail
         setOpen(detail?.open === true)
       }
       window.addEventListener(NOTE_STATE_EVENT, onState)
-      void fetchUiConfig().then((cfg) => setMode(cfg.quickNoteMode))
-      return () => window.removeEventListener(NOTE_STATE_EVENT, onState)
+      void fetchUiConfig().then((cfg) => {
+        if (alive) setMode(cfg.quickNoteMode)
+      })
+      return () => {
+        alive = false
+        window.removeEventListener(NOTE_STATE_EVENT, onState)
+      }
     }, [])
     React.useLayoutEffect(() => {
       const wrap = wrapRef.current

package/src/client/rightbar-tab.ts

@@ -112,7 +112,8 @@ export function TwRightbarTabBody(props: RightbarTabBodyProps): React.ReactEleme
     return () => document.removeEventListener(ACTIVATE_EVENT, onActivate)
   }, [visible, close])
 
-  return React.createElement('div', { ref: hostRef, className: 'dsh-tw-rightbar-tab', 'data-dsh-tw-rightbar': '' })
+  // 不再挂 `data-dsh-tw-rightbar`（v0.22.3）：没有任何选择器/代码消费它。
+  return React.createElement('div', { ref: hostRef, className: 'dsh-tw-rightbar-tab' })
 }
 
 /** The tab definition (stage 1): a page type opened by kind, with a guide entry box. */

package/src/client/session-summary.ts

@@ -95,6 +95,13 @@ function SessionSummaryView(props: SessionSummaryViewProps): React.ReactElement
   const [summaryTitle, setSummaryTitle] = React.useState<string | null>(null)
   const [error, setError] = React.useState('')
   const genRef = React.useRef(0)
+  /**
+   * 卸载守卫（v0.22.3）：genRef 只能识别「被更新的一次 generate 取代」，覆盖不到
+   * 卸载——组件卸载后 genRef 不再变化，在途的 fetch 一 resolve 就会 setState，并
+   * 在「条目缺失」分支里再递归触发一轮请求（clearInterval 挡不住已在途的那次）。
+   * 置 false 的效果排在同组件其它 effect 之前执行，所以清理顺序不影响它。
+   */
+  const mountedRef = React.useRef(true)
   /**
    * 统一「连续失败计数」：任何一次 generate() 失败（HTTP 失败 / 缺标题 / 渲染
    * 服务不可用 / 条目缺失 / 抛错）都递增，任何一次成功归零。达到 MAX_MISSES 后
@@ -105,6 +112,8 @@ function SessionSummaryView(props: SessionSummaryViewProps): React.ReactElement
 
   const generate = React.useCallback(async (): Promise<void> => {
     const gen = ++genRef.current
+    // 卸载后不再发起新一轮（含「条目缺失 → 自动重建」的递归调用）。
+    if (!mountedRef.current) return
     setPhase('loading')
     if (typeof sessionId !== 'string' || sessionId.length === 0) {
       setPhase('error')
@@ -125,7 +134,7 @@ function SessionSummaryView(props: SessionSummaryViewProps): React.ReactElement
         signal: AbortSignal.timeout(25_000),
       })
       const data = (await res.json().catch(() => null)) as { ok?: boolean; title?: string; error?: string } | null
-      if (gen !== genRef.current) return
+      if (!mountedRef.current || gen !== genRef.current) return
       if (!res.ok || data?.ok !== true) {
         failuresRef.current++
         setPhase('error')
@@ -142,12 +151,12 @@ function SessionSummaryView(props: SessionSummaryViewProps): React.ReactElement
       // 原生渲染：wikitext → HTML 片段（块解析，标题/表格/列表/引用齐全，
       // 链接已重写为 /dsh-tiddlywiki/tw/#标题，点击由全局拦截器接管）。
       const fragment = await fetchRenderFragment(data.title)
-      if (gen !== genRef.current) return
+      if (!mountedRef.current || gen !== genRef.current) return
       if (fragment === null) {
         // 区分「条目被清（TW 重启把 $:/temp 冲掉了）」与「渲染服务不可用」：
         // 前者自动重建（受 MAX_MISSES 约束，有界），后者直接报错交还手动重试。
         const exists = await tiddlerExists(data.title)
-        if (gen !== genRef.current) return
+        if (!mountedRef.current || gen !== genRef.current) return
         if (!exists) {
           failuresRef.current++
           if (failuresRef.current < MAX_MISSES) {
@@ -167,7 +176,7 @@ function SessionSummaryView(props: SessionSummaryViewProps): React.ReactElement
       setHtml(fragment)
       setPhase('ready')
     } catch (err) {
-      if (gen !== genRef.current) return
+      if (!mountedRef.current || gen !== genRef.current) return
       failuresRef.current++
       setPhase('error')
       setError(err instanceof Error ? err.message : String(err))
@@ -175,8 +184,13 @@ function SessionSummaryView(props: SessionSummaryViewProps): React.ReactElement
   }, [sessionId])
 
   // 进入 tab 自动触发生成；切走再切回会重新挂载 → 再次生成（总是最新）。
+  // 卸载时置 mountedRef=false：在途请求 resolve 后不再 setState / 不再递归重建。
   React.useEffect(() => {
+    mountedRef.current = true
     void generate()
+    return () => {
+      mountedRef.current = false
+    }
   }, [generate])
 
   // 自愈：汇总条目是 volatile 的 `$:/temp`，TW 重启即消失；若已就绪但条目

package/src/client/settings-page.ts

@@ -49,7 +49,7 @@ interface CatalogEntry {
 interface AdminState {
   ok?: boolean
   server?: { status?: string; url?: string; wikiPath?: string; error?: string }
-  info?: { plugins?: string[]; themes?: string[]; languages?: string[] }
+  info?: { plugins?: string[]; themes?: string[]; languages?: string[]; themeActive?: string }
   catalog?: { plugins?: CatalogEntry[]; themes?: CatalogEntry[]; languages?: CatalogEntry[] }
   config?: Record<string, unknown>
   git?: { exists?: boolean; branch?: string; dirty?: boolean; lastCommit?: string; remote?: string } | null
@@ -101,7 +101,6 @@ async function fetchJson<T>(url: string, init?: RequestInit): Promise<T> {
 /** Form controls registry for the config section (changed-only patch). */
 interface ConfigField {
   key: string
-  input: HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement
   initial: string | boolean | number
   read: () => string | boolean | number
   changed: () => boolean
@@ -224,7 +223,7 @@ function renderConfigSection(body: HTMLElement, config: Record<string, unknown>,
     input.value = initial
     const wrap = make('label', 'dsh-tw-settings-field')
     wrap.append(make('span', 'dsh-tw-settings-label', label), input)
-    fields.push({ key, input, initial, read: () => input.value.trim(), changed: () => input.value.trim() !== initial })
+    fields.push({ key, initial, read: () => input.value.trim(), changed: () => input.value.trim() !== initial })
     section.append(wrap)
   }
   const checkField = (key: string, label: string, initial: boolean): void => {
@@ -233,7 +232,7 @@ function renderConfigSection(body: HTMLElement, config: Record<string, unknown>,
     input.checked = initial
     const wrap = make('label', 'dsh-tw-settings-field dsh-tw-settings-field-check')
     wrap.append(input, make('span', 'dsh-tw-settings-label', label))
-    fields.push({ key, input, initial, read: () => input.checked, changed: () => input.checked !== initial })
+    fields.push({ key, initial, read: () => input.checked, changed: () => input.checked !== initial })
     section.append(wrap)
   }
   const numField = (key: string, label: string, initial: number): void => {
@@ -250,7 +249,7 @@ function renderConfigSection(body: HTMLElement, config: Record<string, unknown>,
     }
     const wrap = make('label', 'dsh-tw-settings-field')
     wrap.append(make('span', 'dsh-tw-settings-label', label), input)
-    fields.push({ key, input, initial, read, changed: () => read() !== initial })
+    fields.push({ key, initial, read, changed: () => read() !== initial })
     section.append(wrap)
   }
   const selectField = (key: string, label: string, initial: string, options: Array<{ value: string; label: string }>): void => {
@@ -264,7 +263,7 @@ function renderConfigSection(body: HTMLElement, config: Record<string, unknown>,
     }
     const wrap = make('label', 'dsh-tw-settings-field')
     wrap.append(make('span', 'dsh-tw-settings-label', label), select)
-    fields.push({ key, input: select, initial, read: () => select.value, changed: () => select.value !== initial })
+    fields.push({ key, initial, read: () => select.value, changed: () => select.value !== initial })
     section.append(wrap)
   }
   /**
@@ -279,7 +278,7 @@ function renderConfigSection(body: HTMLElement, config: Record<string, unknown>,
     input.value = initial
     const wrap = make('label', 'dsh-tw-settings-field dsh-tw-settings-field-area')
     wrap.append(make('span', 'dsh-tw-settings-label', label), input)
-    fields.push({ key, input, initial, read: () => input.value.trim(), changed: () => input.value.trim() !== initial })
+    fields.push({ key, initial, read: () => input.value.trim(), changed: () => input.value.trim() !== initial })
     section.append(wrap)
     return input
   }
@@ -477,7 +476,18 @@ function renderCatalogSection(
     make('span', 'dsh-tw-settings-name', '主题'),
   )
   const themeList = info?.themes ?? []
-  let activeThemeName = themeList.length > 0 ? themeList[themeList.length - 1] : 'tiddlywiki/vanilla'
+  // The ACTIVE theme comes from the host (`$:/theme`, v0.22.3). Deriving it from
+  // the last loaded entry was a guess: with an explicitly activated non-last
+  // theme the wrong radio showed up checked, and one click on 应用主题 (without
+  // touching the radios) rewrote `$:/theme` to that wrong pick. Guessing stays
+  // as the fallback only when the host cannot tell (wiki down / no `$:/theme`).
+  const activeFromServer = info?.themeActive
+  let activeThemeName =
+    typeof activeFromServer === 'string' && themes.some((theme) => theme.name === activeFromServer)
+      ? activeFromServer
+      : themeList.length > 0
+        ? themeList[themeList.length - 1]
+        : 'tiddlywiki/vanilla'
   const themeWrap = make('div', 'dsh-tw-settings-list')
   for (const theme of themes) {
     const load = make('input', 'dsh-tw-settings-check')

package/src/client/theme-sync.ts

@@ -224,18 +224,33 @@ function syncColorScheme($tw: NonNullable<TwRuntime['$tw']>, frame: HTMLIFrameEl
   }
 }
 
-/** Apply the current DSH theme to one TW iframe (no-op until TW is ready). */
+/**
+ * Apply the current DSH theme to one TW iframe (no-op until TW is ready).
+ *
+ * Every path in here is best-effort and MUST NOT throw: `setThemeSyncConfig()`
+ * calls the registered appliers synchronously from inside `doRefresh()`'s
+ * `await` chain, so one exception becomes an unhandled rejection (and skips the
+ * rest of that refresh) for every caller — including the two surfaces that
+ * mount this on the frame's `load` event. The access below is the sharp edge:
+ * as soon as the frame navigates somewhere cross-origin (a link inside the
+ * embedded TW), reading `contentWindow.$tw` itself raises SecurityError — the
+ * inner helpers' try/catch blocks never get a chance to run.
+ */
 function applyToFrame(frame: HTMLIFrameElement): void {
-  const $tw = (frame.contentWindow as TwRuntime | null)?.$tw
-  if ($tw === undefined || $tw.wiki === undefined) return
-  installPaletteSaveGuard($tw)
-  if (syncEnabled) {
-    applyPalette($tw, readDshDark())
-  } else {
-    // Feature off → undo any palette we forced (leave the user's own choice).
-    applyPalette($tw, false)
+  try {
+    const $tw = (frame.contentWindow as TwRuntime | null)?.$tw
+    if ($tw === undefined || $tw.wiki === undefined) return
+    installPaletteSaveGuard($tw)
+    if (syncEnabled) {
+      applyPalette($tw, readDshDark())
+    } else {
+      // Feature off → undo any palette we forced (leave the user's own choice).
+      applyPalette($tw, false)
+    }
+    syncColorScheme($tw, frame)
+  } catch {
+    // Cross-origin frame, TW not booted, detached frame: the next pass retries.
   }
-  syncColorScheme($tw, frame)
 }
 
 /**

package/src/client/tool-views.ts

@@ -227,7 +227,9 @@ function ToolCardShell(props: {
           ? React.createElement(
               'span',
               { className: 'dsh-tw-toolcard-tags' },
-              ...props.tags.map((tag) => React.createElement('span', { className: 'dsh-tw-toolcard-tag', key: tag }, tag)),
+              // index in the key: a tiddler can carry the same tag twice (TW does
+              // not dedup), and duplicate keys make React drop/reshuffle chips.
+              ...props.tags.map((tag, index) => React.createElement('span', { className: 'dsh-tw-toolcard-tag', key: `${index}-${tag}` }, tag)),
             )
           : null,
       )

package/src/client/tw-frame.ts

@@ -42,7 +42,9 @@ export function getTabLabel(): string {
   return tabLabel
 }
 
-async function requestRestart(): Promise<boolean> {  try {
+/** POST /restart; `false` on any failure. Shared by both TW surfaces (v0.22.3). */
+export async function requestRestart(): Promise<boolean> {
+  try {
     const res = await fetch(RESTART_ENDPOINT, { method: 'POST', signal: AbortSignal.timeout(8_000) })
     return res.ok
   } catch {
@@ -60,6 +62,30 @@ export function TwTabIcon({ size = 16, className }: { size?: number; className?:
   )
 }
 
+/**
+ * The last URL a TW surface actually assigned to its iframe, or null when the
+ * frame never loaded one. Both surfaces cache it in `iframe.dataset.loaded`
+ * (only `showFrame` writes it), which keeps "is this frame pointing at the TW
+ * proxy?" answerable without trusting `src` — see `loadableFrameUrl`.
+ */
+export interface FrameLoadedState {
+  loaded?: string
+}
+
+/**
+ * Non-empty `dataset.loaded`, or null when the frame has no real URL yet
+ * (v0.22.3). NEVER read `iframe.src` for this: for an iframe whose `src`
+ * attribute was never assigned the property returns the EMBEDDING page's URL,
+ * and assigning it back to `src` makes the DSH GUI load itself inside the
+ * iframe (a second DSH instance: duplicate FAB, duplicated global listeners,
+ * blank white page). Both callers below drive a full reload, so they must
+ * refuse to touch a frame that has no loaded TW URL.
+ */
+export function loadableFrameUrl(dataset: FrameLoadedState): string | null {
+  const loaded = dataset.loaded
+  return loaded === undefined || loaded.length === 0 ? null : loaded
+}
+
 /** The plain-DOM TW frame controller owned by one surface body. */
 export interface TwFrameController {
   /** Reflect the surface's visibility; loads lazily on the first show. */
@@ -236,8 +262,12 @@ export function createTwFrameController(host: HTMLElement, signal: AbortSignal):
   const fallbackLoad = (hash: string): void => {
     if (disposed) return
     if (pendingHash === hash) pendingHash = null
-    const base = frame.src.split('#')[0]
-    if (frame.src !== `${base}${hash}`) frame.src = `${base}${hash}`
+    // Guard against the never-loaded frame: `frame.src` is '' before showFrame
+    // ran, and `'' + '#title'` resolves against the DSH page URL (v0.22.3).
+    const base = loadableFrameUrl(frame.dataset)
+    if (base === null) return
+    const next = `${base.split('#')[0]}${hash}`
+    if (frame.src !== next) frame.src = next
   }
 
   const doRefresh = async (): Promise<void> => {
@@ -282,7 +312,13 @@ export function createTwFrameController(host: HTMLElement, signal: AbortSignal):
   }
 
   const onReloadRequest = (): void => {
-    if (!frame.hidden) frame.src = frame.src
+    // Reload = re-assign the URL the frame is ALREADY showing (full reload, so
+    // TW re-reads the wiki; `location.reload()` could be blocked mid-edit).
+    // `hidden` alone is not enough (v0.22.3): setVisible(true) reveals the frame
+    // before the first /status response sets its src, and `frame.src = frame.src`
+    // with `src === ''` loads the DSH page into the iframe.
+    const loaded = loadableFrameUrl(frame.dataset)
+    if (loaded !== null && !frame.hidden) frame.src = loaded
   }
   document.addEventListener(PANEL_RELOAD_EVENT, onReloadRequest)
 
@@ -295,15 +331,17 @@ export function createTwFrameController(host: HTMLElement, signal: AbortSignal):
       if (!started) {
         // Nothing loaded yet: stay hidden until the first show kicks the load.
         frame.hidden = true
-        view.dataset.visible = next ? '1' : '0'
         if (next) {
           started = true
           void doRefresh()
         }
         return
       }
+      // Revealing before the first /status response is harmless as long as
+      // every src-writing path checks `dataset.loaded` (onReloadRequest /
+      // fallbackLoad), which also keeps the surface visible while a switch to
+      // another wiki re-resolves its URL.
       frame.hidden = !next
-      view.dataset.visible = next ? '1' : '0'
       // 每次重新显示都重探一次状态：启动轮询是有界的（30×1.5s），首次打开时
       // 服务没起来就会把错误界面永久固定（切走再切回也不恢复）。doRefresh 自己
       // 会清旧 timer，不会重复轮询。

package/src/host/admin.ts

@@ -155,6 +155,28 @@ export async function ensurePlugin(wikiPath: string, twRoot: string, name: strin
   return true
 }
 
+/**
+ * The theme the TW runtime is ACTUALLY showing, as a catalog-style name
+ * (`tiddlywiki/heavier`), or undefined when unknown (wiki down, no `$:/theme`).
+ *
+ * `$:/theme` holds the active theme title and is normally written as
+ * `$:/themes/<name>` (that is what this route's own POST writes), but a user
+ * who picked a theme in TW's Control Panel can leave the fully-qualified
+ * title there — strip the prefix so both shapes compare against the catalog.
+ * Without this the settings page could only guess "the last loaded theme"
+ * (v0.22.3), and one click on 应用主题 silently overwrote the real choice.
+ */
+export async function readActiveThemeName(client: TiddlyWebClient | undefined): Promise<string | undefined> {
+  try {
+    const tiddler = await client?.get('$:/theme')
+    const raw = typeof tiddler?.text === 'string' ? tiddler.text.trim() : ''
+    if (raw.length === 0) return undefined
+    return raw.startsWith('$:/themes/') ? raw.slice('$:/themes/'.length) : raw
+  } catch {
+    return undefined
+  }
+}
+
 /** Enumerate bundled official plugins + themes + languages of tiddlywiki. */
 export async function bundledCatalog(twRoot: string): Promise<Catalog> {
   // TW themes are SKINS layered on the vanilla base (which carries the full
@@ -443,11 +465,16 @@ export function registerAdminRoutes(ctx: { webServer: WebServerFace }, deps: Adm
         git = null
       }
       const view = deps.server.status()
+      // Which theme the runtime actually shows (v0.22.3): the settings page used
+      // to derive it from the LAST entry of info.themes, so a non-last active
+      // theme displayed the wrong radio — and re-applying it (even without
+      // touching the radios) rewrote `$:/theme` to that wrong pick.
+      const themeActive = await readActiveThemeName(deps.getClient())
       json(res, {
         ok: true,
         // Same redaction as GET /status: this route is unauthenticated too.
         server: { ...view, logs: redactLogLines(view.logs) },
-        info: { plugins: info.plugins, themes: info.themes, languages: info.languages ?? [] },
+        info: { plugins: info.plugins, themes: info.themes, languages: info.languages ?? [], themeActive },
         catalog,
         config: maskConfigSecrets(deps.config.get()),
         git,

package/src/index.ts

@@ -71,7 +71,7 @@ export {
 export { openInTwEditor, registerRoutes } from './host/routes.ts'
 export { writeSessionSummary, SESSION_SUMMARY_PREFIX } from './host/routes.ts'
 export type { SessionQueryFace, SessionSummaryResult } from './host/routes.ts'
-export { registerAdminRoutes, resolveTwRoot, readWikiInfo, writeWikiInfo, ensurePlugin, bundledCatalog, ensureLanguage, normalizeThemes, MASKED_SECRET, maskConfigSecrets, stripMaskedSecrets } from './host/admin.ts'
+export { registerAdminRoutes, resolveTwRoot, readWikiInfo, writeWikiInfo, ensurePlugin, bundledCatalog, ensureLanguage, normalizeThemes, readActiveThemeName, MASKED_SECRET, maskConfigSecrets, stripMaskedSecrets } from './host/admin.ts'
 export { escapeInline } from './host/session-summary.ts'
 export { seedDocNote, docNoteText, DOC_NOTE_TITLE, DOC_NOTE_TAG, DOC_NOTE_TEXT } from './host/seed-notes.ts'
 export { hashText, parseSeedMarker, readSeedMarker, writeSeedMarker, SEED_MARKER_VERSION } from './host/seed-util.ts'