agentworkshop 0.7.7 → 0.7.8

package/scripts/e2e-harness-provider-task.mjs

@@ -0,0 +1,126 @@
+/**
+ * 多 Harness + 自定义 LLM provider 简单任务 E2E(一个 Channel,四种引擎)。
+ *   NO_PROXY='127.0.0.1,localhost' node scripts/e2e-harness-provider-task.mjs [--base http://127.0.0.1:3001]
+ *
+ * P1 provider 目录:四引擎目录均含 glm-5.3-flash(可选)
+ * P2 同 Channel 四 harness worker(omp=zhipu-coding-plan / codex=cc-switch /
+ *    opencode=zhipuai-coding-plan / dsh=ustc;模型均 glm-5.3-flash)
+ * P3 简单任务×4:真实 LLM 回合执行并 complete_task → 全部 COMPLETED(可用)
+ */
+const BASE = (() => {
+  const i = process.argv.indexOf('--base')
+  return i > 0 ? process.argv[i + 1] : 'http://127.0.0.1:3001'
+})()
+const TAG = Date.now().toString(36)
+let failures = 0
+let passed = 0
+const results = []
+const check = (id, name, ok, detail = '') => {
+  console.log(`  ${ok ? 'PASS' : 'FAIL'}  ${id} ${name}${detail ? ` — ${detail}` : ''}`)
+  results.push({ id, name, ok, detail })
+  ok ? passed++ : failures++
+}
+const sleep = ms => new Promise(r => setTimeout(r, ms))
+const api = async (method, path, { body, token } = {}, attempt = 0) => {
+  try {
+    const res = await fetch(`${BASE}${path}`, {
+      method,
+      headers: { 'content-type': 'application/json', ...(token ? { authorization: `Bearer ${token}` } : {}) },
+      body: body !== undefined ? JSON.stringify(body) : undefined,
+    })
+    return { status: res.status, ...(await res.json().catch(() => ({}))) }
+  }
+  catch (err) {
+    if (attempt < 10) {
+      await sleep(3000)
+      return api(method, path, { body, token }, attempt + 1)
+    }
+    throw err
+  }
+}
+
+const ENGINES = [
+  { key: 'omp', harness: 'omp', cfg: { provider: 'zhipu-coding-plan', model: 'glm-5.3-flash' } },
+  { key: 'codex', harness: 'codex', cfg: { model: 'glm-5.3-flash', approvalPolicy: 'never' } },
+  { key: 'dsh', harness: 'dsh', cfg: { provider: 'ustc', model: 'glm-5.3-flash' } },
+  { key: 'opencode', harness: 'opencode', cfg: { model: 'zhipuai-coding-plan/glm-5.3-flash' } },
+]
+
+async function main() {
+  console.log(`\n━━━ 多 Harness + provider 简单任务 E2E @ ${BASE} (tag=${TAG}) ━━━`)
+  const reg = await api('POST', '/api/users/register', { body: { email: `hp-${TAG}@test.local`, password: 'Passw0rd!123', name: `hp-${TAG}` } })
+  const token = reg.data?.token
+  if (!token) throw new Error('注册失败')
+  const auth = { token }
+
+  // ── P1 provider 目录(可选性) ──
+  for (const e of ENGINES) {
+    const r = await api('GET', `/api/workshop/harnesses/${e.harness}/providers`, auth)
+    const provs = r.data?.catalog?.providers ?? []
+    const has = provs.some(p => p.models.some(m => m.id === 'glm-5.3-flash'))
+    check(`P1.${e.key}`, `${e.harness} 目录含 glm-5.3-flash(可选)`, has, provs.map(p => p.id).join(',').slice(0, 60))
+  }
+
+  // ── P2 同 Channel 组建(不同 harness worker + 自定义 provider/model) ──
+  const ch = (await api('POST', '/api/workshop/channels', {
+    body: {
+      name: `harness-mix-${TAG}`,
+      leadAgent: { name: `lead-${TAG}`, harness: 'mock', config: { delayMs: 60 } },
+    }, ...auth,
+  })).data
+  const channelId = ch?.channelId
+  check('P2.1', 'Channel 创建(mock lead)', Boolean(channelId))
+  const workers = {}
+  for (const e of ENGINES) {
+    const c = await api('POST', '/api/workshop/agents', {
+      body: { name: `${e.key}-${TAG}`, harness: e.harness, config: { ...e.cfg, systemPromptPrefix: '你是测试执行员:严格按任务完成,完成后立即调用 complete_task。' } }, ...auth,
+    })
+    workers[e.key] = c.data
+    check(`P2.${e.key}-tpl`, `${e.harness} 模板(provider=${e.cfg.provider ?? 'default'},model=${e.cfg.model})`, Boolean(c.data?.id))
+    const join = await api('POST', `/api/workshop/channels/${channelId}/agents`, { body: { agentId: c.data.id, role: 'worker' }, ...auth })
+    if (join.code !== 0) check(`P2.${e.key}-join`, `${e.key} 入队`, false, join.message ?? '')
+  }
+  const members = (await api('GET', `/api/workshop/channels/${channelId}/agents`, auth)).data ?? []
+  check('P2.join', '四引擎 worker 全部入队(5 成员)', members.length >= 5, `members=${members.length}`)
+
+  // ── P3 简单任务×4(真实 LLM 回合) ──
+  const tasks = {}
+  for (const e of ENGINES) {
+    const t = await api('POST', `/api/workshop/channels/${channelId}/tasks`, {
+      body: {
+        title: `smoke-${e.key}-${TAG}`,
+        parts: [{ text: '请直接汇报「 Harness 冒烟测试完成」六个字所在的环境时间,然后立即调用 complete_task。不要执行任何其它操作。' }],
+        assigneeId: workers[e.key].id,
+      }, ...auth,
+    })
+    tasks[e.key] = t.data?.task?.id ?? t.data?.id
+  }
+  check('P3.1', '四路简单任务下发', Object.values(tasks).every(Boolean))
+
+  const states = {}
+  const deadline = Date.now() + 16 * 60_000
+  while (Date.now() < deadline && Object.keys(states).length < 4) {
+    const list = await api('GET', `/api/workshop/channels/${channelId}/tasks`, auth)
+    for (const [k, id] of Object.entries(tasks)) {
+      if (states[k]) continue
+      const me = (list.data ?? []).find(x => x.id === id)
+      if (me && ['COMPLETED', 'FAILED', 'CANCELED'].includes(me.state)) states[k] = me.state
+    }
+    await sleep(6000)
+  }
+  for (const e of ENGINES) {
+    check(`P3.${e.key}`, `${e.harness}(glm-5.3-flash) 简单任务 COMPLETED`, states[e.key] === 'COMPLETED', `state=${states[e.key] ?? 'RUNNING'}`)
+  }
+
+  // ── 清理 ──
+  await api('DELETE', `/api/workshop/channels/${channelId}?purge=1`, auth).catch(() => {})
+
+  console.log(`\n━━━ 多 Harness provider E2E: ${passed} passed / ${failures} failed ━━━`)
+  if (failures) for (const r of results.filter(x => !x.ok)) console.log(`  ${r.id} ${r.name} — ${r.detail}`)
+  process.exit(failures === 0 ? 0 : 1)
+}
+
+main().catch((err) => {
+  console.error('FATAL', err)
+  process.exit(1)
+})

package/server/api/users/setup-status.get.ts

@@ -0,0 +1,8 @@
+import { userRepository } from '../../repositories/user.repository'
+import { defineApiHandler } from '../../utils/response'
+
+/** GET /api/users/setup-status —— 公开:系统是否处于初始化状态。
+ * true = 无活跃管理员 → 登录门呈现"注册管理员"表单,首个注册账号自动成为 admin */
+export default defineApiHandler(async () => {
+  return { needsSetup: !userRepository.hasActiveAdmin() }
+})

package/server/api/workshop/daq/[id]/samples.get.ts

@@ -6,15 +6,17 @@ import { getQuery, getRouterParam } from 'h3'
 import { resolveUser } from '@/server/api/workshop/caller'
 import { defineApiHandler } from '@/server/utils/response'
 import { getDaqController } from '@/server/services/workshop/daq/daq-controller'
+import { daqRuntimeSettings } from '@/server/services/workshop/settings'
 
 export default defineApiHandler(async (event) => {
   resolveUser(event)
   const id = getRouterParam(event, 'id') ?? ''
   const q = getQuery(event)
   const num = (k: string): number | undefined => (q[k] != null && !Number.isNaN(Number(q[k])) ? Number(q[k]) : undefined)
-  // 时间间隔参数(bucketMs):缺省 15s;可调,下限 1s(降采样桶聚合;返回体携带实际生效间隔)
+  // 时间间隔参数(bucketMs):缺省与下限来自 daq.query.*(live 配置,热重载)
+  const { defaultBucketMs, minBucketMs } = daqRuntimeSettings().query
   const rawBucket = num('bucketMs')
-  const bucketMs = rawBucket == null ? 15_000 : Math.max(1000, Math.min(3_600_000, Math.round(rawBucket)))
+  const bucketMs = rawBucket == null ? defaultBucketMs : Math.max(minBucketMs, Math.min(3_600_000, Math.round(rawBucket)))
   const points = await getDaqController().samples(id, {
     fromMs: num('from'),
     toMs: num('to'),

package/server/data/daqs.json

@@ -64,9 +64,9 @@
     "posX": 1695,
     "posZ": 1135,
     "lineId": "ln-af002514",
-    "value": 172.4,
+    "value": 169.5,
     "state": "ok",
-    "lastAt": "2026-09-05T19:05:18.249+08:00",
+    "lastAt": "2026-09-05T20:09:01.412+08:00",
     "createdAt": "2026-08-27T12:39:08.110Z"
   },
   {
@@ -308,9 +308,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-af002514",
-    "value": 309,
+    "value": 317,
     "state": "ok",
-    "lastAt": "2026-09-05T19:05:18.249+08:00",
+    "lastAt": "2026-09-05T20:09:01.412+08:00",
     "createdAt": "2026-08-28T09:37:38.518Z"
   },
   {
@@ -330,9 +330,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-af002514",
-    "value": 169.5,
+    "value": 169.4,
     "state": "ok",
-    "lastAt": "2026-09-05T19:05:18.249+08:00",
+    "lastAt": "2026-09-05T20:09:01.412+08:00",
     "createdAt": "2026-08-29T03:30:57.463Z"
   },
   {
@@ -1012,9 +1012,9 @@
     "posX": 2395,
     "posZ": 1135,
     "lineId": "ln-af002514",
-    "value": 172.6,
+    "value": 172.7,
     "state": "ok",
-    "lastAt": "2026-09-05T19:05:22.686+08:00",
+    "lastAt": "2026-09-05T20:09:03.215+08:00",
     "createdAt": "2026-08-31T04:07:19.038Z"
   },
   {
@@ -3026,9 +3026,9 @@
     "posX": 120,
     "posZ": 120,
     "lineId": "ln-af002514",
-    "value": 0.9705,
-    "state": "ok",
-    "lastAt": "2026-09-05T19:05:18.249+08:00",
+    "value": 1.0214,
+    "state": "alarm",
+    "lastAt": "2026-09-05T20:09:01.412+08:00",
     "createdAt": "2026-09-03T10:17:59.182Z"
   },
   {
@@ -3050,9 +3050,9 @@
     "posX": 120,
     "posZ": 120,
     "lineId": "ln-af002514",
-    "value": 0.9747,
-    "state": "ok",
-    "lastAt": "2026-09-05T19:05:18.249+08:00",
+    "value": 0.9829,
+    "state": "alarm",
+    "lastAt": "2026-09-05T20:09:01.412+08:00",
     "createdAt": "2026-09-03T11:18:01.401Z"
   },
   {
@@ -3072,9 +3072,9 @@
     "deviceBindingId": "dev-mthzr991-ujuad",
     "driverConfig": {},
     "lineId": "ln-af002514",
-    "value": 0.9725,
-    "state": "ok",
-    "lastAt": "2026-09-05T19:05:18.249+08:00",
+    "value": 1.0231,
+    "state": "alarm",
+    "lastAt": "2026-09-05T20:09:01.412+08:00",
     "createdAt": "2026-09-03T11:34:59.332Z"
   },
   {
@@ -3214,9 +3214,9 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-1b318320",
-    "value": 165.2,
+    "value": 167,
     "state": "ok",
-    "lastAt": "2026-09-05T19:05:22.427+08:00",
+    "lastAt": "2026-09-05T20:09:03.215+08:00",
     "createdAt": "2026-09-04T05:08:10.069Z"
   },
   {
@@ -3749,9 +3749,9 @@
       "jsonPath": "data.temp"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 59,
+    "value": 58.9,
     "state": "alarm",
-    "lastAt": "2026-09-05T19:05:21.910+08:00",
+    "lastAt": "2026-09-05T20:09:03.477+08:00",
     "createdAt": "2026-09-05T05:47:00.640Z"
   },
   {
@@ -3774,9 +3774,9 @@
       "jsonPath": "data.value"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 42.1,
+    "value": 42.4,
     "state": "alarm",
-    "lastAt": "2026-09-05T19:05:22.427+08:00",
+    "lastAt": "2026-09-05T20:09:03.215+08:00",
     "createdAt": "2026-09-05T05:47:00.697Z"
   },
   {
@@ -3804,9 +3804,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 0.75,
+    "value": 0.8,
     "state": "ok",
-    "lastAt": "2026-09-05T19:05:21.910+08:00",
+    "lastAt": "2026-09-05T20:09:02.706+08:00",
     "createdAt": "2026-09-05T05:47:00.821Z"
   },
   {
@@ -3835,7 +3835,7 @@
     "lineId": "ln-6a34fbc7",
     "value": 66,
     "state": "alarm",
-    "lastAt": "2026-09-05T19:05:22.427+08:00",
+    "lastAt": "2026-09-05T20:09:03.215+08:00",
     "createdAt": "2026-09-05T05:47:00.864Z"
   },
   {
@@ -3858,9 +3858,9 @@
       "nodeId": "ns=2;s=AW.Temp"
     },
     "lineId": "ln-6a34fbc7",
-    "value": 182.6,
+    "value": 183.5,
     "state": "warn",
-    "lastAt": "2026-09-05T19:05:22.686+08:00",
+    "lastAt": "2026-09-05T20:09:03.215+08:00",
     "createdAt": "2026-09-05T05:47:03.624Z"
   },
   {
@@ -3888,9 +3888,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-6a34fbc7",
-    "value": -0.3,
+    "value": -0.4,
     "state": "alarm",
-    "lastAt": "2026-09-05T19:05:22.427+08:00",
+    "lastAt": "2026-09-05T20:09:02.188+08:00",
     "createdAt": "2026-09-05T05:47:03.680Z"
   },
   {
@@ -3959,9 +3959,9 @@
       "jsonPath": "data.temp"
     },
     "lineId": "ln-419463e0",
-    "value": 59,
+    "value": 58.9,
     "state": "alarm",
-    "lastAt": "2026-09-05T19:05:21.910+08:00",
+    "lastAt": "2026-09-05T20:09:03.477+08:00",
     "createdAt": "2026-09-05T06:09:13.444Z"
   },
   {
@@ -3984,9 +3984,9 @@
       "jsonPath": "data.value"
     },
     "lineId": "ln-419463e0",
-    "value": 42.7,
+    "value": 42.1,
     "state": "alarm",
-    "lastAt": "2026-09-05T19:05:22.427+08:00",
+    "lastAt": "2026-09-05T20:09:03.215+08:00",
     "createdAt": "2026-09-05T06:09:13.490Z"
   },
   {
@@ -4014,9 +4014,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-419463e0",
-    "value": 0.75,
+    "value": 0.8,
     "state": "ok",
-    "lastAt": "2026-09-05T19:05:21.910+08:00",
+    "lastAt": "2026-09-05T20:09:02.965+08:00",
     "createdAt": "2026-09-05T06:09:13.540Z"
   },
   {
@@ -4045,7 +4045,7 @@
     "lineId": "ln-419463e0",
     "value": 66,
     "state": "alarm",
-    "lastAt": "2026-09-05T19:05:22.427+08:00",
+    "lastAt": "2026-09-05T20:09:03.215+08:00",
     "createdAt": "2026-09-05T06:09:13.567Z"
   },
   {
@@ -4068,9 +4068,9 @@
       "nodeId": "ns=2;s=AW.Temp"
     },
     "lineId": "ln-419463e0",
-    "value": 182.6,
+    "value": 183.5,
     "state": "warn",
-    "lastAt": "2026-09-05T19:05:22.686+08:00",
+    "lastAt": "2026-09-05T20:09:03.215+08:00",
     "createdAt": "2026-09-05T06:09:14.128Z"
   },
   {
@@ -4098,9 +4098,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-419463e0",
-    "value": -0.5,
+    "value": 0,
     "state": "alarm",
-    "lastAt": "2026-09-05T19:05:21.910+08:00",
+    "lastAt": "2026-09-05T20:09:03.477+08:00",
     "createdAt": "2026-09-05T06:09:14.173Z"
   },
   {
@@ -4350,9 +4350,9 @@
       "byteOrder": "big"
     },
     "lineId": "ln-3548f325",
-    "value": -0.5,
+    "value": -0.1,
     "state": "alarm",
-    "lastAt": "2026-09-05T19:05:21.910+08:00",
+    "lastAt": "2026-09-05T20:09:02.452+08:00",
     "createdAt": "2026-09-05T07:23:51.869Z"
   },
   {
@@ -4564,9 +4564,61 @@
     "deviceBindingId": null,
     "driverConfig": {},
     "lineId": "ln-871ac52d",
-    "value": 43.4,
+    "value": 43.8,
     "state": "ok",
-    "lastAt": "2026-09-05T19:05:22.427+08:00",
+    "lastAt": "2026-09-05T20:09:03.215+08:00",
     "createdAt": "2026-09-05T09:47:55.620Z"
+  },
+  {
+    "id": "dn-12f70c3b",
+    "templateRef": "daq-temp-tc",
+    "name": "MQTT温度-mtokh78a",
+    "driver": "mqtt",
+    "enabled": true,
+    "intervalMs": 1000,
+    "publishIntervalMs": 0,
+    "unit": "℃",
+    "decimals": 1,
+    "min": 150,
+    "max": 185,
+    "warnLow": 152.8,
+    "warnHigh": 182.2,
+    "deviceBindingId": null,
+    "driverConfig": {
+      "host": "127.0.0.1",
+      "port": 18830,
+      "topic": "aw/sim/temp",
+      "jsonPath": "data.temp"
+    },
+    "lineId": "ln-23810e78",
+    "value": null,
+    "state": "offline",
+    "lastAt": null,
+    "createdAt": "2026-09-05T23:58:31.357+08:00"
+  },
+  {
+    "id": "dn-e0cd4d25",
+    "templateRef": "daq-temp-tc",
+    "name": "HTTP流量-mtokh78a",
+    "driver": "http",
+    "enabled": true,
+    "intervalMs": 1000,
+    "publishIntervalMs": 0,
+    "unit": "℃",
+    "decimals": 1,
+    "min": 150,
+    "max": 185,
+    "warnLow": 152.8,
+    "warnHigh": 182.2,
+    "deviceBindingId": null,
+    "driverConfig": {
+      "url": "http://127.0.0.1:1889/api/value",
+      "jsonPath": "data.value"
+    },
+    "lineId": "ln-23810e78",
+    "value": null,
+    "state": "offline",
+    "lastAt": null,
+    "createdAt": "2026-09-05T23:58:31.450+08:00"
   }
 ]

package/server/data/dcw-lines.json

@@ -1363,5 +1363,12 @@
     "color": "#35e0a0",
     "description": "",
     "createdAt": "2026-09-05T18:55:51.023+08:00"
+  },
+  {
+    "id": "ln-23810e78",
+    "name": "全协议产线-mtokh78a",
+    "color": "#41c8f4",
+    "description": "",
+    "createdAt": "2026-09-05T23:58:29.513+08:00"
   }
 ]

package/server/data/dcw-products.json

@@ -1223,5 +1223,26 @@
     "name": "tzc-prod",
     "description": "",
     "createdAt": "2026-09-05T19:05:14.617+08:00"
+  },
+  {
+    "id": "pd-3ffc5e11",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-05T19:59:44.387+08:00"
+  },
+  {
+    "id": "pd-36b00ed3",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-05T20:04:40.500+08:00"
+  },
+  {
+    "id": "pd-28fc247a",
+    "lineId": "",
+    "name": "cfg-prod",
+    "description": "",
+    "createdAt": "2026-09-05T20:08:42.255+08:00"
   }
 ]

package/server/data/dcw-recipes.json

@@ -2950,5 +2950,89 @@
     "lastGoodRunId": null,
     "createdAt": "2026-09-05T19:05:14.638+08:00",
     "updatedAt": "2026-09-05T19:05:14.638+08:00"
+  },
+  {
+    "id": "rc-3799921d",
+    "productId": "pd-3ffc5e11",
+    "lineId": "",
+    "name": "cfg-recipe",
+    "description": "",
+    "params": [
+      {
+        "nodeId": "dw-204b00c4",
+        "templateRef": "dcw-temp-sp",
+        "value": 180,
+        "min": 150,
+        "max": 200
+      }
+    ],
+    "daqWindows": [
+      {
+        "nodeId": "dn-30031a86",
+        "min": 0,
+        "max": 260
+      }
+    ],
+    "version": 1,
+    "paramsHistory": [],
+    "lastGoodRunId": null,
+    "createdAt": "2026-09-05T19:59:44.404+08:00",
+    "updatedAt": "2026-09-05T19:59:44.404+08:00"
+  },
+  {
+    "id": "rc-7756484b",
+    "productId": "pd-36b00ed3",
+    "lineId": "",
+    "name": "cfg-recipe",
+    "description": "",
+    "params": [
+      {
+        "nodeId": "dw-2dcce3c7",
+        "templateRef": "dcw-temp-sp",
+        "value": 180,
+        "min": 150,
+        "max": 200
+      }
+    ],
+    "daqWindows": [
+      {
+        "nodeId": "dn-2f6aad9f",
+        "min": 0,
+        "max": 260
+      }
+    ],
+    "version": 1,
+    "paramsHistory": [],
+    "lastGoodRunId": null,
+    "createdAt": "2026-09-05T20:04:40.516+08:00",
+    "updatedAt": "2026-09-05T20:04:40.516+08:00"
+  },
+  {
+    "id": "rc-69bd3ed5",
+    "productId": "pd-28fc247a",
+    "lineId": "",
+    "name": "cfg-recipe",
+    "description": "",
+    "params": [
+      {
+        "nodeId": "dw-07cca4c7",
+        "templateRef": "dcw-temp-sp",
+        "value": 180,
+        "min": 150,
+        "max": 200
+      }
+    ],
+    "daqWindows": [
+      {
+        "nodeId": "dn-fe806ab9",
+        "min": 0,
+        "max": 260
+      }
+    ],
+    "version": 1,
+    "paramsHistory": [],
+    "lastGoodRunId": null,
+    "createdAt": "2026-09-05T20:08:42.270+08:00",
+    "updatedAt": "2026-09-05T20:08:42.270+08:00"
   }
 ]