agentworkshop 0.7.52 → 0.7.54

package/server/middleware/01-rate-guard.ts

@@ -0,0 +1,101 @@
+/**
+ * HTTP 防护门(公网部署基线)——单中间件四件事,内存滑窗,无外部依赖:
+ * 1. User-Agent 黑名单:默认拦常见扫描器(sqlmap/nikto/nuclei…),AW_UA_BLOCKLIST 可追加(正则段,| 分隔)
+ * 2. 请求体上限:Content-Length 超限 413(AW_BODY_LIMIT_MB,默认 64MB)
+ * 3. 频率限流:/api 认证面(login/register/mcp/a2a)严限,A其余 API 宽限(AW_RATE_LIMIT_API_PER_MIN,默认 600)
+ * 4. 404 扫描封锁:1 分钟内 /api/* 404 超过阈值(AW_SCAN_404_LIMIT,默认 60)→ 封 IP 10 分钟(反爬/反目录爆破)
+ * 旁路:AW_RATE_LIMIT_OFF=1 或 AW_BENCH_MODE=1(基准隔离实例)整体停用;
+ *      全部状态内存态(重启即清),多实例部署时反代层应另配限流。
+ */
+import { defineEventHandler, createError, getRequestIP, getRequestHeaders, getRequestURL } from 'h3'
+
+const g = globalThis as typeof globalThis & {
+  __awRateBuckets?: Map<string, { count: number, reset: number }>
+  __awScanHits?: Map<string, { count: number, reset: number }>
+  __awScanBlocked?: Map<string, number>
+}
+
+const envNum = (v: string | undefined, dflt: number) => {
+  const n = Number(v)
+  return Number.isFinite(n) && n > 0 ? n : dflt
+}
+
+const OFF = process.env.AW_RATE_LIMIT_OFF === '1' || process.env.AW_BENCH_MODE === '1'
+const AUTH_LIMIT = envNum(process.env.AW_RATE_LIMIT_AUTH_PER_MIN, 20)
+const API_LIMIT = envNum(process.env.AW_RATE_LIMIT_API_PER_MIN, 600)
+const SCAN_LIMIT = envNum(process.env.AW_SCAN_404_LIMIT, 60)
+const BODY_LIMIT_MB = envNum(process.env.AW_BODY_LIMIT_MB, 64)
+const BLOCK_MS = 10 * 60_000
+const WINDOW_MS = 60_000
+// 默认 UA 黑名单:公认攻击工具,不含任何浏览器/爬虫正常名(正常搜索引擎爬虫由 robots.txt 约束)
+const UA_RE = new RegExp(process.env.AW_UA_BLOCKLIST
+  || 'sqlmap|nikto|nuclei|masscan|zgrab|dirbuster|gobuster|wfuzz|ffuf|hydra|acunetix|nessus|arachni', 'i')
+
+/** 认证/敏感面(严限):登录、注册、MCP、A2A */
+function isAuthFace(pathname: string): boolean {
+  return pathname.startsWith('/api/users/login')
+    || pathname.startsWith('/api/users/register')
+    || pathname.startsWith('/api/workshop/users/register')
+    || pathname.startsWith('/api/mcp/')
+    || pathname.includes('/a2a/')
+}
+
+function bucketOf(map: Map<string, { count: number, reset: number }>, key: string, limit: number, now: number): number {
+  const b = map.get(key)
+  if (!b || b.reset <= now) {
+    map.set(key, { count: 1, reset: now + WINDOW_MS })
+    return limit - 1
+  }
+  b.count += 1
+  // 可为负:第 N+1 发起 remaining < 0,由调用方判 429(勿钳 0,否则永不触发)
+  return limit - b.count
+}
+
+export default defineEventHandler((event) => {
+  if (OFF) return
+  const url = getRequestURL(event)
+  const path = url.pathname
+  const ip = getRequestIP(event, { xForwardedFor: true }) ?? 'local'
+  const now = Date.now()
+
+  // 已封锁 IP(404 扫描触发):直接 403,不看别的
+  const blockedUntil = g.__awScanBlocked?.get(ip)
+  if (blockedUntil && blockedUntil > now) {
+    throw createError({ statusCode: 403, statusMessage: `IP temporarily blocked (scanning): retry after ${Math.ceil((blockedUntil - now) / 1000)}s` })
+  }
+  if (blockedUntil && g.__awScanBlocked) g.__awScanBlocked.delete(ip)
+
+  // UA 黑名单(全路径,扫描器对静态面也探)
+  const ua = getRequestHeaders(event)['user-agent'] ?? ''
+  if (ua && UA_RE.test(ua)) {
+    throw createError({ statusCode: 403, statusMessage: 'User agent not allowed' })
+  }
+
+  // 请求体上限(带 Content-Length 才拦;chunked 走 nitro 默认)
+  const len = Number(getRequestHeaders(event)['content-length'] ?? 0)
+  if (len > BODY_LIMIT_MB * 1024 * 1024) {
+    throw createError({ statusCode: 413, statusMessage: `Request body too large (limit ${BODY_LIMIT_MB}MB)` })
+  }
+
+  // 只对 /api/* 限流(静态/页面不做)
+  if (path.startsWith('/api/')) {
+    if (!g.__awRateBuckets) g.__awRateBuckets = new Map()
+    const limit = isAuthFace(path) ? AUTH_LIMIT : API_LIMIT
+    const remaining = bucketOf(g.__awRateBuckets, `${ip}|${limit}`, limit, now)
+    if (remaining < 0) {
+      throw createError({ statusCode: 429, statusMessage: 'Too many requests: slow down' })
+    }
+    // 404 扫描计数(res finish 时回填;blocked 判定在下轮请求入口生效)
+    if (!g.__awScanHits) g.__awScanHits = new Map()
+    const res = event.node?.res
+    if (!res) return
+    res.once('finish', () => {
+      if (res.statusCode !== 404) return
+      const hits = bucketOf(g.__awScanHits!, `${ip}`, SCAN_LIMIT, Date.now())
+      if (hits <= 0) {
+        if (!g.__awScanBlocked) g.__awScanBlocked = new Map()
+        g.__awScanBlocked.set(ip, Date.now() + BLOCK_MS)
+      }
+    })
+  }
+})

package/server/plugins/backup.ts

@@ -53,7 +53,41 @@ async function backupOne(src: string, target: string): Promise<void> {
   }
 }
 
-async function backupOnce(dataDir: string): Promise<void> {
+/** 数据目录内的 JSON 仓储/状态文件(kv、参数面、节点绑定、插件 kv 等)+ 上级配置根的 config.yml/runtime-settings.json */
+async function backupFlatFiles(dataDir: string, backupDir: string, stamp: string): Promise<void> {
+  const bundleDir = resolve(backupDir, `files-${stamp}`)
+  mkdirSync(bundleDir, { recursive: true })
+  const targets: Array<{ src: string, name: string }> = []
+  // dataDir 下所有 .json(逐文件拷贝,目录型子树由各自仓储自轮转,不整树递归)
+  try {
+    for (const f of readdirSync(dataDir, { withFileTypes: true })) {
+      if (f.isFile() && f.name.endsWith('.json')) targets.push({ src: resolve(dataDir, f.name), name: f.name })
+    }
+  }
+  catch { /* 数据目录不可读时跳过 JSON 面 */ }
+  // 配置根(config.yml + runtime-settings.json)——重建实例的"怎么做"半边
+  try {
+    const homeMod = await import('@/shared/config/home.mjs')
+    const rm = homeMod.resolveRunMode({ cwd: process.cwd(), env: process.env })
+    for (const cfg of ['config.yml', 'runtime-settings.json']) {
+      const p = resolve(rm.configRoot, cfg)
+      if (existsSync(p)) targets.push({ src: p, name: cfg })
+    }
+  }
+  catch { /* 模式解析失败只降级 JSON 面 */ }
+  for (const t of targets) {
+    try {
+      const tmp = resolve(bundleDir, `${t.name}.tmp`)
+      await copyFileAsync(t.src, tmp)
+      renameSync(tmp, resolve(bundleDir, t.name))
+    }
+    catch (err) {
+      console.error(`[backup] ${t.name} 快照失败:`, err instanceof Error ? err.message : err)
+    }
+  }
+}
+
+export async function backupOnce(dataDir: string): Promise<void> {
   const backupDir = resolve(dataDir, 'backups')
   mkdirSync(backupDir, { recursive: true })
   const stamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19)
@@ -69,6 +103,8 @@ async function backupOnce(dataDir: string): Promise<void> {
       console.error(`[backup] ${file} 快照失败:`, err instanceof Error ? err.message : err)
     }
   }
+  // JSON 仓储 + 配置面快照(三库之外的可重建性半边)
+  await backupFlatFiles(dataDir, backupDir, stamp)
   // 轮转:每库仅保留最近 backup.keep 份(按文件名内时间戳倒序;env BACKUP_KEEP 兼容)
   const keep = Math.max(1, backupSettings().keep)
   for (const file of DB_FILES) {
@@ -83,9 +119,28 @@ async function backupOnce(dataDir: string): Promise<void> {
       catch { /* 轮转失败不致命 */ }
     }
   }
+  // files-<stamp>/ 目录同 keep 轮转
+  const fileBundles = readdirSync(backupDir)
+    .filter(f => f.startsWith('files-') && !f.includes('.'))
+    .sort()
+    .reverse()
+  for (const stale of fileBundles.slice(keep)) {
+    try {
+      rmSync(resolve(backupDir, stale), { recursive: true })
+    }
+    catch { /* 轮转失败不致命 */ }
+  }
   console.log('[backup] 快照完成 →', backupDir)
   // R4:记录最近一次成功备份时间,供 /api/metrics 观测
   g.__awBackupLastAt = new Date().toISOString()
+  // 备份成败留痕(audit_log;动态导入避免插件装载期循环依赖)
+  void import('../services/workshop/ops/ops').then(({ recordOps }) => {
+    recordOps({
+      actor: 'system', actorName: 'backup', actorKind: 'system',
+      action: 'system.backup.run', kind: 'system',
+      summary: `数据库快照完成(${DB_FILES.length} 库 + JSON/配置)→ ${backupDir}`,
+    })
+  }).catch(() => {})
 }
 
 export default function backupPlugin() {

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/plugins-builtin/diag-bridge/host/plugin.mjs

@@ -68,17 +68,24 @@ export default {
         if (Date.now() - last < AUTO_COOLDOWN_MS) return
         const now = Date.now()
         ctx.kv.set(`cooldown:${line}`, now) // 先占冷却,防同窗连发
-        startDiagnosis(ctx, {
-          line,
-          fromMs: now - 60 * MIN,
-          toMs: now,
-          question: `${line} 产线该时窗数据深度根因诊断(自动触发:节点 ${s.nodeId} 采样值 ${s.value} ${rule.op === 'lt' ? '<' : '>'} ${rule.value})`,
-          scene: `${line}_auto`,
-          source: 'auto',
-        }).then((r) => {
-          if (r.ok) ctx.logger.warn(`自动诊断已发起:产线 ${line} runId=${r.runId}(节点 ${s.nodeId}=${s.value} 越限)`)
-          else ctx.logger.warn(`自动诊断发起失败(产线 ${line}): ${r.error}`)
-        }).catch(() => {})
+        // 首拍竞态:开线后首个越限样本即刻触发,快照查询早于 tsdb 首次刷盘(TSDB_FLUSH_MS=500ms)
+        // → 时窗查空失败。空窗失败定向重试(≤3 次、间隔 5s,总窗 ≤20s);冷却不回滚,仍只此一次派发。
+        const question = `${line} 产线该时窗数据深度根因诊断(自动触发:节点 ${s.nodeId} 采样值 ${s.value} ${rule.op === 'lt' ? '<' : '>'} ${rule.value})`
+        const attempt = (n) => {
+          startDiagnosis(ctx, {
+            line,
+            fromMs: now - 60 * MIN,
+            toMs: now,
+            question,
+            scene: `${line}_auto`,
+            source: 'auto',
+          }).then((r) => {
+            if (r.ok) ctx.logger.warn(`自动诊断已发起:产线 ${line} runId=${r.runId}(节点 ${s.nodeId}=${s.value} 越限)`)
+            else if (n < 3 && String(r.error ?? '').includes('无数采样本')) setTimeout(() => attempt(n + 1), 5000)
+            else ctx.logger.warn(`自动诊断发起失败(产线 ${line}): ${r.error}`)
+          }).catch(() => {})
+        }
+        attempt(0)
       }
       catch { /* 钩子内绝不抛 */ }
     })

package/server/repositories/user.repository.ts

@@ -139,7 +139,8 @@ function importLegacyWorkshopUsers(d: DatabaseSync): void {
     insertUser.run(row.id, row.name, email, hashPassword(randomPassword()), 'user', 'active', row.created_at ?? now())
     const hash = hashToken(row.token)
     if (!tokenExists.get(hash)) {
-      insertToken.run(randomUUID(), row.id, 'legacy', hash, row.token, row.created_at ?? now())
+      // 安全基线:token_plain 不落明文(哈希即可鉴权;明文列仅为旧库形状兼容,恒 NULL)
+      insertToken.run(randomUUID(), row.id, 'legacy', hash, null, row.created_at ?? now())
     }
   }
 }
@@ -241,17 +242,21 @@ function toUser(row: Record<string, unknown>): User {
 export const userRepository = {
   list({ page, pageSize, keyword }: UserListQuery): Paginated<User> {
     const d = getDb()
-    const kw = keyword?.toLowerCase() ?? ''
+    // 分页边界钳制:超大/非法分页参数在 SQL 外收口(OFFSET 1e20 会打穿 sqlite 抛 500)
+    const safePage = Number.isSafeInteger(page) && page >= 1 ? page : 1
+    const safeSize = Number.isSafeInteger(pageSize) && pageSize >= 1 ? Math.min(pageSize, 200) : 20
+    // LIKE 通配符转义:用户关键词里的 %/_ 按字面匹配,不放大匹配面(ESCAPE 子句配套)
+    const kw = keyword?.toLowerCase() ? keyword.toLowerCase().replace(/[\\%_]/g, ch => `\\${ch}`) : ''
     const where = kw
-      ? `WHERE LOWER(name) LIKE ? OR LOWER(email) LIKE ?`
+      ? `WHERE LOWER(name) LIKE ? ESCAPE '\\' OR LOWER(email) LIKE ? ESCAPE '\\'`
       : ''
     const params = kw ? [`%${kw}%`, `%${kw}%`] : []
     const total = (d.prepare(`SELECT COUNT(*) AS n FROM users ${where}`).get(...params) as { n: number }).n
     const rows = d.prepare(
       `SELECT id, name, email, role, status, created_at AS createdAt FROM users ${where}
        ORDER BY created_at DESC LIMIT ? OFFSET ?`,
-    ).all(...params, pageSize, (page - 1) * pageSize) as Array<Record<string, unknown>>
-    return { items: rows.map(toUser), total, page, pageSize }
+    ).all(...params, safeSize, (safePage - 1) * safeSize) as Array<Record<string, unknown>>
+    return { items: rows.map(toUser), total, page: safePage, pageSize: safeSize }
   },
 
   /** 全量用户(不分页;管理面授权矩阵用,避免分页截断) */

package/server/services/user.service.ts

@@ -23,6 +23,12 @@ export function resolveUserByToken(token: string): UserProfile | null {
 }
 
 export const userService = {
+  /**
+   * 登录防爆破:同 IP+邮箱在 15 分钟窗口内累计失败 ≥5 次 → 锁到窗口结束(429)。
+   * 内存态,重启即清;多实例部署由反代层限流补齐。计数表封顶 5000 条防内存滥用。
+   */
+  _loginFails: new Map<string, { count: number, firstAt: number }>(),
+
   // ===== 管理面（与既有契约一致）=====
 
   list(input: UserListInput) {
@@ -104,9 +110,25 @@ export const userService = {
   },
 
   /** 登录：密码校验通过后签发新 token（每次登录生成一个可独立吊销的会话 token） */
-  login(input: UserLogin): AuthResult {
+  login(input: UserLogin, opts: { ip?: string } = {}): AuthResult {
+    const FAIL_WINDOW_MS = 15 * 60_000
+    const LOCK_THRESHOLD = 5
+    const lockKey = `${opts.ip ?? 'local'}|${input.email.toLowerCase()}`
+    const fails = this._loginFails
+    if (fails.size > 5000) {
+      const oldest = fails.keys().next().value
+      if (oldest) fails.delete(oldest)
+    }
+    const rec = fails.get(lockKey)
+    // 已达阈值且窗口未过 → 锁定;偶发失败(1-4 次)不锁,窗口滑过即重置
+    if (rec && rec.count >= LOCK_THRESHOLD && Date.now() - rec.firstAt < FAIL_WINDOW_MS) {
+      const waitMin = Math.ceil((FAIL_WINDOW_MS - (Date.now() - rec.firstAt)) / 60_000)
+      throw new AppError(429, 'LOGIN_LOCKED', `失败次数过多,账号已临时锁定,请约 ${waitMin} 分钟后再试`)
+    }
     const { id, hash } = userRepository.getPasswordHash(input.email) ?? {}
     if (!id || !hash || !verifyPassword(input.password, hash)) {
+      if (!rec || Date.now() - rec.firstAt >= FAIL_WINDOW_MS) fails.set(lockKey, { count: 1, firstAt: Date.now() })
+      else rec.count += 1
       throw new AppError(401, 'UNAUTHORIZED', '邮箱或密码错误')
     }
     const user = userRepository.findById(id)
@@ -116,6 +138,7 @@ export const userService = {
     if (user.status !== 'active') {
       throw new AppError(403, 'FORBIDDEN', '账号已禁用')
     }
+    fails.delete(lockKey)
     const { raw } = userRepository.createToken(id, `session-${Date.now()}`)
     return { user: this.publicProfile(user), token: raw }
   },

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

@@ -96,7 +96,7 @@ export async function dispatchHostTool(ctx: HostToolBridgeContext, req: HostTool
   }
 
   // 所有真实写入口在统一分发层再做一次服务端 fail-closed 守卫；工具目录隐藏不是安全边界。
-  if (['dcw_control', 'param_control', 'dcw_rollback', 'recipe_update', 'recipe_rollback'].includes(req.toolName)) {
+  if (['dcw_control', 'param_control', 'dcw_rollback', 'recipe_update', 'recipe_rollback', 'recipe_trial', 'recipe_apply'].includes(req.toolName)) {
     const profile = getChannelTwinProfile(identity.channelId)
     const guard = twinWriteGuard(identity.channelId, profile)
     if (!guard.allowed) return { text: `${guard.code}: ${guard.message}`, isError: true }

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, toolRecipeLog, toolRecipeRollback, 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>
 
@@ -60,6 +60,12 @@ const INDUSTRIAL_HANDLERS = new Map<string, IndustrialToolHandler>([
   ['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_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 } from './ops-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 }
+  }
+}