agentworkshop 0.7.24 → 0.7.33

package/server/services/workshop/runtime/scheduler-loop.ts

@@ -5,7 +5,7 @@
  * 支持三种执行模式:goal(满意度判断)/ loop(循环重放)/ pipeline(流水线)。
  * 权威契约见 docs/superpowers/plans/2026-08-13-agent-workshop-multi-agent.md 核心契约块 T5。
  */
-import { createLogger } from '../logger'
+import { createLogger } from '../logger'
 import { randomUUID } from 'node:crypto'
 import { TERMINAL_TASK_STATES } from '../types/task'
 import type { A2AMessage, ChannelMail } from '../types/a2a'
@@ -51,6 +51,9 @@ export interface SchedulerLoopOptions {
   stallMs?: number
   /** 调度快照邮件提供者(manager 注入;返回最新在前);未注入则快照 mail 为空 */
   supervisionMail?: (limit: number) => ChannelMail[]
+  /** agent 最近一次工具调用时刻(manager 注入;停滞看门狗的活性信号:
+   *  真实 LLM 长工具链不更新 progress 数字,健康工作不能被两轮 stallMs 误回收) */
+  toolActivityOf?: (agentId: string) => number | null
 }
 
 /** 空闲退避上限(指纹不变时 tick 间隔指数退避至此;事件 wake 立即恢复) */
@@ -60,6 +63,7 @@ export class SchedulerLoop {
   private readonly tickMs: number
   private readonly stallMs: number
   private readonly supervisionMail: ((limit: number) => ChannelMail[]) | null
+  private readonly toolActivityOf: ((agentId: string) => number | null) | null
   /** supervise 节流:最小间隔与最近一次执行时刻/信号指纹(token 效率) */
   private lastSuperviseAt = 0
   private lastFingerprint = ''
@@ -101,6 +105,7 @@ export class SchedulerLoop {
     this.tickMs = options.tickMs ?? 1000
     this.stallMs = options.stallMs ?? 300000
     this.supervisionMail = options.supervisionMail ?? null
+    this.toolActivityOf = options.toolActivityOf ?? null
   }
 
   /** 空闲退避:快照指纹连续不变的轮数(决定下次 tick 间隔) */
@@ -439,6 +444,18 @@ export class SchedulerLoop {
     const assigneeState = new Map(this.channelRuntime.getAgents().map(a => [a.agentId, a.getState()]))
     for (const task of tasks) {
       if (task.state !== 'WORKING') continue
+      // 工具调用即活性:最近 stallMs 内有工具invoke的任务视为健康推进,刷新基线并跳过看门狗。
+      // 真实 LLM worker 的长工具链(真实 PLC 写+等待回读)不更新 progress 数字,且回合间隙
+      // runtime 会短暂 idle——仅凭 progress 停滞会把健康任务误回收(实测 live-line 闭环任务
+      // 交付物已含 CLOSEDLOOP-OK 却被Canceled)。真停滞(无工具活动+无进度)仍走 notify→cancel。
+      const lastTool = this.toolActivityOf?.(task.assigneeId) ?? 0
+      const toolActive = lastTool > 0 && now - lastTool <= this.stallMs
+      if (toolActive) {
+        this.lastProgress.set(task.id, { progress: task.progress, at: now })
+        this.progressSeen.set(task.id, { progress: task.progress, at: now })
+        this.notified.delete(task.id)
+        continue
+      }
       if (assigneeState.get(task.assigneeId) === 'busy') {
         // busy 且 progress 长期不变:催一次 lead 介入(notify 到 assignee 本人,请其推进/汇报);
         // 尚未到基准时间或 progress 已变 → 刷新基线

package/server/services/workshop/scene/scene-layout.repo.ts

@@ -9,8 +9,9 @@
  * 应用级单例,写入 server/data/scene-layouts.json,进程内缓存,启动读盘。
  */
 
-import path from 'node:path'
-import { loadJsonFile, saveJsonFileAtomic } from '../json-store.mjs'
+import { join } from 'node:path'
+import { ensureDataDir } from '@/shared/config/home.mjs'
+import { loadJsonFile, saveJsonFileAtomic } from '../json-store.mjs'
 
 export interface SceneLayout {
   channelId: string
@@ -39,9 +40,8 @@ export interface SceneLayoutInput {
   workspaceId?: string
 }
 
-const DB_PATH = process.cwd().endsWith('server')
-  ? 'data/scene-layouts.json'
-  : path.join(process.cwd(), 'server', 'data', 'scene-layouts.json')
+// 配置根 .AgentWorkShop/data（ensureDataDir 自动迁移旧 cwd/server/data 位置）
+const DB_PATH = join(ensureDataDir(), 'scene-layouts.json')
 
 function load(): SceneLayout[] {
   const parsed = loadJsonFile(DB_PATH, [])

package/server/services/workshop/settings.ts

@@ -88,6 +88,14 @@ export interface HarnessSettings {
   opencode_command: string
   codex_command: string
   dsh_command: string
+  gemini_command: string
+  qwen_command: string
+  copilot_command: string
+  cursor_command: string
+  crush_command: string
+  goose_command: string
+  pi_command: string
+  hermes_command: string
   hitl_timeout_ms: number
 }
 export interface DcwSettings {
@@ -131,10 +139,20 @@ export interface DaqRuntimeSettings {
     defaultIntervalMs: number
     minIntervalMs: number
   }
+  /** WS 实时下发节拍(节点 publishIntervalMs 未显式指定时的默认值与下限;
+   *  与采样间隔解耦 —— 采集可以很快而前端仅按此节拍刷新) */
+  publish: {
+    defaultIntervalMs: number
+    minIntervalMs: number
+  }
   /** 时序查询节拍(bucketMs 缺省值与下限;samples/产线查询/Agent daq_query 共用) */
   query: {
     defaultBucketMs: number
     minBucketMs: number
+    /** 前端趋势图自动重新拉取(查询+重绘)间隔默认值 */
+    displayIntervalMs: number
+    /** 前端趋势图刷新间隔下限(前端钳制用) */
+    minDisplayIntervalMs: number
   }
   tsRetentionH: number
   frameRetentionH: number
@@ -172,12 +190,58 @@ export function daqRuntimeSettings(): DaqRuntimeSettings {
       defaultIntervalMs: Number(get('sampling.defaultIntervalMs', 5000)),
       minIntervalMs: Number(get('sampling.minIntervalMs', 1000)),
     },
+    publish: {
+      defaultIntervalMs: Number(get('publish.defaultIntervalMs', 1000)),
+      minIntervalMs: Number(get('publish.minIntervalMs', 0)),
+    },
     query: {
       defaultBucketMs: Number(get('query.defaultBucketMs', 15000)),
       minBucketMs: Number(get('query.minBucketMs', 1000)),
+      displayIntervalMs: Number(get('query.displayIntervalMs', 5000)),
+      minDisplayIntervalMs: Number(get('query.minDisplayIntervalMs', 500)),
     },
   }
 }
 export function securityHitlTimeoutMs(): number {
   return Number(effective()['security.hitl_timeout_ms'] ?? 180_000)
 }
+
+export interface AmlSettings {
+  python: { pythonBin: string, uvBin: string, indexUrl: string }
+  job: { timeoutMs: number, maxConcurrent: number, diskQuotaMb: number, stallMs: number, logTailLines: number }
+  dataset: { maxRows: number, retentionDays: number, allowCrossRecipe: boolean }
+  model: { retiredKeepDays: number }
+  gates: { nrmse: number, rolloutNrmse: number, valTestGap: number, minRows: number, minRuns: number }
+}
+/** AML 自动建模平台运行语义(live 键热生效;logTailLines 非描述符键,固定缺省) */
+export function amlSettings(): AmlSettings {
+  const e = effective()
+  const get = (k: string, dflt: unknown): unknown => (e[`aml.${k}`] === undefined ? dflt : e[`aml.${k}`])
+  return {
+    python: {
+      pythonBin: String(get('python.pythonBin', '')),
+      uvBin: String(get('python.uvBin', '')),
+      indexUrl: String(get('python.indexUrl', '')),
+    },
+    job: {
+      timeoutMs: Number(get('job.timeoutMs', 1_800_000)),
+      maxConcurrent: Number(get('job.maxConcurrent', 2)),
+      diskQuotaMb: Number(get('job.diskQuotaMb', 2048)),
+      stallMs: Number(get('job.stallMs', 600_000)),
+      logTailLines: 500,
+    },
+    dataset: {
+      maxRows: Number(get('dataset.maxRows', 200_000)),
+      retentionDays: Number(get('dataset.retentionDays', 30)),
+      allowCrossRecipe: Boolean(get('dataset.allowCrossRecipe', false)),
+    },
+    model: { retiredKeepDays: Number(get('model.retiredKeepDays', 90)) },
+    gates: {
+      nrmse: Number(get('gates.nrmse', 0.10)),
+      rolloutNrmse: Number(get('gates.rolloutNrmse', 0.25)),
+      valTestGap: Number(get('gates.valTestGap', 0.20)),
+      minRows: Number(get('gates.minRows', 500)),
+      minRuns: Number(get('gates.minRuns', 3)),
+    },
+  }
+}

package/shared/config/engine.mjs

@@ -60,6 +60,11 @@ export function loadDescriptors() {
     join(here, 'schema.json'),
     resolve(process.cwd(), 'shared', 'config', 'schema.json'),
     resolve(process.cwd(), 'config', 'schema.json'),
+    // 产物自带副本:nuxt 构建把 shared/config/schema.json 复制到
+    // .output/.AgentWorkShop/schema.json。直接 node .output/server/index.mjs
+    // 启动(无 scripts/start.mjs 注入 AW_PACKAGE_ROOT)时,这是唯一能找到描述符
+    // 的路径 —— 缺了它启动即 `找不到 schema.json` 崩,且报错只说"尝试了哪些路径"。
+    resolve(process.cwd(), '.output', '.AgentWorkShop', 'schema.json'),
   ]
   // 启动器注入的载荷根(start.mjs / dev-guard 恒设置;全局安装 = 包根,shared/ 随包发布)
   if (process.env.AW_PACKAGE_ROOT) {

package/shared/config/groups.mjs

@@ -0,0 +1,220 @@
+/**
+ * 配置分组注册表 —— 设置页分组的单一事实来源。
+ *
+ * 描述符(schema.json / 插件声明)只负责声明 `group`(分组 id);分组的标题、说明、
+ * 排序、默认折叠状态由本注册表给出。这样「后端 API 控制前端渲染」才成立:
+ * 前端不再自己扫描描述符猜分组,而是完全按服务端返回的 groups 顺序与元数据渲染。
+ *
+ * 三类来源(source):
+ *   builtin —— 由 schema.json 的声明顺序自动推导(不可删除,可改标题/排序)
+ *   user    —— 管理员经 /api/system/config-groups 创建
+ *   plugin  —— 插件装载期声明(ctx.config.defineGroup 或 manifest.configGroups);
+ *              插件卸载/热重载时自动摘除,不残留空分组
+ *
+ * 健壮性:任何描述符引用了未注册的 group id → 自动兜底注册(source=builtin,
+ * 标题取 id)。字段永不因为「分组没登记」而在设置页消失。
+ *
+ * 持久化:<configRoot>/config-groups.json
+ */
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+
+export const GROUPS_FILENAME = 'config-groups.json'
+
+/**
+ * 插件分组 id 规约:plugin-<插件名>[-<后缀>](合法标识符,可直接进 URL 与 i18n key)。
+ * 把插件声明的任意 id 收敛进自己的命名空间,避免两个插件用同一个 "network" 互相覆盖,
+ * 也保证插件卸载时能可靠识别并摘除自己声明的分组。
+ */
+export function pluginGroupId(pluginName, suffix) {
+  const ns = String(pluginName).replace(/[^A-Za-z0-9_-]/g, '-')
+  const sub = suffix == null || suffix === '' ? '' : `-${String(suffix).replace(/[^A-Za-z0-9_-]/g, '-')}`
+  return `plugin-${ns}${sub}`.slice(0, 48)
+}
+
+/** 插件声明的分组 id → 命名空间内 id(label 保持原样展示) */
+export function namespacedPluginGroupId(pluginName, declaredId) {
+  const raw = String(declaredId ?? '').trim()
+  if (!raw) return pluginGroupId(pluginName)
+  if (raw === 'default' || raw === String(pluginName)) return pluginGroupId(pluginName)
+  return pluginGroupId(pluginName, raw)
+}
+
+/** 插件默认配置分组 id(未显式声明 group 的字段落这里 → 每个插件天然一个独立分区) */
+export function defaultPluginGroupId(pluginName) {
+  return pluginGroupId(pluginName)
+}
+
+const ID_RE = /^[A-Za-z0-9_-]{1,48}$/
+
+/**
+ * 规范化分组定义。
+ * order 只在「显式给出」或调用方提供 fallbackOrder(新建分组时)才落值 ——
+ * 从磁盘读回的旧条目若没写 order,交给 mergeGroups 沿用内置声明顺序,
+ * 否则会平白跳到列表末尾。
+ * @returns {{ ok: true, group: object } | { ok: false, error: string }}
+ */
+export function normalizeGroup(def, { source = 'user', plugin = null, fallbackOrder } = {}) {
+  const d = def ?? {}
+  const id = String(d.id ?? '').trim()
+  if (!ID_RE.test(id)) {
+    return { ok: false, error: `分组 id 非法(仅字母数字_-，1~48 位): ${JSON.stringify(d.id)}` }
+  }
+  const label = String(d.label ?? d.labelKey ?? id).trim()
+  if (!label) return { ok: false, error: `分组 ${id}: label 不能为空` }
+  const order = Number.isFinite(Number(d.order)) ? Number(d.order) : fallbackOrder
+  const group = {
+    id,
+    label,
+    description: String(d.description ?? ''),
+    /** 前端默认是否折叠(用户本地展开/收起偏好优先,见设置页 localStorage) */
+    collapsed: d.collapsed === true,
+    /** false = 不可折叠(始终展开;用于字段极少的固定分组) */
+    collapsible: d.collapsible !== false,
+    icon: d.icon ? String(d.icon) : '',
+    source,
+  }
+  if (order !== undefined) group.order = order
+  if (d.labelKey) group.labelKey = String(d.labelKey)
+  if (plugin) group.plugin = String(plugin)
+  return { ok: true, group }
+}
+
+function readFile(file) {
+  try {
+    const raw = JSON.parse(readFileSync(file, 'utf8'))
+    const list = Array.isArray(raw) ? raw : (Array.isArray(raw?.groups) ? raw.groups : [])
+    return list
+  }
+  catch {
+    return []
+  }
+}
+
+/** 原子写入(tmp + rename);Windows 上 rename 覆盖是原子的 */
+export function saveGroups(groups, groupsPath) {
+  mkdirSync(dirname(groupsPath), { recursive: true })
+  const payload = { version: 1, updatedAt: new Date().toISOString(), groups }
+  const tmp = `${groupsPath}.${process.pid}.tmp`
+  writeFileSync(tmp, `${JSON.stringify(payload, null, 2)}\n`, 'utf8')
+  renameSync(tmp, groupsPath)
+  return payload
+}
+
+export function readGroups(groupsPath) {
+  if (!existsSync(groupsPath)) return []
+  const out = []
+  for (const raw of readFile(groupsPath)) {
+    const n = normalizeGroup(raw, { source: raw?.source === 'user' ? 'user' : (raw?.source ?? 'user') })
+    if (n.ok) out.push(n.group)
+  }
+  return out
+}
+
+/**
+ * 由描述符推导内置分组的出现顺序(按 schema 声明顺序,首次出现的位置定序)。
+ * @returns {string[]} 去重后的 group id 列表
+ */
+export function builtinGroupOrder(descriptors = []) {
+  const seen = new Set()
+  const out = []
+  for (const d of descriptors) {
+    const g = String(d?.group ?? '').trim()
+    if (!g || seen.has(g)) continue
+    seen.add(g)
+    out.push(g)
+  }
+  return out
+}
+
+/**
+ * 合并三路来源 → 有序分组列表(唯一分组权威)。
+ *
+ * 覆盖优先级:plugin > persisted(user/用户定制) > builtin 默认。
+ *  · plugin 组每次装载以插件声明为准(插件改标题/排序即刻生效)
+ *  · builtin 组的标题/排序/折叠允许被 persisted 覆盖(管理员定制),但 source 恒为 builtin
+ *  · persisted 里 source=plugin 且本轮插件未声明的 → 摘除(插件卸载不残留)
+ *  · 描述符引用了未登记分组 → 兜底注册,字段不丢
+ *
+ * @param {object} o
+ * @param {Array} o.descriptors      全部描述符(全局 + 插件)
+ * @param {Array} o.persisted        持久化分组(含管理员定制)
+ * @param {Array} o.pluginGroups     本轮插件声明的分组
+ * @param {Map<string,string>} [o.pluginLabelById] 插件名 → 展示名(用于自动生成组标题)
+ */
+export function mergeGroups({ descriptors = [], persisted = [], pluginGroups = [], pluginLabelById = new Map() } = {}) {
+  const out = new Map()
+
+  // 1) 内置:声明顺序定序
+  const builtin = builtinGroupOrder(descriptors)
+  builtin.forEach((id, i) => {
+    out.set(id, {
+      id,
+      label: id,
+      description: '',
+      order: (i + 1) * 10,
+      collapsed: false,
+      collapsible: true,
+      icon: '',
+      source: 'builtin',
+    })
+  })
+
+  // 2) 持久化(管理员定制 + user 组);plugin 来源需等第 3 步确认存活
+  const persistedById = new Map()
+  for (const g of persisted) persistedById.set(g.id, g)
+
+  // 3) 插件声明(权威覆盖)
+  for (const g of pluginGroups) {
+    const merged = { ...(persistedById.get(g.id) ?? {}), ...g, source: 'plugin' }
+    const label = g.label && g.label !== g.id ? g.label : (pluginLabelById.get(g.plugin) ?? g.label)
+    out.set(g.id, { ...merged, label: label || g.id })
+  }
+
+  // 4) 持久化里非插件组的定制覆盖内置默认(order 缺省时保留内置声明顺序)
+  for (const [id, g] of persistedById) {
+    if (g.source === 'plugin') continue // 交给第 3 步/第 5 步裁决
+    const base = out.get(id)
+    const order = g.order !== undefined ? g.order : base?.order
+    if (base) {
+      out.set(id, { ...base, ...g, order, source: base.source })
+    }
+    else {
+      out.set(id, { ...g, order, source: g.source === 'user' ? 'user' : 'builtin' })
+    }
+  }
+
+  // 5) 摘除本轮未声明的 plugin 组(插件卸载/停用)
+  for (const [id, g] of out) {
+    if (g.source !== 'plugin') continue
+    const declared = pluginGroups.some(p => p.id === id) || builtin.includes(id)
+    if (!declared) out.delete(id)
+  }
+
+  // 6) 兜底:描述符引用了未登记分组 → 就地注册,保证字段有归属
+  builtin.forEach((id, i) => {
+    if (!out.has(id)) {
+      out.set(id, { id, label: id, description: '', order: (i + 1) * 10, collapsed: false, collapsible: true, icon: '', source: 'builtin' })
+    }
+  })
+
+  return [...out.values()].sort((a, b) => (a.order - b.order) || a.id.localeCompare(b.id))
+}
+
+/** 分组 id 的默认落盘路径(与 runtime-settings.json 同目录) */
+export function groupsPathFor(configRoot) {
+  return join(configRoot, GROUPS_FILENAME)
+}
+
+export default {
+  GROUPS_FILENAME,
+  pluginGroupId,
+  namespacedPluginGroupId,
+  defaultPluginGroupId,
+  normalizeGroup,
+  readGroups,
+  saveGroups,
+  builtinGroupOrder,
+  mergeGroups,
+  groupsPathFor,
+}

package/shared/config/home.mjs

@@ -129,6 +129,8 @@ export function resolveRunMode({ cwd, packageRoot, env = process.env } = {}) {
  *   > home 模式 ~/.AgentWorkShop/data > cwd/data 兜底)。
  * 启动器(scripts/start.mjs / dev-guard.mjs)会经 resolveRunMode 注入 AW_DATA_DIR;
  * 本函数为其兜底(直接 node .output/server/index.mjs 等无启动器场景)。
+ * cwd 显式传入 resolveRunMode:调用方给定了 cwd 就必须以它为准,否则
+ * ensureDataDir(cwd, env) 的迁移目标(cwd 内)与解析源(process.cwd())不一致。
  */
 export function dataDirFor(cwd = process.cwd(), env = process.env) {
   if (env.AW_DATA_DIR && String(env.AW_DATA_DIR).trim()) return resolve(String(env.AW_DATA_DIR).trim())
@@ -138,7 +140,8 @@ export function dataDirFor(cwd = process.cwd(), env = process.env) {
 
 /**
  * 确保数据目录存在，并把旧位置(cwd/data 与 cwd/server/data)的运行时文件
- * 迁入配置根（仅复制目标缺失的文件，不删除旧文件;幂等）。
+ * 迁入配置根。迁移采用「最新者胜」(newest-wins)：目标缺失时复制，或旧位置
+ * 副本严格新于目标时覆盖；目标更新或同时刻一律不覆盖。不删除旧文件;幂等。
  * 迁移覆盖 sqlite 主库/-wal/-shm 与 JSON 仓库文件;跳过 .tmp 临时产物。
  */
 export function ensureDataDir(cwd = process.cwd(), env = process.env) {
@@ -163,7 +166,13 @@ export function ensureDataDir(cwd = process.cwd(), env = process.env) {
       const src = join(legacy, f)
       const dst = join(dir, f)
       try {
-        if (!existsSync(dst) && statSync(src).isFile()) copyFileSync(src, dst)
+        if (!statSync(src).isFile()) continue
+        // 最新者胜(newest-wins)：历史实现只在目标缺失时复制，两处各存一份后
+        // 便永久分叉——旧位置继续被 cwd 相对路径的写入方更新，配置根却再无覆盖机会。
+        // 改为按 mtimeMs 比较：旧位置严格更新才覆盖，目标更新或同时刻保持不动，
+        // 因此两侧收敛到同一份(更新的)数据，且不会用陈旧副本倒退已迁移的库。
+        if (existsSync(dst) && statSync(src).mtimeMs <= statSync(dst).mtimeMs) continue
+        copyFileSync(src, dst)
       }
       catch { /* 单个文件迁移失败不阻断 */ }
     }

package/shared/config/schema.json

@@ -40,8 +40,12 @@
     { "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.sampling.defaultIntervalMs", "type": "number", "group": "daq", "label": "节点采样默认间隔(ms)", "labelKey": "settings.runtime.daq.samplingDefaultIntervalMs", "description": "数采节点未显式指定 intervalMs 时的采集周期(采样→入库→事件一拍)", "applies": "live", "default": 5000, "min": 200, "max": 60000, "aliases": ["DAQ_SAMPLING_DEFAULT_INTERVAL_MS"] },
     { "key": "daq.sampling.minIntervalMs", "type": "number", "group": "daq", "label": "节点采样下限(ms)", "labelKey": "settings.runtime.daq.samplingMinIntervalMs", "description": "数采节点允许配置的最小采样周期(create/patch/存量收敛统一钳制)", "applies": "live", "default": 1000, "min": 200, "max": 60000, "aliases": ["DAQ_SAMPLING_MIN_INTERVAL_MS"] },
+    { "key": "daq.publish.defaultIntervalMs", "type": "number", "group": "daq", "label": "WS 下发默认间隔(ms)", "labelKey": "settings.runtime.daq.publishDefaultIntervalMs", "description": "数采节点未显式指定 publishIntervalMs 时,给前端实时推送读数的间隔(与采集间隔解耦;0=随采集节拍每帧下发)", "applies": "live", "default": 1000, "min": 0, "max": 60000, "aliases": ["DAQ_PUBLISH_DEFAULT_INTERVAL_MS"] },
+    { "key": "daq.publish.minIntervalMs", "type": "number", "group": "daq", "label": "WS 下发下限(ms)", "labelKey": "settings.runtime.daq.publishMinIntervalMs", "description": "数采节点允许配置的最小 WS 下发间隔(0=允许每帧下发;调大可抑制前端刷新频率)", "applies": "live", "default": 0, "min": 0, "max": 60000, "aliases": ["DAQ_PUBLISH_MIN_INTERVAL_MS"] },
     { "key": "daq.query.defaultBucketMs", "type": "number", "group": "daq", "label": "时序查询默认间隔(ms)", "labelKey": "settings.runtime.daq.queryDefaultBucketMs", "description": "Timescale 查询未指定 bucketMs 时的降采样桶宽(samples/产线查询/Agent daq_query 共用)", "applies": "live", "default": 15000, "min": 100, "max": 3600000, "aliases": ["DAQ_QUERY_DEFAULT_BUCKET_MS"] },
     { "key": "daq.query.minBucketMs", "type": "number", "group": "daq", "label": "时序查询下限(ms)", "labelKey": "settings.runtime.daq.queryMinBucketMs", "description": "时序查询允许的最小降采样桶宽(传入更小值时钳到该下限)", "applies": "live", "default": 1000, "min": 100, "max": 3600000, "aliases": ["DAQ_QUERY_MIN_BUCKET_MS"] },
+    { "key": "daq.query.displayIntervalMs", "type": "number", "group": "daq", "label": "趋势图刷新间隔(ms)", "labelKey": "settings.runtime.daq.queryDisplayIntervalMs", "description": "数采详情页历史趋势图自动重新拉取(时序库查询并重绘)的间隔(与采集/WS 下发独立)", "applies": "live", "default": 5000, "min": 500, "max": 600000, "aliases": ["DAQ_QUERY_DISPLAY_INTERVAL_MS"] },
+    { "key": "daq.query.minDisplayIntervalMs", "type": "number", "group": "daq", "label": "趋势图刷新下限(ms)", "labelKey": "settings.runtime.daq.queryMinDisplayIntervalMs", "description": "前端允许配置的最小趋势图刷新间隔(传入更小值时钳到该下限,防止高频查询时序库)", "applies": "live", "default": 500, "min": 100, "max": 600000, "aliases": ["DAQ_QUERY_MIN_DISPLAY_INTERVAL_MS"] },
     { "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"] },
@@ -66,7 +70,15 @@
     { "key": "harness.opencode_command", "type": "string", "group": "harness", "label": "opencode 命令", "labelKey": "settings.runtime.harness.opencodeCommand", "description": "OpenCode 引擎可执行文件(PATH 解析)", "applies": "restart", "default": "opencode" },
     { "key": "harness.codex_command", "type": "string", "group": "harness", "label": "codex 命令", "labelKey": "settings.runtime.harness.codexCommand", "description": "OpenAI Codex CLI 可执行文件(app-server 模式)", "applies": "restart", "default": "codex" },
     { "key": "harness.dsh_command", "type": "string", "group": "harness", "label": "dsh 命令", "labelKey": "settings.runtime.harness.dshCommand", "description": "DeepSeek Harness 可执行文件(ACP 模式)", "applies": "restart", "default": "dsh" },
-    { "key": "harness.hitl_timeout_ms", "type": "number", "group": "harness", "label": "引擎审批超时(ms)", "labelKey": "settings.runtime.harness.hitlTimeoutMs", "description": "codex/opencode/dsh 权限审批无人应答的自动拒绝时限(0=无限等待)", "applies": "restart", "default": 300000, "min": 0, "max": 3600000 },
+{ "key": "harness.gemini_command", "type": "string", "group": "harness", "label": "gemini 命令", "labelKey": "settings.runtime.harness.geminiCommand", "description": "Google Gemini CLI 可执行文件(stream-json 无头)", "applies": "restart", "default": "gemini" },
+    { "key": "harness.qwen_command", "type": "string", "group": "harness", "label": "qwen 命令", "labelKey": "settings.runtime.harness.qwenCommand", "description": "Qwen Code 可执行文件(experimental-acp 模式)", "applies": "restart", "default": "qwen" },
+    { "key": "harness.copilot_command", "type": "string", "group": "harness", "label": "copilot 命令", "labelKey": "settings.runtime.harness.copilotCommand", "description": "GitHub Copilot CLI 可执行文件(JSONL 无头)", "applies": "restart", "default": "copilot" },
+    { "key": "harness.cursor_command", "type": "string", "group": "harness", "label": "cursor 命令", "labelKey": "settings.runtime.harness.cursorCommand", "description": "Cursor CLI 可执行文件(stream-json 无头)", "applies": "restart", "default": "cursor-agent" },
+    { "key": "harness.crush_command", "type": "string", "group": "harness", "label": "crush 命令", "labelKey": "settings.runtime.harness.crushCommand", "description": "Charm Crush 可执行文件(run 非交互模式)", "applies": "restart", "default": "crush" },
+{ "key": "harness.goose_command", "type": "string", "group": "harness", "label": "goose 命令", "labelKey": "settings.runtime.harness.gooseCommand", "description": "Block Goose 可执行文件(run stream-json 无头)", "applies": "restart", "default": "goose" },
+    { "key": "harness.pi_command", "type": "string", "group": "harness", "label": "pi 命令", "labelKey": "settings.runtime.harness.piCommand", "description": "pi coding agent 可执行文件(-p --mode json 无头)", "applies": "restart", "default": "pi" },
+    { "key": "harness.hermes_command", "type": "string", "group": "harness", "label": "hermes 命令", "labelKey": "settings.runtime.harness.hermesCommand", "description": "Hermes Agent 可执行文件(acp 模式)", "applies": "restart", "default": "hermes" },
+            { "key": "harness.hitl_timeout_ms", "type": "number", "group": "harness", "label": "引擎审批超时(ms)", "labelKey": "settings.runtime.harness.hitlTimeoutMs", "description": "codex/opencode/dsh 权限审批无人应答的自动拒绝时限(0=无限等待)", "applies": "restart", "default": 300000, "min": 0, "max": 3600000 },
 
     { "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 },
@@ -86,6 +98,23 @@
     { "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"] }
+    { "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"] },
+
+    { "key": "aml.python.pythonBin", "type": "string", "group": "aml", "label": "Python 解释器", "labelKey": "settings.runtime.aml.pythonBin", "description": "AML 训练运行时 Python 可执行名或绝对路径(空=自动探测 python/py -3)", "applies": "restart", "default": "", "aliases": ["AML_PYTHON_BIN"] },
+    { "key": "aml.python.uvBin", "type": "string", "group": "aml", "label": "uv 可执行", "labelKey": "settings.runtime.aml.uvBin", "description": "存在 uv 时优先用 uv 建 venv/装依赖(快且免管理员);空=自动探测", "applies": "restart", "default": "", "aliases": ["AML_UV_BIN"] },
+    { "key": "aml.python.indexUrl", "type": "string", "group": "aml", "label": "pip 镜像源", "labelKey": "settings.runtime.aml.indexUrl", "description": "venv 依赖安装的 PyPI 兼容镜像(空=默认源);仅 venv 供给阶段使用,训练进程不联网", "applies": "restart", "default": "", "aliases": ["AML_PYTHON_INDEX_URL"] },
+    { "key": "aml.job.timeoutMs", "type": "number", "group": "aml", "label": "作业墙钟超时(ms)", "labelKey": "settings.runtime.aml.jobTimeoutMs", "description": "单个训练作业的墙钟上限,超时杀整棵进程树", "applies": "live", "default": 1800000, "min": 30000, "max": 21600000, "aliases": ["AML_JOB_TIMEOUT_MS"] },
+    { "key": "aml.job.maxConcurrent", "type": "number", "group": "aml", "label": "最大并发作业", "labelKey": "settings.runtime.aml.jobMaxConcurrent", "description": "同时运行的训练子进程数上限(FIFO 队列)", "applies": "live", "default": 2, "min": 1, "max": 8, "aliases": ["AML_JOB_MAX_CONCURRENT"] },
+    { "key": "aml.job.diskQuotaMb", "type": "number", "group": "aml", "label": "AML 磁盘配额(MB)", "labelKey": "settings.runtime.aml.jobDiskQuotaMb", "description": "data/aml 目录总配额,超限拒绝新建数据集/作业并提示清扫", "applies": "live", "default": 2048, "min": 128, "max": 1048576, "aliases": ["AML_DISK_QUOTA_MB"] },
+    { "key": "aml.job.stallMs", "type": "number", "group": "aml", "label": "作业停摆判定(ms)", "labelKey": "settings.runtime.aml.jobStallMs", "description": "无进度协议输出持续该时长则判定停摆并终止作业", "applies": "live", "default": 600000, "min": 60000, "max": 7200000, "aliases": ["AML_JOB_STALL_MS"] },
+    { "key": "aml.dataset.maxRows", "type": "number", "group": "aml", "label": "数据集行数上限", "labelKey": "settings.runtime.aml.datasetMaxRows", "description": "单个数据集滑窗样本上限,超出建议加粗 beatMs", "applies": "live", "default": 200000, "min": 1000, "max": 5000000 },
+    { "key": "aml.dataset.retentionDays", "type": "number", "group": "aml", "label": "无引用数据集保留(天)", "labelKey": "settings.runtime.aml.datasetRetentionDays", "description": "无模型/实验引用的数据集快照保留天数(GC)", "applies": "live", "default": 30, "min": 1, "max": 3650 },
+    { "key": "aml.dataset.allowCrossRecipe", "type": "boolean", "group": "aml", "label": "允许跨 Recipe 合并", "labelKey": "settings.runtime.aml.allowCrossRecipe", "description": "默认禁止:不同热 Recipe 的样本严禁混入同一数据集(防噪音)", "applies": "live", "default": false },
+    { "key": "aml.model.retiredKeepDays", "type": "number", "group": "aml", "label": "退役模型工件保留(天)", "labelKey": "settings.runtime.aml.retiredKeepDays", "description": "retired 模型工件文件保留天数,过期删除(注册表行保留并标记 artifacts_pruned)", "applies": "live", "default": 90, "min": 1, "max": 3650 },
+    { "key": "aml.gates.nrmse", "type": "number", "group": "aml", "label": "门禁:单步 NRMSE", "labelKey": "settings.runtime.aml.gateNrmse", "description": "mpc_surrogate 门禁 G1:测试集单步 NRMSE 上限", "applies": "live", "default": 0.1, "min": 0.01, "max": 1 },
+    { "key": "aml.gates.rolloutNrmse", "type": "number", "group": "aml", "label": "门禁:多步滚动 NRMSE", "labelKey": "settings.runtime.aml.gateRolloutNrmse", "description": "mpc_surrogate 门禁 G2:horizon 步滚动预测测试集 NRMSE 上限(MPC 可用性关键指标)", "applies": "live", "default": 0.25, "min": 0.01, "max": 1 },
+    { "key": "aml.gates.valTestGap", "type": "number", "group": "aml", "label": "门禁:泛化差", "labelKey": "settings.runtime.aml.gateValTestGap", "description": "门禁 G3:|test-val|/val 相对差上限(防过拟合验证集)", "applies": "live", "default": 0.2, "min": 0.01, "max": 2 },
+    { "key": "aml.gates.minRows", "type": "number", "group": "aml", "label": "门禁:最少样本行", "labelKey": "settings.runtime.aml.gateMinRows", "description": "门禁 G4a:数据集滑窗样本行数下限", "applies": "live", "default": 500, "min": 50, "max": 1000000 },
+    { "key": "aml.gates.minRuns", "type": "number", "group": "aml", "label": "门禁:最少批次数", "labelKey": "settings.runtime.aml.gateMinRuns", "description": "门禁 G4b:数据集覆盖的批次(run)数下限", "applies": "live", "default": 3, "min": 1, "max": 1000 }
   ]
 }

package/shared/daq-protocol.ts

@@ -443,6 +443,12 @@ export interface AepDaqControllerState {
   defaultIntervalMs: number
   /** 全局缺省 WS 下发间隔(节点 publishIntervalMs=null 时跟随;0 = 随采样节拍) */
   defaultPublishIntervalMs: number
+  /** WS 下发节拍下限(节点 publishIntervalMs 钳制;0 = 允许每帧) */
+  minPublishIntervalMs?: number
+  /** 前端趋势图自动拉取(时序库查询+重绘)间隔默认值 */
+  queryDisplayIntervalMs?: number
+  /** 前端趋势图刷新间隔下限 */
+  minQueryDisplayIntervalMs?: number
   nodesTotal: number
   nodesOnline: number
   /** 管线指标:生产/消费/队列丢失(produced-consumed)/时序库入库数 */

package/shared/lru.mjs

@@ -0,0 +1,94 @@
+/**
+ * 有界 LRU —— 统一替换代码库里「无界 Map」与「超限整体 clear()」两种劣化写法。
+ *
+ * 现状问题(审计实测):
+ *   · `daq-controller.ts` siblingsCache / opsWriteMemo:超限直接 clear() → 瞬时全量缓存穿透,
+ *     紧接着的请求全部回源,形成周期性抖动;
+ *   · `dcw-controller.ts` opsWriteMemo / `manager.ts` reflectCounts / ownerNameCache:
+ *     完全无淘汰,长跑单调增长(ownerNameCache 有 TTL 判定但过期项只被覆盖、从不删除);
+ *   · `monitor.ts`、`scene-events` 等处的按 key 节流表同型。
+ *
+ * 语义:get 命中即提升为最近使用;set 超限逐出最久未用;delete/clear 与 Map 同名。
+ * 保持 Map 的迭代顺序语义(插入序 → 访问序),因此 `for (const k of lru.keys())` 仍然可用。
+ */
+export class LruMap {
+  /**
+   * @param {number} max 容量上限(≥1)
+   * @param {(key:any, value:any) => void} [onEvict] 逐出回调(可选,用于联动清理外部资源)
+   */
+  constructor(max, onEvict) {
+    if (!Number.isFinite(max) || max < 1) throw new Error('LruMap: max 必须是 ≥1 的数字')
+    this.max = Math.floor(max)
+    this.onEvict = typeof onEvict === 'function' ? onEvict : null
+    /** @type {Map<any, any>} 迭代顺序 = 由旧到新 */
+    this.map = new Map()
+    this.hits = 0
+    this.misses = 0
+    this.evictions = 0
+  }
+
+  get size() { return this.map.size }
+
+  has(key) { return this.map.has(key) }
+
+  get(key) {
+    if (!this.map.has(key)) { this.misses += 1; return undefined }
+    // 访问即提升:删了重插(值不变),维持「尾部最新」
+    const v = this.map.get(key)
+    this.map.delete(key)
+    this.map.set(key, v)
+    this.hits += 1
+    return v
+  }
+
+  /** 命中返回值,未命中用 fallback 计算并写入(单一入口,避免各处手写 get/set 样板) */
+  getOrSet(key, fallback) {
+    const hit = this.get(key)
+    if (hit !== undefined) return hit
+    const v = typeof fallback === 'function' ? fallback(key) : fallback
+    this.set(key, v)
+    return v
+  }
+
+  set(key, value) {
+    if (this.map.has(key)) this.map.delete(key)
+    this.map.set(key, value)
+    // while 而非 if:max 被下调或批量写入时可一次收敛
+    while (this.map.size > this.max) {
+      const oldest = this.map.keys().next().value
+      const val = this.map.get(oldest)
+      this.map.delete(oldest)
+      this.evictions += 1
+      this.onEvict?.(oldest, val)
+    }
+    return this
+  }
+
+  delete(key) { return this.map.delete(key) }
+
+  clear() { this.map.clear() }
+
+  keys() { return this.map.keys() }
+
+  values() { return this.map.values() }
+
+  entries() { return this.map.entries() }
+
+  [Symbol.iterator]() { return this.map[Symbol.iterator]() }
+
+  stats() {
+    const total = this.hits + this.misses
+    return {
+      size: this.map.size,
+      max: this.max,
+      hits: this.hits,
+      misses: this.misses,
+      evictions: this.evictions,
+      hitRate: total === 0 ? 0 : Number((this.hits / total).toFixed(4)),
+    }
+  }
+}
+
+export function createLru(max, onEvict) {
+  return new LruMap(max, onEvict)
+}

package/shared/workshop-protocol.ts

@@ -121,9 +121,9 @@ export interface AepSceneLayout {
 /**
  * hitl.request payload:待人工处理条目的统一视图。
  * kind:omp 对话框(rpc-ui ask)/ dcw 工具审批 / codex 命令与文件审批 /
- * opencode 权限与提问 / dsh 权限请求。
+ * opencode 权限与提问 / dsh 权限请求 / claude canUseTool / qwen 工具确认。
  */
-export type AepHitlKind = 'omp-dialog' | 'dcw-approval' | 'codex-approval' | 'opencode-permission' | 'dsh-permission'
+export type AepHitlKind = 'omp-dialog' | 'dcw-approval' | 'codex-approval' | 'opencode-permission' | 'dsh-permission' | 'claude-permission' | 'qwen-permission' | 'hermes-permission'
 
 export interface AepHitlItem {
   kind: AepHitlKind