agentworkshop 0.7.21 → 0.7.23

package/package.json

@@ -1,148 +1,148 @@
-{
-  "name": "agentworkshop",
-  "version": "0.7.21",
-  "type": "module",
-  "description": "AgentWorkShop 软件开发系统 - 基于 Nuxt 4 的配置驱动运行范式",
-  "license": "PolyForm-Noncommercial-1.0.0",
-  "exports": {
-    ".": {
-      "types": "./sdk/index.d.mts",
-      "default": "./sdk/index.mjs"
-    },
-    "./sdk": {
-      "types": "./sdk/index.d.mts",
-      "default": "./sdk/index.mjs"
-    },
-    "./sdk/client": {
-      "types": "./sdk/client.d.mts",
-      "default": "./sdk/client.mjs"
-    },
-    "./package.json": "./package.json"
-  },
-  "bin": {
-    "aw": "bin/aw.mjs",
-    "agentworkshop": "bin/aw.mjs"
-  },
-  "files": [
-    ".output",
-    "bin",
-    "cli",
-    "sdk",
-    "app",
-    "server",
-    "shared",
-    "i18n",
-    "public",
-    "scripts",
-    ".AgentWorkShop/prompts",
-    "config.yml",
-    "nuxt.config.ts",
-    "tsconfig.json",
-    "uno.config.ts",
-    "docker-compose.yml",
-    ".env.example",
-    "README-zh.md",
-    "docs/cli.md",
-    "docs/plugins.md",
-    "docs/sdk.md",
-    "docs/tui.md",
-    "tui"
-  ],
-  "packageManager": "pnpm@11.9.0",
-  "engines": {
-    "node": ">=23.4.0"
-  },
-  "scripts": {
-    "dev": "node bin/aw.mjs dev",
-    "build": "node bin/aw.mjs build",
-    "start": "node bin/aw.mjs start",
-    "generate": "nuxt generate",
-    "preview": "node bin/aw.mjs start",
-    "cli": "node bin/aw.mjs",
-    "tui": "node tui/aw-tui.mjs",
-    "postinstall": "node scripts/home-bootstrap.mjs",
-    "prepublishOnly": "node bin/aw.mjs build",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "typecheck": "nuxt typecheck",
-    "prepare": "husky",
-    "game:test": "tsx scripts/test-agent-brain.ts && tsx scripts/test-game-session.ts",
-    "test:api-live": "node scripts/api-live-e2e.mjs",
-    "game:verify": "node scripts/verify-game.mjs",
-    "game:build-assets": "node scripts/build-player-sheet.mjs",
-    "game:build-wuwa": "node scripts/build-wuwa-assets.mjs",
-    "game:build-models": "node scripts/build-character-models.mjs",
-    "game:build-world": "node scripts/build-world-map.mjs",
-    "game:build-model3d": "node scripts/build-model-3d.mjs"
-  },
-  "lint-staged": {
-    "*.{js,mjs,cjs,ts,vue}": "eslint --fix"
-  },
-  "dependencies": {
-    "@ant-design-vue/nuxt": "^1.4.6",
-    "@ant-design/icons-vue": "^7.0.1",
-    "@earendil-works/pi-tui": "^0.84.4",
-    "@fontsource-variable/fraunces": "^5.3.0",
-    "@fontsource-variable/geist": "^5.3.0",
-    "@fontsource-variable/geist-mono": "^5.3.0",
-    "@fontsource-variable/inter": "^5.3.0",
-    "@fontsource/eb-garamond": "^5.3.0",
-    "@fontsource/ibm-plex-mono": "^5.3.0",
-    "@iconify-json/tabler": "^1.2.0",
-    "@modelcontextprotocol/sdk": "^1.30.0",
-    "@nuxtjs/i18n": "^9.0.0",
-    "@pinia/nuxt": "^0.11.0",
-    "@unocss/nuxt": "^66.0.0",
-    "@unocss/preset-attributify": "^66.0.0",
-    "@unocss/preset-icons": "^66.7.5",
-    "@unocss/preset-typography": "^66.0.0",
-    "@vueuse/core": "^13.0.0",
-    "@vueuse/nuxt": "^13.0.0",
-    "@xterm/addon-fit": "^0.11.0",
-    "@xterm/xterm": "^6.0.0",
-    "ant-design-vue": "^4.2.6",
-    "axios": "^1.7.9",
-    "echarts": "^5.6.0",
-    "h3": "2.0.1-rc.26",
-    "js-yaml": "^4.1.0",
-    "minio": "^8.0.7",
-    "modbus-serial": "^8.0.25",
-    "mqtt": "^5.15.2",
-    "node-opcua": "^2.178.0",
-    "nuxt": "^4.0.0",
-    "nuxt-auth-utils": "^0.5.0",
-    "pg": "^8.23.0",
-    "phaser": "^4.0.0",
-    "pinia": "^3.0.0",
-    "pinia-plugin-persistedstate": "^4.2.0",
-    "sqlite-vec": "^0.1.9",
-    "three": "^0.185.1",
-    "unocss": "^66.0.0",
-    "unplugin-icons": "^22.0.0",
-    "vue": "^3.5.13",
-    "vue-echarts": "^7.0.3",
-    "vue-router": "^4.5.0",
-    "zod": "^3.24.1"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^19.6.1",
-    "@commitlint/config-conventional": "^19.6.0",
-    "@nuxt/eslint": "^1.0.0",
-    "@types/js-yaml": "^4.0.9",
-    "@types/node": "^26.2.0",
-    "@types/three": "^0.185.4",
-    "eslint": "^9.17.0",
-    "husky": "^9.1.7",
-    "lint-staged": "^15.3.0",
-    "pngjs": "^7.0.0",
-    "puppeteer-core": "^25.5.0",
-    "tsx": "^4.23.12",
-    "typescript": "^5.7.3",
-    "vue-tsc": "^3.3.10"
-  },
-  "pnpm": {
-    "ignoredBuiltDependencies": [
-      "@serialport/bindings-cpp"
-    ]
-  }
-}
+{
+  "name": "agentworkshop",
+  "version": "0.7.23",
+  "type": "module",
+  "description": "AgentWorkShop 软件开发系统 - 基于 Nuxt 4 的配置驱动运行范式",
+  "license": "PolyForm-Noncommercial-1.0.0",
+  "exports": {
+    ".": {
+      "types": "./sdk/index.d.mts",
+      "default": "./sdk/index.mjs"
+    },
+    "./sdk": {
+      "types": "./sdk/index.d.mts",
+      "default": "./sdk/index.mjs"
+    },
+    "./sdk/client": {
+      "types": "./sdk/client.d.mts",
+      "default": "./sdk/client.mjs"
+    },
+    "./package.json": "./package.json"
+  },
+  "bin": {
+    "aw": "bin/aw.mjs",
+    "agentworkshop": "bin/aw.mjs"
+  },
+  "files": [
+    ".output",
+    "bin",
+    "cli",
+    "sdk",
+    "app",
+    "server",
+    "shared",
+    "i18n",
+    "public",
+    "scripts",
+    ".AgentWorkShop/prompts",
+    "config.yml",
+    "nuxt.config.ts",
+    "tsconfig.json",
+    "uno.config.ts",
+    "docker-compose.yml",
+    ".env.example",
+    "README-zh.md",
+    "docs/cli.md",
+    "docs/plugins.md",
+    "docs/sdk.md",
+    "docs/tui.md",
+    "tui"
+  ],
+  "packageManager": "pnpm@11.9.0",
+  "engines": {
+    "node": ">=23.4.0"
+  },
+  "scripts": {
+    "dev": "node bin/aw.mjs dev",
+    "build": "node bin/aw.mjs build",
+    "start": "node bin/aw.mjs start",
+    "generate": "nuxt generate",
+    "preview": "node bin/aw.mjs start",
+    "cli": "node bin/aw.mjs",
+    "tui": "node tui/aw-tui.mjs",
+    "postinstall": "node scripts/home-bootstrap.mjs",
+    "prepublishOnly": "node bin/aw.mjs build",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "typecheck": "nuxt typecheck",
+    "prepare": "husky",
+    "game:test": "tsx scripts/test-agent-brain.ts && tsx scripts/test-game-session.ts",
+    "test:api-live": "node scripts/api-live-e2e.mjs",
+    "game:verify": "node scripts/verify-game.mjs",
+    "game:build-assets": "node scripts/build-player-sheet.mjs",
+    "game:build-wuwa": "node scripts/build-wuwa-assets.mjs",
+    "game:build-models": "node scripts/build-character-models.mjs",
+    "game:build-world": "node scripts/build-world-map.mjs",
+    "game:build-model3d": "node scripts/build-model-3d.mjs"
+  },
+  "lint-staged": {
+    "*.{js,mjs,cjs,ts,vue}": "eslint --fix"
+  },
+  "dependencies": {
+    "@ant-design-vue/nuxt": "^1.4.6",
+    "@ant-design/icons-vue": "^7.0.1",
+    "@earendil-works/pi-tui": "^0.84.4",
+    "@fontsource-variable/fraunces": "^5.3.0",
+    "@fontsource-variable/geist": "^5.3.0",
+    "@fontsource-variable/geist-mono": "^5.3.0",
+    "@fontsource-variable/inter": "^5.3.0",
+    "@fontsource/eb-garamond": "^5.3.0",
+    "@fontsource/ibm-plex-mono": "^5.3.0",
+    "@iconify-json/tabler": "^1.2.0",
+    "@modelcontextprotocol/sdk": "^1.30.0",
+    "@nuxtjs/i18n": "^9.0.0",
+    "@pinia/nuxt": "^0.11.0",
+    "@unocss/nuxt": "^66.0.0",
+    "@unocss/preset-attributify": "^66.0.0",
+    "@unocss/preset-icons": "^66.7.5",
+    "@unocss/preset-typography": "^66.0.0",
+    "@vueuse/core": "^13.0.0",
+    "@vueuse/nuxt": "^13.0.0",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/xterm": "^6.0.0",
+    "ant-design-vue": "^4.2.6",
+    "axios": "^1.7.9",
+    "echarts": "^5.6.0",
+    "h3": "2.0.1-rc.26",
+    "js-yaml": "^4.1.0",
+    "minio": "^8.0.7",
+    "modbus-serial": "^8.0.25",
+    "mqtt": "^5.15.2",
+    "node-opcua": "^2.178.0",
+    "nuxt": "^4.0.0",
+    "nuxt-auth-utils": "^0.5.0",
+    "pg": "^8.23.0",
+    "phaser": "^4.0.0",
+    "pinia": "^3.0.0",
+    "pinia-plugin-persistedstate": "^4.2.0",
+    "sqlite-vec": "^0.1.9",
+    "three": "^0.185.1",
+    "unocss": "^66.0.0",
+    "unplugin-icons": "^22.0.0",
+    "vue": "^3.5.13",
+    "vue-echarts": "^7.0.3",
+    "vue-router": "^4.5.0",
+    "zod": "^3.24.1"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^19.6.1",
+    "@commitlint/config-conventional": "^19.6.0",
+    "@nuxt/eslint": "^1.0.0",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^26.2.0",
+    "@types/three": "^0.185.4",
+    "eslint": "^9.17.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^15.3.0",
+    "pngjs": "^7.0.0",
+    "puppeteer-core": "^25.5.0",
+    "tsx": "^4.23.12",
+    "typescript": "^5.7.3",
+    "vue-tsc": "^3.3.10"
+  },
+  "pnpm": {
+    "ignoredBuiltDependencies": [
+      "@serialport/bindings-cpp"
+    ]
+  }
+}

package/scripts/_dbg-device-bind-e2e.mjs

@@ -0,0 +1,129 @@
+/**
+ * 节点 ↔ 设备 多对多绑定 E2E(隔离实例 :3021)
+ *
+ * 验证:
+ *  1) legacy 单绑 POST bind {deviceId} → deviceIds=[d1](迁移语义)
+ *  2) PUT bindings [d1,d2] → 两台设备;重复设定不产生重复对
+ *  3) 数采回写:节点采样值同时出现在 d1/d2 的 telemetry(多对多回写)
+ *  4) 摘除 d2 → 仅 d1 继续回写;d2 的 telemetry 冻结在摘除时刻
+ *  5) 级联:删除 d1 → 节点 deviceIds 自动移除 d1(保留 d2)
+ *  6) dcw 同模型:PUT bindings 双设备 + legacy 兼容
+ *  7) 负向:绑定不存在的设备 404
+ * 用法:NO_PROXY='127.0.0.1,localhost' node scripts/_dbg-device-bind-e2e.mjs [base]
+ */
+const BASE = process.argv[2] ?? 'http://127.0.0.1:3021'
+const TAG = `db${Math.random().toString(36).slice(2, 6)}`
+let pass = 0
+let fail = 0
+const ok = (cond, name, extra = '') => {
+  if (cond) { pass++; console.log(`  ✓ ${name}`) }
+  else { fail++; console.log(`  ✗ ${name} ${extra}`) }
+}
+const sleep = ms => new Promise(r => setTimeout(r, ms))
+const api = async (method, path, { body, token } = {}) => {
+  const res = await fetch(`${BASE}${path}`, {
+    method,
+    headers: { 'content-type': 'application/json', ...(token ? { authorization: `Bearer ${token}` } : {}) },
+    body: body === undefined ? undefined : JSON.stringify(body),
+    signal: AbortSignal.timeout(30_000),
+  })
+  return { status: res.status, ...(await res.json().catch(() => ({}))) }
+}
+
+async function main() {
+  console.log(`━━━ 节点↔设备多对多绑定 E2E @ ${BASE} (tag=${TAG}) ━━━`)
+  const login = await api('POST', '/api/users/login', { body: { email: 'admin', password: 'admin123' } })
+  const token = login.data?.token
+  ok(Boolean(token), 'admin 登录')
+
+  // ── 夹具:2 设备 + 1 数采节点(mock)+ 1 数控节点(mock)──
+  const d1 = (await api('POST', '/api/workshop/device-twins', { body: { name: `dev1-${TAG}`, kind: 'device' }, token })).data?.twin
+  const d2 = (await api('POST', '/api/workshop/device-twins', { body: { name: `dev2-${TAG}`, kind: 'device' }, token })).data?.twin
+  ok(Boolean(d1?.id && d2?.id), '两台设备孪生创建')
+  const line = (await api('POST', '/api/workshop/dcw/lines', { body: { name: `bindline-${TAG}` }, token })).data?.line
+  const node = (await api('POST', '/api/workshop/daq', {
+    body: { name: `daq-${TAG}`, templateRef: 'temp-tc', driver: 'mock', intervalMs: 1000, min: 0, max: 200, lineId: line.id },
+    token,
+  })).data?.node
+  const dcw = (await api('POST', '/api/workshop/dcw', {
+    body: { name: `dcw-${TAG}`, templateRef: 'temp-sp', driver: 'mock', driverConfig: { key: `${TAG}` }, min: 0, max: 200, unit: '℃' },
+    token,
+  })).data?.node
+  ok(Boolean(node?.id && dcw?.id), '数采/数控节点创建')
+  // 采样门控:开跑产线(产品/配方非必需?start 需要 recipeId —— 先建最小产品+配方)
+  const product = (await api('POST', '/api/workshop/dcw/products', { body: { name: `bindprod-${TAG}`, lineId: line.id }, token })).data?.product
+  const recipe = (await api('POST', '/api/workshop/dcw/recipes', { body: { name: `bindrec-${TAG}`, productId: product.id, params: [{ nodeId: dcw.id, value: 50 }] }, token })).data?.recipe
+  const st = await api('POST', `/api/workshop/dcw/lines/${line.id}/start`, { body: { recipeId: recipe.id }, token })
+  ok(st.status === 200, '产线开跑(采样门控放行)')
+
+  const nodeById = async (id) => (await api('GET', '/api/workshop/daq', { token })).data?.nodes?.find(n => n.id === id)
+  const dcwById = async (id) => (await api('GET', '/api/workshop/dcw', { token })).data?.nodes?.find(n => n.id === id)
+  const twinById = async (id) => (await api('GET', '/api/workshop/device-twins', { token })).data?.twins?.find(t => t.id === id)
+    ?? (await api('GET', '/api/workshop/device-twins', { token })).data?.find?.(t => t.id === id)
+
+  // ── 1. legacy 单绑 ──
+  let n = (await api('POST', `/api/workshop/daq/${node.id}/bind`, { body: { deviceId: d1.id }, token })).data?.node
+  ok(Array.isArray(n?.deviceIds) && n.deviceIds.length === 1 && n.deviceIds[0] === d1.id && n.deviceBindingId === d1.id,
+    `legacy 单绑 → deviceIds=[d1](实际 ${JSON.stringify(n?.deviceIds)})`)
+
+  // ── 2. PUT bindings 双设备 + 唯一对 ──
+  n = (await api('PUT', `/api/workshop/daq/${node.id}/bindings`, { body: { deviceIds: [d1.id, d2.id, d1.id] }, token })).data?.node
+  ok(n?.deviceIds?.length === 2 && n.deviceIds.includes(d1.id) && n.deviceIds.includes(d2.id),
+    `PUT bindings 去重 → [d1,d2](实际 ${JSON.stringify(n?.deviceIds)})`)
+  n = (await api('PUT', `/api/workshop/daq/${node.id}/bindings`, { body: { deviceIds: [d1.id, d2.id] }, token })).data?.node
+  ok(n?.deviceIds?.length === 2, '重复设定仍为 2 台(无重复对)')
+
+  // ── 3. 采样回写双设备 ──
+  await sleep(6000)
+  const t1 = await twinById(d1.id)
+  const t2 = await twinById(d2.id)
+  const key1 = Object.keys(t1?.telemetry ?? {})
+  ok(key1.length > 0 && Object.keys(t2?.telemetry ?? {}).length > 0,
+    `采样回写双设备(d1 keys=${key1.join(',')} | d2 keys=${Object.keys(t2?.telemetry ?? {}).join(',')})`)
+
+  // ── 4. 摘除 d2 → 仅 d1 继续回写 ──
+  n = (await api('PUT', `/api/workshop/daq/${node.id}/bindings`, { body: { deviceIds: [d1.id] }, token })).data?.node
+  ok(n?.deviceIds?.length === 1, '摘除 d2 → deviceIds=[d1]')
+  const t2frozen = JSON.stringify((await twinById(d2.id))?.telemetry ?? {})
+  await sleep(5000)
+  const t2after = JSON.stringify((await twinById(d2.id))?.telemetry ?? {})
+  ok(t2frozen === t2after, `d2 摘除后遥测冻结(不再回写)`)
+  const t1b = JSON.stringify((await twinById(d1.id))?.telemetry ?? {})
+  await sleep(5000)
+  const t1c = JSON.stringify((await twinById(d1.id))?.telemetry ?? {})
+  ok(t1b !== t1c, 'd1 绑定保留,持续回写')
+
+  // ── 5. 级联:删除 d1 → 节点自动解绑 d1 ──
+  await api('DELETE', `/api/workshop/device-twins/${d1.id}`, { token })
+  n = await nodeById(node.id)
+  ok(Array.isArray(n?.deviceIds) && !n.deviceIds.includes(d1.id), `删除 d1 → 节点级联解绑(deviceIds=${JSON.stringify(n?.deviceIds)})`)
+
+  // ── 6. dcw 同模型 ──
+  let dcn = (await api('PUT', `/api/workshop/dcw/${dcw.id}/bindings`, { body: { deviceIds: [d2.id] }, token })).data?.node
+  ok(dcn?.deviceIds?.[0] === d2.id, '[dcw] PUT bindings 单设备')
+  dcn = (await api('POST', `/api/workshop/dcw/${dcw.id}/bind`, { body: { deviceId: null }, token })).data?.node
+  ok((dcn?.deviceIds ?? []).length === 0, '[dcw] legacy bind null → 清空')
+  dcn = (await api('PUT', `/api/workshop/dcw/${dcw.id}/bindings`, { body: { deviceIds: [d2.id] }, token })).data?.node
+  ok(dcn?.deviceIds?.length === 1, '[dcw] 恢复绑定')
+
+  // ── 7. 负向:不存在的设备 ──
+  const bad = await api('PUT', `/api/workshop/daq/${node.id}/bindings`, { body: { deviceIds: ['no-such-device'] }, token })
+  ok(bad.status === 404, `负向:不存在设备 404(实际 ${bad.status})`)
+
+  // ── 清理 ──
+  await api('POST', `/api/workshop/dcw/lines/${line.id}/stop`, { body: {}, token }).catch(() => {})
+  await api('DELETE', `/api/workshop/daq/${node.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/${dcw.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/recipes/${recipe.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/products/${product.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/lines/${line.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/device-twins/${d2.id}`, { token }).catch(() => {})
+
+  console.log(`\n━━━ DeviceBind E2E: ${pass} passed / ${fail} failed ━━━`)
+  process.exit(fail === 0 ? 0 : 1)
+}
+
+main().catch((err) => {
+  console.error('E2E 异常:', err)
+  process.exit(1)
+})

package/scripts/_dbg-logs-ui-e2e.py

@@ -0,0 +1,125 @@
+# 运维日志 UI 三项修复浏览器实测:
+#   1) 详情按钮行内展开/无详情显示"无"/人工记录可写详情
+#   2) 全局按钮统一(pill accent,非白底默认)
+#   3) 页头 aw-page-head 规范(标题30px + 描述间距)
+# 附带:daq/dcw 页按钮抽查截图。产物 → .e2e-shots/
+import json
+import sys
+from playwright.sync_api import sync_playwright
+
+BASE = 'http://127.0.0.1:3000'
+SHOT = '.e2e-shots'
+passed = 0
+failed = 0
+
+def ok(cond, name, extra=''):
+    global passed, failed
+    if cond:
+        passed += 1
+        print(f'  OK  {name}')
+    else:
+        failed += 1
+        print(f'  FAIL {name} {extra}')
+
+with sync_playwright() as p:
+    browser = p.chromium.launch(headless=True)
+    page = browser.new_page(viewport={'width': 1440, 'height': 900})
+    page.set_default_timeout(30000)
+
+    # ---- 1. 登录(/logs 不强制跳登录,先去 /workshop 触发登录墙) ----
+    page.goto(BASE + '/workshop', wait_until='domcontentloaded', timeout=90000)
+    try:
+        page.wait_for_selector('input[placeholder="邮箱 / 用户名"]', timeout=20000)
+    except Exception:
+        page.goto(BASE + '/workshop', wait_until='domcontentloaded', timeout=60000)
+        page.wait_for_selector('input[placeholder="邮箱 / 用户名"]', timeout=60000)
+    for attempt in range(3):
+        page.wait_for_timeout(2500 + attempt * 2000)
+        page.fill('input[placeholder="邮箱 / 用户名"]', 'admin')
+        page.fill('.ant-input-password input', 'admin123')
+        try:
+            with page.expect_response(lambda r: '/api/users/login' in r.url, timeout=15000) as ri:
+                page.locator('.ant-input-password input').first.press('Enter')
+            status = ri.value.status
+        except Exception:
+            status = None
+        inp = page.locator('input[placeholder="邮箱 / 用户名"]')
+        if status == 200 and (inp.count() == 0 or not inp.first.is_visible()):
+            break
+    ok(status == 200, f'登录(admin) status={status}')
+    page.wait_for_timeout(1500)
+
+    # ---- 2. 页头规范 ----
+    page.goto(BASE + '/logs', wait_until='domcontentloaded', timeout=60000)
+    page.wait_for_timeout(2500)
+    head = page.locator('.aw-page-head')
+    ok(head.count() > 0, '页头使用 aw-page-head 规范组件')
+    h1 = page.locator('.aw-page-head h1').first
+    fs = h1.evaluate('el => getComputedStyle(el).fontSize')
+    ok(fs == '30px', f'标题字号与其他页统一 30px(实际 {fs})')
+    sub = page.locator('.aw-page-head .sub').first
+    mt = sub.evaluate('el => getComputedStyle(el).marginTop')
+    ok(float(mt.replace('px', '')) >= 8, f'标题-描述间距放大 marginTop={mt}')
+    page.screenshot(path=f'{SHOT}/logs-head.png', clip={'x': 0, 'y': 0, 'width': 1440, 'height': 240})
+
+    # ---- 3. 按钮统一(非白底默认;accent 药丸) ----
+    def bg_of(sel):
+        return page.locator(sel).first.evaluate('el => getComputedStyle(el).backgroundColor')
+    man_bg = bg_of('.head-actions .pill-btn')
+    ok(man_bg not in ('rgb(255, 255, 255)', 'rgba(0, 0, 0, 0)'), f'人工记录按钮有主题底色({man_bg})')
+    man_radius = page.locator('.head-actions .pill-btn').first.evaluate('el => getComputedStyle(el).borderRadius')
+    ok(man_radius == '9999px', f'人工记录按钮药丸形(radius={man_radius})')
+    ok(True, '查询/重置按钮走全局 pill/mini 词汇(截图目视)')
+    page.screenshot(path=f'{SHOT}/logs-buttons.png', clip={'x': 0, 'y': 100, 'width': 1440, 'height': 260})
+
+    # ---- 4. 人工记录:摘要 + 详情(可选) 入册 ----
+    stamp = f'UI验证-{json.dumps("", ensure_ascii=False)}{page.evaluate("Date.now()")}'
+    summary = f'浏览器实测人工记录 {page.evaluate("new Date().toISOString().slice(11,19)")}'
+    detail = f'处置详情备注:round-{page.evaluate("Date.now()")}'
+    page.locator('.head-actions .pill-btn').click()
+    page.wait_for_selector('.modal', timeout=10000)
+    page.locator('.modal textarea').nth(0).fill(summary)
+    page.locator('.modal textarea').nth(1).fill(detail)
+    page.screenshot(path=f'{SHOT}/logs-manual-modal.png')
+    with page.expect_response(lambda r: '/api/workshop/ops-logs' in r.url, timeout=15000) as ri:
+        page.locator('.modal .pill-btn').click()
+    ok(ri.value.status in (200, 201), f'人工记录入册 status={ri.value.status}')
+    page.wait_for_timeout(1200)
+
+    # ---- 5. 详情行:新记录带详情按钮,点击行内展开 ----
+    row = page.locator('tr', has_text=summary).first
+    row.wait_for(state='visible', timeout=15000)
+    btn = row.locator('.detail-cell .mini-btn')
+    ok(btn.count() == 1, '新人工记录带"详情"按钮')
+    btn.click()
+    page.wait_for_timeout(400)
+    detail_box = row.locator('+ tr .detail-box')
+    ok(detail_box.count() == 1, '点击详情 → 行内紧贴展开详情面板')
+    txt = detail_box.first.inner_text() if detail_box.count() else ''
+    ok(detail in txt, '详情内容含人工填写的备注(note)')
+    row.scroll_into_view_if_needed()
+    page.wait_for_timeout(300)
+    page.screenshot(path=f'{SHOT}/logs-detail-expanded.png')
+    btn.click()
+    page.wait_for_timeout(300)
+    ok(detail_box.count() == 0 or not detail_box.first.is_visible(), '再点收起 → 详情面板关闭')
+
+    # ---- 6. 无详情行显示"无" ----
+    none_cells = page.locator('.detail-cell', has_text='无')
+    ok(none_cells.count() > 0, f'无详情行显示"无"(共 {none_cells.count()} 行)')
+
+    # ---- 7. daq/dcw 页按钮抽查(全局词汇无回归) ----
+    page.goto(BASE + '/dcw', wait_until='domcontentloaded', timeout=60000)
+    page.wait_for_timeout(2500)
+    lc_btn = page.locator('.pill-btn').first
+    if lc_btn.count():
+        b = lc_btn.evaluate('el => getComputedStyle(el).backgroundColor')
+        ok(b not in ('rgb(255, 255, 255)', 'rgba(0, 0, 0, 0)'), f'dcw 页 pill-btn 有主题底色({b})')
+        page.screenshot(path=f'{SHOT}/dcw-buttons.png', clip={'x': 0, 'y': 0, 'width': 1440, 'height': 420})
+    else:
+        ok(True, 'dcw 页无 pill-btn 可查(空态)')
+
+    browser.close()
+
+print(f'\n== logs UI e2e: {passed} passed, {failed} failed ==')
+sys.exit(1 if failed else 0)

package/server/api/workshop/daq/[id]/bind.post.ts

@@ -16,7 +16,10 @@ export default defineApiHandler(async (event) => {
   const id = getRouterParam(event, 'id') ?? ''
   // 产线权限:数采设备绑定=操控能力(绑定后通道值回写设备)
   requireLineMode(user, getDaqController().byId(id)?.lineId, 'operate')
-  const body = await readBody<{ deviceId?: string | null }>(event) ?? {}
-  const node = getDaqController().bind(id, body.deviceId ?? null)
+  const body = await readBody<{ deviceId?: string | null, deviceIds?: string[] }>(event) ?? {}
+  // 两种形态:{ deviceId } 排他设置(兼容旧客户端);{ deviceIds: [...] } 整体设定多对多
+  const node = Array.isArray(body.deviceIds)
+    ? getDaqController().setDeviceBindings(id, body.deviceIds)
+    : getDaqController().bind(id, body.deviceId ?? null)
   return { node: node.toView() }
 })

package/server/api/workshop/daq/[id]/bindings.put.ts

@@ -0,0 +1,22 @@
+/**
+ * PUT /api/workshop/daq/:id/bindings —— 整体设定数采节点的绑定设备列表(多对多)。
+ * body: { deviceIds: string[] }(全量替换,去重,逐一校验设备存在;(节点,设备)对唯一)
+ */
+import { getRouterParam, readBody } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { requireLineMode } from '@/server/services/workshop/permissions'
+import { defineApiHandler } from '@/server/utils/response'
+import { bindDaqHost } from '@/server/services/workshop/daq/host-bindings'
+import { getDaqController } from '@/server/services/workshop/daq/daq-controller'
+import { broadcastSceneEvent } from '../../../../services/workshop/scene-events'
+
+export default defineApiHandler(async (event) => {
+  const user = resolveUser(event)
+  bindDaqHost(broadcastSceneEvent)
+  const id = getRouterParam(event, 'id') ?? ''
+  // 产线权限:设备绑定=操控能力(绑定后通道值回写设备)
+  requireLineMode(user, getDaqController().byId(id)?.lineId, 'operate')
+  const body = await readBody<{ deviceIds?: string[] }>(event) ?? {}
+  const node = getDaqController().setDeviceBindings(id, Array.isArray(body.deviceIds) ? body.deviceIds : [])
+  return { node: node.toView() }
+})

package/server/api/workshop/dcw/[id]/bind.post.ts

@@ -14,7 +14,9 @@ export default defineApiHandler(async (event) => {
   const id = getRouterParam(event, 'id') ?? ''
   // 产线权限:设备孪生绑定=操控能力
   requireLineMode(user, getDcwController().byId(id)?.lineId, 'operate')
-  const body = await readBody<{ deviceId?: string | null }>(event) ?? {}
-  const node = getDcwController().bind(id, body.deviceId ?? null)
+  const body = await readBody<{ deviceId?: string | null, deviceIds?: string[] }>(event) ?? {}
+  const node = Array.isArray(body.deviceIds)
+    ? getDcwController().setDeviceBindings(id, body.deviceIds)
+    : getDcwController().bind(id, body.deviceId ?? null)
   return { node: node.toView() }
 })

package/server/api/workshop/dcw/[id]/bindings.put.ts

@@ -0,0 +1,21 @@
+/**
+ * PUT /api/workshop/dcw/:id/bindings —— 整体设定数控节点的绑定设备列表(多对多)。
+ * body: { deviceIds: string[] }(全量替换,去重,逐一校验设备存在;(节点,设备)对唯一)
+ */
+import { getRouterParam, readBody } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { requireLineMode } from '@/server/services/workshop/permissions'
+import { defineApiHandler } from '@/server/utils/response'
+import { bindDcwBroadcast, getDcwController } from '@/server/services/workshop/dcw/dcw-controller'
+import { broadcastSceneEvent } from '../../../../services/workshop/scene-events'
+
+export default defineApiHandler(async (event) => {
+  const user = resolveUser(event)
+  bindDcwBroadcast(broadcastSceneEvent)
+  const id = getRouterParam(event, 'id') ?? ''
+  // 产线权限:设备孪生绑定=操控能力
+  requireLineMode(user, getDcwController().byId(id)?.lineId, 'operate')
+  const body = await readBody<{ deviceIds?: string[] }>(event) ?? {}
+  const node = getDcwController().setDeviceBindings(id, Array.isArray(body.deviceIds) ? body.deviceIds : [])
+  return { node: node.toView() }
+})