agentworkshop 0.7.66 → 0.7.70

package/server/services/workshop/agents/plugin-tools.ts

@@ -83,12 +83,16 @@ export function registerPluginTool(plugin: string, tool: OmpPluginTool): void {
 /** 插件卸载/停用时移除其全部工具 */
 export function unregisterPluginTools(plugin: string): void {
   const st = state()
+  let changed = false
   for (const [k, tool] of [...st.byPlugin.entries()]) {
     if (k.startsWith(`${plugin}:`)) {
       st.byPlugin.delete(k)
       if (st.byName.get(tool.name) === tool) st.byName.delete(tool.name)
+      changed = true
     }
   }
+  // 卸载也必须广播:否则在跑 omp 会话仍保留旧 set_host_tools,工具目录也收不到 available=0。
+  if (changed) notifyToolChange()
 }
 
 /** 全部插件工具(工具名 → 定义;hostToolsForRole 合并与分发用) */

package/server/services/workshop/agents/tool-approvals.ts

@@ -202,7 +202,9 @@ class ToolApprovalService {
 
   /** 审批锚点 → 产线 id(节点 id 直查;recipe:/recipe-propose: 前缀查配方产线) */
   private lineIdOf(nodeId: string): string {
-    const m = /^(?:recipe|recipe-propose):(.+)$/.exec(nodeId)
+    if (nodeId.startsWith('line-start:')) return nodeId.slice('line-start:'.length)
+    if (nodeId.startsWith('line-stop:')) return nodeId.slice('line-stop:'.length)
+    const m = nodeId.match(/^(?:recipe|recipe-propose):(.+)$/)
     try {
       if (m) {
         const recipe = getDcwController().listRecipes().find(r => r.id === m[1])
@@ -289,6 +291,28 @@ class ToolApprovalService {
     return n
   }
 
+  /**
+   * 解绑/收回一条绑定对应的全部挂起审批:
+   *  - 节点/配方直绑:nodeId 原值;
+   *  - 配方绑定:除配方本身,还要清理 `recipe:<id>` / `recipe-propose:<id>` 审批单
+   *    与该配方参数节点上的挂起下发(optimization_explore 经配方授权的审批键是节点 id)。
+   * 2026-10-18 修复:此前只按 nodeId 等值匹配,删配方绑定不会取消配方审批单,
+   * 批准后越过撤权窗口照常执行。
+   */
+  cancelPendingForBinding(agentId: string, binding: { nodeId: string, kind: string }): number {
+    let n = this.cancelPendingFor(agentId, binding.nodeId)
+    if (binding.kind === 'recipe') {
+      n += this.cancelPendingFor(agentId, `recipe:${binding.nodeId}`)
+      n += this.cancelPendingFor(agentId, `recipe-propose:${binding.nodeId}`)
+      try {
+        const recipe = getDcwController().listRecipes().find(r => r.id === binding.nodeId)
+        for (const p of recipe?.params ?? []) n += this.cancelPendingFor(agentId, p.nodeId)
+      }
+      catch { /* 配方已删除 → 无参数节点可清理 */ }
+    }
+    return n
+  }
+
   /**
    * 回合终止时收敛该 Agent 的全部挂起审批(运行时 stop / 成员移除前置):
    * 按「拒绝(回合已中止,指令未执行)」落定,绝不自动批准;返回收敛摘要供

package/server/services/workshop/agents/tool-classes.ts

@@ -25,6 +25,7 @@ export const HYBRID_TWIN_DIRECT_WRITE_TOOL_NAMES = new Set([
   'dcw_control',
   'param_control',
   'dcw_rollback',
+  'recipe_create',
   'recipe_update',
   'recipe_rollback',
   'recipe_trial',
@@ -37,6 +38,7 @@ export const HYBRID_TWIN_DIRECT_WRITE_TOOL_NAMES = new Set([
 export const MES_READ_TOOL_NAMES = new Set([
   'mes_catalog',
   'mes_fetch',
+  'mes_export',
   'mes_dataset_read',
   'mes_datasets',
 ])

package/server/services/workshop/aml/spec.ts

@@ -1,63 +1,64 @@
-/**
- * AML 数据集规格:zod 校验(单一事实来源;REST 与 Agent 工具共用)。
- * 隔离三元组 (lineId, productId, recipeId) 必填 —— 防 Recipe 串味是硬约束。
- */
-import { z } from 'zod'
-import { AppError } from '../../../utils/errors'
-
-export const amlDatasetSpecSchema = z.object({
-  lineId: z.string().min(1),
-  productId: z.string().min(1),
-  recipeId: z.string().min(1),
-  /** 缺省 = 该配方全部已完结批次 */
-  runIds: z.array(z.string().min(1)).max(200).optional(),
-  nodes: z.array(z.object({
-    nodeId: z.string().min(1),
-    /** control = 可控输入(未来轨迹已知);target = 预测目标;feature = 仅历史特征 */
-    role: z.enum(['control', 'feature', 'target']),
-  })).min(2).max(64),
-  fromMs: z.number().int().nonnegative().optional(),
-  toMs: z.number().int().nonnegative().optional(),
-  /** 对齐节拍(ms),≥1000(与 daq 查询下限一致) */
-  beatMs: z.number().int().min(1000).max(3_600_000),
-  window: z.object({
-    historySteps: z.number().int().min(1).max(2048),
-    horizonSteps: z.number().int().min(1).max(512),
-  }),
-  cleaning: z.object({
-    /** Hampel 窗口半径(点数),0 = 关闭 */
-    hampelK: z.number().int().min(0).max(100).optional(),
-    /** 短缺口线性插值上限(ms) */
-    maxInterpMs: z.number().int().min(0).optional(),
-    /** 单 run 缺失率超过则整 run 丢弃 */
-    maxDropRatio: z.number().min(0).max(1).optional(),
-  }).optional(),
-  split: z.object({
-    valRatio: z.number().min(0).max(0.8),
-    testRatio: z.number().min(0).max(0.8),
-    seed: z.number().int(),
-  }).refine(s => s.valRatio + s.testRatio <= 0.9, { message: 'valRatio + testRatio 不得超过 0.9(须保留 train 切分)' }),
-  purpose: z.enum(['mpc_surrogate', 'quality_predict']),
-  note: z.string().max(2000).optional(),
-})
-
-export type AmlDatasetSpec = z.infer<typeof amlDatasetSpecSchema>
-
-export interface AmlNodeSpec {
-  nodeId: string
-  role: 'control' | 'feature' | 'target'
-}
-
-/** 解析失败抛 AppError(422,带 zod 首个 issue 的可读路径) */
-export function parseDatasetSpec(raw: unknown): AmlDatasetSpec {
-  const r = amlDatasetSpecSchema.safeParse(raw)
-  if (!r.success) {
-    const iss = r.error.issues[0]
-    if (!iss) throw new AppError(422, 'AML_SPEC_INVALID', '数据集规格不合法')
-    throw new AppError(422, 'AML_SPEC_INVALID', `数据集规格不合法:${iss.path.join('.')} ${iss.message}`)
-  }
-  if (r.data.nodes.filter(n => n.role === 'target').length === 0) {
-    throw new AppError(422, 'AML_SPEC_INVALID', '数据集规格不合法:至少需要 1 个 target 节点')
-  }
-  return r.data
-}
+/**
+ * AML 数据集规格:zod 校验(单一事实来源;REST 与 Agent 工具共用)。
+ * 隔离三元组 (lineId, productId, recipeId) 必填 —— 防 Recipe 串味是硬约束。
+ */
+import { z } from 'zod'
+import { AppError } from '../../../utils/errors'
+
+export const amlDatasetSpecSchema = z.object({
+  lineId: z.string().min(1),
+  productId: z.string().min(1),
+  recipeId: z.string().min(1),
+  /** 缺省 = 该配方全部已完结批次 */
+  runIds: z.array(z.string().min(1)).max(200).optional(),
+  nodes: z.array(z.object({
+    nodeId: z.string().min(1),
+    /** control = 可控输入(未来轨迹已知);target = 预测目标;feature = 仅历史特征 */
+    role: z.enum(['control', 'feature', 'target']),
+  })).min(2).max(64),
+  fromMs: z.number().int().nonnegative().optional(),
+  toMs: z.number().int().nonnegative().optional(),
+  /** 对齐节拍(ms),≥1000(与 daq 查询下限一致) */
+  beatMs: z.number().int().min(1000).max(3_600_000),
+  window: z.object({
+    historySteps: z.number().int().min(1).max(2048),
+    horizonSteps: z.number().int().min(1).max(512),
+  }),
+  cleaning: z.object({
+    /** Hampel 窗口半径(点数),0 = 关闭 */
+    hampelK: z.number().int().min(0).max(100).optional(),
+    /** 短缺口线性插值上限(ms) */
+    maxInterpMs: z.number().int().min(0).optional(),
+    /** 单 run 缺失率超过则整 run 丢弃 */
+    maxDropRatio: z.number().min(0).max(1).optional(),
+  }).optional(),
+  split: z.object({
+    valRatio: z.number().min(0).max(0.8),
+    testRatio: z.number().min(0).max(0.8),
+    seed: z.number().int(),
+  }).refine(s => s.valRatio + s.testRatio <= 0.9, { message: 'valRatio + testRatio 不得超过 0.9(须保留 train 切分)' }),
+  // virtual_metrology(E6):以 per-run 特征向量为输入的软测量模型(特征对齐经 eda/vm 适配面)
+  purpose: z.enum(['mpc_surrogate', 'quality_predict', 'virtual_metrology']),
+  note: z.string().max(2000).optional(),
+})
+
+export type AmlDatasetSpec = z.infer<typeof amlDatasetSpecSchema>
+
+export interface AmlNodeSpec {
+  nodeId: string
+  role: 'control' | 'feature' | 'target'
+}
+
+/** 解析失败抛 AppError(422,带 zod 首个 issue 的可读路径) */
+export function parseDatasetSpec(raw: unknown): AmlDatasetSpec {
+  const r = amlDatasetSpecSchema.safeParse(raw)
+  if (!r.success) {
+    const iss = r.error.issues[0]
+    if (!iss) throw new AppError(422, 'AML_SPEC_INVALID', '数据集规格不合法')
+    throw new AppError(422, 'AML_SPEC_INVALID', `数据集规格不合法:${iss.path.join('.')} ${iss.message}`)
+  }
+  if (r.data.nodes.filter(n => n.role === 'target').length === 0) {
+    throw new AppError(422, 'AML_SPEC_INVALID', '数据集规格不合法:至少需要 1 个 target 节点')
+  }
+  return r.data
+}

package/server/services/workshop/daq/daq-controller/crud.ts

@@ -101,6 +101,8 @@ export abstract class DaqControllerCrud extends DaqControllerRuntimeControl {
       node.lineId = lid
     }
     if (patch.semantics !== undefined) node.semantics = String(patch.semantics)
+    if (patch.chamber !== undefined) node.chamber = String(patch.chamber)
+    if (patch.unitPath !== undefined) node.unitPath = String(patch.unitPath)
     if (node.value != null) node.state = node.deriveState(node.value)
     this.repo.flushNow()
     this.emitNodeChanged('updated', node)

package/server/services/workshop/daq/daq-controller/sweep-alarms.ts

@@ -10,6 +10,7 @@ import { DaqNodeRuntime } from '../daq-runtime'
 import { SWEEP_MAX_CONCURRENCY, log } from './helpers'
 import { getDaqHostPorts } from '../host-ports'
 import { getOps, recordOps } from '../../ops/ops'
+import { getActiveLineRun } from '../../dcw/line-run'
 import { newAlarmId, notifyAlarm } from '../alarm-notify'
 
 export abstract class DaqControllerSweepAlarms extends DaqControllerIngest {
@@ -112,8 +113,10 @@ export abstract class DaqControllerSweepAlarms extends DaqControllerIngest {
     }
     this.broadcast?.('daq.alarm', payload)
     notifyAlarm(payload)
-    // 运维日志:越限告警入实时事件轨(恢复/详情在告警面板与日志管理)
+    // 运维日志:越限告警入实时事件轨(恢复/详情在告警面板与日志管理);
+    // 告警发生在活动批次内时带上该批次的 product/recipe,产线日志才能按配方检索
     const zh = rule === 'gt-max' ? '高于上限' : '低于下限'
+    const run = getActiveLineRun(node.lineId)
     recordOps({
       actor: 'system',
       actorName: 'system',
@@ -124,6 +127,8 @@ export abstract class DaqControllerSweepAlarms extends DaqControllerIngest {
       targetId: node.id,
       summary: `告警:「${node.name}」${metric} ${zh}阈值 ${threshold}(当前 ${value})`,
       lineId: node.lineId ?? '',
+      productId: run?.productId ?? '',
+      recipeId: run?.recipeId ?? '',
       detail: { alarmId: id, metric, value, rule, threshold },
     })
   }
@@ -140,6 +145,10 @@ export abstract class DaqControllerSweepAlarms extends DaqControllerIngest {
     const ok = repo.ack(id, byUserId, byName, new Date().toISOString())
     if (ok) {
       this.broadcast?.('daq.alarm.changed', { id, ackedBy: byName, ackedAt: new Date().toISOString() })
+      // 确认是人对产线告警的处置动作:回填报警所属节点/产线/活动批次,避免落成无归属条目
+      const nodeId = repo.nodeIdById(id) ?? ''
+      const node = nodeId ? this.repo.byId(nodeId) : undefined
+      const run = node ? getActiveLineRun(node.lineId) : null
       recordOps({
         actor: byUserId,
         actorName: byName,
@@ -148,7 +157,10 @@ export abstract class DaqControllerSweepAlarms extends DaqControllerIngest {
         kind: 'alarm',
         targetKind: 'alarm',
         targetId: id,
-        summary: `确认报警 ${id}(处理完毕,移出实时告警)`,
+        lineId: node?.lineId ?? '',
+        productId: run?.productId ?? '',
+        recipeId: run?.recipeId ?? '',
+        summary: `确认报警 ${id}${node ? `(节点「${node.name}」)` : ''}(处理完毕,移出实时告警)`,
       })
     }
     return ok

package/server/services/workshop/daq/daq-controller/types.ts

@@ -1,68 +1,71 @@
-/**
- * DaqController 的依赖类型与对外 DTO(原 server/services/workshop/daq/daq-controller.ts 顶部模块级类型声明)。纯类型。
- */
-import type { DaqDriverKind, DataTransform } from '../../../../../shared/daq-protocol'
-
-export interface DaqCreateInput {
-  templateRef?: string
-  name?: string
-  driver?: DaqDriverKind
-  driverConfig?: Record<string, string | number | boolean>
-  /** 数据语义标定钩子(decoder) */
-  transform?: DataTransform
-  unit?: string
-  decimals?: number
-  min?: number
-  max?: number
-  warnLow?: number | null
-  warnHigh?: number | null
-  intervalMs?: number | null
-  /** WS 实时下发间隔(null=跟随全局;0=每帧) */
-  publishIntervalMs?: number | null
-  enabled?: boolean
-  posX?: number
-  posZ?: number
-  /** 所属产线('' = 未分配) */
-  lineId?: string
-  /** 节点级采集语义备注(覆盖模板) */
-  semantics?: string
-  deviceBindingId?: string | null
-}
-
-export interface DaqPatchInput {
-  name?: string
-  driver?: DaqDriverKind
-  driverConfig?: Record<string, string | number | boolean>
-  /** 数据语义标定钩子(decoder) */
-  transform?: DataTransform
-  unit?: string
-  decimals?: number
-  min?: number
-  max?: number
-  warnLow?: number | null
-  warnHigh?: number | null
-  intervalMs?: number | null
-  /** WS 实时下发间隔(null=跟随全局;0=每帧) */
-  publishIntervalMs?: number | null
-  enabled?: boolean
-  posX?: number
-  posZ?: number
-  /** 所属产线('' = 未分配;采集门控按产线) */
-  lineId?: string
-  /** 节点级采集语义备注(覆盖模板) */
-  semantics?: string
-}
-
-export type BroadcastFn = (type: string, payload: unknown) => void
-
-/** 有界 LRU 的最小泛型面:shared/lru.mjs 是 allowJs 推断出的**非泛型**类(JS 里没有 @template),
- *  直接 `new LruMap<K, V>()` 无处安放类型参数。这里按实际使用面(get/set/delete/size)声明键值类型,
- *  调用点即可拿到准确的读写类型;运行时仍是同一个 LruMap(纯类型声明,零运行时差异)。 */
-export interface LruLike<K, V> {
-  readonly size: number
-  get(key: K): V | undefined
-  set(key: K, value: V): unknown
-  delete(key: K): unknown
-}
-
-/** TSDB 批量写窗口(ms):消费端攒批再落盘 */
+/**
+ * DaqController 的依赖类型与对外 DTO(原 server/services/workshop/daq/daq-controller.ts 顶部模块级类型声明)。纯类型。
+ */
+import type { DaqDriverKind, DataTransform } from '../../../../../shared/daq-protocol'
+
+export interface DaqCreateInput {
+  templateRef?: string
+  name?: string
+  driver?: DaqDriverKind
+  driverConfig?: Record<string, string | number | boolean>
+  /** 数据语义标定钩子(decoder) */
+  transform?: DataTransform
+  unit?: string
+  decimals?: number
+  min?: number
+  max?: number
+  warnLow?: number | null
+  warnHigh?: number | null
+  intervalMs?: number | null
+  /** WS 实时下发间隔(null=跟随全局;0=每帧) */
+  publishIntervalMs?: number | null
+  enabled?: boolean
+  posX?: number
+  posZ?: number
+  /** 所属产线('' = 未分配) */
+  lineId?: string
+  /** 节点级采集语义备注(覆盖模板) */
+  semantics?: string
+  deviceBindingId?: string | null
+}
+
+export interface DaqPatchInput {
+  name?: string
+  driver?: DaqDriverKind
+  driverConfig?: Record<string, string | number | boolean>
+  /** 数据语义标定钩子(decoder) */
+  transform?: DataTransform
+  unit?: string
+  decimals?: number
+  min?: number
+  max?: number
+  warnLow?: number | null
+  warnHigh?: number | null
+  intervalMs?: number | null
+  /** WS 实时下发间隔(null=跟随全局;0=每帧) */
+  publishIntervalMs?: number | null
+  enabled?: boolean
+  posX?: number
+  posZ?: number
+  /** 所属产线('' = 未分配;采集门控按产线) */
+  lineId?: string
+  /** 节点级采集语义备注(覆盖模板) */
+  semantics?: string
+  /** E8 上下文扩展:设备/腔室名与层级路径(纯标签) */
+  chamber?: string
+  unitPath?: string
+}
+
+export type BroadcastFn = (type: string, payload: unknown) => void
+
+/** 有界 LRU 的最小泛型面:shared/lru.mjs 是 allowJs 推断出的**非泛型**类(JS 里没有 @template),
+ *  直接 `new LruMap<K, V>()` 无处安放类型参数。这里按实际使用面(get/set/delete/size)声明键值类型,
+ *  调用点即可拿到准确的读写类型;运行时仍是同一个 LruMap(纯类型声明,零运行时差异)。 */
+export interface LruLike<K, V> {
+  readonly size: number
+  get(key: K): V | undefined
+  set(key: K, value: V): unknown
+  delete(key: K): unknown
+}
+
+/** TSDB 批量写窗口(ms):消费端攒批再落盘 */

package/server/services/workshop/daq/daq-node.ts

@@ -39,6 +39,9 @@ interface DaqNodeOptions {
   lineId?: string
   /** 节点级采集语义备注(覆盖模板 semantics;注入 Agent 上下文) */
   semantics?: string
+  /** E8 上下文扩展:设备/腔室名与层级路径(纯标签) */
+  chamber?: string
+  unitPath?: string
   /** 驱动连接参数(modbus-tcp/opcua 协议参数;mock 空) */
   driverConfig?: Record<string, string | number | boolean>
   createdAt?: string
@@ -72,6 +75,10 @@ export class DaqNode {
   lineId = ''
   /** 节点级采集语义备注(覆盖模板 semantics) */
   semantics?: string
+  /** E8 上下文扩展:设备/腔室名(EDA commonality 的 chamber 因子;纯标签,无行为) */
+  chamber?: string
+  /** E8 上下文扩展:层级路径(fab/area/tool 展示语义;纯标签) */
+  unitPath?: string
   value: number | null
   state: DaqNodeState = 'offline'
   lastAt: string | null = null
@@ -108,6 +115,8 @@ export class DaqNode {
     if (o.posZ !== undefined) this.posZ = o.posZ
     this.lineId = o.lineId ?? ''
     this.semantics = o.semantics
+    if (o.chamber !== undefined) this.chamber = o.chamber
+    if (o.unitPath !== undefined) this.unitPath = o.unitPath
     this.value = null
     this.createdAt = o.createdAt ?? new Date().toISOString()
   }
@@ -197,6 +206,8 @@ export class DaqNode {
       posZ: this.posZ,
       lineId: this.lineId,
       semantics: this.semantics,
+      chamber: this.chamber,
+      unitPath: this.unitPath,
       value: this.value,
       state: this.state,
       lastAt: this.lastAt,
@@ -227,6 +238,8 @@ export class DaqNode {
       posZ: row.posZ == null ? undefined : Number(row.posZ),
       lineId: row.lineId == null ? '' : String(row.lineId),
       semantics: row.semantics == null ? undefined : String(row.semantics),
+      chamber: row.chamber == null ? undefined : String(row.chamber),
+      unitPath: row.unitPath == null ? undefined : String(row.unitPath),
       createdAt: row.createdAt != null ? String(row.createdAt) : undefined,
     })
     if (row.value != null && !Number.isNaN(Number(row.value))) {
@@ -264,6 +277,8 @@ export class DaqNode {
       posZ: this.posZ,
       lineId: this.lineId,
       semantics: this.semantics,
+      chamber: this.chamber,
+      unitPath: this.unitPath,
       value: this.value,
       state: this.state,
       lastAt: this.lastAt,

package/server/services/workshop/daq/daq-templates.ts

@@ -12,7 +12,7 @@ import { randomUUID } from 'node:crypto'
 import { DAQ_TEMPLATES, DAQ_TEMPLATE_ICONS, daqTemplateByKey, normalizeSignalKind, type DaqMetricRule, type DaqSinkStep, type DaqTemplateDef, type DaqTemplateIcon, type DaqTemplateInput } from '../../../../shared/daq-protocol'
 import { AppError, ErrorCodes } from '../../../utils/errors'
 import { ensureDataDir } from '@/shared/config/home.mjs'
-import { loadJsonFile, saveJsonFileAtomic } from '../json-store.mjs'
+import { loadJsonFile, saveJsonFileAtomic } from '../json-store.mjs'
 
 const log = createLogger('daq.templates')
 
@@ -72,7 +72,21 @@ function normalize(input: Partial<DaqTemplateInput>, prev?: DaqTemplateDef): Daq
     const vmin = Number(input.vector?.min ?? prev?.vector?.min ?? min)
     const vmax = Number(input.vector?.max ?? prev?.vector?.max ?? max)
     if (!Number.isFinite(vmin) || !Number.isFinite(vmax) || vmin >= vmax) throw bad('vector 量程非法')
-    vector = { points, min: vmin, max: vmax }
+    const labelsRaw = input.vector?.labels ?? prev?.vector?.labels
+    const labels = Array.isArray(labelsRaw)
+      ? labelsRaw.map(x => String(x ?? '').trim()).filter(Boolean).slice(0, points)
+      : undefined
+    const baseRaw = Number(input.vector?.pointIndexBase ?? prev?.vector?.pointIndexBase ?? 1)
+    vector = {
+      points,
+      min: vmin,
+      max: vmax,
+      ...(String(input.vector?.axis ?? prev?.vector?.axis ?? '').trim() ? { axis: String(input.vector?.axis ?? prev?.vector?.axis).trim().slice(0, 200) } : {}),
+      ...(String(input.vector?.pointUnit ?? prev?.vector?.pointUnit ?? '').trim() ? { pointUnit: String(input.vector?.pointUnit ?? prev?.vector?.pointUnit).trim().slice(0, 40) } : {}),
+      ...(String(input.vector?.pointLabelPrefix ?? prev?.vector?.pointLabelPrefix ?? '').trim() ? { pointLabelPrefix: String(input.vector?.pointLabelPrefix ?? prev?.vector?.pointLabelPrefix).trim().slice(0, 80) } : {}),
+      pointIndexBase: baseRaw === 0 ? 0 : 1,
+      ...(labels && labels.length > 0 ? { labels } : {}),
+    }
   }
   const sink = input.sink ?? prev?.sink
   if (sink && (!Array.isArray(sink.processors) || sink.processors.some(p => !p || typeof p.name !== 'string'))) {

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

@@ -125,7 +125,7 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
 
   async query(nodeId: string, opts: DaqQueryOpts): Promise<TsdbPoint[]> {
     if (!this.db) return []
-    const limit = Math.min(opts.limit ?? 500, 5000)
+    const limit = Math.max(1, Math.min(opts.limit ?? 500, 5000))
     const from = opts.fromMs ?? 0
     const to = opts.toMs ?? Date.now()
     if (opts.bucketMs && opts.bucketMs >= 100) {
@@ -179,7 +179,9 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
     params.push(q.fromMs ?? 0)
     where.push('ts_ms <= ?')
     params.push(q.toMs ?? Date.now())
-    const limit = Math.min(q.limit ?? 2000, 1_000_000)
+    const limit = Math.max(1, Math.min(q.limit ?? 2000, 1_000_000))
+    // limit 语义 = nodeIds 集合总量(端口契约,与 timescale.adapter 一致);多节点
+    // 查询需要"每节点配额"语义时,由服务层逐节点调用(nodeIds:[单个] 时两者等价)。
     if (q.bucketMs && q.bucketMs >= 100) {
       // 桶宽内插(整数,同 query():绑定参数会走 REAL 浮点除,塌不了桶)
       const bucket = Math.round(Number(q.bucketMs))
@@ -201,7 +203,7 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
     `).all(...params, limit)) as Array<{ node_id: string, ts_ms: number, value: number }>
     for (const r of rows) {
       const list = out.get(r.node_id) ?? []
-      list.push({ at: Number(r.ts_ms), value: r.value })
+      list.push({ at: Number(r.ts_ms), value: Number(r.value) })
       out.set(r.node_id, list)
     }
     return out
@@ -245,7 +247,7 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
 
   async queryFrames(nodeId: string, opts: import('./tsdb-port').DaqFrameQueryOpts): Promise<import('./tsdb-port').DaqFrameRecord[]> {
     if (!this.db) return []
-    const limit = Math.min(opts.limit ?? 100, 1000)
+    const limit = Math.max(1, Math.min(opts.limit ?? 100, 1000))
     const rows = this.db.prepare(`
       SELECT ts_ms, kind, meta, metrics, device_binding_id, line_id, product_id, recipe_id, run_id
       FROM daq_frames

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

@@ -137,7 +137,7 @@ export class TimescaleAdapter implements TsdbPort {
 
   async query(nodeId: string, opts: DaqQueryOpts): Promise<TsdbPoint[]> {
     if (!this.pool) return []
-    const limit = Math.min(opts.limit ?? 500, 5000)
+    const limit = Math.max(1, Math.min(opts.limit ?? 500, 5000))
     // 时间正序(ASC):与 queryTagged 契约一致 —— 消费方(daq_query 最新/最近序列、
     // daq_export 游标续页、AML 网格对齐)都按升序假设;窗口超 limit 时截取的是**最旧**段,
     // 续页游标(lastAt+1)依赖升序才能翻完整窗。
@@ -188,7 +188,7 @@ export class TimescaleAdapter implements TsdbPort {
     params.push(new Date(q.fromMs ?? 0).toISOString())
     where.push(`ts <= $${params.length + 1}`)
     params.push(new Date(q.toMs ?? Date.now()).toISOString())
-    const limit = Math.min(q.limit ?? 2000, 1_000_000)
+    const limit = Math.max(1, Math.min(q.limit ?? 2000, 1_000_000))
     const whereSql = where.join(' AND ')
     if (q.bucketMs && q.bucketMs >= 100) {
       const { rows } = await this.pool.query(
@@ -262,7 +262,7 @@ export class TimescaleAdapter implements TsdbPort {
 
   async queryFrames(nodeId: string, opts: import('./tsdb-port').DaqFrameQueryOpts): Promise<import('./tsdb-port').DaqFrameRecord[]> {
     if (!this.pool) return []
-    const limit = Math.min(opts.limit ?? 100, 1000)
+    const limit = Math.max(1, Math.min(opts.limit ?? 100, 1000))
     const { rows } = await this.pool.query(
       `SELECT ts, kind, points, meta, metrics, device_binding_id, line_id, product_id, recipe_id, run_id
        FROM daq_frames WHERE node_id = $1 AND ($2::text IS NULL OR kind = $2) AND ts >= $3 AND ts <= $4

package/server/services/workshop/db/database/migrations.ts

@@ -56,6 +56,32 @@ export function migrateApprovalPayloadColumns(db: DatabaseSync): void {
   migrateAddColumn(db, 'approval_history', 'choice', 'INTEGER')
 }
 
+/**
+ * 产线日志显式域标识(2026-10-19):scope=line|system。
+ * 老库**首次补列**时按 line_id 回填(有产线=line,无产线=system);之后每次启动只做
+ * 不变量收敛「scope=line 必须有 line_id」—— 缺锚点的行降级为 system,防止无归属行
+ * 混入产线日志。已补列的库不再改写 scope,保留写入方显式给出的 system/line 语义。
+ */
+export function migrateAuditScopeColumn(db: DatabaseSync): void {
+  const existed = (db.prepare('PRAGMA table_info(audit_log)').all() as Array<{ name: string }>).some(c => c.name === 'scope')
+  migrateAddColumn(db, 'audit_log', 'scope', 'TEXT NOT NULL DEFAULT \'system\'')
+  if (!existed) {
+    db.exec('UPDATE audit_log SET scope = \'line\' WHERE scope = \'system\' AND line_id <> \'\'')
+  }
+  db.exec('UPDATE audit_log SET scope = \'system\' WHERE scope = \'line\' AND line_id = \'\'')
+}
+
+/**
+ * 产线日志查询索引(2026-10-19):ops-logs 默认只查产线域,常用过滤是
+ * scope / line_id / recipe_id + 时间倒序。索引必须在该表补列迁移之后创建
+ * (老库先跑 migrateAddColumn,否则 CREATE INDEX 会因缺列中断初始化)。
+ */
+export function migrateAuditQueryIndexes(db: DatabaseSync): void {
+  db.exec('CREATE INDEX IF NOT EXISTS idx_audit_log_scope_at ON audit_log(scope, at DESC)')
+  db.exec('CREATE INDEX IF NOT EXISTS idx_audit_log_line_at ON audit_log(line_id, at DESC)')
+  db.exec('CREATE INDEX IF NOT EXISTS idx_audit_log_recipe_at ON audit_log(recipe_id, at DESC)')
+}
+
 /** AgentTeam guardrail task metadata; additive and safe for existing task rows. */
 export function migrateAgentTeamTaskGuardrailColumns(db: DatabaseSync): void {
   migrateAddColumn(db, 'tasks', 'source_chat_message_id', 'TEXT')

package/server/services/workshop/db/database/open.ts

@@ -6,7 +6,7 @@ import type * as sqliteVec from 'sqlite-vec'
 import { DatabaseSync } from 'node:sqlite'
 import { SCHEMA_SQL } from './schema'
 import { createRequire } from 'node:module'
-import { migrateAddColumn, migrateAgentTeamExecutionLeaseColumns, migrateAgentTeamTaskGuardrailColumns, migrateAgentTeamTaskGuardrails, migrateAgentTeamTaskQueueColumns, migrateAmlChannelOptimizationColumns, migrateAmlModelIdentityColumns, migrateAnalysisEditColumns, migrateApprovalPayloadColumns, migrateDropOwnerFks, migrateGroupChatV17, migrateLegacySchema, migrateMissingForeignKeys, migrateAmlTwinProviderColumns } from './migrations'
+import { migrateAddColumn, migrateAgentTeamExecutionLeaseColumns, migrateAgentTeamTaskGuardrailColumns, migrateAgentTeamTaskGuardrails, migrateAgentTeamTaskQueueColumns, migrateAmlChannelOptimizationColumns, migrateAmlModelIdentityColumns, migrateAnalysisEditColumns, migrateApprovalPayloadColumns, migrateAuditQueryIndexes, migrateAuditScopeColumn, migrateDropOwnerFks, migrateGroupChatV17, migrateLegacySchema, migrateMissingForeignKeys, migrateAmlTwinProviderColumns } from './migrations'
 import { seedDefaultWorkshopData } from './seed'
 
 export const require = createRequire(import.meta.url)
@@ -56,6 +56,10 @@ export function initWorkshopDb(db: DatabaseSync): void {
   migrateAddColumn(db, 'audit_log', 'summary', 'TEXT NOT NULL DEFAULT \'\'')
   // 2026-10-08 写控 ACK 鉴定:严重级列(info/warn/error;既有库补列,历史行按 info 语义)
   migrateAddColumn(db, 'audit_log', 'level', 'TEXT NOT NULL DEFAULT \'info\'')
+  // 2026-10-19 产线日志显式域标识(scope=line|system;老库按 line_id 回填并强制不变量)
+  migrateAuditScopeColumn(db)
+  // 2026-10-19 产线日志查询索引(必须在补列之后:老库缺列时建索引会中断初始化)
+  migrateAuditQueryIndexes(db)
   migrateMissingForeignKeys(db)
   // Run after legacy task-table rebuilds so guardrail metadata and its index survive upgrades.
   migrateAgentTeamTaskQueueColumns(db)