dsh-plc-decode 0.1.5 → 0.2.1

package/index.js

@@ -24,9 +24,13 @@ import { basename, dirname, extname, isAbsolute, join, resolve } from 'node:path
 import { fileURLToPath } from 'node:url'
 import z from '@deepseek-ai/schemastery'
 import { writeSmartPack, writeSourcePack } from './assets/decode-pack.mjs'
+import { registerHmi } from './hmi.js'
 
 export const name = 'dsh-plc-decode'
-export const inject = ['tools', 'commands', 'shell', 'sandboxPolicy']
+export const inject = ['skills', 'tools', 'commands', 'shell', 'sandboxPolicy']
+
+/** 报错尾行：插件出问题时，使用者第一眼看的就是错误文本。 */
+const FEEDBACK_HINT = '遇到问题：加 QQ 号 2171960697，或开 Issue https://github.com/taoziliyouchong/dsh-plc-decode/issues'
 
 /** 插件配置（DSH 官方 Config 机制：cordis.patch.yml 里本插件行的 config 传进 apply）。
  *  2026-11-05 加：让装插件的人不改代码就能换解码产物的存放位置。 */
@@ -2609,6 +2613,9 @@ export function apply(ctx, config = {}) {
   const cfg = config && typeof config === 'object' ? config : {}
   if (typeof cfg.archiveDir === 'string' && cfg.archiveDir.trim()) ARCHIVE_ROOT = cfg.archiveDir.trim()
 
+  // 触摸屏（HMI）工程解码：画面/控件/变量/地址，与 PLC 侧共用同一插件行（hmi.js）。
+  registerHmi(ctx)
+
   // ── 工具一：统一入口（四格式自动识别分发）──
   ctx.tools.register({
     name: 'plc-decode',
@@ -3210,7 +3217,7 @@ export function apply(ctx, config = {}) {
         if (!Number.isFinite(from) || !Number.isFinite(to) || to <= from) throw new Error('第二个参数应是地址，或给出"起hex 止hex"')
         return { kind: 'success', text: `梯形图元素序列（${basename(abs)}）:\n${ladderElementsRange(data, from, to)}` }
       } catch (error) {
-        return { kind: 'error', text: error instanceof Error ? error.message : String(error) }
+        return { kind: 'error', text: (error instanceof Error ? error.message : String(error)) + '\n\n' + FEEDBACK_HINT }
       }
     },
   })
@@ -3227,11 +3234,7 @@ export function apply(ctx, config = {}) {
         `解析方式: ${isAbsolute(ARCHIVE_ROOT) ? '绝对路径，原样使用' : `相对路径，按会话工作区解析（本进程 cwd = ${process.cwd()}）`}`,
         '默认落点: <归档根>\\<工程文件所在文件夹名>\\（同一文件夹里有多个工程文件时用 <文件夹名>_<文件名>）',
         '',
-        '改配置（改完重启 dsh 生效）：在 DSH profile 的 cordis.patch.yml 里给本插件那行加 config：',
-        '  - id: dsh-plc-decode',
-        '    name: dsh-plc-decode',
-        '    config:',
-        '      archiveDir: D:/plc/解码归档',
+        '改配置（改完重启 dsh 生效）：在 DSH profile 的 cordis.patch.yml 里给本插件那行加 config，只写 archiveDir（归档根目录）。',
         '',
         '只改这一次、不写配置：解码时传 outDir 参数（工具参数或 /plc-decode 的第二个参数）。',
       ].join('\n'),
@@ -3259,7 +3262,7 @@ export function apply(ctx, config = {}) {
         const result = kind === 'smart' ? decodeSmartFile(abs, outDir, sessionBase(agent)) : decodeSmartLib(abs, outDir, sessionBase(agent))
         return ({ kind: 'success', text: `已解码完成（类型: ${kind}）:\n${result.proceed}` })
       } catch (error) {
-        return ({ kind: 'error', text: error instanceof Error ? error.message : String(error) })
+        return ({ kind: 'error', text: (error instanceof Error ? error.message : String(error)) + '\n\n' + FEEDBACK_HINT })
       }
     },
   })
@@ -3277,7 +3280,7 @@ export function apply(ctx, config = {}) {
           : `源码在 ${outd}\\pous\\ 下（看程序读它），索引在 ${outd}\\00-索引.md`
         return { kind: 'success', text: `已解码完成，输出目录:\n${outd}\n\n${text}\n\n${tail}` }
       } catch (error) {
-        return { kind: 'error', text: error instanceof Error ? error.message : String(error) }
+        return { kind: 'error', text: (error instanceof Error ? error.message : String(error)) + '\n\n' + FEEDBACK_HINT }
       }
     },
   })
@@ -3292,7 +3295,7 @@ export function apply(ctx, config = {}) {
         const { text } = await decodeDvpText(ctx, dvp, signal)
         return { kind: 'success', text }
       } catch (error) {
-        return { kind: 'error', text: error instanceof Error ? error.message : String(error) }
+        return { kind: 'error', text: (error instanceof Error ? error.message : String(error)) + '\n\n' + FEEDBACK_HINT }
       }
     },
   })
@@ -3314,7 +3317,7 @@ export function apply(ctx, config = {}) {
         if (!check.ok) throw new Error(check.text)
         return { kind: 'success', text: `校验完成（源码目录 ${outd}）:\n\n${check.text}` }
       } catch (error) {
-        return { kind: 'error', text: error instanceof Error ? error.message : String(error) }
+        return { kind: 'error', text: (error instanceof Error ? error.message : String(error)) + '\n\n' + FEEDBACK_HINT }
       }
     },
   })
@@ -3336,7 +3339,7 @@ export function apply(ctx, config = {}) {
         const need = Number(parts[1] ?? 0) || 0
         return ({ kind: 'success', text: conflictReport(o.userSyms, o.records, ptrRefs, need, 4096) })
       } catch (error) {
-        return ({ kind: 'error', text: error instanceof Error ? error.message : String(error) })
+        return ({ kind: 'error', text: (error instanceof Error ? error.message : String(error)) + '\n\n' + FEEDBACK_HINT })
       }
     },
   })
@@ -3357,7 +3360,7 @@ export function apply(ctx, config = {}) {
         const result = raw[0] === 0x44 ? decodeSmartLib(abs, outDir, sessionBase(agent)) : decodeSmartFile(abs, outDir, sessionBase(agent))
         return ({ kind: 'success', text: result.proceed })
       } catch (error) {
-        return ({ kind: 'error', text: error instanceof Error ? error.message : String(error) })
+        return ({ kind: 'error', text: (error instanceof Error ? error.message : String(error)) + '\n\n' + FEEDBACK_HINT })
       }
     },
   })
@@ -3373,7 +3376,7 @@ export function apply(ctx, config = {}) {
         const { notes, report } = await runDiff(ctx, oldP, newP, signal, sessionBase(agent))
         return { kind: 'success', text: notes.length ? `${notes.join('\n')}\n\n${report}` : report }
       } catch (error) {
-        return { kind: 'error', text: error instanceof Error ? error.message : String(error) }
+        return { kind: 'error', text: (error instanceof Error ? error.message : String(error)) + '\n\n' + FEEDBACK_HINT }
       }
     },
   })
@@ -3393,7 +3396,7 @@ export function apply(ctx, config = {}) {
         const { proceed, report } = smartDiff(resolve(parts[0]), resolve(parts[1]), outDir, sessionBase(agent))
         return { kind: 'success', text: `${proceed}\n\n${report}` }
       } catch (error) {
-        return ({ kind: 'error', text: error instanceof Error ? error.message : String(error) })
+        return ({ kind: 'error', text: (error instanceof Error ? error.message : String(error)) + '\n\n' + FEEDBACK_HINT })
       }
     },
   })
@@ -3421,7 +3424,7 @@ export function apply(ctx, config = {}) {
         }
         return ({ kind: 'success', text: `地址占用与空闲段分析（${isDir ? '已解码目录' : basename(abs)}）:\n${freeSpaceReport(userSyms, records)}` })
       } catch (error) {
-        return ({ kind: 'error', text: error instanceof Error ? error.message : String(error) })
+        return ({ kind: 'error', text: (error instanceof Error ? error.message : String(error)) + '\n\n' + FEEDBACK_HINT })
       }
     },
   })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plc-decode",
-  "version": "0.1.5",
-  "description": "在 DSH 里读 PLC 工程文件：CoDeSys .project、台达 .dvp、西门子 S7-200 SMART .smart/.smartlib 统一解码成可读报告与结构化数据，另带新旧工程对比、地址体检与连线还原。",
+  "version": "0.2.1",
+  "description": "在 DSH 里读工控工程文件：PLC（CoDeSys、台达、西门子 SMART）与触摸屏（西门子 WinCC flexible SMART、繁易 FStudio、欧姆龙 NB、昆仑通态 MCGS）里的程序、画面、控件、变量与地址，读成能查的报告与表。",
   "type": "module",
   "main": "index.js",
   "exports": {
@@ -11,6 +11,7 @@
   },
   "files": [
     "index.js",
+    "hmi.js",
     "invariant.js",
     "cordis.patch.yml",
     "assets",
@@ -21,7 +22,7 @@
   ],
   "engines": {
     "node": "^22.19.0 || >=24.0.0",
-    "dsh": ">=0.2.1-0 <0.3.0-0"
+    "dsh": ">=0.2.1-0"
   },
   "dsh": {
     "bundle": {
@@ -38,6 +39,13 @@
     "codesys",
     "delta-dvp",
     "ladder",
+    "hmi",
+    "touchscreen",
+    "wincc-flexible-smart",
+    "fstudio",
+    "omron",
+    "nb-designer",
+    "mcgs",
     "industrial-automation",
     "leadshine",
     "leadsysstudio",
@@ -45,8 +53,9 @@
   ],
   "scripts": {
     "smoke": "node scripts/smoke.mjs",
-    "check": "node --check index.js && node --check invariant.js && node --check assets/decode-pack.mjs && node --check assets/smart-lad.mjs && node --check assets/smart-net-trace.mjs"
+    "check": "node --check index.js && node --check hmi.js && node --check invariant.js && node --check assets/decode-pack.mjs && node --check assets/hmismart-decode.mjs && node --check assets/hmismart-diff.mjs && node --check assets/hmismart-report.mjs && node --check assets/nb-decode.mjs && node --check assets/mcgs-decode.mjs && node --check assets/smart-lad.mjs && node --check assets/smart-net-trace.mjs"
   },
+  "author": "taoziliyouchong",
   "license": "MIT",
   "repository": {
     "type": "git",

package/scripts/smoke.mjs

@@ -15,8 +15,8 @@ import { join } from 'node:path'
 
 import { apply, inject, name as pluginName } from '../index.js'
 
-const EXPECTED_TOOLS = 12
-const EXPECTED_COMMANDS = 12
+const EXPECTED_TOOLS = 18
+const EXPECTED_COMMANDS = 15
 
 let failed = 0
 const pass = (m) => console.log(`  ok   ${m}`)
@@ -60,9 +60,11 @@ function createShell() {
 
 const tools = new Map()
 const commands = new Map()
+const skillProviders = []
 const ctx = {
   tools: { register: (t) => tools.set(t.name, t) },
   commands: { register: (c) => commands.set(c.name, c) },
+  skills: { registerProvider: (factory) => skillProviders.push(factory) },
   shell: createShell(),
   sandboxPolicy: { resolve: () => undefined },
 }
@@ -100,6 +102,9 @@ function checkRegistrations() {
     if (!cmd.description) fail(`命令 /${cmdName} 缺描述`)
   }
   pass('各命令 handler / description')
+
+  if (skillProviders.length === 0) fail('未注册技能 provider')
+  else pass(`技能 provider ${skillProviders.length} 个`)
 }
 
 async function checkBadFile() {