dsh-long-plugins 2.3.0 → 2.4.1

package/client/client.js

@@ -529,17 +529,27 @@ window.__ModuleLoader__.load({
             }
           }
         }
-        window.addEventListener('dragenter', onDragEnter, true)
-        window.addEventListener('dragover', onDragOver, true)
-        window.addEventListener('dragleave', onDragLeave, true)
-        window.addEventListener('drop', onDrop, true)
-        window.addEventListener('paste', onPaste, true)
+        const dragOn = !!(window.__dshLongMod && window.__dshLongMod('uploadDragDrop'))
+        const pasteOn = !!(window.__dshLongMod && window.__dshLongMod('uploadPaste'))
+        if (dragOn) {
+          window.addEventListener('dragenter', onDragEnter, true)
+          window.addEventListener('dragover', onDragOver, true)
+          window.addEventListener('dragleave', onDragLeave, true)
+          window.addEventListener('drop', onDrop, true)
+        }
+        if (pasteOn) {
+          window.addEventListener('paste', onPaste, true)
+        }
         return () => {
-          window.removeEventListener('dragenter', onDragEnter, true)
-          window.removeEventListener('dragover', onDragOver, true)
-          window.removeEventListener('dragleave', onDragLeave, true)
-          window.removeEventListener('drop', onDrop, true)
-          window.removeEventListener('paste', onPaste, true)
+          if (dragOn) {
+            window.removeEventListener('dragenter', onDragEnter, true)
+            window.removeEventListener('dragover', onDragOver, true)
+            window.removeEventListener('dragleave', onDragLeave, true)
+            window.removeEventListener('drop', onDrop, true)
+          }
+          if (pasteOn) {
+            window.removeEventListener('paste', onPaste, true)
+          }
         }
       }, [controller, sessionId])
 
@@ -1367,25 +1377,52 @@ window.__ModuleLoader__.load({
     }
 
     function apply(ctx) {
-      const controller = new FileDraftController(ctx)
-      ctx.effect(() => () => controller.dispose(), 'dsh-upload-manager: draft-file state')
-      ctx.effect(() => ctx.inputTriggers.registerSource({
-        trigger: '@',
-        name: SOURCE,
-        order: 10_000,
-        candidates: async () => [],
-        onPick: () => undefined,
-        codec: {
-          clipboardText: () => '',
-          serialize: async (ref) => {
-            const file = controller.fileForRef(ref)
-            if (!file) throw new Error('待发送文件已失效，请重新上传')
-            controller.markSerializing(ref)
-            return serializedFile(file)
+      const mod = window.__dshLongMod || (() => true)
+      const anyUpload = mod('uploadAttach') || mod('uploadDragDrop') || mod('uploadPaste')
+      if (anyUpload) {
+        const controller = new FileDraftController(ctx)
+        ctx.effect(() => () => controller.dispose(), 'dsh-upload-manager: draft-file state')
+        ctx.effect(() => ctx.inputTriggers.registerSource({
+          trigger: '@',
+          name: SOURCE,
+          order: 10_000,
+          candidates: async () => [],
+          onPick: () => undefined,
+          codec: {
+            clipboardText: () => '',
+            serialize: async (ref) => {
+              const file = controller.fileForRef(ref)
+              if (!file) throw new Error('待发送文件已失效，请重新上传')
+              controller.markSerializing(ref)
+              return serializedFile(file)
+            },
           },
-        },
-      }), 'dsh-upload-manager: hidden file reference codec')
-
+        }), 'dsh-upload-manager: hidden file reference codec')
+        // 输入框附件上传(回形针) + 待发送文件栏：由 uploadAttach 控制
+        if (mod('uploadAttach')) {
+          ctx.slots.inject('conversation.input.left', () => ctx.slots.register({
+            name: 'conversation.input.left',
+            id: 'local-file-upload',
+            order: -20,
+            label: '上传文件',
+          }, (props) => React.createElement(UploadControl, { ...props, controller })))
+          ctx.slots.inject('conversation.input.dock', () => ctx.slots.register({
+            name: 'conversation.input.dock',
+            id: 'local-file-upload-rail',
+            order: 80,
+            label: '待发送文件',
+          }, (props) => React.createElement(PendingFileRail, { ...props, controller })))
+        }
+        // 拖放上传(遮罩+window 监听) / 粘贴上传：由各自开关控制
+        if (mod('uploadDragDrop') || mod('uploadPaste')) {
+          ctx.slots.inject('conversation.input.dock', () => ctx.slots.register({
+            name: 'conversation.input.dock',
+            id: 'local-file-upload-dropzone',
+            order: 90,
+            label: '拖放/粘贴上传',
+          }, (props) => React.createElement(DragDropOverlay, { ...props, controller })))
+        }
+      }
       ctx.effect(() => {
         const style = document.createElement('style')
         style.dataset.plugin = 'dsh-file-uploads'
@@ -1393,41 +1430,24 @@ window.__ModuleLoader__.load({
         document.head.appendChild(style)
         return () => style.remove()
       }, 'dsh-upload-manager: styles')
-
-      ctx.slots.inject('conversation.input.left', () => ctx.slots.register({
-        name: 'conversation.input.left',
-        id: 'local-file-upload',
-        order: -20,
-        label: '上传文件',
-      }, (props) => React.createElement(UploadControl, { ...props, controller })))
-
-      ctx.slots.inject('conversation.input.dock', () => ctx.slots.register({
-        name: 'conversation.input.dock',
-        id: 'local-file-upload-rail',
-        order: 80,
-        label: '待发送文件',
-      }, (props) => React.createElement(PendingFileRail, { ...props, controller })))
-
-      ctx.slots.inject('conversation.input.dock', () => ctx.slots.register({
-        name: 'conversation.input.dock',
-        id: 'local-file-upload-dropzone',
-        order: 90,
-        label: '拖放上传',
-      }, (props) => React.createElement(DragDropOverlay, { ...props, controller })))
-
-      ctx.slots.inject('settings.section', () => ctx.slots.register({
-        name: 'settings.section',
-        id: 'uploaded-files',
-        order: 30,
-        label: '上传文件',
-      }, UploadSettingsSection))
-
-      ctx.slots.inject('settings.section', () => ctx.slots.register({
-        name: 'settings.section',
-        id: 'output-files',
-        order: 35,
-        label: '输出文件',
-      }, WorkspaceFilesSection))
+      // 上传文件预览/管理设置区：由 uploadPreview 控制
+      if (mod('uploadPreview')) {
+        ctx.slots.inject('settings.section', () => ctx.slots.register({
+          name: 'settings.section',
+          id: 'uploaded-files',
+          order: 30,
+          label: '上传文件',
+        }, UploadSettingsSection))
+      }
+      // 输出文件(工作区)设置区：由 workspace 控制
+      if (mod('workspace')) {
+        ctx.slots.inject('settings.section', () => ctx.slots.register({
+          name: 'settings.section',
+          id: 'output-files',
+          order: 35,
+          label: '输出文件',
+        }, WorkspaceFilesSection))
+      }
     }
       return { apply, inject }
     })()
@@ -2062,18 +2082,21 @@ window.__ModuleLoader__.load({
 		const inject = ["slots", "locale"];
 		/** Register the token-usage card into the sidebar footer. */
 		function apply(ctx) {
-			injectMobileCss();
+			injectMobileCss(); // 移动端布局 CSS 始终注入(与余额开关解耦)
 			ctx.effect(() => ctx.locale.register(NS, {
 				zh,
 				en
 			}), "dsh-token-usage: dictionaries");
-			ctx.slots.inject("conversation.composer.dock", () => ctx.slots.register({
-				name: "conversation.composer.dock",
-				id: "token-balance",
-				order: -10,
-				locale: NS,
-				inject: () => ({})
-			}, BalanceChip));
+			// 余额 chip：仅当"余额"模块开启时注册(禁用余额时保留移动布局)
+			if (!(window.__dshLongModules && window.__dshLongModules.balance === false)) {
+				ctx.slots.inject("conversation.composer.dock", () => ctx.slots.register({
+					name: "conversation.composer.dock",
+					id: "token-balance",
+					order: -10,
+					locale: NS,
+					inject: () => ({})
+				}, BalanceChip));
+			}
 		}
       return { apply, inject }
     })()
@@ -2437,6 +2460,11 @@ window.__ModuleLoader__.load({
         .dsh-turn-preview{width:min(360px,88vw);height:min(70vh,520px);top:50%!important;left:50%!important;transform:translate(-50%,-50%)!important}
 
       }
+      /* 会话导航开关(off 时隐藏轮次刻尺/手机把手)：与 DSH 原生回合导航避免冲突 */
+      html[data-dsh-turnruler="off"] .dsh-turn-ruler,
+      html[data-dsh-turnruler="off"] .dsh-turn-phone-tab {
+        display: none !important;
+      }
     `
     const turnRulerPlugin = {
       inject: [],
@@ -2467,6 +2495,11 @@ window.__ModuleLoader__.load({
           let scrollAnim = 0
           let scrollTarget = -1
           let scrollFrom = 0
+          // 会话导航开关：从 glass 配置读取 turnRuler；false=off 隐藏刻尺(避免与 DSH 原生回合导航冲突)
+          ;(() => {
+            const setVis = (en) => { try { document.documentElement.setAttribute('data-dsh-turnruler', en ? 'on' : 'off') } catch (_) {} }
+            fetch('/api/dsh-uploads/glass-config', { cache: 'no-store' }).then((r) => r.json()).then((b) => { if (b && b.cfg) setVis((b.cfg.modules && b.cfg.modules.turnRuler) !== false) }).catch(() => {})
+          })()
 
           const ensureRuler = () => {
             if (ruler && ruler.isConnected) return ruler
@@ -3157,10 +3190,10 @@ window.__ModuleLoader__.load({
         backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
         -webkit-backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
       }
-      /* 任务/todo 面板(lXshSW_root, 在 conversation.input.dock 内)：不透明底+可读文字, 不透明与会话重叠 */
+      /* 任务/todo 面板(lXshSW_root, 在 conversation.input.dock 内)：半透明磨砂底+可读文字 */
       html[data-dsh-glass="on"] [class*="lXshSW_root"],
       html[data-dsh-glass="on"] [class*="lXshSW_body"] {
-        background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 76%, transparent) !important;
+        background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 62%, transparent) !important;
         color: var(--dsw-alias-label-primary) !important;
         backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
         -webkit-backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
@@ -3173,7 +3206,7 @@ window.__ModuleLoader__.load({
       /* 排队消息/等待任务面板(_7yHdaG_dock/panel, 在 conversation.input.dock 内)：不透明/磨砂底+可读文字 */
       html[data-dsh-glass="on"] [class*="_7yHdaG_panel"],
       html[data-dsh-glass="on"] [class*="_7yHdaG_dock"] {
-        background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 88%, transparent) !important;
+        background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 62%, transparent) !important;
         color: var(--dsw-alias-label-primary) !important;
         backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
         -webkit-backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
@@ -3272,6 +3305,8 @@ window.__ModuleLoader__.load({
           --dsw-alias-label-tertiary: #50545b !important;
         }
       }
+    `
+    const GLASS_LAYOUT_CSS = `
       .dsh-glass-section{display:flex;flex-direction:column;gap:16px;min-width:0;padding:4px 2px 24px;color:var(--dsw-alias-label-primary)}
       .dsh-glass-head{display:flex;align-items:center;justify-content:space-between;gap:16px}
       .dsh-glass-head h2{margin:0;font-size:20px;line-height:28px}
@@ -3346,6 +3381,80 @@ window.__ModuleLoader__.load({
         ),
       )
     }
+    // 「dsh-long」设置区：各模块开关(独立、移动端干净)，避免把开关塞进 RA-Span
+    const DSH_LONG_MODULES = [
+      ['glass', 'RA-Span'],
+      ['turnRuler', '会话导航（轮次刻尺）'],
+      ['uploadAttach', '附件上传（回形针）'],
+      ['uploadDragDrop', '附件拖放上传'],
+      ['uploadPaste', '附件粘贴上传'],
+      ['uploadPreview', '上传文件预览/管理'],
+      ['skillDocs', '技能文档'],
+      ['balance', '账户余额'],
+      ['workspace', '输出文件预览/管理'],
+      ['mobile', '移动端布局'],
+    ]
+    const DshLongSettingsSection = () => {
+      const [state, setState] = React.useState({ loading: true, saving: false, error: '', modules: null, patches: null })
+      const load = React.useCallback(async () => {
+        setState((s) => ({ ...s, loading: true, error: '', patches: null }))
+        try {
+          const [r, pr] = await Promise.all([
+            fetch('/api/dsh-uploads/glass-config', { cache: 'no-store' }),
+            fetch('/api/dsh-uploads/patch-status', { cache: 'no-store' }),
+          ])
+          const b = await r.json()
+          if (!r.ok) throw new Error(b.error || ('HTTP ' + r.status))
+          let patches = null
+          try { const pb = await pr.json(); patches = pb.patches } catch (_) {}
+          setState((s) => ({ ...s, loading: false, modules: b.cfg.modules || {}, patches }))
+        } catch (e) { setState((s) => ({ ...s, loading: false, error: String((e && e.message) || e) })) }
+      }, [])
+      React.useEffect(() => { load(); }, [load])
+      const setMod = React.useCallback((k, v) => setState((s) => ({ ...s, modules: { ...(s.modules || {}), [k]: v } })), [])
+      const save = React.useCallback(async () => {
+        setState((s) => ({ ...s, saving: true, error: '' }))
+        try {
+          const r = await fetch('/api/dsh-uploads/glass-config', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ modules: state.modules }) })
+          const b = await r.json()
+          if (!r.ok) throw new Error(b.error || ('HTTP ' + r.status))
+          window.__dshLongModules = state.modules
+          try { localStorage.setItem('dsh-long:modules', JSON.stringify(state.modules)) } catch (e) {}
+          setState((s) => ({ ...s, saving: false, error: '' }))
+        } catch (e) { setState((s) => ({ ...s, saving: false, error: String((e && e.message) || e) })) }
+      }, [state.modules])
+      const PATCH_LABELS = { trustedHosts: 'privileged 信任 trustedHosts', loopback: '反代域名视为 loopback', heartbeat: 'WebSocket 心跳' }
+      const pstat = (st) => st === '已打' ? { text: '已打', cls: 'ok' } : (st === '原生无需' ? { text: '原生无需', cls: 'na' } : { text: '未打', cls: 'warn' })
+      if (state.loading) return React.createElement('div', { className: 'dsh-glass-section' }, '加载中…')
+      return React.createElement('div', { className: 'dsh-glass-section' },
+        React.createElement('div', { className: 'dsh-glass-head' },
+          React.createElement('div', null, React.createElement('h2', null, 'dsh-long'), React.createElement('p', null, '各模块开关：关掉某模块即禁用其功能（若新版 DSH 自带某项，可关掉插件对应功能避免冲突）。')),
+        ),
+        state.error ? React.createElement('div', { className: 'dsh-glass-error' }, state.error) : null,
+        React.createElement('div', { className: 'dsh-glass-card' },
+          DSH_LONG_MODULES.map(([k, label]) => React.createElement('div', { key: k, className: 'dsh-glass-row' },
+            React.createElement('label', null, label),
+            React.createElement('label', { className: 'dsh-glass-switch' }, React.createElement('input', { type: 'checkbox', checked: (state.modules ? state.modules[k] !== false : true), onChange: (e) => setMod(k, e.target.checked) }), (state.modules ? state.modules[k] !== false : true) ? '已开启' : '已关闭'),
+          )),
+          React.createElement('div', { className: 'dsh-glass-actions' },
+            React.createElement('button', { type: 'button', onClick: load }, '重置'),
+            React.createElement('button', { type: 'button', className: 'primary', disabled: state.saving, onClick: save }, state.saving ? '保存中…' : '保存生效'),
+          ),
+        ),
+        state.patches ? React.createElement('div', { className: 'dsh-glass-card' },
+          React.createElement('div', { className: 'dsh-glass-zone-title' }, '补丁状态(只读)'),
+          typeof state.patches === 'string' ? React.createElement('p', { className: 'dsh-glass-note' }, state.patches)
+            : Object.keys(PATCH_LABELS).map((k) => {
+              const st = state.patches[k]
+              const info = pstat(st)
+              return React.createElement('div', { key: k, className: 'dsh-glass-row' },
+                React.createElement('label', null, PATCH_LABELS[k]),
+                React.createElement('span', { className: 'dsh-glass-val' + (info.cls === 'ok' ? '' : (info.cls === 'na' ? ' dsh-glass-na' : ' dsh-glass-warn')) }, info.text),
+              )
+            })
+        ) : null,
+      )
+    }
     const GlassSettingsSection = () => {
       const [state, setState] = React.useState({ loading: true, saving: false, error: '', cfg: null, bgImage: '', bgList: [] })
       const load = React.useCallback(async () => {
@@ -3501,7 +3610,7 @@ window.__ModuleLoader__.load({
           const style = document.createElement('style')
           style.dataset.plugin = 'dsh-long-plugins'
           style.dataset.pluginCss = 'dsh-long-plugins/glass'
-          style.textContent = GLASS_CSS
+          style.textContent = GLASS_CSS // 玻璃视觉规则(仅 RA-Span 开启时注入)
           document.head.appendChild(style)
           return () => style.remove()
         }, 'dsh-long-plugins: glass styles')
@@ -3765,6 +3874,9 @@ window.__ModuleLoader__.load({
               try {
                 const tk = dshDark() ? 'dark' : 'light'
                 root.setAttribute('data-dsh-theme', tk)
+                root.setAttribute('data-dsh-turnruler', ((c.modules && c.modules.turnRuler) !== false) ? 'on' : 'off')
+                window.__dshLongModules = c.modules || {}
+                try { localStorage.setItem('dsh-long:modules', JSON.stringify(window.__dshLongModules)) } catch (e) {}
                 const bt = bgTint(tk)
                 const v = `rgba(${hexToRgb(bt.color)},${bt.mask})`
                 root.style.setProperty('--dsh-glass-bg-zone', v)
@@ -3867,7 +3979,17 @@ window.__ModuleLoader__.load({
       ...glassPlugin.inject,
     ]))
 
+    // 模块开关缓存：页面加载时同步读取(让 main apply 的 modEnabled 门控生效)；
+    // 配置加载(applyTheme)/保存(dsh-long 保存)后更新。开关在下次刷新生效。
+    try {
+      const _m = localStorage.getItem('dsh-long:modules')
+      if (_m) window.__dshLongModules = JSON.parse(_m)
+    } catch (_) {}
+    // 全局模块开关查询(供各组件/apply 内部判断)
+    window.__dshLongMod = (n) => (window.__dshLongModules ? window.__dshLongModules[n] !== false : true)
+
     function apply(ctx) {
+      const modEnabled = (n) => (window.__dshLongModules ? window.__dshLongModules[n] !== false : true)
       const safeApply = (label, fn) => {
         try {
           fn(ctx)
@@ -3875,13 +3997,24 @@ window.__ModuleLoader__.load({
           console.error('[dsh-long-plugins] ' + label + ' apply failed:', error)
         }
       }
-      safeApply('upload', (c) => uploadPlugin.apply(c))
-      safeApply('skill-docs', (c) => skillDocsPlugin.apply(c))
-      safeApply('token-usage', (c) => tokenUsagePlugin.apply(c))
-      safeApply('mobile-hamburger', (c) => mobilePlugin.apply(c))
-      safeApply('workspace-files', (c) => workspaceFilesPlugin.apply(c))
-      safeApply('turn-ruler', (c) => turnRulerPlugin.apply(c))
-      safeApply('glass', (c) => glassPlugin.apply(c))
+      // 「dsh-long」设置区(模块开关+补丁状态)始终注册——独立于任何模块开关, 否则禁用 RA-Span 会连带它一起消失
+      ctx.slots.inject('settings.section', () => ctx.slots.register({ name: 'settings.section', id: 'dsh-long', order: 60, label: 'dsh-long' }, DshLongSettingsSection))
+      // .dsh-glass-* 布局类(设置区排版)的 CSS 始终注入(不随 glass 开关丢失; 体积小)
+      ctx.effect(() => {
+        const style = document.createElement('style')
+        style.dataset.plugin = 'dsh-long-plugins'
+        style.dataset.pluginCss = 'dsh-long-plugins/glass-layout'
+        style.textContent = GLASS_LAYOUT_CSS
+        document.head.appendChild(style)
+        return () => style.remove()
+      }, 'dsh-long-plugins: glass layout css (always)')
+      safeApply('upload', (c) => uploadPlugin.apply(c)) // 上传子功能(预览/附件/拖放/粘贴)在插件内部按模块开关
+      if (modEnabled('skillDocs')) safeApply('skill-docs', (c) => skillDocsPlugin.apply(c))
+      safeApply('token-usage', (c) => tokenUsagePlugin.apply(c)) // 余额 chip 开关在其内部; MOBILE_CSS 始终注入
+      if (modEnabled('mobile')) safeApply('mobile-hamburger', (c) => mobilePlugin.apply(c))
+      if (modEnabled('workspace')) safeApply('workspace-files', (c) => workspaceFilesPlugin.apply(c))
+      if (modEnabled('turnRuler')) safeApply('turn-ruler', (c) => turnRulerPlugin.apply(c))
+      if (modEnabled('glass')) safeApply('glass', (c) => glassPlugin.apply(c))
     }
 
     exports.apply = apply

package/dsh.plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-long-plugins",
   "description": "Merged DSH web plugins: upload manager (drag-and-drop attach any file to the message), workspace output files, skill docs, account balance, Markdown-to-Word (md2docx), and polished file preview (Word & PowerPoint real preview with zoom/pan, rendered Markdown), plus an auto-repair install for DSH core patches (reverse-proxy WebSocket heartbeat, upgrade relink). | 一个插件整合 DSH Web 的常用增强：上传管理（拖放上传：拖任意文件到会话框直接附加）、工作区「输出文件」面板、技能文档浏览、账户余额显示、Markdown 转 Word（md2docx）、Word/PowerPoint 真实预览（可缩放、翻页）；并自带修复安装，自动重连 DSH 核心补丁（反代 WebSocket 心跳、升级重连）。",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "entry": {
     "name": "dsh-long-plugins",
     "inject": [

package/lib/index.js

@@ -12,7 +12,7 @@
  * (which honours `config.trustedHosts`); file paths are resolved inside
  * their configured root so traversal is impossible.
  */
-import { createReadStream } from "node:fs";
+import { createReadStream, readFileSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
 import { link, lstat, mkdir, open, readdir, rename, stat, unlink } from "node:fs/promises";
 import { homedir } from "node:os";
@@ -28,6 +28,8 @@ import ExcelJS from "exceljs";
 // 插件根下的 client/vendor 目录（存放 docx-preview / jszip 前端库，供 docx 预览端点读取）。
 // 用 module 级定位，让 createHandlers / 各 handler 都能访问（不依赖 apply 内的 PACKAGE_DIR）。
 const VENDOR_DIR = resolve(dirname(fileURLToPath(import.meta.url)), "..", "client", "vendor");
+// 插件当前版本(读 package.json)，用于「插件升级时」的配置迁移(如默认关闭回合导航/RA-Span)
+const PLUGIN_VERSION = (() => { try { return JSON.parse(readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), "..", "package.json"), "utf8")).version || ""; } catch { return ""; } })();
 
 export const name = "dsh-long-plugins";
 
@@ -1628,6 +1630,8 @@ window.addEventListener('resize',function(){ try{ if(fitMode) zoomFit(); else ap
     bgTint: { light: { color: "#1a2332", mask: 0.28 }, dark: { color: "#1a2332", mask: 0.28 } },
     inputBox: { light: { color: "", opacity: 1 }, dark: { color: "", opacity: 1 } },
     zone: { session: { color: "#1a2332", mask: 0.45, opacity: 0.5 }, input: { color: "#1a2332", mask: 0.6, opacity: 0.55 } },
+    // 各模块开关(「dsh-long」设置区)：false=禁用该模块功能(避免与 DSH 新版自带功能冲突/按需关闭)
+    modules: { glass: false, uploadAttach: true, uploadDragDrop: true, uploadPaste: true, uploadPreview: true, skillDocs: true, balance: true, mobile: true, workspace: true, turnRuler: false },
   };
   const glassDir = resolve(homedir(), ".dsh-long-plugins");
   const glassFile = join(glassDir, "glass.json");
@@ -1659,6 +1663,16 @@ window.addEventListener('resize',function(){ try{ if(fitMode) zoomFit(); else ap
           await writeFile(glassFile, JSON.stringify(cfg, null, 2), "utf8");
         } catch (_) {}
       }
+      // 插件升级时：版本号变化 → 默认关闭「会话导航」「RA-Span」(避免与 DSH 新版自带功能冲突)
+      if (PLUGIN_VERSION && cfg._pluginVersion !== PLUGIN_VERSION) {
+        try {
+          cfg.modules = { glass: false, uploadAttach: true, uploadDragDrop: true, uploadPaste: true, uploadPreview: true, skillDocs: true, balance: true, mobile: true, workspace: true, turnRuler: false, ...(cfg.modules || {}) };
+          cfg.modules.glass = false;
+          cfg.modules.turnRuler = false;
+          cfg._pluginVersion = PLUGIN_VERSION;
+          await writeFile(glassFile, JSON.stringify(cfg, null, 2), "utf8");
+        } catch (_) {}
+      }
       return cfg;
     } catch { return { ...GLASS_DEFAULTS }; }
   }
@@ -1684,6 +1698,8 @@ window.addEventListener('resize',function(){ try{ if(fitMode) zoomFit(); else ap
             bgTint: cfg.bgTint || { light: { color: "#1a2332", mask: 0.28 }, dark: { color: "#1a2332", mask: 0.28 } },
             bgColor: cfg.bgColor || "#1a2332", bgMask: cfg.bgMask ?? 0.28,
             bgBlur: cfg.bgBlur ?? 0, bgOpacity: cfg.bgOpacity ?? 1,
+            turnRuler: (cfg.modules && cfg.modules.turnRuler) !== false,
+            modules: { glass: false, uploadAttach: true, uploadDragDrop: true, uploadPaste: true, uploadPreview: true, skillDocs: true, balance: true, mobile: true, workspace: true, turnRuler: false, ...(cfg.modules || {}) },
             bgImage: imgMeta,
           },
           bgImage: imgMeta,
@@ -1695,6 +1711,12 @@ window.addEventListener('resize',function(){ try{ if(fitMode) zoomFit(); else ap
         const body = await readJsonBody(req, 4 * 1024 * 1024);
         const current = await readGlassJSON();
         const next = { ...current, ...sanitizeGlass(typeof body === "object" && body !== null ? body : {}) };
+        // 各模块开关表：body.modules 里有的键按布尔合并
+        if (body && typeof body.modules === "object" && body.modules !== null) {
+          const m = { glass: true, uploadAttach: true, uploadDragDrop: true, uploadPaste: true, uploadPreview: true, skillDocs: true, balance: true, mobile: true, workspace: true, turnRuler: true, ...(current.modules || {}) };
+          for (const k of Object.keys(body.modules)) m[k] = body.modules[k] !== false;
+          next.modules = m;
+        }
         // 背景图改为"文件 + 引用": 用户上传的 data-URI 存入 current.uri, 配置只存 "current" 引用
         if (typeof next.bgImage === "string" && next.bgImage.startsWith("data:image/")) {
           try {
@@ -1754,8 +1776,40 @@ window.addEventListener('resize',function(){ try{ if(fitMode) zoomFit(); else ap
       sendError(res, error, onError);
     }
   };
+  // 补丁状态：只读检测 DSH 核心各补丁的「已打 / 未打 / 原生无需」，供 dsh-long 设置区显示
+  const patchStatus = async (req, res) => {
+    try {
+      requireTrusted(req);
+      // 定位 DSH 核心 dsh-client-connection 目录(探测常见路径)
+      let DIR = "";
+      const candidates = [
+        "/volume1/npm/global/lib/node_modules/@deepseek-ai/dsh/node_modules/@deepseek-ai/dsh-client-connection/lib",
+        "/usr/local/lib/node_modules/@deepseek-ai/dsh/node_modules/@deepseek-ai/dsh-client-connection/lib",
+        "/volume1/dsh/.dsh/node_modules/@deepseek-ai/dsh/node_modules/@deepseek-ai/dsh-client-connection/lib",
+        "/usr/lib/node_modules/@deepseek-ai/dsh/node_modules/@deepseek-ai/dsh-client-connection/lib",
+      ];
+      for (const c of candidates) { try { await stat(join(c, "index.js")); DIR = c; break; } catch (_) {} }
+      if (!DIR) { sendJson(res, 200, { ok: true, patches: null, error: "未找到 DSH 核心 dsh-client-connection 目录" }); return; }
+      const IDX = join(DIR, "index.js");
+      const CLI = join(DIR, "client.js");
+      const idx = await readFile(IDX, "utf8");
+      let cli = "";
+      try { cli = await readFile(CLI, "utf8"); } catch (_) {}
+      const mark1 = "PRIVILEGED_METHODS.has(method) && !isTrustedApiRequest(request, trustedHosts)";
+      const mark2 = "isLoopback: pageLocation === void 0 || isLoopbackHostname(pageLocation.hostname) || [";
+      const mark3 = "WEBSOCKET_HEARTBEAT_MS";
+      const patches = {
+        trustedHosts: idx.includes(mark1) ? "已打" : "未打",
+        loopback: cli.includes(mark2) ? "已打" : "未打",
+        heartbeat: idx.includes(mark3) ? "已打" : (idx.includes("socket.ping()") ? "原生无需" : "未打"),
+      };
+      sendJson(res, 200, { ok: true, patches, dir: DIR });
+    } catch (error) {
+      sendError(res, error, onError);
+    }
+  };
 
-  return { root, maxFileBytes, totalMaxBytes, api, download, preview, workspaceList, workspaceFile, workspacePreview, workspaceBrowse, workspaceDelete, workspaceRename, workspaceSave, docxPreviewPage, docxPreviewAsset, pptxPreviewPage, xlsxPreviewPage, xlsxPreviewAsset, glassConfig, glassBackgrounds, glassBackground };
+  return { root, maxFileBytes, totalMaxBytes, api, download, preview, workspaceList, workspaceFile, workspacePreview, workspaceBrowse, workspaceDelete, workspaceRename, workspaceSave, docxPreviewPage, docxPreviewAsset, pptxPreviewPage, xlsxPreviewPage, xlsxPreviewAsset, glassConfig, glassBackgrounds, glassBackground, patchStatus };
 }
 
 /** 人类可读文件大小。 */
@@ -2672,6 +2726,12 @@ export async function apply(ctx, config = {}) {
     handler: handlers.glassBackground,
   }), "dsh-long-plugins: glass-ui background image route");
 
+  ctx.effect(() => ctx.webServer.register({
+    kind: "exact",
+    path: "/api/dsh-uploads/patch-status",
+    handler: handlers.patchStatus,
+  }), "dsh-long-plugins: patch status route");
+
   ctx.effect(() => ctx.webServer.register({
     kind: "exact",
     path: "/api/dsh-uploads/workspace-browse",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-long-plugins",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "description": "Merged DSH web plugins: upload manager (drag-and-drop attach any file to the message), workspace output files, skill docs, account balance, Markdown-to-Word (md2docx), and polished file preview (Word & PowerPoint real preview with zoom/pan, rendered Markdown), plus an auto-repair install for DSH core patches (reverse-proxy WebSocket heartbeat, upgrade relink). | 一个插件整合 DSH Web 的常用增强：上传管理（拖放上传：拖任意文件到会话框直接附加）、工作区「输出文件」面板、技能文档浏览、账户余额显示、Markdown 转 Word（md2docx）、Word/PowerPoint 真实预览（可缩放、翻页）；并自带修复安装，自动重连 DSH 核心补丁（反代 WebSocket 心跳、升级重连）。",
   "type": "module",
   "license": "MIT",

package/patches/dsh-client-connection-heartbeat.sh

@@ -42,11 +42,16 @@ if grep -q 'WEBSOCKET_HEARTBEAT_MS' "$IDX"; then
   echo "    已打过，跳过 ✓"
   exit 0
 fi
+# DSH 已原生心跳（如 v0.1.2-alpha 网关定期 ping）：检测到已是 ping 心跳即跳过，避免重复/冲突
+if grep -q 'socket\.ping()' "$IDX"; then
+  echo "    检测到 DSH 已有 WebSocket ping 心跳（原生或已打过），跳过 ✓"
+  exit 0
+fi
 
-# 待替换的原始代码未在 -> 提示人工核对
+# 待替换的原始代码未在 -> 可能是 DSH 已改逻辑（如 v0.1.2-alpha 会话视图/网关重构）：温和跳过而不是硬失败
 if ! grep -q 'var WebSocketDownlinks = class {' "$IDX"; then
-  echo "    警告：未找到 WebSocketDownlinks 类，可能 DSH 已改逻辑，请人工核对" >&2
-  exit 1
+  echo "    提示：未找到 WebSocketDownlinks 类，DSH 可能已改逻辑（如新版原生心跳），跳过本补丁（不再硬失败）" >&2
+  exit 0
 fi
 
 cp "$IDX" "$IDX.bak-heartbeat-$(date +%Y%m%d-%H%M)"

package/skill/dsh-long-plugins-install/SKILL.md

@@ -119,6 +119,16 @@ pnpm install        # 或用探测到的 pnpm 绝对路径
     # md2docxScript: /your/path/md2docx.py           # 可选，默认用包内 lib/md2docx.py
 ```
 
+### 4.5 设置插件默认：回合导航 + RA-Span 关闭（避免与 DSH 新版自带功能冲突 / 默认更简洁）
+> DSH ≥ v0.1.2-alpha 已自带「紧凑回合导航」。新机默认把插件 `modules.turnRuler` 置 false（避免轮次刻尺冲突），`modules.glass`（RA-Span）也默认 false（要玻璃桌面可在「dsh-long」设置区手动开）。如目标 DSH 无原生回合导航，可在「dsh-long」手动开回。
+```sh
+GJ="${HOME:-/root}/.dsh-long-plugins/glass.json"
+mkdir -p "$(dirname "$GJ")"
+[ -f "$GJ" ] || echo '{"enabled":false,"blur":20,"bgImage":"","bgColor":"#1a2332","bgMask":0.28,"bgTint":{"light":{"color":"#1a2332","mask":0.28},"dark":{"color":"#1a2332","mask":0.28}},"inputBox":{"light":{"color":"","opacity":1},"dark":{"color":"","opacity":1}},"zone":{"session":{"color":"#1a2332","mask":0.45,"opacity":0.5},"input":{"color":"#1a2332","mask":0.6,"opacity":0.55}},"modules":{"glass":false,"uploadAttach":true,"uploadDragDrop":true,"uploadPaste":true,"uploadPreview":true,"skillDocs":true,"balance":true,"mobile":true,"workspace":true,"turnRuler":false}}' > "$GJ"
+node -e "const fs=require('fs');const p=JSON.parse(fs.readFileSync(process.argv[1],'utf8'));p.modules=p.modules||{};p.modules.glass=false;p.modules.turnRuler=false;fs.writeFileSync(process.argv[1],JSON.stringify(p,null,2)+'\n')" "$GJ" \
+  && echo "  ✅ 已默认关闭插件 RA-Span(modules.glass=false) 与回合导航(modules.turnRuler=false)"
+```
+
 ## 工作目录 / 上传目录匹配（重要决策点）
 
 上传/工作区根**不是写死的**，靠环境变量推导：
@@ -176,6 +186,7 @@ setsid nohup <node绝对路径> --expose-internals --max-old-space-size=8192 \
    > **md2docx 工具需新建会话后 agent 才加载**（会话工具集创建时固定），验证时开新会话。
 6. 窄屏（手机）下预览窗按钮自动换行不截断。
 7. 用 `dsh --profile <p> --dump-config` 核对组合树正确。
+8. **「dsh-long」设置区**：设置面板出现「dsh-long」节，含**各模块开关**（RA-Span/会话导航/附件上传/拖放/粘贴/上传预览/技能文档/余额/移动端/输出文件）与**「补丁状态（只读）」**——显示 3 个 DSH 核心补丁的已打/未打/原生无需。模块开关存于 `~/.dsh-long-plugins/glass.json` 的 `modules` 字段，保存后下次刷新生效。
 
 ## 硬性安全边界（必须遵守）
 - **不主动 `git push` / 打 tag / 发 Release**；需要发版本时停下用 `ask_user_question` 等用户确认。

package/skill/dsh-upgrade/SKILL.md

@@ -60,6 +60,19 @@ sh <插件目录>/patches/dsh-client-connection-heartbeat.sh
 cd "$DSH_HOME/profiles/web" && pnpm install
 ```
 
+### 5.5 升级后自动禁用插件「回合导航」(避免与 DSH 新版自带回合导航冲突)
+> DSH ≥ v0.1.2-alpha 已自带「紧凑回合导航」。若插件 turn-ruler 仍开启，两者同时操纵会话 DOM 可能冲突→前端崩。升级流程里**自动把插件 `modules.turnRuler` 置为 false**；如目标版无原生回合导航，可在「dsh-long」设置区手动开回来。
+```sh
+GJ="${HOME:-/root}/.dsh-long-plugins/glass.json"
+if [ -f "$GJ" ]; then
+  node -e "const fs=require('fs');const p=JSON.parse(fs.readFileSync(process.argv[1],'utf8'));p.modules=p.modules||{};p.modules.turnRuler=false;fs.writeFileSync(process.argv[1],JSON.stringify(p,null,2)+'\n')" "$GJ" \
+    && echo "  ✅ 已自动关闭插件回合导航 (modules.turnRuler=false，可在 dsh-long 手动开回)" \
+    || echo "  ⚠️ 未能更新插件配置(可手动在 dsh-long 关掉「会话导航」)"
+else
+  echo "  (未找到插件配置, 跳过; 可手动在 dsh-long 关掉「会话导航」)"
+fi
+```
+
 ### 6. 重启 dsh + 强刷浏览器
 ```sh
 /volume1/dsh/start.sh        # 或按当前环境的重启方式
@@ -73,34 +86,6 @@ cd "$DSH_HOME/profiles/web" && pnpm install
 4. 提问/审批窗口：弹出一个问题，等 60s+ 不再自己消失（心跳补丁生效）。
 5. 插件设置面板「上传文件」「输出文件」「技能文档」都在。
 6. `grep -q WEBSOCKET_HEARTBEAT_MS <核心解压路径>/dsh-client-connection/lib/index.js` → 心跳在位。
-7. **RA-Span 玻璃观感**：左栏/顶栏文字图标、会话区过程内容配色、输入框、提问卡、耗时统计等是否仍正常（见下文"RA-Span 升级后需重新校准"）。
-
-## RA-Span（统一桌面/玻璃）升级后需重新校准 ⚠️
-
-dsh-long-plugins 的「RA-Span（统一桌面/玻璃）」**大量依赖 DSH 内部混淆类名**（`o3BgMG_*`/`CY-8Ka_*`/`QWLzLg_*`/`M8wy4a_*`/`uV2eYG_*`/`wSkVaW_*`/`osXY9a_*`/`p-xYUq_*` 等）与 DSH 内部 DOM 结构。DSH 升级重打包后**这些类名前缀会变**，导致插件里靠类名压样式的规则/JS **静默失效**（不报错，只是观感/配色不对）。
-
-升级流程会**同步插件代码（逻辑保住）**，但**不会自动重抓新的类名**，所以升级后必须**人工复核**玻璃观感。
-
-### 升级后重点复核 + 处理
-1. 浏览器强刷（Ctrl/Cmd+Shift+R）。
-2. 逐项看 RA-Span 是否仍正常：
-   - 左栏/顶栏文字与图标（白字+深影、品牌区不被白化）
-   - 会话区过程内容配色（Bash 绿 / Read 蓝 / Edit 橙 / Write 紫 / Think 琥珀、错误红、工具输出水绿）
-   - 状态/统计行余额（走 `data-slot-conversation="composer.dock"` 的相对稳）
-   - 输入框（无重影、背景/文字随主题、可调色）
-   - 「新会话」按钮去白底
-3. 若某项观感/配色不对 → **新类名变了**。让用户在对应元素「右键 → 检查」，把高亮元素及父级的 class 发我，把 `client/client.js` 里对应的 `[class*="..."]` 前缀更新成新类名（只改选择器，不动逻辑）。
-4. 稳定项无需动：用 `data-slot-*` 的（状态栏）、注入 `<head>` 的 CSS、`data-dsh-theme` 属性。
-
-### 各依赖类名的功能清单（升级后最可能失效）
-| 功能 | 依赖类名 | 失效表现 |
-|---|---|---|
-| 工具名配色(Bash/Read/Edit/Write) | `o3BgMG_title` / `CY-8Ka_title` | 标签不变色 |
-| Think 配色 | `QWLzLg_*` | Think 不琥珀 |
-| 提问/弹窗不透明 | `M8wy4a_card` | 弹窗透明重叠 |
-| 输入框 | `uV2eYG_*` | 重影/背景不随主题 |
-| 耗时统计 | `osXY9a_*` / `p-xYUq_*` | 统计字淡/重影 |
-| 左栏「新会话」 | `newSession` | 白底回来 |
 
 ## 硬性安全边界（必须遵守）
 - **不主动 push / 打 tag / 发 Release**；需要发布版本时停下用 ask_user_question 等确认。
@@ -114,5 +99,4 @@ dsh-long-plugins 的「RA-Span（统一桌面/玻璃）」**大量依赖 DSH 内
 | 升级后设置页"未暴露命名空间" | 补丁2 被覆盖 | 重跑 apply-dsh-patches.sh |
 | 升级后提问窗口自己消失 | 心跳补丁(补丁3)被覆盖 | 重跑 apply-dsh-patches.sh 或装插件补丁脚本 |
 | 升级后插件不显示 | 插件安装副本未同步 | 步骤 5 `pnpm install` |
-| 升级后 RA-Span 观感/配色不对（输入框重影、标签不变色、弹窗透明、统计字淡等） | DSH 混淆类名变了 | 见 RA-Span 校准节：强刷 + 逐项检查，让用户右键给出新类名，更新 `client/client.js` 对应选择器 |
 | 按钮全没了/界面异常 | 浏览器缓存了旧前端 | 强刷 Ctrl/Cmd+Shift+R |