agentworkshop 0.8.6 → 0.8.8

package/server/api/workshop/a2a/[agentId]/card/index.get.ts

@@ -1,75 +1,86 @@
-/**
- * GET /api/workshop/a2a/:agentId.card —— A2A AgentCard(设计文档 §6.3,规范 §7)。
- * 由 AgentConfig 动态生成:camelCase 字段,supportedInterfaces.protocolBinding='JSONRPC',
- * capabilities.streaming=true,skills 由 config.skills 声明(缺省 [])。
- * 按 A2A 规范直接返回 card 文档(不走 ApiEnvelope 信封);Agent 不存在 → 404。
- */
-import { defineEventHandler, getRouterParam, setResponseStatus } from 'h3'
-import { getWorkshopManager } from '../../../../../plugins/workshop'
-import type { AgentChannelManager, ManagerDeps } from '../../../../../services/workshop/runtime/manager'
-import type { AgentInfo } from '../../../../../services/workshop/agents/agent-interface'
-import { parseJson } from '../../../../../services/workshop/db/database'
-
-/** A2A AgentCard(1.0 子集,与 rpc agent/getCard 同一结构) */
-export interface AgentCard {
-  name: string
-  description: string
-  supportedInterfaces: {
-    url: string
-    protocolBinding: 'JSONRPC'
-    protocolVersion: '1.0'
-  }[]
-  capabilities: { streaming: boolean, pushNotifications: boolean }
-  defaultInputModes: string[]
-  defaultOutputModes: string[]
-  skills: unknown[]
-}
-
-/** 按实例 id 查找 Channel 实例(公开 API 无 findAgent;经 deps.repos 只读查询) */
-export function findAgent(manager: AgentChannelManager, agentId: string): AgentInfo | undefined {
-  const repos = (manager as unknown as { deps: ManagerDeps }).deps.repos
-  const m = repos.channelAgents.findById(agentId)
-  if (!m) return undefined
-  return {
-    id: m.id,
-    channelId: m.channelId,
-    name: m.name,
-    harness: m.harness,
-    role: m.role as 'lead' | 'worker',
-    config: parseJson<Record<string, unknown>>(m.configJson, {}),
-    token: m.token,
-  }
-}
-
-/** 生成 AgentCard(由 AgentConfig 动态生成;description/skills 可经 config 声明) */
-export function buildAgentCard(agent: AgentInfo): AgentCard {
-  const config = agent.config ?? {}
-  return {
-    name: agent.name,
-    description:
-      typeof config.description === 'string'
-        ? config.description
-        : `AgentWorkShop ${agent.role} Agent(${agent.harness})`,
-    supportedInterfaces: [
-      {
-        url: `/api/workshop/a2a/${agent.id}/rpc`,
-        protocolBinding: 'JSONRPC',
-        protocolVersion: '1.0',
-      },
-    ],
-    capabilities: { streaming: true, pushNotifications: false },
-    defaultInputModes: ['text/plain'],
-    defaultOutputModes: ['text/plain'],
-    skills: Array.isArray(config.skills) ? config.skills : [],
-  }
-}
-
-export default defineEventHandler((event) => {
-  const agentId = getRouterParam(event, 'agentId')!
-  const agent = findAgent(getWorkshopManager(), agentId)
-  if (!agent) {
-    setResponseStatus(event, 404)
-    return { error: { code: 'NOT_FOUND', message: `Agent 不存在: ${agentId}` } }
-  }
-  return buildAgentCard(agent)
-})
+/**
+ * GET /api/workshop/a2a/:agentId.card —— A2A AgentCard(设计文档 §6.3,规范 §7)。
+ * 由 AgentConfig 动态生成:camelCase 字段,supportedInterfaces.protocolBinding='JSONRPC',
+ * capabilities.streaming=true,skills 由 config.skills 声明(缺省 [])。
+ * 按 A2A 规范直接返回 card 文档(不走 ApiEnvelope 信封);Agent 不存在 → 404。
+ */
+import { defineEventHandler, getRequestHeader, getRouterParam, setResponseStatus } from 'h3'
+import { settingOf } from '../../../../../services/workshop/settings'
+import { resolveUserByToken } from '../../../../../services/user.service'
+import { getWorkshopManager } from '../../../../../plugins/workshop'
+import type { AgentChannelManager, ManagerDeps } from '../../../../../services/workshop/runtime/manager'
+import type { AgentInfo } from '../../../../../services/workshop/agents/agent-interface'
+import { parseJson } from '../../../../../services/workshop/db/database'
+
+/** A2A AgentCard(1.0 子集,与 rpc agent/getCard 同一结构) */
+export interface AgentCard {
+  name: string
+  description: string
+  supportedInterfaces: {
+    url: string
+    protocolBinding: 'JSONRPC'
+    protocolVersion: '1.0'
+  }[]
+  capabilities: { streaming: boolean, pushNotifications: boolean }
+  defaultInputModes: string[]
+  defaultOutputModes: string[]
+  skills: unknown[]
+}
+
+/** 按实例 id 查找 Channel 实例(公开 API 无 findAgent;经 deps.repos 只读查询) */
+export function findAgent(manager: AgentChannelManager, agentId: string): AgentInfo | undefined {
+  const repos = (manager as unknown as { deps: ManagerDeps }).deps.repos
+  const m = repos.channelAgents.findById(agentId)
+  if (!m) return undefined
+  return {
+    id: m.id,
+    channelId: m.channelId,
+    name: m.name,
+    harness: m.harness,
+    role: m.role as 'lead' | 'worker',
+    config: parseJson<Record<string, unknown>>(m.configJson, {}),
+    token: m.token,
+  }
+}
+
+/** 生成 AgentCard(由 AgentConfig 动态生成;description/skills 可经 config 声明) */
+export function buildAgentCard(agent: AgentInfo): AgentCard {
+  const config = agent.config ?? {}
+  return {
+    name: agent.name,
+    description:
+      typeof config.description === 'string'
+        ? config.description
+        : `AgentWorkShop ${agent.role} Agent(${agent.harness})`,
+    supportedInterfaces: [
+      {
+        url: `/api/workshop/a2a/${agent.id}/rpc`,
+        protocolBinding: 'JSONRPC',
+        protocolVersion: '1.0',
+      },
+    ],
+    capabilities: { streaming: true, pushNotifications: false },
+    defaultInputModes: ['text/plain'],
+    defaultOutputModes: ['text/plain'],
+    skills: Array.isArray(config.skills) ? config.skills : [],
+  }
+}
+
+export default defineEventHandler((event) => {
+  // A2A 规范里 AgentCard 是公开发现面(不含任何 token/凭据);但在内网/敏感部署下
+  // 实例与技能清单本身也是情报 → 提供开关,关闭时要求认证。
+  if (settingOf('security.a2aCardPublic') === false) {
+    const token = getRequestHeader(event, 'authorization')?.match(/^Bearer\s+(.+)$/i)?.[1]?.trim()
+    if (!token || !resolveUserByToken(token)) {
+      setResponseStatus(event, 401)
+      return { error: { code: 'UNAUTHORIZED', message: 'AgentCard 未公开:需有效用户 token' } }
+    }
+  }
+  const agentId = getRouterParam(event, 'agentId')!
+  const agent = findAgent(getWorkshopManager(), agentId)
+  if (!agent) {
+    setResponseStatus(event, 404)
+    return { error: { code: 'NOT_FOUND', message: `Agent 不存在: ${agentId}` } }
+  }
+  return buildAgentCard(agent)
+})

package/server/api/workshop/agent-tools/approvals/index.get.ts

@@ -39,5 +39,7 @@ export default defineApiHandler(async (event) => {
   }
 
   const all = scope === 'history' ? getToolApprovals().historyList() : getToolApprovals().listPending(agentId)
-  return { approvals: all.filter(a => visible(a.agentId, a.id)) }
+  // agentId 过滤对两个 scope 一致生效(pending 走 listPending(agentId);history 此前漏过滤,
+  // 面板/脚本按 Agent 查历史会看到其他 Agent 的审批 —— 2026-10-28 修复)
+  return { approvals: all.filter(a => visible(a.agentId, a.id) && (!agentId || a.agentId === agentId)) }
 })

package/server/api/workshop/agent-tools/bindings/index.post.ts

@@ -1,20 +1,20 @@
 /**
  * POST /api/workshop/agent-tools/bindings —— 绑定 Agent ↔ 工业对象。
- * body: { agentId, nodeId, kind: 'dcw'|'daq'|'recipe', mode?: 'auto'|'manual' }
- * 产线权限:普通用户仅可绑定自己有权产线的节点——daq 绑定需「仅查看」及以上,
- * dcw/recipe(写向)绑定需「可操控」;admin/editor 不受限。
+ * body: { agentId, nodeId, kind: 'dcw'|'daq'|'recipe'|'line-recipe', mode?: 'auto'|'manual' }
+ * 产线权限:普通用户仅可绑定自己有权产线的对象——daq 绑定需「仅查看」及以上,
+ * dcw/recipe/line-recipe(写向/管理向)绑定需「可操控」;admin/editor 不受限。
  *
- * 双轨授权(2026-10-28 节点级写授权计划 M1):
- *   - kind='recipe'(nodeId=配方 id)= 配方操作权(update/apply/trial/rollback);
- *   - kind='dcw'(nodeId=数控节点 id)= **点位写授权面** —— Agent 仍不能直写节点
- *     (param_control/dcw_control 恒拒桩不动),但持有该节点后,对"当前活动配方"的
- *     trial/apply 只要覆盖集 ⊆ 自己的节点绑定面即放行;换配方不停摆。
+ * 三轨授权(2026-10-28 节点级写授权 + 产线配方管理权):
+ *   - kind='recipe'(nodeId=配方 id)= 单配方操作权(update/apply/trial/rollback);
+ *   - kind='dcw'(nodeId=数控节点 id)= **点位写授权面 + 下发范围收窄器** —— Agent 仍不能
+ *     直写节点(param_control/dcw_control 恒拒桩不动);绑了 dcw 后,下发只能覆盖这些点位;
+ *   - kind='line-recipe'(nodeId=产线 id)= **产线配方管理权**:对该线全部配方(含未来新建)
+ *     可 查看/新建/修改/回退;下发仍按 dcw 收窄规则(未绑任何 dcw = 配方全参数可发,向下兼容)。
  *
- * auto 治理(产线 Co-Pilot P2,计划 §5.4 铁律 2):**写向绑定首绑强制 manual**——
- * dcw/recipe 写控面挂着逐次人工审批闸,创建即 auto 等于免审上线,故 body.mode 对
- * 写向绑定一律忽略;显式传 auto 不静默吞掉,响应附 modeForced + notice 提示
- * (响应形状向后兼容,多余字段无害)。如需 auto,应在绑定创建后走 PATCH 携
- * confirm:true 显式切换(见 [id].patch.ts)。
+ * auto 治理(产线 Co-Pilot P2,计划 §5.4 铁律 2):**写向/管理向绑定首绑强制 manual**——
+ * 创建即 auto 等于免审上线,故 body.mode 对 dcw/recipe/line-recipe 一律忽略;显式传 auto
+ * 不静默吞掉,响应附 modeForced + notice 提示(响应形状向后兼容)。如需 auto,应在绑定
+ * 创建后走 PATCH 携 confirm:true 显式切换(见 [id].patch.ts)。
  * daq 绑定仅授权 daq_query 读(工具面无写族、mode 无审批语义可摘),维持原样。
  */
 import { readBody } from 'h3'
@@ -29,7 +29,7 @@ import { AppError, ErrorCodes } from '@/server/utils/errors'
 
 export default defineApiHandler(async (event) => {
   const user = resolveUser(event)
-  const body = await readBody<{ agentId?: string, nodeId?: string, kind?: 'dcw' | 'daq' | 'recipe', mode?: 'auto' | 'manual' }>(event) ?? {}
+  const body = await readBody<{ agentId?: string, nodeId?: string, kind?: 'dcw' | 'daq' | 'recipe' | 'line-recipe', mode?: 'auto' | 'manual' }>(event) ?? {}
   const kind = body.kind ?? 'daq'
   const nodeId = String(body.nodeId ?? '')
   const agentId = String(body.agentId ?? '')
@@ -53,9 +53,10 @@ export default defineApiHandler(async (event) => {
   }
 
   // 权限模型 v3:绑线 channel 的产线一致性 —— channel 绑了产线后,其成员 agent 只能
-  // 绑定同产线的节点/配方(产线隔离的工作空间语义;未绑线的纯协作频道不受此限)。
-  const nodeLineOf = (nid: string, k: 'daq' | 'dcw' | 'recipe'): string | null | undefined => {
+  // 绑定同产线的节点/配方/产线管理权(产线隔离的工作空间语义;未绑线的纯协作频道不受此限)。
+  const nodeLineOf = (nid: string, k: 'daq' | 'dcw' | 'recipe' | 'line-recipe'): string | null | undefined => {
     if (k === 'recipe') return getDcwController().listRecipes().find(r => r.id === nid)?.lineId
+    if (k === 'line-recipe') return nid
     return k === 'daq' ? getDaqController().byId(nid)?.lineId : getDcwController().byId(nid)?.lineId
   }
   const targetLine = nodeLineOf(nodeId, kind)
@@ -65,6 +66,27 @@ export default defineApiHandler(async (event) => {
       `该频道已绑定产线「${channelRow.lineId}」,成员 agent 只能绑定同产线的节点/配方(目标 ${nodeId} 属于产线「${targetLine}」)。请改绑同产线对象,或将频道解绑/换绑。`)
   }
 
+  if (kind === 'line-recipe') {
+    // 产线配方管理权:nodeId 字段 = 产线 id;要求调用者对该产线「可操控」(管理向授权)
+    const { getDcwLineRepo } = await import('@/server/services/workshop/dcw/dcw-line.repo')
+    const line = getDcwLineRepo().byId(nodeId)
+    if (!line) throw new AppError(404, ErrorCodes.NOT_FOUND, `产线不存在: ${nodeId}`)
+    const mode = lineMode(user, line.id)
+    if (mode !== 'operate') {
+      throw new AppError(403, 'LINE_FORBIDDEN', `无该产线权限:授予产线配方管理权需对产线「${line.name}」拥有可操控权限`)
+    }
+    // 管理向绑定首绑恒 manual(每次 创建/修改/回退 需人工批准);auto 须 PATCH confirm:true 显式切换
+    const binding = getAgentNodeBindingRepo().bind(agentId, nodeId, 'line-recipe', 'manual')
+    if (body.mode === 'auto') {
+      return {
+        binding,
+        modeForced: 'manual',
+        notice: '产线配方管理权默认 manual(该线配方的创建/修改/回退每次需人工批准),body.mode=auto 已被忽略;如需 auto 请对该绑定 PATCH { mode: "auto", confirm: true } 显式确认切换',
+      }
+    }
+    return { binding }
+  }
+
   if (kind === 'recipe') {
     // recipe 绑定:nodeId 字段 = 配方 id;要求调用者对该配方所在产线「可操控」
     const recipe = getDcwController().listRecipes().find(r => r.id === nodeId)

package/server/api/workshop/analysis/index.post.ts

@@ -11,6 +11,21 @@ import { resolveUser } from '@/server/api/workshop/caller'
 import { getDcwLineRepo } from '@/server/services/workshop/dcw/dcw-line.repo'
 import { getAnalysisRepo } from '@/server/services/workshop/analysis/analysis.repo'
 import { recordOps } from '@/server/services/workshop/ops/ops'
+import { requireLineForResource } from '@/server/services/workshop/line-scope'
+
+/** 报告正文/结构化上下文上限(防单条撑爆 SQLite 与列表渲染) */
+const REPORT_MAX_CHARS = 1024 * 1024
+const METRICS_MAX_BYTES = 256 * 1024
+const clampJson = (v: unknown, maxBytes: number): Record<string, unknown> => {
+  const obj = (v ?? {}) as Record<string, unknown>
+  try {
+    const text = JSON.stringify(obj)
+    return text.length <= maxBytes ? obj : { truncated: true, bytes: text.length }
+  }
+  catch {
+    return {}
+  }
+}
 
 export default defineApiHandler(async (event) => {
   const user = resolveUser(event)
@@ -19,6 +34,8 @@ export default defineApiHandler(async (event) => {
   const title = String(body.title ?? '').trim()
   if (!lineId) throw new AppError(400, 'VALIDATION_ERROR' as never, 'line_id 必填。')
   if (!title) throw new AppError(400, 'VALIDATION_ERROR' as never, 'title 必填。')
+  // 写报告是产线维度操作:零授权用户不得向任意产线写入(污染审计轨)
+  requireLineForResource(user, lineId, '分析报告', 'operate')
   const repo = getAnalysisRepo()
   const id = `ar-${randomUUID().slice(0, 8)}`
   const now = new Date().toISOString()
@@ -31,14 +48,14 @@ export default defineApiHandler(async (event) => {
     category: String(body.category ?? 'eda-pipeline').slice(0, 60),
     summary: String(body.summary ?? '').slice(0, 500),
     conclusions: Array.isArray(body.conclusions) ? (body.conclusions as unknown[]).map(c => String(c)) : [],
-    report: String(body.report ?? ''),
-    metrics: (body.metrics ?? {}) as Record<string, unknown>,
+    report: String(body.report ?? '').slice(0, REPORT_MAX_CHARS),
+    metrics: clampJson(body.metrics, METRICS_MAX_BYTES),
     recipeId: String(body.recipe_id ?? ''),
     recipeVersion: String(body.recipe_version ?? ''),
     windowFrom: body.window_from ? String(body.window_from) : null,
     windowTo: body.window_to ? String(body.window_to) : null,
     dataSources: String(body.data_sources ?? ''),
-    context,
+    context: clampJson(context, METRICS_MAX_BYTES),
     channelId: '',
     channelName: '',
     actor: user.id,

package/server/api/workshop/assets/devices/index.post.ts

@@ -1,53 +1,55 @@
-/**
- * POST /api/workshop/assets/devices —— 上传设备/实体 3D 模型(拖入小镇生成数字孪生)。
- * - Bearer 用户 token;multipart: file(.glb/.gltf)+ name(可选)
- * - 校验:扩展名白名单(glb/gltf/obj/fbx)+ 尺寸上限(30MB,3D 模型比贴图大)
- * - 写入 public/assets/game/devices/<id>.<ext>,运行期扫描接口即时可见
- * - 返回 { asset: SceneModelAsset }
- */
-import { readMultipartFormData } from 'h3'
-import { resolveUser } from '@/server/api/workshop/caller'
-import { AppError } from '@/server/utils/errors'
-import { defineApiHandler } from '@/server/utils/response'
-import fs from 'node:fs'
-import path from 'node:path'
-
-const ALLOWED_EXT = new Set(['.glb', '.gltf', '.obj', '.fbx'])
-const MAX_BYTES = 30 * 1024 * 1024
-
-export default defineApiHandler(async (event) => {
-  resolveUser(event)
-  const parts = await readMultipartFormData(event)
-  if (!parts || parts.length === 0) throw new AppError(400, 'BAD_REQUEST', '缺少上传文件(multipart form-data)')
-
-  let file: { data: Uint8Array, name: string } | null = null
-  let name = ''
-  for (const p of parts) {
-    if (p.name === 'file' && p.data) file = { data: p.data, name: p.filename ?? 'device.glb' }
-    else if (p.name === 'name') name = (p.data?.toString() ?? '').trim()
-  }
-  if (!file) throw new AppError(400, 'BAD_REQUEST', '缺 file 字段')
-  const ext = path.extname(file.name).toLowerCase()
-  if (!ALLOWED_EXT.has(ext)) throw new AppError(400, 'UNSUPPORTED_TYPE', `不支持的模型类型: ${ext}(仅 ${[...ALLOWED_EXT].join('/')})`)
-  if (file.data.length > MAX_BYTES) throw new AppError(400, 'TOO_LARGE', '文件超过 30MB 上限')
-
-  const id = `dev-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 7)}`
-  const devDir = path.join(process.cwd(), 'public', 'assets', 'game', 'devices')
-  fs.mkdirSync(devDir, { recursive: true })
-  const filePath = path.join(devDir, `${id}${ext}`)
-  fs.writeFileSync(filePath, file.data)
-
-  return {
-    asset: {
-      id: `dev-folder-${id}`,
-      name: name || file.name.replace(/\.[^.]+$/, ''),
-      file: `/assets/game/devices/${id}${ext}`,
-      category: 'device',
-      fileType: ext.slice(1),
-      defaultScale: 1,
-      size: file.data.length,
-      thumbnailPath: null,
-      key: id,
-    },
-  }
-})
+/**
+ * POST /api/workshop/assets/devices —— 上传设备/实体 3D 模型(拖入小镇生成数字孪生)。
+ * - Bearer 用户 token;multipart: file(.glb/.gltf)+ name(可选)
+ * - 校验:扩展名白名单(glb/gltf/obj/fbx)+ 尺寸上限(30MB,3D 模型比贴图大)
+ * - 写入 public/assets/game/devices/<id>.<ext>,运行期扫描接口即时可见
+ * - 返回 { asset: SceneModelAsset }
+ */
+import { readMultipartFormData } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { AppError } from '@/server/utils/errors'
+import { defineApiHandler } from '@/server/utils/response'
+import fs from 'node:fs'
+import path from 'node:path'
+import { assertAssetManager } from '@/server/utils/asset-auth'
+
+const ALLOWED_EXT = new Set(['.glb', '.gltf', '.obj', '.fbx'])
+const MAX_BYTES = 30 * 1024 * 1024
+
+export default defineApiHandler(async (event) => {
+  const user = resolveUser(event)
+  assertAssetManager(user, '上传设备模型')
+  const parts = await readMultipartFormData(event)
+  if (!parts || parts.length === 0) throw new AppError(400, 'BAD_REQUEST', '缺少上传文件(multipart form-data)')
+
+  let file: { data: Uint8Array, name: string } | null = null
+  let name = ''
+  for (const p of parts) {
+    if (p.name === 'file' && p.data) file = { data: p.data, name: p.filename ?? 'device.glb' }
+    else if (p.name === 'name') name = (p.data?.toString() ?? '').trim()
+  }
+  if (!file) throw new AppError(400, 'BAD_REQUEST', '缺 file 字段')
+  const ext = path.extname(file.name).toLowerCase()
+  if (!ALLOWED_EXT.has(ext)) throw new AppError(400, 'UNSUPPORTED_TYPE', `不支持的模型类型: ${ext}(仅 ${[...ALLOWED_EXT].join('/')})`)
+  if (file.data.length > MAX_BYTES) throw new AppError(400, 'TOO_LARGE', '文件超过 30MB 上限')
+
+  const id = `dev-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 7)}`
+  const devDir = path.join(process.cwd(), 'public', 'assets', 'game', 'devices')
+  fs.mkdirSync(devDir, { recursive: true })
+  const filePath = path.join(devDir, `${id}${ext}`)
+  fs.writeFileSync(filePath, file.data)
+
+  return {
+    asset: {
+      id: `dev-folder-${id}`,
+      name: name || file.name.replace(/\.[^.]+$/, ''),
+      file: `/assets/game/devices/${id}${ext}`,
+      category: 'device',
+      fileType: ext.slice(1),
+      defaultScale: 1,
+      size: file.data.length,
+      thumbnailPath: null,
+      key: id,
+    },
+  }
+})

package/server/api/workshop/channels/[id]/tasks/index.post.ts

@@ -48,6 +48,8 @@ const submitTaskSchema = z.object({
     intervalMs: z.number().int().min(100).max(86_400_000).optional(),
     maxIterations: z.number().int().min(1).max(10_000).optional(),
     goalCriteria: z.string().optional(),
+    /** goal:显式声明无交付目标(缺省 default=收口必须有真实交付物) */
+    completionPolicy: z.enum(['default', 'no-deliverable']).optional(),
     stages: z.array(z.object({
       name: z.string(),
       description: z.string(),

package/server/api/workshop/channels/[id]/twin-profile.patch.ts

@@ -17,6 +17,7 @@ import { defineApiHandler } from '@/server/utils/response'
 import { AppError } from '@/server/utils/errors'
 import { getChannelTwinProfile, setHybridChannelProfile, assertModelBindableToChannel } from '@/server/services/workshop/aml/twin/channel-profile'
 import { getWorkshopManager } from '@/server/plugins/workshop'
+import { recordOps } from '@/server/services/workshop/ops/ops'
 
 const patchSchema = z.object({
   optimizationMode: z.enum(['exploration', 'aml']).optional(),
@@ -26,9 +27,12 @@ const patchSchema = z.object({
 })
 
 export default defineApiHandler(async (event) => {
-  resolveUser(event)
+  // 治理档位/目标/生产模型绑定均为频道管理字段:切换 bounded_auto 等于放开审批面,
+  // 与 execution-mode 同档,必须 owner-only(此前仅认证不验属主 → 任意用户可绕 HITL)。
+  const user = resolveUser(event)
   const id = getRouterParam(event, 'id') ?? ''
   if (!id) throw new AppError(400, 'VALIDATION_ERROR', 'channel id 必填')
+  getWorkshopManager().requireChannelOwner(id, user, 'channel')
   const body = await readValidatedBody(event, zValidator(patchSchema))
   const prev = getChannelTwinProfile(id)
   if (prev.profile !== 'aml_optimization' && prev.profile !== 'hybrid_twin') {
@@ -62,6 +66,21 @@ export default defineApiHandler(async (event) => {
   }
 
   setHybridChannelProfile({ ...next, createdBy: 'api' })
+  // 治理相关变更入审计轨(与 execution-mode.patch 同口径):controlPolicy 放行面 / 生产模型绑定
+  if (body.controlPolicy !== undefined || body.boundModelId !== undefined) {
+    recordOps({
+      at: new Date().toISOString(),
+      actor: user.id,
+      actorName: user.name,
+      actorKind: 'user',
+      action: 'channel.twin_profile',
+      kind: 'system',
+      summary: `频道孪生配置变更(档位 ${prev.controlPolicy}→${next.controlPolicy}${body.boundModelId !== undefined ? `, 模型 ${prev.boundModelId ?? '无'}→${next.boundModelId ?? '无'}` : ''})`,
+      targetKind: 'channel',
+      targetId: id,
+      detail: { channelId: id, controlPolicy: next.controlPolicy, boundModelId: next.boundModelId ?? null },
+    })
+  }
   // 模式/绑定/goal 变更 → 回收成员运行时:下次装配由 prompt-composer 注入新工况提示词
   try {
     await getWorkshopManager().recycleChannelForTwinProfile(id)

package/server/api/workshop/daq/[id]/ingest.post.ts

@@ -1,11 +1,20 @@
 /**
  * POST /api/workshop/daq/:id/ingest —— 外部 API 推送多源异构数采样本。
  *
+ * 值域契约(路线 B:REST 收物理值):
+ *   - 标量 value = 已标定物理值(engineering value),与轮询/MQTT 管线一致;
+ *     本端点不做 transform(转换由调用方/驱动完成)。请求可携带可选
+ *     `valueDomain: 'engineering'` 显式声明值域(缺省按 engineering;传其它值 400)。
+ *     节点若配置了非恒等 transform,本端点仅打 warn 提醒调用方自行负责标定,
+ *     不改变"不做转换"的行为;
+ *   - 向量/图像帧走 processExternalFrame 管线(sink 处理器/质量门/落存储)。
+ *
  * 适用:第三方/边缘系统每次调用返回一张图片或一个数组(如膜厚模头点位数组),
  * 由调用方主动推入本平台,走与网关采样完全相同的队列/入库/打标/告警链路。
  *
  * body:
- *   { at?: ISO, value?: number, points?: number[], metrics?: {k:number},
+ *   { at?: ISO, value?: number, valueDomain?: 'engineering',
+ *     points?: number[], metrics?: {k:number},
  *     state?: 'ok'|'warn'|'alarm'|'offline',
  *     image?: { base64|data: string, mime?: string, width?: number, height?: number } | string }
  *
@@ -36,6 +45,8 @@ let wideWindowWarned = false
 interface IngestBody {
   at?: string
   value?: number | string
+  /** 值域声明:缺省/仅支持 'engineering'(REST ingest 按契约收物理值,不做 transform);其它值 400 */
+  valueDomain?: string
   points?: unknown
   values?: unknown
   metrics?: Record<string, unknown>
@@ -183,8 +194,21 @@ export default defineApiHandler(async (event) => {
     }
   }
   else {
+    // 值域契约:缺省按 engineering;显式传其它值 → 400(见文件头"值域契约")。
+    const valueDomain = body.valueDomain === undefined ? 'engineering' : String(body.valueDomain).trim()
+    if (valueDomain !== 'engineering') {
+      throw new AppError(400, 'VALIDATION_ERROR', `valueDomain 仅支持 "engineering"(REST ingest 按契约接收物理值、不做 transform);收到 "${String(body.valueDomain)}"。`)
+    }
     const value = Number(body.value)
     if (!Number.isFinite(value)) throw new AppError(400, 'VALIDATION_ERROR', '标量节点的载荷必须提供数值 value。')
+    // 非恒等 transform 提醒(kind='none'/缺省=透传即恒等;kind='linear' 且 scale≠1∨offset≠0 才非恒等):
+    // 按契约本端点不做转换 —— 打 warn 提示调用方确认传入的已是物理值。
+    const tf = node.transform
+    const effScale = tf && tf.kind === 'linear' && Number.isFinite(tf.scale) && tf.scale !== 0 ? tf.scale : 1
+    const effOffset = tf && Number.isFinite(tf.offset) ? tf.offset : 0
+    if (effScale !== 1 || effOffset !== 0) {
+      console.warn(`[daq.ingest] 节点 ${node.id}(${node.name})配置了非恒等 transform(scale=${effScale}, offset=${effOffset});REST ingest 按契约不做转换,请确认调用方传的是物理值。`)
+    }
     env = { nodeId: node.id, templateRef: node.templateRef, value, state, at }
   }
 

package/server/api/workshop/daq/index.post.ts

@@ -1,14 +1,18 @@
 /**
  * POST /api/workshop/daq —— 创建数采节点(server 权威实体;拖入场景/加通道入口)。
  * body: { templateRef?, name?, driver?, unit?, decimals?, min?, max?, warnLow?, warnHigh?,
- *         intervalMs?, enabled?, posX?, posZ?, deviceBindingId? }
+ *         intervalMs?, enabled?, posX?, posZ?, deviceBindingId?, fields?, fieldsBase? }
  * 创建后广播 daq.node.changed(added),全部已连客户端即时收敛。
+ *
+ * 多字段展开:MQTT 单 topic 多字段可用 fields(或 driverConfig.fields)一次声明,
+ * 平台展开为多个 scalar 子节点(独立量程/告警,共享一次订阅),响应返回 nodes+groupId。
  */
 import { readBody } from 'h3'
 import { requireRole } from '@/server/api/workshop/caller'
 import { defineApiHandler } from '@/server/utils/response'
 import { bindDaqHost } from '@/server/services/workshop/daq/host-bindings'
 import { getDaqController, type DaqCreateInput } from '@/server/services/workshop/daq/daq-controller'
+import { buildMqttFieldGroup, hasMqttFieldSpecs } from '@/server/services/workshop/daq/field-group'
 import { broadcastSceneEvent } from '../../../services/workshop/scene-events'
 import { recordOps } from '../../../services/workshop/ops/ops'
 import { getDcwLineRepo } from '../../../services/workshop/dcw/dcw-line.repo'
@@ -21,6 +25,46 @@ export default defineApiHandler(async (event) => {
   if (body.lineId && !getDcwLineRepo().byId(body.lineId)) {
     throw new AppError(400, ErrorCodes.VALIDATION_ERROR, `产线不存在: ${body.lineId}`)
   }
+  const driverConfig = (body.driverConfig ?? {}) as Record<string, unknown>
+  if (hasMqttFieldSpecs(driverConfig, body.fields)) {
+    // 一次配置 → N 个子信号节点:先全量校验并构建,再逐个落地;任一失败回滚已建节点
+    const plan = buildMqttFieldGroup(body)
+    if (!plan) throw new AppError(400, ErrorCodes.VALIDATION_ERROR, 'fields 声明为空:至少配置一个字段')
+    const created = []
+    try {
+      for (const input of plan.inputs) created.push(getDaqController().create(input))
+    }
+    catch (err) {
+      for (const n of created) {
+        try {
+          getDaqController().remove(n.id)
+        }
+        catch { /* 回滚尽力而为:失败项由后续巡检/人工清理 */ }
+      }
+      throw err instanceof AppError
+        ? err
+        : new AppError(400, ErrorCodes.VALIDATION_ERROR, `多字段节点创建失败(已回滚 ${created.length} 个):${err instanceof Error ? err.message : String(err)}`)
+    }
+    recordOps({
+      actor: user.id,
+      actorName: user.name,
+      actorKind: 'user',
+      action: 'daq.node.create',
+      kind: 'daq',
+      targetKind: 'daq-node',
+      targetId: plan.groupId,
+      summary: `创建 MQTT 多字段组「${plan.baseName}」(${created.length} 个字段节点)`,
+      lineId: created[0]?.lineId ?? '',
+      detail: { groupId: plan.groupId, fields: plan.inputs.map(i => i.name), driver: 'mqtt' },
+    })
+    return {
+      nodes: created.map(n => n.toView()),
+      groupId: plan.groupId,
+      count: created.length,
+      // 兼容旧调用方:单节点语义取第一个
+      node: created[0]?.toView() ?? null,
+    }
+  }
   const node = getDaqController().create(body)
   recordOps({
     actor: user.id,