dsh-long-plugins 2.4.5 → 2.5.0

package/client/client.js

@@ -3445,7 +3445,6 @@ window.__ModuleLoader__.load({
     // 「dsh-long」设置区：各模块开关(独立、移动端干净)，避免把开关塞进 RA-Span
     const DSH_LONG_MODULES = [
       ['glass', 'RA-Span'],
-      ['turnRuler', '会话导航（轮次刻尺）'],
       ['uploadAttach', '附件上传（回形针）'],
       ['uploadDragDrop', '附件拖放上传'],
       ['uploadPaste', '附件粘贴上传'],
@@ -3935,7 +3934,6 @@ 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)
@@ -4036,7 +4034,6 @@ window.__ModuleLoader__.load({
       ...tokenUsagePlugin.inject,
       ...mobilePlugin.inject,
       ...workspaceFilesPlugin.inject,
-      ...turnRulerPlugin.inject,
       ...glassPlugin.inject,
     ]))
 
@@ -4074,7 +4071,6 @@ window.__ModuleLoader__.load({
       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))
     }
 

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.4.5",
+  "version": "2.4.6",
   "entry": {
     "name": "dsh-long-plugins",
     "inject": [

package/lib/index.js

@@ -1134,6 +1134,10 @@ export function createHandlers(options = {}) {
         // Markdown → 直接渲染成 HTML（真实效果），失败回退源码文本。
         editable = true; rawText = buffer.toString("utf8");
         body = `<article class="md">${markdownToHtml(rawText)}</article>`;
+      } else if (/\.(html?|xhtml)$/i.test(name)) {
+        // HTML/HTM → 直接渲染成实际效果(iframe + srcdoc, 保留其样式/脚本)
+        editable = true; rawText = buffer.toString("utf8");
+        body = `<iframe class="html" srcDoc="${escapeHtml(rawText)}"></iframe>`;
       } else if (/\.(json|ya?ml|py|js|mjs|cjs|ts|sh|css|html?|xml|csv|ini|conf|env|toml|sql|rs|go|c|h|cpp|java|kt|swift|rb|php|vue|jsx|tsx)$/i.test(name)) {
         editable = true; rawText = buffer.toString("utf8");
         body = `<pre class="text">${escapeHtml(rawText)}</pre>`;
@@ -2553,6 +2557,7 @@ function previewPageHtml(name, rel, size, downloadHref, body, inlineHref = "", e
   body.maximized .md { max-width:none; }
   .image { max-width:100%; border-radius:8px; }
   .pdf { display:block; width:100%; height:86vh; border:1px solid var(--lp-border); border-radius:8px; background:#fff; }
+  .html { display:block; width:100%; height:86vh; border:1px solid var(--lp-border); border-radius:8px; background:#fff; }
   .office { background:#fff; color:#111; border-radius:8px; padding:16px; overflow:auto; }
   .unsupported { color:#f59e0b; text-align:center; padding:40px 0; }
   /* 放大模式：顶栏常驻（固定悬浮），内容占满视口、PDF 全高 */
@@ -2560,6 +2565,7 @@ function previewPageHtml(name, rel, size, downloadHref, body, inlineHref = "", e
   body.maximized .content { max-width:none; padding:0; margin:0; height:100vh; padding-top:53px; }
   body.maximized .md { padding:24px 32px 48px; max-width:820px; margin:0 auto; }
   body.maximized .pdf { height:calc(100vh - 53px); border:none; border-radius:0; }
+  body.maximized .html { height:calc(100vh - 53px); border:none; border-radius:0; }
   body.maximized .text { height:calc(100vh - 53px); border:none; border-radius:0; overflow:auto; }
   body.maximized .office { height:calc(100vh - 53px); overflow:auto; }
   body.maximized .image { max-width:100vw; max-height:100vh; object-fit:contain; }
@@ -2644,72 +2650,6 @@ export async function apply(ctx, config = {}) {
 
   const handlers = createHandlers({ trustedHosts, onError, excludedWorkspaceNames: config.excludedWorkspaceNames });
 
-  // ---- md2docx 工具: Markdown → Word (.docx, 带页码) ----
-  // 调用 md2docx.py (pandoc-free, python-docx + 页脚 PAGE 字段)。
-  // 默认脚本随插件包分发（lib/md2docx.py），换机器也可靠；可用 config.md2docxScript 覆盖。
-  const PACKAGE_DIR = dirname(fileURLToPath(import.meta.url));
-  const MD2DOCX_SCRIPT = resolve(config.md2docxScript ?? join(PACKAGE_DIR, "md2docx.py"));
-  const runScript = (script, args) => new Promise((resolvePromise) => {
-    const child = spawn("python3", [script, ...args], { stdio: ["ignore", "pipe", "pipe"] });
-    let stdout = "", stderr = "";
-    child.stdout.on("data", (d) => { stdout += d.toString(); });
-    child.stderr.on("data", (d) => { stderr += d.toString(); });
-    child.on("error", (error) => resolvePromise({ ok: false, error: String(error), stdout, stderr }));
-    child.on("close", (code) => resolvePromise({ ok: code === 0, code, stdout, stderr }));
-  });
-  ctx.tools.register(defineTool({
-    name: "md2docx",
-    description: "Convert a Markdown file to a styled Word (.docx) document with a page-number footer. Ships a bundled python-docx script (lib/md2docx.py) that renders headings, tables, bold/italic, and lists; the docx includes a footer '第 N 页' field that updates when opened in Word or exported to PDF. Requires python3 and python-docx installed on the host. Override the script path via config.md2docxScript if needed.",
-    parameters: {
-      input: {
-        type: "string",
-        required: true,
-        description: "Absolute path to the input .md file."
-      },
-      output: {
-        type: "string",
-        description: "Optional absolute path for the output .docx. Defaults to the input path with a .docx extension."
-      }
-    },
-    output: {
-      schema: {
-        type: "object",
-        additionalProperties: false,
-        properties: {
-          ok: { type: "boolean", required: true },
-          docxPath: { type: "string" },
-          error: { type: "string" }
-        }
-      },
-      render: (_args, value) => [{
-        type: "text",
-        text: value && value.ok === true
-          ? `已生成 Word 文档：${value.docxPath}\n（含页码页脚，Word/另存 PDF 时自动更新）`
-          : `md2docx 失败：${value?.error ?? "未知错误"}`
-      }]
-    },
-    // 声明交付物：DSH 从 presentCall 的 locations 识别本工具产出的文件，
-    // 从而把 docx 渲染成可点击的交付物卡片（消息里的文件引用也能打开）。
-    presentCall: (args) => {
-      const inPath = resolve(String(args.input ?? ""));
-      const outPath = args.output ? resolve(String(args.output)) : inPath.replace(/\.md$/i, ".docx");
-      return {
-        card: "generic",
-        title: "md2docx",
-        kind: "edit",
-        locations: [{ path: outPath }]
-      };
-    },
-    async execute(args) {
-      const inPath = resolve(String(args.input ?? ""));
-      const outPath = args.output ? resolve(String(args.output)) : inPath.replace(/\.md$/i, ".docx");
-      const result = await runScript(MD2DOCX_SCRIPT, [inPath, outPath]);
-      if (!result.ok) {
-        return { ok: false, error: (result.stderr || result.stdout || String(result.error)).trim() || `md2docx failed (exit ${result.code})` };
-      }
-      return { ok: true, docxPath: outPath };
-    }
-  }));
 
   await sweepUploadTemps(handlers.root);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-long-plugins",
-  "version": "2.4.5",
-  "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.5.0",
+  "description": "Merged DSH web plugins: upload manager (drag-and-drop attach any file to the message), workspace output files, skill docs, account balance, 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 的常用增强：上传管理（拖放上传：拖任意文件到会话框直接附加）、工作区「输出文件」面板、技能文档浏览、账户余额显示、Word/PowerPoint 真实预览（可缩放、翻页）；并自带修复安装，自动重连 DSH 核心补丁（反代 WebSocket 心跳、升级重连）。Office 读取/生成已独立到 dsh-office-reader。",
   "type": "module",
   "license": "MIT",
   "main": "lib/index.js",
@@ -12,7 +12,6 @@
   },
   "files": [
     "lib",
-    "lib/md2docx.py",
     "client",
     "!client/*.bak",
     "cordis.patch.yml",

package/skill/dsh-upgrade/SKILL.md

@@ -91,6 +91,29 @@ fi
 9. 设置面板「技能管理」「上传文件」「输出文件」的 🔍 搜索框：点击后弹出框紧贴按钮下方、滚动不脱离。
 10. **「技能管理」区（全局技能 / 工作区技能两 tab）**：全局技能列 `<DSH_HOME>/skills`；工作区技能扫描工作区根下各子目录的 `.dsh/skills`（无 `.dsh/skills` 则该工作区组为空）。若该区不出现/工作区技能为空，可能 DSH `settings.section` 槽或工作区结构变化——复核。
 
+## 插件依赖 DSH 内部接口（升级脆弱清单）⚠️
+dsh-long-plugins 大量依赖 DSH 内部接口/结构，DSH 升级改动后这些会**静默失效**（不注册/不显示/报错）。升级后逐项复核：
+
+| 依赖 | 用途 | 升级失效表现 |
+|---|---|---|
+| `settings.section` 槽 | 上传文件/输出文件/技能管理/dsh-long/RA-Span 设置区 | 对应设置区不出现 |
+| `conversation.composer.dock` 槽 | 余额 chip | 余额不显示 |
+| `conversation.input.dock` 槽 | 待发送文件栏、拖放/粘贴上传 | 待发送栏/拖放失效 |
+| `conversation.input.left` 槽 | 附件上传（回形针） | 回形针消失 |
+| `conversation.session.header.actions` 槽 | 会话历史/工作区按钮 | 按钮消失 |
+| `shell.overlay` 槽 | 文件浏览器浮层 | 文件浮层打不开 |
+| `data-slot-conversation="..."` 属性 | 余额 chip / dock 样式定位 | 对应样式失效 |
+| `ctx.webServer.register` | 所有路由（上传/工作区/技能/预览/glass/补丁状态） | 路由 404/无响应 |
+| `ctx.inputTriggers.registerSource` | 文件引用 codec（`@`） | 附件引用失效 |
+| `ctx.locale.register` | 多语言 | 文案不翻译 |
+| `window.__ModuleLoader__.load` | 插件客户端加载 | 插件整个不加载 |
+| `useSessions` / 会话 store | 工作区按钮拿 cwd / 当前工作区 | 工作区按钮/当前工作区失效 |
+| 混淆类名 `wSkVaW_/uV2eYG_/o3BgMG_/CY-8Ka_/QWLzLg_/M8wy4a_/lXshSW_/7yHdaG_/VOzbGW_/p-xYUq_/osXY9a_` | RA-Span 玻璃观感/排版 | 观感/配色/排版错(见"RA-Span 升级后需重新校准") |
+| DSH 设置面板 DOM(`VOzbGW` 面板) | 各设置区在其内渲染 | 设置区排版乱 |
+| DSH 核心 `dsh-client-connection` | 心跳补丁(补丁3) | 补丁被覆盖→心跳失效(需重打) |
+
+> 处置：某项失效 → 让用户右键抓新元素 class/槽名/接口，更新插件对应选择器/槽名/调用；或集成 DSH 新 API。**稳定项**：插件自己的路由表、`data-slot` 状态栏(部分)、注入 `<head>` 的 CSS(部分)。
+
 ## 硬性安全边界（必须遵守）
 - **不主动 push / 打 tag / 发 Release**；需要发布版本时停下用 ask_user_question 等确认。
 - 升级会重启 DSH 服务，可能中断当前会话——先向用户说明再执行。

package/lib/md2docx.py

@@ -1,210 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""Generic Markdown -> styled .docx converter with a page-number footer.
-
-Usage:
-  python3 md2docx.py <input.md> [output.docx]
-
-If output.docx is omitted, it defaults to <input-name>.docx next to the input.
-
-Renders headings (h1-h3), bold/italic inline, tables (pipe syntax),
-ordered/unordered lists, blockquotes, and horizontal rules. Adds a centered
-footer with an auto-updating PAGE field (updates when opened in Word or
-exported to PDF).
-
-Requires: python3 + python-docx (`pip install python-docx`).
-"""
-import re
-import sys
-import os
-
-from docx import Document
-from docx.shared import Pt, RGBColor
-from docx.enum.text import WD_ALIGN_PARAGRAPH
-from docx.enum.table import WD_TABLE_ALIGNMENT
-from docx.oxml.ns import qn
-from docx.oxml import OxmlElement
-
-
-def die(msg):
-    print(f"md2docx: {msg}", file=sys.stderr)
-    sys.exit(1)
-
-
-if len(sys.argv) < 2:
-    die("usage: md2docx.py <input.md> [output.docx]")
-
-SRC = os.path.abspath(sys.argv[1])
-if not os.path.isfile(SRC):
-    die(f"input file not found: {SRC}")
-OUT = (
-    os.path.abspath(sys.argv[2])
-    if len(sys.argv) > 2
-    else os.path.splitext(SRC)[0] + ".docx"
-)
-
-with open(SRC, encoding="utf-8") as f:
-    lines = f.read().splitlines()
-
-
-def add_page_number(paragraph):
-    """Insert an auto-updating '第 N 页' page field into a footer paragraph."""
-    run = paragraph.add_run("第 ")
-    set_east_asia(run)
-    fld = OxmlElement("w:fldChar")
-    fld.set(qn("w:fldCharType"), "begin")
-    instr = OxmlElement("w:instrText")
-    instr.set(qn("xml:space"), "preserve")
-    instr.text = " PAGE "
-    sep = OxmlElement("w:fldChar")
-    sep.set(qn("w:fldCharType"), "separate")
-    t = OxmlElement("w:t")
-    t.text = "1"
-    end = OxmlElement("w:fldChar")
-    end.set(qn("w:fldCharType"), "end")
-    r = paragraph.add_run()
-    set_east_asia(r)
-    for el in (fld, instr, sep, t, end):
-        r._r.append(el)
-    run2 = paragraph.add_run(" 页")
-    set_east_asia(run2)
-
-
-doc = Document()
-doc.add_heading(os.path.splitext(os.path.basename(SRC))[0], level=0)
-
-
-# --- base styles ---
-normal = doc.styles["Normal"]
-normal.font.name = "Calibri"
-normal.font.size = Pt(10.5)
-normal._element.rPr.rFonts.set(qn("w:eastAsia"), "微软雅黑")
-
-
-def set_east_asia(run):
-    run.font.name = "Calibri"
-    r = run._element
-    rPr = r.get_or_add_rPr()
-    rf = rPr.find(qn("w:rFonts"))
-    if rf is None:
-        rf = OxmlElement("w:rFonts")
-        rPr.append(rf)
-    rf.set(qn("w:eastAsia"), "微软雅黑")
-
-
-def add_runs_with_bold(par, text):
-    """Add text to paragraph, honoring **bold** and *italic* markers."""
-    for tok in re.split(r"(\*\*.*?\*\*|\*.*?\*)", text):
-        if not tok:
-            continue
-        if tok.startswith("**") and tok.endswith("**") and len(tok) > 4:
-            r = par.add_run(tok[2:-2])
-            r.bold = True
-        elif tok.startswith("*") and tok.endswith("*") and len(tok) > 2:
-            r = par.add_run(tok[1:-1])
-            r.italic = True
-        else:
-            r = par.add_run(tok)
-        set_east_asia(r)
-
-
-def add_body_paragraph(text, style=None):
-    p = doc.add_paragraph(style=style)
-    add_runs_with_bold(p, text)
-    return p
-
-
-def flush_table():
-    global table_rows, in_table
-    if not table_rows:
-        in_table = False
-        return
-    ncols = max(len(r) for r in table_rows)
-    tbl = doc.add_table(rows=len(table_rows), cols=ncols)
-    tbl.style = "Light Grid Accent 1"
-    tbl.alignment = WD_TABLE_ALIGNMENT.CENTER
-    for ri, row in enumerate(table_rows):
-        for ci in range(ncols):
-            cell = tbl.cell(ri, ci)
-            cell.text = ""
-            cp = cell.paragraphs[0]
-            text = row[ci] if ci < len(row) else ""
-            add_runs_with_bold(cp, text)
-            if ri == 0:
-                for run in cp.runs:
-                    run.bold = True
-    tbl.autofit = True
-    table_rows = []
-    in_table = False
-
-
-table_rows = []
-in_table = False
-
-i = 0
-while i < len(lines):
-    stripped = lines[i].strip()
-    if not stripped:
-        i += 1
-        continue
-    if re.fullmatch(r"-{3,}", stripped):
-        flush_table()
-        doc.add_paragraph()
-        i += 1
-        continue
-    if in_table and "|" in stripped and re.fullmatch(r"\|?[\s:|-]+\|?", stripped):
-        i += 1
-        continue
-    if stripped.startswith("|"):
-        in_table = True
-        table_rows.append([c.strip() for c in stripped.strip("|").split("|")])
-        i += 1
-        continue
-    if in_table:
-        flush_table()
-    if stripped.startswith("### "):
-        h = doc.add_heading(level=3)
-        add_runs_with_bold(h, stripped[4:])
-        i += 1
-        continue
-    if stripped.startswith("## "):
-        h = doc.add_heading(level=2)
-        add_runs_with_bold(h, stripped[3:])
-        i += 1
-        continue
-    if stripped.startswith("# "):
-        h = doc.add_heading(level=1)
-        add_runs_with_bold(h, stripped[2:])
-        i += 1
-        continue
-    if stripped.startswith("> "):
-        p = doc.add_paragraph(style="Intense Quote")
-        add_runs_with_bold(p, stripped[2:] + " ")
-        i += 1
-        continue
-    m = re.match(r"^(\d+)\.\s+(.*)$", stripped)
-    if m:
-        p = doc.add_paragraph(style="List Number")
-        add_runs_with_bold(p, m.group(2))
-        i += 1
-        continue
-    if stripped.startswith("- "):
-        p = doc.add_paragraph(style="List Bullet")
-        add_runs_with_bold(p, stripped[2:])
-        i += 1
-        continue
-    p = doc.add_paragraph()
-    add_runs_with_bold(p, stripped)
-    i += 1
-
-if in_table:
-    flush_table()
-
-# --- footer with page number field ---
-footer = doc.sections[0].footer
-fp = footer.paragraphs[0]
-fp.alignment = WD_ALIGN_PARAGRAPH.CENTER
-add_page_number(fp)
-
-doc.save(OUT)
-print("Saved:", OUT)