agentworkshop 0.7.9 → 0.7.11

package/.output/server/index.mjs

@@ -17,6 +17,7 @@ import 'node:buffer';
 import 'node:fs';
 import 'node:path';
 import 'node:url';
+import 'node:fs/promises';
 import 'node:os';
 import 'js-yaml';
 import 'node:child_process';
@@ -24,7 +25,6 @@ import 'node:net';
 import 'node:util';
 import 'node:sqlite';
 import 'node:module';
-import 'node:fs/promises';
 import 'node:zlib';
 
 const kNodeInspect = /* @__PURE__ */ Symbol.for(

package/.output/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentworkshop-prod",
-  "version": "0.7.9",
+  "version": "0.7.11",
   "type": "module",
   "private": true,
   "dependencies": {

package/README-zh.md

@@ -309,6 +309,21 @@ curl http://localhost:3000/api/workshop/channels \
   -H 'authorization: Bearer <token>'
 ```
 
+### 产线级权限
+
+工业数据按**产线**三态管控，由管理员在内置「权限管理」页（`/permissions`，仅 admin 侧栏可见）维护：
+
+| 状态 | 数采节点 | 数控(写控)节点 | 可见性 |
+|---|---|---|---|
+| **无权**（普通用户默认） | 隐藏 | 隐藏 | 后端不返回该产线数据——产线运营/数采中心/数字孪生均不可见 |
+| **仅查看** | 只读 | ✕ | 产线可见、实时值可看，但不可写/不可下发/不可绑定设备 |
+| **可操控** | 读取 | 读取+写入 | 全量能力：设定值下发、参数下发、设备绑定 |
+
+- `admin` / `editor` 为运营角色，不受授权约束（全量全权）。
+- 普通用户**默认无权**——未授权前看不到任何产线数据。
+- 强制点在数据面：列表接口按授权过滤，写控/下发接口返回人话 403，Agent↔节点绑定校验产线授权（数采需仅查看+，写控需可操控）。
+- 插件经 `ctx.permissions`（`lineMode` / `visibleLineIds` / `listGrants` / `setGrants`）获得同一能力面，并有 `permissions:changed` 生命周期钩子；SDK REST 客户端提供 `client.permissions.overview()` / `client.permissions.set(...)`。
+
 ### 执行模式
 
 在任务描述中使用模式前缀（或在 composer UI 中选择）：

package/README.md

@@ -310,6 +310,26 @@ curl http://localhost:3000/api/workshop/channels \
   -H 'authorization: Bearer <token>'
 ```
 
+### Line-level permissions
+
+Industrial data is gated **per production line** with three states, managed by an admin
+in the built-in **Permissions** page (`/permissions`, admin-only in the sidebar):
+
+| State | DAQ nodes | DCW (write) nodes | Visibility |
+| --- | --- | --- | --- |
+| **none** (default for regular users) | hidden | hidden | line data withheld server-side — invisible in Line Ops, DAQ center and the digital twin |
+| **read-only** | read | ✕ | line visible, values stream, no writes / dispatch / device binding |
+| **operate** | read | read + write | full access incl. setpoint writes, dispatch, binding |
+
+- `admin` / `editor` roles are unrestricted (operations roles).
+- Regular users **default to none** — they see no line data until granted.
+- Enforcement lives in the data plane: list endpoints filter by grant, write/dispatch
+  endpoints return a human-readable 403, and Agent↔node bindings validate the line grant
+  (DAQ needs read-only+, DCW needs operate).
+- Plugins get the same surface via `ctx.permissions` (`lineMode` / `visibleLineIds` /
+  `listGrants` / `setGrants`) plus a `permissions:changed` lifecycle hook; the SDK REST
+  client exposes `client.permissions.overview()` / `client.permissions.set(...)`.
+
 ### Execution modes
 
 Prefix the task description (or pick in the composer UI):

package/app/components/AppSidebar.vue

@@ -1,4 +1,7 @@
 <script setup lang="ts">
+import { useUserStore } from '~/stores/workshop/user'
+
+const userStore = useUserStore()
 const { t } = useI18n()
 const route = useRoute()
 const site = useSiteConfig()
@@ -10,6 +13,8 @@ interface MenuItem {
   label: string
   /** 图标微动效类(im-*) */
   motion?: string
+  /** 仅 admin 可见(权限管理) */
+  adminOnly?: boolean
 }
 
 const menuItems = computed<MenuItem[]>(() => [
@@ -21,10 +26,11 @@ const menuItems = computed<MenuItem[]>(() => [
   { key: '/dcw', icon: 'i-tabler-settings-automation', label: t('menu.dcw'), motion: 'im-pop' },
   { key: '/logs', icon: 'i-tabler-list-details', label: t('menu.logs'), motion: 'im-pop' },
   { key: '/users', icon: 'i-tabler-users-group', label: t('menu.users'), motion: 'im-pop' },
+  { key: '/permissions', icon: 'i-tabler-shield-lock', label: t('menu.permissions'), motion: 'im-pop', adminOnly: true },
   { key: '/monitor', icon: 'i-tabler-cpu', label: t('menu.monitor'), motion: 'im-pulse' },
   { key: '/plugins', icon: 'i-tabler-puzzle', label: t('menu.plugins'), motion: 'im-pop' },
   { key: '/settings', icon: 'i-tabler-settings', label: t('menu.settings'), motion: 'im-rotate' },
-])
+].filter(m => !m.adminOnly || userStore.isAdmin))
 
 const isActive = (key: string): boolean =>
   key === '/' ? route.path === '/' : route.path.startsWith(key)

package/app/composables/workshop/apiClient.ts

@@ -1,95 +1,103 @@
-/**
- * 统一 API 客户端 —— 全部手写 fetch 的单一收口。
- * - 信封解析:{code, message, data};code !== 0 或非 2xx 一律抛 ApiError
- * - ApiError 保留业务码与 HTTP 状态(调用方可分支),message 为后端可读文案
- * - 网络层失败(TypeError/断网)→ ApiError('NETWORK'),不再裸奔 "Failed to fetch"
- * - 幂等 GET 可选自动重试(5xx/网络错误;400ms 起退避);写操作永不重试
- */
-
-export class ApiError extends Error {
-  readonly code: string | number
-  readonly status: number
-
-  constructor(code: string | number, status: number, message: string) {
-    super(message)
-    this.name = 'ApiError'
-    this.code = code
-    this.status = status
-  }
-}
-
-/** 鉴权头(cookie token → Bearer;与既有会话契约同源) */
-function authHeaders(json = true): Record<string, string> {
-  const cookieToken = typeof document !== 'undefined'
-    ? (document.cookie.match(/(?:^|;\s*)token=([^;]+)/)?.[1] ?? '')
-    : ''
-  const h: Record<string, string> = {}
-  if (cookieToken) h.authorization = `Bearer ${decodeURIComponent(cookieToken)}`
-  if (json) h['content-type'] = 'application/json'
-  return h
-}
-
-const sleep = (ms: number) => new Promise(r => setTimeout(r, ms))
-
-function isIdempotent(init?: RequestInit): boolean {
-  const method = (init?.method ?? 'GET').toUpperCase()
-  return method === 'GET' || method === 'HEAD'
-}
-
-/** 单次请求:信封解析 + 错误归一化(所有失败路径都抛 ApiError) */
-async function attemptOnce<T>(base: string, path: string, init?: RequestInit): Promise<T> {
-  let res: Response
-  try {
-    res = await fetch(base + path, { ...init, headers: { ...authHeaders(!!init?.body), ...init?.headers } })
-  }
-  catch {
-    throw new ApiError('NETWORK', 0, '无法连接服务器，请检查网络或服务状态')
-  }
-  let json: { code?: string | number, message?: string, data?: T } | null = null
-  try {
-    json = await res.json()
-  }
-  catch {
-    // 非 JSON 响应(代理/网关 HTML 错误页等)——按状态码归一化
-  }
-  if (!res.ok) {
-    throw new ApiError(
-      json?.code ?? `HTTP_${res.status}`,
-      res.status,
-      json?.message || `请求失败(HTTP ${res.status})`,
-    )
-  }
-  if (json?.code !== 0) {
-    throw new ApiError(json?.code ?? 'REQUEST_ERROR', res.status, json?.message || '请求失败')
-  }
-  return json.data as T
-}
-
-/**
- * 统一请求入口。
- * @param opts.base   API 前缀(如 '/api/workshop/daq')
- * @param opts.path   路径后缀(如 '/:id/bind')
- * @param opts.init   fetch RequestInit(body 由调用方 JSON.stringify)
- * @param opts.retries 幂等请求额外重试次数(仅 5xx/网络错误;默认 0)
- */
-export async function apiFetch<T>(opts: { base: string, path?: string, init?: RequestInit, retries?: number }): Promise<T> {
-  const { base, path = '', init, retries = 0 } = opts
-  const idempotent = isIdempotent(init)
-  const attempts = idempotent ? retries + 1 : 1
-  let lastError: ApiError | undefined
-  for (let attempt = 0; attempt < attempts; attempt++) {
-    try {
-      return await attemptOnce<T>(base, path, init)
-    }
-    catch (err) {
-      const apiErr = err instanceof ApiError
-        ? err
-        : new ApiError('INTERNAL_ERROR', 0, apiErrorMessage(err))
-      const retryable = idempotent && (apiErr.code === 'NETWORK' || apiErr.status >= 500)
-      lastError = apiErr
-      if (!retryable || attempt === attempts - 1) throw apiErr
-      await sleep(400 * (attempt + 1))
-    }
-  }
-  throw lastError ?? new ApiError('INTERNAL_ERROR', 0, '请求失败')
-}
+/**
+ * 统一 API 客户端 —— 全部手写 fetch 的单一收口。
+ * - 信封解析:{code, message, data};code !== 0 或非 2xx 一律抛 ApiError
+ * - ApiError 保留业务码与 HTTP 状态(调用方可分支),message 为后端可读文案
+ * - 网络层失败(TypeError/断网)→ ApiError('NETWORK'),不再裸奔 "Failed to fetch"
+ * - 幂等 GET 可选自动重试(5xx/网络错误;400ms 起退避);写操作永不重试
+ */
+
+export class ApiError extends Error {
+  readonly code: string | number
+  readonly status: number
+
+  constructor(code: string | number, status: number, message: string) {
+    super(message)
+    this.name = 'ApiError'
+    this.code = code
+    this.status = status
+  }
+}
+
+/** 鉴权头(cookie token → Bearer;与既有会话契约同源) */
+function authHeaders(json = true): Record<string, string> {
+  const cookieToken = typeof document !== 'undefined'
+    ? (document.cookie.match(/(?:^|;\s*)token=([^;]+)/)?.[1] ?? '')
+    : ''
+  const h: Record<string, string> = {}
+  if (cookieToken) h.authorization = `Bearer ${decodeURIComponent(cookieToken)}`
+  if (json) h['content-type'] = 'application/json'
+  return h
+}
+
+const sleep = (ms: number) => new Promise(r => setTimeout(r, ms))
+
+function isIdempotent(init?: RequestInit): boolean {
+  const method = (init?.method ?? 'GET').toUpperCase()
+  return method === 'GET' || method === 'HEAD'
+}
+
+/** 单次请求:信封解析 + 错误归一化(所有失败路径都抛 ApiError) */
+async function attemptOnce<T>(base: string, path: string, init?: RequestInit): Promise<T> {
+  let res: Response
+  try {
+    // 超时防挂起:无 AbortSignal 的 fetch 在连接黑洞时 promise 永不 settle,loading 永卡
+    res = await fetch(base + path, {
+      ...init,
+      headers: { ...authHeaders(!!init?.body), ...init?.headers },
+      signal: init?.signal ?? AbortSignal.timeout(init?.method && init.method.toUpperCase() !== 'GET' ? 30_000 : 15_000),
+    })
+  }
+  catch (err) {
+    if (err instanceof Error && (err.name === 'TimeoutError' || err.name === 'AbortError')) {
+      throw new ApiError('TIMEOUT', 0, '请求超时,请检查网络或服务状态')
+    }
+    throw new ApiError('NETWORK', 0, '无法连接服务器，请检查网络或服务状态')
+  }
+  let json: { code?: string | number, message?: string, data?: T } | null = null
+  try {
+    json = await res.json()
+  }
+  catch {
+    // 非 JSON 响应(代理/网关 HTML 错误页等)——按状态码归一化
+  }
+  if (!res.ok) {
+    throw new ApiError(
+      json?.code ?? `HTTP_${res.status}`,
+      res.status,
+      json?.message || `请求失败(HTTP ${res.status})`,
+    )
+  }
+  if (json?.code !== 0) {
+    throw new ApiError(json?.code ?? 'REQUEST_ERROR', res.status, json?.message || '请求失败')
+  }
+  return json.data as T
+}
+
+/**
+ * 统一请求入口。
+ * @param opts.base   API 前缀(如 '/api/workshop/daq')
+ * @param opts.path   路径后缀(如 '/:id/bind')
+ * @param opts.init   fetch RequestInit(body 由调用方 JSON.stringify)
+ * @param opts.retries 幂等请求额外重试次数(仅 5xx/网络错误;默认 0)
+ */
+export async function apiFetch<T>(opts: { base: string, path?: string, init?: RequestInit, retries?: number }): Promise<T> {
+  const { base, path = '', init, retries = 0 } = opts
+  const idempotent = isIdempotent(init)
+  const attempts = idempotent ? retries + 1 : 1
+  let lastError: ApiError | undefined
+  for (let attempt = 0; attempt < attempts; attempt++) {
+    try {
+      return await attemptOnce<T>(base, path, init)
+    }
+    catch (err) {
+      const apiErr = err instanceof ApiError
+        ? err
+        : new ApiError('INTERNAL_ERROR', 0, apiErrorMessage(err))
+      const retryable = idempotent && (apiErr.code === 'NETWORK' || apiErr.status >= 500)
+      lastError = apiErr
+      if (!retryable || attempt === attempts - 1) throw apiErr
+      await sleep(400 * (attempt + 1))
+    }
+  }
+  throw lastError ?? new ApiError('INTERNAL_ERROR', 0, '请求失败')
+}

package/app/composables/workshop/useDaqStream.ts

@@ -204,30 +204,44 @@ const createStore = () => {
     }
   }
 
-  /** 挂 WS 帧(townBus);幂等(globalThis 防重复订阅)。返回退订函数。 */
+  /** 挂 WS 帧(townBus)。引用计数:首个调用建立真实订阅,计数归零才退订
+   *  (修复一次性守卫导致首个页面卸载后实时流永久死亡的缺陷)。返回退订函数。 */
+  let feedConsumers = 0
+  let feedUnsub: (() => void) | null = null
   function ensureWsFeed(): () => void {
-    const g = globalThis as typeof globalThis & { __daqBusFed?: boolean }
-    if (g.__daqBusFed) return () => {}
-    g.__daqBusFed = true
-    return useTownBus().subscribe((e: AepEnvelope) => {
-      if (e.type === 'daq.reading') applyReading(e.payload as AepDaqReading)
-      else if (e.type === 'daq.frame') applyFrame(e.payload as unknown as AepDaqFrame)
-      else if (e.type === 'daq.node.changed') applyChange(e.payload as AepDaqNodeChange)
-      else if (e.type === 'daq.controller') Object.assign(controller, e.payload as AepDaqControllerState)
-      else if (e.type === 'daq.template.changed') applyTemplateChange(e.payload as AepDaqTemplateChange)
-      // S5 实时告警:server 权威事件直推(报警进入轨插入;ack 确认后移出未确认列表)
-      else if (e.type === 'daq.alarm') {
-        const p = e.payload as unknown as DaqAlarmRow
-        if (!alarms.some(a => a.id === p.id)) alarms.unshift(p)
+    feedConsumers++
+    if (feedConsumers === 1) {
+      feedUnsub = useTownBus().subscribe(handler)
+    }
+    let done = false
+    return () => {
+      if (done) return
+      done = true
+      if (--feedConsumers === 0) {
+        feedUnsub?.()
+        feedUnsub = null
       }
-      else if (e.type === 'daq.alarm.changed') {
-        const p = e.payload as unknown as { id: string, ackedAt?: string, recovered?: boolean }
-        if (p.ackedAt) {
-          const i = alarms.findIndex(a => a.id === p.id)
-          if (i >= 0) alarms.splice(i, 1)
-        }
+    }
+  }
+
+  function handler(e: AepEnvelope) {
+    if (e.type === 'daq.reading') applyReading(e.payload as AepDaqReading)
+    else if (e.type === 'daq.frame') applyFrame(e.payload as unknown as AepDaqFrame)
+    else if (e.type === 'daq.node.changed') applyChange(e.payload as AepDaqNodeChange)
+    else if (e.type === 'daq.controller') Object.assign(controller, e.payload as AepDaqControllerState)
+    else if (e.type === 'daq.template.changed') applyTemplateChange(e.payload as AepDaqTemplateChange)
+    // S5 实时告警:server 权威事件直推(报警进入轨插入;ack 确认后移出未确认列表)
+    else if (e.type === 'daq.alarm') {
+      const p = e.payload as unknown as DaqAlarmRow
+      if (!alarms.some(a => a.id === p.id)) alarms.unshift(p)
+    }
+    else if (e.type === 'daq.alarm.changed') {
+      const p = e.payload as unknown as { id: string, ackedAt?: string, recovered?: boolean }
+      if (p.ackedAt) {
+        const i = alarms.findIndex(a => a.id === p.id)
+        if (i >= 0) alarms.splice(i, 1)
       }
-    })
+    }
   }
 
   async function load(): Promise<void> {

package/app/composables/workshop/useDcwStream.ts

@@ -50,11 +50,27 @@ function createStore() {
     upsert(p.node)
   }
 
+  /** 引用计数订阅(同 useDaqStream):首个调用建订阅,归零才退订 */
+  let feedConsumers = 0
+  let feedUnsub: (() => void) | null = null
   function ensureWsFeed(): () => void {
-    const g = globalThis as typeof globalThis & { __dcwBusFed?: boolean }
-    if (g.__dcwBusFed) return () => {}
-    g.__dcwBusFed = true
-    return useTownBus().subscribe((e: AepEnvelope) => {
+    feedConsumers++
+    if (feedConsumers === 1) {
+      feedUnsub = useTownBus().subscribe(handler)
+    }
+    let done = false
+    return () => {
+      if (done) return
+      done = true
+      if (--feedConsumers === 0) {
+        feedUnsub?.()
+        feedUnsub = null
+      }
+    }
+  }
+
+  function handler(e: AepEnvelope) {
+    {
       if (e.type === 'dcw.written') {
         const p = e.payload as AepDcwWritten
         const n = nodes.find(x => x.id === p.nodeId)
@@ -83,8 +99,9 @@ function createStore() {
         const i = optimizations.findIndex(x => x.id === p.id)
         if (i >= 0) optimizations[i] = p
         else optimizations.unshift(p)
+        if (optimizations.length > 200) optimizations.length = 200
       }
-    })
+    }
   }
 
   async function load(): Promise<void> {

package/app/composables/workshop/useOpsLog.ts

@@ -74,21 +74,34 @@ const createStore = () => {
   const loading = reactive({ list: false, posting: false })
   const error = reactive({ list: '', post: '' })
 
-  /** 挂 WS 帧(townBus);幂等。返回退订函数。 */
+  /** 挂 WS 帧(townBus)。引用计数(同 useDaqStream):归零才退订。 */
+  let feedConsumers = 0
+  let feedUnsub: (() => void) | null = null
   function ensureLive(): () => void {
-    const g = globalThis as typeof globalThis & { __opsLogFed?: boolean }
-    if (g.__opsLogFed) return () => {}
-    g.__opsLogFed = true
-    void seedRecent()
-    return useTownBus().subscribe((e: AepEnvelope) => {
-      if (e.type === 'ops.log') {
-        const row = ingestFrame(e.payload as AepOpsLog)
-        if (!recent.some(r => r.at === row.at && r.actor === row.actor && r.action === row.action)) {
-          recent.unshift(row)
-          if (recent.length > RECENT_CAP) recent.splice(RECENT_CAP)
-        }
+    feedConsumers++
+    if (feedConsumers === 1) {
+      void seedRecent()
+      feedUnsub = useTownBus().subscribe(handler)
+    }
+    let done = false
+    return () => {
+      if (done) return
+      done = true
+      if (--feedConsumers === 0) {
+        feedUnsub?.()
+        feedUnsub = null
       }
-    })
+    }
+  }
+
+  function handler(e: AepEnvelope) {
+    if (e.type === 'ops.log') {
+      const row = ingestFrame(e.payload as AepOpsLog)
+      if (!recent.some(r => r.at === row.at && r.actor === row.actor && r.action === row.action)) {
+        recent.unshift(row)
+        if (recent.length > RECENT_CAP) recent.splice(RECENT_CAP)
+      }
+    }
   }
 
   /** 首屏预填:最近 15 条历史摘要(实时轨不必从零等事件) */

package/app/composables/workshop/useWorkshopWs.ts

@@ -12,6 +12,11 @@ import { useHitlStore } from '../../stores/workshop/hitl'
 import { useTownBus } from './useTownBus'
 import type { AepEnvelope, AepSnapshot } from '#shared/workshop-protocol'
 
+// 心跳单例(模块作用域):所有 useWorkshopWs() 调用方共享一个 15s 定时器,
+// 避免每组件实例一份冗余 ping 打向同一会话
+let heartbeat: ReturnType<typeof setInterval> | null = null
+let heartbeatUsers = 0
+
 export function useWorkshopWs() {
   const conn = useWsConnectionStore()
   const userStore = useUserStore()
@@ -100,8 +105,9 @@ export function useWorkshopWs() {
     session?.ensureConnected()
   }
 
-  let heartbeat: ReturnType<typeof setInterval> | null = null
   onMounted(() => {
+    heartbeatUsers++
+    if (heartbeat) return
     // 15s 心跳:pong 停止后 checkStale 的断线感知最坏 ~20-35s(服务强杀的半开连接
     // 无 RST,靠 pong 超时发现);ping 发送失败立即关闭走重连,不等 stale 检测
     heartbeat = setInterval(() => {
@@ -110,7 +116,10 @@ export function useWorkshopWs() {
     }, 15_000)
   })
   onBeforeUnmount(() => {
-    if (heartbeat) clearInterval(heartbeat)
+    if (--heartbeatUsers <= 0 && heartbeat) {
+      clearInterval(heartbeat)
+      heartbeat = null
+    }
   })
 
   return { subscribe, unsubscribe, ensureConnected, conn }