agentworkshop 0.7.9 → 0.7.12

package/server/api/workshop/ws.ts

@@ -24,7 +24,8 @@ import type { AgentEvent } from '../../services/workshop/agents/agent-interface'
 import type { A2AMessage } from '../../services/workshop/types/a2a'
 import type { AepEnvelope } from '../../../shared/workshop-protocol'
 import { parseJson } from '../../services/workshop/db/database'
-import { registerScenePeer, unregisterScenePeer, broadcastPeerEvent } from '../../services/workshop/scene-events'
+import { registerScenePeer, setPeerVisibleLines, unregisterScenePeer, broadcastPeerEvent } from '../../services/workshop/scene-events'
+import { visibleLineIds } from '../../services/workshop/permissions'
 import { subscribeHitlEvents } from '../../services/workshop/agents/hitl-registry'
 import { createLogger } from '../../services/workshop/logger'
 import { retentionSettings } from '../../services/workshop/settings'
@@ -167,6 +168,12 @@ function resolveChannelIdFromUrl(peer: WsPeer): string | undefined {
   return resolveQueryParam(peer, 'channelId') ?? resolveQueryParam(peer, 'channel_id')
 }
 
+/** 场景事件注册(鉴权后):按用户产线可见集挂 per-peer 过滤,未经鉴权的 peer 不注册 */
+function attachScenePeer(peer: WsPeer, user: { id: string, role: string }): void {
+  setPeerVisibleLines(peer, visibleLineIds(user))
+  registerScenePeer(peer)
+}
+
 /** 安全发送控制帧(error/pong/snapshot;死连接静默丢弃) */
 function sendControl(peer: WsPeer, obj: unknown): void {
   try {
@@ -589,8 +596,8 @@ function subscribePeer(manager: AgentChannelManager, peer: WsPeer, channelId: st
     return
   }
   stream.peers.add(peer)
-  // 共享场景事件注册表:daq 等无频道归属广播由此直达该 peer
-  registerScenePeer(peer)
+  // 共享场景事件注册表:daq 等无频道归属广播由此直达该 peer(sub 鉴权成功后补挂)
+  attachScenePeer(peer, user)
   let channels = peerChannels.get(peer)
   if (!channels) {
     channels = new Set()
@@ -677,9 +684,14 @@ export default defineWebSocketHandler({
       return
     }
     ensureHubBound(manager)
-    // 场景事件(daq.reading / daq.node.changed / dcw.* / device.* 等无频道归属广播)
-    // 在连接层即注册 —— 不依赖 channel 订阅:/daq 等纯遥测页面建连即得实时帧
-    registerScenePeer(peer)
+    // 场景事件(daq.reading / dcw.* / device.* 等无频道归属广播)鉴权扇出:
+    // ?token= 有效才注册 scene peer(按用户产线可见集过滤);无/坏 token 的连接
+    // 收不到任何 scene 帧(sub 帧鉴权成功后补注册)。前端全部连接携带 ?token=。
+    const qpUser = (() => {
+      const t = resolveQueryParam(peer, 'token')
+      return t ? resolveUserByToken(t) : null
+    })()
+    if (qpUser) attachScenePeer(peer, qpUser)
     // 兼容旧路径:?channelId= 连接即订阅(无 lastSeq → 快照对齐)
     const channelId = resolveChannelIdFromUrl(peer)
     if (!channelId) return // 纯上行 sub 模式(多 channel 复用一条连接)

package/server/data/daqs.json

@@ -64,9 +64,9 @@
     "posX": 1695,
     "posZ": 1135,
     "lineId": "ln-af002514",
-    "value": 166.4,
+    "value": 167.8,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:31.943+08:00",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-08-27T12:39:08.110Z"
   },
   {
@@ -308,9 +308,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-af002514",
-    "value": 313,
+    "value": 311,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:31.943+08:00",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-08-28T09:37:38.518Z"
   },
   {
@@ -330,9 +330,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-af002514",
-    "value": 168.6,
+    "value": 165.5,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:31.943+08:00",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-08-29T03:30:57.463Z"
   },
   {
@@ -1012,9 +1012,9 @@
     "posX": 2395,
     "posZ": 1135,
     "lineId": "ln-af002514",
-    "value": 173.5,
+    "value": 171.6,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T12:28:53.918+08:00",
     "createdAt": "2026-08-31T04:07:19.038Z"
   },
   {
@@ -3026,9 +3026,9 @@
     "posX": 120,
     "posZ": 120,
     "lineId": "ln-af002514",
-    "value": 0.9963,
+    "value": 1.0315,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:31.943+08:00",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-09-03T10:17:59.182Z"
   },
   {
@@ -3050,9 +3050,9 @@
     "posX": 120,
     "posZ": 120,
     "lineId": "ln-af002514",
-    "value": 0.9759,
+    "value": 0.9496,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:31.943+08:00",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-09-03T11:18:01.401Z"
   },
   {
@@ -3072,9 +3072,9 @@
     "deviceBindingId": "dev-mthzr991-ujuad",
     "driverConfig": {},
     "lineId": "ln-af002514",
-    "value": 0.9978,
+    "value": 1.0282,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:31.943+08:00",
+    "lastAt": "2026-09-06T13:35:06.019+08:00",
     "createdAt": "2026-09-03T11:34:59.332Z"
   },
   {
@@ -3214,9 +3214,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-1b318320",
-    "value": 167.5,
+    "value": 167.3,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T13:35:10.738+08:00",
     "createdAt": "2026-09-04T05:08:10.069Z"
   },
   {
@@ -3749,9 +3749,9 @@
       "jsonPath": "data.temp"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 59.5,
+    "value": 57.4,
     "state": "alarm",
-    "lastAt": "2026-09-06T02:40:33.777+08:00",
+    "lastAt": "2026-09-06T13:35:10.738+08:00",
     "createdAt": "2026-09-05T05:47:00.640Z"
   },
   {
@@ -3774,9 +3774,9 @@
       "jsonPath": "data.value"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 42.4,
+    "value": 42.7,
     "state": "alarm",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T13:35:09.950+08:00",
     "createdAt": "2026-09-05T05:47:00.697Z"
   },
   {
@@ -3804,9 +3804,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 0.95,
+    "value": 0.76,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T12:28:54.182+08:00",
     "createdAt": "2026-09-05T05:47:00.821Z"
   },
   {
@@ -3835,7 +3835,7 @@
     "lineId": "ln-6a34fbc7",
     "value": 66,
     "state": "alarm",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T12:28:59.680+08:00",
     "createdAt": "2026-09-05T05:47:00.864Z"
   },
   {
@@ -3858,9 +3858,9 @@
       "nodeId": "ns=2;s=AW.Temp"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 182.7,
-    "state": "warn",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "value": 177.7,
+    "state": "ok",
+    "lastAt": "2026-09-06T13:35:09.950+08:00",
     "createdAt": "2026-09-05T05:47:03.624Z"
   },
   {
@@ -3888,9 +3888,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 0.2,
+    "value": -0.4,
     "state": "alarm",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T12:28:58.123+08:00",
     "createdAt": "2026-09-05T05:47:03.680Z"
   },
   {
@@ -3959,9 +3959,9 @@
       "jsonPath": "data.temp"
     },
     "lineId": "ln-419463e0",
-    "value": 59.5,
+    "value": 57.4,
     "state": "alarm",
-    "lastAt": "2026-09-06T02:40:33.777+08:00",
+    "lastAt": "2026-09-06T13:35:10.738+08:00",
     "createdAt": "2026-09-05T06:09:13.444Z"
   },
   {
@@ -3984,9 +3984,9 @@
       "jsonPath": "data.value"
     },
     "lineId": "ln-419463e0",
-    "value": 43,
+    "value": 42.5,
     "state": "alarm",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T13:35:09.950+08:00",
     "createdAt": "2026-09-05T06:09:13.490Z"
   },
   {
@@ -4014,9 +4014,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-419463e0",
-    "value": 0.95,
+    "value": 0.76,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:33.777+08:00",
+    "lastAt": "2026-09-06T12:28:53.394+08:00",
     "createdAt": "2026-09-05T06:09:13.540Z"
   },
   {
@@ -4045,7 +4045,7 @@
     "lineId": "ln-419463e0",
     "value": 66,
     "state": "alarm",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T12:28:59.680+08:00",
     "createdAt": "2026-09-05T06:09:13.567Z"
   },
   {
@@ -4068,9 +4068,9 @@
       "nodeId": "ns=2;s=AW.Temp"
     },
     "lineId": "ln-419463e0",
-    "value": 182.7,
-    "state": "warn",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "value": 177.7,
+    "state": "ok",
+    "lastAt": "2026-09-06T13:35:09.950+08:00",
     "createdAt": "2026-09-05T06:09:14.128Z"
   },
   {
@@ -4098,9 +4098,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-419463e0",
-    "value": 0.2,
+    "value": -0.5,
     "state": "alarm",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T12:28:57.862+08:00",
     "createdAt": "2026-09-05T06:09:14.173Z"
   },
   {
@@ -4350,9 +4350,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-3548f325",
-    "value": 0.3,
+    "value": -0.5,
     "state": "alarm",
-    "lastAt": "2026-09-06T02:40:32.727+08:00",
+    "lastAt": "2026-09-06T12:28:57.862+08:00",
     "createdAt": "2026-09-05T07:23:51.869Z"
   },
   {
@@ -4564,9 +4564,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-871ac52d",
-    "value": 43.41,
+    "value": 43.57,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T13:35:09.950+08:00",
     "createdAt": "2026-09-05T09:47:55.620Z"
   },
   {
@@ -4638,9 +4638,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-1acc1a0c",
-    "value": 168.4,
+    "value": 166.7,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T13:35:10.738+08:00",
     "createdAt": "2026-09-06T02:22:23.148+08:00"
   },
   {
@@ -4660,9 +4660,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-917490c1",
-    "value": 167,
+    "value": 167.4,
     "state": "ok",
-    "lastAt": "2026-09-06T02:40:33.514+08:00",
+    "lastAt": "2026-09-06T13:35:10.738+08:00",
     "createdAt": "2026-09-06T02:24:50.532+08:00"
   }
 ]

package/server/data/dcw-products.json

@@ -1363,5 +1363,26 @@
     "name": "cfg-prod",
     "description": "",
     "createdAt": "2026-09-06T02:40:12.841+08:00"
+  },
+  {
+    "id": "pd-44a14b9d",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-06T02:53:10.758+08:00"
+  },
+  {
+    "id": "pd-13d7d912",
+    "lineId": "",
+    "name": "全协议产品-mtpbat7b",
+    "description": "",
+    "createdAt": "2026-09-06T12:44:52.278+08:00"
+  },
+  {
+    "id": "pd-d20c4164",
+    "lineId": "",
+    "name": "全协议产品-mtpd7kfb",
+    "description": "",
+    "createdAt": "2026-09-06T13:33:16.771+08:00"
   }
 ]

package/server/data/dcw-recipes.json

@@ -3456,5 +3456,89 @@
     "lastGoodRunId": null,
     "createdAt": "2026-09-06T02:40:12.855+08:00",
     "updatedAt": "2026-09-06T02:40:12.855+08:00"
+  },
+  {
+    "id": "rc-82ef3729",
+    "productId": "pd-44a14b9d",
+    "lineId": "",
+    "name": "cfg-recipe",
+    "description": "",
+    "params": [
+      {
+        "nodeId": "dw-a4ac3308",
+        "templateRef": "dcw-temp-sp",
+        "value": 180,
+        "min": 150,
+        "max": 200
+      }
+    ],
+    "daqWindows": [
+      {
+        "nodeId": "dn-50c28d2e",
+        "min": 0,
+        "max": 260
+      }
+    ],
+    "version": 1,
+    "paramsHistory": [],
+    "lastGoodRunId": null,
+    "createdAt": "2026-09-06T02:53:10.773+08:00",
+    "updatedAt": "2026-09-06T02:53:10.773+08:00"
+  },
+  {
+    "id": "rc-7ff865b1",
+    "productId": "pd-13d7d912",
+    "lineId": "",
+    "name": "全协议配方-mtpbat7b",
+    "description": "",
+    "params": [
+      {
+        "nodeId": "dw-e7b38428",
+        "templateRef": "dcw-temp-sp",
+        "value": 180,
+        "min": 176,
+        "max": 188
+      }
+    ],
+    "daqWindows": [
+      {
+        "nodeId": "dn-29e52546",
+        "min": 100,
+        "max": 260
+      }
+    ],
+    "version": 1,
+    "paramsHistory": [],
+    "lastGoodRunId": null,
+    "createdAt": "2026-09-06T12:44:52.283+08:00",
+    "updatedAt": "2026-09-06T12:44:52.283+08:00"
+  },
+  {
+    "id": "rc-cbf9faee",
+    "productId": "pd-d20c4164",
+    "lineId": "",
+    "name": "全协议配方-mtpd7kfb",
+    "description": "",
+    "params": [
+      {
+        "nodeId": "dw-55d2256a",
+        "templateRef": "dcw-temp-sp",
+        "value": 180,
+        "min": 176,
+        "max": 188
+      }
+    ],
+    "daqWindows": [
+      {
+        "nodeId": "dn-05428da2",
+        "min": 100,
+        "max": 260
+      }
+    ],
+    "version": 1,
+    "paramsHistory": [],
+    "lastGoodRunId": null,
+    "createdAt": "2026-09-06T13:33:16.777+08:00",
+    "updatedAt": "2026-09-06T13:33:16.777+08:00"
   }
 ]

package/server/data/dcw-rollback.json

@@ -4641,6 +4641,94 @@
       "recipeRunId": "rr-428a0178",
       "id": "anc-1af16afd",
       "at": "2026-09-06T02:40:12.962+08:00"
+    },
+    {
+      "lineId": "ln-e9e17df2",
+      "nodeId": "dw-a4ac3308",
+      "prevValue": null,
+      "newValue": 180,
+      "source": "recipe",
+      "actor": "recipe",
+      "recipeRunId": "rr-5a232c33",
+      "id": "anc-8f340b23",
+      "at": "2026-09-06T02:53:10.879+08:00"
+    },
+    {
+      "lineId": "ln-17b2d0ae",
+      "nodeId": "dw-d341d62e",
+      "prevValue": 162,
+      "newValue": 170,
+      "source": "manual",
+      "actor": "0d5e5317-6876-411e-bd45-32e7349736ad",
+      "recipeRunId": null,
+      "id": "anc-85394422",
+      "at": "2026-09-06T12:23:04.760+08:00"
+    },
+    {
+      "lineId": "ln-c371bc70",
+      "nodeId": "dw-e7b38428",
+      "prevValue": null,
+      "newValue": 180,
+      "source": "recipe",
+      "actor": "recipe",
+      "recipeRunId": "rr-3e459205",
+      "id": "anc-ac7856da",
+      "at": "2026-09-06T12:44:52.320+08:00"
+    },
+    {
+      "lineId": "ln-ec0592b7",
+      "nodeId": "dw-55d2256a",
+      "prevValue": null,
+      "newValue": 180,
+      "source": "recipe",
+      "actor": "recipe",
+      "recipeRunId": "rr-4ec227dd",
+      "id": "anc-dc7cc8f9",
+      "at": "2026-09-06T13:33:16.822+08:00"
+    },
+    {
+      "lineId": "ln-ec0592b7",
+      "nodeId": "dw-9c17cd7d",
+      "prevValue": null,
+      "newValue": 165.5,
+      "source": "manual",
+      "actor": "2e1628c8-ceec-4b22-a02d-816ecce9ffac",
+      "recipeRunId": null,
+      "id": "anc-842bc754",
+      "at": "2026-09-06T13:33:26.433+08:00"
+    },
+    {
+      "lineId": "ln-ec0592b7",
+      "nodeId": "dw-3794be6e",
+      "prevValue": null,
+      "newValue": 168.25,
+      "source": "manual",
+      "actor": "2e1628c8-ceec-4b22-a02d-816ecce9ffac",
+      "recipeRunId": null,
+      "id": "anc-3eb0e53b",
+      "at": "2026-09-06T13:33:37.489+08:00"
+    },
+    {
+      "lineId": "ln-ec0592b7",
+      "nodeId": "dw-c6d18283",
+      "prevValue": null,
+      "newValue": 172.5,
+      "source": "manual",
+      "actor": "2e1628c8-ceec-4b22-a02d-816ecce9ffac",
+      "recipeRunId": null,
+      "id": "anc-928ae0ec",
+      "at": "2026-09-06T13:33:37.499+08:00"
+    },
+    {
+      "lineId": "ln-ec0592b7",
+      "nodeId": "dw-55d2256a",
+      "prevValue": 180,
+      "newValue": 182,
+      "source": "manual",
+      "actor": "2e1628c8-ceec-4b22-a02d-816ecce9ffac",
+      "recipeRunId": null,
+      "id": "anc-8183a820",
+      "at": "2026-09-06T13:33:38.774+08:00"
     }
   ],
   "records": [
@@ -5032,7 +5120,7 @@
         "channels": [],
         "degraded": true
       },
-      "evaluatedAt": "2026-09-06T02:49:14.884+08:00",
+      "evaluatedAt": "2026-09-06T15:27:48.724+08:00",
       "windowAgg": {
         "at": "2026-08-31T16:25:17.398Z",
         "fromMs": 1788193396897,
@@ -11481,7 +11569,7 @@
           }
         ]
       },
-      "evaluatedAt": "2026-09-06T02:49:14.884+08:00",
+      "evaluatedAt": "2026-09-06T15:27:48.724+08:00",
       "windowAgg": {
         "at": "2026-09-05T02:07:03.383Z",
         "fromMs": 1788573903195,
@@ -11542,7 +11630,7 @@
           }
         ]
       },
-      "evaluatedAt": "2026-09-06T02:49:14.884+08:00",
+      "evaluatedAt": "2026-09-06T15:27:48.724+08:00",
       "windowAgg": {
         "at": "2026-09-05T02:44:52.815Z",
         "fromMs": 1788576172595,
@@ -11602,7 +11690,7 @@
           }
         ]
       },
-      "evaluatedAt": "2026-09-06T02:49:14.884+08:00",
+      "evaluatedAt": "2026-09-06T15:27:48.724+08:00",
       "windowAgg": {
         "at": "2026-09-05T03:09:49.742Z",
         "fromMs": 1788577669697,
@@ -11662,7 +11750,7 @@
           }
         ]
       },
-      "evaluatedAt": "2026-09-06T02:49:14.884+08:00",
+      "evaluatedAt": "2026-09-06T15:27:48.724+08:00",
       "windowAgg": {
         "at": "2026-09-05T03:34:32.268Z",
         "fromMs": 1788579151974,
@@ -11711,7 +11799,7 @@
         "channels": [],
         "degraded": true
       },
-      "evaluatedAt": "2026-09-06T02:49:14.884+08:00",
+      "evaluatedAt": "2026-09-06T15:27:48.724+08:00",
       "windowAgg": {
         "at": "2026-09-05T09:01:07.414Z",
         "fromMs": 1788598747074,