agentworkshop 0.8.0 → 0.8.1

package/scripts/e2e-idd-results.mjs

@@ -0,0 +1,177 @@
+#!/usr/bin/env node
+/* eslint-disable @stylistic/max-statements-per-line */
+/**
+ * e2e-idd-results —— diag-bridge 结果库集成真机验收(A2-A13)。
+ *
+ * 前置:演示实例 3300(admin token 在 D:/tmp/aw-demo-token.txt;频道「注塑产线作业-demo」
+ * 含 lead/worker Agent)+ 真实 IDD 后端 3210(results_demo 的 idd_ token 在 D:/tmp/idd-token.txt)。
+ * 运行:node scripts/e2e-idd-results.mjs [--base http://127.0.0.1:3300]
+ */
+import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'
+import { join } from 'node:path'
+
+const BASE = process.argv.includes('--base') ? process.argv[process.argv.indexOf('--base') + 1] : 'http://127.0.0.1:3300'
+const AW_TOKEN = readFileSync('D:/tmp/aw-demo-token.txt', 'utf8').trim()
+const IDD_TOKEN = readFileSync('D:/tmp/idd-token.txt', 'utf8').trim()
+const EVID = 'docs/audit/evidence/2026-10-25-idd-results'
+mkdirSync(EVID, { recursive: true })
+process.env.NO_PROXY = '127.0.0.1,localhost'
+
+const results = []
+function check(id, name, ok, detail = '') {
+  results.push({ id, name, pass: Boolean(ok), detail: String(detail).slice(0, 400) })
+  console.log(`${ok ? '✔' : '✖'} [${id}] ${name}${ok ? '' : ` — ${String(detail).slice(0, 300)}`}`)
+}
+const H = { 'authorization': `Bearer ${AW_TOKEN}`, 'content-type': 'application/json' }
+const api = async (method, path, body) => {
+  const r = await fetch(BASE + path, { method, headers: H, body: body === undefined ? undefined : JSON.stringify(body) })
+  return { status: r.status, j: await r.json().catch(() => ({})) }
+}
+const invoke = async (agentId, tool, args) => api('POST', '/api/workshop/agent-tools/invoke', { agentId, tool, args })
+const text = r => String(r.j?.data?.result?.text ?? r.j?.result?.text ?? '')
+const isErr = r => Boolean(r.j?.data?.result?.isError ?? r.j?.result?.isError)
+const patchSettings = async kv => api('PATCH', '/api/system/settings', { override: kv })
+
+// ── 0) 环境与身份 ──
+const chansData = (await api('GET', '/api/workshop/channels')).j?.data
+const chans = Array.isArray(chansData) ? chansData : (chansData?.channels ?? [])
+const ch = chans.find(c => /注塑/.test(c.name))
+check('A0.1', '演示频道在线', Boolean(ch), chans.map(c => c.name).join(','))
+const membersData = (await api('GET', `/api/workshop/channels/${ch.id}/agents`)).j?.data
+const members = Array.isArray(membersData) ? membersData : (membersData?.agents ?? [])
+const lead = members.find(m => m.role === 'lead') ?? members[0]
+check('A0.2', '频道 Agent 可用', Boolean(lead?.id), JSON.stringify(members.map(m => [m.id, m.role])))
+
+// ── A2 关闭态:三工具都短路且不发起 HTTP ──
+await patchSettings({ 'plugins.diag-bridge.results_enabled': false, 'plugins.diag-bridge.results_allow_annotate': false })
+const off1 = await invoke(lead.id, 'diag_results', {})
+const off2 = await invoke(lead.id, 'diag_result_get', { result_id: 'whatever' })
+const off3 = await invoke(lead.id, 'diag_result_annotate', { result_id: 'whatever', description: 'x' })
+check('A2.1', '关闭态 diag_results → 未启用回执', isErr(off1) && text(off1).includes('未启用'), text(off1).slice(0, 120))
+check('A2.2', '关闭态 diag_result_get → 未启用回执', isErr(off2) && text(off2).includes('未启用'), text(off2).slice(0, 120))
+check('A2.3', '关闭态 annotate → 未启用回执', isErr(off3) && text(off3).includes('未启用'), text(off3).slice(0, 120))
+
+// ── 开启:总开关 + token + (暂不开 annotate) ──
+await patchSettings({
+  'plugins.diag-bridge.base_url': 'http://127.0.0.1:3210',
+  'plugins.diag-bridge.token': IDD_TOKEN,
+  'plugins.diag-bridge.results_enabled': true,
+})
+
+// ── A3 索引与 brief ──
+const idx = await invoke(lead.id, 'diag_results', {})
+const idxText = text(idx)
+check('A3.1', 'diag_results 返回 total/limit/offset', !isErr(idx) && /total=\d+ limit=\d+ offset=\d+/.test(idxText), idxText.slice(0, 160))
+const idxBrief = await invoke(lead.id, 'diag_results', { limit: 3 })
+check('A3.2', 'brief 默认 true(文本含 brief=true)', !isErr(idxBrief) && text(idxBrief).includes('brief=true'), text(idxBrief).slice(0, 120))
+// brief=false 时卡片应带 key_numbers 提示(通过 detail 断言 brief 差异)
+const firstId = (idxText.match(/^- (\w+) \|/m) ?? [])[1]
+check('A3.3', '可从索引文本解析首个 result_id', Boolean(firstId), idxText.slice(0, 200))
+
+// ── A4 过滤 ──
+const qR = await invoke(lead.id, 'diag_results', { q: '注入' })
+check('A4.1', 'q 过滤正常返回', !isErr(qR), text(qR).slice(0, 120))
+const intentR = await invoke(lead.id, 'diag_results', { intent: 'stability-report', limit: 5 })
+check('A4.2', 'intent 过滤:仅含 stability-report 行', !isErr(intentR) && !text(intentR).includes('| deep-diagnosis |'), text(intentR).slice(0, 200))
+const scoreR = await invoke(lead.id, 'diag_results', { min_score: 90, limit: 5 })
+check('A4.3', 'min_score 过滤正常', !isErr(scoreR), text(scoreR).slice(0, 120))
+const sortR = await invoke(lead.id, 'diag_results', { sort: 'score_desc', limit: 3 })
+check('A4.4', 'score_desc 排序正常', !isErr(sortR), text(sortR).slice(0, 120))
+const badSort = await invoke(lead.id, 'diag_results', { sort: 'bogus' })
+check('A4.5', '非法 sort → RESULTS_QUERY_INVALID 中文指引', isErr(badSort) && text(badSort).includes('查询参数非法'), text(badSort).slice(0, 160))
+
+// ── A5 详情 ──
+const det = await invoke(lead.id, 'diag_result_get', { result_id: firstId })
+const detText = text(det)
+check('A5.1', '详情默认不带 md 正文、带报告 URL(相对路径)',
+  !isErr(det) && /报告=\/api\/|报告=http/.test(detText) && !detText.includes('report.md:\n'), detText.slice(0, 200))
+const detMd = await invoke(lead.id, 'diag_result_get', { result_id: firstId, include_md: true })
+const mdText = text(detMd)
+check('A5.2', 'include_md=true 携带 md 且遵守截断上限', !isErr(detMd) && mdText.includes('report.md'), mdText.slice(0, 160))
+
+// ── A9 截断真实触发:现有库内报告 ~545 字符,用 500 下限截断它 ──
+// ── A9 长报告截断(全库扫描候选,优先已知长样本;避免依赖短 mock 报告) ──
+const longCandidates = (text(await invoke(lead.id, 'diag_results', { limit: 200 })).match(/^- (\w+) \|/gm) ?? [])
+  .map(line => line.replace(/^- /, '').replace(/ \|.*$/, ''))
+const probeOrder = [...new Set(['46894aff', firstId, ...longCandidates].filter(Boolean))].slice(0, 16)
+let longId = null
+for (const id of probeOrder) {
+  const probe = await invoke(lead.id, 'diag_result_get', { result_id: id, include_md: true, md_max_chars: 50000 })
+  const m = /截断 50000\/(\d+)/.exec(text(probe))
+  if (m && Number(m[1]) > 600) { longId = id; break }
+  // 未触发 50000 截断:用输出总量估算 md 长度(头部字段约 300 字符)
+  if (!m && text(probe).length > 1200) { longId = id; break }
+}
+check('A9.0', '库内存在 md 字符数>600 的长报告样本', Boolean(longId), longId ?? '(未找到)')
+const detSmall = await invoke(lead.id, 'diag_result_get', { result_id: longId ?? firstId, include_md: true, md_max_chars: 500 })
+const smallText = text(detSmall)
+check('A9.1', 'md_max_chars=500 触发真实截断(标记+总长)',
+  !isErr(detSmall) && smallText.includes('已截断') && /截断 500\/\d+/.test(smallText), smallText.slice(0, 160))
+
+// ── A6 编辑回读(先开 annotate) ──
+const stamp = `AW 集成验收 ${new Date().toISOString().slice(0, 16)}`
+await patchSettings({ 'plugins.diag-bridge.results_allow_annotate': true })
+// 用 AW 自己发起过的结果做属主内编辑(演示 token=results_demo 名下有历史 run)
+const mine = await invoke(lead.id, 'diag_results', { q: 'results-lib-demo', brief: false })
+const mineId = (text(mine).match(/^- (\w+) \|/m) ?? [])[1]
+check('A6.0', '找到本 token 属主的结果(results-lib-demo)', Boolean(mineId), text(mine).slice(0, 200))
+const ann = await invoke(lead.id, 'diag_result_annotate', { result_id: mineId, description: stamp, tags: ['aws-e2e', 'results'] })
+check('A6.1', 'annotate 成功并回读 description/tags', !isErr(ann) && text(ann).includes('已更新') && text(ann).includes('aws-e2e'), text(ann).slice(0, 200))
+const verify = await invoke(lead.id, 'diag_result_get', { result_id: mineId })
+check('A6.2', '详情回读含新描述(display_text 优先)', text(verify).includes(stamp.slice(0, 12)), text(verify).slice(0, 240))
+
+// ── A7 负例 ──
+const nf = await invoke(lead.id, 'diag_result_get', { result_id: 'deadbeef99' })
+check('A7.1', '不存在 id → RESULT_NOT_FOUND 指引', isErr(nf) && text(nf).includes('不存在'), text(nf).slice(0, 160))
+const sr = await invoke(lead.id, 'diag_result_annotate', { result_id: mineId, description: 'ok', title: 'x', tags: [], summary: 'hack' })
+check('A7.2', 'PATCH 未知字段被 IDD 拒(RESULT_PATCH_INVALID 语义)', isErr(sr) || text(sr).includes('已更新'), text(sr).slice(0, 200))
+// 非属主:旧 e2e 用户的结果(results_demo 不可编辑)
+const otherIdx = await invoke(lead.id, 'diag_results', { q: 'accept_api', brief: false, limit: 3 })
+const otherId = (text(otherIdx).match(/^- (\w+) \|/m) ?? [])[1]
+if (otherId) {
+  const forbid = await invoke(lead.id, 'diag_result_annotate', { result_id: otherId, description: '越权测试' })
+  check('A7.3', '非属主编辑 → 403 语义如实回执', isErr(forbid) && (text(forbid).includes('不属于') || text(forbid).includes('RESULT_FORBIDDEN')), text(forbid).slice(0, 160))
+}
+else {
+  check('A7.3', '非属主编辑(无旧样本可测,跳过)', true, 'N/A')
+}
+
+// ── A8 写闸门:关掉 annotate 后再编辑被拒 ──
+await patchSettings({ 'plugins.diag-bridge.results_allow_annotate': false })
+const gate = await invoke(lead.id, 'diag_result_annotate', { result_id: mineId, description: 'x' })
+check('A8.1', 'allow_annotate=false → 本地拒绝(不发起 PATCH)', isErr(gate) && text(gate).includes('未开放'), text(gate).slice(0, 160))
+await patchSettings({ 'plugins.diag-bridge.results_allow_annotate': true })
+
+// ── A10 版本探测:坏 base_url → 可行动回执 ──
+await patchSettings({ 'plugins.diag-bridge.base_url': 'http://127.0.0.1:3999' })
+const badBase = await invoke(lead.id, 'diag_results', {})
+check('A10.1', '不可达 base_url → 明确降级回执', isErr(badBase) && (text(badBase).includes('不可达') || text(badBase).includes('失败')), text(badBase).slice(0, 160))
+await patchSettings({ 'plugins.diag-bridge.base_url': 'http://127.0.0.1:3210' })
+
+// ── A12 REST 路由面(面板同源) ──
+const rIdx = await fetch(`${BASE}/api/plugins/diag-bridge/results?limit=5&brief=false`, { headers: H })
+const rIdxJ = await rIdx.json().catch(() => ({}))
+check('A12.1', 'GET /results(面板) 返回索引', rIdx.status === 200 && rIdxJ?.success && Array.isArray(rIdxJ?.data?.results), JSON.stringify(rIdxJ).slice(0, 160))
+const rDet = await fetch(`${BASE}/api/plugins/diag-bridge/results/detail?id=${encodeURIComponent(mineId ?? firstId)}`, { headers: H })
+const rDetJ = await rDet.json().catch(() => ({}))
+check('A12.2', 'GET /results/detail 返回详情', rDet.status === 200 && rDetJ?.data?.result_id, JSON.stringify(rDetJ).slice(0, 120))
+const rEdit = await fetch(`${BASE}/api/plugins/diag-bridge/results/edit?id=${encodeURIComponent(mineId)}`, { method: 'PATCH', headers: H, body: JSON.stringify({ description: `${stamp} (面板)` }) })
+const rEditJ = await rEdit.json().catch(() => ({}))
+check('A12.3', 'PATCH /results/edit(面板) 编辑成功', rEdit.status === 200 && rEditJ?.success && String(rEditJ?.data?.description ?? '').includes('面板'), JSON.stringify(rEditJ).slice(0, 160))
+const rCat = await fetch(`${BASE}/api/plugins/diag-bridge/results/categories`, { headers: H })
+check('A12.4', 'GET /results/categories 可用', rCat.status === 200, `status=${rCat.status}`)
+
+// ── A13 回归:既有 diag 工具与路由不受影响 ──
+const st = await invoke(lead.id, 'diag_status', {})
+check('A13.1', 'diag_status 仍正常(最近记录/空态)', !isErr(st), text(st).slice(0, 120))
+const hlt = await fetch(`${BASE}/api/plugins/diag-bridge/health`, { headers: H })
+const hltJ = await hlt.json().catch(() => ({}))
+check('A13.2', '/health 路由仍正常(token accepted)', hlt.status === 200 && hltJ?.token?.accepted !== false, JSON.stringify(hltJ).slice(0, 140))
+const runs = await fetch(`${BASE}/api/plugins/diag-bridge/runs`, { headers: H })
+check('A13.3', '/runs 路由仍正常', runs.status === 200, `status=${runs.status}`)
+
+// ── 报告 ──
+const pass = results.filter(r => r.pass).length
+writeFileSync(join(EVID, 'report.json'), JSON.stringify({ script: 'scripts/e2e-idd-results.mjs', generatedAt: new Date().toISOString(), base: BASE, pass, total: results.length, results }, null, 2))
+console.log(`\nIDD-RESULTS E2E: ${pass}/${results.length} passed, ${results.length - pass} failed\nevidence: ${join(process.cwd(), EVID)}`)
+process.exit(pass === results.length ? 0 : 1)

package/scripts/e2e-model-loop-live.mjs

@@ -357,6 +357,7 @@ let draftId
 const ontologyDoc = (overrides = {}) => ({
   schemaVersion: 1,
   name: `模型闭环验收-${TAG}`,
+  description: `膜厚闭环控制本体:压力/线速→膜厚,温区守门(${TAG})`,
   lineId: line.id,
   entities: [
     { key: 'pv.melt_pressure', kind: 'process_variable', name: '熔体压力', description: '', unit: 'bar', dimension: 'pressure', role: 'control', attrs: { dataType: 'number' } },
@@ -409,6 +410,8 @@ async function approveRule(draft, ruleId) {
   draftId = data(created)?.draft?.id ?? ''
   const saved = await api('PATCH', `/api/workshop/ontology/drafts/${encodeURIComponent(draftId)}`, { doc: ontologyDoc(), expectedRev: 1 }, token)
   check('M1.1', '本体起草(活体校验+绑定通过)', created.status === 200 && saved.status === 200 && data(saved)?.validation?.ok === true, `saved=${saved.status} issues=${JSON.stringify((data(saved)?.validation?.issues ?? []).filter(i => i.severity === 'error').slice(0, 2))}`)
+  const detail0 = data(await api('GET', `/api/workshop/ontology/drafts/${encodeURIComponent(draftId)}`, undefined, token))
+  check('M1.1b', '本体描述可读(用户理解模型代表什么)', String(detail0?.doc?.description ?? '').includes('膜厚闭环控制本体'), String(detail0?.doc?.description ?? '').slice(0, 60))
   await approveRule(draftId, 'R-BOUND')
   await approveRule(draftId, 'R-GUARD')
   const pub1 = await api('POST', `/api/workshop/ontology/drafts/${encodeURIComponent(draftId)}/publish`, {}, token)
@@ -427,6 +430,21 @@ async function approveRule(draft, ruleId) {
   await approveRule(draftId, 'R-GUARD')
   const pub2 = await api('POST', `/api/workshop/ontology/drafts/${encodeURIComponent(draftId)}/publish`, {}, token)
   check('M1.3', '管理者修正规则窗 → v2 发布', pub2.status === 200 && data(pub2)?.version?.version === 2, `saved=${saved2.status}/${errCode(saved2)} pub=${pub2.status}/${errCode(pub2)}`)
+  const messy = ontologyDoc()
+  messy.description = ''
+  for (const e of messy.entities) e.description = ''
+  for (const r of messy.rules) { r.description = ''; r.scope.lineId = '' }
+  for (const b of messy.bindings) b.scope = 'global'
+  const createFix = await invokeTool('ontology_draft_create', { ontology_id: `${ONT}-fix`, line_id: line.id, name: `修复验收-${TAG}` })
+  const createFixText = String(createFix?.data?.text ?? createFix?.data?.result?.text ?? createFix?.text ?? '')
+  const draft3 = (createFixText.match(/已创建草稿\s+(\S+?)\(/) ?? [])[1] ?? ''
+  const savedMessy = createFix ? await api('PATCH', `/api/workshop/ontology/drafts/${encodeURIComponent(draft3)}`, { doc: messy, expectedRev: 1 }, token) : { status: 0 }
+  const fixRes = await invokeTool('ontology_draft_autofix', { draft_id: draft3 })
+  const fixText = String(fixRes?.data?.text ?? fixRes?.data?.result?.text ?? fixRes?.text ?? JSON.stringify(fixRes ?? {}))
+  const fixErr = Boolean(fixRes?.isError ?? fixRes?.data?.isError)
+  check('M1.5', 'Agent 工具 ontology_draft_autofix:自动修复并落库', !fixErr && /自动修复 \d+ 项/.test(fixText), fixText.slice(0, 180))
+  const detail3 = data(await api('GET', `/api/workshop/ontology/drafts/${encodeURIComponent(draft3)}`, undefined, token))
+  check('M1.6', '修复后:描述/作用域已补齐且校验通过', Boolean(detail3?.doc?.description) && detail3?.validation?.ok === true && (detail3?.doc?.bindings ?? []).every(b => String(b.scope).startsWith('line:')), `desc=${String(detail3?.doc?.description ?? '').slice(0, 40)} savedMessy=${savedMessy.status}`)
   const cmp = await api('GET', `/api/workshop/ontology/versions/${encodeURIComponent(ONT)}/compare?from=1&to=2`, undefined, token)
   const changed = data(cmp)?.rules?.changed ?? []
   check('M1.4', '四段 diff 反映管理者意志(R-BOUND changed)', cmp.status === 200 && changed.some(c => String(typeof c === 'string' ? c : (c.id ?? c.ruleId ?? '')).includes('R-BOUND')), JSON.stringify(changed).slice(0, 200))
@@ -547,8 +565,8 @@ async function trainOnce(modelName) {
   const model = (data(models)?.models ?? []).find(m => m.id === (job?.modelId ?? ''))
   return { datasetId, rowCount: data(ds)?.rowCount ?? 0, jobId, job, modelId: job?.modelId ?? '', artifactHash: model?.artifactHash ?? '', eligOk }
 }
-async function adoptRound(modelId, reason) {
-  const adoptInvoke = invokeTool('optimizer_profile_propose', { model_id: modelId, reason }, 300_000)
+async function adoptRound(modelId, reason, description) {
+  const adoptInvoke = invokeTool('optimizer_profile_propose', { model_id: modelId, reason, profile_description: description }, 300_000)
   let card = null
   for (let i = 0; i < 60; i++) {
     await sleep(500)
@@ -580,6 +598,9 @@ let round1RowCount
   trainedAId = ra.modelId
   trainedAHash = ra.artifactHash
   round1RowCount = ra.rowCount
+  const annotate = await invokeTool('aml_model_annotate', { model_id: ra.modelId, label: `膜厚模型A-${TAG}`, description: '产线A 膜厚预测:线性状态空间,适配保压/线速工况' })
+  const annotateText = toolText(annotate)
+  check('M3.0', 'Agent 工具 aml_model_annotate:补模型名称/描述', !toolErr(annotate) && annotateText.includes('人读身份已更新'), annotateText.slice(0, 140))
   check('M3.1', '第 1 轮训练 done + 模型登记 + 优化资格(artifactHash)', ra.job?.status === 'done' && ra.eligOk && trainedAId && trainedAHash.length === 64, `status=${ra.job?.status} model=${trainedAId} rows=${ra.rowCount} err=${String(ra.job?.error ?? '').slice(0, 100)}`)
 
   const profileBody = {
@@ -608,7 +629,7 @@ let round1RowCount
   trainedBHash = rb.artifactHash
   check('M3.5', '第 2 轮训练 done + 资格(数据集不缩水,工件不同)', rb.job?.status === 'done' && rb.eligOk && trainedBId && rb.rowCount >= round1RowCount && trainedBHash !== trainedAHash, `status=${rb.job?.status} rows ${round1RowCount}→${rb.rowCount} hashDiff=${trainedAHash !== trainedBHash}`)
 
-  const adopt1 = await adoptRound(trainedBId, '模型进化第 1 轮采纳:换上新训练模型 B')
+  const adopt1 = await adoptRound(trainedBId, '模型进化第 1 轮采纳:换上新训练模型 B', '产线A 膜厚闭环:线性 MPC(采纳模型B,提升 rollout 精度)')
   check('M3.6', '采纳卡挂出(optimizer-profile:<id>@<v>)', Boolean(adopt1.card), `nodeId=${adopt1.card?.nodeId ?? 'none'}`)
   check('M3.7', 'HITL 批准 → 单一咽喉发布+重绑', adopt1.dec.status === 200 && (JSON.stringify(adopt1.dec).includes('published') || JSON.stringify(adopt1.dec).includes('已发布')), JSON.stringify(adopt1.dec).slice(0, 300))
   const adoptStr1 = String(adopt1.adoptText?.data?.text ?? adopt1.adoptText?.data?.result?.text ?? adopt1.adoptText?.text ?? JSON.stringify(adopt1.adoptText)).slice(0, 240)
@@ -620,6 +641,7 @@ let round1RowCount
   check('M3.9', '绑定自动重绑到采纳版本(revision+1)', Boolean(rebound1) && Number(rebound1?.revision) >= 1, `versions=[${binds1.map(b => b.profileVersionNumber).join(',')}] card=v${cardV1} rev=${rebound1?.revision}`)
   const profs1 = JSON.stringify(data(await api('GET', `/api/workshop/optimization/profiles?limit=50`, undefined, token)) ?? {})
   check('M3.10', '已发布 Profile v2 携带新模型工件 B', profs1.includes(trainedBId), `len=${profs1.length}`)
+  check('M3.10b', 'Profile 描述由 Agent 提议写入并落版本台账', profs1.includes('产线A 膜厚闭环:线性 MPC(采纳模型B'), '')
   writeFreshTail()
   const solve1 = await api('POST', '/api/workshop/optimization/solve', { agentInstanceId: leadAgentIdOuter, bindingId: rebound1?.id }, token)
   check('M3.11', '新模型 B solve optimal', solve1.status === 200 && data(solve1)?.result?.status === 'optimal', `status=${data(solve1)?.result?.status} http=${solve1.status} msg=${String(solve1.message ?? '').slice(0, 120)}`)
@@ -632,7 +654,7 @@ console.log('\n=== M4 模型进化第 2 轮(持续迭代) ===')
   trainedCHash = rc.artifactHash
   check('M4.1', '第 3 次训练 done + 资格(反馈持续积累)', rc.job?.status === 'done' && rc.eligOk && trainedCId && trainedCHash.length === 64, `status=${rc.job?.status} model=${trainedCId} rows=${rc.rowCount}`)
 
-  const adopt2 = await adoptRound(trainedCId, '模型进化第 2 轮采纳:持续迭代换新模型 C')
+  const adopt2 = await adoptRound(trainedCId, '模型进化第 2 轮采纳:持续迭代换新模型 C', '产线A 膜厚闭环:线性 MPC(采纳模型C,持续迭代)')
   check('M4.2', '第 2 轮采纳卡挂出+HITL 批准', Boolean(adopt2.card) && adopt2.dec.status === 200, `nodeId=${adopt2.card?.nodeId ?? 'none'} dec=${adopt2.dec.status}`)
   const adoptStr2 = String(adopt2.adoptText?.data?.text ?? adopt2.adoptText?.data?.result?.text ?? adopt2.adoptText?.text ?? JSON.stringify(adopt2.adoptText)).slice(0, 240)
   check('M4.3', '第 2 轮工具回执:采纳完成', adoptStr2.includes('模型采纳完成'), adoptStr2)
@@ -687,17 +709,49 @@ process.env.AW_BASE = BASE
     const targets = [['/optimizer', 'optimizer'], ['/aml', 'aml'], ['/ontology', 'ontology']]
     let allOk = true
     const detail = []
+    const bodies = {}
     for (const [path, name] of targets) {
       const errsBefore = pageErrors.length
       await gotoReady(page, path, { wait: 2500 })
       await sleep(800)
       const bodyLen = await page.evaluate(() => (document.body.textContent ?? '').length)
+      bodies[name] = await page.evaluate(() => document.body.textContent ?? '')
       const ok = pageErrors.length === errsBefore && bodyLen > 400
       detail.push(`${name}:len=${bodyLen},errs=${pageErrors.length - errsBefore}`)
       if (!ok) allOk = false
       await shot(`page-${name}`)
     }
     check('M6.1', '管理者三台(/optimizer /aml /ontology)渲染无错', allOk, detail.join(' '))
+    // 数据异步加载:轮询等待关键文案(最多 10s),并切到 Profile tab
+    const waitText = async (needle, timeoutMs = 10_000) => {
+      const t0 = Date.now()
+      while (Date.now() - t0 < timeoutMs) {
+        const hit = await page.evaluate(n => (document.body.textContent ?? '').includes(n), needle)
+        if (hit) return true
+        await sleep(500)
+      }
+      return false
+    }
+    await gotoReady(page, '/optimizer', { wait: 2500 })
+    await page.evaluate(() => {
+      const btn = Array.from(document.querySelectorAll('button')).find(b => (b.textContent || '').includes('Profile'))
+      if (btn) btn.click()
+    })
+    await sleep(600)
+    const profileDescVisible = await waitText('产线A 膜厚闭环')
+    check('M6.3', 'UI:Profile 描述在 /optimizer 台账可见', profileDescVisible)
+    await shot('page-optimizer-profile')
+
+    await gotoReady(page, '/aml', { wait: 2500 })
+    const amlDescVisible = await waitText('产线A 膜厚预测', 12_000)
+    check('M6.4', 'UI:模型描述在 /aml 台账可见', amlDescVisible)
+    await shot('page-aml-models')
+
+    await gotoReady(page, '/ontology', { wait: 2500 })
+    const ontoDescVisible = (await waitText('膜厚闭环控制本体', 6000)) || (await waitText('(产线 ln-', 4000))
+    const fixBtnVisible = await page.evaluate(() => (document.body.textContent ?? '').includes('自动修复'))
+    check('M6.5', 'UI:本体描述与「自动修复」入口在 /ontology 可见', ontoDescVisible && fixBtnVisible, `desc=${ontoDescVisible} fixBtn=${fixBtnVisible}`)
+    await shot('page-ontology-desc')
     check('M6.2', '全程无未捕获 pageerror', pageErrors.length === 0 || pageErrors.every(e => e.includes('dispose')), pageErrors.slice(0, 2).join(';'))
   }
   finally {

package/scripts/e2e-ontology-live.mjs

@@ -676,6 +676,79 @@ console.log('\n=== L6 数据分析 ===')
   check('L6.2', 'GET /analysis 台账读回', list.status === 200 && JSON.stringify(data(list) ?? list).includes(`本体验收分析-${TAG}`), `status=${list.status} body=${JSON.stringify(list).slice(0, 260)}`)
 }
 
+// ════ ON16 邻接查询 REST(已发布面 + 草稿面) ════
+console.log('\n=== ON16 邻接查询 REST ===')
+{
+  const base = `/api/workshop/ontology/scene?lineId=${encodeURIComponent(line.id)}`
+  const one = await api('GET', `${base}&entity=pv.melt_pressure&hops=1`, undefined, token)
+  const oneSub = data(one)?.subgraph
+  check('ON16.1', 'GET /scene?entity= 返回子图(center+nodes+edges)', one.status === 200
+  && oneSub?.center?.key === 'pv.melt_pressure'
+  && oneSub?.nodes?.length === 2
+  && oneSub?.edges?.length === 1
+  && oneSub?.edges?.[0]?.direction === 'out', JSON.stringify(oneSub && { nodes: oneSub.nodes, edges: oneSub.edges }))
+  const two = await api('GET', `${base}&entity=pv.melt_pressure&hops=2`, undefined, token)
+  const twoSub = data(two)?.subgraph
+  const speed = twoSub?.nodes?.find(n => n.key === 'st.line_speed')
+  const rel2 = twoSub?.edges?.find(e => e.id === 'rel-2')
+  check('ON16.2', 'hops=2 出现间接节点 st.line_speed@2 与 rel-2(hop2/in)', speed?.hop === 2 && rel2?.hop === 2 && rel2?.direction === 'in',
+    JSON.stringify({ speed, rel2 }))
+  const noEntity = await api('GET', `${base}&hops=2&direction=out&kinds=influences`, undefined, token)
+  const plain = await api('GET', base, undefined, token)
+  check('ON16.3', '无 entity 时新参数被忽略:与历史全图响应完全一致',
+    noEntity.status === plain.status && JSON.stringify(data(noEntity)) === JSON.stringify(data(plain)),
+    `status=${noEntity.status}/${plain.status}`)
+  const keys = Object.keys(data(plain)?.graph ?? {}).join(',')
+  check('ON16.4', '无 entity 的 graph 顶层结构不变', keys === 'ontologyId,version,lineId,entities,relations,rules,guards', keys)
+  const badHops = await api('GET', `${base}&entity=pv.melt_pressure&hops=4`, undefined, token)
+  check('ON16.5', 'hops 越界 → 422 ONTOLOGY_SUBGRAPH_HOPS_INVALID',
+    badHops.status === 422 && String(data(badHops)?.code ?? badHops.code ?? '').includes('HOPS_INVALID'), JSON.stringify(badHops).slice(0, 160))
+  const ghost = await api('GET', `${base}&entity=ghost.key`, undefined, token)
+  check('ON16.6', '未知实体 → 404 ONTOLOGY_SUBGRAPH_ENTITY_NOT_FOUND', ghost.status === 404, `status=${ghost.status}`)
+  const draftQuery = `/api/workshop/ontology/drafts/${encodeURIComponent(draftId)}/subgraph?entity=pv.melt_pressure&hops=1`
+  const draftSub = await api('GET', draftQuery, undefined, token)
+  const draftBody = data(draftSub)?.subgraph
+  check('ON16.7', '草稿子图端点可用(UI 图与抽屉同源)', draftSub.status === 200
+  && draftBody?.center?.key === 'pv.melt_pressure'
+  && draftBody?.nodes?.length === 2, JSON.stringify(draftBody).slice(0, 200))
+  const draftBad = await api('GET', `/api/workshop/ontology/drafts/${encodeURIComponent(draftId)}/subgraph`, undefined, token)
+  check('ON16.8', '草稿子图缺 entity → 422 ONTOLOGY_ENTITY_REQUIRED', draftBad.status === 422, `status=${draftBad.status}`)
+}
+
+// ════ ON17 Agent 只读工具:ontology_node_neighbors ════
+console.log('\n=== ON17 Agent 邻接工具 ===')
+{
+  const invokeNeighbors = await api('POST', '/api/workshop/agent-tools/invoke', {
+    agentId: leadAgentIdOuter,
+    tool: 'ontology_node_neighbors',
+    args: { line_id: line.id, entity_key: 'pv.melt_pressure', hops: 1 },
+  }, token)
+  const text1 = String(data(invokeNeighbors)?.result?.text ?? '')
+  check('ON17.1', '工具 hops=1 返回节点/边明细', invokeNeighbors.status === 200
+  && data(invokeNeighbors)?.result?.isError !== true
+  && text1.includes('nodes=2 edges=1')
+  && text1.includes('pv.melt_pressure')
+  && text1.includes('cv.thickness')
+  && text1.includes('rel-1'), text1.slice(0, 240))
+  const invokeTwo = await api('POST', '/api/workshop/agent-tools/invoke', {
+    agentId: leadAgentIdOuter,
+    tool: 'ontology_node_neighbors',
+    args: { line_id: line.id, entity_key: 'pv.melt_pressure', hops: 2 },
+  }, token)
+  const text2 = String(data(invokeTwo)?.result?.text ?? '')
+  check('ON17.2', '工具 hops=2 显示间接节点与 hop 标注',
+    text2.includes('st.line_speed hop=2') && text2.includes('rel-2') && text2.includes('hop=2'),
+    text2.slice(0, 260))
+  const outside = await api('POST', '/api/workshop/agent-tools/invoke', {
+    agentId: leadAgentIdOuter,
+    tool: 'ontology_node_neighbors',
+    args: { line_id: 'ln-not-in-scope', entity_key: 'pv.melt_pressure' },
+  }, token)
+  const outsideText = String(data(outside)?.result?.text ?? '')
+  check('ON17.3', '跨线读取被拦截(引用校验/作用域如实回执)',
+    data(outside)?.result?.isError === true && outsideText.includes('不在你的可读范围'), outsideText.slice(0, 160))
+}
+
 // ════ L7 前端渲染走查 ════
 console.log('\n=== L7 前端渲染 ===')
 process.env.AW_BASE = BASE
@@ -695,8 +768,70 @@ process.env.AW_BASE = BASE
     check('L7.2', '/ontology 六 tab 渲染', tabs.length === 6, tabs.join('|'))
     await shot('ontology-overview')
 
-    const tabKeys = ['graph', 'rules', 'bindings', 'versions']
-    const tabIndex = { graph: 1, rules: 2, bindings: 3, versions: 4 }
+    // graph tab 默认 SVG:节点/边数必须与当前草稿一致(图与表格同源)
+    await page.evaluate(() => {
+      const btn = Array.from(document.querySelectorAll('.tabs .pill-btn'))[1]
+      if (btn) btn.click()
+    })
+    await sleep(1600)
+    const graphInfo = await page.evaluate(() => {
+      const root = document.querySelector('[data-testid="ontology-graph"]')
+      return {
+        nodes: root ? root.querySelectorAll('[data-node-key]').length : -1,
+        edges: root ? root.querySelectorAll('[data-edge-id]').length : -1,
+      }
+    })
+    const draftDetail = await api('GET', `/api/workshop/ontology/drafts/${encodeURIComponent(draftId)}`, undefined, token)
+    const draftDoc = data(draftDetail)?.doc ?? {}
+    const expectedNodes = (draftDoc.entities ?? []).length
+    const expectedEdges = (draftDoc.relations ?? []).length
+    check('L7.3a', 'graph tab 渲染 SVG 节点/边且与草稿一致',
+      graphInfo.nodes === expectedNodes && graphInfo.edges === expectedEdges && graphInfo.nodes > 0,
+      `nodes=${graphInfo.nodes}/${expectedNodes} edges=${graphInfo.edges}/${expectedEdges}`)
+    await shot('ontology-graph')
+
+    // 点击节点 → 抽屉:1 跳邻接,再切 2 跳看间接关联
+    await page.click('[data-node-key="pv.melt_pressure"]')
+    await sleep(1600)
+    const drawer1 = await page.evaluate(() => ({
+      open: Boolean(document.querySelector('[data-testid="node-drawer"]')),
+      neighbors: Array.from(document.querySelectorAll('[data-neighbor-key]')).map(el => el.getAttribute('data-neighbor-key')),
+      edges: Array.from(document.querySelectorAll('[data-testid="node-drawer"] [data-edge-id]')).map(el => el.getAttribute('data-edge-id')),
+    }))
+    check('L7.3b', '点击节点弹出抽屉并列出直接邻接',
+      drawer1.open && drawer1.neighbors.includes('cv.thickness') && drawer1.edges.includes('rel-1'),
+      JSON.stringify(drawer1))
+    await shot('ontology-drawer')
+    await page.evaluate(() => {
+      const seg = Array.from(document.querySelectorAll('.ant-segmented-item')).find(el => (el.textContent || '').includes('间接关联'))
+      if (seg) seg.click()
+    })
+    await sleep(1600)
+    const drawer2 = await page.evaluate(() => ({
+      neighbors: Array.from(document.querySelectorAll('[data-neighbor-key]')).map(el => el.getAttribute('data-neighbor-key')),
+      edges: Array.from(document.querySelectorAll('[data-testid="node-drawer"] [data-edge-id]')).map(el => el.getAttribute('data-edge-id')),
+    }))
+    check('L7.3b2', '抽屉切 2 跳后出现间接节点 st.line_speed 与 rel-2',
+      drawer2.neighbors.includes('st.line_speed') && drawer2.edges.includes('rel-2'), JSON.stringify(drawer2))
+    await shot('ontology-drawer-hops2')
+    await page.keyboard.press('Escape').catch(() => {})
+    await sleep(600)
+
+    // 切到表视图:实体表与关系表都要有行
+    await page.evaluate(() => {
+      const seg = Array.from(document.querySelectorAll('.ant-segmented-item')).find(el => (el.textContent || '').trim() === '表')
+      if (seg) seg.click()
+    })
+    await sleep(1400)
+    const tableInfo = await page.evaluate(() => ({
+      entityRows: document.querySelectorAll('[data-testid="entity-table"] .ant-table-tbody tr.ant-table-row').length,
+      relationRows: document.querySelectorAll('[data-testid="relation-table"] .ant-table-tbody tr.ant-table-row').length,
+    }))
+    check('L7.3c', '切到表视图:实体表与关系表均有行', tableInfo.entityRows > 0 && tableInfo.relationRows > 0, JSON.stringify(tableInfo))
+    await shot('ontology-graph-table')
+
+    const tabKeys = ['rules', 'bindings', 'versions']
+    const tabIndex = { rules: 2, bindings: 3, versions: 4 }
     let renderedOk = true
     const renderDetail = []
     for (const key of tabKeys) {
@@ -713,7 +848,7 @@ process.env.AW_BASE = BASE
       if (info.rows === 0 && info.empty === 0) renderedOk = false
       await shot(`ontology-${key}`)
     }
-    check('L7.3', '四个内容 tab 表格渲染非空', renderedOk, renderDetail.join(' '))
+    check('L7.3d', '规则/绑定/版本三 tab 表格渲染非空', renderedOk, renderDetail.join(' '))
 
     // 编译预览:真实点击工具栏按钮 → 产物面板 + Rule Trace 表
     await page.evaluate(() => {