@gehennawu/dsh-service 0.13.2 → 0.14.0

package/README.en.md

@@ -11,7 +11,7 @@ A service-control and operations plugin for self-hosted DSH Web. Provides safe r
 ### Version and updates
 
 - Displays current DSH and plugin versions with links to GitHub Releases
-- Automatically checks npm registry for stable and preview releases, shows update status
+- Automatically checks npm registry for stable and preview releases; when a new version exists, the right-side status text (chevron + `New version`) is clickable to expand/collapse, showing the current/latest versions and both dist-tag versions inline, each with npmjs and npmmirror links (npmjs.com is blocked on some networks; npmmirror serves as the mirror entry)
 - One-click plugin upgrade with automatic restart after completion
 
 ### Safe restart
@@ -19,6 +19,7 @@ A service-control and operations plugin for self-hosted DSH Web. Provides safe r
 - Detects active agents, background jobs, and terminals before restart; lists them and requires explicit confirmation
 - `/restart` command also available in conversations; automatically refuses when active work is detected
 - Automatically probes for the new process after restart and reloads the page; manual reload available after 60 seconds
+- Optional `Restart` entry at the bottom of the settings left navigation, enabled by a switch in the Restart tab (off by default), sharing the exact same confirmation flow as the Restart tab
 
 ### Health diagnostics
 
@@ -44,6 +45,7 @@ A service-control and operations plugin for self-hosted DSH Web. Provides safe r
 ### Task notifications
 
 - Browser notification when a session finishes its turn, or when your approval, plan review, or answer is needed
+- Clicking a notification focuses the DSH page and closes the popup
 - Three toggle switches: master switch, task completion, and approvals & questions, each controlled independently
 - Bell icon in the conversation input bar toggles the master switch quickly
 - All toggles persist across page reloads

package/README.md

@@ -11,7 +11,7 @@
 ### 版本与更新
 
 - 显示当前 DSH 和插件版本，版本号链接到 GitHub Releases
-- 自动检查 npm registry 的正式版和预览版，显示更新状态
+- 自动检查 npm registry 的正式版和预览版；有新版本时右侧「小三角 + 有新版本」状态文本可点击展开/收起，行内展示当前/最新版本与正式版/预览版双 tag，版本号分别带 npmjs 与 npmmirror 链接（部分网络会被 npmjs.com 拦截，npmmirror 作为镜像入口）
 - 一键升级插件，升级后自动重启
 
 ### 安全重启
@@ -19,6 +19,7 @@
 - 重启前检测活跃 Agent、后台任务和终端，展示清单并要求显式确认
 - 对话中输入 `/restart` 也可触发，检测到运行中工作时自动拒绝
 - 重启后自动探测新进程并刷新页面，60 秒未恢复时提供手动刷新
+- 可在「重启」标签开启「设置页左列显示入口」开关（默认关闭），开启后在设置页左侧标签列底部显示「重启」快捷入口，与「重启」标签共用同一套确认流程
 
 ### 健康诊断
 
@@ -44,6 +45,7 @@
 ### 任务通知
 
 - 会话完成一轮任务、或需要你授权/审阅计划/选择答案时发送浏览器通知
+- 点击系统通知弹窗会聚焦到 DSH 页面并关闭该通知
 - 三档开关条：总开关、任务结束通知、授权与提问通知，各自独立控制
 - 对话栏内铃铛图标快速切换总开关
 - 各开关在页面刷新后保持

package/client.js

@@ -10,6 +10,7 @@ window.__ModuleLoader__.load({
     const NS = 'dsh-service'
     const zh = {
       'nav.label': '服务控制',
+      'nav.restart': '重启',
       'overlay.label': '服务重启状态',
       'recovery.waiting.title': '服务重启中…',
       'recovery.waiting.body': '正在等待新的 DSH Web 进程启动，已等待 {seconds} 秒。',
@@ -52,6 +53,7 @@ window.__ModuleLoader__.load({
       'health.detail.permissions.warning': '发现 {count} 个文件或目录权限异常',
       'health.detail.generic': '{status}',
       'tabs.overview': '概览',
+      'tabs.notify': '通知',
       'tabs.health': '健康诊断',
       'tabs.usage': '模型统计',
       'overview.container': '容器信息',
@@ -106,6 +108,8 @@ window.__ModuleLoader__.load({
       'update.checking': '检查中…',
       'update.current': '已是最新版本',
       'update.available': '有新版本：{version}',
+      'update.detailsButton': '查看详情',
+      'update.detailsHide': '收起',
       'update.unavailable': '暂时无法检查最新版本',
       'update.unpublished': '尚未发布可检查版本',
       'health.recheck': '重新诊断',
@@ -113,7 +117,8 @@ window.__ModuleLoader__.load({
       'update.details.title': 'DSH 更新可用',
       'update.details.current': '当前版本：{version}',
       'update.details.latest': '最新版本：{version}',
-      'update.channels': '正式版 {latest} · 预览版 {next}',
+      'update.channelStable': '正式版',
+      'update.channelPreview': '预览版',
       'update.details.close': '关闭',
       'update.upgrade': '升级插件',
       'update.upgrading': '升级中…',
@@ -146,6 +151,8 @@ window.__ModuleLoader__.load({
       'restart.sent': '重启指令已发出。',
       'restart.sentHint': '页面连接即将断开，服务恢复后将自动刷新。',
       'restart.idleHint': '当前没有检测到运行中的工作。确认后将断开连接，等待服务自动重启。',
+      'restart.navToggle': '设置页左列显示「重启」入口',
+      'restart.navToggleHint': '默认关闭；开启后在设置页左侧标签列底部显示快捷重启入口',
       'activity.agent': 'Agent',
       'activity.job': '后台任务',
       'activity.terminal': '终端',
@@ -212,6 +219,7 @@ window.__ModuleLoader__.load({
     }
     const en = {
       'nav.label': 'Service Control',
+      'nav.restart': 'Restart',
       'overlay.label': 'Service restart status',
       'recovery.waiting.title': 'Restarting service…',
       'recovery.waiting.body': 'Waiting for a new DSH Web process. Elapsed: {seconds} seconds.',
@@ -254,6 +262,7 @@ window.__ModuleLoader__.load({
       'health.detail.permissions.warning': 'Found {count} file or directory permission anomalies',
       'health.detail.generic': '{status}',
       'tabs.overview': 'Overview',
+      'tabs.notify': 'Notifications',
       'tabs.health': 'Health',
       'tabs.usage': 'Models',
       'overview.container': 'Container info',
@@ -308,6 +317,8 @@ window.__ModuleLoader__.load({
       'update.checking': 'Checking…',
       'update.current': 'Up to date',
       'update.available': 'New version: {version}',
+      'update.detailsButton': 'View details',
+      'update.detailsHide': 'Collapse',
       'update.unavailable': 'Latest version is temporarily unavailable',
       'update.unpublished': 'No published version is available to check',
       'health.recheck': 'Run again',
@@ -315,7 +326,8 @@ window.__ModuleLoader__.load({
       'update.details.title': 'DSH update available',
       'update.details.current': 'Current version: {version}',
       'update.details.latest': 'Latest version: {version}',
-      'update.channels': 'Stable {latest} · Preview {next}',
+      'update.channelStable': 'Stable',
+      'update.channelPreview': 'Preview',
       'update.details.close': 'Close',
       'update.upgrade': 'Upgrade plugin',
       'update.upgrading': 'Upgrading…',
@@ -348,6 +360,8 @@ window.__ModuleLoader__.load({
       'restart.sent': 'Restart request sent.',
       'restart.sentHint': 'The connection will close shortly. The page will reload automatically after recovery.',
       'restart.idleHint': 'No active work was detected. Confirm to disconnect and wait for the service to restart.',
+      'restart.navToggle': 'Show "Restart" entry in settings left nav',
+      'restart.navToggleHint': 'Off by default; when enabled, a quick-restart entry appears at the bottom of the settings left navigation',
       'activity.agent': 'Agent',
       'activity.job': 'Background job',
       'activity.terminal': 'Terminal',
@@ -456,6 +470,36 @@ window.__ModuleLoader__.load({
         }, [])
         return { enabled, done, input, setEnabled: (v) => setNotifyEnabled(v), setDone: (v) => setNotifyDone(v), setInput: (v) => setNotifyInput(v) }
       }
+      // 设置页左列「重启」入口显示开关：默认关闭，localStorage 持久化；
+      // 开启时才注册 settings.section 条目（导航列单元格由外壳渲染，开关不生效就不能用 null 内容占位）。
+      let restartNavEnabled = false
+      try { restartNavEnabled = localStorage.getItem('dsh-service-restart-nav') === 'true' } catch (_) {}
+      let restartNavDispose = null
+      const syncRestartNavEntry = () => {
+        if (restartNavDispose) { restartNavDispose(); restartNavDispose = null }
+        if (!restartNavEnabled) return
+        restartNavDispose = ctx.slots.register(
+          { name: 'settings.section', id: 'dsh-service-restart', order: 499, label: () => t('nav.restart') },
+          () => React.createElement(RestartSection, null),
+        )
+      }
+      const restartNavListeners = new Set()
+      const setRestartNavEnabled = (value) => {
+        restartNavEnabled = value === true
+        try { localStorage.setItem('dsh-service-restart-nav', restartNavEnabled ? 'true' : 'false') } catch (_) {}
+        syncRestartNavEntry()
+        for (const listener of restartNavListeners) listener()
+      }
+      const useRestartNavEnabled = () => {
+        const [enabled, setEnabled] = useState(restartNavEnabled)
+        useEffect(() => {
+          const update = () => setEnabled(restartNavEnabled)
+          restartNavListeners.add(update)
+          setEnabled(restartNavEnabled)
+          return () => restartNavListeners.delete(update)
+        }, [])
+        return [enabled, setRestartNavEnabled]
+      }
       // 会话边沿通知：running→idle 记一次任务结束；pendingInteraction 出现记一次需要确认。
       // 数据源是客户端运行时的会话列表快照（订阅推送）；首个快照只建立基线，重连后重建基线，二者都不响铃。
       const NOTIFY_KIND_KEYS = {
@@ -466,7 +510,15 @@ window.__ModuleLoader__.load({
       const notifyPermissionGranted = () => typeof Notification !== 'undefined' && Notification.permission === 'granted'
       const fireNotification = (title, body) => {
         if (!notifyPermissionGranted()) return
-        try { new Notification(title, { body }) } catch (_) {}
+        try {
+          const notification = new Notification(title, { body })
+          // 点击系统通知弹窗：聚焦 DSH 页面并关闭该通知（chrome/ff 从通知点击回调
+          // 视为用户手势，window.focus() 可把标签页带到前台）
+          notification.onclick = () => {
+            try { window.focus() } catch (_) {}
+            try { notification.close() } catch (_) {}
+          }
+        } catch (_) {}
       }
       if (ctx.sessions && typeof ctx.sessions.list?.subscribe === 'function') {
         const observed = new Map()
@@ -540,6 +592,60 @@ window.__ModuleLoader__.load({
         return snapshot
       }
 
+      // 重启流程共享状态：设置面板「重启」标签与专属设置页共用同一份 stage/activity/busy/error，
+      // 触发路径（两段式确认、强制重启、恢复浮层）完全一致。
+      const restartFlowListeners = new Set()
+      let restartFlow = { stage: 0, activity: null, busy: false, error: null }
+      const setRestartFlow = (next) => {
+        restartFlow = next
+        for (const listener of restartFlowListeners) listener(next)
+      }
+      const useRestartFlow = () => {
+        const [snapshot, setSnapshot] = useState(restartFlow)
+        useEffect(() => {
+          restartFlowListeners.add(setSnapshot)
+          setSnapshot(restartFlow)
+          return () => restartFlowListeners.delete(setSnapshot)
+        }, [])
+        return snapshot
+      }
+      const checkRestart = async () => {
+        setRestartFlow({ ...restartFlow, busy: true, error: null })
+        try {
+          const res = await ctx.connection.rpc.call('/dsh-service', 'activity', {})
+          if (res && res.ok === false) {
+            console.error('dsh-service: activity check failed', res.error)
+            throw new Error(t('error.activity'))
+          }
+          const nextActivity = res && res.value ? res.value : { hasActive: false, items: [] }
+          setRestartFlow({ ...restartFlow, activity: nextActivity, stage: nextActivity.hasActive ? 3 : 1, busy: false, error: null })
+        } catch (err) {
+          setRestartFlow({ ...restartFlow, error: err && err.message ? String(err.message) : String(err), stage: 0, busy: false })
+        }
+      }
+      const restartWeb = async (force) => {
+        setRestartFlow({ ...restartFlow, busy: true, error: null })
+        try {
+          const res = await ctx.connection.rpc.call('/dsh-service', 'web', { force: force === true })
+          if (res && res.ok === false) {
+            if (res.error === 'active-work' && res.value) {
+              setRestartFlow({ ...restartFlow, activity: res.value, stage: 3, busy: false, error: null })
+              return
+            }
+            console.error('dsh-service: restart failed', res.error)
+            throw new Error(t('error.restart'))
+          }
+          const previousInstanceId = res && res.value ? res.value.instanceId : undefined
+          if (typeof previousInstanceId !== 'string' || previousInstanceId.length === 0) {
+            throw new Error(t('error.instance'))
+          }
+          setRestartFlow({ ...restartFlow, stage: 2, busy: false, error: null })
+          startRecovery(previousInstanceId).catch((err) => console.error('dsh-service: recovery failed', err))
+        } catch (err) {
+          setRestartFlow({ ...restartFlow, error: err && err.message ? String(err.message) : String(err), stage: 0, busy: false })
+        }
+      }
+
       const useRecoveryState = () => {
         const [snapshot, setSnapshot] = useState(recoveryState)
         useEffect(() => {
@@ -587,6 +693,7 @@ window.__ModuleLoader__.load({
       ctx.effect(() => () => {
         recoveryGeneration += 1
         recoveryListeners.clear()
+        restartFlowListeners.clear()
         updateListeners.clear()
       }, 'dsh-service recovery')
 
@@ -601,6 +708,27 @@ window.__ModuleLoader__.load({
         }, translate('update.badge'))
       }
 
+      // 正式/预览通道行：版本号后跟 npmjs（版本页）与 npmmirror（镜像版本页）两个文字链接。
+      // 版本串嵌进 URL 前过安全字符集校验，不过校验的标签降级为纯文本。供更新详情浮层使用。
+      const NPM_DSH_PACKAGE = '@deepseek-ai/dsh'
+      const packageVersionHref = (base, version) => {
+        if (typeof version !== 'string' || version.length === 0 || !/^[0-9A-Za-z.+_-]+$/.test(version)) return null
+        return `${base}${version}`
+      }
+      const siteLabelLink = (kind, label, href) => {
+        const testid = `version-dsh-channel-${kind}-${label}`
+        if (!href) return React.createElement('span', { 'data-testid': testid, style: { marginLeft: '10px' } }, label)
+        return React.createElement('a', { 'data-testid': testid, href, target: '_blank', rel: 'noreferrer', style: { color: 'var(--dsw-alias-brand-primary)', textDecoration: 'underline', marginLeft: '10px' } }, label)
+      }
+      const channelLine = (translate, kind, version) => React.createElement('div', { style: { whiteSpace: 'nowrap', lineHeight: 1.7 } },
+        kind === 'latest' ? translate('update.channelStable') : translate('update.channelPreview'),
+        ' ', React.createElement('span', { 'data-testid': `version-dsh-channel-${kind}`, style: { marginLeft: '4px' } }, version || '—'),
+        siteLabelLink(kind, 'npmjs', packageVersionHref(`https://www.npmjs.com/package/${NPM_DSH_PACKAGE}/v/`, version)),
+        siteLabelLink(kind, 'npmmirror', packageVersionHref(`https://www.npmmirror.com/package/${NPM_DSH_PACKAGE}/home?version=`, version)))
+      const channelLines = (translate, tags) => React.createElement('div', { style: { margin: '4px 0', fontSize: '12px', lineHeight: 1.7, color: 'var(--dsw-alias-label-secondary)', display: 'flex', flexDirection: 'column', gap: '6px' } },
+        channelLine(translate, 'latest', tags && tags.latest),
+        channelLine(translate, 'next', tags && tags.next))
+
       function ServiceOverlay() {
         const recovery = useRecoveryState()
         const updateState = useUpdateState()
@@ -617,7 +745,7 @@ window.__ModuleLoader__.load({
           React.createElement('div', { style: { fontSize: '18px', fontWeight: 700, marginBottom: '10px' } }, translate('update.details.title')),
           React.createElement('p', { style: { margin: '4px 0', fontSize: '13px' } }, translate('update.details.current', { version: update.current })),
           React.createElement('p', { style: { margin: '4px 0', fontSize: '13px' } }, translate('update.details.latest', { version: update.latest })),
-          React.createElement('p', { style: { margin: '4px 0', fontSize: '12px', color: 'var(--dsw-alias-label-secondary)' } }, translate('update.channels', { latest: update.tags?.latest || '—', next: update.tags?.next || '—' })),
+          channelLines(translate, update.tags),
           React.createElement('button', { style: { marginTop: '16px', padding: '7px 16px', borderRadius: '6px', border: 0, background: 'var(--dsw-alias-brand-primary)', color: 'var(--dsw-alias-button-contrast-fill)', cursor: 'pointer' }, onClick: () => setUpdateDetailsOpen(false) }, translate('update.details.close'))))
         }
 
@@ -666,6 +794,89 @@ window.__ModuleLoader__.load({
         return React.createElement(ServiceOverlay, null)
       }
 
+      // 重启区块：设置面板「重启」标签与设置页左列底部的专属入口共用，状态取自共享重启流。
+      // showNavToggle 仅「重启」标签传入：控制设置页左列入口是否显示（默认关闭）。
+      function RestartSection({ showNavToggle }) {
+        const translate = useTranslation()
+        const flow = useRestartFlow()
+        const [navEnabled, setNavEnabled] = useRestartNavEnabled()
+        const btn = { minHeight: '32px', padding: '6px 14px', borderRadius: '7px', border: '1px solid transparent', cursor: 'pointer', fontSize: '13px', fontWeight: 550, transition: 'border-color 120ms ease, color 120ms ease, background 120ms ease', lineHeight: '20px' }
+        const danger = { ...btn, background: 'var(--dsw-alias-state-error-primary)', color: '#fff', borderColor: 'var(--dsw-alias-state-error-primary)' }
+        const ghost = { ...btn, background: 'transparent', color: 'var(--dsw-alias-label-primary)', borderColor: 'var(--dsw-alias-border-l2)' }
+        const row = { display: 'flex', alignItems: 'center', gap: '8px', marginTop: '12px', flexWrap: 'wrap' }
+        const hint = { color: 'var(--dsw-alias-label-secondary)', fontSize: '12px', marginTop: '8px', lineHeight: 1.5 }
+        const card = { padding: '4px 0 14px', marginBottom: '12px', color: 'var(--dsw-alias-label-primary)' }
+        const displaySurface = { background: 'var(--dsh-svc-surface-bg)', color: 'var(--dsw-alias-label-primary)', border: '1px solid var(--dsw-alias-border-l1)', borderRadius: '8px', padding: '10px' }
+        const sectionTitle = { fontSize: '14px', fontWeight: 700, margin: '0 0 8px', color: 'var(--dsw-alias-label-primary)' }
+
+        // 重启后提示
+        if (flow.stage === 2) {
+          return React.createElement('div', { 'data-testid': 'restart-card', style: card },
+            React.createElement('div', { style: sectionTitle }, translate('restart.title')),
+            React.createElement('p', { style: { margin: 0, fontSize: '13px' } }, translate('restart.sent')),
+            React.createElement('p', { style: hint }, translate('restart.sentHint')))
+        }
+
+        const activityLabels = {
+          agent: translate('activity.agent'),
+          job: translate('activity.job'),
+          terminal: translate('activity.terminal'),
+        }
+        const activityItems = flow.activity && Array.isArray(flow.activity.items) ? flow.activity.items : []
+        const activityWarning = flow.stage === 3
+          ? React.createElement('div', { style: { marginTop: '12px', padding: '10px 12px', borderRadius: '6px', background: 'rgba(211,51,51,0.1)', border: '1px solid rgba(211,51,51,0.35)' } },
+              React.createElement('p', { style: { margin: '0 0 8px', color: 'var(--dsw-alias-state-error-primary)', fontSize: '13px', fontWeight: 600 } },
+                translate('activity.warning', { count: activityItems.length })),
+              React.createElement('ul', { style: { margin: 0, paddingLeft: '20px', fontSize: '12px', lineHeight: 1.7 } },
+                activityItems.map((item) => React.createElement('li', { key: item.type + ':' + item.id },
+                  translate('activity.item', {
+                    type: activityLabels[item.type] || item.type,
+                    label: item.label,
+                    status: item.status,
+                  }))))
+            )
+          : null
+
+        // 重启按钮区块
+        return React.createElement('div', { 'data-testid': 'restart-card', style: card },
+          React.createElement('div', { style: sectionTitle }, translate('restart.title')),
+          React.createElement('div', { 'data-testid': 'restart-region', style: displaySurface },
+            React.createElement('p', { style: { margin: 0, fontSize: '13px' } }, translate('restart.description')),
+            activityWarning,
+            React.createElement('div', { style: row },
+              flow.stage === 0
+                ? React.createElement('button', { style: danger, 'data-variant': 'danger', onClick: checkRestart, disabled: flow.busy }, translate(flow.busy ? 'update.checking' : 'restart.button'))
+                : flow.stage === 1
+                  ? [
+                      React.createElement('button', { key: 'confirm', style: danger, onClick: () => restartWeb(false), disabled: flow.busy }, translate(flow.busy ? 'restart.sending' : 'restart.confirm')),
+                      React.createElement('button', { key: 'cancel', style: ghost, onClick: () => setRestartFlow({ ...restartFlow, activity: null, stage: 0, busy: false, error: null }), disabled: flow.busy }, translate('restart.cancel')),
+                    ]
+                  : flow.stage === 3
+                    ? [
+                        React.createElement('button', { key: 'force', style: danger, onClick: () => restartWeb(true), disabled: flow.busy }, translate(flow.busy ? 'restart.sending' : 'restart.force')),
+                        React.createElement('button', { key: 'cancel', style: ghost, onClick: () => setRestartFlow({ ...restartFlow, activity: null, stage: 0, busy: false, error: null }), disabled: flow.busy }, translate('restart.cancel')),
+                      ]
+                    : null
+            ),
+            flow.stage === 1 ? React.createElement('p', { style: hint }, translate('restart.idleHint')) : null,
+            flow.error ? React.createElement('p', { style: Object.assign({}, hint, { color: 'var(--dsw-alias-state-error-primary)' }) }, String(flow.error)) : null,
+            showNavToggle
+              ? React.createElement('div', { style: { marginTop: '12px', paddingTop: '10px', borderTop: '1px solid var(--dsw-alias-border-l1)', display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: '12px' } },
+                  React.createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: '2px' } },
+                    React.createElement('span', { style: { fontSize: '13px', color: 'var(--dsw-alias-label-primary)' } }, translate('restart.navToggle')),
+                    React.createElement('span', { style: hint }, translate('restart.navToggleHint'))),
+                  React.createElement('button', {
+                    type: 'button',
+                    role: 'switch',
+                    'data-testid': 'restart-nav-switch',
+                    'aria-checked': String(navEnabled),
+                    onClick: () => setNavEnabled(!navEnabled),
+                    style: { width: '34px', height: '20px', borderRadius: '10px', padding: 0, flexShrink: 0, position: 'relative', border: `1px solid ${navEnabled ? 'var(--dsw-alias-state-success-primary)' : 'var(--dsw-alias-border-l2)'}`, background: navEnabled ? 'var(--dsw-alias-state-success-primary)' : 'var(--dsw-alias-bg-layer-2)', cursor: 'pointer', lineHeight: 0 },
+                  }, React.createElement('span', { style: { position: 'absolute', top: '1px', left: navEnabled ? '15px' : '1px', width: '16px', height: '16px', borderRadius: '50%', background: navEnabled ? '#fff' : 'var(--dsw-alias-label-tertiary)' } })))
+              : null)
+        )
+      }
+
       function ServicePanel() {
         const translate = useTranslation()
         const [health, setHealth] = useState(null)
@@ -703,11 +914,10 @@ window.__ModuleLoader__.load({
         const [toolErrorsOpen, setToolErrorsOpen] = useState(false)
         const [modelsOpen, setModelsOpen] = useState(false)
         const [activeTab, setActiveTab] = useState('overview')
-        // 重启状态：0=初始，1=普通确认，2=已发出，3=检测到活动工作
-        const [stage, setStage] = useState(0)
-        const [activity, setActivity] = useState(null)
-        const [busy, setBusy] = useState(false)
-        const [error, setError] = useState(null)
+        // 版本详情行内展开（不用浮层：弹层会被设置模态盖住）
+        const [channelOpen, setChannelOpen] = useState(false)
+        // 重启流程状态来自共享流（与设置页左列底部的专属入口同源）
+        const restartFlowState = useRestartFlow()
         const usageRequestPayload = { timezoneOffsetMinutes: new Date().getTimezoneOffset() }
 
         // 进入面板时拉取当前版本和健康快照；健康数据每 5 秒刷新，卸载即停止。
@@ -994,54 +1204,6 @@ window.__ModuleLoader__.load({
           }
         }
 
-         const checkRestart = async () => {
-          setBusy(true)
-          setError(null)
-          try {
-            const res = await ctx.connection.rpc.call('/dsh-service', 'activity', {})
-            if (res && res.ok === false) {
-              console.error('dsh-service: activity check failed', res.error)
-              throw new Error(translate('error.activity'))
-            }
-            const nextActivity = res && res.value ? res.value : { hasActive: false, items: [] }
-            setActivity(nextActivity)
-            setStage(nextActivity.hasActive ? 3 : 1)
-          } catch (err) {
-            setError(err && err.message ? String(err.message) : String(err))
-            setStage(0)
-          } finally {
-            setBusy(false)
-          }
-        }
-
-        const restart = async (force) => {
-          setBusy(true)
-          setError(null)
-          try {
-            const res = await ctx.connection.rpc.call('/dsh-service', 'web', { force: force === true })
-            if (res && res.ok === false) {
-              if (res.error === 'active-work' && res.value) {
-                setActivity(res.value)
-                setStage(3)
-                return
-              }
-              console.error('dsh-service: restart failed', res.error)
-              throw new Error(translate('error.restart'))
-            }
-            setStage(2)
-            const previousInstanceId = res && res.value ? res.value.instanceId : undefined
-            if (typeof previousInstanceId !== 'string' || previousInstanceId.length === 0) {
-              throw new Error(translate('error.instance'))
-            }
-            startRecovery(previousInstanceId).catch((err) => console.error('dsh-service: recovery failed', err))
-          } catch (err) {
-            setError(err && err.message ? String(err.message) : String(err))
-            setStage(0)
-          } finally {
-            setBusy(false)
-          }
-        }
-
         // 样式
         const btn = { minHeight: '32px', padding: '6px 14px', borderRadius: '7px', border: '1px solid transparent', cursor: 'pointer', fontSize: '13px', fontWeight: 550, transition: 'border-color 120ms ease, color 120ms ease, background 120ms ease', lineHeight: '20px' }
         const primary      = { ...btn, background: 'var(--dsw-alias-brand-primary)', color: 'var(--dsw-alias-button-contrast-fill)', borderColor: 'var(--dsw-alias-brand-primary)' }
@@ -1394,21 +1556,36 @@ window.__ModuleLoader__.load({
                     : null)))
             : null))
 
-        const versionRow = (id, label, fallbackVersion, state, action) => React.createElement('div', { key: id, style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: '16px', padding: '10px 2px', borderTop: id === 'dsh' ? 0 : '1px solid var(--dsw-alias-border-l1)' } },
-          React.createElement('div', { style: { whiteSpace: 'nowrap', display: 'flex', alignItems: 'center', gap: '8px' } },
-            React.createElement('span', { style: { fontSize: '13px', fontWeight: 650 } }, `${label} `),
-            state?.url
-              ? React.createElement('a', { 'data-testid': `version-${id}-link`, href: state.url, target: '_blank', rel: 'noreferrer', style: { color: 'var(--dsw-alias-label-primary)', textDecoration: 'underline', fontSize: '12px', whiteSpace: 'nowrap', marginLeft: '16px' } }, state.current || fallbackVersion || translate('version.loading'))
-              : React.createElement('code', { style: { fontSize: '12px', color: 'var(--dsw-alias-label-primary)', marginLeft: '16px' } }, state?.current || fallbackVersion || translate('version.loading'))),
-             state?.tags && id === 'dsh' ? React.createElement('span', { style: { marginLeft: '8px', fontSize: '11px', color: 'var(--dsw-alias-label-secondary)', whiteSpace: 'nowrap' } }, translate('update.channels', { latest: state.tags.latest || '—', next: state.tags.next || '—' })) : null,
+        // 正式/预览通道两行信息在版本卡内下拉展开（不弹浮层：弹层会被设置模态盖住）。
+        // 有更新时状态文本本身可点击：小三角 + 「有新版本：…」整体切换展开/收起。
+        const chevronIcon = (open) => React.createElement('svg', { xmlns: 'http://www.w3.org/2000/svg', width: 12, height: 12, viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor', strokeWidth: 3, strokeLinecap: 'round', strokeLinejoin: 'round', style: { display: 'block', transition: 'transform 150ms ease', transform: open ? 'rotate(90deg)' : 'none' } },
+          React.createElement('path', { d: 'M9 6l6 6-6 6' }))
+        const versionRow = (id, label, fallbackVersion, state, action, expandable, topBorder) => {
+          const statusText = !state
+            ? (updateError || translate('update.checking'))
+            : state.status === 'unpublished' ? translate('update.unpublished')
+              : state.status === 'unavailable' ? translate('update.unavailable')
+                : state.upToDate ? translate('update.current')
+                  : translate('update.available', { version: state.latest })
+          const statusColor = !state ? 'var(--dsw-alias-label-secondary)' : state.upToDate ? 'var(--dsw-alias-state-success-primary)' : 'var(--dsw-alias-state-warn-primary)'
+          const clickable = expandable && state && state.status !== 'unpublished' && state.status !== 'unavailable' && !state.upToDate
+          const rightSide = clickable
+            ? React.createElement('button', { type: 'button', title: translate(channelOpen ? 'update.detailsHide' : 'update.detailsButton'), style: { background: 'transparent', border: 0, padding: 0, cursor: 'pointer', display: 'inline-flex', alignItems: 'center', gap: '5px', fontSize: '12px', fontWeight: 600, color: statusColor }, onClick: () => setChannelOpen((value) => !value) },
+                chevronIcon(channelOpen),
+                React.createElement('span', null, statusText))
+            : React.createElement('div', { style: { color: statusColor, fontWeight: 600 } }, statusText)
+          return React.createElement('div', { key: id, style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: '16px', padding: '10px 2px', borderTop: topBorder ? '1px solid var(--dsw-alias-border-l1)' : 0 } },
+            React.createElement('div', { style: { whiteSpace: 'nowrap', display: 'flex', alignItems: 'center', gap: '8px' } },
+              React.createElement('span', { style: { fontSize: '13px', fontWeight: 650 } }, `${label} `),
+              state?.url
+                ? React.createElement('a', { 'data-testid': `version-${id}-link`, href: state.url, target: '_blank', rel: 'noreferrer', style: { color: 'var(--dsw-alias-label-primary)', textDecoration: 'underline', fontSize: '12px', whiteSpace: 'nowrap', marginLeft: '16px' } }, state.current || fallbackVersion || translate('version.loading'))
+                : React.createElement('code', { style: { fontSize: '12px', color: 'var(--dsw-alias-label-primary)', marginLeft: '16px' } }, state?.current || fallbackVersion || translate('version.loading'))),
             action || null,
-          React.createElement('div', { style: { textAlign: 'right', fontSize: '12px' } },
-            React.createElement('div', { style: { color: !state ? 'var(--dsw-alias-label-secondary)' : state.upToDate ? 'var(--dsw-alias-state-success-primary)' : 'var(--dsw-alias-state-warn-primary)', fontWeight: 600 } }, !state
-              ? (updateError || translate('update.checking'))
-              : state.status === 'unpublished' ? translate('update.unpublished')
-                : state.status === 'unavailable' ? translate('update.unavailable')
-                  : state.upToDate ? translate('update.current') : translate('update.available', { version: state.latest }))))
-        // 版本信息区块
+            React.createElement('div', { style: { textAlign: 'right', fontSize: '12px' } }, rightSide))
+        }
+        // 版本信息区块：DSH 行在有更新时状态文本（小三角 + 有新版本）整体可点击，行内下拉展开
+        const dshUpdate = updateInfo?.dsh
+        const dshExpandable = dshUpdate && dshUpdate.status !== 'unpublished' && dshUpdate.status !== 'unavailable' && !dshUpdate.upToDate
         const pluginUpdate = updateInfo?.plugin && !updateInfo.plugin.upToDate && updateInfo.plugin.status === 'available'
         const pluginAction = pluginUpdate
           ? React.createElement('button', { style: Object.assign({}, neutral, { minHeight: '24px', padding: '2px 8px', fontSize: '11px' }), disabled: upgradeBusy, onClick: upgradePlugin }, translate(upgradeBusy ? 'update.upgrading' : 'update.upgrade'))
@@ -1416,67 +1593,18 @@ window.__ModuleLoader__.load({
         const versionBlock = React.createElement('div', { key: 'version-card', 'data-testid': 'version-card', style: card },
           React.createElement('div', { key: 'title', style: sectionTitle }, translate('version.title')),
           React.createElement('div', { style: displaySurface },
-            versionRow('dsh', 'DSH', version, updateInfo?.dsh),
-            versionRow('plugin', 'dsh-service', pluginVersion, updateInfo?.plugin, pluginAction),
+            versionRow('plugin', 'dsh-service', pluginVersion, updateInfo?.plugin, pluginAction, false, false),
+            versionRow('dsh', 'DSH', version, dshUpdate, null, dshExpandable === true, true),
+            channelOpen
+              ? React.createElement('div', { 'data-testid': 'version-channel-details', style: { marginTop: '6px', paddingTop: '8px', borderTop: '1px solid var(--dsw-alias-border-l1)', fontSize: '12px', lineHeight: 1.7, color: 'var(--dsw-alias-label-secondary)', display: 'flex', flexDirection: 'column', gap: '6px' } },
+                  React.createElement('div', null, translate('update.details.current', { version: dshUpdate?.current || version || '—' })),
+                  React.createElement('div', null, translate('update.details.latest', { version: dshUpdate?.latest || '—' })),
+                  channelLines(translate, dshUpdate?.tags))
+              : null,
             upgradeError ? React.createElement('p', { style: Object.assign({}, hint, { color: 'var(--dsw-alias-state-error-primary)', margin: '4px 0 0' }) }, upgradeError) : null))
 
-        // 重启后提示
-        if (stage === 2) {
-          return React.createElement('div', null,
-            healthBlock,
-            backupBlock,
-            versionBlock,
-            React.createElement('div', { key: 'restart-section' },
-              React.createElement('div', { style: sectionTitle }, translate('restart.title')),
-              React.createElement('p', { style: { margin: 0, fontSize: '13px' } }, translate('restart.sent')),
-              React.createElement('p', { style: hint }, translate('restart.sentHint')))
-          )
-        }
-
-        const activityLabels = {
-          agent: translate('activity.agent'),
-          job: translate('activity.job'),
-          terminal: translate('activity.terminal'),
-        }
-        const activityItems = activity && Array.isArray(activity.items) ? activity.items : []
-        const activityWarning = stage === 3
-          ? React.createElement('div', { style: { marginTop: '12px', padding: '10px 12px', borderRadius: '6px', background: 'rgba(211,51,51,0.1)', border: '1px solid rgba(211,51,51,0.35)' } },
-              React.createElement('p', { style: { margin: '0 0 8px', color: 'var(--dsw-alias-state-error-primary)', fontSize: '13px', fontWeight: 600 } },
-                translate('activity.warning', { count: activityItems.length })),
-              React.createElement('ul', { style: { margin: 0, paddingLeft: '20px', fontSize: '12px', lineHeight: 1.7 } },
-                activityItems.map((item) => React.createElement('li', { key: item.type + ':' + item.id },
-                  translate('activity.item', {
-                    type: activityLabels[item.type] || item.type,
-                    label: item.label,
-                    status: item.status,
-                  }))))
-            )
-          : null
-
-        // 重启按钮区块
-        const restartBlock = React.createElement('div', { key: 'restart-section', 'data-testid': 'restart-card', style: card },
-          React.createElement('div', { style: sectionTitle }, translate('restart.title')),
-          React.createElement('div', { 'data-testid': 'restart-region', style: displaySurface },
-          React.createElement('p', { style: { margin: 0, fontSize: '13px' } }, translate('restart.description')),
-          activityWarning,
-          React.createElement('div', { style: row },
-            stage === 0
-              ? React.createElement('button', { style: danger, 'data-variant': 'danger', onClick: checkRestart, disabled: busy }, translate(busy ? 'update.checking' : 'restart.button'))
-              : stage === 1
-                ? [
-                    React.createElement('button', { key: 'confirm', style: danger, onClick: () => restart(false), disabled: busy }, translate(busy ? 'restart.sending' : 'restart.confirm')),
-                    React.createElement('button', { key: 'cancel', style: ghost, onClick: () => { setActivity(null); setStage(0) }, disabled: busy }, translate('restart.cancel')),
-                  ]
-                : stage === 3
-                  ? [
-                      React.createElement('button', { key: 'force', style: danger, onClick: () => restart(true), disabled: busy }, translate(busy ? 'restart.sending' : 'restart.force')),
-                      React.createElement('button', { key: 'cancel', style: ghost, onClick: () => { setActivity(null); setStage(0) }, disabled: busy }, translate('restart.cancel')),
-                    ]
-                  : null
-          ),
-          stage === 1 ? React.createElement('p', { style: hint }, translate('restart.idleHint')) : null,
-          error ? React.createElement('p', { style: Object.assign({}, hint, { color: 'var(--dsw-alias-state-error-primary)' }) }, String(error)) : null)
-        )
+        // 重启区块复用共享组件（「重启」标签还承载设置页左列入口的显示开关；左侧入口默认关闭）
+        const restartBlock = React.createElement(RestartSection, { showNavToggle: true })
 
         const { enabled: notifyOn, done: notifyDoneOn, input: notifyInputOn, setEnabled: setNotifyOn, setDone: setNotifyDoneOn, setInput: setNotifyInputOn } = useNotifyState()
         const notifSupported = typeof Notification !== 'undefined'
@@ -1512,18 +1640,22 @@ window.__ModuleLoader__.load({
                       notifyRow(translate('notification.master'), translate('notification.masterHint'), notifyOn, setNotifyOn, false),
                       notifyRow(translate('notification.done'), translate('notification.doneHint'), notifyDoneOn, setNotifyDoneOn, !notifyOn),
                       notifyRow(translate('notification.input'), translate('notification.inputHint'), notifyInputOn, setNotifyInputOn, !notifyOn))))
-        const overviewBlock = React.createElement('div', null, versionBlock, notificationBlock, containerInfoBlock, overviewErrorsBlock)
+        const overviewBlock = React.createElement('div', null, versionBlock, containerInfoBlock, overviewErrorsBlock)
+        // 任务通知独立成顶部标签（v0.14 起不再混在概览里）
+        const notifyBlock = React.createElement('div', null, notificationBlock)
         const maintenanceBlock = React.createElement('div', { key: 'maintenance-card', 'data-testid': 'maintenance-card', style: card }, backupBlock)
         const diagnosticFailure = diagnostics?.checks?.some((check) => check.status === 'error' || (check.status === 'warning' && !(check.id === 'backup-storage' && String(check.detail || '').startsWith('0:')))) === true
         const tabWarnings = {
           overview: false,
+          notify: false,
           health: Boolean(healthError || permissionError || diagnosticFailure || permissionAbnormal > 0),
           usage: Boolean(usageError),
           backup: Boolean(backupError),
-          restart: Boolean(error),
+          restart: Boolean(restartFlowState.error),
         }
         const tabs = [
           ['overview', 'tabs.overview'],
+          ['notify', 'tabs.notify'],
           ['health', 'tabs.health'],
           ['usage', 'tabs.usage'],
           ['backup', 'tabs.backup'],
@@ -1532,13 +1664,15 @@ window.__ModuleLoader__.load({
         const warningTabs = tabs.filter(([id]) => tabWarnings[id]).map(([, label]) => translate(label))
         const tabContent = activeTab === 'overview'
           ? overviewBlock
-          : activeTab === 'health'
-            ? healthBlock
-            : activeTab === 'usage'
-              ? usageBlock
-              : activeTab === 'backup'
-                ? maintenanceBlock
-                : restartBlock
+          : activeTab === 'notify'
+            ? notifyBlock
+            : activeTab === 'health'
+              ? healthBlock
+              : activeTab === 'usage'
+                ? usageBlock
+                : activeTab === 'backup'
+                  ? maintenanceBlock
+                  : restartBlock
         return React.createElement('div', null,
           warningTabs.length > 0 ? React.createElement('div', { style: { marginBottom: '12px', padding: '11px 13px', borderRadius: '8px', background: 'rgba(198,128,0,0.16)', border: '1px solid rgba(198,128,0,0.48)', boxShadow: '0 2px 8px rgba(0,0,0,0.08)' } },
             React.createElement('div', { style: { fontSize: '13px', fontWeight: 700 } }, translate('tabs.alert.title')),
@@ -1581,10 +1715,21 @@ window.__ModuleLoader__.load({
         { name: 'sidebar.footer.action', id: 'dsh-service-update', order: 90, label: () => t('update.badge') },
         () => React.createElement(UpdateBadge, null),
       ))
-      ctx.slots.inject('settings.section', () => ctx.slots.register(
-        { name: 'settings.section', id: 'dsh-service', order: 99, label: () => t('nav.label') },
-        () => React.createElement(ServicePanel, null),
-      ))
+      ctx.slots.inject('settings.section', () => {
+        const disposePanel = ctx.slots.register(
+          { name: 'settings.section', id: 'dsh-service', order: 99, label: () => t('nav.label') },
+          () => React.createElement(ServicePanel, null),
+        )
+        // 左列「重启」入口由「重启」标签内的开关控制，默认不注册
+        syncRestartNavEntry()
+        return () => {
+          disposePanel()
+          if (restartNavDispose) {
+            restartNavDispose()
+            restartNavDispose = null
+          }
+        }
+      })
       ctx.slots.inject('shell.overlay', () => ctx.slots.register(
         { name: 'shell.overlay', id: 'dsh-service-restart', order: 100, label: () => t('overlay.label') },
         () => React.createElement(RestartOverlay, null),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gehennawu/dsh-service",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "description": "DSH Web 自托管运维面板：安全重启、健康监控、备份和 Linux 权限维护。",
   "type": "module",
   "scripts": {