agentworkshop 0.7.54 → 0.7.58

package/shared/config/single-instance.mjs

@@ -33,7 +33,7 @@ async function pidLooksLikeAw(pid) {
       const r = spawnSync('powershell', ['-NoProfile', '-Command',
         `(Get-CimInstance Win32_Process -Filter 'ProcessId=${Number(pid)}').CommandLine`], { encoding: 'utf8', timeout: 8000 })
       const line = String(r.stdout ?? '')
-      return /node|aw|agentworkshop/i.test(line) && /start\.mjs|aw\.mjs|\.output/i.test(line)
+      return /node|aw|agentworkshop/i.test(line) && /start.mjs|aw.mjs|dev-guard.mjs|.output/i.test(line)
     }
     const fs = await import('node:fs')
     const line = fs.readFileSync(`/proc/${pid}/cmdline`, 'utf8').replace(/\0/g, ' ')
@@ -155,3 +155,30 @@ export async function checkPort(host, port) {
     })
   })
 }
+
+/**
+ * 锁心跳(2026-10-04 事故补强):锁文件可能被第三方引导流程改写,导致原持锁进程
+ * "失锁隐形",与后续实例形成数据目录多写者(JSON 快照库最后写者赢 = 他人的写入蒸发,
+ * 实测曾抹掉新建数控节点)。持锁期间每 10s 校验锁归属;被他人接管 → 立即自杀退出。
+ */
+export function enforceLockHeartbeat(lock, configRoot, onConflict) {
+  const lockPath = join(configRoot, '.runtime', 'aw.lock')
+  const timer = setInterval(() => {
+    let cur = null
+    try {
+      cur = JSON.parse(readFileSync(lockPath, 'utf-8'))
+    }
+    catch { /* 锁文件瞬时缺失(接管者重写中):下一拍再验 */ }
+    if (!cur || cur.pid === process.pid) return
+    clearInterval(timer)
+    const msg = '[single-instance] 数据目录实例锁已被 pid=' + cur.pid + ' 接管(多写者会互相毁灭 JSON 快照)—— 本进程主动退出以保护数据'
+    console.error(msg)
+    try {
+      onConflict?.(cur)
+    }
+    catch { /* ignore */ }
+    process.exit(78)
+  }, 10_000)
+  timer.unref?.()
+  return timer
+}

package/shared/daq-protocol.ts

@@ -115,8 +115,8 @@ export const DAQ_TEMPLATES: DaqTemplateDef[] = [
   { key: 'pressure-tx', name: '压力变送器', code: 'PRESSURE · TX', ch: '熔体压力', unit: 'MPa', base: 0.82, amp: 0.05, min: 0.6, max: 1.2, decimals: 2, icon: 'pressure', telemetryKey: 'pressure', semantics: '熔体压力:挤出负荷的「血压计」。判读:与温度负相关(温度升→熔体黏度降→压力降);压力突升常见于滤网堵塞或出料受阻。' },
   { key: 'tension-cell', name: '张力传感器', code: 'TENSION · CELL', ch: '膜张力', unit: 'kN', base: 21.4, amp: 0.9, min: 18, max: 26, decimals: 1, icon: 'tension', semantics: '膜张力:成膜质量直接指标。判读:张力波动与速度/温度设定强耦合,评估张力前先确认速度稳定。' },
   { key: 'line-encoder', name: '速度编码器', code: 'LINE · ENCODER', ch: '产线速度', unit: 'm/min', base: 318, amp: 7, min: 280, max: 360, decimals: 0, icon: 'encoder', semantics: '产线速度:产能直接观测量。判读:实际速度对设定值的跟随滞后反映传动惯量;速度波动会传导至张力与厚度。' },
-  { key: 'vision-cam', name: '视觉检测相机', code: 'VISION · CAM', ch: '表面缺陷率', unit: '‰', base: 0.42, amp: 0.09, min: 0.1, max: 0.9, decimals: 2, icon: 'camera' },
-  { key: 'power-meter', name: '电参采集器', code: 'POWER · METER', ch: '运行功率', unit: 'kW', base: 45.2, amp: 2.6, min: 38, max: 55, decimals: 1, icon: 'gateway' },
+  { key: 'vision-cam', name: '视觉检测相机', code: 'VISION · CAM', ch: '表面缺陷率', unit: '‰', base: 0.42, amp: 0.09, min: 0.1, max: 0.9, decimals: 2, icon: 'camera', semantics: '工业相机表检帧:图像暗斑/异物/边缘缺损对应表面缺陷;判读结合检测算法伴随字段(缺陷数/位置);误报常源于光照抖动与反光,连续多帧同位置暗斑才可判真缺陷。' },
+  { key: 'power-meter', name: '电参采集器', code: 'POWER · METER', ch: '运行功率', unit: 'kW', base: 45.2, amp: 2.6, min: 38, max: 55, decimals: 1, icon: 'gateway', semantics: '功率计:整机/关键设备有功功率,反映负载率与能耗;缓升=磨损或工艺漂移,突跳=启停或卡阻;与产量联用可得单位能耗,是能效优化的直接观测量。' },
   // ===== 多形态信号模板(v2 帧管线)=====
   {
     key: 'thickness-scan', name: '测厚扫描仪', code: 'THK · SCAN', ch: '厚度轮廓', unit: 'mm',
@@ -475,3 +475,13 @@ export interface AepDaqControllerState {
   /** 写库侧丢弃(重试耗尽/攒批溢出;与 dropped 的队列侧丢弃分列) */
   tsdbDropped?: number
 }
+
+/** driverConfig 出口脱敏:键名含 password/secret/token/passwd/api_key 的值置换为 '******'(REST/AEP 投影用;持久化与驱动内部不经过此函数) */
+export function maskDriverConfigSecrets<T extends Record<string, unknown>>(cfg: T | undefined | null): T {
+  if (!cfg || typeof cfg !== 'object') return {} as T
+  const out: Record<string, unknown> = { ...cfg }
+  for (const k of Object.keys(out)) {
+    if (/pass(word)?|secret|token|passwd|api[-_]?key/i.test(k)) out[k] = '******'
+  }
+  return out as T
+}

package/shared/dcw-protocol/catalog.ts

@@ -219,9 +219,14 @@ export const DCW_DRIVERS: DcwDriverMeta[] = [
         { value: 'true', label: '允许(内网 MES 显式开启)' },
       ], hint: '内网/环回地址显式白名单开关(生产 MES 通常在内网)' },
       { key: 'desc', label: '节点语义描述(desc)', type: 'string', placeholder: '烘箱温度设定回写 MES 工单;异常时先查工单状态', hint: '节点语义描述(给 Agent 看):参数物理含义、异常时先查什么' },
+      { key: 'headers', label: '默认请求头(headers)', type: 'text', placeholder: '{"X-Unit":"L01","X-API-Token":"{{SECRET:MES_PRIMARY}}"}', hint: '默认请求头 JSON(随读/写/史所有请求携带;值支持 {{SECRET:REF}} 引用凭据不落明文;映射级 headers 与认证头可覆盖)' },
       { key: 'readMap', label: '当前值映射(readMap)', type: 'text', placeholder: '{"path":"/api/v1/params/{name}/current","query":{"name":"TEMP_SP"},"response":{"valuePath":"data.value","tsPath":"data.ts","tsFormat":"epoch_ms"}}', hint: '当前值映射 JSON:{method,path,query,headers,response:{valuePath,tsPath,tsFormat}}' },
       { key: 'writeMap', label: '写映射(writeMap)', type: 'text', placeholder: '{"method":"POST","path":"/api/v1/params/{name}/setpoint","query":{"name":"TEMP_SP"},"bodyTemplate":{"value":"{{value}}"},"successOn":[200,201],"response":{"ackPath":"ack"}}', hint: '写映射 JSON(可选):{method,path,bodyTemplate,successOn,response:{ackPath}};bodyTemplate 里 {{value}} 为治理后工程值' },
-      { key: 'historyMap', label: '历史映射(historyMap)', type: 'text', placeholder: '{"path":"/api/v1/params/{name}/history","query":{"name":"TEMP_SP"},"response":{"rowsPath":"data.rows[*]","valuePath":"value","tsPath":"ts","nextCursorPath":"data.nextCursor"},"pageSize":500,"maxPages":40}', hint: '历史映射 JSON(可选):{method,path,query,response:{rowsPath,valuePath,tsPath,nextCursorPath},pageSize,maxPages}' },
+      { key: 'historyMap', label: '历史映射(historyMap)', type: 'text', placeholder: '{"path":"/api/v1/params/{name}/history","query":{"name":"TEMP_SP"},"response":{"rowsPath":"data.rows[*]","valuePath":"value","tsPath":"ts","nextCursorPath":"data.nextCursor"},"pageSize":500,"maxPages":40}', hint: '历史映射 JSON(可选):{method,path,query,response:{rowsPath,valuePath,tsPath,nextCursorPath},pageSize,maxPages};response.format 支持数据格式全谱:scalar(缺省,每时间点一个数值)/vector(检测向量如膜厚断面,配 valuesPath)/image(图像帧如 CCD,配 dataPath+mimePath)/table/event(记录流)' },
+      { key: 'writeHook', label: '写入构造钩子(writeHook)', type: 'text', placeholder: 'function (eng, ctx) {\n  // eng = recipe 下发的本参数工程值;返回真实写请求(多字段 API 只写本节点负责的一个字段)\n  return { method: \'POST\', path: \'/api/v1/params/multi/set\', body: { tem: eng } }\n}', hint: '可选 JS 函数表达式:(eng, ctx) => {method?,path?,query?,headers?,body?};覆盖 writeMap 声明(body 缺省 {{value}} 模板);recipe 下发时每个参数只把本节点的值传给本 API' },
+      { key: 'writeCheckHook', label: '写响应二次校验钩子(writeCheckHook)', type: 'text', placeholder: 'function (param, ctx) {\n  // param = {status, reply(MES 响应 JSON), eng(本次设定)};返回 {ok, message}\n  return { ok: !!(param.reply && param.reply.applied && param.reply.applied.tem === param.eng), message: \'applied.tem === 设定值\' }\n}', hint: '可选 JS 函数表达式:(param, ctx) => {ok, message};对 MES 响应 data 做业务二次校验(回读之外),ok=false 即写失败' },
+      { key: 'requestHook', label: '请求构造钩子(requestHook)', type: 'text', placeholder: 'function (param, ctx) {\n  // param = Agent 传入的参数对象;返回请求覆盖(合入映射声明,钩子优先)\n  return { query: { from: param.from, to: param.to, lane: param.lane } }\n}', hint: '可选 JS 函数表达式:(param, ctx) => {path?,query?,headers?};返回值合入映射声明(钩子优先);独立子进程执行,4s 超时击杀' },
+      { key: 'dataHook', label: '数据下沉钩子(dataHook)', type: 'text', placeholder: 'function (param, data, ctx) {\n  // data.rows = 格式化行(标量 value/向量 values/图像 data+mime/记录 record);data.node = 点位信息\n  const means = data.rows.map(r => r.values.reduce((a, b) => a + b, 0) / r.values.length)\n  ctx.plot({ name: \'trend\', title: data.node.name, series: [{ name: \'rowMean\', points: means.map((v, i) => [i, v]) }] })\n  ctx.saveCsv({ name: \'rows\', rows: [[\'ts\', \'mean\']].concat(data.rows.map(r => [r.ts, r.values[0]])) })\n  return { summary: `行数 ${data.rows.length},均值 ${means[0].toFixed(2)}`, context: \'已绘图并存 CSV\' }\n}', hint: '可选 JS 函数表达式:(param, data, ctx) => {summary?,context?,stats?};ctx 提供 saveCsv/saveJson/saveText/savePng/plot(SVG)/log/now,产物落数据根 mes-artifacts/<点位id>/;Agent 取数回包自动附处理摘要与产物清单;独立子进程执行,4s 超时击杀' },
     ],
   },
 ]

package/shared/dcw-protocol/index.ts

@@ -1,19 +1,19 @@
-/**
- * DCW 共享协议:模板/驱动预设与类型、产线、产品与配方、工艺参数映射、调控闭环记录
- *
- * 由原单文件按职责拆分而来;此处保持**原文件的公开 API 与 import 路径不变**
- * (目录 index 解析),外部调用方无需改动。
- *
- * 模块划分:
- *   catalog.ts             控制模板与写控制驱动目录(预设数据)+ 模板键辅助
- *   line.ts                产线(顶层隔离维度)+ 节点视图(REST/WS 同构载荷)
- *   recipe.ts              产品/配方/批次 + 工艺参数映射与 PLC 转换模式
- *   closed-loop.ts         调控闭环:写入来源/台账/Agent 优化记录与广播载荷
- */
-export { DCW_TEMPLATE_ICONS, DCW_TEMPLATES, dcwTemplateByKey, dcwKeyFromRef, DCW_DRIVERS } from './catalog'
-export type { DcwTemplateDef, DcwTemplateIcon, DcwTemplateInput, DcwDriverKind, DcwScaleConfig, DcwDriverMeta } from './catalog'
-export { DCW_LINE_COLORS, dcwLineColorFor } from './line'
-export type { LineView, LineInput, DcwNodeState, DcwNodeView, AepDcwWritten, AepDcwNodeChange, AepDcwRead, AepDcwControllerState } from './line'
-export type { ParamLimitRange, ParamConversion, ParamAccessSpec, DcwParamView, DcwParamInput, ParamLimitLayer, ParamLimitsBreakdown, ProductView, ProductInput, RecipeDaqWindow, RecipeParam, RecipeView, RecipeInput, RecipeRunView, LineRunState, RecipeRunData, LineQueryOpts, LineQueryResult } from './recipe'
-export type { DcwWriteSource, DcwWriteMeta, DcwJournalAnchor, OptimizationChannelMetrics, OptimizationMetrics, OptimizationStatus, OptimizationVerdict, OptimizationJudge, OptimizationRecord, DcwParamLedger, AepDcwOptimizationChange } from './closed-loop'
-export { applyTransform, inverseTransform, normalizeDataTransform, type DataTransform } from './catalog'
+/**
+ * DCW 共享协议:模板/驱动预设与类型、产线、产品与配方、工艺参数映射、调控闭环记录
+ *
+ * 由原单文件按职责拆分而来;此处保持**原文件的公开 API 与 import 路径不变**
+ * (目录 index 解析),外部调用方无需改动。
+ *
+ * 模块划分:
+ *   catalog.ts             控制模板与写控制驱动目录(预设数据)+ 模板键辅助
+ *   line.ts                产线(顶层隔离维度)+ 节点视图(REST/WS 同构载荷)
+ *   recipe.ts              产品/配方/批次 + 工艺参数映射与 PLC 转换模式
+ *   closed-loop.ts         调控闭环:写入来源/台账/Agent 优化记录与广播载荷
+ */
+export { DCW_TEMPLATE_ICONS, DCW_TEMPLATES, dcwTemplateByKey, dcwKeyFromRef, DCW_DRIVERS } from './catalog'
+export type { DcwTemplateDef, DcwTemplateIcon, DcwTemplateInput, DcwDriverKind, DcwScaleConfig, DcwDriverMeta } from './catalog'
+export { DCW_LINE_COLORS, dcwLineColorFor } from './line'
+export type { LineView, LineInput, DcwNodeState, DcwNodeView, AepDcwWritten, AepDcwNodeChange, AepDcwRead, AepDcwControllerState, WriteAckLevel, WriteVerifyOutcome } from './line'
+export type { ParamLimitRange, ParamConversion, ParamAccessSpec, DcwParamView, DcwParamInput, ParamLimitLayer, ParamLimitsBreakdown, ProductView, ProductInput, RecipeDaqWindow, RecipeParam, RecipeView, RecipeInput, RecipeRunView, LineRunState, RecipeRunData, LineQueryOpts, LineQueryResult } from './recipe'
+export type { DcwWriteSource, DcwWriteMeta, DcwJournalAnchor, OptimizationChannelMetrics, OptimizationMetrics, OptimizationStatus, OptimizationVerdict, OptimizationJudge, OptimizationRecord, DcwParamLedger, AepDcwOptimizationChange } from './closed-loop'
+export { applyTransform, inverseTransform, normalizeDataTransform, type DataTransform } from './catalog'

package/shared/dcw-protocol/line.ts

@@ -23,12 +23,24 @@ export interface LineView {
   color: string
   description: string
   createdAt: string
+  /**
+   * 线级控制模式总闸(HITL 生产化,2026-10-08):
+   *  - 'manual'(缺省,fail-safe):本线全部配方写族动作(recipe_update/apply/trial/rollback/propose)
+   *    即使节点绑定 mode='auto' 也强制挂人工审批 —— 人必须批;
+   *  - 'auto':按各绑定的 mode 语义(auto 免批);manual→auto 切换须显式 confirm:true。
+   * 存量数据无此字段时按 'manual' 生效(读侧归一,见 DcwLineRepo.controlModeOf)。
+   */
+  controlMode?: 'auto' | 'manual'
 }
 
 export interface LineInput {
   name: string
   color?: string
   description?: string
+  /** 线级控制模式总闸;缺省 'manual';manual→auto 须 confirm:true(服务端强制) */
+  controlMode?: 'auto' | 'manual'
+  /** manual→auto 的显式风险确认(严格 === true;仅 patch 入参用,不落盘) */
+  confirm?: boolean
 }
 
 // ============================================================
@@ -98,12 +110,34 @@ export interface AepDcwWritten {
   /** 原始值(PLC 语义,换算后) */
   raw: number | null
   ok: boolean
+  /** 写 ACK 鉴定等级(2026-10-08):缺省按旧口径归一(ok+readback→readback-verified) */
+  ack?: WriteAckLevel
   message: string
   /** 关联的配方批次(单发/保写为 null) */
   recipeRunId: string | null
   at: string
 }
 
+/**
+ * 写 ACK 鉴定三级(生产化:区分「链路受理」与「设备证实」,堵 mqtt/http 假成功):
+ *  - readback-verified:写入后经**独立回读**且容差比对通过(modbus/opcua 驱动内回读,或写后验证器补验);
+ *  - transport-ack:仅链路/网关受理(mqtt QoS puback、http 2xx 无回传数值)——设备侧未证实;
+ *  - unverified:命令未成功发出或驱动不支持任何确认 —— 一律不得计为生效。
+ */
+export type WriteAckLevel = 'readback-verified' | 'transport-ack' | 'unverified'
+
+/** 写后验证结论(verify 层产出;ack 的升级依据) */
+export interface WriteVerifyOutcome {
+  /** verified=回读证实 / unverified=未能证实(设备不回读或超次) / failed=命令本身失败 */
+  verdict: 'verified' | 'unverified' | 'failed'
+  /** 最终 ACK 等级(verify 可将 transport-ack 升级为 readback-verified) */
+  ack: WriteAckLevel
+  /** 实际执行的回读次数(0=无需回读) */
+  attempts: number
+  /** 人读结论(进批次结果与回执) */
+  message: string
+}
+
 /** dcw.node.changed 帧载荷 */
 export interface AepDcwNodeChange {
   op: 'added' | 'updated' | 'removed'

package/shared/dcw-protocol/recipe.ts

@@ -3,7 +3,7 @@
  * (由 shared/dcw-protocol.ts 按职责拆出;内容逐行原文搬运)
  */
 import type { DcwDriverKind } from './catalog'
-import type { DcwNodeState } from './line'
+import type { DcwNodeState, WriteAckLevel } from './line'
 
 // ============================================================
 // Product 产品 + Recipe 配方(产品-配方-批次三级隔离)
@@ -88,6 +88,8 @@ export interface DcwParamView {
   stepLimit: number | null
   /** PLC 执行节点(映射目标) */
   nodeId: string
+  /** 参数描述("这个参数影响什么";缺省由模板语义派生,给 Agent/用户的本体说明) */
+  desc?: string
   /** 执行节点所属产线(派生自节点;'' = 未分配) */
   lineId: string
   /** 驱动类别(仅类别;不含寄存器等寻址细节) */
@@ -106,6 +108,7 @@ export interface DcwParamView {
 export interface DcwParamInput {
   key?: string
   name?: string
+  desc?: string
   templateRef?: string
   unit?: string
   decimals?: number
@@ -226,6 +229,14 @@ export interface RecipeView {
   }>
   /** 已知良好批次(判定 keep / 手动标记;基准恢复的目标) */
   lastGoodRunId?: string | null
+  /** 下发操作间隔卡控(ms):该配方两次已批准/已执行的 Agent 下发最小间隔(锚=审批时刻);缺省=默认 60000;0=显式禁用 */
+  opIntervalMs?: number
+  /** 二级操作权限:默认绑定即可操作;requireAuth=true 时仅 authorizedAgentIds 清单内的 Agent 可操作 */
+  access?: {
+    requireAuth?: boolean
+    /** 授权 Agent 成员实例 id 清单(requireAuth=true 时生效;空清单 = 无人可操作,fail-closed) */
+    authorizedAgentIds?: string[]
+  }
   createdAt: string
   updatedAt: string
 }
@@ -237,6 +248,13 @@ export interface RecipeInput {
   params?: RecipeParam[]
   /** 配方级数采监控窗口(目标数采节点 + 越限上下限) */
   daqWindows?: RecipeDaqWindow[]
+  /** 二级操作权限(缺省 undefined = 未配置,绑定即可操作) */
+  access?: {
+    requireAuth?: boolean
+    authorizedAgentIds?: string[]
+  }
+  /** 下发操作间隔卡控(ms);缺省=默认 60000;0=显式禁用 */
+  opIntervalMs?: number
 }
 
 /** 生产批次(Recipe 应用的隔离窗口:数采数据/写历史按窗口归属产品) */
@@ -249,8 +267,20 @@ export interface RecipeRunView {
   lineId: string
   startedAt: string
   endedAt: string | null
-  /** apply 时逐参数写结果快照(节点级寻址) */
-  results: Array<{ templateRef: string, nodeId: string | null, ok: boolean, message: string, value: number }>
+  /** apply 时逐参数写结果快照(节点级寻址);ack/verify 为 2026-10-08 ACK 鉴定增量 */
+  results: Array<{
+    templateRef: string
+    nodeId: string | null
+    ok: boolean
+    message: string
+    value: number
+    /** 写 ACK 鉴定等级(ok=true 时区分设备证实 vs 仅链路受理;历史批次无此字段) */
+    ack?: WriteAckLevel
+    /** 写后验证结论(readback-verified 不再补验;transport-ack/unverified 经补验归一) */
+    verify?: { verdict: 'verified' | 'unverified' | 'failed', attempts: number }
+  }>
+  /** 批次 ACK 鉴定汇总(2026-10-08;历史批次缺省) */
+  ackSummary?: { verified: number, unverified: number, failed: number, total: number }
   /** 建批时的参数冻结(配方事后修改不影响审计与回放) */
   paramsSnapshot?: RecipeParam[]
 }

package/shared/local-time.mjs

@@ -7,15 +7,50 @@
 export const DEFAULT_TIME_ZONE = 'Asia/Shanghai'
 const TIME_ZONE_KEY = '__awConfiguredTimeZone'
 
+// Intl.DateTimeFormat 构造是最贵的 Intl 操作;热路径(每条日志/WS 帧/DB 行都带时间戳)
+// 必须按 timeZone 缓存 formatter、缓存时区校验结果,否则高频时间戳会把 CPU 打满。
+const partsFormatterCache = new Map()
+function partsFormatter(timeZone) {
+  let f = partsFormatterCache.get(timeZone)
+  if (!f) {
+    f = new Intl.DateTimeFormat('en-CA', {
+      timeZone,
+      calendar: 'iso8601',
+      numberingSystem: 'latn',
+      year: 'numeric', month: '2-digit', day: '2-digit',
+      hour: '2-digit', minute: '2-digit', second: '2-digit',
+      hourCycle: 'h23',
+    })
+    partsFormatterCache.set(timeZone, f)
+  }
+  return f
+}
+const offsetFormatterCache = new Map()
+function offsetFormatter(timeZone) {
+  let f = offsetFormatterCache.get(timeZone)
+  if (!f) {
+    f = new Intl.DateTimeFormat('en-US', {
+      timeZone,
+      timeZoneName: 'longOffset',
+      hour: '2-digit', minute: '2-digit', hourCycle: 'h23',
+    })
+    offsetFormatterCache.set(timeZone, f)
+  }
+  return f
+}
+
 function configuredTimeZoneValue() {
   const g = globalThis
   return typeof g[TIME_ZONE_KEY] === 'string' ? g[TIME_ZONE_KEY] : DEFAULT_TIME_ZONE
 }
 
+const validTimeZoneCache = new Set()
 export function isValidTimeZone(value) {
   if (typeof value !== 'string' || !value.trim()) return false
+  if (validTimeZoneCache.has(value)) return true
   try {
     new Intl.DateTimeFormat('en-US', { timeZone: value }).format()
+    validTimeZoneCache.add(value)
     return true
   }
   catch {
@@ -56,20 +91,9 @@ function pad(value, width) {
 function dateParts(date, timeZone) {
   const d = date instanceof Date ? date : new Date(date)
   if (Number.isNaN(d.getTime())) throw new RangeError('Invalid time value')
-  const parts = new Intl.DateTimeFormat('en-CA', {
-    timeZone,
-    calendar: 'iso8601',
-    numberingSystem: 'latn',
-    year: 'numeric', month: '2-digit', day: '2-digit',
-    hour: '2-digit', minute: '2-digit', second: '2-digit',
-    hourCycle: 'h23',
-  }).formatToParts(d)
+  const parts = partsFormatter(timeZone).formatToParts(d)
   const values = Object.fromEntries(parts.filter(p => p.type !== 'literal').map(p => [p.type, p.value]))
-  const offsetText = new Intl.DateTimeFormat('en-US', {
-    timeZone,
-    timeZoneName: 'longOffset',
-    hour: '2-digit', minute: '2-digit', hourCycle: 'h23',
-  }).formatToParts(d).find(p => p.type === 'timeZoneName')?.value ?? 'GMT'
+  const offsetText = offsetFormatter(timeZone).formatToParts(d).find(p => p.type === 'timeZoneName')?.value ?? 'GMT'
   const match = offsetText.match(/^GMT([+-])(\d{2}):(\d{2})$/)
   const offsetMinutes = match
     ? (match[1] === '+' ? 1 : -1) * (Number(match[2]) * 60 + Number(match[3]))

package/shared/workshop-protocol.ts

@@ -206,6 +206,10 @@ export interface AepHitlItem {
   /** park 截止时刻(omp 对话框零订阅倒计时;null = 有订阅者,计时暂停) */
   expiresAt?: string | null
   // ===== v17 增量(全部可选:旧消费者按原字段工作,不破坏兼容)=====
+  /** 权限模型 v3:dcw-approval 的目标对象 id(recipe-propose:<配方id> 或 节点 id;产线锚点推导用) */
+  nodeId?: string
+  /** 权限模型 v3:条目归属产线(注册时可直填;缺省由 nodeId/channel.line_id 推导) */
+  lineId?: string
   /** question(提问) | approval(授权);缺省按 kind 推定 */
   requestType?: AepHitlRequestType
   /** 引擎原生 requestId(与 id 区分:omp 用 id,codex/opencode 另有 rpcId) */

package/.output/public/_nuxt/B2x8SKRO2.js

@@ -1 +0,0 @@
-import{E as e,v as t}from"./CavpkQb0.js";import{S as n,b as r,d as i,i as a}from"./ByMj6e7s.js";import{Ct as o,L as s,Mt as c,R as l,Tt as u,Y as d,at as f,d as p,et as m,h,j as g,jt as _,n as v,nt as y,ot as b,u as x}from"./C2YYOgMe.js";import{C as S,E as C,W as w,gt as T,j as E,w as D}from"./Bub2P5me.js";import{P as O,V as k,b as A,c as j,dt as M,ht as N,p as P,r as F,u as I}from"./wDPc4SSR.js";var L=e=>{let{componentCls:t,popoverBg:n,popoverColor:r,width:i,fontWeightStrong:a,popoverPadding:o,boxShadowSecondary:s,colorTextHeading:c,borderRadiusLG:l,zIndexPopup:u,marginXS:d,colorBgElevated:f}=e;return[{[t]:_(_({},h(e)),{position:`absolute`,top:0,left:{_skip_check_:!0,value:0},zIndex:u,fontWeight:`normal`,whiteSpace:`normal`,textAlign:`start`,cursor:`auto`,userSelect:`text`,"--antd-arrow-background-color":f,"&-rtl":{direction:`rtl`},"&-hidden":{display:`none`},[`${t}-content`]:{position:`relative`},[`${t}-inner`]:{backgroundColor:n,backgroundClip:`padding-box`,borderRadius:l,boxShadow:s,padding:o},[`${t}-title`]:{minWidth:i,marginBottom:d,color:c,fontWeight:a},[`${t}-inner-content`]:{color:r}})},C(e,{colorBg:`var(--antd-arrow-background-color)`}),{[`${t}-pure`]:{position:`relative`,maxWidth:`none`,[`${t}-content`]:{display:`inline-block`}}}]},R=e=>{let{componentCls:t}=e;return{[t]:T.map(n=>{let r=e[`${n}-6`];return{[`&${t}-${n}`]:{"--antd-arrow-background-color":r,[`${t}-inner`]:{backgroundColor:r},[`${t}-arrow`]:{background:`transparent`}}}})}},z=e=>{let{componentCls:t,lineWidth:n,lineType:r,colorSplit:i,paddingSM:a,controlHeight:o,fontSize:s,lineHeight:c,padding:l}=e,u=o-Math.round(s*c),d=u/2,f=u/2-n,p=l;return{[t]:{[`${t}-inner`]:{padding:0},[`${t}-title`]:{margin:0,padding:`${d}px ${p}px ${f}px`,borderBottom:`${n}px ${r} ${i}`},[`${t}-inner-content`]:{padding:`${a}px ${p}px`}}}},B=p(`Popover`,e=>{let{colorBgElevated:t,colorText:n,wireframe:r}=e,i=x(e,{popoverBg:t,popoverColor:n,popoverPadding:12});return[L(i),R(i),r&&z(i),A(i,`zoom-big`)]},e=>{let{zIndexPopupBase:t}=e;return{zIndexPopup:t+30,width:177}}),V=n({compatConfig:{MODE:3},name:`APopover`,inheritAttrs:!1,props:o(_(_({},E()),{content:d(),title:d()}),_(_({},D()),{trigger:`hover`,placement:`top`,mouseEnterDelay:.1,mouseLeaveDelay:.1})),setup(e,n){let{expose:o,slots:s,attrs:l}=n,d=t();g(e.visible===void 0,`popover`,"`visible` will be removed in next major version, please use `open` instead."),o({getPopupDomNode:()=>{var e;return((e=d.value)?.getPopupDomNode)?.call(e)}});let{prefixCls:f,configProvider:p}=v(`popover`,e),[m,h]=B(f),_=i(()=>p.getPrefixCls()),y=()=>{let{title:t=b(s.title?.call(s)),content:n=b(s.content?.call(s))}=e,i=!!(Array.isArray(t)?t.length:t),o=!!(Array.isArray(n)?n.length:t);return!i&&!o?null:r(a,null,[i&&r(`div`,{class:`${f.value}-title`},[t]),r(`div`,{class:`${f.value}-inner-content`},[n])])};return()=>{let t=u(e.overlayClassName,h.value);return m(r(S,c(c(c({},N(e,[`title`,`content`])),l),{},{prefixCls:f.value,ref:d,overlayClassName:t,transitionName:k(_.value,`zoom-big`,e.transitionName),"data-popover-inject":!0}),{title:y,default:s.default}))}}}),H=f(V),U=e=>{let{componentCls:t,iconCls:n,zIndexPopup:r,colorText:i,colorWarning:a,marginXS:o,fontSize:s,fontWeightStrong:c,lineHeight:l}=e;return{[t]:{zIndex:r,[`${t}-inner-content`]:{color:i},[`${t}-message`]:{position:`relative`,marginBottom:o,color:i,fontSize:s,display:`flex`,flexWrap:`nowrap`,alignItems:`start`,[`> ${t}-message-icon ${n}`]:{color:a,fontSize:s,flex:`none`,lineHeight:1,paddingTop:(Math.round(s*l)-s)/2},"&-title":{flex:`auto`,marginInlineStart:o},"&-title-only":{fontWeight:c}},[`${t}-description`]:{position:`relative`,marginInlineStart:s+o,marginBottom:o,color:i,fontSize:s},[`${t}-buttons`]:{textAlign:`end`,button:{marginInlineStart:o}}}}},W=p(`Popconfirm`,e=>U(e),e=>{let{zIndexPopupBase:t}=e;return{zIndexPopup:t+60}}),G=function(e,t){var n={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&t.indexOf(r)<0&&(n[r]=e[r]);if(e!=null&&typeof Object.getOwnPropertySymbols==`function`)for(var i=0,r=Object.getOwnPropertySymbols(e);i<r.length;i++)t.indexOf(r[i])<0&&Object.prototype.propertyIsEnumerable.call(e,r[i])&&(n[r[i]]=e[r[i]]);return n},K=n({compatConfig:{MODE:3},name:`APopconfirm`,inheritAttrs:!1,props:o(_(_({},E()),{prefixCls:String,content:d(),title:d(),description:d(),okType:y(`primary`),disabled:{type:Boolean,default:!1},okText:d(),cancelText:d(),icon:d(),okButtonProps:m(),cancelButtonProps:m(),showCancel:{type:Boolean,default:!0},onConfirm:Function,onCancel:Function}),_(_({},D()),{trigger:`click`,placement:`top`,mouseEnterDelay:.1,mouseLeaveDelay:.1,arrowPointAtCenter:!1,autoAdjustOverflow:!0,okType:`primary`,disabled:!1})),slots:Object,setup(n,a){let{slots:o,emit:d,expose:f,attrs:p}=a,m=t();g(n.visible===void 0,`Popconfirm`,"`visible` will be removed in next major version, please use `open` instead."),f({getPopupDomNode:()=>{var e;return((e=m.value)?.getPopupDomNode)?.call(e)}});let[h,y]=w(!1,{value:e(n,`open`)}),b=(e,t)=>{n.open===void 0&&y(e),d(`update:open`,e),d(`openChange`,e,t)},x=e=>{b(!1,e)},S=e=>n.onConfirm?.call(n,e),C=e=>{var t;b(!1,e),(t=n.onCancel)==null||t.call(n,e)},T=e=>{e.keyCode===O.ESC&&h&&b(!1,e)},E=e=>{let{disabled:t}=n;t||b(e)},{prefixCls:D,getPrefixCls:A}=v(`popconfirm`,n),L=i(()=>A()),R=i(()=>A(`btn`)),[z]=W(D),[B]=s(`Popconfirm`,l.Popconfirm),V=()=>{let{okButtonProps:e,cancelButtonProps:t,title:i=o.title?.call(o),description:a=o.description?.call(o),cancelText:s=o.cancel?.call(o),okText:c=o.okText?.call(o),okType:l,icon:u=o.icon?.call(o)||r(P,null,null),showCancel:d=!0}=n,{cancelButton:f,okButton:p}=o,m=_({onClick:C,size:`small`},t),h=_(_(_({onClick:S},I(l)),{size:`small`}),e);return r(`div`,{class:`${D.value}-inner-content`},[r(`div`,{class:`${D.value}-message`},[u&&r(`span`,{class:`${D.value}-message-icon`},[u]),r(`div`,{class:[`${D.value}-message-title`,{[`${D.value}-message-title-only`]:!!a}]},[i])]),a&&r(`div`,{class:`${D.value}-description`},[a]),r(`div`,{class:`${D.value}-buttons`},[d?f?f(m):r(j,m,{default:()=>[s||B.value.cancelText]}):null,p?p(h):r(F,{buttonProps:_(_({size:`small`},I(l)),e),actionFn:S,close:x,prefixCls:R.value,quitOnNullishReturnValue:!0,emitEvent:!0},{default:()=>[c||B.value.okText]})])])};return()=>{let{placement:e,overlayClassName:t,trigger:i=`click`}=n,a=G(n,[`placement`,`overlayClassName`,`trigger`]),s=N(a,[`title`,`content`,`cancelText`,`okText`,`onUpdate:open`,`onConfirm`,`onCancel`,`prefixCls`]),l=u(D.value,t);return z(r(H,c(c(c({},s),p),{},{trigger:i,placement:e,onOpenChange:E,open:h.value,overlayClassName:l,transitionName:k(L.value,`zoom-big`,n.transitionName),ref:m,"data-popover-inject":!0}),{default:()=>[M(o.default?.call(o)||[],{onKeydown:e=>{T(e)}},!1)],content:V}))}}}),q=f(K);export{q as t};