agentworkshop 0.7.24 → 0.7.33

package/scripts/experiment-castfilm-ui-shot.mjs

@@ -0,0 +1,52 @@
+/**
+ * 闭环实验 UI 目视验证 —— 产线管理(/dcw)/数采(/daq)/数字孪生(/town)三页真实截图。
+ *
+ * 前置:主项目生产实例(BASE,默认 :3001)已登录可用;实验夹具已建。
+ * 用法:NO_PROXY='127.0.0.1,localhost' node scripts/experiment-castfilm-ui-shot.mjs [out-dir]
+ */
+import puppeteer from 'puppeteer-core'
+import fs from 'node:fs'
+import path from 'node:path'
+
+const BASE = process.env.AW_BASE ?? 'http://127.0.0.1:3001'
+const OUT = process.argv[2] ?? 'docs/experiments/results/castfilm-ui'
+fs.mkdirSync(OUT, { recursive: true })
+
+// 登录拿 token(全新数据态:首注册即 admin)
+const login = await fetch(`${BASE}/api/users/login`, {
+  method: 'POST',
+  headers: { 'content-type': 'application/json' },
+  body: JSON.stringify({ email: 'admin@awshop.local', password: 'admin123' }),
+}).then(r => r.json()).catch(() => ({}))
+const token = login?.data?.token
+if (!token) {
+  console.error('登录失败:', JSON.stringify(login).slice(0, 200))
+  process.exit(1)
+}
+
+const browser = await puppeteer.launch({
+  executablePath: 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
+  headless: 'new',
+  // 本机 7890 系统代理会拦 localhost 动态模块 → 必须直连
+  args: ['--no-sandbox', '--disable-gpu', '--proxy-server=direct://', '--proxy-bypass-list=*', '--window-size=1920,1200'],
+})
+const page = await browser.newPage()
+const errors = []
+page.on('pageerror', e => errors.push(String(e).slice(0, 160)))
+await page.setViewport({ width: 1920, height: 1200, deviceScaleFactor: 1 })
+await page.setCookie({ name: 'token', value: token, domain: '127.0.0.1', path: '/' })
+const shot = async (url, name, waitMs = 9000) => {
+  await page.goto(`${BASE}${url}`, { waitUntil: 'domcontentloaded', timeout: 90_000 })
+  await new Promise(r => setTimeout(r, waitMs))
+  await page.screenshot({ path: path.join(OUT, name) })
+  console.log(`shot: ${name}`)
+}
+
+await shot('/', '01-dashboard.png', 10_000)
+await shot('/dcw', '02-lines-dcw.png')
+await shot('/daq', '03-daq.png')
+await shot('/town', '04-town.png', 14_000)
+await shot('/workshop/agents', '05-agents.png')
+
+console.log('pageerrors:', errors.length ? errors.join(' | ') : 'none')
+await browser.close()

package/scripts/experiment-castfilm-viz.mjs

@@ -0,0 +1,172 @@
+/**
+ * 闭环实验可视化 —— result.json + truth.jsonl → 自包含 SVG 图表报告(report.html)。
+ *
+ * 用法:node scripts/experiment-castfilm-viz.mjs docs/experiments/results/castfilm-<tag>
+ * 输出:<dir>/report.html(纯内联 SVG,无外部依赖,浏览器直开)
+ */
+import fs from 'node:fs'
+import path from 'node:path'
+
+const dir = process.argv[2]
+if (!dir || !fs.existsSync(dir)) {
+  console.error('用法: node scripts/experiment-castfilm-viz.mjs <result-dir>')
+  process.exit(1)
+}
+const result = JSON.parse(fs.readFileSync(path.join(dir, 'result.json'), 'utf-8'))
+const truth = fs.existsSync(path.join(dir, 'truth.jsonl'))
+  ? fs.readFileSync(path.join(dir, 'truth.jsonl'), 'utf-8').trim().split('\n').filter(Boolean).map(l => JSON.parse(l))
+  : []
+
+// ---------- SVG 折线图 ----------
+const W = 860
+const H = 240
+const PAD = { l: 56, r: 14, t: 26, b: 30 }
+
+function lineChart({ series, bands = [], yMin, yMax, unit = '', title, hLines = [] }) {
+  const n = Math.max(...series.map(s => s.data.length))
+  if (!n) return `<div class="chart-empty">${title}:无数据</div>`
+  const t0 = new Date(truth[0]?.t ?? Date.now()).getTime()
+  const t1 = new Date(truth.at(-1)?.t ?? Date.now()).getTime()
+  const span = Math.max(t1 - t0, 1)
+  const lo = yMin ?? Math.min(...series.flatMap(s => s.data.filter(Number.isFinite)))
+  const hi = yMax ?? Math.max(...series.flatMap(s => s.data.filter(Number.isFinite)))
+  const padY = (hi - lo) * 0.08 || 1
+  const y0 = lo - padY
+  const y1 = hi + padY
+  const X = t => PAD.l + ((new Date(t).getTime() - t0) / span) * (W - PAD.l - PAD.r)
+  const Y = v => PAD.t + (1 - (v - y0) / (y1 - y0)) * (H - PAD.t - PAD.b)
+  let svg = `<svg viewBox="0 0 ${W} ${H}" class="chart">`
+  svg += `<text x="${PAD.l}" y="16" class="ct">${title}</text>`
+  for (let i = 0; i <= 4; i++) {
+    const v = y0 + ((y1 - y0) * i) / 4
+    const y = Y(v).toFixed(1)
+    svg += `<line x1="${PAD.l}" y1="${y}" x2="${W - PAD.r}" y2="${y}" class="grid"/>`
+    svg += `<text x="${PAD.l - 6}" y="${Number(y) + 4}" class="ax" text-anchor="end">${v.toFixed(Math.abs(v) < 10 ? 1 : 0)}</text>`
+  }
+  for (const b of bands) {
+    const x1 = X(b.from)
+    const x2 = X(b.to)
+    svg += `<rect x="${x1.toFixed(1)}" y="${PAD.t}" width="${Math.max(x2 - x1, 1).toFixed(1)}" height="${H - PAD.t - PAD.b}" fill="${b.color}" opacity="0.10"/>`
+    svg += `<text x="${((x1 + x2) / 2).toFixed(1)}" y="${H - 8}" class="ax" text-anchor="middle">${b.label}</text>`
+  }
+  for (const h of hLines) {
+    if (h.v < y0 || h.v > y1) continue
+    svg += `<line x1="${PAD.l}" y1="${Y(h.v).toFixed(1)}" x2="${W - PAD.r}" y2="${Y(h.v).toFixed(1)}" stroke="${h.color}" stroke-dasharray="6 4" stroke-width="1.4"/>`
+    svg += `<text x="${W - PAD.r - 4}" y="${(Y(h.v) - 5).toFixed(1)}" class="ax" text-anchor="end" fill="${h.color}">${h.label}</text>`
+  }
+  for (const s of series) {
+    const pts = s.data.map((v, i) => v == null ? '' : `${X(new Date(truth[Math.min(i, truth.length - 1)]?.t ?? Date.now()).getTime()).toFixed(1)},${Y(v).toFixed(1)}`).filter(Boolean)
+    if (!pts.length) continue
+    svg += `<polyline points="${pts.join(' ')}" fill="none" stroke="${s.color}" stroke-width="1.6"/>`
+  }
+  svg += '</svg>'
+  const legend = series.map(s => `<span class="lg"><i style="background:${s.color}"></i>${s.name}</span>`).join('')
+    + hLines.map(h => `<span class="lg"><i style="background:transparent;border-bottom:2px dashed ${h.color};height:0"></i>${h.label}</span>`).join('')
+  return svg + `<div class="legend">${legend}<span class="lg unit">${unit}</span></div>`
+}
+
+// ---------- 组装数据 ----------
+const phaseBands = []
+let cur = null
+for (const s of truth) {
+  if (!cur || cur.phase !== s.phase) {
+    if (cur) phaseBands.push(cur)
+    cur = { phase: s.phase, from: s.t }
+  }
+  cur.to = s.t
+}
+if (cur) phaseBands.push(cur)
+const bands = phaseBands.map(b => ({ ...b, color: b.phase === 'warmup' ? '#41c8f4' : b.phase === 'steady' ? '#35e0a0' : b.phase === 'batch' ? '#f4b941' : '#f45e41' }))
+const pick = (obj, p) => p.split('.').reduce((a, k) => (a == null ? undefined : a[k]), obj)
+const series = (p, color, name) => ({ name, color, data: truth.map(s => pick(s, p)) })
+
+const charts = [
+  lineChart({
+    title: '① 熔体温度(真值 vs 协议暴露值)',
+    series: [series('truth.meltTemp', '#41c8f4', '真值'), series('exposed.meltTemp', '#8ab4ff', 'Agent 可见')],
+    bands, hLines: [{ v: 195, color: '#f4b941', label: '工艺窗下限 195℃' }, { v: 225, color: '#f4b941', label: '上限 225℃' }],
+    unit: '℃',
+  }),
+  lineChart({
+    title: '② 平均膜厚 h(质量守恒:∝ N/v)+ 合格窗',
+    series: [series('truth.thickness', '#35e0a0', '真值'), series('exposed.thickness', '#8affd0', 'Agent 可见')],
+    bands,
+    hLines: [{ v: 48, color: '#35e0a0', label: '合格窗 48' }, { v: 52, color: '#35e0a0', label: '52' }, { v: result.optimum?.thickness ?? 50, color: '#f45e41', label: `W* h=${result.optimum?.thickness ?? 50}` }],
+    unit: 'μm',
+  }),
+  lineChart({
+    title: '③ 品质与安全(缺陷率 / 熔体压力)',
+    series: [series('truth.defect', '#f4b941', '缺陷率%'), series('exposed.pressure', '#f45e41', '压力MPa')],
+    bands, hLines: [{ v: 2, color: '#f4b941', label: '缺陷率目标 2%' }, { v: 22, color: '#f45e41', label: '压力安全 22MPa' }],
+    unit: '% / MPa',
+  }),
+  lineChart({
+    title: '④ 控制输入轨迹(SP,Agent 下发经真实协议)',
+    series: [
+      series('sp.zone3', '#41c8f4', '区3温度℃(÷3 显示)'),
+      { name: '螺杆rpm(÷2)', color: '#35e0a0', data: truth.map(s => s.sp.screw / 2) },
+      { name: '线速m/min', color: '#f4b941', data: truth.map(s => s.sp.lineSpeed) },
+    ],
+    bands,
+    unit: '组合刻度(区3/3、螺杆/2、线速)',
+  }),
+]
+
+const kpi = result.convergence ?? {}
+const win = result.windows ?? {}
+const sc = result.scores ?? {}
+const rows = [
+  ['收敛交付', kpi.convLine ?? '—'],
+  ['稽核结论', kpi.auditLine ?? '—'],
+  ['HITL 审批', `${kpi.approvals?.count ?? 0} 次(时延 p50 ≈ ${pct(kpi.approvals?.latencies, 0.5)}ms)`],
+  ['膜厚窗(末 3min)', fmtWin(win.thickness, 'μm')],
+  ['缺陷率窗', fmtWin(win.defect, '%')],
+  ['压力窗峰值', fmtWin(win.pressure, 'MPa')],
+  ['J(W_agent) / J(W*)', `${sc.agentJ?.toFixed?.(2) ?? '?'} / ${sc.optimumJ ?? '?'} = ${(100 * (sc.ratio ?? 0)).toFixed(1)}%`],
+  ['离线最优 W*', `T=${result.optimum?.zoneTemp}℃ N=${result.optimum?.screw}rpm v=${result.optimum?.lineSpeed}m/min → h*=${result.optimum?.thickness}μm 缺陷 ${result.optimum?.defect}%`],
+  ['起点工况(次优)', `zone=${result.start?.zone}℃ N=${result.start?.screw}rpm v=${result.start?.lineSpeed}m/min(理论 h≈53.9μm 偏厚)`],
+  ['可复现性', `seed=${result.seed} timeScale=${result.timeScale}× 同 seed 重跑逐点一致`],
+  ['总时长', `${Math.round((result.durationS ?? 0) / 60)} min(${result.pass} PASS / ${result.fail} FAIL)`],
+]
+function pct(a, p) {
+  if (!a?.length) return '?'
+  const s = [...a].sort((x, y) => x - y)
+  return Math.round(s[Math.min(s.length - 1, Math.floor(s.length * p))])
+}
+function fmtWin(w, unit) {
+  if (!w) return '—'
+  return `均值 ${w.avg?.toFixed?.(2)}${unit}(min ${w.min?.toFixed?.(1)} / max ${w.max?.toFixed?.(1)},n=${w.n})`
+}
+
+const checks = (result.checks ?? []).map(c =>
+  `<li class="${c.ok ? 'ok' : 'bad'}">${c.ok ? '✓' : '✗'} ${c.name}${c.extra ? ` — ${c.extra}` : ''}</li>`).join('')
+
+const html = `<!doctype html><html lang="zh"><head><meta charset="utf-8">
+<title>挤出流延闭环实验报告 · ${result.tag}</title><style>
+body{background:#0b1220;color:#dbe6f4;font-family:"Segoe UI",system-ui,sans-serif;margin:0;padding:32px}
+h1{font-size:22px;color:#35e0a0;margin:0 0 4px} h2{font-size:15px;color:#41c8f4;margin:28px 0 10px}
+.sub{color:#7c8db0;font-size:12px;margin-bottom:24px}
+.chart{width:100%;max-width:980px;background:#0e1626;border:1px solid #1c2a44;border-radius:10px;display:block}
+.legend{font-size:12px;color:#9fb0cf;margin:6px 0 18px;display:flex;gap:14px;flex-wrap:wrap}
+.lg i{display:inline-block;width:14px;height:3px;margin-right:5px;vertical-align:middle}
+.grid{stroke:#16233c;stroke-width:1}.ct{fill:#9fb0cf;font-size:13px}.ax{fill:#5d6f93;font-size:10px}
+table{border-collapse:collapse;font-size:13px;max-width:980px;width:100%}
+td,th{border:1px solid #1c2a44;padding:7px 12px;text-align:left;vertical-align:top}
+th{color:#41c8f4;background:#0e1626;width:220px}td{color:#dbe6f4}
+ul.checks{columns:2;max-width:980px;font-size:12px;padding-left:18px;margin:0}
+li.ok{color:#35e0a0}li.bad{color:#f45e41}
+.chart-empty{color:#5d6f93;font-size:13px;padding:20px}
+.badge{display:inline-block;background:#0e1626;border:1px solid #1c2a44;border-radius:6px;padding:2px 10px;font-size:12px;color:#41c8f4;margin-right:8px}
+</style></head><body>
+<h1>挤出流延薄膜产线 · AgentTeam 闭环优化实验</h1>
+<div class="sub">tag=${result.tag} · seed=${result.seed} · timeScale=${result.timeScale}× · ${result.startedAt} · 时长 ${Math.round((result.durationS ?? 0) / 60)} min · <span class="badge">${result.pass} PASS</span><span class="badge">${result.fail} FAIL</span></div>
+${charts.join('\n')}
+<h2>关键指标</h2>
+<table>${rows.map(r => `<tr><th>${r[0]}</th><td>${r[1]}</td></tr>`).join('')}</table>
+<h2>检查项(${result.pass}/${result.pass + result.fail})</h2>
+<ul class="checks">${checks}</ul>
+<p class="sub" style="margin-top:24px">物理真值曲线来自 plc-node-simulator plant-model(未加噪状态方程积分);「Agent 可见」= 协议暴露值(传感器噪声后)。复现:NO_PROXY='127.0.0.1,localhost' node scripts/experiment-castfilm-closedloop.mjs</p>
+</body></html>`
+
+fs.writeFileSync(path.join(dir, 'report.html'), html)
+console.log(`report → ${path.join(dir, 'report.html')}(truth ${truth.length} 样本)`)

package/scripts/i18n-merge.mjs

@@ -1,67 +1,189 @@
 /**
  * 合并器:把 i18n/dicts/<ns>.json(zh)+ i18n/dicts/_en.json(zh→en)
  * 注入 i18n/locales/zh-CN.ts 与 en.ts。
- * - ns 已存在 → 在其块首插入缺词条;否则新建 ns 块
- * - vue-i18n 特殊字符({}@$|)转义为字面量插值
+ * - dict 中的点号键('src.user'、'runtime.daq.x')展开为嵌套对象输出,
+ *   与 vue-i18n 的路径解析语义一致(resolveValue 按 '.' 分段逐层下钻)
+ * - ns 已存在 → 解析块内叶子路径,补插缺失键(整块重建,保持既有条目)
+ * - vue-i18n 特殊字符({}@$|)转义为字面量插值;{pN} 占位符保持原样
  * - en 缺失 → 回退 zh(报告计数)
+ * - 键风格:合法标识符用裸键,其余用单引号(项目 eslint singlequote 风格)
  */
 import fs from 'node:fs'
 import path from 'node:path'
 
 const esc = v => v
-  // 保护 vue-i18n 占位符 {pN},其余 { } @ | $ 转义为字面量插值
-  .replace(/\{(?!p\d+\})/g, '{\'{\'}')
-  .replace(/([@$|])/g, '{\'$1\'}')
+  .replace(/\{(?!p\d+\})/g, `{'{'}`)
+  .replace(/([@$|])/g, `{'$1'}`)
 const enMap = JSON.parse(fs.readFileSync('i18n/dicts/_en.json', 'utf-8'))
 let miss = 0
+const norm = s => s.replace(/\s+/g, ' ').trim()
 
-function buildEntries(ns, dict, isEn) {
-  const out = []
+function valueFor(zh, isEn) {
+  if (!isEn) return zh
+  const hit = enMap[norm(zh)] ?? enMap[zh]
+  if (hit == null) {
+    miss++
+    return zh
+  }
+  return hit
+}
+
+function quoteKey(k) {
+  return /^[A-Za-z0-9_$]+$/.test(k) ? k : `'${k.replace(/\\/g, '\\\\').replace(/'/g, '\\\'')}'`
+}
+function quoteVal(v) {
+  return `'${esc(v).replace(/\\/g, '\\\\').replace(/'/g, '\\\'').replace(/\r?\n/g, '\\n')}'`
+}
+
+// dict → 树:点号键展开为嵌套分组
+function toTree(dict, isEn) {
+  const root = { entries: [], groups: new Map() }
   for (const [k, zh] of Object.entries(dict)) {
-    let v = zh
-    if (isEn) {
-      const normalized = s => s.replace(/\s+/g, ' ').trim()
-      const hit = enMap[normalized(zh)] ?? enMap[zh]
-      if (hit == null) {
-        miss++
-        v = zh
+    const v = valueFor(zh, isEn)
+    const segs = k.split('.')
+    let node = root
+    for (let i = 0; i < segs.length - 1; i++) {
+      let g = node.groups.get(segs[i])
+      if (!g) {
+        g = { entries: [], groups: new Map() }
+        node.groups.set(segs[i], g)
       }
-      else v = hit
+      node = g
+    }
+    // 同名键不重复插入;值在建树时统一引用化,emit 阶段只写原始字面量
+    if (!node.entries.some(e => e[0] === segs[segs.length - 1])) {
+      node.entries.push([segs[segs.length - 1], quoteVal(v)])
     }
-    const keyLit = /^[A-Za-z0-9_$]+$/.test(k) ? k : JSON.stringify(k)
-    out.push(`    ${keyLit}: '${esc(v).replace(/\\/g, '\\\\').replace(/'/g, '\\\'').replace(/\r?\n/g, '\\n')}',`)
   }
+  return root
+}
+
+function emitTree(tree, indent) {
+  const pad = ' '.repeat(indent)
+  const lines = []
+  for (const [k, v] of tree.entries) lines.push(`${pad}${quoteKey(k)}: ${v},`)
+  for (const [k, g] of tree.groups) {
+    lines.push(`${pad}${quoteKey(k)}: {`)
+    lines.push(...emitTree(g, indent + 2))
+    lines.push(`${pad}},`)
+  }
+  return lines
+}
+
+// 解析既有 ns 块 → 有序树(值为已引用的原始字面量,保持原样)
+// 返回 { tree, hadDottedEntry }:块内还存在扁平点号键时标记需重建
+function parseBlockTree(lines) {
+  const mk = () => ({ entries: [], groups: new Map() })
+  const root = mk()
+  const stack = [{ indent: 0, node: root }]
+  let hadDottedEntry = false
+  for (const raw of lines) {
+    const indent = (raw.match(/^ */) || [''])[0].length - 4
+    const ln = raw.trim()
+    const closeM = ln.match(/^\},?$/)
+    if (closeM) {
+      while (stack.length > 1 && indent <= stack[stack.length - 1].indent) stack.pop()
+      continue
+    }
+    const openM = ln.match(/^(?:"([^"]+)"|'([^']+)'|([\w$]+)): \{$/)
+    const entryM = ln.match(/^(?:"([^"]+)"|'([^']+)'|([\w$]+)): (.*)$/)
+    if (openM) {
+      const name = openM[1] ?? openM[2] ?? openM[3]
+      let g = stack[stack.length - 1].node.groups.get(name)
+      if (!g) {
+        g = mk()
+        stack[stack.length - 1].node.groups.set(name, g)
+      }
+      stack.push({ indent, node: g })
+    }
+    else if (entryM) {
+      const name = entryM[1] ?? entryM[2] ?? entryM[3]
+      // 去掉行尾逗号,保留已引用的字面量原样
+      const val = entryM[4].replace(/,\s*$/, '')
+      const node = stack[stack.length - 1].node
+      if (name.includes('.')) {
+        // 旧版扁平点号键:展开为嵌套,记为重建信号
+        hadDottedEntry = true
+        const segs = name.split('.')
+        let cur = node
+        for (let i = 0; i < segs.length - 1; i++) {
+          let g = cur.groups.get(segs[i])
+          if (!g) {
+            g = mk()
+            cur.groups.set(segs[i], g)
+          }
+          cur = g
+        }
+        if (!cur.entries.some(e => e[0] === segs[segs.length - 1])) cur.entries.push([segs[segs.length - 1], val])
+      }
+      else {
+        if (!node.entries.some(e => e[0] === name)) node.entries.push([name, val])
+      }
+    }
+  }
+  return { tree: root, hadDottedEntry }
+}
+
+// 树的全部叶子路径
+function treeLeaves(tree, prefix = '') {
+  const out = new Set()
+  for (const [k] of tree.entries) out.add(prefix ? `${prefix}.${k}` : k)
+  for (const [k, g] of tree.groups) for (const p of treeLeaves(g, prefix ? `${prefix}.${k}` : k)) out.add(p)
   return out
 }
 
+// 合并 dict 树缺失叶子到既有树(两侧值均为已引用化字面量)
+function mergeTree(existing, dictTree) {
+  let added = 0
+  for (const [k, v] of dictTree.entries) {
+    if (!existing.entries.some(e => e[0] === k)) {
+      existing.entries.push([k, v])
+      added++
+    }
+  }
+  for (const [k, g] of dictTree.groups) {
+    let sub = existing.groups.get(k)
+    if (!sub) {
+      sub = { entries: [], groups: new Map() }
+      existing.groups.set(k, sub)
+    }
+    added += mergeTree(sub, g)
+  }
+  return added
+}
+
 for (const [localeFile, isEn] of [['i18n/locales/zh-CN.ts', false], ['i18n/locales/en.ts', true]]) {
   let src = fs.readFileSync(localeFile, 'utf-8')
   let insertedTotal = 0
   for (const f of fs.readdirSync('i18n/dicts').filter(x => x.endsWith('.json') && !x.startsWith('_'))) {
     const ns = f.replace('.json', '')
     const dict = JSON.parse(fs.readFileSync(path.join('i18n/dicts', f), 'utf-8'))
-    const entries = buildEntries(ns, dict, isEn)
-    if (entries.length === 0) continue
-    const nsRe = new RegExp(`^  ${ns}: \\{`, 'm')
+    if (Object.keys(dict).length === 0) continue
+    const dictTree = toTree(dict, isEn)
+    const nsRe = new RegExp(`^  (?:${JSON.stringify(ns)}|'${ns}'|${ns}): \\{`, 'm')
     const m = src.match(nsRe)
     if (m) {
-      // 已有 ns:块首插入尚不存在的键
+      // 已有 ns:解析块 → 检查叶子 → 有缺失或存在旧扁平点号键时整块重建
       const start = m.index + m[0].length
       const end = src.indexOf('\n  },', start)
-      const block = src.slice(start, end)
-      // 键可能带引号(点号等非 \w 键由 emitter JSON.stringify 加引号)
-      const fresh = entries.filter(e => !block.includes(e.match(/ {4}"?([\w.]+)"?:/)[1] + ':'))
-      if (fresh.length) {
-        src = src.slice(0, start) + '\n' + fresh.join('\n') + src.slice(start)
-        insertedTotal += fresh.length
+      const blockLines = src.slice(start, end).split('\n').filter(l => l.trim() !== '')
+      const { tree: existingTree, hadDottedEntry } = parseBlockTree(blockLines)
+      const existingLeaves = treeLeaves(existingTree)
+      const wantLeaves = treeLeaves(dictTree)
+      const missing = [...wantLeaves].filter(l => !existingLeaves.has(l)).length
+      if (missing > 0 || hadDottedEntry) {
+        const added = mergeTree(existingTree, dictTree, isEn)
+        const rebuilt = [''].concat(emitTree(existingTree, 4))
+        src = src.slice(0, start) + rebuilt.join('\n') + src.slice(end)
+        insertedTotal += added
       }
     }
     else {
-      // 新 ns:插到文件末尾闭合前
+      // 新 ns:插到文件末尾闭合前(ns 名非合法标识符时加引号,如 team-plugins)
       const tail = src.lastIndexOf('}')
-      const block = `  ${ns}: {\n${entries.join('\n')}\n  },\n`
+      const block = `  ${quoteKey(ns)}: {\n${emitTree(dictTree, 4).join('\n')}\n  },\n`
       src = src.slice(0, tail) + block + src.slice(tail)
-      insertedTotal += entries.length
+      insertedTotal += treeLeaves(dictTree).size
     }
   }
   fs.writeFileSync(localeFile, src)