agentworkshop 0.6.1 → 0.7.1

package/server/services/workshop/daq/storage/sqlite.adapter.ts

@@ -10,6 +10,7 @@ import { join } from 'node:path'
 import { DatabaseSync } from 'node:sqlite'
 import { ensureDataDir } from '@/shared/config/home.mjs'
 import type { DaqQueryOpts, DaqSampleRow, TsdbPoint, TsdbPort } from './tsdb-port'
+import { daqRuntimeSettings } from '../../settings'
 
 const log = createLogger('daq.tsdb.sqlite')
 
@@ -18,8 +19,8 @@ const DB_PATH = join(ensureDataDir(), 'daq-timeseries.sqlite')
 export class SqliteTimeSeriesAdapter implements TsdbPort {
   readonly backend = 'sqlite-emulated'
   private db: DatabaseSync | null = null
-  /** 启动清理水位(默认保留 7 天,环境变量 DAQ_TS_RETENTION_H 可调) */
-  private readonly retentionH = Number(process.env.DAQ_TS_RETENTION_H ?? 168)
+  /** 启动清理水位(daq.tsRetentionH;env DAQ_TS_RETENTION_H 兼容) */
+  private readonly retentionH = daqRuntimeSettings().tsRetentionH
   private retentionTimer: NodeJS.Timeout | null = null
 
   async init(): Promise<void> {
@@ -262,10 +263,10 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
     }))
   }
 
-  /** 帧保留期清理(与样本同拍;帧保留期独立可配 DAQ_FRAME_RETENTION_H,默认 720h) */
+  /** 帧保留期清理(与样本同拍;daq.frameRetentionH,env DAQ_FRAME_RETENTION_H 兼容) */
   private sweepFrameRetention(): void {
     if (!this.db) return
-    const cutoff = Date.now() - Number(process.env.DAQ_FRAME_RETENTION_H ?? 720) * 3600_000
+    const cutoff = Date.now() - daqRuntimeSettings().frameRetentionH * 3600_000
     try {
       this.db.prepare('DELETE FROM daq_frames WHERE ts_ms < ?').run(cutoff)
     }

package/server/services/workshop/daq/storage/timescale.adapter.ts

@@ -8,6 +8,7 @@
 import { createRequire } from 'node:module'
 import type { Pool } from 'pg'
 import type { DaqQueryOpts, DaqSampleRow, TsdbPoint, TsdbPort } from './tsdb-port'
+import { daqRuntimeSettings } from '../../settings'
 
 /* nitro(Windows)dev 下对 external 的动态 import 会生成绝对盘符路径 → ESM loader
  * 拒绝 'd:' scheme;用 createRequire 走 CJS require 由 Node 原生解析(生产亦同)。 */
@@ -17,10 +18,10 @@ export class TimescaleAdapter implements TsdbPort {
   readonly backend = 'timescale'
   private pool: Pool | null = null
   private retentionTimer: NodeJS.Timeout | null = null
-  /** 保留期(默认 7 天,DAQ_TS_RETENTION_H 可调) */
-  private readonly retentionH = Number(process.env.DAQ_TS_RETENTION_H ?? 168)
-  /** 帧保留期(默认 30 天,DAQ_FRAME_RETENTION_H 可调;图像元数据体量远小于标量) */
-  private readonly frameRetentionH = Number(process.env.DAQ_FRAME_RETENTION_H ?? 720)
+  /** 保留期(daq.tsRetentionH;env DAQ_TS_RETENTION_H 兼容) */
+  private readonly retentionH = daqRuntimeSettings().tsRetentionH
+  /** 帧保留期(daq.frameRetentionH;env DAQ_FRAME_RETENTION_H 兼容) */
+  private readonly frameRetentionH = daqRuntimeSettings().frameRetentionH
 
   constructor(private readonly url: string) {}
 

package/server/services/workshop/db/retention.ts

@@ -1,50 +1,49 @@
-/**
- * 增长治理保留策略(hardening GROW-1)。
- *
- * 为无保留机制的只增表做分批清理(每批 ≤5000,循环到 0,避免长事务持锁):
- *   messages          默认 30d   (AW_MESSAGES_RETENTION_D)
- *   audit_log         默认 90d   (AW_AUDIT_RETENTION_D;合规观察期,从严保留)
- *   approval_history  默认 180d  (AW_APPROVAL_RETENTION_D;历史裁决主张不可变,放宽)
- * AW_RETENTION_DISABLED=1 整体逃生门。时间列均为 TEXT ISO,可字典序比较。
- * channel_events 与 daq_samples 已有各自保留机制,此处不重复覆盖。
- */
-type DatabaseSyncLike = {
-  prepare: (sql: string) => { run: (...args: unknown[]) => { changes: number | bigint } }
-}
-
-const DAY_MS = 86_400_000
-const BATCH = 5000
-
-const TARGETS = [
-  { table: 'messages', column: 'created_at', days: 30, envKey: 'AW_MESSAGES_RETENTION_D' },
-  { table: 'audit_log', column: 'at', days: 90, envKey: 'AW_AUDIT_RETENTION_D' },
-  { table: 'approval_history', column: 'created_at', days: 180, envKey: 'AW_APPROVAL_RETENTION_D' },
-] as const
-
-function retentionDays(envKey: string, fallback: number): number {
-  const n = Number(process.env[envKey])
-  return Number.isFinite(n) && n > 0 ? n : fallback
-}
-
-export interface RetentionResult { table: string, removed: number, days: number }
-
-/** 对单库执行一轮保留清理;返回各表删除行数(调用方负责 try/catch 与日志)。 */
-export function runRetentionSweep(db: DatabaseSyncLike): RetentionResult[] {
-  if (process.env.AW_RETENTION_DISABLED === '1') return []
-  const out: RetentionResult[] = []
-  for (const t of TARGETS) {
-    const days = retentionDays(t.envKey, t.days)
-    const before = new Date(Date.now() - days * DAY_MS).toISOString()
-    let removed = 0
-    for (;;) {
-      const res = db.prepare(
-        `DELETE FROM ${t.table} WHERE rowid IN (SELECT rowid FROM ${t.table} WHERE ${t.column} < ? LIMIT ${BATCH})`,
-      ).run(before)
-      const n = Number(res.changes)
-      removed += n
-      if (n < BATCH) break
-    }
-    out.push({ table: t.table, removed, days })
-  }
-  return out
-}
+/**
+ * 增长治理保留策略(hardening GROW-1;配置驱动)。
+ *
+ * 为无保留机制的只增表做分批清理(每批 ≤5000,循环到 0,避免长事务持锁):
+ *   messages          默认 30d   (retention.messages_days)
+ *   audit_log         默认 90d   (retention.audit_days;合规观察期,从严保留)
+ *   approval_history  默认 180d  (retention.approval_days;历史裁决主张不可变,放宽)
+ * retention.disabled 整体逃生门(env AW_RETENTION_DISABLED / RETENTION_DISABLED 兼容别名)。
+ * 覆盖链:config.yml < runtime-settings < env(AW_<键> 或历史别名)。时间列均为 TEXT ISO。
+ * channel_events 与 daq_samples 已有各自保留机制,此处不重复覆盖。
+ */
+import { retentionSettings } from '../settings'
+
+type DatabaseSyncLike = {
+  prepare: (sql: string) => { run: (...args: unknown[]) => { changes: number | bigint } }
+}
+
+const DAY_MS = 86_400_000
+const BATCH = 5000
+
+const TARGETS = [
+  { table: 'messages', column: 'created_at', days: 30, cfgKey: 'messages_days' },
+  { table: 'audit_log', column: 'at', days: 90, cfgKey: 'audit_days' },
+  { table: 'approval_history', column: 'created_at', days: 180, cfgKey: 'approval_days' },
+] as const
+
+export interface RetentionResult { table: string, removed: number, days: number }
+
+/** 对单库执行一轮保留清理;返回各表删除行数(调用方负责 try/catch 与日志)。 */
+export function runRetentionSweep(db: DatabaseSyncLike): RetentionResult[] {
+  const retention = retentionSettings()
+  if (retention.disabled) return []
+  const out: RetentionResult[] = []
+  for (const t of TARGETS) {
+    const days = retention[t.cfgKey]
+    const before = new Date(Date.now() - days * DAY_MS).toISOString()
+    let removed = 0
+    for (;;) {
+      const res = db.prepare(
+        `DELETE FROM ${t.table} WHERE rowid IN (SELECT rowid FROM ${t.table} WHERE ${t.column} < ? LIMIT ${BATCH})`,
+      ).run(before)
+      const n = Number(res.changes)
+      removed += n
+      if (n < BATCH) break
+    }
+    out.push({ table: t.table, removed, days })
+  }
+  return out
+}

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

@@ -30,6 +30,9 @@ import { recordOps } from '../ops/ops'
 /** 运维日志写下发防噪:同节点同值 10s 内的心跳重下发不重复入册 */
 const opsWriteMemo = new Map<string, { eng: number, at: number }>()
 
+/** 周期读网关默认间隔(节点 readIntervalMs=null 时生效;真实 PLC 建议按链路承载调整) */
+const DEFAULT_READ_INTERVAL_MS = 5000
+
 /** write() 来源 → 日志来源(user 人工下发 / agent 智能体 / system 配方·回退等系统路径) */
 function opsActorKindOf(source: string): 'user' | 'agent' | 'system' {
   if (source === 'agent') return 'agent'
@@ -47,6 +50,8 @@ export interface DcwCreateInput {
   /** 数据语义标定钩子(encode:物理值 → PLC 设定值) */
   transform?: DataTransform
   holdIntervalMs?: number | null
+  /** 周期读间隔 ms(null = 网关默认;0 = 仅手动读取) */
+  readIntervalMs?: number | null
   unit?: string
   decimals?: number
   min?: number
@@ -68,6 +73,8 @@ export interface DcwPatchInput {
   /** 数据语义标定钩子(encode) */
   transform?: DataTransform
   holdIntervalMs?: number | null
+  /** 周期读间隔 ms(null = 网关默认;0 = 仅手动读取) */
+  readIntervalMs?: number | null
   unit?: string
   decimals?: number
   min?: number
@@ -128,9 +135,10 @@ class DcwController {
 
   private host = {
     running: () => this.running,
-    defaults: () => ({ holdIntervalMs: 0 }),
+    defaults: () => ({ holdIntervalMs: 0, readIntervalMs: DEFAULT_READ_INTERVAL_MS }),
     executeWrite: async (node: DcwNode, eng: number, tolerance: number, recipeRunId: string | null) =>
       this.executeWrite(node, eng, tolerance, recipeRunId),
+    executeRead: async (node: DcwNode) => this.executeRead(node),
   }
 
   /**
@@ -200,6 +208,48 @@ class DcwController {
     this.broadcast?.('dcw.node.changed', payload)
   }
 
+  /**
+   * 核心读执行:驱动读(寄存器解码 + 工程量映射在驱动内)→ 标定 decode(PLC 值 → 物理值)
+   * → 读状态记账(节点 readValue/lastReadAt,失败记 lastReadError 不动写状态机)→ WS dcw.read 直推。
+   * 不支持读的驱动(mock 外的 mqtt/http)不产生节点状态噪音,直接返回说明。
+   */
+  private async executeRead(node: DcwNode): Promise<{ ok: boolean, value: number | null, raw: number | null, message: string, at: string }> {
+    const at = new Date().toISOString()
+    const driver = resolveDcwDriver(node.driver)
+    if (!driver.read) {
+      return { ok: false, value: null, raw: null, message: `驱动 ${node.driver} 不支持读取(仅观测型通道)`, at }
+    }
+    let r: { ok: boolean, message: string, eng: number | null, raw: number | null }
+    try {
+      r = await driver.read({ domain: { min: node.min, max: node.max }, driverConfig: node.driverConfig })
+    }
+    catch (err) {
+      r = { ok: false, eng: null, raw: null, message: err instanceof Error ? err.message : String(err) }
+    }
+    // 读回的是 PLC 设定值域 → 经标定 decode 换算物理量(与写链路 inverse 互逆)
+    const value = r.ok && r.eng != null ? applyTransform(r.eng, node.transform) : null
+    node.applyReadResult(value, r.raw, r.ok, r.message, at)
+    this.repo.flushDebounced()
+    this.broadcast?.('dcw.read', {
+      nodeId: node.id,
+      templateRef: node.templateRef,
+      value,
+      raw: r.raw,
+      ok: r.ok,
+      message: r.message,
+      at,
+    })
+    return { ok: r.ok, value, raw: r.raw, message: r.message, at }
+  }
+
+  /** 手动读取(REST/前端「读取」按钮/Agent 工具;走运行时在飞互斥) */
+  async readNow(id: string): Promise<{ ok: boolean, value: number | null, raw: number | null, message: string, at: string }> {
+    this.ensureLoop()
+    const rt = this.runtimes.get(id)
+    if (!rt) throw new AppError(404, ErrorCodes.NOT_FOUND, `控制节点不存在: ${id}`)
+    return rt.readNow()
+  }
+
   setBroadcast(fn: BroadcastFn | null): void {
     this.broadcast = fn
     // 调控闭环 WS 帧(dcw.optimization.changed)与既有帧同一广播通道
@@ -286,6 +336,7 @@ class DcwController {
       transform: normalizeDataTransform(input.transform),
       enabled: input.enabled,
       holdIntervalMs: input.holdIntervalMs ?? null,
+      readIntervalMs: input.readIntervalMs ?? null,
       unit: input.unit,
       decimals: input.decimals,
       min: input.min,
@@ -323,6 +374,10 @@ class DcwController {
       node.holdIntervalMs = patch.holdIntervalMs == null ? null : Math.max(0, Math.min(3_600_000, Math.round(patch.holdIntervalMs)))
       rearm = true
     }
+    if (patch.readIntervalMs !== undefined) {
+      node.readIntervalMs = patch.readIntervalMs == null ? null : Math.max(0, Math.min(3_600_000, Math.round(patch.readIntervalMs)))
+      rearm = true
+    }
     if (patch.enabled !== undefined) {
       node.enabled = patch.enabled
       // 暂停/恢复的状态同步:暂停 → offline(暂停控制);恢复 → 回到待机(等下次写 ACK 转 ok)