agentworkshop 0.7.52 → 0.7.54

package/server/services/workshop/mes/mes-datasets.ts

@@ -0,0 +1,441 @@
+/**
+ * MES CSV 数据集服务 —— mes-rest 节点历史取数的落盘事实源。
+ *
+ * 定位(铁律:MES 原文不进 prompt):Agent 经 mes_fetch 取历史数据时,
+ * 行级原文只写进 <configRoot>/datasets/<dataset_id>.csv(表头 ts,value;RFC4180 转义;UTF-8),
+ * 工具回包只给 stats + ≤3 行采样。取数作业 = **进程内异步执行**(createFetchJob 里
+ * `void run()` 即返,绝不进任何调度循环);账本落 mes_fetch_jobs / mes_datasets 两表。
+ *
+ * 驱动边界:本模块不 import mes-rest.ts(并行工作流实现中),只经 resolveDcwDriver('mes-rest')
+ * 取既有 DcwWriteDriver 的可选 fetchHistory 原语(结构化本地声明,签名与驱动面约定一致)。
+ */
+import { createHash, randomUUID } from 'node:crypto'
+import { closeSync, existsSync, mkdirSync, openSync, readFileSync, writeSync } from 'node:fs'
+import { dirname, join, resolve } from 'node:path'
+import type { DatabaseSync } from 'node:sqlite'
+import type { DcwWriteDriver } from '../dcw/drivers/shared'
+import { resolveDcwDriver } from '../dcw/drivers'
+import { AppError, ErrorCodes } from '../../../utils/errors'
+
+// ============================================================
+// 驱动历史原语(本地结构化声明;不 import 驱动实现)
+// ============================================================
+
+/** 历史行(时间戳 ISO + 工程量数值) */
+export interface DcwHistoryRow { ts: string, value: number }
+
+export interface DcwFetchHistoryInput {
+  driverConfig: Record<string, unknown>
+  fromIso: string
+  toIso: string
+  maxRows: number
+  onRows: (rows: DcwHistoryRow[]) => Promise<void> | void
+}
+
+export interface DcwFetchHistoryResult { rows: number, complete: boolean }
+
+/** mes-rest 写驱动的本模块视角(既有 DcwWriteDriver + 可选 fetchHistory;kind 放宽为 string,便于测试注入假驱动) */
+export type MesHistoryDriver = Omit<DcwWriteDriver, 'kind'> & {
+  kind: string
+  fetchHistory?(input: DcwFetchHistoryInput): Promise<DcwFetchHistoryResult>
+}
+
+// ============================================================
+// CSV 原语(RFC4180:引号/逗号/换行转义;CRLF 行结束;UTF-8)
+// ============================================================
+
+/** 单字段转义:含 引号/逗号/CR/LF 时加引号并把内部引号翻倍 */
+export function csvEscapeField(v: string): string {
+  return /[",\r\n]/.test(v) ? `"${v.replace(/"/g, '""')}"` : v
+}
+
+/** 一行数据:ts,value(value 非数值写空串,统计侧跳过) */
+export function csvLineOf(ts: string, value: number): string {
+  const v = Number.isFinite(value) ? String(value) : ''
+  return `${csvEscapeField(ts)},${v}`
+}
+
+/** RFC4180 行解析(支持引号内逗号/双引号转义;单行内不含裸换行) */
+export function parseCsvLine(line: string): string[] {
+  const out: string[] = []
+  let cur = ''
+  let inQuotes = false
+  for (let i = 0; i < line.length; i++) {
+    const c = line[i]!
+    if (inQuotes) {
+      if (c === '"') {
+        if (line[i + 1] === '"') {
+          cur += '"'
+          i++
+        }
+        else inQuotes = false
+      }
+      else cur += c
+    }
+    else if (c === '"') inQuotes = true
+    else if (c === ',') {
+      out.push(cur)
+      cur = ''
+    }
+    else cur += c
+  }
+  out.push(cur)
+  return out
+}
+
+// ============================================================
+// 行类型
+// ============================================================
+
+export interface MesDatasetRow {
+  id: string
+  lineId: string
+  nodeId: string
+  nodeName: string
+  fromTs: string | null
+  toTs: string | null
+  rows: number
+  sha256: string
+  filePath: string
+  /** running(取数中) | ready | failed */
+  status: string
+  error: string
+  createdBy: string
+  createdAt: string
+}
+
+export interface MesFetchJobRow {
+  id: string
+  datasetId: string
+  agentId: string
+  /** running | done | failed */
+  status: string
+  rows: number
+  error: string
+  createdAt: string
+  updatedAt: string
+}
+
+const DATASET_COLS = `id, line_id AS lineId, node_id AS nodeId, node_name AS nodeName, from_ts AS fromTs,
+  to_ts AS toTs, rows, sha256, file_path AS filePath, status, error, created_by AS createdBy, created_at AS createdAt`
+const JOB_COLS = `id, dataset_id AS datasetId, agent_id AS agentId, status, rows, error, created_at AS createdAt, updated_at AS updatedAt`
+
+/** 存储行 → 领域行(数值列归一;进程内异步账本,跨进程的 running 视为 stale) */
+function toDatasetRow(r: Record<string, unknown>, bootedAt: string): MesDatasetRow {
+  const row = {
+    id: String(r.id),
+    lineId: String(r.lineId ?? ''),
+    nodeId: String(r.nodeId ?? ''),
+    nodeName: String(r.nodeName ?? ''),
+    fromTs: r.fromTs == null ? null : String(r.fromTs),
+    toTs: r.toTs == null ? null : String(r.toTs),
+    rows: Number(r.rows ?? 0),
+    sha256: String(r.sha256 ?? ''),
+    filePath: String(r.filePath ?? ''),
+    status: String(r.status ?? 'ready'),
+    error: String(r.error ?? ''),
+    createdBy: String(r.createdBy ?? ''),
+    createdAt: String(r.createdAt ?? ''),
+  }
+  // 进程内异步:上一进程遗留的 running 永远不会再被本进程 finalize,如实呈现为 failed
+  if (row.status === 'running' && row.createdAt < bootedAt) {
+    row.status = 'failed'
+    row.error = row.error || '服务重启,取数进程已消失(作业未完成)'
+  }
+  return row
+}
+
+function toJobRow(r: Record<string, unknown>, bootedAt: string): MesFetchJobRow {
+  const row = {
+    id: String(r.id),
+    datasetId: String(r.datasetId ?? ''),
+    agentId: String(r.agentId ?? ''),
+    status: String(r.status ?? 'running'),
+    rows: Number(r.rows ?? 0),
+    error: String(r.error ?? ''),
+    createdAt: String(r.createdAt ?? ''),
+    updatedAt: String(r.updatedAt ?? ''),
+  }
+  if (row.status === 'running' && row.createdAt < bootedAt) {
+    row.status = 'failed'
+    row.error = row.error || '服务重启,取数进程已消失(作业未完成)'
+  }
+  return row
+}
+
+// ============================================================
+// 读取视图
+// ============================================================
+
+export type MesDatasetReadMode = 'head' | 'stats' | 'rows'
+
+export interface MesDatasetHeadView { columns: string[], totalRows: number, preview: string[][] }
+/** count/min/max/mean/stddev(采样标准差 n-1)针对 value 数值列;首末 ts 取首末数值行 */
+export interface MesDatasetStatsView {
+  count: number
+  min: number | null
+  max: number | null
+  mean: number | null
+  stddev: number | null
+  firstTs: string | null
+  lastTs: string | null
+}
+export interface MesDatasetRowsView { offset: number, total: number, rows: string[][] }
+
+export type MesDatasetRead
+  = { meta: MesDatasetRow, mode: 'head', head: MesDatasetHeadView }
+    | { meta: MesDatasetRow, mode: 'stats', stats: MesDatasetStatsView }
+    | { meta: MesDatasetRow, mode: 'rows', rowsView: MesDatasetRowsView }
+
+// ============================================================
+// 仓储工厂(全 prepared 占位符绑定,零字符串拼接)
+// ============================================================
+
+export interface MesCreateFetchJobInput {
+  nodeId: string
+  fromIso?: string
+  toIso?: string
+  maxRows: number
+  agentId: string
+  lineId?: string
+  nodeName?: string
+  /** 节点驱动配置(取数时透传给驱动) */
+  driverConfig?: Record<string, unknown>
+}
+
+export type MesDatasetStore = ReturnType<typeof createMesDatasetStore>
+
+export interface MesDatasetStoreOpts {
+  /** 驱动解析(缺省走 dcw 注册表;测试注入假驱动,不联网) */
+  resolveDriver?: (kind: string) => MesHistoryDriver
+}
+
+export function createMesDatasetStore(db: DatabaseSync, datasetsDir: string, opts: MesDatasetStoreOpts = {}) {
+  mkdirSync(datasetsDir, { recursive: true })
+  // 进程引导时刻:此前的 running 账本属于已消失的进程(查询侧按 failed 呈现)
+  const bootedAt = new Date().toISOString()
+  const resolveDriver = opts.resolveDriver ?? ((kind: string): MesHistoryDriver => resolveDcwDriver(kind as Parameters<typeof resolveDcwDriver>[0]))
+
+  const insertDataset = db.prepare(
+    `INSERT INTO mes_datasets (id, line_id, node_id, node_name, from_ts, to_ts, rows, sha256, file_path, status, error, created_by, created_at)
+     VALUES (?, ?, ?, ?, ?, ?, 0, '', ?, 'running', '', ?, ?)`,
+  )
+  const finalizeDatasetReady = db.prepare(
+    `UPDATE mes_datasets SET rows = ?, sha256 = ?, status = 'ready', error = ? WHERE id = ?`,
+  )
+  const finalizeDatasetFailed = db.prepare(
+    `UPDATE mes_datasets SET status = 'failed', error = ? WHERE id = ?`,
+  )
+  const selectDatasetById = db.prepare(`SELECT ${DATASET_COLS} FROM mes_datasets WHERE id = ?`)
+  const selectDatasetsRecent = db.prepare(`SELECT ${DATASET_COLS} FROM mes_datasets ORDER BY created_at DESC LIMIT ?`)
+
+  const insertJob = db.prepare(
+    `INSERT INTO mes_fetch_jobs (id, dataset_id, agent_id, status, rows, error, created_at, updated_at)
+     VALUES (?, ?, ?, 'running', 0, '', ?, ?)`,
+  )
+  const finalizeJobDone = db.prepare(
+    `UPDATE mes_fetch_jobs SET status = 'done', rows = ?, error = '', updated_at = ? WHERE id = ?`,
+  )
+  const finalizeJobFailed = db.prepare(
+    `UPDATE mes_fetch_jobs SET status = 'failed', rows = ?, error = ?, updated_at = ? WHERE id = ?`,
+  )
+  const selectJobById = db.prepare(`SELECT ${JOB_COLS} FROM mes_fetch_jobs WHERE id = ?`)
+
+  /** 同步分块写(处理部分写)+ 增量 sha256(免二次读文件) */
+  function writeAll(fd: number, hash: ReturnType<typeof createHash>, text: string): void {
+    const buf = Buffer.from(text, 'utf8')
+    let off = 0
+    while (off < buf.length) off += writeSync(fd, buf, off, buf.length - off)
+    hash.update(buf)
+  }
+
+  function csvPathOf(datasetId: string): string {
+    // datasetId 由本服务生成(字符集受控);仍防御路径逃逸
+    const safe = datasetId.replace(/[^A-Za-z0-9_-]/g, '')
+    return join(datasetsDir, `${safe || 'unknown'}.csv`)
+  }
+
+  /** 取数执行体(进程内异步;写 CSV → sha256 → dataset=ready → job=done;异常 → 双 failed+error) */
+  async function runFetchJob(jobId: string, datasetId: string, input: MesCreateFetchJobInput): Promise<void> {
+    const filePath = csvPathOf(datasetId)
+    const driver = resolveDriver('mes-rest')
+    const maxRows = Math.max(1, Math.min(5000, Math.round(input.maxRows) || 0))
+    const hash = createHash('sha256')
+    let rows = 0
+    let fd: number | null = null
+    try {
+      if (typeof driver.fetchHistory !== 'function') {
+        throw new Error('mes-rest 驱动未提供 fetchHistory 原语(驱动实现缺失或未注册)')
+      }
+      fd = openSync(filePath, 'w')
+      writeAll(fd, hash, 'ts,value\r\n')
+      const result = await driver.fetchHistory({
+        driverConfig: (input.driverConfig ?? {}) as Record<string, unknown>,
+        fromIso: String(input.fromIso ?? ''),
+        toIso: String(input.toIso ?? ''),
+        maxRows,
+        onRows: (batch) => {
+          if (!Array.isArray(batch) || batch.length === 0) return
+          const lines: string[] = []
+          for (const r of batch) {
+            if (rows >= maxRows) break // 截断保护:即使驱动超发也不越上限
+            lines.push(csvLineOf(String(r?.ts ?? ''), Number(r?.value)))
+            rows++
+          }
+          if (lines.length > 0) writeAll(fd!, hash, `${lines.join('\r\n')}\r\n`)
+        },
+      })
+      if (fd != null) {
+        closeSync(fd)
+        fd = null
+      }
+      // 驱动自报不完整 → ready 但 error 留截断备注(数据仍可用);完整 → error 清空
+      const note = result && result.complete === false ? `truncated:驱动在 maxRows=${maxRows} 内未返回完整窗口` : ''
+      finalizeDatasetReady.run(rows, hash.digest('hex'), note, datasetId)
+      finalizeJobDone.run(rows, new Date().toISOString(), jobId)
+    }
+    catch (err) {
+      if (fd != null) {
+        try {
+          closeSync(fd)
+        }
+        catch { /* 已关闭 */ }
+      }
+      const msg = err instanceof Error ? err.message : String(err)
+      // 收敛账本;收尾自身失败(如关机中库已闭)也不允许击穿成 unhandled rejection
+      try {
+        finalizeDatasetFailed.run(msg.slice(0, 500), datasetId)
+        finalizeJobFailed.run(rows, msg.slice(0, 500), new Date().toISOString(), jobId)
+      }
+      catch (finErr) {
+        console.error('[mes-datasets] 取数失败账本收敛异常:', finErr)
+      }
+    }
+  }
+
+  return {
+    /** 数据目录(测试/展示用) */
+    dir: datasetsDir,
+
+    /** 建 job + dataset(running) 账本并启动进程内异步取数(立即返回,绝不阻塞/不进调度循环) */
+    createFetchJob(input: MesCreateFetchJobInput): { jobId: string, datasetId: string } {
+      const datasetId = `mesds-${randomUUID().slice(0, 8)}`
+      const jobId = `mesjob-${randomUUID().slice(0, 8)}`
+      const now = new Date().toISOString()
+      const filePath = csvPathOf(datasetId)
+      insertDataset.run(
+        datasetId, input.lineId ?? '', input.nodeId, input.nodeName ?? '',
+        input.fromIso ?? null, input.toIso ?? null, filePath, input.agentId, now,
+      )
+      insertJob.run(jobId, datasetId, input.agentId, now, now)
+      // 进程内异步执行:不 await、不落任何定时器/调度环;异常在 runFetchJob 内自收敛(双 failed)
+      void runFetchJob(jobId, datasetId, input)
+      return { jobId, datasetId }
+    },
+
+    jobStatus(jobId: string): MesFetchJobRow | null {
+      const r = selectJobById.get(jobId) as unknown as Record<string, unknown> | undefined
+      return r ? toJobRow(r, bootedAt) : null
+    },
+
+    datasetMeta(id: string): MesDatasetRow | null {
+      const r = selectDatasetById.get(id) as unknown as Record<string, unknown> | undefined
+      return r ? toDatasetRow(r, bootedAt) : null
+    },
+
+    /** 最近数据集(新→旧) */
+    listDatasets(limit = 20): MesDatasetRow[] {
+      const rows = selectDatasetsRecent.all(Math.max(1, Math.min(100, Math.round(limit) || 20))) as unknown as Record<string, unknown>[]
+      return rows.map(r => toDatasetRow(r, bootedAt))
+    },
+
+    /**
+     * 读取数据集内容(head/stats/rows)。
+     * 数据原文只在结构化字段里返回,渲染层负责「text 只带 stats+≤3 行采样」。
+     */
+    readDataset(id: string, mode: MesDatasetReadMode = 'head', offset = 0): MesDatasetRead {
+      const meta = this.datasetMeta(id)
+      if (!meta) throw new AppError(404, ErrorCodes.NOT_FOUND, `数据集 ${id} 不存在(mes_datasets 可列出可见数据集)`)
+      if (!existsSync(meta.filePath)) {
+        throw new AppError(404, ErrorCodes.NOT_FOUND, `数据集 ${id} 的 CSV 文件缺失(${meta.status === 'running' ? '仍在取数中' : '文件已被清理'})`)
+      }
+      const raw = readFileSync(meta.filePath, 'utf8')
+      const lines = raw.split(/\r?\n/).filter((l, i, arr) => !(l === '' && i === arr.length - 1))
+      const columns = lines.length > 0 ? parseCsvLine(lines[0]!) : ['ts', 'value']
+      const rows = lines.slice(1).map(l => parseCsvLine(l))
+      const valueCol = Math.max(0, columns.indexOf('value') >= 0 ? columns.indexOf('value') : 1)
+
+      if (mode === 'head') {
+        return {
+          meta,
+          mode,
+          head: { columns, totalRows: rows.length, preview: rows.slice(0, 5) },
+        }
+      }
+      if (mode === 'stats') {
+        const vals: number[] = []
+        let firstTs: string | null = null
+        let lastTs: string | null = null
+        for (const r of rows) {
+          const raw = r[valueCol] ?? ''
+          // 空串(非数值占位)不能经 Number('')→0 混入统计
+          if (raw !== '' && Number.isFinite(Number(raw))) {
+            const v = Number(raw)
+            vals.push(v)
+            if (firstTs == null) firstTs = r[0] ?? null
+            lastTs = r[0] ?? lastTs
+          }
+        }
+        const n = vals.length
+        const min = n > 0 ? Math.min(...vals) : null
+        const max = n > 0 ? Math.max(...vals) : null
+        const mean = n > 0 ? vals.reduce((a, b) => a + b, 0) / n : null
+        const stddev = n > 1
+          ? Math.sqrt(vals.reduce((a, b) => a + (b - mean!) ** 2, 0) / (n - 1))
+          : (n === 1 ? 0 : null)
+        return { meta, mode, stats: { count: n, min, max, mean, stddev, firstTs, lastTs } }
+      }
+      // rows:offset 起 20 行分页
+      const off = Math.max(0, Math.round(offset) || 0)
+      return {
+        meta,
+        mode,
+        rowsView: { offset: off, total: rows.length, rows: rows.slice(off, off + 20) },
+      }
+    },
+  }
+}
+
+// ============================================================
+// 进程级单例(plugins/workshop.ts 装配;模式同 bindOpsRepos / configureAmlRuntime)
+// ============================================================
+
+const g = globalThis as typeof globalThis & { __mesDatasets?: MesDatasetStore }
+
+/** 装配(启动插件调用一次;幂等) */
+export function configureMesDatasets(db: DatabaseSync, datasetsDir: string, opts: MesDatasetStoreOpts = {}): MesDatasetStore {
+  g.__mesDatasets ??= createMesDatasetStore(db, datasetsDir, opts)
+  return g.__mesDatasets
+}
+
+/** 读取单例(未装配 = 测试/降级;抛 503 与 manager 未就绪同语义) */
+export function getMesDatasets(): MesDatasetStore {
+  if (!g.__mesDatasets) {
+    throw new AppError(503, 'MES_DATASETS_NOT_READY', 'MES 数据集服务尚未初始化(plugin 未执行)')
+  }
+  return g.__mesDatasets
+}
+
+/** 测试/关机卸载 */
+export function resetMesDatasets(): void {
+  g.__mesDatasets = undefined
+}
+
+/**
+ * 默认落盘目录:复用平台配置根解析 —— 运行数据目录(configRoot/data)的上一级,
+ * 即 <configRoot>/datasets(与 <configRoot>/aml 同层;dcw-params.json 等以同一条
+ * ensureDataDir 链路定位 <configRoot>/data)。
+ */
+export function defaultDatasetsDir(dataDir: string): string {
+  return resolve(dirname(dataDir), 'datasets')
+}

package/server/services/workshop/plugins/host/init.mjs

@@ -37,7 +37,15 @@ export async function initPluginHost({ cwd = process.cwd(), packageRoot } = {})
   let settingsPath = null
   let paths = { home: homeDir, configRoot: join(cwd, '.AgentWorkShop'), dataDir: join(cwd, '.AgentWorkShop', 'data') }
   try {
-    const homeMod = await import(pathToUrl(join(cwd, 'shared', 'config', 'home.mjs')))
+    // home.mjs 探测根:cwd 优先;cwd 漂移(计划任务/服务方式启动,schtasks 默认 System32、
+    // 或 cwd=AW_HOME)时 shared/ 不在 cwd 下 → 回退 packageRoot(aw-plugins.ts 已按 chunk
+    // 逐级上溯算好)/ AW_PACKAGE_ROOT(启动器注入)。否则这里 throw 进 catch →
+    // config=null 且 paths 落到 join(cwd,'.AgentWorkShop') 嵌套错根,插件 ctx.config
+    // 终身为空(PATCH/重启都救不回,插件命名空间设置键全部不可见)。
+    const engineBases = [cwd, packageRoot, process.env.AW_PACKAGE_ROOT].filter(Boolean)
+    const base = engineBases.find(r => existsSync(join(r, 'shared', 'config', 'home.mjs')))
+    if (!base) throw new Error(`shared/config/home.mjs 不在任何候选根(${engineBases.join(' | ')})`)
+    const homeMod = await import(pathToUrl(join(base, 'shared', 'config', 'home.mjs')))
     const rm = homeMod.resolveRunMode({ cwd, packageRoot, env: process.env })
     const engineRoot = rm.mode === 'repo' ? rm.root : (packageRoot ?? rm.root)
     if (engineRoot && existsSync(join(engineRoot, 'shared', 'config', 'engine.mjs'))) {

package/server/services/workshop/plugins/host/load.mjs

@@ -56,7 +56,7 @@ export async function loadAllPlugins(host, { config, paths }) {
           name: def.name,
           version: String(def.version ?? '0.0.0'),
           description: String(def.description ?? ''),
-          auth: String(def.auth ?? 'none'),
+          auth: String(def.auth ?? 'user'),
           scope,
           dir,
           entry,
@@ -82,7 +82,7 @@ export async function loadAllPlugins(host, { config, paths }) {
         name: def.name,
         version: String(def.version ?? '0.0.0'),
         description: String(def.description ?? ''),
-        auth: String(def.auth ?? 'none'),
+        auth: String(def.auth ?? 'user'),
         scope,
         dir,
         entry,

package/server/services/workshop/runtime/manager/admin-channel.ts

@@ -6,7 +6,8 @@ import { ManagerNotifications } from './notifications'
 import type { ActingUser, AgentTemplateDetail } from './types'
 import type { AgentInfo } from '../../agents/agent-interface'
 import type { AgentRow, ChannelRow, WorkspaceRow } from '../../db/database'
-import { AppError } from '../../../../utils/errors'
+import { AppError, ErrorCodes } from '../../../../utils/errors'
+import { getDcwLineRepo } from '../../dcw/dcw-line.repo'
 import { assertHarnessUsable } from '../../agents/harness-availability'
 import { mkdirSync } from 'node:fs'
 import { parseJson } from '../../db/database'
@@ -144,6 +145,31 @@ export abstract class ManagerAdminChannel extends ManagerNotifications {
     return this.deps.repos.channels.findById(channelId)?.scenarioPrompt ?? ''
   }
 
+  /** v18:绑定/解绑产线(lineId 空 = 解绑)。绑定变更回收成员运行时,下次装配注入产线简报。 */
+  async bindChannelLine(channelId: string, lineId: string | null): Promise<ChannelRow> {
+    const channel = this.requireChannelRow(channelId)
+    const next = String(lineId ?? '').trim()
+    if (next && next !== channel.lineId) {
+      // 产线存在性校验:避免绑到已删除/拼错的线 id(工具面按线过滤,悬空绑定毫无价值)
+      const line = getDcwLineRepo().byId(next)
+      if (!line) throw new AppError(404, ErrorCodes.NOT_FOUND, `产线不存在: ${next}`)
+    }
+    if (next === channel.lineId) return channel
+    const updated = this.deps.repos.channels.setLine(channelId, next)!
+    // 与场景 prompt 变更同链路:回收成员运行时,下次装配注入新的产线简报
+    await this.unloadChannelAgents(channelId)
+    if (updated.leadAgentId) this.ensureChannelActive(channelId)
+    return updated
+  }
+
+  /** v18:Agent 实例 → 其频道绑定的产线 id(只读扩权依据;未绑/找不到 = null) */
+  channelLineBindingOf(agentId: string): string | null {
+    const m = this.deps.repos.channelAgents.findById(agentId)
+    if (!m) return null
+    const lineId = this.deps.repos.channels.findById(m.channelId)?.lineId ?? ''
+    return lineId || null
+  }
+
   /** AML 解耦:twin-profile 变更(模式/绑定模型)后回收成员,重新装配注入新工况提示词 */
   async recycleChannelForTwinProfile(channelId: string): Promise<void> {
     const channel = this.deps.repos.channels.findById(channelId)

package/server/services/workshop/runtime/manager/channel-templates.ts

@@ -16,14 +16,15 @@ import { getChannelPluginsRepo } from '../../db/channel-plugins.repo'
 /** 携带「知识库集成」选项的模板:实例化时可显式启停 rag-bridge(开 → 注入 KB 作业段提示词) */
 export const KNOWLEDGE_BASE_TEMPLATE_IDS = new Set(['chtpl-aml-optimization-default', 'chtpl-generic-optimize-default'])
 
-/** 知识库集成开启时追加到频道场景提示词的作业段(教 lead 先检索后沉淀) */
+/** 知识库集成开启时追加到频道场景提示词的作业段(教全员:先检索、后行动、再沉淀;知识调优工程师为主消费者) */
 export const KNOWLEDGE_BASE_PROMPT_SECTION = `
 
 ## 知识库集成(已启用 rag-bridge)
 本频道接入了 rag-knowledge 知识库,优化作业遵循「先检索、后行动、再沉淀」:
-1. 优化启动前,lead 先用 kb_agent(mode=sync) 检索知识库中与本场景相关的**数据分析结论**与**物理机理知识**(检索词带上产线/产品/关键物理量,如「注塑 保压 克重 波动」「烘箱温度 膜厚 滞后」);把检索所得的机理关系、历史阈值与经验教训作为探索方向、步长与安全边界的依据;
-2. 优化过程中,若对某个现象拿不准,先查知识库再动手;worker 也可各自检索,但入库/沉淀由 lead 统一收口;
-3. 优化闭环收口后(目标达标或 judge 判定 keep),lead 用 kb_agent(mode=async) 把本次经验沉淀入知识库:标题、类别(工艺经验/数据分析/故障案例)、问题、解决方案、关键数据(带单位的参数调整↔响应变化)。异步提交后无需等待,可继续汇报。`
+1. 优化启动前,lead 与知识调优工程师先用 kb_agent(mode=sync) 检索知识库中与本场景相关的**数据分析结论**与**物理机理知识**(检索词带上产线/产品/关键物理量,如「注塑 保压 克重 波动」「烘箱温度 膜厚 滞后」);把检索所得的机理关系、历史阈值与经验教训作为探索方向、步长与安全边界的依据;
+2. 知识调优工程师是知识库的主要消费者与沉淀者:调优方案必须注明依据哪条知识;优化过程中若对某个现象拿不准,先查知识库再动手;worker 也可各自检索,但入库/沉淀由 lead 统一收口(可交知识调优工程师执行);
+3. 优化闭环收口后(目标达标或 judge 判定 keep),用 kb_agent(mode=async) 把本次经验沉淀入知识库:标题、类别(工艺经验/数据分析/故障案例)、问题、解决方案、关键数据(带单位的参数调整↔响应变化)。异步提交后无需等待,可继续汇报;入库结果用 kb_agent_status 查询;
+4. 若本频道同时启用深度诊断(diag-bridge):数据判读拿不准或质量异常时,先用 diag_run 发起根因诊断(异步,提交即返 task_id),完成后按 diag_status 返回的指引把报告经验经 kb_agent 入库,再把结论用于调优决策。`
 
 export abstract class ManagerChannelTemplates extends ManagerTeams {
   /** 可见性感知 Channel 模板列表:普通用户 = 本人 + public(含内置);admin = 全量 */

package/server/services/workshop/runtime/manager/runtime-wiring.ts

@@ -12,6 +12,7 @@ import type { ChannelRuntime } from '../channel-runtime'
 import { Mailbox } from '../mailbox'
 import { SchedulerLoop } from '../scheduler-loop'
 import { buildMessage, instanceToAgentInfo, log, parseChannelLlm, rowToChannelMail, runtimeKey } from './helpers'
+import { getDcwLineRepo } from '../../dcw/dcw-line.repo'
 import { harnessContinuityEnabled, workshopSettings } from '../../settings'
 import { composeChannelSystemPrompt } from '../../aml/twin/prompt-composer'
 
@@ -29,7 +30,22 @@ export abstract class ManagerRuntimeWiring extends ManagerBus {
     // 变更经 updateChannel 回收成员运行时,下次装配拿到新场景)
     const scenarioPrompt = this.deps.repos.channels.findById(m.channelId)?.scenarioPrompt ?? ''
     const configWithCtx: Record<string, unknown> = { ...agent.config }
-    if (scenarioPrompt) configWithCtx.scenarioPrompt = scenarioPrompt
+    // v18 频道绑定产线:注入产线简报(只读上下文;全员可 line_context 看实时全景,写仍需节点授权)
+    try {
+      const boundLineId = this.deps.repos.channels.findById(m.channelId)?.lineId ?? ''
+      const line = boundLineId ? getDcwLineRepo().byId(boundLineId) : undefined
+      if (line) {
+        const brief = `\n\n## 绑定产线(只读上下文)\n本频道已绑定产线「${line.name}」(${line.id})${line.description ? ` — ${line.description}` : ''}。全员可用 line_context 查看该产线实时全景(运行状态/活动批次/当前配方与参数窗口),ops_log / recipe_log / recipe_versions 查运维日志与配方历史(频道绑定 = 只读授权);参数下发等写操作仍需节点授权(lead 可用 team_grant_nodes/grant_node_ids 授予)。`
+        configWithCtx.scenarioPrompt = (scenarioPrompt ? `${scenarioPrompt}\n` : '') + brief
+      }
+      else if (scenarioPrompt) {
+        configWithCtx.scenarioPrompt = scenarioPrompt
+      }
+    }
+    catch {
+      // 产线仓储未就绪等异常:退回纯场景 prompt,不阻断装配
+      if (scenarioPrompt) configWithCtx.scenarioPrompt = scenarioPrompt
+    }
     // AML 解耦:训练/工艺优化 Channel 的动态工况提示词(模式+goal+绑定节点调试元数据组装;
     // 模式/绑定变更经 twin-profile PATCH 回收成员运行时生效,与 scenarioPrompt 同链路)。
     try {

package/server/services/workshop/runtime/manager/state.ts

@@ -503,6 +503,17 @@ export abstract class ManagerState extends ManagerContracts {
 
   /** Harness 重建落共享记忆(§7.1 harness.restarted / §6.2 lastRestartReason) */
   protected recordHarnessRestartEvent(e: { agentId: string, channelId: string, harness: string, reason: string, at: string }): void {
+    // lead 的 harness 因进程死亡重建时,被外部中止的回合可能遗留未规划的 SUBMITTED 根
+    // (旧回合的 supervise 请求已消费、快照指纹不变 → 无事件再唤醒)。lead 重建即补一次
+    // 调度唤醒(幂等;无 scheduler 则按需重挂),不让根任务只能等 ROOT_TIMEOUT 判死。
+    try {
+      if (this.deps.repos.channels.findById(e.channelId)?.leadAgentId === e.agentId) {
+        const cr = this.channels.get(e.channelId)
+        if (cr?.scheduler) cr.scheduler.wake()
+        else this.ensureChannelActive(e.channelId)
+      }
+    }
+    catch { /* 恢复路径绝不阻断重建记账 */ }
     if (!channelMemoryDigestEnabled()) return
     const payload: Record<string, unknown> = {
       channelId: e.channelId,

package/server/services/workshop/runtime/scheduler-loop/tick.ts

@@ -133,9 +133,13 @@ export abstract class SchedulerLoopTick extends SchedulerLoopState {
     }
 
     // Failed/empty triage does not trigger blind dispatch. Retry the Lead after backoff.
+    // activeRootId 只排除「仍活跃」的根:它指向的根已终态(如 ROOT_TIMEOUT)时不得再排除
+    // 其他未规划根 —— 否则中止回合遗留的 SUBMITTED 根会因指纹不变而永无重试,直到新根超时。
+    const activeRoot = snapshot.activeRootId ? snapshot.tasks.find(t => t.id === snapshot.activeRootId) : null
+    const activeRootAlive = Boolean(activeRoot) && !TERMINAL_TASK_STATES[activeRoot!.state]
     const hasUnplannedLeadRoot = snapshot.tasks.some((task) => {
       if (task.parentId || task.assigneeId !== this.lead.agentId) return false
-      if (snapshot.activeRootId && task.id !== snapshot.activeRootId) return false
+      if (snapshot.activeRootId && activeRootAlive && task.id !== snapshot.activeRootId) return false
       if (task.state !== 'SUBMITTED' && task.state !== 'WORKING') return false
       return !snapshot.tasks.some(child => child.parentId === task.id)
     })

package/server/services/workshop/runtime/task-engine/helpers.ts

@@ -18,7 +18,9 @@ export const log = createLogger('workshop.task-engine')
  *  收口规则只认 WAITING/WORKING,三面都不接) */
 export const TRANSITIONS: Record<TaskState, TaskState[]> = {
   SUBMITTED: ['WORKING', 'ASSIGNED', 'COMPLETED', 'CANCELED'],
-  ASSIGNED: ['WORKING', 'CANCELED'],
+  // ASSIGNED → COMPLETED:mock/rpc worker 无运行时消费 assign(任务永远停在 ASSIGNED),
+  // 交付即视同接取 —— 与 SUBMITTED/WAITING → COMPLETED 的 mock 闭环例外同一口径。
+  ASSIGNED: ['WORKING', 'COMPLETED', 'CANCELED'],
   WORKING: ['WAITING', 'COMPLETED', 'FAILED', 'CANCELED'],
   WAITING: ['WORKING', 'COMPLETED', 'CANCELED'],
   FAILED: ['ASSIGNED', 'CANCELED'],

package/shared/config/schema.json

@@ -21,7 +21,10 @@
     { "key": "time.timeZone", "type": "timezone", "group": "time", "label": "系统时区", "labelKey": "settings.runtime.time.timeZone", "description": "日志、聊天、审计、Agent 记录与定时任务使用的 IANA 时区；DAQ 原始时间轴仍保存绝对时间", "applies": "live", "default": "Asia/Shanghai" },
 
     { "key": "security.approvalGate", "type": "boolean", "group": "security", "label": "高危操作双人复核", "labelKey": "settings.runtime.security.approvalGate", "description": "R3：开启后写控/删除等高风险操作需另一位管理员批核", "applies": "live", "default": false },
-    { "key": "security.hitl_timeout_ms", "type": "number", "group": "security", "label": "HITL 审批超时(ms)", "labelKey": "settings.runtime.security.hitlTimeoutMs", "description": "手动确认模式下发审批的等待超时(超时按拒绝收敛)", "applies": "restart", "default": 180000, "min": 1000, "max": 86400000, "aliases": ["HITL_TIMEOUT_MS"] },
+    { "key": "security.hitl_timeout_ms", "type": "number", "group": "security", "label": "HITL 审批超时(ms)", "labelKey": "settings.runtime.security.hitlTimeoutMs", "description": "手动确认模式下发审批的等待超时(超时按拒绝收敛;内存快照热生效)", "applies": "live", "default": 180000, "min": 1000, "max": 86400000, "aliases": ["HITL_TIMEOUT_MS"] },
+    { "key": "security.allowRegistration", "type": "boolean", "group": "security", "label": "开放自助注册", "labelKey": "settings.runtime.security.allowRegistration", "description": "公网部署闸门：关闭后（且首管理员已就位）两个注册端点均返回 403，仅管理员可建账号", "applies": "live", "default": true },
+    { "key": "security.hstsEnabled", "type": "boolean", "group": "security", "label": "下发 HSTS 头", "labelKey": "settings.runtime.security.hstsEnabled", "description": "仅在已全站 HTTPS（反代/隧道终结 TLS）时开启，开启后响应带 Strict-Transport-Security", "applies": "live", "default": false },
+    { "key": "security.recipeDispatchApproval", "type": "boolean", "group": "security", "label": "配方下发人工审批", "labelKey": "settings.runtime.security.recipeDispatchApproval", "description": "开启后 recipe_trial/recipe_apply 在下发前挂起等待人工裁决:批准=执行下发;拒绝(可附指导)=Agent 收到人工指导并修订候选后重新提交", "applies": "live", "default": false },
 
     { "key": "daq.startInfrastructure", "type": "select", "group": "daq", "label": "数采基础设施拉起策略", "labelKey": "settings.runtime.daq.startInfrastructure", "description": "auto=启动探测，不通且有 Docker 则自动拉起；always=仅 Docker 拉起；never=只直连", "applies": "live", "default": "auto", "options": ["auto", "always", "never"] },
     { "key": "daq.mqtt.host", "type": "string", "group": "daq", "label": "MQTT Broker 地址", "labelKey": "settings.runtime.daq.mqttHost", "description": "数采事件总线 MQTT 主机", "applies": "restart", "default": "127.0.0.1" },

package/shared/daq-protocol.ts

@@ -214,7 +214,8 @@ export type DaqDriverKind = 'mock' | 'modbus-tcp' | 'modbus-rtu' | 'opcua' | 'mq
 export interface DriverConfigField {
   key: string
   label: string
-  type: 'string' | 'number' | 'select'
+  /** text=多行 JSON 编辑(textarea;MES REST 映射等结构化配置) */
+  type: 'string' | 'number' | 'select' | 'text'
   required?: boolean
   default?: string | number
   placeholder?: string