agentworkshop 0.6.0 → 0.7.0

package/server/services/workshop/dcw/recipe-rollback-manager.ts

@@ -30,11 +30,12 @@ import { getDcwNodeRepo } from './dcw-node.repo'
 import { getActiveLineRun } from './line-run'
 import { getRecipeRollBackRepo, type RecipeRollBackRepo } from './recipe-rollback.repo'
 import { recordOps } from '../ops/ops'
+import { dcwSettings } from '../settings'
 
-/** 回退后同向重写冷却 */
-const COOLDOWN_MS = Number(process.env.DCW_ROLLBACK_COOLDOWN_MS ?? 300_000)
-/** 系统兜底评估的最小观察窗 */
-const MIN_WINDOW_MS = Number(process.env.DCW_ROLLBACK_MIN_WINDOW_MS ?? 120_000)
+/** 回退后同向重写冷却(dcw.rollback_cooldown_ms;env DCW_ROLLBACK_COOLDOWN_MS 兼容) */
+const COOLDOWN_MS = (): number => dcwSettings().rollback_cooldown_ms
+/** 系统兜底评估的最小观察窗(env DCW_ROLLBACK_MIN_WINDOW_MS 兼容) */
+const MIN_WINDOW_MS = (): number => dcwSettings().rollback_min_window_ms
 /** 兜底评估复查间隔(未触发时) */
 const RECHECK_MS = 30_000
 /** 每节点链自动回退上限(超出升级人工) */
@@ -43,10 +44,10 @@ const MAX_AUTO_ROLLBACKS = 2
 const BREACH_THRESHOLD = 3
 /** 锚去重窗口(保写心跳防噪) */
 const ANCHOR_DEDUP_MS = 5_000
-/** 基线回看窗 */
-const BASELINE_MS = Number(process.env.DCW_ROLLBACK_BASELINE_MS ?? 600_000)
-/** open 记录孤儿判定:属主超时未判定 → 后续 Agent 可接管(判定/回退/顶替) */
-const OPEN_RECORD_STALE_MS = Number(process.env.DCW_ROLLBACK_STALE_MS ?? 1_800_000)
+/** 基线回看窗(env DCW_ROLLBACK_BASELINE_MS 兼容) */
+const BASELINE_MS = (): number => dcwSettings().rollback_baseline_ms
+/** open 记录孤儿判定:属主超时未判定 → 后续 Agent 可接管(env DCW_ROLLBACK_STALE_MS 兼容) */
+const OPEN_RECORD_STALE_MS = (): number => dcwSettings().rollback_stale_ms
 
 /** 数值入参钳制(时间/桶宽:有限正整数,防越界透传) */
 function clampMs(v: number | undefined): number | undefined {
@@ -91,12 +92,12 @@ export class RecipeRollBackManager {
     const rb = this.repo.lastRollbackAnchor(node.id)
     if (rb && rb.prevValue != null) {
       const elapsed = Date.now() - Date.parse(rb.at)
-      if (elapsed < COOLDOWN_MS) {
+      if (elapsed < COOLDOWN_MS()) {
         const restored = rb.newValue
         const wrong = rb.prevValue
         // 同向判定:偏离恢复值的方向与原错误方向一致(往回改不受限)
         if (eng !== restored && Math.sign(eng - restored) === Math.sign(wrong - restored)) {
-          throw new AppError(409, ErrorCodes.CONFLICT, `回退冷却中:节点「${node.name}」${Math.ceil((COOLDOWN_MS - elapsed) / 1000)}s 内禁止同向重写(刚从 ${wrong} 回退到 ${restored});如确需调整请先 dcw_judge 复盘或反向操作`)
+          throw new AppError(409, ErrorCodes.CONFLICT, `回退冷却中:节点「${node.name}」${Math.ceil((COOLDOWN_MS() - elapsed) / 1000)}s 内禁止同向重写(刚从 ${wrong} 回退到 ${restored});如确需调整请先 dcw_judge 复盘或反向操作`)
         }
       }
     }
@@ -156,7 +157,7 @@ export class RecipeRollBackManager {
         })
         anchor.recordId = record.id
         this.repo.flushNow()
-        void this.fillMetrics(record, 'baseline', Date.parse(record.setAt) - BASELINE_MS, Date.parse(record.setAt))
+        void this.fillMetrics(record, 'baseline', Date.parse(record.setAt) - BASELINE_MS(), Date.parse(record.setAt))
         this.emit('opened', record)
         recordOps({
           actor: meta.actor,
@@ -196,7 +197,7 @@ export class RecipeRollBackManager {
 
   /** 孤儿判定:open 记录超时未判定(属主可能已消失)→ 可被后续 Agent 接管 */
   isStale(record: OptimizationRecord): boolean {
-    return record.status === 'open' && Date.now() - Date.parse(record.setAt) > OPEN_RECORD_STALE_MS
+    return record.status === 'open' && Date.now() - Date.parse(record.setAt) > OPEN_RECORD_STALE_MS()
   }
 
   judge(recordId: string, verdict: OptimizationVerdict, reason: string, by: 'agent' | 'system' | 'user', actor: string, opts?: { takeover?: boolean }): OptimizationRecord {
@@ -401,8 +402,8 @@ export class RecipeRollBackManager {
     const rb = this.repo.lastRollbackAnchor(nodeId)
     if (rb) {
       const elapsed = Date.now() - Date.parse(rb.at)
-      if (elapsed < COOLDOWN_MS)
-        throw new AppError(409, ErrorCodes.CONFLICT, `回退冷却中:节点 ${Math.ceil((COOLDOWN_MS - elapsed) / 1000)}s 内禁止再次回退`)
+      if (elapsed < COOLDOWN_MS())
+        throw new AppError(409, ErrorCodes.CONFLICT, `回退冷却中:节点 ${Math.ceil((COOLDOWN_MS() - elapsed) / 1000)}s 内禁止再次回退`)
     }
   }
 
@@ -415,7 +416,7 @@ export class RecipeRollBackManager {
       if (record.policy === 'observe_only')
         continue
       const setMs = Date.parse(record.setAt)
-      if (now - setMs < MIN_WINDOW_MS)
+      if (now - setMs < MIN_WINDOW_MS())
         continue
       if (record.evaluatedAt && now - Date.parse(record.evaluatedAt) < RECHECK_MS)
         continue

package/server/services/workshop/logger.ts

@@ -1,58 +1,65 @@
-/**
- * 极简结构化日志(R4):级别 + JSON 行,env 开关。
- * - AWSHOP_LOG_LEVEL = debug | info | warn | error(默认 info)
- * - 输出:单行 JSON(t/level/scope/msg/args),error/warn 走 stderr,其余 stdout
- * - 范围收敛:仅替换 server/services/workshop 目录的 console 直出
- *   (request-log、plugins、mcp 的 console 保留,见计划 R4-2,避免全量替换的回归面)
- */
-
-export type LogLevel = 'debug' | 'info' | 'warn' | 'error'
-
-const LEVELS: Record<LogLevel, number> = { debug: 10, info: 20, warn: 30, error: 40 }
-
-function minLevel(): LogLevel {
-  const v = process.env.AWSHOP_LOG_LEVEL as LogLevel | undefined
-  return v && v in LEVELS ? v : 'info'
-}
-
-/** 安全序列化:Error → stack,循环引用降级为 [Circular],序列化失败降级 String */
-function safe(value: unknown): unknown {
-  if (value instanceof Error) return value.stack ?? String(value)
-  if (typeof value === 'object' && value !== null) {
-    try {
-      return JSON.parse(JSON.stringify(value))
-    }
-    catch {
-      return '[Unserializable]'
-    }
-  }
-  return value
-}
-
-export interface Logger {
-  debug(msg: string, ...args: unknown[]): void
-  info(msg: string, ...args: unknown[]): void
-  warn(msg: string, ...args: unknown[]): void
-  error(msg: string, ...args: unknown[]): void
-}
-
-export function createLogger(scope: string): Logger {
-  const emit = (level: LogLevel, msg: string, args: unknown[]): void => {
-    if (LEVELS[level] < LEVELS[minLevel()]) return
-    const line = JSON.stringify({
-      t: new Date().toISOString(),
-      level,
-      scope,
-      msg,
-      ...(args.length ? { args: args.map(safe) } : {}),
-    })
-    if (level === 'error' || level === 'warn') console.error(line)
-    else console.log(line)
-  }
-  return {
-    debug: (msg, ...args) => emit('debug', msg, args),
-    info: (msg, ...args) => emit('info', msg, args),
-    warn: (msg, ...args) => emit('warn', msg, args),
-    error: (msg, ...args) => emit('error', msg, args),
-  }
-}
+/**
+ * 极简结构化日志(R4):级别 + JSON 行,配置驱动。
+ * - log.level(设置描述符;env AWSHOP_LOG_LEVEL 兼容别名)= debug|info|warn|error(默认 info)
+ * - 输出:单行 JSON(t/level/scope/msg/args),error/warn 走 stderr,其余 stdout
+ * - 范围收敛:仅替换 server/services/workshop 目录的 console 直出
+ *   (request-log、plugins、mcp 的 console 保留,见计划 R4-2,避免全量替换的回归面)
+ */
+import { settingOf } from './settings'
+
+export type LogLevel = 'debug' | 'info' | 'warn' | 'error'
+
+const LEVELS: Record<LogLevel, number> = { debug: 10, info: 20, warn: 30, error: 40 }
+
+function minLevel(): LogLevel {
+  // 配置未就绪/解析失败回落 info(日志层永不因配置抛错)
+  try {
+    const v = settingOf('log.level') as LogLevel
+    return v && v in LEVELS ? v : 'info'
+  }
+  catch {
+    return 'info'
+  }
+}
+
+/** 安全序列化:Error → stack,循环引用降级为 [Circular],序列化失败降级 String */
+function safe(value: unknown): unknown {
+  if (value instanceof Error) return value.stack ?? String(value)
+  if (typeof value === 'object' && value !== null) {
+    try {
+      return JSON.parse(JSON.stringify(value))
+    }
+    catch {
+      return '[Unserializable]'
+    }
+  }
+  return value
+}
+
+export interface Logger {
+  debug(msg: string, ...args: unknown[]): void
+  info(msg: string, ...args: unknown[]): void
+  warn(msg: string, ...args: unknown[]): void
+  error(msg: string, ...args: unknown[]): void
+}
+
+export function createLogger(scope: string): Logger {
+  const emit = (level: LogLevel, msg: string, args: unknown[]): void => {
+    if (LEVELS[level] < LEVELS[minLevel()]) return
+    const line = JSON.stringify({
+      t: new Date().toISOString(),
+      level,
+      scope,
+      msg,
+      ...(args.length ? { args: args.map(safe) } : {}),
+    })
+    if (level === 'error' || level === 'warn') console.error(line)
+    else console.log(line)
+  }
+  return {
+    debug: (msg, ...args) => emit('debug', msg, args),
+    info: (msg, ...args) => emit('info', msg, args),
+    warn: (msg, ...args) => emit('warn', msg, args),
+    error: (msg, ...args) => emit('error', msg, args),
+  }
+}

package/server/services/workshop/runtime/embedding-provider.ts

@@ -1,9 +1,12 @@
 /**
- * Embedding provider — OpenAI 兼容 /embeddings 端点(env 驱动,原生 fetch 零 SDK)。
- * 未配置 env → 返回 null(向量分支整体关闭,记忆系统纯 FTS 降级)。
+ * Embedding provider — OpenAI 兼容 /embeddings 端点(配置驱动,原生 fetch 零 SDK)。
+ * 未配置(memory.embed_base_url/embed_model 均空)→ 返回 null(向量分支整体关闭,记忆系统纯 FTS 降级)。
+ * 覆盖链:config.yml < runtime-settings < env(AW_MEMORY_EMBED_*);原生 fetch 零 SDK。
  * 熔断:连续 3 次失败禁用 10 分钟(避免每个任务都白等超时)。
  * 维度:首次成功 embed 的返回长度(不信任配置,以实测为准)。
  */
+import { memorySettings } from '../settings'
+
 export interface EmbeddingProvider {
   embed(texts: string[]): Promise<Float32Array[]>
   /** 已知维度(首次成功 embed 前 null) */
@@ -15,10 +18,11 @@ const COOLDOWN_MS = 10 * 60_000
 const REQUEST_TIMEOUT_MS = 10_000
 
 export function createEnvEmbeddingProvider(): EmbeddingProvider | null {
-  const baseUrl = process.env.AW_MEMORY_EMBED_BASE_URL
-  const model = process.env.AW_MEMORY_EMBED_MODEL
+  const memoryCfg = memorySettings()
+  const baseUrl = memoryCfg.embed_base_url || undefined
+  const model = memoryCfg.embed_model || undefined
   if (!baseUrl || !model) return null
-  const apiKey = process.env.AW_MEMORY_EMBED_API_KEY ?? ''
+  const apiKey = memoryCfg.embed_api_key ?? ''
   let dims: number | null = null
   let fails = 0
   let disabledUntil = 0

package/server/services/workshop/runtime/manager.ts

@@ -37,7 +37,8 @@ import type { ChannelBus, MemberChangeEvent, TaskEngine, TaskEventTask } from '.
 import { ChannelRuntime } from './channel-runtime'
 import { SchedulerLoop, type SchedulerLoopOptions } from './scheduler-loop'
 import { TaskEngine as TaskEngineImpl } from './task-engine'
-import { AgentMemory, envNum, runMemoryMaintenance, segmentCJK, unsegmentCJK, vectorizeMemory, type MaintenanceResult, type MemorySnippet } from './memory'
+import { AgentMemory, runMemoryMaintenance, segmentCJK, unsegmentCJK, vectorizeMemory, type MaintenanceResult, type MemorySnippet } from './memory'
+import { memorySettings } from '../settings'
 import { createEnvEmbeddingProvider } from './embedding-provider'
 import { listHarnessProcesses, listAliveHarnessProcessesByAgent, sweepHarnessProcesses, killHarnessProcess } from '../agents/harness-process'
 import { hasTerminalSession, sweepTerminalSessions } from '../agents/harness-terminal'
@@ -323,7 +324,7 @@ export class AgentChannelManager {
       catch (err) {
         log.error('[memory] 反思任务异常', err)
       }
-    }, envNum('AW_MEMORY_MAINTENANCE_MS', 6 * 3600_000))
+    }, memorySettings().maintenance_ms)
     this.memoryTimer.unref?.()
   }
 
@@ -444,7 +445,7 @@ export class AgentChannelManager {
     for (const rt of this.agentIndex.values()) {
       if (rt.getState() === 'busy') return
     }
-    const trigger = envNum('AW_MEMORY_REFLECT_TRIGGER', 8)
+    const trigger = memorySettings().reflect_trigger
     const month = new Date().toISOString().slice(0, 7)
     for (const agentId of this.deps.repos.memories.listMemoryAgentIds()) {
       const rows = this.deps.repos.memories.listByAgentWithRowid(agentId, 1_000_000)
@@ -2545,9 +2546,12 @@ export class AgentChannelManager {
    * 协同工作流的第一步——先看别的团队在做什么/做过什么,再决定是否发信请求协作。
    */
   listOtherTeamsOverview(channelId: string, agentId: string): Array<{
-    channelId: string, name: string, description: string, leadName: string | null,
-    activeTasks: Array<{ id: string, title: string, state: string }>,
-    recentCompleted: Array<{ title: string }>,
+    channelId: string
+    name: string
+    description: string
+    leadName: string | null
+    activeTasks: Array<{ id: string, title: string, state: string }>
+    recentCompleted: Array<{ title: string }>
   }> {
     this.requireMember(channelId, agentId)
     const sender = this.deps.repos.channelAgents.findByChannelAgent(channelId, agentId)
@@ -2582,7 +2586,12 @@ export class AgentChannelManager {
    * 无需跨 channel 发信;查无所得而有协作必要时,再由 lead 发起跨 channel 通信。
    */
   recallOtherTeamsMemory(channelId: string, agentId: string, input: { query: string, limit?: number }): Array<{
-    channelId: string, channelName: string, title: string, content: string, importance: number, createdAt: string,
+    channelId: string
+    channelName: string
+    title: string
+    content: string
+    importance: number
+    createdAt: string
   }> {
     this.requireMember(channelId, agentId)
     const q = input.query.trim()

package/server/services/workshop/runtime/memory.ts

@@ -13,6 +13,7 @@ import type { MemoryRow } from '../db/database'
 import type { WorkspaceTask } from '../types/task'
 import type { A2AMessage, Part } from '../types/a2a'
 import type { EmbeddingProvider } from './embedding-provider'
+import { memorySettings } from '../settings'
 
 const W_RELEVANCE = 0.5
 const W_RECENCY = 0.3
@@ -44,12 +45,18 @@ const RECENCY_HALF_LIFE_DAYS: Record<string, number> = {
 }
 const CONTENT_STORE_LIMIT = 800
 
-/** 环境变量安全数值(非有限/非正数 → fallback;防 NaN/0 破坏预算与定时器) */
+/** 环境变量安全数值(非有限/非正数 → fallback;防 NaN/0 破坏预算与定时器)。
+ *  @deprecated 配置驱动迁移后仅存量测试使用;新代码读 memorySettings().*
 export function envNum(name: string, fallback: number): number {
   const n = Number(process.env[name])
   return Number.isFinite(n) && n > 0 ? n : fallback
 }
 
+/** memory 组配置(单次解析,进程缓存;env AW_MEMORY_* 经 schema 描述符通用覆盖) */
+function memoryCfg() {
+  return memorySettings()
+}
+
 export interface AgentMemoryOptions {
   channelId: string
   agentId: string
@@ -264,10 +271,10 @@ export class AgentMemory {
   async recall(query: string, recallOpts: RecallOptions = {}): Promise<string | null> {
     const doTouch = recallOpts.touch !== false
     // 显式 budgetTokens(实例/调用级)= 整块记忆硬顶(L0 简报+L1 引子+提示全计入);
-    // 未显式设置 = 双预算:L1 引子 ≤ AW_MEMORY_PRIMER_TOKENS(300),整块 ≤ AW_MEMORY_INJECT_TOTAL(500)
+    // 未显式设置 = 双预算:L1 引子 ≤ memory.primer_tokens(300),整块 ≤ memory.inject_total(500)
     const explicit = recallOpts.budgetTokens ?? this.opts.budgetTokens
-    const budget = explicit ?? envNum('AW_MEMORY_PRIMER_TOKENS', 300)
-    const totalBudget = explicit ?? envNum('AW_MEMORY_INJECT_TOTAL', 500)
+    const budget = explicit ?? memoryCfg().primer_tokens
+    const totalBudget = explicit ?? memoryCfg().inject_total
     const scope = recallOpts.scope ?? 'auto'
     const scored = await this.rank(query, scope, { excludeCurated: true, relatedTaskIds: recallOpts.relatedTaskIds })
 
@@ -624,9 +631,9 @@ export function runMemoryMaintenance(
   repo: MemoryRepo,
   opts: { expireDays?: number, cap?: number } = {},
 ): MaintenanceResult {
-  const expireDays = opts.expireDays ?? envNum('AW_MEMORY_EXPIRE_DAYS', 180)
-  const sessionExpireDays = envNum('AW_MEMORY_EXPIRE_SESSION_DAYS', 14)
-  const cap = opts.cap ?? envNum('AW_MEMORY_CAP', 500)
+  const expireDays = opts.expireDays ?? memoryCfg().expire_days
+  const sessionExpireDays = memoryCfg().expire_session_days
+  const cap = opts.cap ?? memoryCfg().cap
   const now = Date.now()
   let deletedExpired = 0
   let evicted = 0

package/server/services/workshop/settings.ts

@@ -0,0 +1,143 @@
+/**
+ * 运行语义设置读取(服务端唯一入口;配置驱动 first)。
+ *
+ * 与构建期 loadConfig(app/config)解耦:server 树内引用树外模块会触发 nitro dev
+ * 的外部化缺陷(相对路径溢出盘符根),故本模块走 @/shared 别名 + 描述符体系。
+ *
+ * 值的解析链(shared/config/schema.json 描述符为单一事实来源):
+ *   描述符默认 < config.yml < <configRoot>/runtime-settings.json < 环境变量(AW_<键> / 历史别名)
+ * 键=描述符 key(config.yml 中同形;zod 于构建期校验,运行时以描述符默认兜底)。
+ * 结果进程内缓存 3s(键均为 restart 级;热改配置重启生效,无需更低延迟)。
+ */
+import { join } from 'node:path'
+import {
+  loadEffective,
+} from '@/shared/config/engine.mjs'
+import { resolveRunMode } from '@/shared/config/home.mjs'
+
+let cache: { at: number, effective: Record<string, unknown> } | null = null
+const TTL_MS = 3000
+
+function effective(): Record<string, unknown> {
+  if (cache && Date.now() - cache.at < TTL_MS) return cache.effective
+  const runMode = resolveRunMode({
+    cwd: process.cwd(),
+    packageRoot: process.env.AW_PACKAGE_ROOT ?? process.cwd(),
+    env: process.env,
+  })
+  const eff = loadEffective({
+    configPath: runMode.configPath,
+    settingsPath: runMode.settingsPath ?? join(runMode.configRoot, 'runtime-settings.json'),
+    env: process.env,
+  })
+  cache = { at: Date.now(), effective: eff.effective }
+  return eff.effective
+}
+
+/** 按描述符键读单值(键必已注册 schema.json;缺键 = 描述符默认) */
+export function settingOf(key: string): unknown {
+  return effective()[key]
+}
+
+/** 聚合组(前缀匹配;dotted 键 → 平铺键名,如 memory.primer_tokens → { primer_tokens }) */
+function section<G extends string>(group: string): G {
+  const out: Record<string, unknown> = {}
+  const prefix = `${group}.`
+  for (const [k, v] of Object.entries(effective())) {
+    if (k.startsWith(prefix)) out[k.slice(prefix.length)] = v
+  }
+  return out as G
+}
+
+// ---------- 类型化组(形状与 app/config zod、schema.json 描述符三处一致) ----------
+
+export interface MemorySettings {
+  primer_tokens: number
+  inject_total: number
+  maintenance_ms: number
+  expire_days: number
+  expire_session_days: number
+  cap: number
+  reflect_trigger: number
+  embed_base_url: string
+  embed_model: string
+  embed_api_key: string
+}
+export interface OmpSettings {
+  compact_enabled: boolean
+  compact_threshold: number
+  compact_min_interval_ms: number
+  compact_wait_ms: number
+}
+export interface DcwSettings {
+  rollback_cooldown_ms: number
+  rollback_min_window_ms: number
+  rollback_baseline_ms: number
+  rollback_stale_ms: number
+}
+export interface WorkshopSettings {
+  idle_sweep_ms: number
+  idle_grace_ms: number
+}
+export interface BackupSettings {
+  disabled: boolean
+  interval_hours: number
+  keep: number
+}
+export interface RetentionSettings {
+  disabled: boolean
+  events_days: number
+  messages_days: number
+  audit_days: number
+  approval_days: number
+}
+export interface LogSettings {
+  level: 'debug' | 'info' | 'warn' | 'error'
+}
+export interface DaqRuntimeSettings {
+  mqtt: {
+    host: string
+    port: number
+    username: string
+    password: string
+    secure: boolean
+    caFile: string
+    qos: number
+    rejectUnauthorized: boolean
+  }
+  tsRetentionH: number
+  frameRetentionH: number
+  alarmWebhookUrl: string
+  alarmEscalateMinutes: number
+}
+
+export const memorySettings = (): MemorySettings => section<MemorySettings>('memory')
+export const ompSettings = (): OmpSettings => section<OmpSettings>('omp')
+export const dcwSettings = (): DcwSettings => section<DcwSettings>('dcw')
+export const workshopSettings = (): WorkshopSettings => section<WorkshopSettings>('workshop')
+export const backupSettings = (): BackupSettings => section<BackupSettings>('backup')
+export const retentionSettings = (): RetentionSettings => section<RetentionSettings>('retention')
+export const logSettings = (): LogSettings => section<LogSettings>('log')
+export function daqRuntimeSettings(): DaqRuntimeSettings {
+  const e = effective()
+  const get = (k: string, dflt: unknown): unknown => (e[`daq.${k}`] === undefined ? dflt : e[`daq.${k}`])
+  return {
+    mqtt: {
+      host: String(get('mqtt.host', '127.0.0.1')),
+      port: Number(get('mqtt.port', 1883)),
+      username: String(get('mqtt.username', '')),
+      password: String(get('mqtt.password', '')),
+      secure: Boolean(get('mqtt.secure', false)),
+      caFile: String(get('mqtt.caFile', '')),
+      qos: Number(get('mqtt.qos', 0)),
+      rejectUnauthorized: Boolean(get('mqtt.rejectUnauthorized', true)),
+    },
+    tsRetentionH: Number(get('tsRetentionH', 168)),
+    frameRetentionH: Number(get('frameRetentionH', 720)),
+    alarmWebhookUrl: String(get('alarmWebhookUrl', '')),
+    alarmEscalateMinutes: Number(get('alarmEscalateMinutes', 15)),
+  }
+}
+export function securityHitlTimeoutMs(): number {
+  return Number(effective()['security.hitl_timeout_ms'] ?? 180_000)
+}

package/shared/config/engine.mjs

@@ -203,8 +203,12 @@ export function envOverridesFromEnv(env = process.env, descriptors = loadDescrip
   const out = {}
   for (const desc of descriptors) {
     const varName = `AW_${desc.key.toUpperCase().replace(/\./g, '_')}`
-    if (env[varName] !== undefined) {
-      const coerced = coerceValue(desc, env[varName])
+    // aliases:历史环境变量名兼容(迁移前已在用的非 AW_ 前缀/异序名,如 DAQ_FRAME_RETENTION_H;
+    // 优先级 AW_<KEY> > aliases 中声明顺序)
+    const legacy = (desc.aliases ?? []).map(a => env[a]).find(v => v !== undefined)
+    const rawEnv = env[varName] !== undefined ? env[varName] : legacy
+    if (rawEnv !== undefined) {
+      const coerced = coerceValue(desc, rawEnv)
       if (coerced !== null) out[desc.key] = coerced
     }
   }

package/shared/config/schema.json

@@ -20,6 +20,7 @@
     { "key": "i18n.defaultLocale", "type": "select", "group": "i18n", "label": "默认语言", "labelKey": "settings.runtime.i18n.defaultLocale", "description": "未做本地选择时的界面语言", "applies": "live", "default": "zh-CN", "options": ["zh-CN", "en"] },
 
     { "key": "security.approvalGate", "type": "boolean", "group": "security", "label": "高危操作双人复核", "labelKey": "settings.runtime.security.approvalGate", "description": "R3：开启后写控/删除等高风险操作需另一位管理员批核", "applies": "live", "default": false },
+    { "key": "security.hitl_timeout_ms", "type": "number", "group": "security", "label": "HITL 审批超时(ms)", "labelKey": "settings.runtime.security.hitlTimeoutMs", "description": "手动确认模式下发审批的等待超时(超时按拒绝收敛)", "applies": "restart", "default": 180000, "min": 1000, "max": 86400000, "aliases": ["HITL_TIMEOUT_MS"] },
 
     { "key": "daq.startInfrastructure", "type": "select", "group": "daq", "label": "数采基础设施拉起策略", "labelKey": "settings.runtime.daq.startInfrastructure", "description": "auto=启动探测，不通且有 Docker 则自动拉起；always=仅 Docker 拉起；never=只直连", "applies": "live", "default": "auto", "options": ["auto", "always", "never"] },
     { "key": "daq.mqtt.host", "type": "string", "group": "daq", "label": "MQTT Broker 地址", "labelKey": "settings.runtime.daq.mqttHost", "description": "数采事件总线 MQTT 主机", "applies": "restart", "default": "127.0.0.1" },
@@ -30,6 +31,52 @@
     { "key": "daq.objectstore.port", "type": "number", "group": "daq", "label": "对象存储端口", "labelKey": "settings.runtime.daq.osPort", "description": "MinIO S3 API 端口", "applies": "restart", "default": 9000, "min": 1, "max": 65535 },
     { "key": "daq.objectstore.accessKey", "type": "string", "group": "daq", "label": "对象存储 AccessKey", "labelKey": "settings.runtime.daq.osAccess", "description": "MinIO 访问账号", "applies": "restart", "default": "awshop" },
     { "key": "daq.objectstore.secretKey", "type": "string", "group": "daq", "label": "对象存储 SecretKey", "labelKey": "settings.runtime.daq.osSecret", "description": "MinIO 访问密钥", "applies": "restart", "default": "awshop-secret" },
-    { "key": "daq.objectstore.bucket", "type": "string", "group": "daq", "label": "对象存储桶", "labelKey": "settings.runtime.daq.osBucket", "description": "图像帧存储桶(不存在时自动创建)", "applies": "restart", "default": "daq" }
+    { "key": "daq.objectstore.bucket", "type": "string", "group": "daq", "label": "对象存储桶", "labelKey": "settings.runtime.daq.osBucket", "description": "图像帧存储桶(不存在时自动创建)", "applies": "restart", "default": "daq" },
+
+    { "key": "daq.mqtt.qos", "type": "number", "group": "daq", "label": "MQTT QoS", "labelKey": "settings.runtime.daq.mqttQos", "description": "数采事件总线发布 QoS(0/1/2)", "applies": "restart", "default": 0, "min": 0, "max": 2, "aliases": ["DAQ_MQTT_QOS"] },
+    { "key": "daq.mqtt.username", "type": "string", "group": "daq", "label": "MQTT 用户名", "labelKey": "settings.runtime.daq.mqttUsername", "description": "数采事件总线 MQTT 鉴权用户名(空=匿名)", "applies": "restart", "default": "", "aliases": ["DAQ_MQTT_USERNAME"] },
+    { "key": "daq.mqtt.password", "type": "string", "group": "daq", "label": "MQTT 密码", "labelKey": "settings.runtime.daq.mqttPassword", "description": "数采事件总线 MQTT 鉴权密码", "applies": "restart", "default": "", "aliases": ["DAQ_MQTT_PASSWORD"] },
+    { "key": "daq.mqtt.caFile", "type": "string", "group": "daq", "label": "MQTT CA 证书", "labelKey": "settings.runtime.daq.mqttCaFile", "description": "mqtts 自签 CA 证书文件路径", "applies": "restart", "default": "", "aliases": ["DAQ_MQTT_CA_FILE"] },
+    { "key": "daq.mqtt.rejectUnauthorized", "type": "boolean", "group": "daq", "label": "MQTT 校验证书", "labelKey": "settings.runtime.daq.mqttRejectUnauthorized", "description": "mqtts 是否校验服务端证书(自签调试可关)", "applies": "restart", "default": true, "aliases": ["DAQ_MQTT_REJECT_UNAUTHORIZED"] },
+    { "key": "daq.tsRetentionH", "type": "number", "group": "daq", "label": "标量时序保留(h)", "labelKey": "settings.runtime.daq.tsRetentionH", "description": "SQLite 仿真库标量样本保留小时数(Timescale 由 hypertable 策略管理)", "applies": "restart", "default": 168, "min": 1, "max": 8760, "aliases": ["DAQ_TS_RETENTION_H"] },
+    { "key": "daq.frameRetentionH", "type": "number", "group": "daq", "label": "帧元数据保留(h)", "labelKey": "settings.runtime.daq.frameRetentionH", "description": "daq_frames 帧元数据保留小时数", "applies": "restart", "default": 720, "min": 1, "max": 8760, "aliases": ["DAQ_FRAME_RETENTION_H"] },
+    { "key": "daq.alarmWebhookUrl", "type": "string", "group": "daq", "label": "告警 Webhook", "labelKey": "settings.runtime.daq.alarmWebhookUrl", "description": "告警升级推送的 Webhook 地址(空=不推送)", "applies": "restart", "default": "", "aliases": ["ALARM_WEBHOOK_URL"] },
+    { "key": "daq.alarmEscalateMinutes", "type": "number", "group": "daq", "label": "告警升级时限(min)", "labelKey": "settings.runtime.daq.alarmEscalateMinutes", "description": "未确认告警升级通知的时延(分钟)", "applies": "restart", "default": 15, "min": 1, "max": 1440, "aliases": ["ALARM_ESCALATE_MINUTES"] },
+
+    { "key": "memory.primer_tokens", "type": "number", "group": "memory", "label": "记忆引子预算", "labelKey": "settings.runtime.memory.primerTokens", "description": "注入 Agent 上下文的记忆引子 token 预算(AW_MEMORY_PRIMER_TOKENS)", "applies": "restart", "default": 300, "min": 50, "max": 4000 },
+    { "key": "memory.inject_total", "type": "number", "group": "memory", "label": "记忆注入硬顶", "labelKey": "settings.runtime.memory.injectTotal", "description": "单次记忆注入总 token 硬顶(AW_MEMORY_INJECT_TOTAL)", "applies": "restart", "default": 500, "min": 100, "max": 8000 },
+    { "key": "memory.maintenance_ms", "type": "number", "group": "memory", "label": "记忆维护周期(ms)", "labelKey": "settings.runtime.memory.maintenanceMs", "description": "记忆维护(衰减/驱逐/策展)调度周期", "applies": "restart", "default": 21600000, "min": 60000, "max": 604800000 },
+    { "key": "memory.expire_days", "type": "number", "group": "memory", "label": "情景记忆过期(天)", "labelKey": "settings.runtime.memory.expireDays", "description": "情景任务记忆默认保留天数", "applies": "restart", "default": 180, "min": 1, "max": 3650 },
+    { "key": "memory.expire_session_days", "type": "number", "group": "memory", "label": "会话记忆过期(天)", "labelKey": "settings.runtime.memory.expireSessionDays", "description": "会话级记忆保留天数", "applies": "restart", "default": 14, "min": 1, "max": 365 },
+    { "key": "memory.cap", "type": "number", "group": "memory", "label": "记忆条目上限", "labelKey": "settings.runtime.memory.cap", "description": "单通道记忆条目驱逐上限", "applies": "restart", "default": 500, "min": 50, "max": 50000 },
+    { "key": "memory.reflect_trigger", "type": "number", "group": "memory", "label": "反思触发阈值", "labelKey": "settings.runtime.memory.reflectTrigger", "description": "空闲反思(sleep-time compute)的已积压任务数触发阈值", "applies": "restart", "default": 8, "min": 1, "max": 100 },
+    { "key": "memory.embed_base_url", "type": "string", "group": "memory", "label": "Embedding 端点", "labelKey": "settings.runtime.memory.embedBaseUrl", "description": "OpenAI 兼容 /embeddings 基址(空=向量分支关闭,纯 FTS 检索)", "applies": "restart", "default": "" },
+    { "key": "memory.embed_model", "type": "string", "group": "memory", "label": "Embedding 模型", "labelKey": "settings.runtime.memory.embedModel", "description": "向量编码模型名", "applies": "restart", "default": "" },
+    { "key": "memory.embed_api_key", "type": "string", "group": "memory", "label": "Embedding 密钥", "labelKey": "settings.runtime.memory.embedApiKey", "description": "Embedding 端点鉴权密钥(Bearer)", "applies": "restart", "default": "" },
+
+    { "key": "omp.compact_enabled", "type": "boolean", "group": "omp", "label": "上下文自动压缩", "labelKey": "settings.runtime.omp.compactEnabled", "description": "上下文越过阈值时自动压缩(可被 env 显式关闭)", "applies": "restart", "default": true },
+    { "key": "omp.compact_threshold", "type": "number", "group": "omp", "label": "压缩阈值", "labelKey": "settings.runtime.omp.compactThreshold", "description": "触发压缩的上下文占用比例(0~1)", "applies": "restart", "default": 0.7, "min": 0.3, "max": 0.95 },
+    { "key": "omp.compact_min_interval_ms", "type": "number", "group": "omp", "label": "压缩最小间隔(ms)", "labelKey": "settings.runtime.omp.compactMinIntervalMs", "description": "两次自动压缩之间的最小间隔", "applies": "restart", "default": 300000, "min": 30000, "max": 3600000 },
+    { "key": "omp.compact_wait_ms", "type": "number", "group": "omp", "label": "压缩等待超时(ms)", "labelKey": "settings.runtime.omp.compactWaitMs", "description": "等待 compaction_end 完成事件的超时", "applies": "restart", "default": 120000, "min": 10000, "max": 600000 },
+
+    { "key": "dcw.rollback_cooldown_ms", "type": "number", "group": "dcw", "label": "回退冷却(ms)", "labelKey": "settings.runtime.dcw.rollbackCooldownMs", "description": "回退执行后的同向冷却窗", "applies": "restart", "default": 300000, "min": 0, "max": 3600000 },
+    { "key": "dcw.rollback_min_window_ms", "type": "number", "group": "dcw", "label": "回退最小观察窗(ms)", "labelKey": "settings.runtime.dcw.rollbackMinWindowMs", "description": "开记录后允许判定的最小观察窗", "applies": "restart", "default": 120000, "min": 0, "max": 3600000 },
+    { "key": "dcw.rollback_baseline_ms", "type": "number", "group": "dcw", "label": "基线稳定窗(ms)", "labelKey": "settings.runtime.dcw.rollbackBaselineMs", "description": "上一稳定锚的稳定时间要求", "applies": "restart", "default": 600000, "min": 0, "max": 7200000 },
+    { "key": "dcw.rollback_stale_ms", "type": "number", "group": "dcw", "label": "open 记录过期(ms)", "labelKey": "settings.runtime.dcw.rollbackStaleMs", "description": "open 优化记录多久后允许他人接管", "applies": "restart", "default": 1800000, "min": 60000, "max": 14400000 },
+
+    { "key": "workshop.idle_sweep_ms", "type": "number", "group": "workshop", "label": "空产线扫描(ms)", "labelKey": "settings.runtime.workshop.idleSweepMs", "description": "车间空闲产线扫描周期", "applies": "restart", "default": 30000, "min": 5000, "max": 600000 },
+    { "key": "workshop.idle_grace_ms", "type": "number", "group": "workshop", "label": "空闲宽限(ms)", "labelKey": "settings.runtime.workshop.idleGraceMs", "description": "产线空闲判定的宽限时长", "applies": "restart", "default": 120000, "min": 10000, "max": 3600000 },
+
+    { "key": "backup.disabled", "type": "boolean", "group": "backup", "label": "禁用自动备份", "labelKey": "settings.runtime.backup.disabled", "description": "关闭运行数据自动备份", "applies": "restart", "default": false, "aliases": ["BACKUP_DISABLED"] },
+    { "key": "backup.interval_hours", "type": "number", "group": "backup", "label": "备份间隔(h)", "labelKey": "settings.runtime.backup.intervalHours", "description": "自动备份间隔小时数", "applies": "restart", "default": 24, "min": 1, "max": 720, "aliases": ["BACKUP_INTERVAL_HOURS"] },
+    { "key": "backup.keep", "type": "number", "group": "backup", "label": "备份保留份数", "labelKey": "settings.runtime.backup.keep", "description": "保留的最近备份份数", "applies": "restart", "default": 7, "min": 1, "max": 100, "aliases": ["BACKUP_KEEP"] },
+
+    { "key": "retention.disabled", "type": "boolean", "group": "retention", "label": "禁用数据保留策略", "labelKey": "settings.runtime.retention.disabled", "description": "关闭过期数据清理(调试用)", "applies": "restart", "default": false, "aliases": ["RETENTION_DISABLED", "AW_RETENTION_DISABLED"] },
+    { "key": "retention.events_days", "type": "number", "group": "retention", "label": "事件保留(天)", "labelKey": "settings.runtime.retention.eventsDays", "description": "WS 事件流保留天数", "applies": "restart", "default": 7, "min": 1, "max": 365, "aliases": ["AW_EVENTS_RETENTION_D"] },
+    { "key": "retention.messages_days", "type": "number", "group": "retention", "label": "消息保留(天)", "labelKey": "settings.runtime.retention.messagesDays", "description": "Channel 消息保留天数", "applies": "restart", "default": 30, "min": 1, "max": 3650 },
+    { "key": "retention.audit_days", "type": "number", "group": "retention", "label": "审计日志保留(天)", "labelKey": "settings.runtime.retention.auditDays", "description": "审计日志保留天数(合规观察期,从严保留)", "applies": "restart", "default": 90, "min": 1, "max": 3650 },
+    { "key": "retention.approval_days", "type": "number", "group": "retention", "label": "审批历史保留(天)", "labelKey": "settings.runtime.retention.approvalDays", "description": "审批历史保留天数(历史裁决主张不可变,放宽)", "applies": "restart", "default": 180, "min": 1, "max": 3650 },
+
+    { "key": "log.level", "type": "string", "group": "log", "label": "日志级别", "labelKey": "settings.runtime.log.level", "description": "服务端日志级别(debug/info/warn/error)", "applies": "restart", "default": "info", "aliases": ["AWSHOP_LOG_LEVEL"] }
   ]
 }

package/shared/dcw-protocol.ts

@@ -257,6 +257,14 @@ export interface DcwNodeView {
   lineId: string
   /** 当前设定值(工程量;null = 从未下发) */
   value: number | null
+  /** PLC 当前读数(工程量物理值;周期读/手动读回填,null = 从未读到或不支持) */
+  readValue: number | null
+  /** 最近一次读到 PLC 值的时刻 */
+  lastReadAt: string | null
+  /** 最近一次读失败原因(成功后清空) */
+  lastReadError: string | null
+  /** 周期读间隔 ms(null = 走网关默认;0 = 关闭周期读,仅手动读取) */
+  readIntervalMs: number | null
   /** 最近一次成功下发时刻 / 最近一次写尝试时刻 */
   lastAckAt: string | null
   lastWriteAt: string | null
@@ -286,6 +294,19 @@ export interface AepDcwNodeChange {
   node: DcwNodeView | null
 }
 
+/** dcw.read 帧载荷(每次 PLC 读数直推;周期读 + 手动读共用) */
+export interface AepDcwRead {
+  nodeId: string
+  templateRef: string
+  /** 工程量物理值(读回原始值经换算/标定解码;读失败为 null) */
+  value: number | null
+  /** 原始值(PLC 语义,换算后;非寄存器驱动与 value 同源) */
+  raw: number | null
+  ok: boolean
+  message: string
+  at: string
+}
+
 /** dcw.controller 帧载荷 */
 export interface AepDcwControllerState {
   running: boolean