agentworkshop 0.7.53 → 0.7.54

package/.output/server/index.mjs

@@ -24,8 +24,9 @@ import 'zod';
 import 'node:child_process';
 import 'node:sqlite';
 import 'node:module';
-import 'node:fs/promises';
+import 'node:dns/promises';
 import 'node:net';
+import 'node:fs/promises';
 import 'node:util';
 import 'node:zlib';
 //# sourceMappingURL=index.mjs.map

package/.output/server/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.mjs","sources":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/.output/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentworkshop-prod",
-  "version": "0.7.53",
+  "version": "0.7.54",
   "type": "module",
   "private": true,
   "dependencies": {

package/README-zh.md

@@ -28,7 +28,7 @@
 
 **[English](./README.md)** · **[在线文档](https://kingdol666.github.io/AgentWorkShop)** · **[版本发布](https://github.com/kingdol666/AgentWorkShop/releases)** · **[更新日志](./changelog.md)** · **[插件 API](./docs/plugins.md)** · **[SDK](./docs/sdk.md)**
 
-<sub><b>v0.7.53</b> · 14 个执行引擎 · 6 种现场协议（5 内置 + 串口插件） · 115 个运行时设置项 · 双语文档（简体中文 / English）</sub>
+<sub><b>v0.7.54</b> · 14 个执行引擎 · 6 种现场协议（5 内置 + 串口插件）+ MES REST 集成 · 116 个运行时设置项 · 双语文档（简体中文 / English）</sub>
 
 <br />
 
@@ -186,7 +186,7 @@ AgentWorkShop 起家于**多智能体软件工作坊**——Channel 内的编码
 | **运行时可观测** | `GET /api/system/monitor` 把 Agent 团队内部暴露成数字：根队列深度、看门狗介入次数、Harness 会话复用、记忆 outbox 积压——每项都有对应的文档化回退开关，新机制可以不重新部署就关掉。 |
 | **产线操作单页（`/operations`）** | 一页看全对产线的每一次触碰：实时操作流水（REST 快照 + WS 推流）把写控、数采、建模、配方、回退、报警、产线、人工、系统动作归入**九类分类**，写控行渲染结构化 **前值 → 后值 diff 徽章**（失败标红），并直接从事件流推断**闭环阶段**（监视 → 探索·小步 → 推荐搜索 → 影子验证 → 生产）。同一数据面也供工作台控制台的「产线作业」面板使用。 |
 | **外部 MCP 网关** | `aw mcp` 启动零依赖的 **stdio MCP 服务**（38 个工具），自动发现运行中的实例（环境变量 → 锁文件 → 配置文件），把产线、配方（含 mark-good）、受治理 DCW 写入、工艺参数语义映射、数采查询、频道、团队供给、模型晋升、判卷/回退与插件管理暴露给任意 MCP 客户端——受 `mcp.enabled` 运行时设置门控，附 `--doctor` 与 `--print-config` 辅助指令。 |
-| **全量配置驱动运行时** | 全部运行旋钮（记忆预算、上下文压缩、回退护栏、保留策略、备份、日志级别、系统时区、MCP 开关…）在设置描述符注册表声明一次，优先级 **config.yml < runtime-settings < env**——**113 个设置项、18 组**（36 live / 79 restart），代码零硬编码默认。 |
+| **全量配置驱动运行时** | 全部运行旋钮（记忆预算、上下文压缩、回退护栏、保留策略、备份、日志级别、系统时区、MCP 开关…）在设置描述符注册表声明一次，优先级 **config.yml < runtime-settings < env**——**113 个设置项、18 组**（37 live / 79 restart），代码零硬编码默认。 |
 | **可配置系统时区** | 一个 `time.timeZone` 设置项（IANA 时区，live 热生效）统一驱动人读时间——日志、聊天、审计、Agent 记录与定时任务；机器时间轴（数采样本、`timestamptz`）仍保存绝对时间。 |
 | **可配置节拍** | 采样与查询的默认值/下限全部是 **live 设置**（`daq.sampling.*`、`daq.query.*`）：热重载、create/patch 时钳制，Agent 工具描述实时携带当前值。 |
 
@@ -388,7 +388,7 @@ aw update --check                      # 只报告，不安装
 npm install -g agentworkshop@latest    # 手动等效
 ```
 
-版本遵循 semver。每次 `aw start` 都会校验配置根，并把 `home` 之前的旧版 `data/` 布局迁移进来（以最新文件为准），因此数据可以跨版本存活。SQLite schema 迁移在服务端启动时执行。当前版本：**v0.7.53**——见[版本发布](https://github.com/kingdol666/AgentWorkShop/releases)。
+版本遵循 semver。每次 `aw start` 都会校验配置根，并把 `home` 之前的旧版 `data/` 布局迁移进来（以最新文件为准），因此数据可以跨版本存活。SQLite schema 迁移在服务端启动时执行。当前版本：**v0.7.54**——见[版本发布](https://github.com/kingdol666/AgentWorkShop/releases)。
 
 ### 第一次「Agent × 产线」会话（约 2 分钟）
 

package/README.md

@@ -28,7 +28,7 @@
 
 **[简体中文](./README-zh.md)** · **[Documentation](https://kingdol666.github.io/AgentWorkShop)** · **[Releases](https://github.com/kingdol666/AgentWorkShop/releases)** · **[Changelog](./changelog.md)** · **[Plugin API](./docs/plugins.md)** · **[SDK](./docs/sdk.md)**
 
-<sub><b>v0.7.53</b> · 14 engines · 6 field protocols (5 built-in + serial plugin) · 115 runtime settings · bilingual docs (简体中文 / English)</sub>
+<sub><b>v0.7.54</b> · 14 engines · 6 field protocols (5 built-in + serial plugin) + MES REST integration · 116 runtime settings · bilingual docs (简体中文 / English)</sub>
 
 <br />
 
@@ -187,7 +187,7 @@ Recorded against a running instance: real DAQ history, real write control, real
 | **Runtime observability** | `GET /api/system/monitor` exposes the agent-team internals as numbers: root queue depth, watchdog interventions, harness session reuse, pending memory outbox — each guarded by a documented rollback switch, so new machinery can be turned off without a redeploy. |
 | **Line operations feed (`/operations`)** | One page for every touch on the plant: a live operation feed (REST snapshot + WS stream) classifies writes, DAQ, AML, recipe, rollback, alarm, line, manual and system actions into **nine categories**, renders structured **before → after diff badges** on write rows (failures marked red), and infers the **closed-loop phase** (monitor → exploration · small-step → recommendation search → shadow verification → production) straight from the event stream. The same feed powers a line-operations panel inside the workshop console. |
 | **External MCP gateway** | `aw mcp` starts a zero-dependency **stdio MCP server** (38 tools) that discovers a running instance automatically (env → lock file → config file) and exposes lines, recipes (incl. mark-good), governed DCW writes, semantic parameter mapping, DAQ queries, channels, team provisioning, model promotion, judge/rollback and plugin management to any MCP client — gated by the `mcp.enabled` runtime setting, with `--doctor` and `--print-config` helpers. |
-| **Fully config-driven runtime** | Every runtime knob (memory budgets, compaction, rollback guardrails, retention, backups, log level, system timezone, MCP gate…) is declared once in the settings descriptor registry with precedence **config.yml < runtime-settings < env** — **115 settings across 18 groups** (36 live / 79 restart), no hardcoded defaults in code. |
+| **Fully config-driven runtime** | Every runtime knob (memory budgets, compaction, rollback guardrails, retention, backups, log level, system timezone, MCP gate…) is declared once in the settings descriptor registry with precedence **config.yml < runtime-settings < env** — **116 settings across 18 groups** (37 live / 79 restart), no hardcoded defaults in code. |
 | **Configurable system timezone** | One `time.timeZone` setting (IANA id, live-applied) drives human-facing timestamps — logs, chat, audit, agent records and schedules — through a single formatter; machine timelines (DAQ samples, `timestamptz`) stay absolute. |
 | **Configurable cadences** | Sampling and query defaults/floors are **live settings** (`daq.sampling.*`, `daq.query.*`): hot-reloaded, clamped on node create/patch, and agent tool descriptions always carry the current values. |
 
@@ -256,7 +256,7 @@ page headers stack, dense tables become scrollable ledgers with a pinned identit
 <td width="50%"><img src="https://raw.githubusercontent.com/kingdol666/AgentWorkShop/main/docs/readme-assets/shot-monitor.png" alt="Runtime monitor" width="100%" /><br/><sub><b>Runtime monitor.</b> Every wired channel, member count, dependency cycle and owner.</sub></td>
 </tr>
 <tr>
-<td><img src="https://raw.githubusercontent.com/kingdol666/AgentWorkShop/main/docs/readme-assets/shot-settings.png" alt="Settings" width="100%" /><br/><sub><b>Settings.</b> 115 keys across 18 groups, descriptor-driven — the same registry the CLI reads.</sub></td>
+<td><img src="https://raw.githubusercontent.com/kingdol666/AgentWorkShop/main/docs/readme-assets/shot-settings.png" alt="Settings" width="100%" /><br/><sub><b>Settings.</b> 116 keys across 18 groups, descriptor-driven — the same registry the CLI reads.</sub></td>
 <td><img src="https://raw.githubusercontent.com/kingdol666/AgentWorkShop/main/docs/readme-assets/shot-plugins.png" alt="Plugins" width="100%" /><br/><sub><b>Plugins.</b> Three scopes, hot reload on edit, per-team switches.</sub></td>
 </tr>
 </table>
@@ -379,7 +379,7 @@ aw update --check                      # only report; nothing is installed
 npm install -g agentworkshop@latest    # manual equivalent
 ```
 
-Releases follow semver. `aw start` verifies the config root on every launch and migrates the legacy pre-`home` `data/` layout into it (newest file wins), so data survives upgrades. SQLite schema migrations run server-side at boot. Current version: **v0.7.53** — see [Releases](https://github.com/kingdol666/AgentWorkShop/releases).
+Releases follow semver. `aw start` verifies the config root on every launch and migrates the legacy pre-`home` `data/` layout into it (newest file wins), so data survives upgrades. SQLite schema migrations run server-side at boot. Current version: **v0.7.54** — see [Releases](https://github.com/kingdol666/AgentWorkShop/releases).
 
 ### Your first agent × line session (~2 minutes)
 
@@ -657,7 +657,7 @@ AgentWorkShop/
 ├── sdk/                        # agentworkshop/sdk — plugin context, hook bus, REST client, browser SDK
 ├── tui/                        # terminal workbench (aw tui)
 ├── shared/
-│   └── config/                 # schema.json (115 setting descriptors) + engine (merge/validate/persist) + path resolver
+│   └── config/                 # schema.json (116 setting descriptors) + engine (merge/validate/persist) + path resolver
 ├── config.yml                  # factory defaults (read at build/start; version comes from package.json)
 ├── .AgentWorkShop/             # config root in a checkout — prompts (versioned) + runtime overrides · data · logs · commands (git-ignored)
 ├── data/                       # legacy pre-migration location (auto-migrated into the config root)

package/app/components/dcw/DcwAddNodeModal.vue

@@ -3,28 +3,32 @@
  * 添加控制节点向导 —— mock / 真实设备(协议参数 schema 动态表单 + 测试连接 + 数据语义标定)。
  * 向导各字段由页面 useDcwAddNode 独占持有,经 v-model 就地读写(与原模板写法一致);
  * 组件只负责呈现,测试/提交回抛页面。
+ * mes-rest 驱动额外提供「试读」(读链路验证,POST /dcw/mes-test-read;后端并行上线,404 容错)。
  */
+import { computed } from 'vue'
 import type { DcwTemplateDef } from '#shared/dcw-protocol'
 import type { DaqDriverCatalogEntry, DriverConfigField } from '#shared/daq-protocol'
 
-defineProps<{
+const props = defineProps<{
   templates: DcwTemplateDef[]
   driverCatalog: DaqDriverCatalogEntry[]
   addFields: DriverConfigField[]
   addTesting: boolean
   addTest: { ok: boolean, message: string } | null
+  addMesTesting: boolean
+  addMesResult: { ok: boolean, eng: number | null, ts: string | null, latencyMs: number | null, message: string } | null
   addSaving: boolean
   addError: string
 }>()
 
-const emit = defineEmits<{ test: [], submit: [] }>()
+const emit = defineEmits<{ 'test': [], 'mes-test': [], 'submit': [] }>()
 
 const { t } = useI18n()
 
 const addOpen = defineModel<boolean>('open', { required: true })
 const addScenario = defineModel<'mock' | 'real'>('scenario', { required: true })
 const addTemplate = defineModel<string>('template', { required: true })
-const addDriver = defineModel<'mock' | 'modbus-tcp' | 'opcua'>('driver', { required: true })
+const addDriver = defineModel<string>('driver', { required: true })
 const addName = defineModel<string>('name', { required: true })
 const addHold = defineModel<number | null>('hold', { required: true })
 const addRead = defineModel<number | null>('read', { required: true })
@@ -33,6 +37,23 @@ const addStepLimit = defineModel<number | null>('stepLimit', { required: true })
 const addCfg = defineModel<Record<string, string | number>>('cfg', { required: true })
 const addTransform = defineModel<{ kind: 'none' | 'linear', scale: number, offset: number }>('transform', { required: true })
 const addSemantics = defineModel<string>('semantics', { required: true })
+
+/** 映射表字段(type='text',如 readMap/writeMap/historyMap 的 JSON 多行输入 → textarea) */
+const isMapField = (f: DriverConfigField): boolean => f.type === 'text'
+
+/** 试读是否可用(仅 mes-rest 驱动展示) */
+const isMesRest = computed(() => addDriver.value === 'mes-rest')
+
+/** 试读内联结果文案:成功 = eng 值 + 耗时;失败 = 服务端/容错 message */
+const mesResultText = computed(() => {
+  const r = props.addMesResult
+  if (!r) return ''
+  if (r.ok) {
+    const eng = r.eng != null ? String(r.eng) : '--'
+    return `${eng}${r.latencyMs != null ? ` · ${r.latencyMs}ms` : ''}`
+  }
+  return r.message
+})
 </script>
 
 <template>
@@ -202,13 +223,21 @@ const addSemantics = defineModel<string>('semantics', { required: true })
             v-for="f in addFields"
             :key="f.key"
             class="f"
+            :class="{ 'map-field': isMapField(f) }"
           >
             <span>{{ f.label }}<em
               v-if="f.required"
               style="color: var(--tone-danger-dot); font-style: normal;"
             >*</em></span>
+            <textarea
+              v-if="isMapField(f)"
+              v-model="addCfg[f.key]"
+              class="inp cfg-map mono"
+              rows="6"
+              :placeholder="f.placeholder"
+            />
             <select
-              v-if="f.type === 'select'"
+              v-else-if="f.type === 'select'"
               v-model="addCfg[f.key]"
               class="inp"
             >
@@ -247,6 +276,24 @@ const addSemantics = defineModel<string>('semantics', { required: true })
             :class="addTest.ok ? 'good' : 'bad'"
           >{{ addTest.ok ? '✓' : '✗' }} {{ addTest.message }}</span>
         </div>
+        <!-- mes-rest 读链路试读(独立于写链路「测试连接」;后端端点并行上线,404 显示未就绪) -->
+        <div
+          v-if="isMesRest"
+          class="test-row"
+        >
+          <button
+            class="mini-btn"
+            :disabled="addMesTesting"
+            @click="emit('mes-test')"
+          >
+            {{ addMesTesting ? $t('dcwDetail.mesTesting') : $t('dcwDetail.mesTestBtn') }}
+          </button>
+          <span
+            v-if="addMesResult"
+            class="test-result"
+            :class="addMesResult.ok ? 'good' : 'bad'"
+          >{{ addMesResult.ok ? '✓' : '✗' }} {{ mesResultText }}</span>
+        </div>
       </template>
 
       <label class="f">
@@ -302,6 +349,9 @@ const addSemantics = defineModel<string>('semantics', { required: true })
 .seg.on { font-weight: 600; color: var(--on-accent); background: var(--accent); border-color: var(--accent); }
 .f-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 10px; margin-bottom: 10px; }
 .driver-form { grid-template-columns: repeat(3, 1fr); }
+/* 映射表字段(readMap/writeMap/historyMap 的 JSON 多行输入):整行铺满 + 等宽字体 */
+.driver-form .map-field { grid-column: 1 / -1; }
+.cfg-map { font-family: var(--font-mono); font-size: 11.5px; line-height: 1.5; resize: vertical; }
 
 .field-hint { font-size: 10px; color: var(--ink-faint); line-height: 1.35; }
 .f { display: flex; flex-direction: column; gap: 4px; font-size: 11.5px; color: var(--ink-faint); }

package/app/components/dcw/DcwNodesTable.vue

@@ -5,6 +5,7 @@
  */
 import type { DcwNodeView } from '#shared/dcw-protocol'
 import { reactive } from 'vue'
+import { dcwDriverBadgeKey } from '~/utils/dcw-driver-badge'
 
 defineProps<{
   lineNodes: DcwNodeView[]
@@ -27,6 +28,14 @@ const emit = defineEmits<{
   'remove': [nodeId: string]
 }>()
 
+const { t } = useI18n()
+
+/** 边缘层徽标文案(mes-rest=「MES 边缘层」;mock/s7-stub=「无协议转换」;真实协议自明不加) */
+function drvBadge(driver: string): string {
+  const key = dcwDriverBadgeKey(driver)
+  return key ? t(key) : ''
+}
+
 /** 直写输入框逐节点暂存(与页面 useDcwWrites 的 setInputs 同一个对象) */
 const setInputs = defineModel<Record<string, number | ''>>('setInputs', { required: true })
 const stepDrafts = reactive<Record<string, number | '' | null>>({})
@@ -69,6 +78,10 @@ function saveStep(n: DcwNodeView): void {
             <td>
               <span class="mono dim">{{ n.id.slice(0, 8) }}</span>
               <b>{{ n.name }}</b>
+              <span
+                v-if="drvBadge(n.driver)"
+                class="drv-badge"
+              >{{ drvBadge(n.driver) }}</span>
               <small class="mono ch">{{ dcwTemplateRefCh(n.templateRef) }}</small>
             </td>
             <td>
@@ -222,6 +235,8 @@ function saveStep(n: DcwNodeView): void {
 .nodes-table th { font-size: 11px; font-weight: 600; letter-spacing: 0.06em; text-transform: uppercase; color: var(--ink-faint); border-bottom: 1px solid var(--line-strong); }
 .nodes-table td b { margin-left: 8px; }
 .ch { display: block; margin-top: 2px; font-size: 11.5px; color: var(--ink-faint); }
+/* 边缘层徽标(仅 mes-rest/mock/s7-stub;极简单行小 pill,协议名自明者不加) */
+.drv-badge { display: inline-block; margin-left: 7px; padding: 1px 7px; font-family: var(--font-mono); font-size: 10.5px; letter-spacing: 0.03em; color: var(--ink-faint); border: 1px solid var(--line-strong); border-radius: 4px; vertical-align: 1px; }
 .right { text-align: right; }
 .val { font-size: 13px; }
 .val small { margin-left: 3px; color: var(--ink-faint); }

package/app/components/dcw/DcwParamApprovalCard.vue

@@ -0,0 +1,110 @@
+<script setup lang="ts">
+/**
+ * HITL 下发参数审批卡(产线详情页)—— 本产线控制节点的 Agent 写入待批项。
+ * 数据与裁决由页面 useDcwParamApprovals 独占持有(经 props/emit 回抛,与节点表同模式);
+ * 空态由页面 v-if 收敛(整卡不渲染,避免噪音)。三态语义:同意=立即执行;
+ * 拒绝=Agent 按原值继续(意见逐字回流);超时=默认不同意(卡头小字常驻)。
+ */
+import type { DcwApprovalRow } from '../../pages/dcw/composables/useDcwParamApprovals'
+
+defineProps<{
+  items: DcwApprovalRow[]
+  decidingId: string
+  remainingSec: (a: DcwApprovalRow) => number
+  agentName: (a: DcwApprovalRow) => string
+  nodeName: (a: DcwApprovalRow) => string
+}>()
+
+const emit = defineEmits<{ decide: [id: string, approved: boolean] }>()
+
+const comments = defineModel<Record<string, string>>('comments', { required: true })
+</script>
+
+<template>
+  <section class="aw-tile ap-card">
+    <div class="ap-head">
+      <b>{{ $t('dcwDetail.apTitle') }}</b>
+      <span class="ap-count mono">{{ items.length }}</span>
+      <small class="ap-rule">{{ $t('dcwDetail.apRule') }}</small>
+    </div>
+    <div
+      v-for="ap in items"
+      :key="ap.id"
+      class="ap-row"
+    >
+      <div class="ap-main">
+        <div class="ap-line">
+          <span class="ap-node">{{ nodeName(ap) }}</span>
+          <span class="ap-detail">{{ ap.detail }}</span>
+        </div>
+        <small class="ap-meta">
+          <span class="mono">{{ $t('dcwDetail.apInitiator') }} {{ agentName(ap) }}</span>
+          <span
+            class="ap-ttl mono"
+            :class="{ urgent: remainingSec(ap) <= 30 }"
+          >⏱ {{ remainingSec(ap) }}s {{ $t('dcwDetail.apTimeout') }}</span>
+        </small>
+      </div>
+      <input
+        v-model="comments[ap.id]"
+        class="inp ap-comment"
+        :placeholder="$t('dcwDetail.apCommentPh')"
+      >
+      <div class="ap-actions">
+        <button
+          class="mini-btn ap-ok"
+          :disabled="decidingId === ap.id"
+          @click="emit('decide', ap.id, true)"
+        >
+          {{ $t('dcwDetail.apApprove') }}
+        </button>
+        <button
+          class="mini-btn danger"
+          :disabled="decidingId === ap.id"
+          @click="emit('decide', ap.id, false)"
+        >
+          {{ $t('dcwDetail.apReject') }}
+        </button>
+      </div>
+    </div>
+  </section>
+</template>
+
+<style scoped>
+/* 共享工具类随标记搬入本组件:scoped 的 data-v 归属不跨组件,
+   凡在多组件出现的规则(.mono/.dim/.inp/.mini-btn/... 等)在此各持一份逐字相同的副本。 */
+
+.mono { font-family: var(--font-mono); font-variant-numeric: tabular-nums; }
+
+.ap-card { padding: 12px 18px; margin-bottom: 14px; border-color: color-mix(in srgb, var(--tone-warning-dot) 35%, transparent); }
+.ap-head { display: flex; gap: 8px; align-items: baseline; }
+.ap-head b { font-size: 13.5px; }
+.ap-count { padding: 0 7px; font-size: 11.5px; color: var(--tone-warning-dot); border: 1px solid var(--tone-warning-dot); border-radius: 4px; }
+.ap-rule { margin-left: auto; font-size: 10.5px; color: var(--ink-faint); }
+
+.ap-row { display: flex; gap: 10px; align-items: center; padding: 9px 0; border-top: 1px solid var(--divider-hair); }
+.ap-row:first-of-type { border-top: 0; margin-top: 8px; }
+.ap-main { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 3px; }
+.ap-line { display: flex; gap: 8px; align-items: baseline; min-width: 0; flex-wrap: wrap; }
+.ap-node { font-weight: 600; font-size: 12.5px; }
+.ap-detail { font-size: 12px; color: var(--ink-soft); overflow-wrap: anywhere; }
+.ap-meta { display: flex; gap: 12px; align-items: center; flex-wrap: wrap; font-size: 11px; color: var(--ink-faint); }
+.ap-ttl { color: var(--tone-warning-dot); }
+.ap-ttl.urgent { color: var(--tone-danger-dot); }
+.ap-comment { flex: none; width: 240px; padding: 5px 9px; font-size: 12px; }
+.ap-actions { display: flex; flex: none; gap: 6px; }
+.ap-ok { color: var(--tone-success-dot); }
+
+@media (max-width: 900px) {
+/* ══ 窄屏自适应层(≤900 手持/平板竖):审批行落成一列,触摸目标 ≥40px ══ */
+  .ap-card { padding: 12px; }
+  .ap-rule { margin-left: 0; }
+  .ap-row { flex-wrap: wrap; }
+  .ap-comment { flex: 1 1 100%; width: auto; }
+  .ap-actions { margin-left: auto; }
+  .mini-btn,
+  .inp {
+    min-height: 40px;
+  }
+}
+</style>

package/app/components/dcw/DcwRecipeEditModal.vue

@@ -8,6 +8,7 @@ import type { DaqNodeLive } from '@/app/composables/workshop/useDaqStream'
 import type { DcwRecipeForm } from '../../pages/dcw/composables/useDcwRecipes'
 import type { StaleRef } from '../../pages/dcw/composables/useDcwDetailScope'
 import { emptyRecipeDaqWindowRow, emptyRecipeParamRow } from '~/utils/dcw-recipe-form'
+import { dcwDriverBadgeKey } from '~/utils/dcw-driver-badge'
 
 defineProps<{
   lineProducts: ProductView[]
@@ -29,6 +30,14 @@ const emit = defineEmits<{ submit: [], close: [] }>()
 
 const recipeOpen = defineModel<boolean>('open', { required: true })
 const recipeForm = defineModel<DcwRecipeForm>('form', { required: true })
+
+const { t } = useI18n()
+
+/** 参数绑定节点选项的边缘层徽标后缀(select option 纯文本,以「 · 徽标」尾注呈现) */
+function drvBadgeSuffix(driver: string): string {
+  const key = dcwDriverBadgeKey(driver)
+  return key ? ` · ${t(key)}` : ''
+}
 </script>
 
 <template>
@@ -93,7 +102,7 @@ const recipeForm = defineModel<DcwRecipeForm>('form', { required: true })
               :key="n.id"
               :value="n.id"
             >
-              {{ n.name }}({{ dcwTemplateRefCh(n.templateRef) }} · {{ n.min }}~{{ n.max }} {{ n.unit }})
+              {{ n.name }}{{ drvBadgeSuffix(n.driver) }}({{ dcwTemplateRefCh(n.templateRef) }} · {{ n.min }}~{{ n.max }} {{ n.unit }})
             </option>
           </select>
           <span

package/app/components/workshop/town/components/TownAgentBindings.vue

@@ -9,12 +9,21 @@
 import type { useDaqStream } from '@/app/composables/workshop/useDaqStream'
 import type { useDcwStream } from '@/app/composables/workshop/useDcwStream'
 import type { AgentNodeBindingRow, ToolApprovalRow } from '@/app/composables/workshop/town/town-view-types'
+import { dcwDriverBadgeKey } from '@/app/utils/dcw-driver-badge'
 
 const agentBindKind = defineModel<'dcw' | 'daq'>('agentBindKind', { required: true })
 const agentBindNodeId = defineModel<string>('agentBindNodeId', { required: true })
 const agentBindMode = defineModel<'auto' | 'manual'>('agentBindMode', { required: true })
 const approvalComments = defineModel<Record<string, string>>('approvalComments', { required: true })
 
+const { t } = useI18n()
+
+/** 绑定节点选项的边缘层徽标后缀(mes-rest=「MES 边缘层」;mock/s7-stub=「无协议转换」;select option 纯文本尾注) */
+function bindBadgeSuffix(driver: string): string {
+  const key = dcwDriverBadgeKey(driver)
+  return key ? ` · ${t(key)}` : ''
+}
+
 defineProps<{
   mode: 'browse' | 'edit'
   agentBindings: AgentNodeBindingRow[]
@@ -107,7 +116,7 @@ defineProps<{
           :key="n.id"
           :value="n.id"
         >
-          {{ n.name }}
+          {{ n.name }}{{ bindBadgeSuffix(n.driver) }}
         </option>
       </template>
       <template v-else>

package/app/composables/workshop/useDcwStream.ts

@@ -221,6 +221,10 @@ function createStore() {
     testDriver: async (driver: string, driverConfig: Record<string, unknown>): Promise<{ ok: boolean, message: string }> => {
       return api<{ test: { ok: boolean, message: string } }>('/test-driver', { method: 'POST', body: JSON.stringify({ driver, driverConfig }) }).then(r => r.test)
     },
+    /** MES REST 驱动试读(边缘链路连通性;契约 {ok,eng,ts,latencyMs};404=后端端点未就绪,由调用方容错) */
+    mesTestRead: async (driverConfig: Record<string, unknown>): Promise<{ ok: boolean, eng?: number, ts?: string, latencyMs?: number }> => {
+      return api<{ ok: boolean, eng?: number, ts?: string, latencyMs?: number }>('/mes-test-read', { method: 'POST', body: JSON.stringify({ driverConfig }) })
+    },
     testNode: async (id: string): Promise<{ ok: boolean, message: string }> => {
       return api<{ test: { ok: boolean, message: string } }>(`/${id}/test`, { method: 'POST' }).then(r => r.test)
     },

package/app/pages/dcw/[id].vue

@@ -14,6 +14,7 @@ import { useDcwDetailScope } from './composables/useDcwDetailScope'
 import { useDcwDetailTemplates } from './composables/useDcwDetailTemplates'
 import { useDcwLedger } from './composables/useDcwLedger'
 import { useDcwLineRun } from './composables/useDcwLineRun'
+import { useDcwParamApprovals } from './composables/useDcwParamApprovals'
 import { useDcwProducts } from './composables/useDcwProducts'
 import { useDcwQuery } from './composables/useDcwQuery'
 import { useDcwRecipes } from './composables/useDcwRecipes'
@@ -28,6 +29,7 @@ const recipes = useDcwRecipes(scope, products, lineRun, writes)
 const queryCtl = useDcwQuery(scope)
 const addNode = useDcwAddNode(scope)
 const tplCtl = useDcwDetailTemplates(addNode)
+const approvals = useDcwParamApprovals(scope)
 
 const { dcw, line, lineId, ls, lineNodes, lineProducts, lineRecipesAll, lineRuns, lineHistory, unassignedNodes, unassignedProducts, stateLabel, dcwTemplateRefCh, nodeMin, nodeMax, lineDaqNodes, daqNodeCh, adoptNode, adoptProduct, productName, paramStatus, paramNodeName, daqWindowStatus, nodeDeviceNames } = scope
 const { setInputs, writingId, writeError, writeOk, readingId, togglingId, stepPatchingId, doWrite, doRead, toggleControl, patchStepLimit } = writes
@@ -36,8 +38,9 @@ const { lineProductId, lineRecipeId, lineBusy, lineMsg, lineErr, lineRecipes, do
 const { filterProductId, visibleRecipes, productOpen, productSaving, productError, productForm, doCreateProduct } = products
 const { verOpen, verRecipe, verRows, verLoading, verMsg, doRevert, recipeOpen, recipeEditing, recipeSaving, recipeError, recipeStaleNote, recipeForm, applyResult, runDataView, runDataLoading, openRecipeCreate, openRecipeEdit, openRecipeHistory, saveRecipe, doApplyRecipe, doViewRun } = recipes
 const { query, queryBusy, queryError, queryResult, doQuery, daqParamKeys } = queryCtl
-const { addOpen, addScenario, addTemplate, addDriver, addName, addHold, addRead, addWriteLock, addStepLimit, addCfg, addTransform, addSemantics, addTesting, addTest, addSaving, addError, addFields, driverCatalog, doTestConnection, doAddNode } = addNode
+const { addOpen, addScenario, addTemplate, addDriver, addName, addHold, addRead, addWriteLock, addStepLimit, addCfg, addTransform, addSemantics, addTesting, addTest, addMesTesting, addMesResult, addSaving, addError, addFields, driverCatalog, doTestConnection, doMesTestRead, doAddNode } = addNode
 const { tplOpen, tplSaving, tplError, tplOk, tplForm, tplIcons, builtinCount, customCount, openTplModal, doCreateTemplate } = tplCtl
+const { approvalItems, approvalComments, approvalDecidingId, approvalRemainingSec, approvalAgentName, approvalNodeName, decideApproval } = approvals
 </script>
 
 <template>
@@ -144,12 +147,27 @@ const { tplOpen, tplSaving, tplError, tplOk, tplForm, tplIcons, builtinCount, cu
       :add-fields="addFields"
       :add-testing="addTesting"
       :add-test="addTest"
+      :add-mes-testing="addMesTesting"
+      :add-mes-result="addMesResult"
       :add-saving="addSaving"
       :add-error="addError"
       @test="doTestConnection"
+      @mes-test="doMesTestRead"
       @submit="doAddNode"
     />
 
+    <!-- HITL 下发参数审批(本产线节点的 Agent 写入待批;空态不渲染避免噪音) -->
+    <DcwParamApprovalCard
+      v-if="approvalItems.length"
+      v-model:comments="approvalComments"
+      :items="approvalItems"
+      :deciding-id="approvalDecidingId"
+      :remaining-sec="approvalRemainingSec"
+      :agent-name="approvalAgentName"
+      :node-name="approvalNodeName"
+      @decide="decideApproval"
+    />
+
     <!-- 控制节点清单 -->
     <DcwNodesTable
       v-model:set-inputs="setInputs"

package/app/pages/dcw/composables/useDcwAddNode.ts

@@ -1,5 +1,6 @@
 import { computed, reactive, ref } from 'vue'
 import { useDcwStream } from '~/composables/workshop/useDcwStream'
+import { ApiError } from '~/composables/workshop/apiClient'
 import type { useDcwDetailScope } from './useDcwDetailScope'
 import { DCW_DRIVERS } from '#shared/dcw-protocol'
 import type { DaqDriverCatalogEntry, DriverConfigField } from '#shared/daq-protocol'
@@ -18,7 +19,9 @@ export function useDcwAddNode(scope: ReturnType<typeof useDcwDetailScope>) {
   const addOpen = ref(false)
   const addScenario = ref<'mock' | 'real'>('mock')
   const addTemplate = ref(dcw.templates[0]?.key ?? '')
-  const addDriver = ref<'mock' | 'modbus-tcp' | 'opcua'>('mock')
+  // 驱动 kind 由驱动目录(server 权威)自描述:mock/modbus-tcp/opcua/…/mes-rest,
+  // 放宽为 string 以容纳并行加入的 mes-rest 等新驱动
+  const addDriver = ref<string>('mock')
   const addName = ref('')
   const addHold = ref<number | null>(null)
   const addRead = ref<number | null>(null)
@@ -29,6 +32,9 @@ export function useDcwAddNode(scope: ReturnType<typeof useDcwDetailScope>) {
   const addSemantics = ref('')
   const addTesting = ref(false)
   const addTest = ref<{ ok: boolean, message: string } | null>(null)
+  // MES REST 试读(mes-rest 驱动专属;与「测试连接」写链路并列的读链路验证)
+  const addMesTesting = ref(false)
+  const addMesResult = ref<{ ok: boolean, eng: number | null, ts: string | null, latencyMs: number | null, message: string } | null>(null)
   const addSaving = ref(false)
   const addError = ref('')
 
@@ -46,6 +52,7 @@ export function useDcwAddNode(scope: ReturnType<typeof useDcwDetailScope>) {
     }
     addCfg.value = cfg
     addTest.value = null
+    addMesResult.value = null
   }
   void resetAddCfg()
 
@@ -63,6 +70,30 @@ export function useDcwAddNode(scope: ReturnType<typeof useDcwDetailScope>) {
     }
   }
 
+  /** MES REST 试读:组装当前表单 driverConfig POST /dcw/mes-test-read,内联呈现 eng/耗时/服务端文案 */
+  async function doMesTestRead(): Promise<void> {
+    addMesTesting.value = true
+    addMesResult.value = null
+    try {
+      const r = await dcw.mesTestRead({ ...addCfg.value })
+      addMesResult.value = { ok: !!r.ok, eng: r.eng ?? null, ts: r.ts ?? null, latencyMs: r.latencyMs ?? null, message: '' }
+    }
+    catch (err) {
+      // 后端端点与前端并行开发:404 = mes-test-read 未上线,提示"服务端未就绪"而非报错崩坏
+      const notReady = err instanceof ApiError && err.status === 404
+      addMesResult.value = {
+        ok: false,
+        eng: null,
+        ts: null,
+        latencyMs: null,
+        message: notReady ? t('dcwDetail.mesNotReady') : apiErrorMessage(err),
+      }
+    }
+    finally {
+      addMesTesting.value = false
+    }
+  }
+
   async function doAddNode(): Promise<void> {
     addSaving.value = true
     addError.value = ''
@@ -114,11 +145,14 @@ export function useDcwAddNode(scope: ReturnType<typeof useDcwDetailScope>) {
     addSemantics,
     addTesting,
     addTest,
+    addMesTesting,
+    addMesResult,
     addSaving,
     addError,
     driverCatalog,
     addFields,
     doTestConnection,
+    doMesTestRead,
     doAddNode,
   }
 }