agentworkshop 0.7.53 → 0.7.54

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

@@ -0,0 +1,119 @@
+import { computed, onUnmounted, ref } from 'vue'
+import { apiFetch } from '~/composables/workshop/apiClient'
+import { useDcwStream } from '~/composables/workshop/useDcwStream'
+import { useHitlStore } from '~/stores/workshop/hitl'
+import type { useDcwDetailScope } from './useDcwDetailScope'
+
+/**
+ * HITL 下发参数审批(产线详情页卡)—— 本产线控制节点的 Agent 写入待批项。
+ *
+ * 数据源(GET /api/workshop/agent-tools/approvals?scope=pending,服务端已按
+ * Channel 可见性 + 审批资格 fail-closed 过滤):行载荷带 nodeId/expiresAt,
+ * ① kind='dcw' 只留下发审批;② nodeId ∈ 本产线节点 —— 精确过滤到当前产线
+ * (hitl/pending 的 AepHitlItem 无结构化 nodeId,故不作数据源)。
+ * 发起者名以全局 HITL store(dcw-approval 条目)补全,缺失回退 agentId。
+ * 裁决走既有 POST /agent-tools/approvals/:id/decide(approved + comment,
+ * 拒绝意见逐字回流 Agent);30s 轮询 + 裁决后立即刷新;空态由页面 v-if 收敛整卡。
+ */
+
+/** 审批行(GET approvals 返回 ToolApproval 的客户端投影;只取用到的字段) */
+export interface DcwApprovalRow {
+  id: string
+  agentId: string
+  kind: string
+  nodeId: string
+  /** 人读摘要(节点/物理量/当前值→目标值/步长依据,服务端生成,有什么展示什么) */
+  detail: string
+  createdAt: string
+  /** 到期时刻(超时默认不同意) */
+  expiresAt: string
+  status: string
+}
+
+export function useDcwParamApprovals(scope: ReturnType<typeof useDcwDetailScope>) {
+  const dcw = useDcwStream()
+  const hitl = useHitlStore()
+  const { lineNodes } = scope
+
+  const items = ref<DcwApprovalRow[]>([])
+  /** 逐审批拒绝意见输入(经 v-model 下发卡片;decide 时随 rejected 提交) */
+  const comments = ref<Record<string, string>>({})
+  const decidingId = ref('')
+  /** 1s 心跳(倒计时用;读取它的渲染在每秒重算剩余秒数) */
+  const nowMs = ref(Date.now())
+
+  /** 本产线可见待批(服务端已过滤权限;这里只做产线与类型收窄) */
+  const approvalItems = computed<DcwApprovalRow[]>(() => {
+    const ids = new Set(lineNodes.value.map(n => n.id))
+    return items.value.filter(a => a.kind === 'dcw' && ids.has(a.nodeId) && a.status === 'pending')
+  })
+
+  /** 发起者名(HITL 统一待办的 agentName 优先;缺失回退 agentId) */
+  function approvalAgentName(a: DcwApprovalRow): string {
+    return hitl.items.find(i => i.kind === 'dcw-approval' && i.id === a.id)?.agentName ?? a.agentId
+  }
+
+  /** 审批目标节点名(节点已删除时回退短 id) */
+  function approvalNodeName(a: DcwApprovalRow): string {
+    return dcw.nodeById(a.nodeId)?.name ?? a.nodeId.slice(0, 8)
+  }
+
+  /** 剩余秒数(读取 nowMs 心跳;超时默认不同意) */
+  function approvalRemainingSec(a: DcwApprovalRow): number {
+    return Math.max(0, Math.ceil((Date.parse(a.expiresAt) - nowMs.value) / 1000))
+  }
+
+  async function load(): Promise<void> {
+    try {
+      const r = await apiFetch<{ approvals?: DcwApprovalRow[] }>({ base: '/api/workshop/agent-tools/approvals', path: '?scope=pending' })
+      items.value = r.approvals ?? []
+    }
+    catch {
+      // 轮询失败保持既有数据(空态不渲染整卡,不打扰产线操作台)
+    }
+  }
+
+  /** 裁决:approved=true 立即执行;false 拒绝(意见逐字回流 Agent)。成功/冲突后立即刷新 */
+  async function decideApproval(id: string, approved: boolean): Promise<void> {
+    decidingId.value = id
+    try {
+      await apiFetch({
+        base: '/api/workshop/agent-tools/approvals',
+        path: `/${encodeURIComponent(id)}/decide`,
+        init: { method: 'POST', body: JSON.stringify({ approved, comment: comments.value[id] ?? '' }) },
+      })
+      items.value = items.value.filter(a => a.id !== id)
+    }
+    catch {
+      // 409 ALREADY_RESOLVED(他人已处理/超时)等:以服务端事实源收敛
+    }
+    finally {
+      Reflect.deleteProperty(comments.value, id)
+      decidingId.value = ''
+      await load()
+    }
+  }
+
+  // 30s 数据轮询 + 1s 倒计时心跳(同一定时器计数,避免双计时器漂移)
+  let tick = 0
+  const timer = setInterval(() => {
+    nowMs.value = Date.now()
+    tick++
+    if (tick % 30 === 0) void load()
+  }, 1000)
+  onUnmounted(() => clearInterval(timer))
+
+  void load()
+  // 发起者名依赖全局 HITL 待办快照(幂等;挂载基线对齐,后续由 AEP hitl.* 帧增量收敛)
+  void hitl.loadSnapshot()
+
+  return {
+    approvalItems,
+    approvalComments: comments,
+    approvalDecidingId: decidingId,
+    approvalRemainingSec,
+    approvalAgentName,
+    approvalNodeName,
+    decideApproval,
+  }
+}

package/app/utils/dcw-driver-badge.ts

@@ -0,0 +1,16 @@
+/**
+ * DCW 驱动边缘层徽标 —— 节点表 / 数据绑定节点选择处共用的极简语义标注。
+ *
+ * 只给"非自明"的驱动加徽标:
+ *  - mes-rest  → MES 边缘层(写控制经 MES REST 边缘链路,协议名不自明);
+ *  - mock / s7-stub → 无协议转换(模拟/桩源,提醒其非真实产线链路);
+ *  - modbus/opcua/mqtt/http 等真实协议驱动 → 协议名自明,不加徽标。
+ *
+ * driver 形参放宽为 string:'mes-rest'/'s7-stub' 枚举由后端驱动目录并行加入
+ * DcwDriverKind,字面量比较在合入前后均类型安全(避免与未合入的联合类型比对报错)。
+ */
+export function dcwDriverBadgeKey(driver: string): 'dcwDetail.drvBadgeMes' | 'dcwDetail.drvBadgeNoConv' | null {
+  if (driver === 'mes-rest') return 'dcwDetail.drvBadgeMes'
+  if (driver === 'mock' || driver === 's7-stub') return 'dcwDetail.drvBadgeNoConv'
+  return null
+}

package/docs/cli.en.md

@@ -167,7 +167,7 @@ are never overwritten:
 - Precedence (the CLI, the web settings page and the dev/prod launch scripts all share one engine,
   `shared/config/engine.mjs`):
   `config.yml defaults < runtime-settings.json runtime overrides < environment variables / explicit CLI flags`.
-- There are **115 setting descriptors across 18 groups** (`aw config list` prints exactly 113 rows):
+- There are **116 setting descriptors across 18 groups** (`aw config list` prints exactly 113 rows):
 
 | Group | Count | Group | Count | Group | Count | Group | Count |
 |---|---|---|---|---|---|---|---|

package/i18n/locales/en.ts

@@ -300,6 +300,8 @@ export default {
         approvalGate: 'Dual approval for high-risk ops',
         allowRegistration: 'Open self-service registration',
         hstsEnabled: 'Send HSTS header',
+        recipeDispatchApproval: 'Human approval for recipe dispatch',
+        recipeDispatchApprovalDesc: 'When on, recipe_trial/recipe_apply suspend for a human decision before dispatch: approve = execute; deny (with guidance) = agent revises candidates and re-submits',
       },
       server: {
         host: 'Listen address',
@@ -1173,6 +1175,18 @@ export default {
     stepUnset: 'unset',
     recipeStepLimitLabel: 'Recipe per-step limit Δ≤',
     recipeStepLimitPlaceholder: 'Follow node default',
+    drvBadgeMes: 'MES edge',
+    drvBadgeNoConv: 'No protocol conversion',
+    mesTestBtn: 'Test read',
+    mesTesting: 'Reading…',
+    mesNotReady: 'Server endpoint not ready yet',
+    apTitle: 'Setpoint write approvals',
+    apRule: 'Approve = apply now; Reject = agent keeps the current value; Timeout = not approved',
+    apInitiator: 'by',
+    apTimeout: 'to timeout (defaults to reject)',
+    apApprove: 'Approve',
+    apReject: 'Reject',
+    apCommentPh: 'Rejection note (returned verbatim to the agent)',
   },
   teams: {
     selectChannel: 'Select a target channel',

package/i18n/locales/zh-CN.ts

@@ -300,6 +300,8 @@ export default {
         approvalGate: '高危操作双人复核',
         allowRegistration: '开放自助注册',
         hstsEnabled: '下发 HSTS 头',
+        recipeDispatchApproval: '配方下发人工审批',
+        recipeDispatchApprovalDesc: '开启后 recipe_trial/recipe_apply 下发前挂起等待人工裁决:批准=执行;拒绝可附指导,Agent 按指导修订后重新提交',
       },
       server: {
         host: '监听地址',
@@ -1173,6 +1175,18 @@ export default {
     stepUnset: '未配置',
     recipeStepLimitLabel: 'Recipe 单步上限 Δ≤',
     recipeStepLimitPlaceholder: '跟随节点默认',
+    drvBadgeMes: 'MES 边缘层',
+    drvBadgeNoConv: '无协议转换',
+    mesTestBtn: '试读',
+    mesTesting: '试读中…',
+    mesNotReady: '服务端未就绪',
+    apTitle: '下发参数审批',
+    apRule: '同意=立即执行;拒绝=Agent 按原值继续;超时=默认不同意',
+    apInitiator: '发起',
+    apTimeout: '后超时默认不同意',
+    apApprove: '同意',
+    apReject: '拒绝',
+    apCommentPh: '拒绝意见(逐字回流给 Agent)',
   },
   teams: {
     selectChannel: '选择目标 Channel',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentworkshop",
-  "version": "0.7.53",
+  "version": "0.7.54",
   "type": "module",
   "description": "AgentWorkShop \u8f6f\u4ef6\u5f00\u53d1\u7cfb\u7edf - \u57fa\u4e8e Nuxt 4 \u7684\u914d\u7f6e\u9a71\u52a8\u8fd0\u884c\u8303\u5f0f",
   "license": "PolyForm-Noncommercial-1.0.0",

package/scripts/_dbg-protocol-matrix.mjs

@@ -377,7 +377,14 @@ async function main() {
   check('6.3b', 'DCW OPC UA 回读=172.5±1', Number.isFinite(opc2) && Math.abs(opc2 - 172.5) <= 1, `read=${opc2}`)
 
   // 6.4 PLC Modbus 写(配方窗内)+ 真闭环 SP→PV 收敛
-  const wPlc = await api('POST', `/api/workshop/dcw/${plcSp.id}/write`, { body: { value: 182 }, token })
+  // 开跑下发配方参数也算一次在线写(60s 节流按节点计);撞锁时等待重试(治理按设计工作)
+  let wPlc = await api('POST', `/api/workshop/dcw/${plcSp.id}/write`, { body: { value: 182 }, token })
+  for (let i = 0; i < 70 && !(wPlc.code === 0 && wPlc.data?.outcome?.ok === true); i++) {
+    const m = String(wPlc.data?.message ?? wPlc.message ?? '').match((/还需 (\d+)s/))
+    if (!m || !/在线写入间隔/.test(String(wPlc.data?.message ?? wPlc.message ?? ''))) break
+    await sleep(Math.min(65, Number(m[1]) + 1) * 1000)
+    wPlc = await api('POST', `/api/workshop/dcw/${plcSp.id}/write`, { body: { value: 182 }, token })
+  }
   check("6.4a", "DCW Modbus 写 SP=182(配方窗内)", wPlc.code === 0 && wPlc.data?.outcome?.ok === true, JSON.stringify(wPlc.data ?? wPlc.message ?? {}).slice(0, 140))
   const wPlcBad = await api('POST', `/api/workshop/dcw/${plcSp.id}/write`, { body: { value: 195 }, token })
   check('6.4b', '配方窗联锁负例(195 越窗 → 400)', wPlcBad.status === 400, `status=${wPlcBad.status} msg=${String(wPlcBad.message ?? '').slice(0, 80)}`)

package/server/api/workshop/dcw/mes-test-read.post.ts

@@ -0,0 +1,24 @@
+/**
+ * POST /api/workshop/dcw/mes-test-read —— MES REST 映射试读(body: { driverConfig })。
+ * 供驱动表单调试 readMap:用户面鉴权 → 调 mes-rest 驱动 read 原语 →
+ * { ok, eng, ts, latencyMs, message }(ts 从驱动消息的 ts=<ISO> 约定中提取;latencyMs 为本次调用墙钟)。
+ */
+import { readBody } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { defineApiHandler } from '@/server/utils/response'
+import { mesRestDcwDriver } from '@/server/services/workshop/dcw/drivers/mes-rest'
+
+export default defineApiHandler(async (event) => {
+  resolveUser(event)
+  const body = await readBody<{
+    driverConfig?: Record<string, unknown>
+    domain?: { min?: number, max?: number }
+  }>(event) ?? {}
+  const domain = { min: Number(body.domain?.min ?? 0), max: Number(body.domain?.max ?? 100) }
+  const t0 = Date.now()
+  const r = await mesRestDcwDriver.read!({ domain, driverConfig: body.driverConfig ?? {} })
+  const latencyMs = Date.now() - t0
+  // 驱动 read 消息约定携带 ts=<ISO>;提取为结构化字段(缺省 null)
+  const ts = r.message.match(/ts=([^\s,)]+)/)?.[1] ?? null
+  return { ok: r.ok, eng: r.eng, ts, latencyMs, message: r.message }
+})

package/server/plugins/workshop.ts

@@ -55,6 +55,7 @@ import { recoverInterruptedJobs, shutdownOrchestrator } from '../services/worksh
 import { envStatus, startCreateVenv } from '../services/workshop/aml/env-manager'
 import { attachOmpPluginBridge } from '../services/workshop/agents/plugin-tools'
 import { startAmlRetentionTimer, stopAmlRetentionTimer } from '../services/workshop/aml/retention'
+import { configureMesDatasets, defaultDatasetsDir } from '../services/workshop/mes/mes-datasets'
 
 declare global {
 
@@ -149,6 +150,9 @@ export default function workshopPlugin(nitroApp: {
   recoverInterruptedJobs()
   startAmlRetentionTimer()
 
+  // MES 数据集服务(新表由 SCHEMA_SQL 启动建出;CSV 落 <configRoot>/datasets/<id>.csv)
+  configureMesDatasets(db, defaultDatasetsDir(dataDir))
+
   // 插件 omp 工具注册桥:启动即接管 pending 队列(此前首次 spawn omp agent 才挂桥,
   // 全新实例未 spawn 前 kb_agent/diag_run 等插件工具会一直"未知工具")
   attachOmpPluginBridge()

package/server/services/workshop/agents/host-tool-bridge/tools/industrial.ts

@@ -9,7 +9,7 @@
  * 该族**不依赖 workspace**,由 dispatch 在 workspace 门控之前分流(保持原分发顺序)。
  */
 import type { HostToolResult } from '../types'
-import { toolAmlDatasetBuild, toolAmlDatasetStats, toolAmlJobCancel, toolAmlJobLogs, toolAmlJobStatus, toolAmlJobSubmit, toolAmlLeaderboard, toolAmlModelFind, toolAmlModelPromote, toolAmlModelReference, toolAmlNodeCatalog, toolAmlTrainingPlanCreate, toolAmlTrainingPlanList, toolAmlTrainingPlanTrain, toolDaqFrames, toolDaqQuery, toolDcwControl, toolDcwJudge, toolDcwJournal, toolDcwRead, toolDcwRollback, toolLineContext, toolMyIndustrialNodes, toolOpsLog, toolParamControl, toolParamRead, toolRecipeApply, toolRecipeLog, toolRecipeRollback, toolRecipeTrial, toolRecipeUpdate, toolRecipeVersions, toolOptimizationExplore, toolTwinProviderCatalog, toolTwinSceneDiscover, toolTwinSceneCompile, toolTwinSceneFreeze, toolTwinSceneRead, toolTwinPhysicsSpecDraft, toolTwinPhysicsSpecValidate, toolTwinPhysicsSpecCompile, toolTwinSnapshotCreate, toolTwinTrialRun, toolMpcOptimize, toolTwinGateEvaluate, toolTwinBayesOptimize, toolTwinCalibrationRequest } from '../../industrial'
+import { toolAmlDatasetBuild, toolAmlDatasetStats, toolAmlJobCancel, toolAmlJobLogs, toolAmlJobStatus, toolAmlJobSubmit, toolAmlLeaderboard, toolAmlModelFind, toolAmlModelPromote, toolAmlModelReference, toolAmlNodeCatalog, toolAmlTrainingPlanCreate, toolAmlTrainingPlanList, toolAmlTrainingPlanTrain, toolDaqFrames, toolDaqQuery, toolDcwControl, toolDcwJudge, toolDcwJournal, toolDcwRead, toolDcwRollback, toolLineContext, toolMesCatalog, toolMesDatasetRead, toolMesDatasets, toolMesFetch, toolMyIndustrialNodes, toolOpsLog, toolParamControl, toolParamRead, toolRecipeApply, toolRecipeLog, toolRecipeRollback, toolRecipeTrial, toolRecipeUpdate, toolRecipeVersions, toolOptimizationExplore, toolTwinProviderCatalog, toolTwinSceneDiscover, toolTwinSceneCompile, toolTwinSceneFreeze, toolTwinSceneRead, toolTwinPhysicsSpecDraft, toolTwinPhysicsSpecValidate, toolTwinPhysicsSpecCompile, toolTwinSnapshotCreate, toolTwinTrialRun, toolMpcOptimize, toolTwinGateEvaluate, toolTwinBayesOptimize, toolTwinCalibrationRequest } from '../../industrial'
 
 type IndustrialToolHandler = (agentId: string, args: Record<string, unknown>, channelId?: string) => Promise<HostToolResult>
 
@@ -59,9 +59,13 @@ const INDUSTRIAL_HANDLERS = new Map<string, IndustrialToolHandler>([
   ['line_context', (agentId, args) => toolLineContext(agentId, args as { line_id?: string })],
   ['recipe_versions', (agentId, args) => toolRecipeVersions(agentId, args as { recipe_id?: string, limit?: number | string })],
   ['recipe_update', (agentId, args) => toolRecipeUpdate(agentId, args as Parameters<typeof toolRecipeUpdate>[1])],
-  ['recipe_rollback', (agentId, args) => toolRecipeRollback(agentId, args as Parameters<typeof toolRecipeRollback>[1])],
-  ['recipe_trial', (agentId, args) => toolRecipeTrial(agentId, args as Parameters<typeof toolRecipeTrial>[1])],
+  ['recipe_rollback', (agentId, args) => toolRecipeRollback(agentId, args as Parameters<typeof toolRecipeRollback>[1])],
+  ['recipe_trial', (agentId, args) => toolRecipeTrial(agentId, args as Parameters<typeof toolRecipeTrial>[1])],
   ['recipe_apply', (agentId, args) => toolRecipeApply(agentId, args as Parameters<typeof toolRecipeApply>[1])],
+  ['mes_catalog', (agentId, args) => toolMesCatalog(agentId, args as Parameters<typeof toolMesCatalog>[1])],
+  ['mes_fetch', (agentId, args) => toolMesFetch(agentId, args as Parameters<typeof toolMesFetch>[1])],
+  ['mes_dataset_read', (agentId, args) => toolMesDatasetRead(agentId, args as Parameters<typeof toolMesDatasetRead>[1])],
+  ['mes_datasets', (agentId, args) => toolMesDatasets(agentId, args as Parameters<typeof toolMesDatasets>[1])],
 ])
 
 /** 工业工具名集合(与 INDUSTRIAL_HANDLERS 同源;dispatch 据此在 workspace 门控前分流) */

package/server/services/workshop/agents/industrial/index.ts

@@ -12,12 +12,14 @@
  *   ops-tools.ts           运维日志与配方变更史(ops_log / recipe_* / line_context)
  *   aml-dataset-tools.ts   AML 数据集与节点目录(aml_node_catalog / aml_dataset_*)
  *   aml-job-tools.ts       AML 作业与模型(aml_job_* / aml_leaderboard / aml_model_*)
+ *   mes-tools.ts           MES 数据集面(mes_catalog / mes_fetch / mes_dataset_read / mes_datasets)
  */
 export { toolMyIndustrialNodes, toolDcwControl, toolDcwRead } from './dcw-tools'
 export { toolParamControl, toolParamRead } from './param-tools'
 export { toolDaqQuery, toolDaqFrames } from './daq-tools'
 export { toolDcwJudge, toolDcwRollback, toolDcwJournal } from './dcw-judge-tools'
 export { toolOpsLog, toolRecipeLog, toolLineContext, toolRecipeVersions, toolRecipeUpdate, toolRecipeRollback, toolRecipeTrial, toolRecipeApply } from './ops-tools'
+export { toolMesCatalog, toolMesFetch, toolMesDatasetRead, toolMesDatasets } from './mes-tools'
 export { toolAmlNodeCatalog, toolAmlDatasetBuild, toolAmlDatasetStats } from './aml-dataset-tools'
 export { toolAmlJobSubmit, toolAmlJobStatus, toolAmlJobLogs, toolAmlJobCancel, toolAmlLeaderboard, toolAmlModelFind, toolAmlModelPromote, toolAmlModelReference, toolAmlTrainingPlanList, toolAmlTrainingPlanTrain, toolAmlTrainingPlanCreate } from './aml-job-tools'
 

package/server/services/workshop/agents/industrial/mes-tools.ts

@@ -0,0 +1,135 @@
+/**
+ * MES 数据集工具族(mes_catalog / mes_fetch / mes_dataset_read / mes_datasets)。
+ *
+ * 面向 Agent 的 MES REST 点位只读面:目录检索、历史取数(护栏在 mes-controller 代码级)、
+ * CSV 数据集读取与清单。铁律:MES 行级原文不进 prompt —— 所有回包只给统计摘要 + ≤3 行采样;
+ * 全量原文只落 <configRoot>/datasets/<id>.csv(见 services/workshop/mes/mes-datasets.ts)。
+ * 权限:fetch 按 dcw 绑线过滤(controller 内代码级);数据集读取/清单按
+ * 创建者 ∪ 节点绑定 ∪ 可读产线(agentOpsScope 既有路径)过滤。
+ */
+import type { MesDatasetRow, MesDatasetRead } from '../../mes/mes-datasets'
+import { getMesDatasets } from '../../mes/mes-datasets'
+import { createMesController } from '../../mes/mes-controller'
+import { agentOpsScope } from './ops-tools'
+import { AppError } from '../../../../utils/errors'
+
+/** 控制器单例(护栏依赖真实服务;无状态可安全复用) */
+let controller: ReturnType<typeof createMesController> | null = null
+function mesController(): ReturnType<typeof createMesController> {
+  controller ??= createMesController()
+  return controller
+}
+
+/** 数据集可见性:创建者 ∪ 节点绑定 ∪ 可读产线(节点授权线 ∪ 频道绑定线) */
+function mesDatasetVisible(agentId: string, ds: MesDatasetRow): boolean {
+  if (ds.createdBy === agentId) return true
+  const scope = agentOpsScope(agentId)
+  if (!scope) return false
+  if (scope.nodeIds.has(ds.nodeId)) return true
+  return !!ds.lineId && (scope.lineIds.includes(ds.lineId) || scope.boundLineIds.includes(ds.lineId))
+}
+
+/** 数据集行 → 一行摘要(id | 节点 | 窗口 | 行数 | 状态) */
+function dsLine(ds: MesDatasetRow): string {
+  const win = ds.fromTs && ds.toTs ? `${ds.fromTs.slice(5, 16).replace('T', ' ')} ~ ${ds.toTs.slice(5, 16).replace('T', ' ')}` : '当前值'
+  let state: string
+  if (ds.status === 'ready') state = `就绪(${ds.rows} 行,sha256 ${ds.sha256.slice(0, 8)})`
+  else if (ds.status === 'running') state = '取数中'
+  else state = `失败(${ds.error.slice(0, 80)})`
+  return `- ${ds.id} | ${ds.nodeName || ds.nodeId} | ${win} | ${state}`
+}
+
+/** 工具:mes_catalog —— MES REST 点位目录(数据驱动;q 子串/产线过滤;只读,无授权门槛)。
+ *  每条含 id/单位/量程/读写/历史能力位,是 mes_fetch 与 mes_dataset_read 的寻址入口。 */
+export async function toolMesCatalog(_agentId: string, args: { q?: string, line_id?: string, limit?: number | string } = {}): Promise<{ text: string, isError?: boolean }> {
+  try {
+    const r = await mesController().catalog(args)
+    return { text: r.text }
+  }
+  catch (err) {
+    return { text: `MES 点位目录查询失败:${err instanceof Error ? err.message : String(err)}(服务未就绪时请稍后重试)。`, isError: true }
+  }
+}
+
+/** 工具:mes_fetch —— MES 历史取数(护栏代码级:绑线授权/窗口≤7天/行数≤5000/每分钟≤6次)。
+ *  三模式:无 from/to=当前值快照;小窗口内联统计;大请求异步落 CSV 数据集(回 job_id/dataset_id,
+ *  勿轮询,用 mes_datasets 查状态)。回包只含统计摘要 + ≤3 行采样,MES 原文不进对话。 */
+export async function toolMesFetch(agentId: string, args: { ids?: unknown, from?: string, to?: string, max_rows?: number | string } = {}): Promise<{ text: string, isError?: boolean }> {
+  try {
+    const r = await mesController().fetch(agentId, args)
+    return { text: r.text, isError: r.isError }
+  }
+  catch (err) {
+    return { text: `MES 取数失败:${err instanceof Error ? err.message : String(err)}(驱动离线或点位配置缺失时常见;可先用 mes_catalog 确认点位)。`, isError: true }
+  }
+}
+
+/** 工具:mes_dataset_read —— 读 CSV 数据集(head=列名+总行数 / stats=统计 / rows=分页)。
+ *  权限:创建者或有该节点/产线可见权;回包同样只带 ≤3 行采样(原文不进 prompt)。 */
+export async function toolMesDatasetRead(agentId: string, args: { dataset_id?: string, mode?: string, offset?: number | string } = {}): Promise<{ text: string, isError?: boolean }> {
+  const datasetId = String(args.dataset_id ?? '').trim()
+  if (!datasetId) return { text: 'dataset_id 必填(mes_fetch 异步回包或 mes_datasets 清单里的 id)。', isError: true }
+  const modeArg = String(args.mode ?? 'head').trim()
+  const mode = modeArg === 'stats' || modeArg === 'rows' ? modeArg : 'head'
+  try {
+    const store = getMesDatasets()
+    const meta = store.datasetMeta(datasetId)
+    if (!meta) return { text: `数据集 ${datasetId} 不存在(用 mes_datasets 列出你可读的数据集)。`, isError: true }
+    if (!mesDatasetVisible(agentId, meta)) {
+      return { text: `无权读取数据集 ${datasetId}(仅创建者、该节点绑定者或该产线可读者可读)。`, isError: true }
+    }
+    const r: MesDatasetRead = store.readDataset(datasetId, mode, Number(args.offset) || 0)
+    const stateTxt = meta.status === 'ready' ? '' : meta.status === 'running' ? '\n注意:数据集仍在取数中,当前为已写入部分。' : `\n注意:取数已失败:${meta.error.slice(0, 120)}(以下为失败前已写入部分)。`
+    if (r.mode === 'stats') {
+      const s = r.stats
+      const f4 = (v: number | null | undefined): string => v == null || !Number.isFinite(v) ? '-' : String(Number(v.toFixed(4)))
+      return {
+        text: `数据集 ${datasetId} 统计(${meta.nodeName || meta.nodeId},产线 ${meta.lineId || '未分配'}):\n`
+          + `  数值行数 ${s.count} | 首 ${s.firstTs ?? '-'} ~ 末 ${s.lastTs ?? '-'}\n`
+          + `  min ${f4(s.min)} / max ${f4(s.max)} / mean ${f4(s.mean)} / stddev ${f4(s.stddev)}\n`
+          + `  文件 sha256 ${meta.sha256.slice(0, 16)}${stateTxt}`,
+      }
+    }
+    // head / rows:列名+行数+分页游标,采样 ≤3 行(原文不进 prompt)
+    let headTxt: string
+    let totalRows: number
+    let sample: string[]
+    if (r.mode === 'head') {
+      headTxt = `数据集 ${datasetId} 概览(${meta.nodeName || meta.nodeId},产线 ${meta.lineId || '未分配'}):\n  列名: ${r.head.columns.join(', ')}\n  总行数: ${r.head.totalRows}\n`
+      totalRows = r.head.totalRows
+      sample = r.head.preview.slice(0, 3).map(row => row.join(','))
+    }
+    else {
+      headTxt = `数据集 ${datasetId} 第 ${r.rowsView.offset} 行起的分页(每页 20 行,共 ${r.rowsView.total} 行;本页 ${r.rowsView.rows.length} 行):\n`
+      totalRows = r.rowsView.total
+      sample = r.rowsView.rows.slice(0, 3).map(row => row.join(','))
+    }
+    return {
+      text: `${headTxt}采样(≤3 行,ts,value): ${sample.join(' | ') || '(空)'}${totalRows > 3 ? '(其余行不进对话;统计用 mode=stats,分页翻看用 offset)' : ''}${stateTxt}`,
+    }
+  }
+  catch (err) {
+    if (err instanceof AppError && err.status === 404) return { text: err.message, isError: true }
+    return { text: `数据集读取失败:${err instanceof Error ? err.message : String(err)}`, isError: true }
+  }
+}
+
+/** 工具:mes_datasets —— 你可见的 CSV 数据集清单(新→旧;创建者/节点绑定/产线可读过滤)。
+ *  用于找回 mes_fetch 异步作业的 dataset_id 与确认取数状态(替代轮询 job)。 */
+export async function toolMesDatasets(agentId: string, args: { limit?: number | string } = {}): Promise<{ text: string, isError?: boolean }> {
+  try {
+    const store = getMesDatasets()
+    const limit = Math.min(Math.max(Math.round(Number(args.limit)) || 20, 1), 100)
+    const visible = store.listDatasets(100).filter(ds => mesDatasetVisible(agentId, ds)).slice(0, limit)
+    if (visible.length === 0) {
+      return { text: '你还没有可见的 MES 数据集。用 mes_fetch(带 from/to 与较大 max_rows)创建;或刚创建的作业尚未登记(稍后再查)。' }
+    }
+    const running = visible.filter(ds => ds.status === 'running').length
+    return {
+      text: `MES 数据集清单(可见 ${visible.length} 条,新→旧${running > 0 ? `;其中 ${running} 条取数中 —— 勿轮询,未完成先做别的` : ''}):\n${visible.map(dsLine).join('\n')}\n\n说明:读统计用 mes_dataset_read(dataset_id, mode=stats);读分页/概览用 mode=head|rows。`,
+    }
+  }
+  catch (err) {
+    return { text: `数据集清单查询失败:${err instanceof Error ? err.message : String(err)}(服务未就绪时请稍后重试)。`, isError: true }
+  }
+}

package/server/services/workshop/agents/industrial/ops-tools.ts

@@ -11,6 +11,7 @@ import { getDcwLineRepo } from '../../dcw/dcw-line.repo'
 import { getDcwProductRepo } from '../../dcw/dcw-product.repo'
 import { getDcwRecipeRepo } from '../../dcw/dcw-recipe.repo'
 import { getOps } from '../../ops/ops'
+import { settingOf } from '../../settings'
 import { fanoutQuery, windowOf } from './audit-query'
 
 // ================================================================
@@ -324,12 +325,18 @@ export async function toolRecipeUpdate(agentId: string, args: {
     })
     .map((p) => {
       const patch = list.find(x => String(x.node_id).trim() === p.nodeId)
-      if (!patch) return { nodeId: p.nodeId, templateRef: p.templateRef, value: p.value, min: p.min, max: p.max }
-      const out: { nodeId: string, templateRef?: string, value: number, min?: number, max?: number } = { nodeId: p.nodeId, templateRef: p.templateRef, value: Number(patch.value) }
+      // stepLimit 必须随行携带:丢了会被 normParams 视为"参数有变化"(同值也空转增版),
+      // 且配方层单步限幅被静默抹掉(退化为参数/节点层默认)——治理数据完整性
+      const out: { nodeId: string, templateRef?: string, value: number, min?: number, max?: number, stepLimit?: number } = {
+        nodeId: p.nodeId,
+        templateRef: p.templateRef,
+        value: patch ? Number(patch.value) : p.value,
+      }
       if (p.min != null) out.min = p.min
-      if (patch.min != null && Number.isFinite(Number(patch.min))) out.min = Number(patch.min)
+      if (patch?.min != null && Number.isFinite(Number(patch.min))) out.min = Number(patch.min)
       if (p.max != null) out.max = p.max
-      if (patch.max != null && Number.isFinite(Number(patch.max))) out.max = Number(patch.max)
+      if (patch?.max != null && Number.isFinite(Number(patch.max))) out.max = Number(patch.max)
+      if (p.stepLimit != null) out.stepLimit = p.stepLimit
       return out
     })
   const extra = list.filter(p => !recipe.params.some(x => x.nodeId === String(p.node_id).trim()))
@@ -385,7 +392,7 @@ export async function toolRecipeRollback(agentId: string, args: {
   }
   try {
     if (dispatch) {
-      const { recipe: updated, run } = await getDcwController().rollbackRecipeAndDispatch(recipeId, {
+      const { recipe: updated, run, definitionNoop } = await getDcwController().rollbackRecipeAndDispatch(recipeId, {
         version: toLastGood ? undefined : version,
         toLastGood,
         by: 'agent',
@@ -394,8 +401,11 @@ export async function toolRecipeRollback(agentId: string, args: {
         description: reason,
       })
       const okN = run.results.filter(r => r.ok).length
+      const defNote = definitionNoop
+        ? `定义已在目标版本 v${updated.version ?? 1}(未生成新版本)`
+        : `已生成 v${updated.version ?? 1}`
       return {
-        text: `统一回退完成:配方「${updated.name}」已生成 v${updated.version ?? 1},参数恢复为目标版本(${toLastGood ? '已知良好批次冻结' : `v${version}`}),并已整批重下发到 PLC(${okN}/${run.results.length} 参数成功);原因:${reason}。\n用 daq_query 复测确认恢复效果;版本史用 recipe_versions 复核。`,
+        text: `统一回退完成:配方「${updated.name}」${defNote},参数恢复为目标版本(${toLastGood ? '已知良好批次冻结' : `v${version}`}),并已整批重下发到 PLC(${okN}/${run.results.length} 参数成功);原因:${reason}。\n用 daq_query 复测确认恢复效果;版本史用 recipe_versions 复核。`,
       }
     }
     const updated = getDcwController().revertRecipe(recipeId, {
@@ -416,6 +426,20 @@ export async function toolRecipeRollback(agentId: string, args: {
   }
 }
 
+/**
+ * v19.5 HITL 下发裁决门:security.recipeDispatchApproval 开启时,配方下发动作
+ * 不直接执行 —— 挂起等待人工裁决(复用 ToolApprovalService,人类批/拒理由原样回流):
+ *   批准       → 按原逻辑执行下发,回执附人工附言;
+ *   拒绝(可附指导)→ 工具回包携带人工指导文本,Agent 按指导修订候选后重新提交 ——
+ *   即"改好配方交给人类判断是否下发;不下发则人告诉 Agent 怎么修"的真实作业语义。
+ * 超时(默认 180s,security.hitl_timeout_ms)自动按拒绝收敛。
+ */
+async function hitlDispatchGate(agentId: string, detail: string, title: string): Promise<{ approved: boolean, comment: string }> {
+  const { getToolApprovals } = await import('../tool-approvals')
+  const decision = await getToolApprovals().request(agentId, 'recipe-dispatch', 'dcw', detail, { title })
+  return { approved: decision.approved, comment: decision.comment }
+}
+
 /** 工具:recipe_trial —— 多参数候选整批试验下发(v19 配方链路核心)。
  *  候选值只覆盖列出节点(**必须是自己绑定的数控节点**);整批一次落产线,**不写配方版本** ——
  *  复测判读:有进步/达标 → recipe_update 固化(同 id 版本+1);劣化 → recipe_rollback(dispatch=true) 统一回退。
@@ -445,6 +469,26 @@ export async function toolRecipeTrial(agentId: string, args: {
     }
   }
   try {
+    // v19.5 HITL 门:开启人工审批时,整批试验前先挂起等人工裁决(拒绝附指导 → 回给 Agent 修订)
+    let hitlNote = ''
+    if (settingOf('security.recipeDispatchApproval') === true) {
+      const gate = await hitlDispatchGate(
+        agentId,
+        `配方试验候选(整批 ${list.length} 参数):${list.map((p) => {
+          const node = getDcwController().byId(p.nodeId)
+          const old = recipe.params.find(x => x.nodeId === p.nodeId)?.value
+          return `${node?.name ?? p.nodeId} ${old ?? '?'}→${p.value}${node?.unit ?? ''}`
+        }).join(';')} | 假设:${hypothesis} | 批准=整批下发试验(不写版本);拒绝可附指导`,
+        '配方试验(整批候选)下发审批',
+      )
+      if (!gate.approved) {
+        return {
+          text: `人工未批准本次试验下发。人工指导:${gate.comment || '(无附言,仅不同意候选)'}。请按人工指导修订候选参数(必要时先 recipe_update 调整基线),然后重新提交 recipe_trial。`,
+        }
+      }
+      // 人工附言随批准回执回流(Agent 与审计都能看到放行时人的原话)
+      if (gate.comment) hitlNote = `\n人工附言:${gate.comment}`
+    }
     const run = await getDcwController().applyRecipe(recipeId, { overrides: list, trial: true })
     const okN = run.results.filter(r => r.ok).length
     // 批次级留痕:试验动作入审计(逐参数写已有 write-audit;这里是"一次试验"粒度)
@@ -463,7 +507,7 @@ export async function toolRecipeTrial(agentId: string, args: {
       return `${node?.name ?? r.templateRef}→${r.value}${node?.unit ?? ''}${r.ok ? '' : ` 被拒${reason}`}`
     }).join(';')
     return {
-      text: `试验已整批下发(${okN}/${run.results.length} 成功,批次 ${run.id.slice(0, 8)}):${changed}。假设:${hypothesis}。注意:本次试验**未写入配方版本** —— 等待工艺惯性后 daq_query 复测判读:有进步/达标 → recipe_update 把候选值固化进配方(同 id 版本+1);无进步/劣化 → recipe_rollback(recipe_id, dispatch=true, reason=…) 统一回退(定义回退+PLC 整批恢复)。`,
+      text: `试验已整批下发(${okN}/${run.results.length} 成功,批次 ${run.id.slice(0, 8)}):${changed}。假设:${hypothesis}。${hitlNote}注意:本次试验**未写入配方版本** —— 等待工艺惯性后 daq_query 复测判读:有进步/达标 → recipe_update 把候选值固化进配方(同 id 版本+1);无进步/劣化 → recipe_rollback(recipe_id, dispatch=true, reason=…) 统一回退(定义回退+PLC 整批恢复)。`,
     }
   }
   catch (err) {
@@ -491,8 +535,35 @@ export async function toolRecipeApply(agentId: string, args: {
     return { text: `无权下发配方 ${recipeId}(需持有该配方至少一个数控节点的授权;找 lead 用 team_grant_nodes 授予)。`, isError: true }
   }
   try {
+    // v19.5 HITL 门:开启人工审批时,正式下发前先挂起等人工裁决(拒绝附指导 → 回给 Agent 修订)
+    let hitlNote = ''
+    if (settingOf('security.recipeDispatchApproval') === true) {
+      const gate = await hitlDispatchGate(
+        agentId,
+        `配方正式下发:「${recipe.name}」v${recipe.version ?? 1} 全参数整批(${recipe.params.length} 项):${recipe.params.map((p) => {
+          const node = getDcwController().byId(p.nodeId)
+          return `${node?.name ?? p.nodeId}=${p.value}${node?.unit ?? ''}`
+        }).join(';')} | 批准=整批下发到 PLC;拒绝可附指导`,
+        '配方下发审批',
+      )
+      if (!gate.approved) {
+        return {
+          text: `人工未批准本次配方下发。人工指导:${gate.comment || '(无附言)'}。请按人工指导修订配方(recipe_update)后重新提交 recipe_apply。`,
+        }
+      }
+      // 人工附言随批准回执回流(与 recipe_trial 同口径)
+      if (gate.comment) hitlNote = `\n人工附言:${gate.comment}`
+    }
     const run = await getDcwController().applyRecipe(recipeId)
     const okN = run.results.filter(r => r.ok).length
+    // 逐参数标注:被跳过/失败的参数(节点停用/已删除/限界拒绝)必须透出给 Agent,
+    // 否则回包只见 N/N 成功数,无法定位哪些参数未生效(与 recipe_trial 的逐参数渲染同口径)。
+    const skipped = run.results.filter(r => !r.ok)
+      .map((r) => {
+        const node = r.nodeId ? getDcwController().byId(r.nodeId) : undefined
+        return `${node?.name ?? r.templateRef ?? r.nodeId ?? '?'}: ${String(r.message).slice(0, 80)}`
+      })
+    const skippedNote = skipped.length > 0 ? `\n未生效参数(${skipped.length}):\n  - ${skipped.join('\n  - ')}` : ''
     try {
       const { recordOps } = await import('../../ops/ops')
       recordOps({
@@ -503,7 +574,7 @@ export async function toolRecipeApply(agentId: string, args: {
     }
     catch { /* 审计失败不影响下发结果 */ }
     return {
-      text: `配方「${recipe.name}」v${recipe.version ?? 1} 已整批下发(${okN}/${run.results.length} 参数成功,批次 ${run.id.slice(0, 8)})。用 daq_query 复测确认工艺响应。`,
+      text: `配方「${recipe.name}」v${recipe.version ?? 1} 已整批下发(${okN}/${run.results.length} 参数成功,批次 ${run.id.slice(0, 8)})。${skippedNote}${hitlNote}用 daq_query 复测确认工艺响应。`,
     }
   }
   catch (err) {