agentworkshop 0.7.39 → 0.7.41

package/server/api/workshop/dcw/params/index.get.ts

@@ -0,0 +1,27 @@
+/**
+ * GET /api/workshop/dcw/params —— 工艺参数映射列表(登录用户)。
+ * 仅语义面(key/单位/限界/当前值/驱动类别);寄存器等 PLC 寻址细节不透出。
+ * ?lineId= 过滤产线;?limits=1 附带各参数的有效限界剖面(分层 + 交集)。
+ */
+import { getQuery } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { filterByLine } from '@/server/services/workshop/permissions'
+import { defineApiHandler } from '@/server/utils/response'
+import { bindDcwBroadcast, getDcwController } from '@/server/services/workshop/dcw/dcw-controller'
+import { broadcastSceneEvent } from '@/server/services/workshop/scene-events'
+
+export default defineApiHandler(async (event) => {
+  const user = resolveUser(event)
+  bindDcwBroadcast(broadcastSceneEvent)
+  const ctrl = getDcwController()
+  const q = getQuery(event)
+  const lineFilter = q.lineId ? String(q.lineId) : ''
+  let params = ctrl.listParamViews()
+  params = filterByLine(user, params, p => p.lineId)
+  if (lineFilter) params = params.filter(p => p.lineId === lineFilter)
+  const withLimits = q.limits === '1'
+  return {
+    params,
+    limits: withLimits ? params.map(p => ctrl.paramLimitsOf(p.id)) : undefined,
+  }
+})

package/server/api/workshop/dcw/params/index.post.ts

@@ -0,0 +1,25 @@
+/**
+ * POST /api/workshop/dcw/params —— 创建工艺参数映射。
+ * 路径一(nodeId):映射指向既有写控制执行节点;
+ * 路径二(access):设备连接 + 寄存器 + 标准转换模式一键建映射
+ *   (系统按转换模式自动创建执行节点,用户不手工拼装驱动配置)。
+ */
+import { readBody } from 'h3'
+import type { DcwParamInput } from '#shared/dcw-protocol'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { requireLineMode } from '@/server/services/workshop/permissions'
+import { defineApiHandler } from '@/server/utils/response'
+import { bindDcwBroadcast, getDcwController } from '@/server/services/workshop/dcw/dcw-controller'
+import { broadcastSceneEvent } from '@/server/services/workshop/scene-events'
+
+export default defineApiHandler(async (event) => {
+  const user = resolveUser(event)
+  bindDcwBroadcast(broadcastSceneEvent)
+  const body = await readBody<Partial<DcwParamInput>>(event) ?? {}
+  // 产线权限:目标产线(access 自动建节点)或执行节点所在产线需「可操控」
+  const lineId = body.access
+    ? (body.lineId ?? '')
+    : (body.nodeId ? getDcwController().byId(String(body.nodeId))?.lineId : undefined)
+  requireLineMode(user, lineId, 'operate')
+  return { param: getDcwController().createParamMapping(body) }
+})

package/server/api/workshop/permissions/index.get.ts

@@ -23,7 +23,9 @@ export default defineApiHandler(async (event) => {
   // channel 列表按 owner 归并(每用户一次轻量查询;channel 行自带 ownerUserId)
   const out = users.map(u => ({
     ...u,
-    channels: manager.listChannelsForUser(u.id).map(c => ({ id: c.channelId, name: c.name, createdAt: c.createdAt })),
+    // ChannelRow 的 channel 主键列名是 id(SELECT 'id, name, ...');原写的 c.channelId 运行时恒 undefined,
+    // 与前端 UserRow.channels: Array<{ id, name, createdAt }>(app/pages/permissions/index.vue)不一致
+    channels: manager.listChannelsForUser(u.id).map(c => ({ id: c.id, name: c.name, createdAt: c.createdAt })),
     grants: grantsByUser.get(u.id) ?? [],
   }))
   return { lines, users: out }

package/server/plugins/aw-plugins.ts

@@ -9,19 +9,32 @@ import { existsSync } from 'node:fs'
 import { dirname, resolve } from 'node:path'
 
 // packageRoot = 本包根。nitro 打包后 import.meta.url 位于 .output/server/chunks/ 内,
-// '..','..' 解析到 .output(不含源码);内置插件目录以「真实存在」为准逐级探测:
-// 包根(源码运行)→ .output 上一级(repo 部署,源码同树)→ cwd。
-const candidates = [
-  resolve(dirname(fileURLToPath(import.meta.url)), '..', '..'),
-  resolve(dirname(fileURLToPath(import.meta.url)), '..', '..', '..'),
-  process.cwd(),
-]
+// 且 chunk 相对包根的层级随 nitro 版本变化(如 chunks/build/xxx.mjs 比源码布局深一层),
+// 固定 2/3 级上溯在**全局安装布局**(node_modules/agentworkshop/)下探测不到包根,
+// builtin 插件会全部失踪。改为从 chunk 目录逐级上溯(上限 8 级 ≫ 任何已知布局),
+// 以「server/plugins-builtin 真实存在」为命中判据;最后兜底 cwd(源码运行)。
+const candidates: string[] = []
+for (let dir = dirname(fileURLToPath(import.meta.url)), i = 0; i < 8; i++, dir = dirname(dir)) {
+  candidates.push(dir)
+}
+candidates.push(process.cwd())
 const packageRoot = candidates.find(r => existsSync(resolve(r, 'server', 'plugins-builtin'))) ?? process.cwd()
 
 export default defineNitroPlugin((nitroApp) => {
-  void initPluginHost({ cwd: process.cwd(), packageRoot }).then((host) => {
-    // 实际监听端口回填(nitro listen 后 ctx.api 自环 origin 才准确)
-    nitroApp.hooks.hookOnce('listen', (listener: { port?: number }) => {
+  // host.mjs 是未类型化的 JS:TS 从 `{ cwd = process.cwd(), packageRoot } = {}` 推断形参类型时只保留了
+  // 带默认值的 cwd,丢掉了没有默认值的 shorthand 属性 packageRoot(host.mjs 内部确实会解构并使用它,
+  // 见 host.mjs 的 host.packageRoot / resolveRunMode({ cwd, packageRoot }))。按真实形参给局部变量
+  // 加注解即可,调用本身逐字不变。
+  const hostOptions: { cwd?: string, packageRoot?: string } = { cwd: process.cwd(), packageRoot }
+  void initPluginHost(hostOptions).then((host) => {
+    // 实际监听端口回填(nitro listen 后 ctx.api 自环 origin 才准确)。
+    // nitro 的运行时 hook 类型 NitroRuntimeHooks 未声明 'listen'(nitro 2.13 的 node 预设运行时只派发
+    // request/beforeResponse/afterResponse/render:*/error/close),故对一个只读视图做局部拓宽;
+    // 注册行为与原代码逐字相同(有派发则回填端口,无派发则空转),运行时零变化。
+    const hooks = nitroApp.hooks as typeof nitroApp.hooks & {
+      hookOnce(name: 'listen', fn: (listener: { port?: number }) => void): unknown
+    }
+    hooks.hookOnce('listen', (listener) => {
       if (listener?.port)
         host.setSelfOrigin(listener.port)
     })

package/server/plugins/dev-stability-guard.ts

@@ -23,7 +23,9 @@ export default defineNitroPlugin(() => {
       console.error(`[stability-guard] fatal ${kind}, exiting:\n${describeReason(reason)}`)
       process.exit(1)
     }
-    counts[severity] += 1
+    // counts 的四个 key 装配时已全部初始化为 0,且 'fatal' 已在上面提前 return;
+    // `?? 0` 只是 noUncheckedIndexedAccess 下的写法,取值口径与 `+= 1` 完全一致
+    counts[severity] = (counts[severity] ?? 0) + 1
     const line = `[stability-guard] ${severity}(累计 ${counts[severity]},不退出): ${describeReason(reason).slice(0, 200).replace(/\n/g, ' ')}`
     // 外部设备不可达与引擎边界属"要有人知道"的信号 → error;其余瞬态噪声 → warn
     if (severity === 'upstream' || severity === 'engine') console.error(line)

package/server/plugins/system-config.ts

@@ -11,6 +11,11 @@ import { resolve } from 'node:path'
 import { resolveRunMode } from '@/shared/config/home.mjs'
 import { getSystemConfigService } from '../services/system-config'
 
+/** 错误消息提取(catch 变量为 unknown;与原先 `String(err?.message ?? err)` 逐字等价) */
+function errorMessage(err: unknown): string {
+  return String((err as { message?: unknown } | null | undefined)?.message ?? err)
+}
+
 export default function systemConfigPlugin(nitroApp: {
   hooks: { hook(name: string, fn: (...args: unknown[]) => void | Promise<void>): void }
 }): void {
@@ -28,7 +33,7 @@ export default function systemConfigPlugin(nitroApp: {
   }
   catch (err) {
     // 初始化失败不阻断服务（设置系统降级为只读构建配置）
-    console.warn('[system-config] 初始化失败(设置系统降级):', String(err?.message ?? err))
+    console.warn('[system-config] 初始化失败(设置系统降级):', errorMessage(err))
   }
 
   nitroApp.hooks.hook('close', () => {

package/server/plugins-builtin/serial-bridge/client.mjs

@@ -0,0 +1,210 @@
+/**
+ * serial-bridge 客户端面板 —— 注入 'plugins.page' 插槽。
+ * 协议栈可用性、系统串口枚举、连接探针(开串口读一次,不落库)、打开链路与串口节点概览。
+ * 与 diag-bridge 同范式:30s 自动刷新健康面,语言切换即重渲染。
+ */
+export function setup(ctx) {
+  const styleId = 'aw-serial-styles'
+  if (!document.getElementById(styleId)) {
+    document.head.append(ctx.el('style', { id: styleId }, [`
+      .aw-serial { display:flex; flex-direction:column; gap:10px; font-size:12px; }
+      .aw-serial-badge { display:inline-flex; align-items:center; gap:6px; }
+      .aw-serial-dot { width:8px; height:8px; border-radius:50%; display:inline-block; }
+      .aw-serial-dot-ok { background:#35e0a0; }
+      .aw-serial-dot-bad { background:#e05a5a; }
+      .aw-serial-toolbar { display:flex; justify-content:flex-end; }
+      .aw-serial-btn { padding:4px 12px; border:1px solid color-mix(in srgb, currentColor 28%, transparent); border-radius:7px; background:transparent; color:inherit; cursor:pointer; }
+      .aw-serial-table { width:100%; border-collapse:collapse; }
+      .aw-serial-table th, .aw-serial-table td { text-align:left; padding:5px 8px; border-bottom:1px solid color-mix(in srgb, currentColor 10%, transparent); }
+      .aw-serial-table th { opacity:.65; font-weight:500; }
+      .aw-serial-empty { opacity:.6; padding:6px 0; }
+      .aw-serial-form { display:flex; flex-wrap:wrap; gap:6px; align-items:center; }
+      .aw-serial-form .aw-serial-inp { width:110px; padding:3px 8px; border:1px solid color-mix(in srgb, currentColor 24%, transparent); border-radius:7px; background:transparent; color:inherit; font:inherit; }
+      .aw-serial-form .aw-serial-inp.grow { flex:1 1 140px; }
+      .aw-serial-hint { opacity:.6; }
+      .aw-serial-result { white-space:pre-wrap; word-break:break-all; padding:6px 8px; border-radius:7px; }
+      .aw-serial-result.ok { background:color-mix(in srgb, #35e0a0 12%, transparent); }
+      .aw-serial-result.bad { background:color-mix(in srgb, #e05a5a 12%, transparent); }
+      .aw-serial-sec { font-weight:600; opacity:.85; margin-top:2px; }
+    `]))
+  }
+
+  ctx.ui.registerPanel({
+    slot: 'plugins.page',
+    name: 'serial-bridge-panel',
+    titleKey: 'panel.title',
+    order: 30,
+    mount(elRoot) {
+      const t = k => ctx.t(`panel.${k}`)
+      const root = ctx.el('div', { class: 'aw-serial' })
+      elRoot.append(root)
+
+      // ---- 状态徽标 + 刷新 ----
+      const badge = ctx.el('span', { class: 'aw-serial-badge' })
+      const refreshAll = () => {
+        void loadHealth()
+        void loadPorts()
+      }
+      const toolbar = ctx.el('div', { class: 'aw-serial-toolbar' }, [
+        ctx.el('button', { class: 'aw-serial-btn', onclick: refreshAll }, [t('refresh')]),
+      ])
+      root.append(ctx.el('div', {}, [badge]), toolbar)
+
+      // ---- 系统串口表 ----
+      root.append(ctx.el('div', { class: 'aw-serial-sec' }, [t('ports')]))
+      const portsWrap = ctx.el('div')
+      root.append(portsWrap)
+
+      // ---- 连接探针 ----
+      root.append(ctx.el('div', { class: 'aw-serial-sec' }, [t('probe')]))
+      const probeSel = ctx.el('input', { class: 'aw-serial-inp grow', placeholder: 'COM3' })
+      const modeSel = ctx.el('select', { class: 'aw-serial-inp' }, [
+        ctx.el('option', { value: 'modbus-rtu' }, ['Modbus RTU']),
+        ctx.el('option', { value: 'ascii-line' }, ['ASCII']),
+      ])
+      const baudInp = ctx.el('input', { class: 'aw-serial-inp', type: 'number', value: '9600' })
+      const unitInp = ctx.el('input', { class: 'aw-serial-inp', type: 'number', value: '1' })
+      const regInp = ctx.el('input', { class: 'aw-serial-inp', type: 'number', placeholder: '40001' })
+      const lineInp = ctx.el('input', { class: 'aw-serial-inp grow', placeholder: t('sendLine') })
+      const probeBtn = ctx.el('button', { class: 'aw-serial-btn', onclick: () => void runProbe() })
+      const result = ctx.el('div', { class: 'aw-serial-hint' }, [t('probe_hint')])
+      const form = ctx.el('div', { class: 'aw-serial-form' }, [
+        probeSel, modeSel, baudInp, unitInp, regInp, lineInp, probeBtn,
+      ])
+      root.append(form, result)
+
+      // ---- 打开的链路 + 串口节点 ----
+      root.append(ctx.el('div', { class: 'aw-serial-sec' }, [t('links')]))
+      const linksWrap = ctx.el('div')
+      root.append(linksWrap, ctx.el('div', { class: 'aw-serial-sec' }, [t('nodes')]))
+      const nodesWrap = ctx.el('div')
+      root.append(nodesWrap)
+
+      let probing = false
+      function setBtn(label, disabled) {
+        probeBtn.textContent = label
+        probeBtn.disabled = disabled
+      }
+
+      async function loadHealth() {
+        const h = await ctx.fetch('/api/plugins/serial-bridge/health').catch(() => null)
+        badge.replaceChildren(
+          ctx.el('span', { class: `aw-serial-dot ${h?.available ? 'aw-serial-dot-ok' : 'aw-serial-dot-bad'}` }),
+          document.createTextNode(h?.available ? t('available') : t('unavailable')),
+        )
+        const links = Array.isArray(h?.links) ? h.links : []
+        if (!links.length) {
+          linksWrap.replaceChildren(ctx.el('div', { class: 'aw-serial-empty' }, [t('nolinks')]))
+        }
+        else {
+          const tbody = ctx.el('tbody')
+          for (const l of links) {
+            tbody.append(ctx.el('tr', {}, [
+              ctx.el('td', {}, [String(l.key ?? '-')]),
+              ctx.el('td', {}, [String(l.pending ?? 0)]),
+              ctx.el('td', {}, [String(l.errors ?? 0)]),
+              ctx.el('td', {}, [l.lastUsedAt ? new Date(l.lastUsedAt).toLocaleTimeString() : '-']),
+            ]))
+          }
+          linksWrap.replaceChildren(ctx.el('table', { class: 'aw-serial-table' }, [
+            ctx.el('thead', {}, [ctx.el('tr', {}, [
+              ctx.el('th', {}, [t('link')]),
+              ctx.el('th', {}, [t('pending')]),
+              ctx.el('th', {}, [t('errors')]),
+              ctx.el('th', {}, [t('lastUsed')]),
+            ])]),
+            tbody,
+          ]))
+        }
+        const nodes = Array.isArray(h?.readNodes) ? h.readNodes : []
+        nodesWrap.replaceChildren(
+          nodes.length
+            ? ctx.el('div', {}, [nodes.map(n => `${n.name || n.id} @ ${n.path || '?'}${n.enabled === false ? ' [off]' : ''}`).join(', ')])
+            : ctx.el('div', { class: 'aw-serial-empty' }, [t('nonodes')]),
+        )
+      }
+
+      async function loadPorts() {
+        const r = await ctx.fetch('/api/plugins/serial-bridge/ports').catch(() => null)
+        const ports = Array.isArray(r?.ports) ? r.ports : []
+        if (!ports.length) {
+          portsWrap.replaceChildren(ctx.el('div', { class: 'aw-serial-empty' }, [r?.error ?? t('noports')]))
+          return
+        }
+        const tbody = ctx.el('tbody')
+        for (const p of ports) {
+          const pickPort = () => void (probeSel.value = p.path)
+          const row = ctx.el('tr', { style: 'cursor:pointer', title: p.friendlyName ?? '', onclick: pickPort }, [
+            ctx.el('td', {}, [String(p.path ?? '-')]),
+            ctx.el('td', {}, [String(p.manufacturer ?? '-')]),
+            ctx.el('td', {}, [String(p.serialNumber ?? '-')]),
+          ])
+          tbody.append(row)
+        }
+        portsWrap.replaceChildren(ctx.el('table', { class: 'aw-serial-table' }, [
+          ctx.el('thead', {}, [ctx.el('tr', {}, [
+            ctx.el('th', {}, [t('path')]),
+            ctx.el('th', {}, [t('manufacturer')]),
+            ctx.el('th', {}, [t('serialNumber')]),
+          ])]),
+          tbody,
+        ]))
+      }
+
+      async function runProbe() {
+        if (probing) return
+        const path = String(probeSel.value ?? '').trim()
+        if (!path) {
+          result.className = 'aw-serial-result bad'
+          result.textContent = t('noports')
+          return
+        }
+        probing = true
+        setBtn(t('probing'), true)
+        try {
+          // ctx.fetch 会自动 JSON.stringify(body)——这里必须传对象(双重 stringify 会让服务端收到字符串)
+          const r = await ctx.fetch('/api/plugins/serial-bridge/probe', {
+            method: 'POST',
+            body: {
+              path,
+              mode: modeSel.value,
+              baudRate: Number(baudInp.value) || 9600,
+              unitId: Number(unitInp.value) || 1,
+              register: regInp.value === '' ? undefined : Number(regInp.value),
+              sendLine: modeSel.value === 'ascii-line' && lineInp.value ? lineInp.value : undefined,
+            },
+          })
+          const body = r ?? {}
+          const ok = body.ok === true
+          result.className = `aw-serial-result ${ok ? 'ok' : 'bad'}`
+          result.textContent = `${ok ? '✓' : '✗'} ${body.message ?? body.error ?? '-'}${body.latencyMs != null ? ` (${body.latencyMs}ms)` : ''}`
+          void loadHealth()
+        }
+        catch (err) {
+          result.className = 'aw-serial-result bad'
+          result.textContent = `✗ ${err?.message ?? err}`
+        }
+        finally {
+          probing = false
+          setBtn(t('run_probe'), false)
+        }
+      }
+
+      setBtn(t('run_probe'), false)
+      void loadHealth()
+      void loadPorts()
+      const timer = setInterval(() => void loadHealth(), 30_000)
+      const offLocale = ctx.hooks.on('i18n:changed', () => {
+        setBtn(t('run_probe'), false)
+        result.className = 'aw-serial-hint'
+        result.textContent = t('probe_hint')
+        void loadHealth()
+        void loadPorts()
+      })
+      return () => {
+        clearInterval(timer)
+        offLocale()
+      }
+    },
+  })
+}