agentworkshop 0.7.66 → 0.7.71

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

@@ -12,15 +12,15 @@
  *   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)
+ *   mes-tools.ts           MES 数据集面(mes_catalog / mes_fetch / mes_export / mes_dataset_read / mes_datasets)
  */
 export { toolMyIndustrialNodes, toolDcwControl } from './dcw-tools'
 export { toolParamControl } from './param-tools'
 export { toolDaqQuery, toolDaqFrames } from './daq-tools'
 export { toolDaqExport } from './daq-export'
 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 { toolOpsLog, toolRecipeLog, toolRecipeCatalog, toolRecipeCreate, toolLineContext, toolRecipeVersions, toolRecipeUpdate, toolRecipeRollback, toolRecipeTrial, toolRecipeApply } from './ops-tools'
+export { toolMesCatalog, toolMesFetch, toolMesExport, 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/line-tools.ts

@@ -8,7 +8,6 @@
  *   - line_status:只读,lead/worker 均可(复用工业工具的 grant 复核,channel 线 ≥readonly)。
  * 理由强制:reason 必填(启停理由入审计与审批卡,人要看懂为什么启停)。
  */
-import { getWorkshopManager } from '@/server/plugins/workshop'
 import { getToolApprovals } from '../tool-approvals'
 import { agentBadgeLabel } from '../agent-badge'
 import { getDcwController } from '../../dcw/dcw-controller'
@@ -20,10 +19,16 @@ export interface LineStartInput { recipe_id?: string, reason?: string }
 export interface LineStopInput { reason?: string }
 export interface LineStatusInput { line_id?: string }
 
+/** 懒加载 manager:静态 import plugins/workshop 会拖入 Nitro #imports,使本模块无法被单测/脚本直接加载 */
+async function workshopManager() {
+  const { getWorkshopManager } = await import('@/server/plugins/workshop')
+  return getWorkshopManager()
+}
+
 /** 解析「频道 lead + 绑线」上下文;line_start/line_stop 共用 */
 async function requireBoundLineLead(agentId: string, channelId: string | undefined): Promise<{ lineId: string, lineName: string } | { error: string }> {
   if (!channelId) return { error: 'line_start/line_stop 仅限频道内使用(缺频道上下文)。' }
-  const manager = getWorkshopManager()
+  const manager = await workshopManager()
   const ch = manager.deps.repos.channels.findById(channelId)
   if (!ch) return { error: `频道不存在: ${channelId}` }
   if (ch.leadAgentId !== agentId) return { error: '产线启停仅限频道 lead 操作(你是 worker;如需启停请向 lead 提出)。' }
@@ -49,6 +54,10 @@ export async function toolLineStart(agentId: string, args: LineStartInput, chann
   const recipe = ctrl.listRecipes().find(r => r.id === recipeId)
   if (!recipe) return { text: `配方 ${recipeId} 不存在。`, isError: true }
   if (recipe.lineId !== lineId) return { text: `配方「${recipe.name}」不属于本频道绑定的产线「${lineName}」,不能用于开线。`, isError: true }
+  if (recipe.params.length === 0) return { text: `配方「${recipe.name}」没有工艺参数,不能开线。请先在配方中保存可下发参数。`, isError: true }
+  // 审批快照:人工批准的是「这个版本 + 这组参数」;审批期间配方被改必须重新申请
+  const approvedVersion = recipe.version ?? 1
+  const approvedParams = JSON.stringify(recipe.params.map(p => ({ nodeId: p.nodeId, value: p.value })))
   if (ctrl.lineState(lineId).active) {
     const cur = ctrl.lineState(lineId)
     return { text: `产线「${lineName}」已在运行(批次 ${cur.runId},配方 ${cur.recipeName});重复开线被拒。如需换配方,先 line_stop 再开。`, isError: true }
@@ -63,7 +72,7 @@ export async function toolLineStart(agentId: string, args: LineStartInput, chann
         const node = ctrl.byId(p.nodeId)
         return `${node?.name ?? p.nodeId}=${p.value}${node?.unit ?? ''}`
       }).join(';')})。理由:${reason} | 批准=开线并下发配方;拒绝可附指导。`,
-      { title: `产线开跑:${lineName}`, payload: { schemaVersion: 1, kind: 'line-start', lineId, recipeId, reason } },
+      { title: `产线开跑:${lineName}`, payload: { schemaVersion: 1, kind: 'line-start', lineId, recipeId, recipeVersion: approvedVersion, reason } },
     )
   }
   catch (err) {
@@ -72,20 +81,126 @@ export async function toolLineStart(agentId: string, args: LineStartInput, chann
   if (!decision.approved) {
     return { text: `开线未获批准(超时未批或人工拒绝),产线未做任何变更。人工意见:${decision.comment || '(无附言)'}` }
   }
+  // 审批期间频道绑线/成员角色/配方归属都可能变化:批准不等于授权仍有效
+  const again = await requireBoundLineLead(agentId, channelId)
+  if ('error' in again) return { text: `审批通过后复核失败,本次未开线:${again.error}`, isError: true }
+  if (again.lineId !== lineId) {
+    return { text: `审批通过后复核失败:频道绑定产线已从「${lineName}」变更为「${again.lineId}」,本次未开线。请重新提交开线申请。`, isError: true }
+  }
+  const recipeNow = ctrl.listRecipes().find(r => r.id === recipeId)
+  if (!recipeNow || recipeNow.lineId !== lineId) {
+    return { text: `审批通过后复核失败:配方「${recipe.name}」已删除或不再属于产线「${lineName}」,本次未开线。`, isError: true }
+  }
+  const versionNow = recipeNow.version ?? 1
+  const paramsNow = JSON.stringify(recipeNow.params.map(p => ({ nodeId: p.nodeId, value: p.value })))
+  if (versionNow !== approvedVersion || paramsNow !== approvedParams) {
+    return {
+      text: `审批通过后复核失败:配方「${recipe.name}」在审批期间已变更(批准 v${approvedVersion},当前 v${versionNow};参数${paramsNow === approvedParams ? '一致' : '已变更'}),本次未开线。请按当前配方重新提交开线申请。`,
+      isError: true,
+    }
+  }
+  if (ctrl.lineState(lineId).active) {
+    return { text: `审批通过后复核失败:产线「${lineName}」已在运行(批次 ${ctrl.lineState(lineId).runId}),本次未重复开线。`, isError: true }
+  }
   try {
     const run = await ctrl.lineStart(lineId, recipeId)
+    const results = run.results ?? []
+    const failed = results.filter(r => !r.ok)
+    const unverified = results.filter(r => r.ok && r.verify?.verdict !== 'verified' && r.ack !== 'readback-verified')
+    const detailOf = (r: typeof results[number]): string => {
+      const node = r.nodeId ? ctrl.byId(r.nodeId) : undefined
+      return `${node?.name ?? r.templateRef ?? r.nodeId ?? '?'}: ${String(r.message).slice(0, 100)}`
+    }
+    // 写参期间人工可能停线并重开:本批次不再活动时,不能把本次结果报成「当前已开跑」
+    const activeAfter = ctrl.lineState(lineId)
+    if (!activeAfter.active || activeAfter.runId !== run.id) {
+      try {
+        recordOps({
+          actor: agentId, actorName: agentBadgeLabel(agentId), actorKind: 'agent',
+          action: 'line.start', kind: 'line', targetKind: 'line', targetId: lineId, lineId,
+          recipeId: recipe.id,
+          productId: run.productId ?? '',
+          level: 'error',
+          summary: `Agent 开线结果失效:批次 ${run.id.slice(0, 8)} 在写参期间被替代/停止(当前批次 ${activeAfter.runId ?? '无'});未报成功`,
+        })
+      }
+      catch { /* 审计失败不改变拒绝语义 */ }
+      return {
+        text: `开线执行期间产线批次已变更(本次批次 ${run.id.slice(0, 8)},当前批次 ${activeAfter.runId ?? '无'}),本次结果不能代表当前运行状态。请用 line_status/daq_query 复核实际工况;如需重开请重新提交申请。`,
+        isError: true,
+      }
+    }
+    // 全部参数失败 = 线已开但 PLC 未按配方生效:自动停线收窗,避免空跑采样与误判。
+    // 只停「本次刚开的批次」:写参数期间人工可能已停线并重开,不能误停新批次。
+    if (results.length > 0 && failed.length === results.length) {
+      const activeNow = ctrl.lineState(lineId)
+      let stopped = false
+      let stopNote = ''
+      if (activeNow.active && activeNow.runId === run.id) {
+        try {
+          ctrl.lineStop(lineId)
+          stopped = true
+        }
+        catch { /* 已停/停线失败在文案中如实说明 */ }
+      }
+      else {
+        stopNote = `本批次已被替代或已停止(当前批次 ${activeNow.runId ?? '无'}),未执行自动停线`
+      }
+      try {
+        recordOps({
+          actor: agentId, actorName: agentBadgeLabel(agentId), actorKind: 'agent',
+          action: 'line.start', kind: 'line', targetKind: 'line', targetId: lineId, lineId,
+          recipeId: recipe.id,
+          productId: run.productId ?? '',
+          level: 'error',
+          summary: `Agent 开线失败:「${lineName}」配方「${recipe.name}」全部 ${results.length} 个参数未下发成功(批次 ${run.id.slice(0, 8)});${stopNote || (stopped ? '已自动停线' : '自动停线未成功')};理由:${reason}`,
+        })
+        if (stopped) {
+          recordOps({
+            actor: agentId, actorName: agentBadgeLabel(agentId), actorKind: 'agent',
+            action: 'line.stop', kind: 'line', targetKind: 'line', targetId: lineId, lineId,
+            recipeId: recipe.id,
+            level: 'warn',
+            summary: `Agent 自动停线:批次 ${run.id.slice(0, 8)} 收窗(开线后全部参数下发失败)`,
+          })
+        }
+      }
+      catch { /* 审计失败不改变拒绝语义 */ }
+      return {
+        text: `开线失败:配方「${recipe.name}」全部 ${results.length} 个参数均未下发成功。${stopped ? '已自动停线收窗,产线未保持运行状态。' : stopNote || '自动停线未成功,请立即人工检查并停止产线。'}\n失败明细:\n  - ${failed.map(detailOf).join('\n  - ')}`,
+        isError: true,
+      }
+    }
     try {
       recordOps({
         actor: agentId, actorName: agentBadgeLabel(agentId), actorKind: 'agent',
         action: 'line.start', kind: 'line', targetKind: 'line', targetId: lineId, lineId,
-        summary: `Agent 开线:「${lineName}」以配方「${recipe.name}」开跑(批次 ${run.id.slice(0, 8)});理由:${reason}`,
+        recipeId: recipe.id,
+        productId: run.productId ?? '',
+        summary: `Agent 开线:「${lineName}」以配方「${recipe.name}」开跑(批次 ${run.id.slice(0, 8)};失败 ${failed.length},未证实 ${unverified.length});理由:${reason}`,
+        level: failed.length > 0 ? 'error' : unverified.length > 0 ? 'warn' : 'info',
       })
     }
     catch { /* 审计失败不影响执行 */ }
-    return { text: `产线「${lineName}」已开跑(批次 ${run.id.slice(0, 8)},配方「${recipe.name}」参数已下发)。用 daq_query 复测确认数采窗口激活。` }
+    if (failed.length > 0 || unverified.length > 0) {
+      const acks = run.ackSummary
+      const parts = [
+        `产线「${lineName}」已开跑(批次 ${run.id.slice(0, 8)},配方「${recipe.name}」),但参数下发未全部证实${acks ? `(证实 ${acks.verified}/${acks.total},未证实 ${acks.unverified},失败 ${acks.failed})` : ''}:`,
+        ...(failed.length > 0 ? [`失败参数:`, ...failed.map(r => `  - ${detailOf(r)}`)] : []),
+        ...(unverified.length > 0 ? [`未证实参数(命令已受理,设备侧未确认):`, ...unverified.map(r => `  - ${detailOf(r)}`)] : []),
+        '请先用 daq_query 复测实际工况;未生效参数需人工处置或 line_stop 后重试,禁止把本次开线当作全量生效。',
+      ]
+      return { text: parts.join('\n'), isError: true }
+    }
+    return { text: `产线「${lineName}」已开跑(批次 ${run.id.slice(0, 8)},配方「${recipe.name}」参数已全部设备证实)。用 daq_query 复测确认数采窗口激活。` }
   }
   catch (err) {
-    return { text: `开线执行失败(产线未变更):${err instanceof Error ? err.message : String(err)}`, isError: true }
+    // lineStart 可能已在创建批次后抛错:不能固定宣称「产线未变更」,按当前状态如实说明
+    const after = ctrl.lineState(lineId)
+    const stateNote = after.active
+      ? `产线当前显示运行中(批次 ${after.runId},配方 ${after.recipeName ?? '-'}),本次调用异常;请立即用 line_status/daq_query 复核,必要时人工停线`
+      : '产线当前未运行'
+    return { text: `开线执行失败:${err instanceof Error ? err.message : String(err)};${stateNote}。`, isError: true }
   }
 }
 
@@ -106,7 +221,7 @@ export async function toolLineStop(agentId: string, args: LineStopInput, channel
       `line-stop:${lineId}`,
       'dcw',
       `产线停线审批:产线「${lineName}」将关闭当前批次窗口(批次 ${st.runId},配方 ${st.recipeName},已打标 ${st.taggedSamples} 样本)。理由:${reason} | 批准=停线(数采同步停止);拒绝可附指导。`,
-      { title: `产线停线:${lineName}`, payload: { schemaVersion: 1, kind: 'line-stop', lineId, reason } },
+      { title: `产线停线:${lineName}`, payload: { schemaVersion: 1, kind: 'line-stop', lineId, runId: st.runId, reason } },
     )
   }
   catch (err) {
@@ -115,12 +230,31 @@ export async function toolLineStop(agentId: string, args: LineStopInput, channel
   if (!decision.approved) {
     return { text: `停线未获批准(超时未批或人工拒绝),产线继续运行。人工意见:${decision.comment || '(无附言)'}` }
   }
+  // 审批期间频道可能换线/换 lead,或产线已被人工停止:批准不等于状态未变
+  const again = await requireBoundLineLead(agentId, channelId)
+  if ('error' in again) return { text: `审批通过后复核失败,本次未停线:${again.error}`, isError: true }
+  if (again.lineId !== lineId) {
+    return { text: `审批通过后复核失败:频道绑定产线已从「${lineName}」变更为「${again.lineId}」,本次未停线。`, isError: true }
+  }
+  const now = ctrl.lineState(lineId)
+  if (!now.active) {
+    return { text: `审批通过后产线「${lineName}」已停止(可能由人工或其他操作完成),无需重复停线。` }
+  }
+  // 只停审批时看到的那一批:等待期间人工可能停线并重开,批准旧单不得误停新批次
+  if (st.runId && now.runId !== st.runId) {
+    return {
+      text: `审批通过后复核失败:产线「${lineName}」批次已变更(审批时 ${st.runId},当前 ${now.runId}),本次未停线。如仍需停止当前批次,请重新提交停线申请。`,
+      isError: true,
+    }
+  }
   try {
     const run = ctrl.lineStop(lineId)
     try {
       recordOps({
         actor: agentId, actorName: agentBadgeLabel(agentId), actorKind: 'agent',
         action: 'line.stop', kind: 'line', targetKind: 'line', targetId: lineId, lineId,
+        recipeId: st.recipeId ?? '',
+        productId: st.productId ?? '',
         summary: `Agent 停线:「${lineName}」批次 ${run.id.slice(0, 8)} 收窗;理由:${reason}`,
       })
     }
@@ -135,7 +269,7 @@ export async function toolLineStop(agentId: string, args: LineStopInput, channel
 /** 工具:line_status —— 本频道绑定产线的运行状态(只读)。 */
 export async function toolLineStatus(agentId: string, args: LineStatusInput, channelId?: string): Promise<{ text: string, isError?: boolean }> {
   const ctrl = getDcwController()
-  const manager = getWorkshopManager()
+  const manager = await workshopManager()
   const ch = channelId ? manager.deps.repos.channels.findById(channelId) : undefined
   const faces = resolveRefFaces(agentId)
   const readable = [...faces.readableLines]

package/server/services/workshop/agents/industrial/manual-approval.ts

@@ -1,46 +1,57 @@
-/**
- * 手动确认模式(mode='manual')的审批样板 —— 参数面(param_control)/节点面(dcw_control)/
- * 回退面(dcw_rollback)共用的同源审批语义:
- *   ① 同 Agent 同节点挂起去重(防审批面板堆积);
- *   ② 挂起等待用户批准(超时按拒绝收敛,备注回给 Agent);
- *   ③ 批准后绑定二次校验(审批期间解绑 = 权限在批准时失效,指令不执行)。
- * (由 param-tools/dcw-tools/dcw-judge-tools 中三份同构内联块收敛而来)
- */
-import { getAgentNodeBindingRepo } from '../node-bindings.repo'
-import { getToolApprovals } from '../tool-approvals'
-
-export async function requestManualApproval(args: {
-  agentId: string
-  nodeId: string
-  /** 人读摘要(进入孪生审批面板与 HITL 待办) */
-  detail: string
-  /** 动作口径(决定三处文案的动词):缺省 '下发'(参数面/节点面);回退面传 '回退' */
-  action?: '下发' | '回退'
-}): Promise<{ ok: true, comment: string } | { ok: false, text: string, isError?: boolean }> {
-  const action = args.action ?? '下发'
-  const pendingText = action === '回退'
-    ? '你对该节点已有一条待审批指令,请等待用户处理后再发新的回退请求(避免审批堆积)。'
-    : '你对该执行节点已有一条待审批的下发指令,请等待用户处理后再发新指令(避免审批堆积)。'
-  const resultPrefix = action === '回退' ? '回退未执行' : '指令未执行'
-  const approvals = getToolApprovals()
-  if (approvals.hasPendingFor(args.agentId, args.nodeId)) {
-    return { ok: false, text: pendingText, isError: true }
-  }
-  const ap = await approvals.request(args.agentId, args.nodeId, 'dcw', args.detail)
-  if (!ap.approved) {
-    return {
-      ok: false,
-      text: `${resultPrefix}:用户${ap.comment.includes('超时') ? '未在时限内批准(超时)' : `拒绝了本次${action}`}。用户备注:${ap.comment || '(无)'}`,
-    }
-  }
-  // 审批期间节点可能被解绑/删除(权限在批准时失效):二次校验
-  if (!getAgentNodeBindingRepo().find(args.agentId, args.nodeId, 'dcw')) {
-    return {
-      ok: false,
-      text: `${resultPrefix}:审批通过时你的该节点绑定已被解除(权限在批准时失效)。`,
-      isError: true,
-    }
-  }
-  // 批准附言随回执:人类可在批准时留反馈(缺省空),原样回流给 Agent
-  return { ok: true, comment: ap.comment ?? '' }
-}
+/**
+ * 手动确认模式(mode='manual')的审批样板 —— 参数面(param_control)/节点面(dcw_control)/
+ * 回退面(dcw_rollback)共用的同源审批语义:
+ *   ① 同 Agent 同节点挂起去重(防审批面板堆积);
+ *   ② 挂起等待用户批准(超时按拒绝收敛,备注回给 Agent);
+ *   ③ 批准后绑定二次校验(审批期间解绑 = 权限在批准时失效,指令不执行)。
+ * (由 param-tools/dcw-tools/dcw-judge-tools 中三份同构内联块收敛而来)
+ */
+import { getAgentNodeBindingRepo } from '../node-bindings.repo'
+import { getToolApprovals } from '../tool-approvals'
+
+export async function requestManualApproval(args: {
+  agentId: string
+  nodeId: string
+  /** 人读摘要(进入孪生审批面板与 HITL 待办) */
+  detail: string
+  /** 动作口径(决定三处文案的动词):缺省 '下发'(参数面/节点面);回退面传 '回退' */
+  action?: '下发' | '回退'
+  /**
+   * 批准后的授权复核(缺省 = 数控节点直绑仍存在)。
+   * 配方授权路径传「绑定配方仍存在且仍包含该参数节点」——否则批准时绑定已解除仍会执行。
+   */
+  verify?: () => boolean
+}): Promise<{ ok: true, comment: string } | { ok: false, text: string, isError: true }> {
+  const action = args.action ?? '下发'
+  const pendingText = action === '回退'
+    ? '你对该节点已有一条待审批指令,请等待用户处理后再发新的回退请求(避免审批堆积)。'
+    : '你对该执行节点已有一条待审批的下发指令,请等待用户处理后再发新指令(避免审批堆积)。'
+  const resultPrefix = action === '回退' ? '回退未执行' : '指令未执行'
+  const approvals = getToolApprovals()
+  if (approvals.hasPendingFor(args.agentId, args.nodeId)) {
+    return { ok: false, text: pendingText, isError: true }
+  }
+  const ap = await approvals.request(args.agentId, args.nodeId, 'dcw', args.detail)
+  if (!ap.approved) {
+    return {
+      ok: false,
+      text: `${resultPrefix}:用户${ap.comment.includes('超时') ? '未在时限内批准(超时)' : `拒绝了本次${action}`}。用户备注:${ap.comment || '(无)'}`,
+      isError: true,
+    }
+  }
+  // 审批期间节点可能被解绑/删除(权限在批准时失效):二次校验
+  const stillAuthorized = args.verify
+    ? args.verify()
+    : !!getAgentNodeBindingRepo().find(args.agentId, args.nodeId, 'dcw')
+  if (!stillAuthorized) {
+    return {
+      ok: false,
+      text: args.verify
+        ? `${resultPrefix}:审批通过时你的授权已被解除(权限在批准时失效)。`
+        : `${resultPrefix}:审批通过时你的该节点绑定已被解除(权限在批准时失效)。`,
+      isError: true,
+    }
+  }
+  // 批准附言随回执:人类可在批准时留反馈(缺省空),原样回流给 Agent
+  return { ok: true, comment: ap.comment ?? '' }
+}

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

@@ -9,7 +9,7 @@
  */
 import type { MesDatasetRow, MesDatasetRead } from '../../mes/mes-datasets'
 import { getMesDatasets } from '../../mes/mes-datasets'
-import { createMesController } from '../../mes/mes-controller'
+import { createMesController, formatDictionary } from '../../mes/mes-controller'
 import { agentOpsScope } from './ops-tools'
 import { AppError } from '../../../../utils/errors'
 
@@ -36,12 +36,12 @@ function dsLine(ds: MesDatasetRow): 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}`
+  return `- ${ds.id} | ${ds.nodeName || ds.nodeId} | ${win} | ${state} | 文件 ${ds.filePath}`
 }
 
 /** 工具:mes_catalog —— MES REST 点位目录(数据驱动;q 子串/产线过滤;按调用者可读产线严格过滤:
  *  跨产线与孤儿(未分配)点位不可见;未绑线的 agent 得到空目录 —— 与 mes_fetch 的授权口径一致)。 */
-export async function toolMesCatalog(agentId: string, args: { q?: string, line_id?: string, limit?: number | string } = {}): Promise<{ text: string, isError?: boolean }> {
+export async function toolMesCatalog(agentId: string, args: { q?: string, line_id?: string, product_id?: string, recipe_id?: string, limit?: number | string } = {}): Promise<{ text: string, isError?: boolean }> {
   try {
     const scope = agentOpsScope(agentId)
     const scopeLineIds = scope ? [...scope.lineIds] : []
@@ -49,7 +49,7 @@ export async function toolMesCatalog(agentId: string, args: { q?: string, line_i
     if (r.entries.length === 0 && scopeLineIds.length === 0) {
       return { text: '你还没有可读的产线绑定,无可见 MES 点位。先完成产线绑定与节点绑定后再用 mes_catalog。' }
     }
-    return { text: r.text }
+    return { text: r.text, ...('isError' in r && r.isError ? { isError: true } : {}) }
   }
   catch (err) {
     return { text: `MES 点位目录查询失败:${err instanceof Error ? err.message : String(err)}(服务未就绪时请稍后重试)。`, isError: true }
@@ -72,6 +72,29 @@ export async function toolMesFetch(agentId: string, args: { ids?: unknown, from?
   }
 }
 
+/** 工具:mes_export —— 把 MES 历史数据导出到指定目录(CSV/JSONL/图像 + manifest/README)。
+ *  与 mes_fetch 的分工:在线判读用 mes_fetch(统计摘要);需要全量原文做离线分析/交给
+ *  其他 worker 时用 mes_export,产物含字段级物理语义,不需要回读平台。 */
+export async function toolMesExport(agentId: string, args: {
+  ids?: unknown
+  from?: string
+  to?: string
+  max_rows?: number | string
+  param?: unknown
+  folder?: string
+  title?: string
+  note?: string
+  merge?: boolean | string
+} = {}): Promise<{ text: string, isError?: boolean }> {
+  try {
+    const r = await mesController().exportData(agentId, args)
+    return { text: r.text, isError: r.isError }
+  }
+  catch (err) {
+    return { text: `MES 数据导出失败:${err instanceof Error ? err.message : String(err)}`, 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 }> {
@@ -88,6 +111,8 @@ export async function toolMesDatasetRead(agentId: string, args: { dataset_id?: s
     }
     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)}(以下为失败前已写入部分)。`
+    const dictText = formatDictionary(r.dictionary)
+    const pathTxt = `\n  数据文件: ${meta.filePath}\n  语义清单: ${meta.manifestPath}`
     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)))
@@ -95,7 +120,7 @@ export async function toolMesDatasetRead(agentId: string, args: { dataset_id?: s
         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}`,
+          + `  文件 sha256 ${meta.sha256.slice(0, 16)}${pathTxt}${dictText ? `\n${dictText}` : ''}${stateTxt}`,
       }
     }
     // head / rows:列名+行数+分页游标,采样 ≤3 行(原文不进 prompt)
@@ -113,7 +138,7 @@ export async function toolMesDatasetRead(agentId: string, args: { dataset_id?: s
       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}`,
+      text: `${headTxt}采样(≤3 行): ${sample.join(' | ') || '(空)'}${totalRows > 3 ? '(其余行不进对话;统计用 mode=stats,分页翻看用 offset)' : ''}${pathTxt}${dictText ? `\n${dictText}` : ''}${stateTxt}`,
     }
   }
   catch (err) {