agentworkshop 0.7.65 → 0.7.70

package/server/plugins/aw-plugins.ts

@@ -42,7 +42,13 @@ export default defineNitroPlugin((nitroApp) => {
   // 见 host.mjs 的 host.packageRoot / resolveRunMode({ cwd, packageRoot }))。按真实形参给局部变量
   // 加注解即可,调用本身逐字不变。
   const hostOptions: { cwd?: string, packageRoot?: string } = { cwd: process.cwd(), packageRoot }
-  void initPluginHost(hostOptions).then((host) => {
+  void initPluginHost(hostOptions).then(async (host) => {
+    // 插件装载完成后再同步一次工具目录:覆盖 workshop 启动时插件尚未注册的工具。
+    try {
+      const { syncToolRegistry } = await import('@/server/services/workshop/tools/registry')
+      syncToolRegistry('plugin-host-ready')
+    }
+    catch { /* 目录同步失败不影响插件运行;插件变更/手动 API 会重试 */ }
     // 实际监听端口回填(nitro listen 后 ctx.api 自环 origin 才准确)。
     // nitro 的运行时 hook 类型 NitroRuntimeHooks 未声明 'listen'(nitro 2.13 的 node 预设运行时只派发
     // request/beforeResponse/afterResponse/render:*/error/close),故对一个只读视图做局部拓宽;

package/server/plugins/workshop.ts

@@ -54,6 +54,7 @@ import { configureAmlRuntime } from '../services/workshop/aml/runtime'
 import { recoverInterruptedJobs, shutdownOrchestrator } from '../services/workshop/aml/job-orchestrator'
 import { envStatus, startCreateVenv } from '../services/workshop/aml/env-manager'
 import { attachOmpPluginBridge } from '../services/workshop/agents/plugin-tools'
+import { initToolRegistrySync } from '../services/workshop/tools/registry'
 import { startAmlRetentionTimer, stopAmlRetentionTimer } from '../services/workshop/aml/retention'
 import { configureMesDatasets, defaultDatasetsDir } from '../services/workshop/mes/mes-datasets'
 import { configureAnalysisRepo } from '../services/workshop/analysis/analysis.repo'
@@ -164,6 +165,9 @@ export default function workshopPlugin(nitroApp: {
   // 全新实例未 spawn 前 kb_agent/diag_run 等插件工具会一直"未知工具")
   attachOmpPluginBridge()
 
+  // 工具目录:把内置 + 插件工具投影到 tool_registry(启动一次,之后订阅插件注册变更)
+  initToolRegistrySync()
+
   // AML 训练环境启动预热(用户规约:启动时检测 uv,有则在运行时目录 <configRoot>/aml/.venv
   // 直接创建训练环境;异步执行不阻塞启动;失败只记日志,可在「运行环境」面板重试)
   void (async () => {

package/server/plugins-builtin/diag-bridge/client.mjs

@@ -1,5 +1,6 @@
 /**
  * diag-bridge 客户端面板 —— 注入 'plugins.page' 插槽。
+ * 连接检测(调 /health,含用户配置 token 的实测三态,结构化渲染) +
  * 诊断记录表(runId/产线/状态/评分/入库/报告),30s 自动刷新,语言切换即重渲染;
  * 已完成诊断可点「报告」在线查看 report md 全文(经 /report 路由代理诊断服务)。
  */
@@ -11,15 +12,26 @@ export function setup(ctx) {
       .aw-diag-toolbar { display:flex; justify-content:flex-end; }
       .aw-diag-btn { padding:4px 12px; border:1px solid color-mix(in srgb, currentColor 28%, transparent); border-radius:7px; background:transparent; color:inherit; cursor:pointer; }
       .aw-diag-btn:disabled { opacity:.45; cursor:default; }
-      .aw-diag-table { width:100%; border-collapse:collapse; }
-      .aw-diag-table th, .aw-diag-table td { text-align:left; padding:5px 8px; border-bottom:1px solid color-mix(in srgb, currentColor 10%, transparent); }
+      .aw-diag-table-wrap { overflow-x: auto; -webkit-overflow-scrolling: touch; }
+      .aw-diag-table { width:100%; border-collapse:collapse; min-width:540px; }
+      .aw-diag-table th, .aw-diag-table td { text-align:left; padding:5px 8px; border-bottom:1px solid color-mix(in srgb, currentColor 10%, transparent); white-space:nowrap; }
       .aw-diag-table th { opacity:.65; font-weight:500; }
       .aw-diag-st { display:inline-flex; align-items:center; gap:5px; }
       .aw-diag-dot { width:8px; height:8px; border-radius:50%; display:inline-block; }
       .aw-diag-dot-running { background:#41c8f4; }
       .aw-diag-dot-completed { background:#35e0a0; }
       .aw-diag-dot-failed, .aw-diag-dot-stopped { background:#e05a5a; }
+      .aw-diag-dot-na { background:#9aa4ad; }
       .aw-diag-empty { opacity:.6; padding:8px 0; }
+      .aw-diag-status { display:flex; gap:12px; align-items:center; flex-wrap:wrap; }
+      .aw-diag-check { padding:8px 10px; border:1px dashed color-mix(in srgb, currentColor 20%, transparent); border-radius:8px; display:flex; flex-direction:column; gap:5px; }
+      /* 未检测前不渲染空虚线框 */
+      .aw-diag-check:has(> .aw-diag-check-rows:empty) { display:none; }
+      .aw-diag-check-rows { display:flex; flex-direction:column; gap:3px; }
+      .aw-diag-check-row { display:flex; gap:6px; align-items:baseline; flex-wrap:wrap; }
+      .aw-diag-check-k { opacity:.65; min-width:86px; }
+      .aw-diag-check-err { color:#e05a5a; }
+      .aw-diag-check-ok { color:#35e0a0; }
       .aw-diag-modal { position:fixed; inset:0; z-index:9999; background:rgba(0,0,0,.55); display:flex; align-items:center; justify-content:center; }
       .aw-diag-modal-box { width:min(860px, 92vw); max-height:84vh; display:flex; flex-direction:column; gap:8px; background:var(--aw-bg, #101826); color:inherit; border:1px solid color-mix(in srgb, currentColor 22%, transparent); border-radius:12px; padding:14px 16px; }
       .aw-diag-modal-head { display:flex; align-items:center; justify-content:space-between; gap:12px; font-weight:600; }
@@ -34,12 +46,103 @@ export function setup(ctx) {
     order: 20,
     mount(el) {
       const t = k => ctx.t(`panel.${k}`)
-      const timer = setInterval(load, 30_000)
+      const timer = setInterval(() => {
+        void load()
+        void refreshStatus()
+      }, 30_000)
       const table = ctx.el('div', { class: 'aw-diag-table-wrap' })
+
+      function dot(ok, na = false) {
+        return ctx.el('span', {
+          class: `aw-diag-dot ${na ? 'aw-diag-dot-na' : ok ? 'aw-diag-dot-completed' : 'aw-diag-dot-failed'}`,
+          title: na ? t('tokenUnknown') : ok ? t('ok') : t('bad'),
+        })
+      }
+
+      // ---- 连接状态行(30s 轮询) + 「检测连接」显式检测(宿主后端会拿用户配置的 token 实测受保护端点) ----
+      const remoteCell = ctx.el('span', { class: 'aw-diag-st' }, [dot(false), ` ${t('remote')}: -`])
+      const tokenCell = ctx.el('span', { class: 'aw-diag-st' }, [dot(false, true), ` ${t('tokenCfg')}: -`])
+      const engineCell = ctx.el('span', { class: 'aw-diag-st faint' }, [` ${t('engine')}: -`])
+      const statusRow = ctx.el('div', { class: 'aw-diag-status' }, [remoteCell, tokenCell, engineCell])
+
+      const checkBtn = ctx.el('button', { class: 'aw-diag-btn' }, [t('checkBtn')])
+      const checkRows = ctx.el('div', { class: 'aw-diag-check-rows' })
+      const checkBox = ctx.el('div', { class: 'aw-diag-check' }, [checkRows])
+      checkBtn.addEventListener('click', () => void runCheck())
+
+      /** 检测明细行:true 绿 / false 红 / null 灰 */
+      function checkRow(label, okState, value) {
+        const val = ctx.el('span')
+        for (const seg of (Array.isArray(value) ? value : [{ text: String(value) }])) {
+          val.append(ctx.el('span', { class: seg.cls ?? '' }, [String(seg.text)]))
+        }
+        return ctx.el('div', { class: 'aw-diag-check-row' }, [
+          ctx.el('span', { class: 'aw-diag-check-k' }, [label]),
+          dot(okState === true, okState == null),
+          val,
+        ])
+      }
+
+      /** token 三态文案 */
+      const tokenText = tk => !tk?.configured
+        ? t('tokenNone')
+        : tk?.accepted === true ? t('tokenAccepted') : tk?.accepted === false ? t('tokenRejected') : t('tokenUnknown')
+
+      async function runCheck() {
+        checkBtn.disabled = true
+        checkBtn.textContent = t('checking')
+        const t0 = Date.now()
+        const h = await ctx.fetch('/api/plugins/diag-bridge/health').catch(() => null)
+        const ms = Date.now() - t0
+        const rows = []
+        if (!h) {
+          rows.push(checkRow(t('checkBtn'), false, [{ text: t('checkFail'), cls: 'aw-diag-check-err' }]))
+        }
+        else {
+          const remote = h?.remote ?? {}
+          const rOk = remote?.status === 'ok'
+          rows.push(checkRow(t('remote'), rOk, [
+            { text: `${h?.base ?? '-'} · ${remote?.status ?? '-'}`, cls: rOk ? '' : 'aw-diag-check-err' },
+            ...(remote?.auth ? [{ text: ` · auth=${remote.auth}`, cls: /被拒|401|403/.test(String(remote.auth)) ? 'aw-diag-check-err' : '' }] : []),
+            ...(remote?.error ? [{ text: ` · ${remote.error}`, cls: 'aw-diag-check-err' }] : []),
+          ]))
+          const tk = h?.token ?? {}
+          rows.push(checkRow(t('tokenCfg'), tk?.configured ? tk?.accepted : null,
+            [{ text: tokenText(tk), cls: tk?.accepted === false ? 'aw-diag-check-err' : '' },
+              ...(tk?.hint ? [{ text: ` · ${tk.hint}`, cls: 'aw-diag-check-err' }] : []),
+              ...(h?.auth ? [{ text: ` · ${h.auth === 'bearer' ? t('bearer') : t('anonymous')}` }] : [])]))
+          rows.push(checkRow(t('engine'), true, [{ text: String(h?.harness ?? '-') }]))
+          const by = h?.runs?.byStatus ?? {}
+          rows.push(checkRow(t('runs'), true, [{ text: `${h?.runs?.total ?? 0} (completed ${by.completed ?? 0} / running ${by.running ?? 0} / failed ${by.failed ?? 0})` }]))
+          const allOk = rOk && tk?.accepted !== false
+          rows.push(ctx.el('div', { class: 'aw-diag-check-row' }, [
+            ctx.el('span', { class: allOk ? 'aw-diag-check-ok' : 'aw-diag-check-err' },
+              [allOk ? `✔ ${t('allOk')}` : `✖ ${t('allBad')}`]),
+            ctx.el('span', { class: 'faint' }, [` · ${t('latency')} ${ms}ms`]),
+          ]))
+        }
+        checkRows.replaceChildren(...rows)
+        checkBtn.disabled = false
+        checkBtn.textContent = t('checkBtn')
+      }
+
+      async function refreshStatus() {
+        const h = await ctx.fetch('/api/plugins/diag-bridge/health').catch(() => null)
+        const remote = h?.remote ?? {}
+        const rOk = remote?.status === 'ok'
+        remoteCell.replaceChildren(dot(rOk), ` ${t('remote')}: ${remote?.status ?? '-'}${remote?.auth ? `(${remote.auth})` : ''}`)
+        const tk = h?.token ?? {}
+        tokenCell.replaceChildren(dot(tk?.configured ? tk?.accepted === true : false, !tk?.configured), ` ${t('tokenCfg')}: ${tokenText(tk)}`)
+        engineCell.replaceChildren(` ${t('engine')}: ${h?.harness ?? '-'}`)
+      }
+
       el.append(ctx.el('div', { class: 'aw-diag' }, [
+        statusRow,
         ctx.el('div', { class: 'aw-diag-toolbar' }, [
+          checkBtn,
           ctx.el('button', { class: 'aw-diag-btn', onclick: () => void load() }, [t('refresh')]),
         ]),
+        checkBox,
         table,
       ]))
 
@@ -121,8 +224,12 @@ export function setup(ctx) {
       }
 
       void load()
+      void refreshStatus()
       // 语言切换 → 重渲染(标题由插槽响应式解析,表格文案在此重取)
-      const offLocale = ctx.hooks.on('i18n:changed', () => void load())
+      const offLocale = ctx.hooks.on('i18n:changed', () => {
+        void load()
+        void refreshStatus()
+      })
       return () => {
         clearInterval(timer)
         offLocale()

package/server/plugins-builtin/diag-bridge/host/diagnosis.mjs

@@ -1,75 +1,82 @@
-/**
- * 启动一次诊断(建运行记录 / 调 harness / 落 KV)
- * (由 server/plugins-builtin/diag-bridge/index.mjs 按职责拆出;内容逐行原文搬运)
- */
-import { baseOf, harnessOf, jpost, maxMinutesOf, maxTurnsOf, runKey, runningOfLine, short } from './helpers.mjs'
-import { snapshotCore } from './snapshot.mjs'
-import { startingLines } from './constants.mjs'
-import { defaultQuestionFor, resolveBridgeIntent } from './intents.mjs'
-
-export async function startDiagnosis(ctx, { line, fromMs, toMs, question, scene, source, dataPath, dataPaths, harness, agentId, channelId, analysisIntent, model, permissionMode }) {
-  const base = baseOf(ctx)
-  if (!base) return { ok: false, error: 'diag.base_url 非法(仅允许 http/https 且 host 为 127.0.0.1/localhost)。' }
-  const intent = resolveBridgeIntent(analysisIntent)
-  if (analysisIntent && String(analysisIntent).trim() && !intent) {
-    return { ok: false, error: `未知分析意图: ${String(analysisIntent)}(支持 deep-diagnosis/stability-report/quick-screen/doe-analysis/experience-mining/optimizer-campaign)` }
-  }
-  if (startingLines.has(line)) return { ok: false, error: `产线 ${line} 已有诊断正在启动,请稍后再试。` }
-  const existing = runningOfLine(ctx, line)
-  if (existing) return { ok: false, error: `产线 ${line} 已有运行中的诊断(run_id=${existing.id}),请稍后用 diag_status 查询。` }
-  startingLines.add(line)
-  try {
-    let snap = { ok: true, csvPath: '', rows: 0, nodes: 0 }
-    if (!dataPath && !(Array.isArray(dataPaths) && dataPaths.length > 0)) {
-      snap = await snapshotCore(ctx, line, fromMs, toMs)
-      if (!snap.ok) return { ok: false, error: snap.error }
-    }
-    // 按情景注入业务提示词:调用方显式 question 优先,否则用意图目录的模板(分析语义在此,执行解耦在 IDD)
-    const q = question || defaultQuestionFor(intent, { line, fromMs, toMs })
-    const sceneName = scene || `${line}_diag`
-    // v2.1:统一走 IDD 任务管理面 /api/diagnosis/tasks——接收即返 task_id,
-    // 诊断在 IDD 后台线程执行(内部 start+execute),Channel 绝不等待。
-    // v2.2:dataPaths(多文件,manifest 首位)走 IDD multi 模式;harness 可按次覆盖。
-    const payload = Array.isArray(dataPaths) && dataPaths.length > 0
-      ? { dataPaths }
-      : { dataPath: dataPath || snap.csvPath }
-    const started = await jpost(ctx, `${base}/api/diagnosis/tasks`, {
-      ...payload,
-      sceneName,
-      userQuestion: q,
-      harness: harness || harnessOf(ctx), // 缺省落 claude 引擎会因无 key 失败,必须显式(系统配置 plugins.diag-bridge.harness → kv → omp;diag_run 可按次覆盖)
-      ...(intent && intent !== 'deep-diagnosis' ? { analysisIntent: intent } : {}), // 分析意图透传(缺省意图不传,由 IDD 兜底)
-      ...(model ? { model: String(model) } : {}), // 引擎模型按次覆盖(合法性由 IDD validateEngineOption 校验,不合法 400)
-      ...(permissionMode ? { permissionMode: String(permissionMode) } : {}),
-      enhancement: 'off',
-      reportLanguage: 'zh',
-      maxTurns: maxTurnsOf(ctx), // 修复循环会加转数;150 不够走完全管线
-      timeoutMinutes: maxMinutesOf(ctx),
-    })
-    const runId = String(started.data?.task_id ?? started.data?.runId ?? '')
-    const name = String(started.data?.name ?? '')
-    if (!runId) return { ok: false, error: `tasks 响应缺少 data.task_id: ${short(started)}` }
-    ctx.kv.set(runKey(runId), {
-      line, fromMs, toMs, question: q, scene: sceneName,
-      intent: intent || 'deep-diagnosis',
-      status: 'running', createdAt: Date.now(), source,
-      csvPath: snap.csvPath,
-      files: Array.isArray(dataPaths) ? dataPaths.length : 0,
-      name,
-      // 归因:发起 Agent 完成后的结果回执靠它寻址(平台通告面 deliver)
-      agentId: agentId || '', channelId: channelId || '',
-    })
-    return { ok: true, runId, name, csvPath: snap.csvPath, rows: snap.rows, nodes: snap.nodes, files: Array.isArray(dataPaths) ? dataPaths.length : 0, intent: intent || 'deep-diagnosis', question: q }
-  }
-  catch (err) {
-    return { ok: false, error: `发起诊断失败: ${err?.message ?? err}` }
-  }
-  finally {
-    startingLines.delete(line)
-  }
-}
-
-// ── 轮询器:15s 扫描 kv 中 running 的 run → 更新状态 ──────────────────────
-// v2.1:入库不再由本插件自动执行(web documents/create 旧两步管线已移除)。
-// 完成后的协调契约:Channel 空闲时用 diag_status 查询 → 拿到 诊断总结+报告 md
-// 路径 → 由 Agent 调用 rag-bridge 的 kb_agent(mode=async) 把报告入库知识库。
+/**
+ * 启动一次诊断(建运行记录 / 调 harness / 落 KV)
+ * (由 server/plugins-builtin/diag-bridge/index.mjs 按职责拆出;内容逐行原文搬运)
+ */
+import { baseOf, harnessOf, jpost, maxMinutesOf, maxTurnsOf, runKey, runningOfLine, short } from './helpers.mjs'
+import { snapshotCore } from './snapshot.mjs'
+import { startingLines } from './constants.mjs'
+import { defaultQuestionFor, resolveBridgeIntent } from './intents.mjs'
+
+export async function startDiagnosis(ctx, { line, fromMs, toMs, question, scene, source, dataPath, dataPaths, harness, agentId, channelId, analysisIntent, model, permissionMode }) {
+  const base = baseOf(ctx)
+  if (!base) return { ok: false, error: 'diag.base_url 非法(仅允许 http/https 且 host 为 127.0.0.1/localhost)。' }
+  const intent = resolveBridgeIntent(analysisIntent)
+  if (analysisIntent && String(analysisIntent).trim() && !intent) {
+    return { ok: false, error: `未知分析意图: ${String(analysisIntent)}(支持 deep-diagnosis/stability-report/quick-screen/doe-analysis/experience-mining/optimizer-campaign)` }
+  }
+  if (startingLines.has(line)) return { ok: false, error: `产线 ${line} 已有诊断正在启动,请稍后再试。` }
+  const existing = runningOfLine(ctx, line)
+  if (existing) return { ok: false, error: `产线 ${line} 已有运行中的诊断(run_id=${existing.id}),请稍后用 diag_status 查询。` }
+  startingLines.add(line)
+  try {
+    let snap = { ok: true, csvPath: '', rows: 0, nodes: 0 }
+    if (!dataPath && !(Array.isArray(dataPaths) && dataPaths.length > 0)) {
+      snap = await snapshotCore(ctx, line, fromMs, toMs)
+      if (!snap.ok) return { ok: false, error: snap.error }
+    }
+    // 按情景注入业务提示词:调用方显式 question 优先,否则用意图目录的模板(分析语义在此,执行解耦在 IDD)
+    const q = question || defaultQuestionFor(intent, { line, fromMs, toMs })
+    const sceneName = scene || `${line}_diag`
+    // v2.1:统一走 IDD 任务管理面 /api/diagnosis/tasks——接收即返 task_id,
+    // 诊断在 IDD 后台线程执行(内部 start+execute),Channel 绝不等待。
+    // v2.2:dataPaths(多文件,manifest 首位)走 IDD multi 模式;harness 可按次覆盖。
+    const payload = Array.isArray(dataPaths) && dataPaths.length > 0
+      ? { dataPaths }
+      : { dataPath: dataPath || snap.csvPath }
+    const started = await jpost(ctx, `${base}/api/diagnosis/tasks`, {
+      ...payload,
+      sceneName,
+      userQuestion: q,
+      harness: harness || harnessOf(ctx), // 缺省落 claude 引擎会因无 key 失败,必须显式(系统配置 plugins.diag-bridge.harness → kv → omp;diag_run 可按次覆盖)
+      ...(intent && intent !== 'deep-diagnosis' ? { analysisIntent: intent } : {}), // 分析意图透传(缺省意图不传,由 IDD 兜底)
+      ...(model ? { model: String(model) } : {}), // 引擎模型按次覆盖(合法性由 IDD validateEngineOption 校验,不合法 400)
+      ...(permissionMode ? { permissionMode: String(permissionMode) } : {}),
+      enhancement: 'off',
+      reportLanguage: 'zh',
+      maxTurns: maxTurnsOf(ctx), // 修复循环会加转数;150 不够走完全管线
+      timeoutMinutes: maxMinutesOf(ctx),
+    })
+    const runId = String(started.data?.task_id ?? started.data?.runId ?? '')
+    const name = String(started.data?.name ?? '')
+    if (!runId) return { ok: false, error: `tasks 响应缺少 data.task_id: ${short(started)}` }
+    // 采用 IDD ack 的真实初始态:队列满时是 queued,触发失败时是 failed。
+    // 此前一律写 running —— queued 被 sweep 的 running 过滤条件丢弃,自动回执永久丢失。
+    const ackStatus = String(started.data?.status ?? '').toLowerCase()
+    if (ackStatus === 'failed') {
+      return { ok: false, error: `诊断任务已受理但立即失败(run_id=${runId}):${started.data?.error ?? started.data?.result?.error ?? 'IDD 未返回原因'}` }
+    }
+    const initialStatus = ['queued', 'running'].includes(ackStatus) ? ackStatus : 'running'
+    ctx.kv.set(runKey(runId), {
+      line, fromMs, toMs, question: q, scene: sceneName,
+      intent: intent || 'deep-diagnosis',
+      status: initialStatus, createdAt: Date.now(), source,
+      csvPath: snap.csvPath,
+      files: Array.isArray(dataPaths) ? dataPaths.length : 0,
+      name,
+      // 归因:发起 Agent 完成后的结果回执靠它寻址(平台通告面 deliver)
+      agentId: agentId || '', channelId: channelId || '',
+    })
+    return { ok: true, runId, name, status: initialStatus, csvPath: snap.csvPath, rows: snap.rows, nodes: snap.nodes, files: Array.isArray(dataPaths) ? dataPaths.length : 0, intent: intent || 'deep-diagnosis', question: q }
+  }
+  catch (err) {
+    return { ok: false, error: `发起诊断失败: ${err?.message ?? err}` }
+  }
+  finally {
+    startingLines.delete(line)
+  }
+}
+
+// ── 轮询器:15s 扫描 kv 中 running 的 run → 更新状态 ──────────────────────
+// v2.1:入库不再由本插件自动执行(web documents/create 旧两步管线已移除)。
+// 完成后的协调契约:Channel 空闲时用 diag_status 查询 → 拿到 诊断总结+报告 md
+// 路径 → 由 Agent 调用 rag-bridge 的 kb_agent(mode=async) 把报告入库知识库。

package/server/plugins-builtin/diag-bridge/host/helpers.mjs

@@ -1,126 +1,129 @@
-/**
- * 基址与令牌解析 / JSON 请求 / 规则解析 / CSV 与数值格式化
- * (由 server/plugins-builtin/diag-bridge/index.mjs 按职责拆出;内容逐行原文搬运)
- */
-import { DEFAULT_BASE } from './constants.mjs'
-
-export function baseOf(ctx) {
-  const raw = String(ctx.config?.get?.('plugins.diag-bridge.base_url') || ctx.kv.get('diag.base_url') || DEFAULT_BASE).trim()
-  try {
-    const u = new URL(raw)
-    const okProto = u.protocol === 'http:' || u.protocol === 'https:'
-    const okHost = u.hostname === '127.0.0.1' || u.hostname === 'localhost'
-    if (!okProto || !okHost) return null
-    return raw.replace(/\/+$/, '')
-  }
-  catch {
-    return null
-  }
-}
-
-/** 诊断服务鉴权 token(系统配置 plugins.diag-bridge.token 优先,kv diag.token 兜底;空=匿名)。
- *  诊断服务 v4 起默认强制 Bearer(AUTH_ENABLED!==0),401 AUTH_REQUIRED 时先查这里。 */
-export function diagTokenOf(ctx) {
-  return String(ctx.config?.get?.('plugins.diag-bridge.token') || ctx.kv.get('diag.token') || '').trim()
-}
-
-export function authHeadersOf(ctx) {
-  const t = diagTokenOf(ctx)
-  return t ? { authorization: `Bearer ${t}` } : {}
-}
-
-// ── 配置读取(系统配置优先,kv 兜底;前端全局设置→运行配置→插件组可改,保存即热生效) ──
-
-export const harnessOf = ctx => String(ctx.config?.get?.('plugins.diag-bridge.harness') || ctx.kv.get('diag.harness') || 'omp')
-export const maxTurnsOf = ctx => Number(ctx.config?.get?.('plugins.diag-bridge.max_turns')) || Number(ctx.kv.get('diag.max_turns')) || 220
-export const maxMinutesOf = ctx => Number(ctx.config?.get?.('plugins.diag-bridge.max_minutes')) || Number(ctx.kv.get('diag.max_minutes')) || 40
-/** 自动诊断开关:系统配置布尔或 kv 'true'(kv 为历史字符串语义) */
-export const autoEnabledOf = ctx => ctx.config?.get?.('plugins.diag-bridge.auto_enabled') === true || ctx.kv.get('auto_diag_enabled') === 'true'
-export const autoRulesOf = ctx => String(ctx.config?.get?.('plugins.diag-bridge.auto_rules') || ctx.kv.get('auto_rules') || '')
-
-export const runKey = id => `run:${id}`
-
-/** kv 中全部 run 记录 → [{ id, meta }] */
-export function kvRuns(ctx) {
-  const out = []
-  for (const [k, v] of Object.entries(ctx.kv.all())) {
-    if (k.startsWith('run:') && v && typeof v === 'object') out.push({ id: k.slice(4), meta: v })
-  }
-  return out
-}
-
-/** 该产线是否有运行中的诊断 */
-export function runningOfLine(ctx, line) {
-  return kvRuns(ctx).find(r => r.meta?.status === 'running' && r.meta?.line === line) ?? null
-}
-
-/** 短 JSON 摘要(错误信息用) */
-export function short(body) {
-  try {
-    return JSON.stringify(body).slice(0, 200)
-  }
-  catch {
-    return String(body)
-  }
-}
-
-/** 401 时给可操作的修复指引(生产最常见故障:会话 token 随诊断服务重启失效) */
-export function authHint(status, msg) {
-  if (status !== 401) return msg
-  return `${msg};修复:在 系统设置→运行配置→插件 更新「诊断 API Token」(推荐使用诊断服务侧的持久化 API Token,idd_ 前缀,服务重启不失效)`
-}
-
-/** JSON GET:断言 HTTP ok 且 body.success===true,返回 body */
-export async function jget(ctx, url, timeoutMs = 8000) {
-  const res = await ctx.http.get(url, { timeoutMs, headers: authHeadersOf(ctx) })
-  const body = await res.json().catch(() => null)
-  if (!res.ok) throw new Error(authHint(res.status, `HTTP ${res.status} ${short(body)}`))
-  if (!body || body.success !== true) throw new Error(`success!=true ${short(body)}`)
-  return body
-}
-
-/** JSON POST:断言 HTTP ok 且 body.success===true,返回 body(extraHeaders 供 KB 端点叠加鉴权) */
-export async function jpost(ctx, url, body, timeoutMs = 15000, extraHeaders = {}) {
-  const res = await ctx.http.post(url, body, { timeoutMs, headers: { ...authHeadersOf(ctx), ...extraHeaders } })
-  const out = await res.json().catch(() => null)
-  if (!res.ok) throw new Error(authHint(res.status, `HTTP ${res.status} ${short(out)}`))
-  if (!out || out.success !== true) throw new Error(`success!=true ${short(out)}`)
-  return out
-}
-
-/** 解析 auto_rules(kv 存 JSON 字符串 {nodeId:{op:'gt'|'lt',value}}) */
-export function parseAutoRules(raw) {
-  if (!raw) return {}
-  try {
-    const obj = typeof raw === 'string' ? JSON.parse(raw) : raw
-    return obj && typeof obj === 'object' ? obj : {}
-  }
-  catch {
-    return {}
-  }
-}
-
-/** CSV 单元格转义(含逗号/引号/换行时加引号) */
-export function csvCell(v) {
-  const s = String(v)
-  return /[",\r\n]/.test(s) ? `"${s.replace(/"/g, '""')}"` : s
-}
-
-/** 数值格式化(保留 6 位小数,去尾零;非有限值 → 空) */
-export function fmtNum(v) {
-  if (typeof v !== 'number' || !Number.isFinite(v)) return ''
-  return String(Math.round(v * 1e6) / 1e6)
-}
-
-/** 快照文件名(ASCII 安全,避免 multipart filename 编码问题) */
-export function safeName(line, toMs) {
-  const s = String(line).replace(/[^A-Za-z0-9._-]+/g, '_').replace(/^_+|_+$/g, '').slice(0, 40) || 'line'
-  return `snap-${s}-${toMs}.csv`
-}
-
-// ── 快照导出器 ───────────────────────────────────────────────────────────
-
-/**
- * 导出产线时窗快照:daq 节点过滤 → 时序查询 → 时间戳 pivot → CSV → multipart 上传。
- * 成功返回 { ok:true, csvPath, rows, nodes, fromMs, toMs };失败返回 { ok:false, error }。
- */
+/**
+ * 基址与令牌解析 / JSON 请求 / 规则解析 / CSV 与数值格式化
+ * (由 server/plugins-builtin/diag-bridge/index.mjs 按职责拆出;内容逐行原文搬运)
+ */
+import { DEFAULT_BASE } from './constants.mjs'
+
+export function baseOf(ctx) {
+  const raw = String(ctx.config?.get?.('plugins.diag-bridge.base_url') || ctx.kv.get('diag.base_url') || DEFAULT_BASE).trim()
+  try {
+    const u = new URL(raw)
+    const okProto = u.protocol === 'http:' || u.protocol === 'https:'
+    const okHost = u.hostname === '127.0.0.1' || u.hostname === 'localhost'
+    if (!okProto || !okHost) return null
+    return raw.replace(/\/+$/, '')
+  }
+  catch {
+    return null
+  }
+}
+
+/** 诊断服务鉴权 token(系统配置 plugins.diag-bridge.token 优先,kv diag.token 兜底;空=匿名)。
+ *  诊断服务 v4 起默认强制 Bearer(AUTH_ENABLED!==0),401 AUTH_REQUIRED 时先查这里。 */
+export function diagTokenOf(ctx) {
+  return String(ctx.config?.get?.('plugins.diag-bridge.token') || ctx.kv.get('diag.token') || '').trim()
+}
+
+export function authHeadersOf(ctx) {
+  const t = diagTokenOf(ctx)
+  return t ? { authorization: `Bearer ${t}` } : {}
+}
+
+// ── 配置读取(系统配置优先,kv 兜底;前端全局设置→运行配置→插件组可改,保存即热生效) ──
+
+export const harnessOf = ctx => String(ctx.config?.get?.('plugins.diag-bridge.harness') || ctx.kv.get('diag.harness') || 'omp')
+export const maxTurnsOf = ctx => Number(ctx.config?.get?.('plugins.diag-bridge.max_turns')) || Number(ctx.kv.get('diag.max_turns')) || 220
+export const maxMinutesOf = ctx => Number(ctx.config?.get?.('plugins.diag-bridge.max_minutes')) || Number(ctx.kv.get('diag.max_minutes')) || 40
+/** 自动诊断开关:系统配置布尔或 kv 'true'(kv 为历史字符串语义) */
+export const autoEnabledOf = ctx => ctx.config?.get?.('plugins.diag-bridge.auto_enabled') === true || ctx.kv.get('auto_diag_enabled') === 'true'
+export const autoRulesOf = ctx => String(ctx.config?.get?.('plugins.diag-bridge.auto_rules') || ctx.kv.get('auto_rules') || '')
+
+export const runKey = id => `run:${id}`
+
+/** kv 中全部 run 记录 → [{ id, meta }] */
+export function kvRuns(ctx) {
+  const out = []
+  for (const [k, v] of Object.entries(ctx.kv.all())) {
+    if (k.startsWith('run:') && v && typeof v === 'object') out.push({ id: k.slice(4), meta: v })
+  }
+  return out
+}
+
+/** 未终态(仍占用产线单飞锁):queued 与 running 同等对待 */
+export const ACTIVE_RUN_STATUSES = new Set(['queued', 'running'])
+
+/** 该产线是否有未终态的诊断(queued 也占用,否则同线会并发两个任务) */
+export function runningOfLine(ctx, line) {
+  return kvRuns(ctx).find(r => ACTIVE_RUN_STATUSES.has(r.meta?.status) && r.meta?.line === line) ?? null
+}
+
+/** 短 JSON 摘要(错误信息用) */
+export function short(body) {
+  try {
+    return JSON.stringify(body).slice(0, 200)
+  }
+  catch {
+    return String(body)
+  }
+}
+
+/** 401 时给可操作的修复指引(生产最常见故障:会话 token 随诊断服务重启失效) */
+export function authHint(status, msg) {
+  if (status !== 401) return msg
+  return `${msg};修复:在 系统设置→运行配置→插件 更新「诊断 API Token」(推荐使用诊断服务侧的持久化 API Token,idd_ 前缀,服务重启不失效)`
+}
+
+/** JSON GET:断言 HTTP ok 且 body.success===true,返回 body */
+export async function jget(ctx, url, timeoutMs = 8000) {
+  const res = await ctx.http.get(url, { timeoutMs, headers: authHeadersOf(ctx) })
+  const body = await res.json().catch(() => null)
+  if (!res.ok) throw new Error(authHint(res.status, `HTTP ${res.status} ${short(body)}`))
+  if (!body || body.success !== true) throw new Error(`success!=true ${short(body)}`)
+  return body
+}
+
+/** JSON POST:断言 HTTP ok 且 body.success===true,返回 body(extraHeaders 供 KB 端点叠加鉴权) */
+export async function jpost(ctx, url, body, timeoutMs = 15000, extraHeaders = {}) {
+  const res = await ctx.http.post(url, body, { timeoutMs, headers: { ...authHeadersOf(ctx), ...extraHeaders } })
+  const out = await res.json().catch(() => null)
+  if (!res.ok) throw new Error(authHint(res.status, `HTTP ${res.status} ${short(out)}`))
+  if (!out || out.success !== true) throw new Error(`success!=true ${short(out)}`)
+  return out
+}
+
+/** 解析 auto_rules(kv 存 JSON 字符串 {nodeId:{op:'gt'|'lt',value}}) */
+export function parseAutoRules(raw) {
+  if (!raw) return {}
+  try {
+    const obj = typeof raw === 'string' ? JSON.parse(raw) : raw
+    return obj && typeof obj === 'object' ? obj : {}
+  }
+  catch {
+    return {}
+  }
+}
+
+/** CSV 单元格转义(含逗号/引号/换行时加引号) */
+export function csvCell(v) {
+  const s = String(v)
+  return /[",\r\n]/.test(s) ? `"${s.replace(/"/g, '""')}"` : s
+}
+
+/** 数值格式化(保留 6 位小数,去尾零;非有限值 → 空) */
+export function fmtNum(v) {
+  if (typeof v !== 'number' || !Number.isFinite(v)) return ''
+  return String(Math.round(v * 1e6) / 1e6)
+}
+
+/** 快照文件名(ASCII 安全,避免 multipart filename 编码问题) */
+export function safeName(line, toMs) {
+  const s = String(line).replace(/[^A-Za-z0-9._-]+/g, '_').replace(/^_+|_+$/g, '').slice(0, 40) || 'line'
+  return `snap-${s}-${toMs}.csv`
+}
+
+// ── 快照导出器 ───────────────────────────────────────────────────────────
+
+/**
+ * 导出产线时窗快照:daq 节点过滤 → 时序查询 → 时间戳 pivot → CSV → multipart 上传。
+ * 成功返回 { ok:true, csvPath, rows, nodes, fromMs, toMs };失败返回 { ok:false, error }。
+ */