agentworkshop 0.7.33 → 0.7.37

package/scripts/_dbg-audit-all-pages.mjs

@@ -1,43 +1,43 @@
-/** 全站巡检截图:8 个主页面一次采齐。 */
-import puppeteer from 'puppeteer-core'
-
-const ROOT = 'http://127.0.0.1:3000'
-const sleep = ms => new Promise(r => setTimeout(r, ms))
-
-const login = await fetch(`${ROOT}/api/users/login`, {
-  method: 'POST',
-  headers: { 'content-type': 'application/json' },
-  body: JSON.stringify({ email: process.env.E2E_USER ?? 'zhangwei@awshop.io', password: process.env.E2E_PASS ?? 'Awshop@123' }),
-}).then(r => r.json())
-if (!login.data?.token) { console.error('login failed'); process.exit(1) }
-
-const browser = await puppeteer.launch({
-  executablePath: 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
-  headless: 'new',
-  args: ['--no-sandbox', '--disable-gpu', '--window-size=1600,1000'],
-})
-const page = await browser.newPage()
-await page.setViewport({ width: 1600, height: 1000, deviceScaleFactor: 1.25 })
-await page.setCookie({ name: 'token', value: login.data.token, domain: '127.0.0.1', path: '/' })
-
-const shots = [
-  ['/', 'audit-home'],
-  ['/daq', 'audit-daq'],
-  ['/dcw', 'audit-dcw'],
-  ['/workshop', 'audit-workshop'],
-  ['/monitor', 'audit-monitor'],
-  ['/users', 'audit-users'],
-  ['/settings', 'audit-settings'],
-]
-for (const [path, name] of shots) {
-  try {
-    await page.goto(`${ROOT}${path}`, { waitUntil: 'domcontentloaded', timeout: 45000 })
-    await sleep(name === 'audit-workshop' ? 9000 : 5000)
-    await page.screenshot({ path: `docs/audit/screenshots/redesign0831/${name}.png`, fullPage: name !== 'audit-workshop' })
-    console.log('ok', name)
-  } catch (e) {
-    console.error('FAIL', name, e.message.slice(0, 80))
-  }
-}
-await browser.close()
-console.log('DONE')
+/** 全站巡检截图:8 个主页面一次采齐。 */
+import puppeteer from 'puppeteer-core'
+
+const ROOT = 'http://127.0.0.1:3000'
+const sleep = ms => new Promise(r => setTimeout(r, ms))
+
+const login = await fetch(`${ROOT}/api/users/login`, {
+  method: 'POST',
+  headers: { 'content-type': 'application/json' },
+  body: JSON.stringify({ email: process.env.E2E_USER ?? 'zhangwei@awshop.io', password: process.env.E2E_PASS ?? 'Awshop@123' }),
+}).then(r => r.json())
+if (!login.data?.token) { console.error('login failed'); process.exit(1) }
+
+const browser = await puppeteer.launch({
+  executablePath: 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
+  headless: 'new',
+  args: ['--no-sandbox', '--disable-gpu', '--window-size=1600,1000'],
+})
+const page = await browser.newPage()
+await page.setViewport({ width: 1600, height: 1000, deviceScaleFactor: 1.25 })
+await page.setCookie({ name: 'token', value: login.data.token, domain: '127.0.0.1', path: '/' })
+
+const shots = [
+  ['/', 'audit-home'],
+  ['/daq', 'audit-daq'],
+  ['/dcw', 'audit-dcw'],
+  ['/workshop', 'audit-workshop'],
+  ['/monitor', 'audit-monitor'],
+  ['/users', 'audit-users'],
+  ['/settings', 'audit-settings'],
+]
+for (const [path, name] of shots) {
+  try {
+    await page.goto(`${ROOT}${path}`, { waitUntil: 'domcontentloaded', timeout: 45000 })
+    await sleep(name === 'audit-workshop' ? 9000 : 5000)
+    await page.screenshot({ path: `docs/audit/screenshots/redesign0831/${name}.png`, fullPage: name !== 'audit-workshop' })
+    console.log('ok', name)
+  } catch (e) {
+    console.error('FAIL', name, e.message.slice(0, 80))
+  }
+}
+await browser.close()
+console.log('DONE')

package/scripts/_dbg-configroot-audit.mjs

@@ -1,84 +1,84 @@
-/**
- * 配置根解析审计 —— 验证「启动目录的 ./.AgentWorkShop 优先,~/.AgentWorkShop 兜底」
- * 在解析层与三条启动路径(start.mjs / dev-guard.mjs / 直跑 .output)上的一致性。
- *
- * 运行:node scripts/_dbg-configroot-audit.mjs
- */
-import { existsSync, mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
-import { homedir, tmpdir } from 'node:os'
-import { join, resolve } from 'node:path'
-import { resolveRunMode, dataDirFor } from '../shared/config/home.mjs'
-import { groupsPathFor } from '../shared/config/groups.mjs'
-
-const REPO = resolve(new URL('..', import.meta.url).pathname.replace(/^\/([A-Za-z]:)/, '$1'))
-const HOME = homedir()
-let pass = 0, fail = 0
-const ok = (n, cond, d = '') => {
-  if (cond) { pass++; console.log(`  PASS  ${n}${d ? `  — ${d}` : ''}`) }
-  else { fail++; console.log(`  FAIL  ${n}${d ? `  — ${d}` : ''}`) }
-}
-const show = (label, rm) => console.log(`   · ${label}: mode=${rm.mode} configRoot=${rm.configRoot} settings=${rm.settingsPath}`)
-
-console.log('\n━━━ 1. 解析层:优先级与兜底 ━━━')
-
-// ① 检出目录内(有 ./.AgentWorkShop)→ 项目运行时根
-const rmRepo = resolveRunMode({ cwd: REPO, env: process.env })
-show('检出内(repo)', rmRepo)
-ok('repo 模式 = 项目运行时根 <repo>/.AgentWorkShop', rmRepo.mode === 'repo' && rmRepo.configRoot === join(REPO, '.AgentWorkShop'), rmRepo.configRoot)
-ok('settingsPath 在项目运行时根', rmRepo.settingsPath === join(REPO, '.AgentWorkShop', 'runtime-settings.json'))
-ok('AW_HOME 不抢项目根(② 优先于 ④)', resolveRunMode({ cwd: REPO, env: { ...process.env, AW_HOME: join(HOME, '.AgentWorkShop') } }).configRoot === join(REPO, '.AgentWorkShop'))
-
-// ② 检出内但无 ./.AgentWorkShop → 回退 ~/.AgentWorkShop
-const tmp = mkdtempSync(join(tmpdir(), 'aw-root-'))
-mkdirSync(join(tmp, 'server'), { recursive: true })
-writeFileSync(join(tmp, 'config.yml'), 'app:\n  title: probe\n')
-writeFileSync(join(tmp, 'nuxt.config.ts'), 'export default {}\n')
-const rmCheckoutNoRoot = resolveRunMode({ cwd: tmp, env: process.env })
-show('检出内但无 .AgentWorkShop', rmCheckoutNoRoot)
-ok('回退 ~/.AgentWorkShop(项目根的 config.yml 仍生效)', rmCheckoutNoRoot.configRoot === join(HOME, '.AgentWorkShop') && rmCheckoutNoRoot.configPath === join(tmp, 'config.yml'))
-
-// ③ 任意目录(非检出)→ ~/.AgentWorkShop,AW_HOME 可重定向
-const rmAny = resolveRunMode({ cwd: tmpdir(), env: process.env })
-show('任意目录', rmAny)
-ok('非检出目录 → ~/.AgentWorkShop(兜底)', rmAny.configRoot === join(HOME, '.AgentWorkShop'))
-const redirected = join(tmp, 'aw-home-redirect')
-mkdirSync(redirected, { recursive: true })
-const rmRedirect = resolveRunMode({ cwd: tmpdir(), env: { ...process.env, AW_HOME: redirected } })
-ok('AW_HOME 可重定向兜底根', rmRedirect.configRoot === redirected, rmRedirect.configRoot)
-
-// ④ AW_MODE=home 强制 home(全局安装的 aw 在检出内运行时,载荷来自包目录)
-const rmForced = resolveRunMode({ cwd: REPO, env: { ...process.env, AW_MODE: 'home' } })
-show('AW_MODE=home(强制)', rmForced)
-ok('AW_MODE=home → configRoot=~/.AgentWorkShop(即使 cwd 是检出)', rmForced.configRoot === join(HOME, '.AgentWorkShop'))
-
-console.log('\n━━━ 2. 派生路径一致性 ━━━')
-ok('dataDir = 配置根/data', dataDirFor(REPO) === join(REPO, '.AgentWorkShop', 'data'), dataDirFor(REPO))
-const repoConfRoot = join(REPO, '.AgentWorkShop')
-ok('分组注册表与 settings 同目录(配置根)', groupsPathFor(repoConfRoot) === join(repoConfRoot, 'config-groups.json'), groupsPathFor(repoConfRoot))
-ok('~ 兜底下分组注册表同样落 ~/.AgentWorkShop', groupsPathFor(join(HOME, '.AgentWorkShop')) === join(HOME, '.AgentWorkShop', 'config-groups.json'))
-
-console.log('\n━━━ 3. 启动器与运行时服务同源 ━━━')
-const fsMod = await import('node:fs')
-const read = (p) => fsMod.readFileSync(p, 'utf8')
-const startSrc = read(join(REPO, 'scripts', 'start.mjs'))
-const devSrc = read(join(REPO, 'scripts', 'dev-guard.mjs'))
-ok('start.mjs 用 resolveRunMode(cwd) 解析配置根', /resolveRunMode\(\{ cwd: process\.cwd\(\)/.test(startSrc))
-ok('dev-guard.mjs 用 resolveRunMode(cwd) 解析配置根', /resolveRunMode\(\{ cwd: process\.cwd\(\)/.test(devSrc))
-// 启动插件不得写死 <cwd>/data(遗留位置);真实路径须经 resolveRunMode 解析并如实打印
-const bootSrc = read(join(REPO, 'server', 'plugins', 'system-config.ts'))
-ok('system-config 启动插件走 resolveRunMode(与启动器同源)', /resolveRunMode/.test(bootSrc))
-ok('启动插件不再写死 <cwd>/data/runtime-settings.json', !/runtime-settings\.json`\)/.test(bootSrc))
-
-const scSrc = read(join(REPO, 'server', 'services', 'system-config.ts'))
-const stSrc = read(join(REPO, 'server', 'services', 'workshop', 'settings.ts'))
-const hostSrc = read(join(REPO, 'server', 'services', 'workshop', 'plugins', 'host.mjs'))
-ok('SystemConfigService 走 resolveRunMode(与启动器同源)', /resolveRunMode/.test(scSrc))
-ok('settings 服务走 resolveRunMode', /resolveRunMode/.test(stSrc))
-ok('插件宿主走 resolveRunMode(插件目录/状态文件同根)', /resolveRunMode/.test(hostSrc))
-
-console.log('\n━━━ 4. 分组注册表随配置根走 ━━━')
-ok('repo 的分组注册表存在(本机已由设置页写入)', existsSync(groupsPathFor(repoConfRoot)))
-rmSync(tmp, { recursive: true, force: true })
-
-console.log(`\n━━ 结果:${pass} passed, ${fail} failed ━━`)
-process.exit(fail === 0 ? 0 : 1)
+/**
+ * 配置根解析审计 —— 验证「启动目录的 ./.AgentWorkShop 优先,~/.AgentWorkShop 兜底」
+ * 在解析层与三条启动路径(start.mjs / dev-guard.mjs / 直跑 .output)上的一致性。
+ *
+ * 运行:node scripts/_dbg-configroot-audit.mjs
+ */
+import { existsSync, mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
+import { homedir, tmpdir } from 'node:os'
+import { join, resolve } from 'node:path'
+import { resolveRunMode, dataDirFor } from '../shared/config/home.mjs'
+import { groupsPathFor } from '../shared/config/groups.mjs'
+
+const REPO = resolve(new URL('..', import.meta.url).pathname.replace(/^\/([A-Za-z]:)/, '$1'))
+const HOME = homedir()
+let pass = 0, fail = 0
+const ok = (n, cond, d = '') => {
+  if (cond) { pass++; console.log(`  PASS  ${n}${d ? `  — ${d}` : ''}`) }
+  else { fail++; console.log(`  FAIL  ${n}${d ? `  — ${d}` : ''}`) }
+}
+const show = (label, rm) => console.log(`   · ${label}: mode=${rm.mode} configRoot=${rm.configRoot} settings=${rm.settingsPath}`)
+
+console.log('\n━━━ 1. 解析层:优先级与兜底 ━━━')
+
+// ① 检出目录内(有 ./.AgentWorkShop)→ 项目运行时根
+const rmRepo = resolveRunMode({ cwd: REPO, env: process.env })
+show('检出内(repo)', rmRepo)
+ok('repo 模式 = 项目运行时根 <repo>/.AgentWorkShop', rmRepo.mode === 'repo' && rmRepo.configRoot === join(REPO, '.AgentWorkShop'), rmRepo.configRoot)
+ok('settingsPath 在项目运行时根', rmRepo.settingsPath === join(REPO, '.AgentWorkShop', 'runtime-settings.json'))
+ok('AW_HOME 不抢项目根(② 优先于 ④)', resolveRunMode({ cwd: REPO, env: { ...process.env, AW_HOME: join(HOME, '.AgentWorkShop') } }).configRoot === join(REPO, '.AgentWorkShop'))
+
+// ② 检出内但无 ./.AgentWorkShop → 回退 ~/.AgentWorkShop
+const tmp = mkdtempSync(join(tmpdir(), 'aw-root-'))
+mkdirSync(join(tmp, 'server'), { recursive: true })
+writeFileSync(join(tmp, 'config.yml'), 'app:\n  title: probe\n')
+writeFileSync(join(tmp, 'nuxt.config.ts'), 'export default {}\n')
+const rmCheckoutNoRoot = resolveRunMode({ cwd: tmp, env: process.env })
+show('检出内但无 .AgentWorkShop', rmCheckoutNoRoot)
+ok('回退 ~/.AgentWorkShop(项目根的 config.yml 仍生效)', rmCheckoutNoRoot.configRoot === join(HOME, '.AgentWorkShop') && rmCheckoutNoRoot.configPath === join(tmp, 'config.yml'))
+
+// ③ 任意目录(非检出)→ ~/.AgentWorkShop,AW_HOME 可重定向
+const rmAny = resolveRunMode({ cwd: tmpdir(), env: process.env })
+show('任意目录', rmAny)
+ok('非检出目录 → ~/.AgentWorkShop(兜底)', rmAny.configRoot === join(HOME, '.AgentWorkShop'))
+const redirected = join(tmp, 'aw-home-redirect')
+mkdirSync(redirected, { recursive: true })
+const rmRedirect = resolveRunMode({ cwd: tmpdir(), env: { ...process.env, AW_HOME: redirected } })
+ok('AW_HOME 可重定向兜底根', rmRedirect.configRoot === redirected, rmRedirect.configRoot)
+
+// ④ AW_MODE=home 强制 home(全局安装的 aw 在检出内运行时,载荷来自包目录)
+const rmForced = resolveRunMode({ cwd: REPO, env: { ...process.env, AW_MODE: 'home' } })
+show('AW_MODE=home(强制)', rmForced)
+ok('AW_MODE=home → configRoot=~/.AgentWorkShop(即使 cwd 是检出)', rmForced.configRoot === join(HOME, '.AgentWorkShop'))
+
+console.log('\n━━━ 2. 派生路径一致性 ━━━')
+ok('dataDir = 配置根/data', dataDirFor(REPO) === join(REPO, '.AgentWorkShop', 'data'), dataDirFor(REPO))
+const repoConfRoot = join(REPO, '.AgentWorkShop')
+ok('分组注册表与 settings 同目录(配置根)', groupsPathFor(repoConfRoot) === join(repoConfRoot, 'config-groups.json'), groupsPathFor(repoConfRoot))
+ok('~ 兜底下分组注册表同样落 ~/.AgentWorkShop', groupsPathFor(join(HOME, '.AgentWorkShop')) === join(HOME, '.AgentWorkShop', 'config-groups.json'))
+
+console.log('\n━━━ 3. 启动器与运行时服务同源 ━━━')
+const fsMod = await import('node:fs')
+const read = (p) => fsMod.readFileSync(p, 'utf8')
+const startSrc = read(join(REPO, 'scripts', 'start.mjs'))
+const devSrc = read(join(REPO, 'scripts', 'dev-guard.mjs'))
+ok('start.mjs 用 resolveRunMode(cwd) 解析配置根', /resolveRunMode\(\{ cwd: process\.cwd\(\)/.test(startSrc))
+ok('dev-guard.mjs 用 resolveRunMode(cwd) 解析配置根', /resolveRunMode\(\{ cwd: process\.cwd\(\)/.test(devSrc))
+// 启动插件不得写死 <cwd>/data(遗留位置);真实路径须经 resolveRunMode 解析并如实打印
+const bootSrc = read(join(REPO, 'server', 'plugins', 'system-config.ts'))
+ok('system-config 启动插件走 resolveRunMode(与启动器同源)', /resolveRunMode/.test(bootSrc))
+ok('启动插件不再写死 <cwd>/data/runtime-settings.json', !/runtime-settings\.json`\)/.test(bootSrc))
+
+const scSrc = read(join(REPO, 'server', 'services', 'system-config.ts'))
+const stSrc = read(join(REPO, 'server', 'services', 'workshop', 'settings.ts'))
+const hostSrc = read(join(REPO, 'server', 'services', 'workshop', 'plugins', 'host.mjs'))
+ok('SystemConfigService 走 resolveRunMode(与启动器同源)', /resolveRunMode/.test(scSrc))
+ok('settings 服务走 resolveRunMode', /resolveRunMode/.test(stSrc))
+ok('插件宿主走 resolveRunMode(插件目录/状态文件同根)', /resolveRunMode/.test(hostSrc))
+
+console.log('\n━━━ 4. 分组注册表随配置根走 ━━━')
+ok('repo 的分组注册表存在(本机已由设置页写入)', existsSync(groupsPathFor(repoConfRoot)))
+rmSync(tmp, { recursive: true, force: true })
+
+console.log(`\n━━ 结果:${pass} passed, ${fail} failed ━━`)
+process.exit(fail === 0 ? 0 : 1)

package/scripts/_dbg-daq-intervals-func.mjs

@@ -1,94 +1,94 @@
-/** 三节拍独立性的功能验证(生产 3001):
- *  1) 通过设置 API 分别改「采集/WS下发/趋势刷新」缺省与下限 → 网关状态各自独立生效;
- *  2) 数采列表「采样周期/WS 下发」两列显示随各自缺省变化(互不牵连);
- *  3) 数采详情页趋势图按 displayIntervalMs 自动重拉(按网络请求计数验证节拍);
- *  4) 复原并确认回落到原值。 */
-import puppeteer from 'puppeteer-core'
-
-const BASE = process.env.AW_BASE ?? 'http://127.0.0.1:3001'
-const EMAIL = 'zhangwei@awshop.io'
-const PASS = 'Awshop@123'
-const T = (k, v) => ({ [k]: v })
-
-const login = await fetch(`${BASE}/api/users/login`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ email: EMAIL, password: PASS }) }).then(r => r.json())
-const token = login.data.token
-const H = { authorization: `Bearer ${token}`, 'content-type': 'application/json' }
-const j = async (p, init) => (await fetch(BASE + p, init)).json()
-
-let fail = 0
-const check = (n, ok, extra = '') => { console.log(`${ok ? '✔' : '✖'} ${n}${extra ? ` — ${extra}` : ''}`); if (!ok) fail++ }
-
-const patch = o => j('/api/system/settings', { method: 'PATCH', headers: H, body: JSON.stringify({ override: o }) })
-const ctrl = async () => (await j('/api/workshop/daq', { headers: H })).data.controller
-
-// ---------- 1) 三节拍独立热生效 ----------
-const before = await ctrl()
-console.log('origin:', JSON.stringify({ s: before.defaultIntervalMs, p: before.defaultPublishIntervalMs, q: before.queryDisplayIntervalMs }))
-await patch({ 'daq.sampling.defaultIntervalMs': 3000, 'daq.publish.defaultIntervalMs': 1000, 'daq.query.displayIntervalMs': 2000 })
-await new Promise(r => setTimeout(r, 1200))
-const after = await ctrl()
-check('采集缺省 → 3000(独立生效)', after.defaultIntervalMs === 3000, `s=${after.defaultIntervalMs}`)
-check('WS 下发缺省 → 1000(不受采集改动牵连)', after.defaultPublishIntervalMs === 1000, `p=${after.defaultPublishIntervalMs}`)
-check('趋势刷新缺省 → 2000(独立生效)', after.queryDisplayIntervalMs === 2000, `q=${after.queryDisplayIntervalMs}`)
-
-// 只改下限,不动缺省 → 缺省应被下限抬升/保持,且三者互不牵连
-await patch({ 'daq.publish.minIntervalMs': 200, 'daq.sampling.minIntervalMs': 1500, 'daq.query.minDisplayIntervalMs': 800 })
-await new Promise(r => setTimeout(r, 1200))
-const c2 = await ctrl()
-check('WS 下限 → 200', c2.minPublishIntervalMs === 200, `minPublish=${c2.minPublishIntervalMs}`)
-check('采集下限 → 1500', c2.minIntervalMs === 1500, `minInterval=${c2.minIntervalMs}`)
-check('趋势刷新下限 → 800', c2.minQueryDisplayIntervalMs === 800, `minDisplay=${c2.minQueryDisplayIntervalMs}`)
-check('下限变更不影响各自缺省(采样仍 3000 / 刷新仍 2000)', c2.defaultIntervalMs === 3000 && c2.queryDisplayIntervalMs === 2000, `${c2.defaultIntervalMs}/${c2.queryDisplayIntervalMs}`)
-
-// 超出下限的写入应被服务端钳制:采集 500 < 下限 1500 → 拒绝/钳制
-await patch({ 'daq.sampling.defaultIntervalMs': 500 })
-await new Promise(r => setTimeout(r, 1000))
-const c3 = await ctrl()
-check('采集缺省低于下限时不会生效(钳制保护)', c3.defaultIntervalMs >= 1500, `s=${c3.defaultIntervalMs}`)
-
-// ---------- 2) 列表两列各自显示 ----------
-const browser = await puppeteer.launch({ executablePath: 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe', headless: 'new', args: ['--no-sandbox', '--disable-gpu', '--window-size=1760,1100'] })
-const page = await browser.newPage()
-await page.setViewport({ width: 1760, height: 1100 })
-await page.setCookie({ name: 'token', value: token, domain: '127.0.0.1', path: '/' })
-await page.goto(`${BASE}/daq`, { waitUntil: 'domcontentloaded', timeout: 90000 })
-await page.waitForFunction(() => document.querySelectorAll('.nodes-table tbody tr td b').length > 3, { timeout: 60000 })
-await new Promise(r => setTimeout(r, 2500))
-const cols = await page.evaluate(() => {
-  const row = document.querySelector('.nodes-table tbody tr')
-  const tds = [...row.querySelectorAll('td')]
-  return { interval: tds[4]?.innerText?.trim(), publish: tds[5]?.innerText?.trim() }
-})
-console.log('list cols:', JSON.stringify(cols))
-const live = await ctrl()
-check(`列表「采样周期」列反映缺省 ${live.defaultIntervalMs}ms`, (cols.interval || '').includes(String(live.defaultIntervalMs)), cols.interval)
-check(`列表「WS 下发」列反映缺省 ${live.defaultPublishIntervalMs}ms`, (cols.publish || '').includes(String(live.defaultPublishIntervalMs)), cols.publish)
-await page.screenshot({ path: '.e2e-shots/prod-intervals-list.png' })
-
-// ---------- 3) 详情页按 displayIntervalMs 自动重拉 ----------
-const firstNode = await page.evaluate(() => document.querySelector('.nodes-table tbody tr a')?.getAttribute('href') ?? '')
-const nodeHref = firstNode || (await j('/api/workshop/daq', { headers: H })).data.nodes.find(n => n.lineId)?.id
-if (nodeHref) {
-  const url = nodeHref.startsWith('/') ? BASE + nodeHref : `${BASE}/daq/${nodeHref}`
-  let hits = 0
-  page.on('request', (req) => { if (/\/samples/.test(req.url())) hits++ })
-  await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 90000 })
-  await page.waitForSelector('.refresh-ctl input', { timeout: 60000 })
-  await new Promise(r => setTimeout(r, 2000))
-  hits = 0
-  await new Promise(r => setTimeout(r, 12000))
-  const expected = Math.round(12000 / 2000)
-  console.log(`detail /samples requests in 12s = ${hits} (displayIntervalMs=2000 → ~${expected})`)
-  check('详情页按趋势刷新间隔自动拉取时序库', hits >= 3 && hits <= expected + 3, `hits=${hits}`)
-  await page.screenshot({ path: '.e2e-shots/prod-daq-detail.png' })
-}
-
-// ---------- 4) 复原 ----------
-await patch({ 'daq.sampling.defaultIntervalMs': null, 'daq.sampling.minIntervalMs': null, 'daq.publish.defaultIntervalMs': null, 'daq.publish.minIntervalMs': null, 'daq.query.displayIntervalMs': null, 'daq.query.minDisplayIntervalMs': null })
-await new Promise(r => setTimeout(r, 1200))
-const back = await ctrl()
-check('复原后回落默认(采集 5000 / 下发 1000 / 刷新 5000)', back.defaultIntervalMs === 5000 && back.defaultPublishIntervalMs === 1000 && back.queryDisplayIntervalMs === 5000, JSON.stringify({ s: back.defaultIntervalMs, p: back.defaultPublishIntervalMs, q: back.queryDisplayIntervalMs }))
-
-await browser.close()
-console.log(fail === 0 ? '全部通过' : `失败 ${fail} 项`)
-process.exit(fail === 0 ? 0 : 1)
+/** 三节拍独立性的功能验证(生产 3001):
+ *  1) 通过设置 API 分别改「采集/WS下发/趋势刷新」缺省与下限 → 网关状态各自独立生效;
+ *  2) 数采列表「采样周期/WS 下发」两列显示随各自缺省变化(互不牵连);
+ *  3) 数采详情页趋势图按 displayIntervalMs 自动重拉(按网络请求计数验证节拍);
+ *  4) 复原并确认回落到原值。 */
+import puppeteer from 'puppeteer-core'
+
+const BASE = process.env.AW_BASE ?? 'http://127.0.0.1:3001'
+const EMAIL = 'zhangwei@awshop.io'
+const PASS = 'Awshop@123'
+const T = (k, v) => ({ [k]: v })
+
+const login = await fetch(`${BASE}/api/users/login`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ email: EMAIL, password: PASS }) }).then(r => r.json())
+const token = login.data.token
+const H = { authorization: `Bearer ${token}`, 'content-type': 'application/json' }
+const j = async (p, init) => (await fetch(BASE + p, init)).json()
+
+let fail = 0
+const check = (n, ok, extra = '') => { console.log(`${ok ? '✔' : '✖'} ${n}${extra ? ` — ${extra}` : ''}`); if (!ok) fail++ }
+
+const patch = o => j('/api/system/settings', { method: 'PATCH', headers: H, body: JSON.stringify({ override: o }) })
+const ctrl = async () => (await j('/api/workshop/daq', { headers: H })).data.controller
+
+// ---------- 1) 三节拍独立热生效 ----------
+const before = await ctrl()
+console.log('origin:', JSON.stringify({ s: before.defaultIntervalMs, p: before.defaultPublishIntervalMs, q: before.queryDisplayIntervalMs }))
+await patch({ 'daq.sampling.defaultIntervalMs': 3000, 'daq.publish.defaultIntervalMs': 1000, 'daq.query.displayIntervalMs': 2000 })
+await new Promise(r => setTimeout(r, 1200))
+const after = await ctrl()
+check('采集缺省 → 3000(独立生效)', after.defaultIntervalMs === 3000, `s=${after.defaultIntervalMs}`)
+check('WS 下发缺省 → 1000(不受采集改动牵连)', after.defaultPublishIntervalMs === 1000, `p=${after.defaultPublishIntervalMs}`)
+check('趋势刷新缺省 → 2000(独立生效)', after.queryDisplayIntervalMs === 2000, `q=${after.queryDisplayIntervalMs}`)
+
+// 只改下限,不动缺省 → 缺省应被下限抬升/保持,且三者互不牵连
+await patch({ 'daq.publish.minIntervalMs': 200, 'daq.sampling.minIntervalMs': 1500, 'daq.query.minDisplayIntervalMs': 800 })
+await new Promise(r => setTimeout(r, 1200))
+const c2 = await ctrl()
+check('WS 下限 → 200', c2.minPublishIntervalMs === 200, `minPublish=${c2.minPublishIntervalMs}`)
+check('采集下限 → 1500', c2.minIntervalMs === 1500, `minInterval=${c2.minIntervalMs}`)
+check('趋势刷新下限 → 800', c2.minQueryDisplayIntervalMs === 800, `minDisplay=${c2.minQueryDisplayIntervalMs}`)
+check('下限变更不影响各自缺省(采样仍 3000 / 刷新仍 2000)', c2.defaultIntervalMs === 3000 && c2.queryDisplayIntervalMs === 2000, `${c2.defaultIntervalMs}/${c2.queryDisplayIntervalMs}`)
+
+// 超出下限的写入应被服务端钳制:采集 500 < 下限 1500 → 拒绝/钳制
+await patch({ 'daq.sampling.defaultIntervalMs': 500 })
+await new Promise(r => setTimeout(r, 1000))
+const c3 = await ctrl()
+check('采集缺省低于下限时不会生效(钳制保护)', c3.defaultIntervalMs >= 1500, `s=${c3.defaultIntervalMs}`)
+
+// ---------- 2) 列表两列各自显示 ----------
+const browser = await puppeteer.launch({ executablePath: 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe', headless: 'new', args: ['--no-sandbox', '--disable-gpu', '--window-size=1760,1100'] })
+const page = await browser.newPage()
+await page.setViewport({ width: 1760, height: 1100 })
+await page.setCookie({ name: 'token', value: token, domain: '127.0.0.1', path: '/' })
+await page.goto(`${BASE}/daq`, { waitUntil: 'domcontentloaded', timeout: 90000 })
+await page.waitForFunction(() => document.querySelectorAll('.nodes-table tbody tr td b').length > 3, { timeout: 60000 })
+await new Promise(r => setTimeout(r, 2500))
+const cols = await page.evaluate(() => {
+  const row = document.querySelector('.nodes-table tbody tr')
+  const tds = [...row.querySelectorAll('td')]
+  return { interval: tds[4]?.innerText?.trim(), publish: tds[5]?.innerText?.trim() }
+})
+console.log('list cols:', JSON.stringify(cols))
+const live = await ctrl()
+check(`列表「采样周期」列反映缺省 ${live.defaultIntervalMs}ms`, (cols.interval || '').includes(String(live.defaultIntervalMs)), cols.interval)
+check(`列表「WS 下发」列反映缺省 ${live.defaultPublishIntervalMs}ms`, (cols.publish || '').includes(String(live.defaultPublishIntervalMs)), cols.publish)
+await page.screenshot({ path: '.e2e-shots/prod-intervals-list.png' })
+
+// ---------- 3) 详情页按 displayIntervalMs 自动重拉 ----------
+const firstNode = await page.evaluate(() => document.querySelector('.nodes-table tbody tr a')?.getAttribute('href') ?? '')
+const nodeHref = firstNode || (await j('/api/workshop/daq', { headers: H })).data.nodes.find(n => n.lineId)?.id
+if (nodeHref) {
+  const url = nodeHref.startsWith('/') ? BASE + nodeHref : `${BASE}/daq/${nodeHref}`
+  let hits = 0
+  page.on('request', (req) => { if (/\/samples/.test(req.url())) hits++ })
+  await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 90000 })
+  await page.waitForSelector('.refresh-ctl input', { timeout: 60000 })
+  await new Promise(r => setTimeout(r, 2000))
+  hits = 0
+  await new Promise(r => setTimeout(r, 12000))
+  const expected = Math.round(12000 / 2000)
+  console.log(`detail /samples requests in 12s = ${hits} (displayIntervalMs=2000 → ~${expected})`)
+  check('详情页按趋势刷新间隔自动拉取时序库', hits >= 3 && hits <= expected + 3, `hits=${hits}`)
+  await page.screenshot({ path: '.e2e-shots/prod-daq-detail.png' })
+}
+
+// ---------- 4) 复原 ----------
+await patch({ 'daq.sampling.defaultIntervalMs': null, 'daq.sampling.minIntervalMs': null, 'daq.publish.defaultIntervalMs': null, 'daq.publish.minIntervalMs': null, 'daq.query.displayIntervalMs': null, 'daq.query.minDisplayIntervalMs': null })
+await new Promise(r => setTimeout(r, 1200))
+const back = await ctrl()
+check('复原后回落默认(采集 5000 / 下发 1000 / 刷新 5000)', back.defaultIntervalMs === 5000 && back.defaultPublishIntervalMs === 1000 && back.queryDisplayIntervalMs === 5000, JSON.stringify({ s: back.defaultIntervalMs, p: back.defaultPublishIntervalMs, q: back.queryDisplayIntervalMs }))
+
+await browser.close()
+console.log(fail === 0 ? '全部通过' : `失败 ${fail} 项`)
+process.exit(fail === 0 ? 0 : 1)