agentworkshop 0.7.66 → 0.7.71

package/server/services/workshop/tools/policy.ts

@@ -0,0 +1,150 @@
+/**
+ * Channel 级工具策略:选择模式 / 逐工具开关 / 执行闸门。
+ *
+ * 硬边界:本模块只负责“在已合格工具集合里做减法”。角色、Channel profile、写守卫、
+ * 插件总开关仍由 host-tool-bridge/catalog 与 dispatch 的既有规则决定;Channel 选择
+ * 不能把被硬规则排除的工具打开。
+ *
+ * 无策略行(默认)= mode='all' + 全部合格工具启用,保证存量 Channel 行为不变。
+ */
+import { getToolRegistryRepo, type ChannelToolPolicySnapshot, type ToolPolicyMode } from '../db/tool-registry.repo'
+import { HYBRID_TWIN_DIRECT_WRITE_TOOL_NAMES } from '../agents/tool-classes'
+import { createLogger } from '../logger'
+
+const log = createLogger('workshop.tool-policy')
+
+let warnedAt = 0
+
+/**
+ * WP7 分级降级:
+ *  - 读取成功 → 更新「最近已知快照」缓存;
+ *  - 读取失败但有缓存(≤5min)→ 用缓存 + stale 标记(读面继续可用,写面由闸门按族拒);
+ *  - 读取失败且无缓存 → selected + 空集(=全拒;比"降级全启用"更安全);
+ *  - env AW_POLICY_DEGRADE=open 回到旧的 fail-open(灰度观察期用,启动期 audit warn)。
+ */
+const lastGood = new Map<string, { snapshot: ChannelToolPolicySnapshot, at: number }>()
+const STALE_MS = 5 * 60_000
+let degradeWarned = false
+
+/** 写族:策略/目录不可判定时这些工具一律拒绝(物理安全优先) */
+const POLICY_WRITE_TOOL_NAMES = new Set<string>([...HYBRID_TWIN_DIRECT_WRITE_TOOL_NAMES, 'line_start', 'line_stop'])
+export function isPolicyWriteTool(name: string): boolean {
+  return POLICY_WRITE_TOOL_NAMES.has(name)
+}
+
+function failOpenMode(): boolean {
+  if (process.env.AW_POLICY_DEGRADE !== 'open') return false
+  if (!degradeWarned) {
+    degradeWarned = true
+    log.warn('AW_POLICY_DEGRADE=open:策略读取失败将降级为全启用(fail-open);安全开关打开态请尽快关闭')
+  }
+  return true
+}
+
+/** 读取策略;DB 故障时按 WP7 分级降级(缓存→stale;无缓存→全拒;fail-open 仅显式开关) */
+export function getPolicySnapshot(channelId: string): ChannelToolPolicySnapshot {
+  const fallback: ChannelToolPolicySnapshot = {
+    channelId,
+    mode: 'all',
+    source: 'default',
+    updatedBy: '',
+    updatedAt: null,
+    settings: new Map(),
+  }
+  if (!channelId) return fallback
+  try {
+    const snapshot = getToolRegistryRepo().snapshot(channelId)
+    lastGood.set(channelId, { snapshot, at: Date.now() })
+    return snapshot
+  }
+  catch (err) {
+    const cached = lastGood.get(channelId)
+    if (cached && Date.now() - cached.at <= STALE_MS) {
+      if (Date.now() - warnedAt > 60_000) {
+        warnedAt = Date.now()
+        log.warn(`读取 Channel 工具策略失败,使用最近已知快照(${Math.round((Date.now() - cached.at) / 1000)}s 前): ${err instanceof Error ? err.message : String(err)}`)
+      }
+      return { ...cached.snapshot, source: 'cached', stale: true, ageMs: Date.now() - cached.at }
+    }
+    if (failOpenMode()) return fallback
+    if (Date.now() - warnedAt > 60_000) {
+      warnedAt = Date.now()
+      log.warn(`读取 Channel 工具策略失败且无可用快照,降级为全拒(selected+空集): ${err instanceof Error ? err.message : String(err)}`)
+    }
+    return { ...fallback, mode: 'selected', source: 'degraded', stale: true }
+  }
+}
+
+/** 该 Channel 是否启用某工具(不考虑角色/profile/写守卫)。 */
+export function isChannelToolEnabled(policy: ChannelToolPolicySnapshot, name: string): boolean {
+  if (policy.mode === 'selected') return policy.settings.get(name) === true
+  return policy.settings.get(name) !== false
+}
+
+/** 在已合格工具集合上应用 Channel 选择。无 channelId = 不裁剪(兼容旧调用)。 */
+export function applyChannelToolPolicy<T extends { name: string }>(tools: T[], channelId?: string): T[] {
+  if (!channelId) return tools
+  const policy = getPolicySnapshot(channelId)
+  if (policy.source === 'default') return tools
+  return tools.filter(t => isChannelToolEnabled(policy, t.name))
+}
+
+export type ToolGateReason = 'CHANNEL_TOOL_DISABLED' | 'UNAVAILABLE' | 'POLICY_UNAVAILABLE'
+
+export interface ToolGateResult {
+  blocked: boolean
+  reason?: ToolGateReason
+  message?: string
+  /** WP7:策略读取降级(读面放行但带降级标记;写面不会带此标记——已被拒) */
+  degraded?: boolean
+}
+
+/**
+ * 执行面闸门:
+ *  - 未知工具不在这里拦截(保持既有“未知工具”错误语义);
+ *  - 目录中存在但当前未注册(unavailable)→ 拒绝;
+ *  - 本 Channel 显式停用 → 拒绝;
+ *  - WP7:目录读取失败时,写族 fail-closed(物理安全优先),读族放行并带 degraded 标记。
+ */
+export function channelToolGate(channelId: string, toolName: string): ToolGateResult {
+  if (!channelId) return { blocked: false }
+  let row: ReturnType<ReturnType<typeof getToolRegistryRepo>['get']>
+  try {
+    row = getToolRegistryRepo().get(toolName)
+  }
+  catch {
+    // 目录不可读:写族必须拒(策略不可判定时不得放行物理写);读族降级可用
+    if (isPolicyWriteTool(toolName)) {
+      return {
+        blocked: true,
+        reason: 'POLICY_UNAVAILABLE',
+        message: `工具「${toolName}」属写族,当前工具目录不可读(策略无法判定),已按安全默认拒绝。请稍后重试;若持续出现请联系管理员。`,
+      }
+    }
+    return { blocked: false, degraded: true }
+  }
+  if (!row) return { blocked: false }
+  if (!row.available) {
+    return {
+      blocked: true,
+      reason: 'UNAVAILABLE',
+      message: `工具「${toolName}」当前未注册(来源插件未安装或加载失败),不可调用。请让管理员在插件管理中启用对应插件后重试。`,
+    }
+  }
+  const policy = getPolicySnapshot(channelId)
+  if (!isChannelToolEnabled(policy, toolName)) {
+    return {
+      blocked: true,
+      reason: 'CHANNEL_TOOL_DISABLED',
+      message: policy.stale
+        ? `本 Channel 已在「设置 → 工具」中停用「${toolName}」(策略为最近已知快照,数据库暂不可读)。请稍后重试或联系 Channel 属主。`
+        : `本 Channel 已在「设置 → 工具」中停用「${toolName}」。请让 Channel 属主在工具管理中启用后重试;硬规则排除的工具不能通过开关绕过。`,
+    }
+  }
+  return { blocked: false, ...(policy.stale ? { degraded: true } : {}) }
+}
+
+/** API 写入前的模式校验 */
+export function normalizeMode(value: unknown): ToolPolicyMode {
+  return value === 'selected' ? 'selected' : 'all'
+}

package/server/services/workshop/tools/registry.ts

@@ -0,0 +1,304 @@
+/**
+ * 工具注册表同步服务:把运行时工具定义投影到 `tool_registry`。
+ *
+ * 事实源仍是:
+ *  - 内置:`HOST_TOOLS`(host-tools.json 加载结果)
+ *  - 插件:`listPluginTools()`(ctx.omp.registerTool 运行时注册)
+ *
+ * 本模块只写元数据,不参与执行;执行仍走 host-tool-bridge / 插件 handler。
+ * 同步幂等:插件注册/卸载、宿主重载、进程启动、手动 API 均可重复调用。
+ */
+import { createHash } from 'node:crypto'
+import { HOST_TOOLS } from '../agents/host-tool-bridge/catalog'
+import { HYBRID_TWIN_DIRECT_WRITE_TOOL_NAMES, LEAD_ONLY_TOOL_NAMES } from '../agents/tool-classes'
+import { listPluginTools, onPluginToolsChange, pluginOfTool } from '../agents/plugin-tools'
+import { pluginManifest } from '../plugins/host.mjs'
+import { createLogger } from '../logger'
+import { recordOps } from '../ops/ops'
+import { declarationVerdict } from '../agents/tool-reference-spec'
+import {
+  getToolRegistryRepo,
+  type ToolRegistryUpsert,
+  type ToolRole,
+} from '../db/tool-registry.repo'
+
+const log = createLogger('workshop.tool-registry')
+
+/**
+ * WP5 登记制:工业工具必须声明引用面(references 或 noRefs)。
+ * 写族未声明 → 拒绝登记(不进目录 = 注入面与执行面双关);读族未声明 → 放行+告警入册。
+ * 声明字段来自 host-tools.json(迁移脚本 scripts/tool-references-migrate.ts)。
+ */
+const EXTRA_WRITE_TOOL_NAMES = new Set(['line_start', 'line_stop'])
+function isWriteFamily(name: string, riskClass?: string): boolean {
+  return riskClass === 'write' || HYBRID_TWIN_DIRECT_WRITE_TOOL_NAMES.has(name) || EXTRA_WRITE_TOOL_NAMES.has(name)
+}
+const warnedUndeclared = new Set<string>()
+function declarationVerdictOf(tool: { name: string, references?: unknown, noRefs?: boolean, riskClass?: string }): 'ok' | 'undeclared-write' | 'undeclared-read' {
+  return declarationVerdict(tool, isWriteFamily(tool.name, tool.riskClass))
+}
+
+export interface ToolRegistrySyncResult {
+  builtin: number
+  plugin: number
+  total: number
+  unavailable: number
+  at: string
+  reason: string
+}
+
+interface SyncState {
+  last: ToolRegistrySyncResult | null
+  lastError: string
+  timer: ReturnType<typeof setTimeout> | null
+  inFlight: boolean
+  subscribed: boolean
+}
+
+const g = globalThis as typeof globalThis & { __awToolRegistrySync?: SyncState }
+
+function state(): SyncState {
+  return g.__awToolRegistrySync ??= {
+    last: null,
+    lastError: '',
+    timer: null,
+    inFlight: false,
+    subscribed: false,
+  }
+}
+
+/** 稳定序列化(键排序),用于定义哈希;不可序列化值降级为字符串描述。 */
+function stableStringify(value: unknown): string {
+  if (value === null || typeof value !== 'object') return JSON.stringify(value) ?? 'null'
+  if (Array.isArray(value)) return `[${value.map(stableStringify).join(',')}]`
+  const obj = value as Record<string, unknown>
+  return `{${Object.keys(obj).sort().map(k => `${JSON.stringify(k)}:${stableStringify(obj[k])}`).join(',')}}`
+}
+
+function safeParameters(value: unknown): { parameters: Record<string, unknown>, error?: string } {
+  try {
+    const clone = JSON.parse(JSON.stringify(value ?? {}))
+    return {
+      parameters: clone && typeof clone === 'object' && !Array.isArray(clone) ? clone as Record<string, unknown> : {},
+    }
+  }
+  catch (err) {
+    return {
+      parameters: {},
+      error: err instanceof Error ? err.message : String(err),
+    }
+  }
+}
+
+/** 展示分组:只影响 UI 归类,不影响权限/注入。 */
+const GROUP_BY_PREFIX: Record<string, string> = {
+  report: 'task',
+  complete: 'task',
+  submit: 'task',
+  dispatch: 'task',
+  reassign: 'task',
+  update: 'task',
+  cancel: 'task',
+  refuse: 'task',
+  get: 'task',
+  list: 'team',
+  create: 'team',
+  remove: 'team',
+  send: 'messaging',
+  broadcast: 'messaging',
+  poll: 'messaging',
+  read: 'messaging',
+  save: 'memory',
+  search: 'memory',
+  daq: 'daq',
+  dcw: 'dcw',
+  ops: 'line',
+  line: 'line',
+  recipe: 'recipe',
+  mes: 'mes',
+  aml: 'aml',
+  twin: 'twin',
+  mpc: 'twin',
+  optimization: 'twin',
+  optimizer: 'optimization',
+  team: 'team',
+  exp: 'experience',
+  analysis: 'analysis',
+}
+
+function groupOf(name: string, source: 'builtin' | 'plugin', pluginName: string): string {
+  if (source === 'plugin') return pluginName ? `plugin:${pluginName}` : 'plugin'
+  const prefix = name.split('_')[0] ?? name
+  return GROUP_BY_PREFIX[prefix] ?? prefix
+}
+
+function builtinRoles(name: string): ToolRole[] {
+  return LEAD_ONLY_TOOL_NAMES.has(name) ? ['lead'] : ['lead', 'worker']
+}
+
+function hashOf(row: Omit<ToolRegistryUpsert, 'definitionHash'>): string {
+  return createHash('sha256').update(stableStringify({
+    name: row.name,
+    source: row.source,
+    pluginName: row.pluginName ?? '',
+    label: row.label ?? '',
+    description: row.description,
+    parameters: row.parameters ?? {},
+    roles: row.roles ?? [],
+    group: row.group ?? '',
+  })).digest('hex')
+}
+
+/** 当前运行时快照(不写库;单测可直接断言)。 */
+export function buildToolRegistrySnapshot(): ToolRegistryUpsert[] {
+  const out = new Map<string, ToolRegistryUpsert>()
+  for (const tool of HOST_TOOLS) {
+    // WP5 登记制:写族未声明引用面 → 不登记(unavailable → 注入/执行双关)
+    const verdict = declarationVerdictOf(tool)
+    if (verdict === 'undeclared-write') {
+      log.error(`工具「${tool.name}」属写族但未声明 references/noRefs,拒绝登记(注入面与执行面均不可用)`)
+      recordOps({
+        actor: 'system', actorName: 'tool-registry', actorKind: 'system',
+        action: 'tool.registry.rejected', kind: 'system', level: 'warn',
+        targetKind: 'tool', targetId: tool.name,
+        summary: `写族工具未声明引用面,拒绝登记:${tool.name}`,
+      })
+      continue
+    }
+    if (verdict === 'undeclared-read' && !warnedUndeclared.has(tool.name)) {
+      warnedUndeclared.add(tool.name)
+      log.warn(`工具「${tool.name}」未声明 references/noRefs,按无引用工具登记(限期补齐)`)
+      recordOps({
+        actor: 'system', actorName: 'tool-registry', actorKind: 'system',
+        action: 'tool.registry.undeclared', kind: 'system', level: 'warn',
+        targetKind: 'tool', targetId: tool.name,
+        summary: `工具未声明引用面(references/noRefs):${tool.name}`,
+      })
+    }
+    const safe = safeParameters(tool.parameters)
+    const base: Omit<ToolRegistryUpsert, 'definitionHash'> = {
+      name: tool.name,
+      source: 'builtin',
+      pluginName: '',
+      pluginScope: '',
+      label: tool.label ?? tool.name,
+      description: tool.description,
+      parameters: safe.parameters,
+      roles: builtinRoles(tool.name),
+      group: groupOf(tool.name, 'builtin', ''),
+      metadata: {
+        builtin: true,
+        hidden: Boolean(tool.hidden),
+        riskClass: tool.riskClass ?? '',
+        referencesDeclared: Boolean(tool.references || tool.noRefs),
+        ...(safe.error ? { schemaError: safe.error } : {}),
+      },
+    }
+    out.set(tool.name, { ...base, definitionHash: hashOf(base) })
+  }
+
+  let manifest = new Map<string, { version?: string, scope?: string }>()
+  try {
+    manifest = new Map(pluginManifest().map(p => [p.name, { version: p.version, scope: p.scope }]))
+  }
+  catch {
+    // 插件宿主未初始化(单测/极早启动):仍登记插件工具,scope 留空
+  }
+
+  for (const [name, tool] of listPluginTools()) {
+    // 内置同名优先(registerPluginTool 已告警);目录与执行面同口径
+    if (out.has(name)) continue
+    const owner = pluginOfTool(name) ?? ''
+    const meta = manifest.get(owner)
+    const safe = safeParameters(tool.parameters)
+    const base: Omit<ToolRegistryUpsert, 'definitionHash'> = {
+      name,
+      source: 'plugin',
+      pluginName: owner,
+      pluginScope: String(meta?.scope ?? ''),
+      label: tool.label ?? name,
+      description: tool.description,
+      parameters: safe.parameters,
+      roles: tool.roles && tool.roles.length > 0 ? [...tool.roles] : ['lead', 'worker'],
+      group: groupOf(name, 'plugin', owner),
+      metadata: {
+        builtin: false,
+        plugin: owner,
+        pluginVersion: meta?.version ?? '',
+        pluginScope: meta?.scope ?? '',
+        ...(safe.error ? { schemaError: safe.error } : {}),
+      },
+    }
+    out.set(name, { ...base, definitionHash: hashOf(base) })
+  }
+
+  return [...out.values()]
+}
+
+/** 同步一次(同步 SQLite;调用方需要异步时自行包 Promise)。 */
+export function syncToolRegistry(reason = 'manual'): ToolRegistrySyncResult {
+  const st = state()
+  if (st.inFlight) {
+    // 并发同步(插件批量注册):返回上次结果,避免重入事务
+    return st.last ?? { builtin: 0, plugin: 0, total: 0, unavailable: 0, at: new Date().toISOString(), reason: `${reason}:coalesced` }
+  }
+  st.inFlight = true
+  try {
+    const repo = getToolRegistryRepo()
+    const rows = buildToolRegistrySnapshot()
+    repo.upsertMany(rows)
+    const unavailable = repo.markUnavailableExcept(rows.map(r => r.name))
+    const counts = repo.counts()
+    const result: ToolRegistrySyncResult = {
+      builtin: counts.builtin,
+      plugin: counts.plugin,
+      total: counts.total,
+      unavailable,
+      at: new Date().toISOString(),
+      reason,
+    }
+    st.last = result
+    st.lastError = ''
+    log.info(`synced builtin=${result.builtin} plugin=${result.plugin} unavailable=${result.unavailable} total=${result.total} (${reason})`)
+    return result
+  }
+  catch (err) {
+    st.lastError = err instanceof Error ? err.message : String(err)
+    log.warn(`同步失败(${reason}): ${st.lastError}`)
+    throw err
+  }
+  finally {
+    st.inFlight = false
+  }
+}
+
+/** 防抖同步(插件注册/卸载/重载会连续触发)。 */
+export function scheduleToolRegistrySync(reason = 'change', delayMs = 150): void {
+  const st = state()
+  if (st.timer) clearTimeout(st.timer)
+  st.timer = setTimeout(() => {
+    st.timer = null
+    try {
+      syncToolRegistry(reason)
+    }
+    catch { /* 已记录;不拖垮插件装载/请求 */ }
+  }, delayMs)
+  st.timer.unref?.()
+}
+
+/** 启动装配:先同步一次,再订阅插件工具变更(幂等)。 */
+export function initToolRegistrySync(): void {
+  try {
+    syncToolRegistry('boot')
+  }
+  catch { /* boot 同步失败不阻断服务;手动 sync/插件变更会重试 */ }
+  const st = state()
+  if (st.subscribed) return
+  st.subscribed = true
+  onPluginToolsChange(() => scheduleToolRegistrySync('plugin-tools-change'))
+}
+
+export function getToolRegistrySyncState(): { last: ToolRegistrySyncResult | null, lastError: string } {
+  const st = state()
+  return { last: st.last, lastError: st.lastError }
+}

package/server/services/workshop/tools/types.ts

@@ -0,0 +1,19 @@
+/** 工具治理共享类型(目录/策略/UI 共用;纯类型,零运行时依赖)。 */
+
+export type ToolBlockReason
+  = | 'OK'
+    | 'ROLE_DENIED'
+    | 'PROFILE_DENIED'
+    | 'WRITE_GUARD'
+    | 'PLUGIN_DISABLED'
+    | 'CHANNEL_PLUGIN_DISABLED'
+    | 'CHANNEL_TOOL_DISABLED'
+    | 'UNAVAILABLE'
+    | 'UNKNOWN'
+
+export interface ToolExclusion {
+  reason: Exclude<ToolBlockReason, 'OK'>
+  message: string
+}
+
+export type ToolRoleName = 'lead' | 'worker'

package/server/services/workshop/types/task.ts

@@ -64,6 +64,23 @@ export const TERMINAL_TASK_STATES: Partial<Record<TaskState, true>> = {
   CANCELED: true,
 }
 
+/**
+ * FAILED 任务重派最小回退窗(2026-10-19 实测缺陷修复)。
+ *
+ * 旧调度器在任务进入 FAILED 的下一 tick 立即 reassign;worker 还没来得及消费新的
+ * assign 投递,任务又被下一次重试换发 lease —— 旧投递因「旧执行代次」被丢弃,
+ * 三次重试可在 0.4s 内烧完(实测 channel-task-chsmoke* 父任务 CANCELED /
+ * CHILD_RETRIES_EXHAUSTED)。留出短回退窗,让新 assign 有机会真正被执行,
+ * 失败也才会留下可诊断的回合历史。
+ */
+export const FAILED_RETRY_BACKOFF_MS = 2000
+
+/** FAILED 任务是否已过重派回退窗(updatedAt 不可解析时放行,避免历史数据永久卡死) */
+export function failedRetryReady(task: { updatedAt: string }, now = Date.now()): boolean {
+  const at = Date.parse(task.updatedAt)
+  return !Number.isFinite(at) || now - at >= FAILED_RETRY_BACKOFF_MS
+}
+
 /**
  * 单 Agent 任务队列视图(每个 AgentRuntime 自己的任务管理系统)。
  * DB tasks 表是唯一事实源;本视图为派生只读投影,不持有第二份状态:

package/shared/config/schema.json

@@ -18,6 +18,7 @@
     { "key": "theme.mode", "type": "select", "group": "theme", "label": "显示模式", "labelKey": "settings.runtime.theme.mode", "description": "全局默认深浅色；用户本地切换偏好优先", "applies": "live", "default": "light", "options": ["light", "dark"] },
 
     { "key": "i18n.defaultLocale", "type": "select", "group": "i18n", "label": "默认语言", "labelKey": "settings.runtime.i18n.defaultLocale", "description": "未做本地选择时的界面语言", "applies": "live", "default": "zh-CN", "options": ["zh-CN", "en"] },
+
     { "key": "time.timeZone", "type": "timezone", "group": "time", "label": "系统时区", "labelKey": "settings.runtime.time.timeZone", "description": "日志、聊天、审计、Agent 记录与定时任务使用的 IANA 时区；DAQ 原始时间轴仍保存绝对时间", "applies": "live", "default": "Asia/Shanghai" },
 
     { "key": "security.approvalGate", "type": "boolean", "group": "security", "label": "高危操作双人复核", "labelKey": "settings.runtime.security.approvalGate", "description": "R3：开启后写控/删除等高风险操作需另一位管理员批核", "applies": "live", "default": false },
@@ -38,7 +39,6 @@
     { "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.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"] },
@@ -76,15 +76,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.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.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.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": "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 },
@@ -117,6 +117,8 @@
     { "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": "retention.analysis_days", "type": "number", "group": "retention", "label": "分析报告保留(天)", "labelKey": "settings.runtime.retention.analysisDays", "description": "数据分析报告台账保留天数(数据留痕,宽松保留)", "applies": "restart", "default": 365, "min": 1, "max": 3650 },
+    { "key": "retention.optimizer_days", "type": "number", "group": "retention", "label": "优化运行保留(天)", "labelKey": "settings.runtime.retention.optimizerDays", "description": "Optimizer 运行/候选/建议/收益台账保留天数", "applies": "restart", "default": 365, "min": 1, "max": 3650 },
+    { "key": "retention.process_model_days", "type": "number", "group": "retention", "label": "过程模型台账保留(天)", "labelKey": "settings.runtime.retention.processModelDays", "description": "过程模型资格报告与模拟试验台账保留天数", "applies": "restart", "default": 365, "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"] },
 
@@ -136,6 +138,13 @@
     { "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 },
-    { "key": "mcp.enabled", "type": "boolean", "group": "mcp", "label": "启动 MCP 集成", "labelKey": "settings.runtime.mcp.enabled", "description": "允许 aw 工业 MCP(mcp/aw-mcp-server.mjs)连接并操作本实例;停用后 MCP 工具调用将被拒绝(平台 REST 与频道内 agent 不受影响)。也可用环境变量 AW_MCP_ENABLED 覆盖。", "applies": "live", "default": false, "aliases": ["AW_MCP_ENABLED"] }
+    { "key": "aml.uq.freshDays", "type": "number", "group": "aml", "label": "UQ 证据保鲜天数", "labelKey": "settings.runtime.aml.uqFreshDays", "description": "工件 UQ 校准时间(calibratedAt)超过该天数后建议降级 unverified(需重训刷新证据)", "applies": "live", "default": 7, "min": 1, "max": 365 },
+
+    { "key": "mcp.enabled", "type": "boolean", "group": "mcp", "label": "启动 MCP 集成", "labelKey": "settings.runtime.mcp.enabled", "description": "允许 aw 工业 MCP(mcp/aw-mcp-server.mjs)连接并操作本实例;停用后 MCP 工具调用将被拒绝(平台 REST 与频道内 agent 不受影响)。也可用环境变量 AW_MCP_ENABLED 覆盖。", "applies": "live", "default": false, "aliases": ["AW_MCP_ENABLED"] },
+
+    { "key": "optimizer.solver.poolSize", "type": "number", "group": "optimizer", "label": "Solver 进程池上限", "labelKey": "settings.runtime.optimizer.poolSize", "description": "本地 Python Solver 进程池大小(每进程同时 1 个 solve)", "applies": "restart", "default": 1, "min": 1, "max": 4 },
+    { "key": "optimizer.solver.requestTimeoutMs", "type": "number", "group": "optimizer", "label": "Solver 请求超时(ms)", "labelKey": "settings.runtime.optimizer.requestTimeoutMs", "description": "单次求解硬超时;超时终止独占 Worker 进程", "applies": "restart", "default": 30000, "min": 1000, "max": 600000 },
+    { "key": "optimizer.solver.threads", "type": "number", "group": "optimizer", "label": "Solver 线程预算", "labelKey": "settings.runtime.optimizer.threads", "description": "求解进程 OMP/OPENBLAS/MKL/NUMEXPR 线程数(避免与训练抢占)", "applies": "restart", "default": 1, "min": 1, "max": 16 },
+    { "key": "optimizer.crosscheck.tol", "type": "number", "group": "optimizer", "label": "互校一致性容差", "labelKey": "settings.runtime.optimizer.crosscheckTol", "description": "候选互校逐 CV 无量纲数值一致性门限(默认数值精度级;调大仅用于诊断,放宽不改变证据要求)", "applies": "live", "default": 0.000001, "min": 0.0000000001, "max": 0.001 }
   ]
 }

package/shared/daq-protocol.ts

@@ -37,8 +37,22 @@ export interface DaqTemplateDef {
   // ===== 多形态信号(v2 帧管线;缺省 scalar = 既有单点链路,零行为变化)=====
   /** 信号形态:scalar 单点(缺省)/ vector 多点轮廓(测厚仪/扫描仪)/ image 图像帧(CCD) */
   signalKind?: DaqSignalKind
-  /** vector 声明(驱动生成/校验点列的依据) */
-  vector?: { points: number, min: number, max: number }
+  /** vector 声明(驱动生成/校验点列的依据);layout 字段说明点位的物理排布 */
+  vector?: {
+    points: number
+    min: number
+    max: number
+    /** 点位轴/排布说明(如 模头横向位置:操作侧→传动侧) */
+    axis?: string
+    /** 单点单位(缺省 = 模板 unit;常用于 index/点号) */
+    pointUnit?: string
+    /** 点标签前缀(与 labels 二选一;如 模头点) */
+    pointLabelPrefix?: string
+    /** 点序号起点(0 或 1;缺省 1) */
+    pointIndexBase?: 0 | 1
+    /** 显式逐点标签(长度通常 = points) */
+    labels?: string[]
+  }
   /** 实时下沉处理管线(采样后、入库前按序执行;处理器实现 server 注册表,插件可扩展) */
   sink?: { processors: DaqSinkStep[] }
   /** 派生指标阈值(帧 metrics 越限 → 既有告警链路,边沿触发) */
@@ -96,8 +110,17 @@ export interface DaqTemplateInput {
   icon?: DaqTemplateIcon
   /** 信号形态(缺省 scalar) */
   signalKind?: DaqSignalKind
-  /** vector 声明(signalKind=vector 时:points 必填 1~4096) */
-  vector?: { points: number, min: number, max: number }
+  /** vector 声明(signalKind=vector 时:points 必填 1~4096;axis/labels 描述点位物理含义) */
+  vector?: {
+    points: number
+    min: number
+    max: number
+    axis?: string
+    pointUnit?: string
+    pointLabelPrefix?: string
+    pointIndexBase?: 0 | 1
+    labels?: string[]
+  }
   /** 下沉处理管线(signalKind=image 时自动前置 thumbnail/quality-gate) */
   sink?: { processors: DaqSinkStep[] }
   /** 派生指标阈值规则 */
@@ -122,7 +145,15 @@ export const DAQ_TEMPLATES: DaqTemplateDef[] = [
     key: 'thickness-scan', name: '测厚扫描仪', code: 'THK · SCAN', ch: '厚度轮廓', unit: 'mm',
     base: 0.52, amp: 0.018, min: 0.4, max: 0.65, decimals: 3, icon: 'tension',
     signalKind: 'vector',
-    vector: { points: 64, min: 0.4, max: 0.65 },
+    vector: {
+      points: 64,
+      min: 0.4,
+      max: 0.65,
+      axis: '模头横向位置(操作侧→传动侧)',
+      pointUnit: '点',
+      pointLabelPrefix: '模头点',
+      pointIndexBase: 1,
+    },
     sink: { processors: [
       { name: 'resample', args: { n: 64 } },
       { name: 'derive-metric', args: { name: 'avg', op: 'avg' } },
@@ -413,6 +444,9 @@ export interface DaqNodeView {
   posZ?: number
   /** 所属产线('' = 未分配;采集门控/场景光晕按产线隔离) */
   lineId: string
+  /** E8 上下文扩展:设备/腔室名与层级路径(EDA commonality 的 chamber 因子;纯标签) */
+  chamber?: string
+  unitPath?: string
   value: number | null
   state: DaqNodeState
   lastAt: string | null