agentworkshop 0.8.6 → 0.8.8

package/server/services/workshop/dcw/dcw-controller/helpers.ts

@@ -1,61 +1,62 @@
-/**
- * DcwController 的模块级纯工具/常量(原 server/services/workshop/dcw/dcw-controller.ts 类外声明,含类体之后与类无关的部分)。
- */
-import type { ProductInput } from '../../../../../shared/dcw-protocol'
-import { AppError, ErrorCodes } from '../../../../utils/errors'
-import { attachDcwPluginBridge } from '../plugin-bridge'
-import { getDcwParamRepo } from '../param-map.repo'
-
-// 写驱动插件桥(模块装载即挂;插件宿主先到则注册项排队、此处接管回放)
-attachDcwPluginBridge()
-
-/** 周期读网关默认间隔(节点 readIntervalMs=null 时生效;真实 PLC 建议按链路承载调整) */
-export const DEFAULT_READ_INTERVAL_MS = 5000
-
-/** write() 来源 → 日志来源(user 人工下发 / agent 智能体 / system 配方·回退等系统路径) */
-export function opsActorKindOf(source: string): 'user' | 'agent' | 'system' {
-  if (source === 'agent') return 'agent'
-  if (source === 'manual') return 'user'
-  return 'system'
-}
-
-export const SWEEP_MS = 500
-
-// 基准模式显式留痕:AW_BENCH_MODE=1 豁免在线探索限频(单步上限/60s 间隔/写入保持窗),
-// 四层限界联锁不受影响(软层旁路还需每次写携带 meta.benchArm)。生产实例误配此 env 时启动即告警。
-if (process.env.AW_BENCH_MODE === '1') {
-  console.warn('[dcw] AW_BENCH_MODE=1:在线探索限频(单步上限/60s 间隔/写入保持窗)已整体豁免 —— 仅限基准/审计环境使用!')
-}
-
-/**
- * 产品级工艺参数限界校验:键必须命中该产品所属产线上的工艺参数映射
- * (防静默失效的拼错键);区间须 min<=max 且为有限数字。产品未挂产线时限界无
- * 寻址语境,拒绝非空限界。
- */
-export function assertProductParamLimits(lineId: string, paramLimits: ProductInput['paramLimits'] | undefined): void {
-  if (paramLimits == null) return
-  if (typeof paramLimits !== 'object' || Array.isArray(paramLimits)) {
-    throw new AppError(400, ErrorCodes.VALIDATION_ERROR, 'paramLimits 需为对象(键=工艺参数 key,值={min?,max?})')
-  }
-  const entries = Object.entries(paramLimits)
-  if (entries.length === 0) return
-  if (!lineId) {
-    throw new AppError(400, ErrorCodes.VALIDATION_ERROR, '产品未挂载产线,不可设定工艺参数限界(限界按产线内的工艺参数寻址)')
-  }
-  const lineKeys = new Set(
-    getDcwParamRepo().listViews().filter(p => p.lineId === lineId).map(p => p.key),
-  )
-  for (const [key, range] of entries) {
-    if (!lineKeys.has(key)) {
-      throw new AppError(400, ErrorCodes.VALIDATION_ERROR, `产品限界的工艺参数键「${key}」在产线上不存在(可用的工艺参数:${[...lineKeys].join(', ') || '无 —— 先创建写控节点生成参数面'})`)
-    }
-    const min = range?.min == null ? null : Number(range.min)
-    const max = range?.max == null ? null : Number(range.max)
-    if ((range?.min != null && !Number.isFinite(min)) || (range?.max != null && !Number.isFinite(max))) {
-      throw new AppError(400, ErrorCodes.VALIDATION_ERROR, `产品限界「${key}」的上下限需为数字`)
-    }
-    if (min != null && max != null && min > max) {
-      throw new AppError(400, ErrorCodes.VALIDATION_ERROR, `产品限界「${key}」非法:min ${min} > max ${max}`)
-    }
-  }
-}
+/**
+ * DcwController 的模块级纯工具/常量(原 server/services/workshop/dcw/dcw-controller.ts 类外声明,含类体之后与类无关的部分)。
+ */
+import type { ProductInput } from '../../../../../shared/dcw-protocol'
+import { AppError, ErrorCodes } from '../../../../utils/errors'
+import { attachDcwPluginBridge } from '../plugin-bridge'
+import { getDcwParamRepo } from '../param-map.repo'
+import { benchModeEnabled } from '../../bench-mode'
+
+// 写驱动插件桥(模块装载即挂;插件宿主先到则注册项排队、此处接管回放)
+attachDcwPluginBridge()
+
+/** 周期读网关默认间隔(节点 readIntervalMs=null 时生效;真实 PLC 建议按链路承载调整) */
+export const DEFAULT_READ_INTERVAL_MS = 5000
+
+/** write() 来源 → 日志来源(user 人工下发 / agent 智能体 / system 配方·回退等系统路径) */
+export function opsActorKindOf(source: string): 'user' | 'agent' | 'system' {
+  if (source === 'agent') return 'agent'
+  if (source === 'manual') return 'user'
+  return 'system'
+}
+
+export const SWEEP_MS = 500
+
+// 基准模式显式留痕:AW_BENCH_MODE=1 豁免在线探索限频(单步上限/60s 间隔/写入保持窗),
+// 四层限界联锁不受影响(软层旁路还需每次写携带 meta.benchArm)。生产实例误配此 env 时启动即告警。
+if (benchModeEnabled()) {
+  console.warn('[dcw] AW_BENCH_MODE=1:在线探索限频(单步上限/60s 间隔/写入保持窗)已整体豁免 —— 仅限基准/审计环境使用!')
+}
+
+/**
+ * 产品级工艺参数限界校验:键必须命中该产品所属产线上的工艺参数映射
+ * (防静默失效的拼错键);区间须 min<=max 且为有限数字。产品未挂产线时限界无
+ * 寻址语境,拒绝非空限界。
+ */
+export function assertProductParamLimits(lineId: string, paramLimits: ProductInput['paramLimits'] | undefined): void {
+  if (paramLimits == null) return
+  if (typeof paramLimits !== 'object' || Array.isArray(paramLimits)) {
+    throw new AppError(400, ErrorCodes.VALIDATION_ERROR, 'paramLimits 需为对象(键=工艺参数 key,值={min?,max?})')
+  }
+  const entries = Object.entries(paramLimits)
+  if (entries.length === 0) return
+  if (!lineId) {
+    throw new AppError(400, ErrorCodes.VALIDATION_ERROR, '产品未挂载产线,不可设定工艺参数限界(限界按产线内的工艺参数寻址)')
+  }
+  const lineKeys = new Set(
+    getDcwParamRepo().listViews().filter(p => p.lineId === lineId).map(p => p.key),
+  )
+  for (const [key, range] of entries) {
+    if (!lineKeys.has(key)) {
+      throw new AppError(400, ErrorCodes.VALIDATION_ERROR, `产品限界的工艺参数键「${key}」在产线上不存在(可用的工艺参数:${[...lineKeys].join(', ') || '无 —— 先创建写控节点生成参数面'})`)
+    }
+    const min = range?.min == null ? null : Number(range.min)
+    const max = range?.max == null ? null : Number(range.max)
+    if ((range?.min != null && !Number.isFinite(min)) || (range?.max != null && !Number.isFinite(max))) {
+      throw new AppError(400, ErrorCodes.VALIDATION_ERROR, `产品限界「${key}」的上下限需为数字`)
+    }
+    if (min != null && max != null && min > max) {
+      throw new AppError(400, ErrorCodes.VALIDATION_ERROR, `产品限界「${key}」非法:min ${min} > max ${max}`)
+    }
+  }
+}

package/server/services/workshop/dcw/dcw-controller/recipes.ts

@@ -4,7 +4,7 @@
  */
 import { DcwControllerParams } from './params'
 import type { DcwWriteHistoryEntry } from '../dcw-recipe.repo'
-import type { RecipeInput, RecipeRunView, RecipeView, WriteVerifyOutcome } from '../../../../../shared/dcw-protocol'
+import type { DcwWriteMeta, RecipeInput, RecipeRunView, RecipeView, WriteVerifyOutcome } from '../../../../../shared/dcw-protocol'
 import { AppError, ErrorCodes } from '../../../../utils/errors'
 import { getDcwRecipeRepo } from '../dcw-recipe.repo'
 import { assertRecipeOpIntervalForExecution, beginRecipeOp, endRecipeOp, recordRecipeOpAnchor } from '../recipe-op-anchor'
@@ -112,7 +112,7 @@ export abstract class DcwControllerRecipes extends DcwControllerParams {
    * 2026-10-08 ACK 鉴定:每参数写后经 verifyRecipeWrite 补验(链路受理→独立回读
    * 证实),结果行携带 ack/verify —— 「ok」不再被当成「设备已生效」。
    */
-  protected async writeRecipeParams(recipe: RecipeView, run: RecipeRunView, opts: { enforceRecipeWindow?: boolean } = {}): Promise<void> {
+  protected async writeRecipeParams(recipe: RecipeView, run: RecipeRunView, opts: { enforceRecipeWindow?: boolean, writeMeta?: DcwWriteMeta } = {}): Promise<void> {
     const results: RecipeRunView['results'] = []
     for (const param of recipe.params) {
       const node = param.nodeId ? this.repo.byId(param.nodeId) : undefined
@@ -149,7 +149,7 @@ export abstract class DcwControllerRecipes extends DcwControllerParams {
         }
       }
       try {
-        const outcome = await this.write(node.id, param.value, run.id, { source: 'recipe', actor: 'recipe' })
+        const outcome = await this.write(node.id, param.value, run.id, opts.writeMeta ?? { source: 'recipe', actor: 'recipe' })
         // ACK 鉴定:命令 ok 但仅链路受理(mqtt/http-no-echo/mock)→ 独立回读补验
         const v: WriteVerifyOutcome = await verifyRecipeWrite(this, node, param.value, outcome, { tolerance: writeTolerance(node) })
         const ackTag = v.verdict === 'verified' ? '' : v.verdict === 'failed' ? '' : ` · ${v.message}`
@@ -210,6 +210,8 @@ export abstract class DcwControllerRecipes extends DcwControllerParams {
     agentDispatch?: boolean
     /** 本次下发的审批单 id(锚自豁免:自己刚获批的那次不卡自己;不同 id 且锚新鲜 = 竞态拦截) */
     agentApprovalId?: string
+    /** Trusted identity for Agent trial writes; other recipe operations keep recipe semantics. */
+    agentTrialMeta?: Omit<DcwWriteMeta, 'source' | 'approvalId'>
     /** 应急豁免:仅跳过 recipe 级频控(审批/四层限界/试验节拍照常) */
     emergency?: boolean
   } = {}) {
@@ -252,6 +254,7 @@ export abstract class DcwControllerRecipes extends DcwControllerParams {
       trial?: boolean
       agentDispatch?: boolean
       agentApprovalId?: string
+      agentTrialMeta?: Omit<DcwWriteMeta, 'source' | 'approvalId'>
       emergency?: boolean
     },
     overrides: Array<{ nodeId: string, value: number }>,
@@ -267,7 +270,10 @@ export abstract class DcwControllerRecipes extends DcwControllerParams {
         })
       : recipe.params
     const run = repo.createRun(recipe, effective)
-    await this.writeRecipeParams({ ...recipe, params: effective }, run, { enforceRecipeWindow: overrides.length > 0 })
+    const trialMeta: DcwWriteMeta | undefined = opts.trial && opts.agentDispatch && opts.agentTrialMeta
+      ? { ...opts.agentTrialMeta, source: 'agent', ...(opts.agentApprovalId ? { approvalId: opts.agentApprovalId } : {}) }
+      : undefined
+    await this.writeRecipeParams({ ...recipe, params: effective }, run, { enforceRecipeWindow: overrides.length > 0, writeMeta: trialMeta })
     // 运行中应用新配方版本 → 谱系拆段(A13):旧段在 now 闭合,新段记录新版本/内容 hash。
     try {
       const { getActiveLineRun, setActiveLineRun } = await import('../line-run')
@@ -302,9 +308,9 @@ export abstract class DcwControllerRecipes extends DcwControllerParams {
     const level: 'info' | 'warn' | 'error' = acks.failed > 0 ? 'error' : acks.unverified > 0 ? 'warn' : 'info'
     try {
       recordOps({
-        actor: opts.agentDispatch ? 'agent-dispatch' : 'system',
-        actorName: opts.agentDispatch ? 'Agent 整批下发' : '产线系统',
-        actorKind: 'system',
+        actor: trialMeta?.actor ?? (opts.agentDispatch ? 'agent-dispatch' : 'system'),
+        actorName: trialMeta?.actorName ?? (opts.agentDispatch ? 'Agent 整批下发' : '产线系统'),
+        actorKind: trialMeta ? 'agent' : 'system',
         action: 'recipe.dispatch.ack',
         kind: 'write',
         targetKind: 'recipe',
@@ -336,7 +342,7 @@ export abstract class DcwControllerRecipes extends DcwControllerParams {
         recipeId,
         at: Date.now(),
         approvalId: opts.agentApprovalId ?? '',
-        agentId: '',
+        agentId: trialMeta?.actor ?? '',
         op: opts.trial ? 'trial' : 'apply',
         source: 'agent-executed',
       })

package/server/services/workshop/dcw/dcw-controller/state.ts

@@ -1,71 +1,88 @@
-/**
- * DcwControllerState —— 字段 / 巡检循环 / 运行时同步 / 宿主
- * (拆分层,承 DcwControllerContracts;方法体与原文件逐行一致)
- */
-import { DcwControllerContracts } from './contracts'
-import type { BroadcastFn } from './types'
-import { DEFAULT_READ_INTERVAL_MS, SWEEP_MS } from './helpers'
-import type { DcwNode } from '../dcw-node'
-import { DcwNodeRuntime } from '../dcw-runtime'
-import { getDcwNodeRepo } from '../dcw-node.repo'
-import { getRecipeRollBackManager } from '../recipe-rollback-manager'
-import { getActiveLineRun } from '../line-run'
-import { hydrateWriteLocks } from './gate-persist'
-
-export abstract class DcwControllerState extends DcwControllerContracts {
-  protected repo = getDcwNodeRepo()
-  protected broadcast: BroadcastFn | null = null
-  protected timer: NodeJS.Timeout | null = null
-  /** 边缘控制运行时注册表(节点 id → 独立运行时) */
-  protected runtimes = new Map<string, DcwNodeRuntime>()
-
-  running = true
-  protected writesTotal = 0
-  protected writesFailed = 0
-  /** 写入保持窗注册表(nodeId → lockUntil epoch ms;P1-5 落盘:重启读盘续算,防"重启即绕保持窗") */
-  protected writeLocks = new Map<string, number>(
-    Object.entries(hydrateWriteLocks()).map(([k, v]) => [k, Number(v)]),
-  )
-
-  // ---------- 生命周期 ----------
-
-  protected ensureLoop(): void {
-    this.syncRuntimes()
-    if (this.timer) return
-    this.timer = setInterval(() => this.sweep(), SWEEP_MS)
-    this.timer.unref?.()
-  }
-
-  /** 网关统一调度:保写心跳在各运行时内部自治(单节点写事务不波及邻居);
-   *  调控闭环:open 优化记录的系统兜底评估复用本节拍(F1,不建新定时器) */
-  protected sweep(): void {
-    if (!this.running) return
-    const now = Date.now()
-    for (const rt of this.runtimes.values()) rt.tick(now)
-    getRecipeRollBackManager().evaluateOpenRecords(now)
-  }
-
-  protected syncRuntimes(): void {
-    const live = new Set<string>()
-    for (const node of this.repo.all()) {
-      live.add(node.id)
-      if (!this.runtimes.has(node.id)) {
-        this.runtimes.set(node.id, new DcwNodeRuntime(node, this.host))
-      }
-    }
-    for (const id of [...this.runtimes.keys()]) {
-      if (!live.has(id)) this.runtimes.delete(id)
-    }
-  }
-
-  // ---------- 网关服务面(runtime host)----------
-
-  protected host = {
-    running: () => this.running,
-    defaults: () => ({ holdIntervalMs: 0, readIntervalMs: DEFAULT_READ_INTERVAL_MS }),
-    lineActive: (lineId: string) => Boolean(getActiveLineRun(lineId)),
-    executeWrite: async (node: DcwNode, eng: number, tolerance: number, recipeRunId: string | null) =>
-      this.executeWrite(node, eng, tolerance, recipeRunId),
-    executeRead: async (node: DcwNode) => this.executeRead(node),
-  }
-}
+/**
+ * DcwControllerState —— 字段 / 巡检循环 / 运行时同步 / 宿主
+ * (拆分层,承 DcwControllerContracts;方法体与原文件逐行一致)
+ */
+import { DcwControllerContracts } from './contracts'
+import type { BroadcastFn } from './types'
+import { DEFAULT_READ_INTERVAL_MS, SWEEP_MS } from './helpers'
+import type { DcwNode } from '../dcw-node'
+import { DcwNodeRuntime } from '../dcw-runtime'
+import { getDcwNodeRepo } from '../dcw-node.repo'
+import { getRecipeRollBackManager } from '../recipe-rollback-manager'
+import { getActiveLineRun } from '../line-run'
+import { hydrateWriteLocks } from './gate-persist'
+import { createLogger } from '../../logger'
+
+const log = createLogger('dcw.controller')
+
+export abstract class DcwControllerState extends DcwControllerContracts {
+  protected repo = getDcwNodeRepo()
+  protected broadcast: BroadcastFn | null = null
+  protected timer: NodeJS.Timeout | null = null
+  /** 边缘控制运行时注册表(节点 id → 独立运行时) */
+  protected runtimes = new Map<string, DcwNodeRuntime>()
+
+  running = true
+  protected writesTotal = 0
+  protected writesFailed = 0
+  /** 写入保持窗注册表(nodeId → lockUntil epoch ms;P1-5 落盘:重启读盘续算,防"重启即绕保持窗") */
+  protected writeLocks = new Map<string, number>(
+    Object.entries(hydrateWriteLocks()).map(([k, v]) => [k, Number(v)]),
+  )
+
+  // ---------- 生命周期 ----------
+
+  protected ensureLoop(): void {
+    this.syncRuntimes()
+    if (this.timer) return
+    this.timer = setInterval(() => this.sweep(), SWEEP_MS)
+    this.timer.unref?.()
+  }
+
+  /** 网关统一调度:保写心跳在各运行时内部自治(单节点写事务不波及邻居);
+   *  调控闭环:open 优化记录的系统兜底评估复用本节拍(F1,不建新定时器) */
+  protected sweep(): void {
+    if (!this.running) return
+    const now = Date.now()
+    // 500ms 定时器回调:逐 runtime 兜底,单个节点 tick 抛错不得跳过其余节点、
+    // 也不得升级为进程级 uncaughtException(与 runtime/manager/state.ts 同口径)。
+    for (const rt of this.runtimes.values()) {
+      try {
+        rt.tick(now)
+      }
+      catch (err) {
+        log.error(`[dcw] 节点 ${rt.node.id} tick 异常(已隔离):`, err)
+      }
+    }
+    try {
+      getRecipeRollBackManager().evaluateOpenRecords(now)
+    }
+    catch (err) {
+      log.error('[dcw] 回退评估异常(已隔离):', err)
+    }
+  }
+
+  protected syncRuntimes(): void {
+    const live = new Set<string>()
+    for (const node of this.repo.all()) {
+      live.add(node.id)
+      if (!this.runtimes.has(node.id)) {
+        this.runtimes.set(node.id, new DcwNodeRuntime(node, this.host))
+      }
+    }
+    for (const id of [...this.runtimes.keys()]) {
+      if (!live.has(id)) this.runtimes.delete(id)
+    }
+  }
+
+  // ---------- 网关服务面(runtime host)----------
+
+  protected host = {
+    running: () => this.running,
+    defaults: () => ({ holdIntervalMs: 0, readIntervalMs: DEFAULT_READ_INTERVAL_MS }),
+    lineActive: (lineId: string) => Boolean(getActiveLineRun(lineId)),
+    executeWrite: async (node: DcwNode, eng: number, tolerance: number, recipeRunId: string | null) =>
+      this.executeWrite(node, eng, tolerance, recipeRunId),
+    executeRead: async (node: DcwNode) => this.executeRead(node),
+  }
+}

package/server/services/workshop/dcw/dcw-controller/write-audit.ts

@@ -42,7 +42,7 @@ export function recordDcwWriteOps(args: {
     lineId: args.node.lineId ?? '',
     productId: runNow?.productId ?? '',
     recipeId: runNow?.recipeId ?? args.recipeRunId ?? '',
-    detail: { eng: args.eng, prevValue: args.prevValue, ok: args.outcome.ok, message: args.outcome.message, taskId: args.meta?.taskId ?? null, hypothesis: args.meta?.hypothesis ?? '', executionMode: args.meta?.executionMode ?? null },
+    detail: { eng: args.eng, prevValue: args.prevValue, ok: args.outcome.ok, message: args.outcome.message, taskId: args.meta?.taskId ?? null, hypothesis: args.meta?.hypothesis ?? '', approvalId: args.meta?.approvalId ?? null, executionMode: args.meta?.executionMode ?? null },
   })
   // 插件钩子:写控 ACK 观察(与运维入册同点同去重节流)
   emitDcwWrite({ nodeId: args.id, name: args.node.name, eng: args.eng, prevValue: args.prevValue, ok: args.outcome.ok, source: args.src, lineId: args.node.lineId ?? '', at: new Date().toISOString() })