dsh-plugin 1.3.2 → 1.3.3

package/lib/http/routes.js

@@ -19,7 +19,7 @@ import { resolveNpmPackage } from '../services/install/npm-resolve.js';
 import { preflightTarget } from '../services/install/preflight.js';
 import { isDshPlugin, isEntryLoaded } from '../services/loader.js';
 import { loadSettings, saveSettings, resetSettings } from '../services/settings.js';
-import { appendLog, readLog, logFilePath, defaultLogFilePath, customLogFile } from '../services/log.js';
+import { appendLog, clearLog, readLog, logFilePath, defaultLogFilePath, customLogFile } from '../services/log.js';
 const PROFILE_RE = /^[A-Za-z0-9_-]+$/;
 const BODY_LIMIT_BYTES = 4 * 1024;
 const COMMAND_TIMEOUT_MS = 5 * 60 * 1000;
@@ -311,6 +311,27 @@ export function mountPluginHubRoutes(webServer, profile, loader) {
                 }
             },
         }),
+        webServer.register({
+            kind: 'exact',
+            path: '/dsh-plugin-hub/clear-log',
+            handler: (request, response) => {
+                if (!requireTrustedPost(request, response))
+                    return;
+                // 清空所有日志：截断当前日志文件为空
+                try {
+                    const ok = clearLog(profile);
+                    if (!ok) {
+                        sendJson(response, 500, { error: 'failed to clear log' });
+                        return;
+                    }
+                    appendLog(profile, { at: Date.now(), level: 'info', category: 'system', event: 'system.clear', message: '日志已由用户清空' });
+                    sendJson(response, 200, { ok: true });
+                }
+                catch {
+                    sendJson(response, 500, { error: 'failed to clear log' });
+                }
+            },
+        }),
         webServer.register({
             kind: 'exact',
             path: '/dsh-plugin-hub/open-log',

package/lib/services/log.js

@@ -68,6 +68,18 @@ export function appendLog(profile, entry) {
         // 日志失败不阻断主流程
     }
 }
+/** 清空系统日志：把当前日志文件截断为空。失败返回 false（不阻断调用方）。 */
+export function clearLog(profile) {
+    try {
+        const file = logFilePath(profile);
+        mkdirSync(dirname(file), { recursive: true });
+        writeFileSync(file, '');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 /** 兼容旧格式：早期无 category（level 用 info/ok/fail/warn），归一化到新版。 */
 function normalize(raw) {
     if (typeof raw !== 'object' || raw === null)

package/lib/types/services/log.d.ts

@@ -45,5 +45,7 @@ export declare function defaultLogFilePath(profile: string): string;
 export declare function logFilePath(profile: string): string;
 /** 追加一条系统日志（JSONL 一行一条）。 */
 export declare function appendLog(profile: string, entry: LogEntry): void;
+/** 清空系统日志：把当前日志文件截断为空。失败返回 false（不阻断调用方）。 */
+export declare function clearLog(profile: string): boolean;
 /** 读取系统日志（按时间正序，最新在末尾），超上限就地裁剪；支持过滤与分页。 */
 export declare function readLog(profile: string, opts?: ReadLogOptions): ReadLogResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "A community plugin marketplace for DeepSeek Harness, built to the official plugin spec — browse, search and install 4000+ human-curated community plugins without leaving the app. · DeepSeek Harness 社区插件市场（遵循官方开发规范）：4000+ 人工精选社区插件，每日更新。",
   "type": "module",
   "main": "lib/index.js",

package/src/client/components/PluginHubSection.tsx

@@ -15,6 +15,7 @@ import modalStyles from '../styles/Modal.module.css'
 import type { EnvInfo, HubPlugin, SectionProps, ToastState } from '../types.ts'
 import { installCommandOf, repoFromInstallTarget } from '../logic/install-command.ts'
 import { PLUGIN_VERSION } from '../logic/constants.ts'
+import { ensurePluginCss } from '../logic/ensure-plugin-css.ts'
 import { getEnv, revealInstallFolder } from '../data/host.ts'
 import { useCatalog } from '../hooks/useCatalog.ts'
 import { useLanguage } from '../hooks/useLanguage.ts'
@@ -34,7 +35,7 @@ import type { SectionView } from './layout/SectionTabs.tsx'
 import { InstalledView } from './views/InstalledView.tsx'
 import { CustomInstallView } from './views/CustomInstallView.tsx'
 import { SettingsView } from './views/SettingsView.tsx'
-import { CloseIcon } from './ui/icons.tsx'
+import { CloseIcon, ConfirmIcon } from './ui/icons.tsx'
 import type { InstalledItem } from '../logic/installed.ts'
 import { issueRepoOf, pluginOfItem } from '../logic/installed.ts'
 
@@ -99,6 +100,10 @@ export function PluginHubSection({ t: _hostT, locale }: SectionProps) {
     return () => { alive = false }
   }, [])
 
+  // 样式自愈：宿主重启/热更可能移除 <style> 标签而模块缓存未失效（factory 不重跑、CSS 不回来）。
+  // 挂载与每次切换视图时比对全局 CSS 清单，把缺失的样式补注入回去 —— 用户无需再手动点击恢复。
+  useEffect(() => { ensurePluginCss() }, [view])
+
   const queue = useTaskQueue({
     t,
     refreshInstalled: catalog.refreshInstalled,
@@ -509,7 +514,7 @@ export function PluginHubSection({ t: _hostT, locale }: SectionProps) {
       onIgnoreUpdate: (repo: string, version?: string) => setIgnoreTarget({ repo, version }),
       cancelTask: queue.cancelTask,
       restarting,
-      onRestart: () => { void requestRestart() },
+      onRestart: () => setShowRestartConfirm(true),
       // 失败记录仓库反查：历史记录可能存的是裸 npm 包名，反查成 owner/repo 才显示仓库链接
       // 与提 Issue 按钮；查不到则隐藏（防提到错误仓库）
       resolveRepo: (repo: string) => issueRepoOf(repo, catalog.installedItems, catalog.plugins),
@@ -531,6 +536,10 @@ export function PluginHubSection({ t: _hostT, locale }: SectionProps) {
           }, h(CloseIcon)),
         ),
         h('div', { className: modalStyles.modalBody },
+          // 忽略更新确认：品牌蓝问号图标，普通确认
+          h('div', { className: modalStyles.confirmIconWrap },
+            h(ConfirmIcon, { type: 'question' }),
+          ),
           h('div', { className: modalStyles.failPrepareHint }, t('ignoreUpdateConfirmDetail')),
           h('div', { className: modalStyles.modalActions },
             h('button', {
@@ -567,7 +576,8 @@ export function PluginHubSection({ t: _hostT, locale }: SectionProps) {
       onClose: () => setConfirmPlugin(null),
       onCopy: () => copyCommand(confirmPlugin),
       onInstall: () => queue.installNow(confirmPlugin, confirmIsUpdate ? { update: true } : undefined),
-      onRestart: () => { void requestRestart() },
+      // 重启：结果视图「立即重启」也会中断进行中的任务 → 先弹重启确认弹窗
+      onRestart: () => setShowRestartConfirm(true),
     }),
     // 命令行安装确认弹窗：与目录安装同一套确认/进度/结果流程（plugin 传 null 走 customTarget 模式）。
     // 已安装目标 → update 标记，确认后走覆盖重装（服务端 mode=update 放行），不再 409 报错。
@@ -592,7 +602,7 @@ export function PluginHubSection({ t: _hostT, locale }: SectionProps) {
         setToast({ id: Date.now(), kind: 'copied' })
       },
       onInstall: () => void queue.installCustom(confirmCustomTarget, confirmIsUpdate ? { update: true } : undefined),
-      onRestart: () => { void requestRestart() },
+      onRestart: () => setShowRestartConfirm(true),
     }),
     // 全局 npm 安装确认弹窗（官方 `npm install -g <pkgs>`）：与应用商店同一套确认/进度/结果流程。
     // 装的是系统级 CLI 工具（如 @deepseek-ai/dsh），不进任何 profile、无需宿主重启；
@@ -618,7 +628,7 @@ export function PluginHubSection({ t: _hostT, locale }: SectionProps) {
         setToast({ id: Date.now(), kind: 'copied' })
       },
       onInstall: () => void queue.installGlobalNpm(confirmGlobalNpm.pkgs),
-      onRestart: () => { void requestRestart() },
+      onRestart: () => setShowRestartConfirm(true),
     }),
     // 卸载确认弹窗：确认/进度/结果视图逻辑收敛在 modals.tsx。
     // 已安装视图的自定义安装（目录外）没有完整目录数据，按已安装项伪插件适配后走同一弹窗
@@ -645,7 +655,7 @@ export function PluginHubSection({ t: _hostT, locale }: SectionProps) {
         if (uninstallItem) void queue.uninstallItem(uninstallItem)
         else if (uninstallPlugin) void queue.uninstallNow(uninstallPlugin)
       },
-      onRestart: () => { void requestRestart() },
+      onRestart: () => setShowRestartConfirm(true),
     }),
     // 已安装详情弹窗：目录元数据 + 宿主运行时信息的完整展示，操作（更新/卸载/复制路径）由此发起
     detailItem && h(InstalledDetailModal, {

package/src/client/components/modals/ConfirmDialog.tsx

@@ -0,0 +1,73 @@
+/**
+ * DSH Plugin Hub — the community plugin marketplace for DeepSeek Harness.
+ * Website: https://dsh-plugin.org
+ * GitHub: https://github.com/dshplugin/dsh-plugin-hub
+ *
+ * Generic confirm dialog — the single entry point for every "are you sure?"
+ * question in the app. Rule: any question must be a modal dialog, never an
+ * in-button double-click.
+ *
+ * The icon in the middle tells the type at a glance: a blue question mark
+ * for routine confirmations (install / update / restart / ignore), a red
+ * action glyph for destructive ones (clear / delete / uninstall / reset).
+ */
+import { createElement as h } from 'react'
+import type { MouseEvent } from 'react'
+import styles from '../../styles/Modal.module.css'
+import type { Translate } from '../../types.ts'
+import { CloseIcon, ConfirmIcon, type ConfirmIconType } from '../ui/icons.tsx'
+
+/** 通用确认弹窗：标题 + 类型图标 + 描述 + 取消/确认按钮。
+ *  type='question' → 蓝问号 + 品牌蓝确认按钮；危险类型 → 红图形 + 红色确认按钮。 */
+export function ConfirmDialog({ type, title, desc, confirmLabel, cancelLabel, busy, busyLabel, t, onConfirm, onCancel }: {
+  type: ConfirmIconType
+  title: string
+  desc?: string
+  confirmLabel: string
+  cancelLabel?: string
+  /** 确认动作在途：禁用按钮防止二次点击 */
+  busy?: boolean
+  /** 在途时确认按钮文案（如「清空中…」）；缺省沿用 confirmLabel */
+  busyLabel?: string
+  t: Translate
+  onConfirm: () => void
+  onCancel: () => void
+}) {
+  const danger = type !== 'question'
+  return h('div', {
+    className: styles.overlay,
+    onClick: (e: MouseEvent<HTMLDivElement>) => { if (e.target === e.currentTarget) onCancel() },
+  },
+    h('div', { className: styles.modal, role: 'dialog', 'aria-modal': 'true' },
+      h('div', { className: styles.modalHead },
+        h('div', { className: styles.modalTitle }, title),
+        h('button', {
+          className: styles.modalClose,
+          type: 'button',
+          'aria-label': t('errorClose'),
+          onClick: onCancel,
+        }, h(CloseIcon)),
+      ),
+      h('div', { className: styles.modalBody },
+        h('div', { className: styles.confirmIconWrap },
+          h(ConfirmIcon, { type }),
+        ),
+        desc ? h('div', { className: styles.modalDesc }, desc) : null,
+        h('div', { className: styles.modalActions },
+          h('button', {
+            className: styles.restartLater,
+            type: 'button',
+            disabled: busy,
+            onClick: onCancel,
+          }, cancelLabel ?? t('confirmCancel')),
+          h('button', {
+            className: danger ? styles.dangerConfirm : styles.confirmPrimary,
+            type: 'button',
+            disabled: busy,
+            onClick: onConfirm,
+          }, busy && busyLabel ? busyLabel : confirmLabel),
+        ),
+      ),
+    ),
+  )
+}

package/src/client/components/modals/LogsModal.tsx

@@ -25,6 +25,7 @@ import view from '../../styles/LogsView.module.css'
 import type { Translate } from '../../types.ts'
 import { openLogFile } from '../../data/host.ts'
 import { CloseIcon } from '../ui/icons.tsx'
+import { ConfirmDialog } from './ConfirmDialog.tsx'
 
 /** 与服务端 /logs 返回的 LogEntry 对齐的客户端投影。 */
 export interface LogEntryView {
@@ -120,6 +121,9 @@ export function LogsModal({ t, onClose }: {
   const [error, setError] = useState(false)
   const [opening, setOpening] = useState(false)
   const [openFailed, setOpenFailed] = useState(false)
+  const [showClearConfirm, setShowClearConfirm] = useState(false)
+  const [clearing, setClearing] = useState(false)
+  const [clearFailed, setClearFailed] = useState(false)
   const offsetRef = useRef(0)
 
   /** 拉一页：过滤参数取当前 state，偏移量由调用方给出。 */
@@ -195,6 +199,24 @@ export function LogsModal({ t, onClose }: {
     if (!ok) setOpenFailed(true)
   }
 
+  /** 清空所有日志：确认弹窗（独立弹出框，垃圾桶图标）确认后执行。 */
+  const doClear = async () => {
+    setClearing(true)
+    try {
+      const res = await fetch('/dsh-plugin-hub/clear-log', { method: 'POST', cache: 'no-store' })
+      if (!res.ok) {
+        setClearFailed(true)
+        return
+      }
+      await reload()
+    } catch {
+      setClearFailed(true)
+    } finally {
+      setClearing(false)
+      setShowClearConfirm(false)
+    }
+  }
+
   /** 导出：拼纯文本 → Blob → 触发浏览器下载 .log 文件 */
   const exportFile = () => {
     const text = entries.map((e) => `[${fmtLogTime(e.at)}] [${e.level}] [${e.category}] [${e.event}] ${e.message}`).join('\n')
@@ -219,6 +241,15 @@ export function LogsModal({ t, onClose }: {
     h('div', { className: `${styles.errorModal} ${styles.logModal}`, role: 'dialog', 'aria-modal': 'true' },
       h('div', { className: styles.modalHead },
         h('div', { className: styles.modalTitle }, t('logModalTitle')),
+        h('div', { className: view.headActions },
+          h('button', {
+            type: 'button',
+            className: view.clearBtn,
+            disabled: clearing,
+            title: t('logClearAllTip'),
+            onClick: () => setShowClearConfirm(true),
+          }, t('logClearAll')),
+        ),
         h('button', {
           className: styles.modalClose,
           'aria-label': t('errorClose'),
@@ -277,9 +308,11 @@ export function LogsModal({ t, onClose }: {
       h('div', { className: view.foot },
         h('span', { className: view.footPath, title: path },
           `${t('logPathLabel')}: ${path === '' ? '…' : path}`),
-        openFailed
-          ? h('span', { className: view.footFail }, t('logOpenFileFail'))
-          : h('span', { className: view.footCount }, t('logCount', { n: total })),
+        clearFailed
+          ? h('span', { className: view.footFail }, t('logClearFailed'))
+          : openFailed
+            ? h('span', { className: view.footFail }, t('logOpenFileFail'))
+            : h('span', { className: view.footCount }, t('logCount', { n: total })),
         h('div', { className: view.footActions },
           h('button', {
             type: 'button',
@@ -290,12 +323,24 @@ export function LogsModal({ t, onClose }: {
           }, t('logOpenFile')),
           h('button', {
             type: 'button',
-            className: `${view.btn} ${view.btnPrimary}`,
+            className: view.btn,
             disabled: entries.length === 0,
             onClick: exportFile,
           }, t('logsExport')),
         ),
       ),
     ),
+    // 清空日志确认弹窗：独立弹出框（垃圾桶图标，危险操作），确认后才真正清空
+    showClearConfirm && h(ConfirmDialog, {
+      type: 'trash',
+      title: t('logClearConfirmTitle'),
+      desc: t('logClearConfirmDesc'),
+      confirmLabel: t('logClearAll'),
+      busy: clearing,
+      busyLabel: t('logClearing'),
+      t,
+      onConfirm: () => void doClear(),
+      onCancel: () => setShowClearConfirm(false),
+    }),
   )
 }

package/src/client/components/modals/NotificationsModal.tsx

@@ -13,7 +13,7 @@
  * failures keep their copy / fix / file-an-issue actions. Opened from the
  * header entry button (after the Settings tab).
  */
-import { createElement as h } from 'react'
+import { createElement as h, useState } from 'react'
 import type { MouseEvent } from 'react'
 import styles from '../../styles/Modal.module.css'
 import type { EnvInfo, Translate } from '../../types.ts'
@@ -22,6 +22,7 @@ import { classifyFailure, npmTooLowVersion } from '../../logic/failures.ts'
 import type { PendingRestart, QueueTask } from '../../hooks/useTaskQueue.ts'
 import { pluginIssueUrl, pluginSiteUrl } from '../../logic/urls.ts'
 import { CloseIcon } from '../ui/icons.tsx'
+import { ConfirmDialog } from './ConfirmDialog.tsx'
 
 /** 记录时间完整展示：YYYY-MM-DD HH:mm:ss（每条通知都带精确到秒的时间戳）。 */
 function fmtTime(at: number): string {
@@ -79,6 +80,10 @@ export function NotificationsModal({ records, tasks, pendingRestarts, t, env, on
    *  查不到返回 null，按钮与仓库链接一并隐藏（防提到错误仓库）。不传则按记录原样展示。 */
   resolveRepo?: (repo: string) => string | null
 }) {
+  // 危险操作确认：清空全部 / 删除单条都必须先弹独立确认框（垃圾桶图标），禁止按钮内直接生效
+  const [confirmClear, setConfirmClear] = useState(false)
+  const [confirmRemoveId, setConfirmRemoveId] = useState<number | null>(null)
+
   return h('div', {
     className: styles.overlay,
     onClick: (e: MouseEvent<HTMLDivElement>) => {
@@ -234,12 +239,12 @@ export function NotificationsModal({ records, tasks, pendingRestarts, t, env, on
                         onClick: (e: MouseEvent<HTMLButtonElement>) => { e.stopPropagation(); onIgnoreUpdate(r.repo, r.version) },
                       }, t('ignoreUpdateRun'))
                       : null,
-                    // 每条通知右侧的删除按钮：单独移除这一条
+                    // 每条通知右侧的删除按钮：先弹确认框，确认后移除这一条
                     h('button', {
                       className: styles.noticeRemove,
                       'aria-label': t('removeNotification'),
                       title: t('removeNotification'),
-                      onClick: (e: MouseEvent<HTMLButtonElement>) => { e.stopPropagation(); onRemove(r.id) },
+                      onClick: (e: MouseEvent<HTMLButtonElement>) => { e.stopPropagation(); setConfirmRemoveId(r.id) },
                     }, h(CloseIcon)),
                   ),
                   // 每条失败记录是一个独立卡片：头部（状态/仓库/时间/复制完整日志）→ 修复或提 Issue 动作。
@@ -294,11 +299,31 @@ export function NotificationsModal({ records, tasks, pendingRestarts, t, env, on
         h('div', { className: styles.modalActions },
           records.length > 0 ? h('button', {
             className: styles.failClear,
-            onClick: onClear,
+            onClick: () => setConfirmClear(true),
           }, t('notificationsClear')) : null,
           h('button', { className: styles.restartNow, onClick: onClose }, t('errorClose')),
         ),
       ),
     ),
+    // 清空全部通知确认弹窗：独立弹出框（垃圾桶图标，危险操作），确认后才真正清空
+    confirmClear && h(ConfirmDialog, {
+      type: 'trash',
+      title: t('notificationsClearConfirmTitle'),
+      desc: t('notificationsClearConfirmDesc'),
+      confirmLabel: t('notificationsClear'),
+      t,
+      onConfirm: () => { setConfirmClear(false); onClear() },
+      onCancel: () => setConfirmClear(false),
+    }),
+    // 删除单条通知确认弹窗：独立弹出框（垃圾桶图标），确认后才移除
+    confirmRemoveId !== null && h(ConfirmDialog, {
+      type: 'trash',
+      title: t('removeNotificationConfirmTitle'),
+      desc: t('removeNotificationConfirmDesc'),
+      confirmLabel: t('removeNotification'),
+      t,
+      onConfirm: () => { onRemove(confirmRemoveId); setConfirmRemoveId(null) },
+      onCancel: () => setConfirmRemoveId(null),
+    }),
   )
 }

package/src/client/components/modals/modals.tsx

@@ -12,7 +12,7 @@ import { createElement as h } from 'react'
 import type { MouseEvent } from 'react'
 import styles from '../../styles/Modal.module.css'
 import type { EnvInfo, HubPlugin, TaskState, ToastState, Translate } from '../../types.ts'
-import { CloseIcon, CopyIcon, LinkIcon } from '../ui/icons.tsx'
+import { CloseIcon, ConfirmIcon, CopyIcon, LinkIcon } from '../ui/icons.tsx'
 import { ProgressView } from './ProgressView.tsx'
 import { installCommandOf } from '../../logic/install-command.ts'
 import { pluginDetailUrl, pluginIssueUrl, pluginSiteUrl } from '../../logic/urls.ts'
@@ -144,6 +144,10 @@ export function InstallModal(props: InstallModalProps) {
         })
         // 确认/进行中：来源行 + 安装命令 + 实时进度 + 操作按钮
         : h('div', { className: styles.modalBody },
+          // 安装/更新确认态：品牌蓝问号图标，一眼识别这是确认询问
+          !busy ? h('div', { className: styles.confirmIconWrap },
+            h(ConfirmIcon, { type: 'question' }),
+          ) : null,
           h('div', { className: styles.trustHint }, t('confirmDesc')),
           h('div', { className: styles.modalRow },
             h('span', { className: styles.modalLabel }, t('confirmPlugin')),
@@ -267,6 +271,10 @@ export function UninstallModal(props: UninstallModalProps) {
         })
         // 确认/进行中：来源行 + 实时进度 + 操作按钮
         : h('div', { className: styles.modalBody },
+          // 卸载确认态：红色垃圾桶图标，删除类危险操作
+          !busy ? h('div', { className: styles.confirmIconWrap },
+            h(ConfirmIcon, { type: 'trash' }),
+          ) : null,
           h('div', { className: styles.modalDesc }, t('uninstallDesc')),
           h('div', { className: styles.modalRow },
             h('span', { className: styles.modalLabel }, t('confirmPlugin')),
@@ -449,6 +457,10 @@ export function RestartConfirmModal({ t, restarting, onClose, onRestartNow }: {
         }, h(CloseIcon)),
       ),
       h('div', { className: styles.modalBody },
+        // 重启确认：红色警告三角 —— 重启会中断正在进行的安装/卸载任务，风险提示
+        h('div', { className: styles.confirmIconWrap },
+          h(ConfirmIcon, { type: 'warning' }),
+        ),
         h('div', { className: styles.failPrepareHint }, t('restartHint')),
         h('div', { className: styles.modalActions },
           h('button', {

package/src/client/components/ui/icons.tsx

@@ -340,6 +340,54 @@ export function ResetIcon() {
     }))
 }
 
+/** 确认弹窗图标类型：普通确认 = 问号；危险操作 = 垃圾桶 / 警告三角 / 还原箭头 */
+export type ConfirmIconType = 'question' | 'trash' | 'warning' | 'reset'
+
+/** 确认弹窗图标：圆形徽标 + 白色图形 —— 普通确认（安装/更新/重启/忽略）蓝底白问号；
+ *  危险操作（清空/删除/卸载/重置）红底白动作图形。居中放在弹窗标题下方，一眼区分确认类型。 */
+export function ConfirmIcon({ type }: { type: ConfirmIconType }) {
+  const danger = type !== 'question'
+  const glyphs = type === 'trash'
+    ? [
+      h('path', {
+        d: 'M4.5 6.5h15M9.5 6.5V4.8a1.3 1.3 0 0 1 1.3-1.3h2.4a1.3 1.3 0 0 1 1.3 1.3v1.7',
+        stroke: '#ffffff', strokeWidth: 1.9, strokeLinecap: 'round', strokeLinejoin: 'round',
+      }),
+      h('path', {
+        d: 'M6.2 6.5l.7 12.2a1.5 1.5 0 0 0 1.5 1.3h7.2a1.5 1.5 0 0 0 1.5-1.3l.7-12.2',
+        stroke: '#ffffff', strokeWidth: 1.9, strokeLinecap: 'round', strokeLinejoin: 'round',
+      }),
+      h('path', { d: 'M10 10.2v6M14 10.2v6', stroke: '#ffffff', strokeWidth: 1.9, strokeLinecap: 'round' }),
+    ]
+    : type === 'warning'
+      ? [
+        h('path', {
+          d: 'M12 4.2l8.5 14.3a1 1 0 0 1-.87 1.5H4.37a1 1 0 0 1-.87-1.5L12 4.2z',
+          stroke: '#ffffff', strokeWidth: 1.9, strokeLinejoin: 'round',
+        }),
+        h('path', { d: 'M12 9.6v4.5', stroke: '#ffffff', strokeWidth: 1.9, strokeLinecap: 'round' }),
+        h('circle', { cx: 12, cy: 16.7, r: 1.05, fill: '#ffffff' }),
+      ]
+      : type === 'reset'
+        ? [
+          h('path', { d: 'M4.5 7.8A8.4 8.4 0 1 1 3.6 14.4', stroke: '#ffffff', strokeWidth: 1.9, strokeLinecap: 'round' }),
+          h('path', { d: 'M3.9 3.9v3.9h3.9', stroke: '#ffffff', strokeWidth: 1.9, strokeLinecap: 'round', strokeLinejoin: 'round' }),
+        ]
+        : [
+          h('path', {
+            d: 'M9.5 9.2a2.6 2.6 0 1 1 3.7 2.38c-.84.38-1.2.95-1.2 1.72',
+            stroke: '#ffffff', strokeWidth: 1.9, strokeLinecap: 'round',
+          }),
+          h('circle', { cx: 12, cy: 16.4, r: 1.1, fill: '#ffffff' }),
+        ]
+  return h('div', {
+    className: danger ? `${modalStyles.confirmIcon} ${modalStyles.confirmIconDanger}` : modalStyles.confirmIcon,
+    'aria-hidden': 'true',
+  },
+    h('svg', { viewBox: '0 0 24 24', width: 22, height: 22, fill: 'none' }, ...glyphs),
+  )
+}
+
 /** 系统日志图标：文档纸 + 三行文字（stroke 继承 currentColor），设置左侧导航「系统日志」用。 */
 export function LogsIcon() {
   return h('svg', {

package/src/client/components/views/LogsView.tsx

@@ -95,7 +95,7 @@ export function LogsView({ t, logPath, onLogPathSaved }: {
       h('div', { className: styles.actions },
         h('button', {
           type: 'button',
-          className: `${styles.btn} ${styles.btnPrimary}`,
+          className: styles.btn,
           onClick: () => setOpen(true),
         }, t('logViewerOpen')),
         h('button', { type: 'button', className: styles.btn, disabled: entries.length === 0, onClick: exportFile }, t('logsExport')),

package/src/client/components/views/SettingsView.tsx

@@ -24,7 +24,7 @@ import { Toggle } from '../ui/Toggle.tsx'
 import { DiagnosticsView } from './DiagnosticsView.tsx'
 import { LogsView } from './LogsView.tsx'
 import {
-  CloseIcon, DiagnosticsIcon, LogsIcon, ResetIcon, SecurityIcon, UpdatesIcon,
+  CloseIcon, ConfirmIcon, DiagnosticsIcon, LogsIcon, ResetIcon, SecurityIcon, UpdatesIcon,
 } from '../ui/icons.tsx'
 import type { EnvInfo, Translate } from '../../types.ts'
 import type { HubSettings } from '../../hooks/useSettings.ts'
@@ -253,6 +253,10 @@ export function SettingsView({ t, settings, update, reset, env, onCopy }: {
           }, h(CloseIcon)),
         ),
         h('div', { className: modalStyles.modalBody },
+          // 恢复默认 = 破坏性操作：红色警告三角图标，醒目提示风险
+          h('div', { className: modalStyles.confirmIconWrap },
+            h(ConfirmIcon, { type: 'warning' }),
+          ),
           h('div', { className: modalStyles.failPrepareHint }, t('settingsResetConfirmDetail')),
           h('div', { className: modalStyles.modalActions },
             h('button', {

package/src/client/data/catalog.ts

@@ -16,21 +16,22 @@ const PROXY_BASE = '/dsh-plugin-hub/catalog'
 const PLUGINS_URL = (lang: LocaleId) => `${PROXY_BASE}?lang=${lang}`
 const STATS_URL = `${PROXY_BASE}?stats=1`
 
-async function fetchJson(url: string): Promise<unknown> {
-  const res = await fetch(url, { cache: 'no-store' })
+async function fetchJson(url: string, signal?: AbortSignal): Promise<unknown> {
+  const res = await fetch(url, { cache: 'no-store', signal })
   if (!res.ok) throw new Error(String(res.status))
   return res.json()
 }
 
-/** 目录插件列表（在线 API 已只返回 verified；过滤与排序由上层负责）。 */
-export async function fetchCatalog(lang: LocaleId): Promise<HubPlugin[]> {
-  const data = await fetchJson(PLUGINS_URL(lang))
+/** 目录插件列表（在线 API 已只返回 verified；过滤与排序由上层负责）。
+ *  signal 可选：宿主重启/代理抖动导致请求挂起时，上层可中止旧请求释放连接。 */
+export async function fetchCatalog(lang: LocaleId, signal?: AbortSignal): Promise<HubPlugin[]> {
+  const data = await fetchJson(PLUGINS_URL(lang), signal)
   return (Array.isArray(data) ? data : []).map((item) => normalize(item as Record<string, unknown>))
 }
 
 /** 收录/精选统计（/api/stats.json）；字段不完整返回 null。 */
-export async function fetchStats(): Promise<{ total: number; verified: number } | null> {
-  const s = await fetchJson(STATS_URL) as { total?: number; verified?: number }
+export async function fetchStats(signal?: AbortSignal): Promise<{ total: number; verified: number } | null> {
+  const s = await fetchJson(STATS_URL, signal) as { total?: number; verified?: number }
   if (s && typeof s.total === 'number' && typeof s.verified === 'number') {
     return { total: s.total, verified: s.verified }
   }

package/src/client/hooks/useCatalog.ts

@@ -9,7 +9,7 @@
  * installed-plugin table, and the filter/search/sort/install-status view
  * state, exposing the derived visible list and per-category counts.
  */
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
 import type { HubPlugin, LocaleId } from '../types.ts'
 import { HUB_REPO, PLUGIN_VERSION } from '../logic/constants.ts'
 import type { HubAboutInfo, HubUpdateInfo } from '../types.ts'
@@ -45,6 +45,14 @@ export function useCatalog(lang: LocaleId) {
   const [sort, setSort] = useState<SortKey>('sortStars')
   /** 当前排序方向：点同一个排序按钮切换 正序/倒序；点新排序用该排序的默认方向（与已安装视图一致） */
   const [sortDir, setSortDir] = useState<'asc' | 'desc'>('desc')
+  /** 目录加载「超时自动强制刷新」重试计数：宿主重启/代理未就绪时请求可能长时间挂起，
+   *  界面停在「正在加载插件数据…」假死 —— 超时自动重拉，最多自动重试 2 次后转失败态；
+   *  用户手动刷新（reload）时清零重新计数。 */
+  const loadRetriesRef = useRef(0)
+  /** 目录加载超时阈值：超过即判定挂起，强制刷新一次（服务端代理 curl 上限 20s，客户端 12s 先兜底） */
+  const LOAD_TIMEOUT_MS = 12000
+  /** 挂起后最多自动重试次数：避免代理持续不通时无限循环刷新（每次重试仍 12s，2 次后转失败界面可手动重试） */
+  const MAX_LOAD_RETRIES = 2
 
   /** 点击排序按钮：同一按钮切换正/倒序，新按钮用默认方向 */
   function toggleSort(key: SortKey) {
@@ -83,15 +91,21 @@ export function useCatalog(lang: LocaleId) {
   // 拉取目录 + 统计。在线 API 已只返回 verified；再过滤一次，保证只展示人工验证通过的插件。
   useEffect(() => {
     let cancelled = false
+    // 本次加载是否已收尾（成功或失败）：超时定时器只对「还在加载中」生效
+    let settled = false
+    // 中止控制器：请求挂起时（宿主重启/代理抖动）超时自动重试会换新请求，
+    // 旧请求在此中止释放连接，避免挂起堆积
+    const controller = new AbortController()
     setPlugins(null)
     setHubPlugin(null)
     setStats(null)
     setFailed(false)
     // 目录数据直拉：hub 自身版本由独立 Worker 版本控制中心管理，不再依赖主站版本号接口。
-    const load = () => Promise.all([fetchCatalog(lang), fetchStats()])
+    const load = () => Promise.all([fetchCatalog(lang, controller.signal), fetchStats(controller.signal)])
     load()
       .then(([list, stats]) => {
         if (cancelled) return
+        settled = true
         // 插件市场不显示自己：DSH Plugin Hub 从目录里排除自身条目，
         // 防止「自己出现在自己的插件列表里、还能自己安装自己」；统计计数同步减 1 保持与列表一致。
         // 目录数据已排除自身，此处再兜底过滤一次，防旧快照仍含自身条目。
@@ -106,9 +120,27 @@ export function useCatalog(lang: LocaleId) {
         }
       })
       .catch(() => {
-        if (!cancelled) setFailed(true)
+        if (cancelled) return
+        settled = true
+        setFailed(true)
       })
-    return () => { cancelled = true }
+    // 加载超时兜底：宿主刚重启/代理未就绪时目录请求可能长时间挂起，界面停在「正在加载插件数据…」
+    // 像假死。超过阈值未收尾 → 强制刷新列表（重拉一次，最多 MAX_LOAD_RETRIES 次自动重试），
+    // 重试仍失败 → 转失败界面（显示「重试」按钮，手动刷新时计数清零重新开始）。
+    const timer = window.setTimeout(() => {
+      if (cancelled || settled) return
+      if (loadRetriesRef.current < MAX_LOAD_RETRIES) {
+        loadRetriesRef.current += 1
+        setReloadKey((k) => k + 1)
+      } else {
+        setFailed(true)
+      }
+    }, LOAD_TIMEOUT_MS)
+    return () => {
+      cancelled = true
+      window.clearTimeout(timer)
+      controller.abort()
+    }
     // lang 必须进依赖：切换界面语言要重新拉对应语言的数据文件，
     // 否则英文模式仍停留在 plugins.zh.json，描述/名称全是中文
   }, [reloadKey, lang])
@@ -218,7 +250,7 @@ export function useCatalog(lang: LocaleId) {
     hubPlugin,
     stats,
     failed,
-    reload: () => setReloadKey((k) => k + 1),
+    reload: () => { loadRetriesRef.current = 0; setReloadKey((k) => k + 1) },
     installed,
     installedItems,
     installedName,