agentworkshop 0.8.5 → 0.8.6

package/server/api/workshop/agents/[id].patch.ts

@@ -9,6 +9,7 @@ import { zValidator } from '../../../utils/validate'
 import { defineApiHandler } from '../../../utils/response'
 import { AppError } from '../../../utils/errors'
 import { getWorkshopManager } from '../../../plugins/workshop'
+import { assertSpawnConfigAllowed } from '../../../services/workshop/agents/harness-spawn-policy'
 
 const patchAgentSchema = z.object({
   name: z.string().min(1).optional(),
@@ -26,5 +27,7 @@ export default defineApiHandler(async (event) => {
   const agent = manager.getAgent(agentId)
   if (!agent) throw new AppError(404, 'NOT_FOUND', `Agent 不存在: ${agentId}`)
   manager.requireWritable(agent.ownerUserId, user, 'Agent 模板')
+  // 启动面收权(2026-10-28):command/args/cwd/env 只有 admin 能改,且命令须与引擎同族
+  assertSpawnConfigAllowed(String(body.harness ?? agent.harness), body.config, user)
   return manager.updateAgent(agentId, body)
 })

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

@@ -8,6 +8,7 @@ import { readValidatedBody } from 'h3'
 import { zValidator } from '../../../utils/validate'
 import { defineApiHandler } from '../../../utils/response'
 import { getWorkshopManager } from '../../../plugins/workshop'
+import { assertSpawnConfigAllowed } from '../../../services/workshop/agents/harness-spawn-policy'
 
 const createAgentSchema = z.object({
   name: z.string().min(1, 'name 必填'),
@@ -19,6 +20,8 @@ const createAgentSchema = z.object({
 export default defineApiHandler(async (event) => {
   const user = resolveUser(event)
   const body = await readValidatedBody(event, zValidator(createAgentSchema))
+  // 启动面收权(2026-10-28):非 admin 不得指定 command/args/cwd/env
+  assertSpawnConfigAllowed(body.harness, body.config, user)
   return getWorkshopManager().createAgent({
     name: body.name,
     harness: body.harness,

package/server/api/workshop/channel-templates/[id].patch.ts

@@ -9,6 +9,7 @@ import { defineApiHandler } from '../../../utils/response'
 import { AppError } from '../../../utils/errors'
 import { resolveUser } from '../caller'
 import { getWorkshopManager } from '../../../plugins/workshop'
+import { assertSpawnConfigAllowed } from '../../../services/workshop/agents/harness-spawn-policy'
 
 const memberSchema = z.union([
   z.object({ templateId: z.string().min(1), role: z.enum(['lead', 'worker']) }),
@@ -44,5 +45,9 @@ export default defineApiHandler(async (event) => {
   const tpl = manager.getChannelTemplate(templateId)
   if (!tpl) throw new AppError(404, 'NOT_FOUND', `Channel 模板不存在: ${templateId}`)
   manager.requireWritable(tpl.ownerUserId, user, 'Channel 模板')
+  if (body.lead) assertSpawnConfigAllowed(body.lead.harness, body.lead.config, user)
+  for (const m of body.members ?? []) {
+    if ('inline' in m) assertSpawnConfigAllowed(m.inline.harness, m.inline.config, user)
+  }
   return manager.updateChannelTemplate(templateId, body)
 })

package/server/api/workshop/channel-templates/index.post.ts

@@ -9,6 +9,7 @@ import { zValidator } from '../../../utils/validate'
 import { defineApiHandler } from '../../../utils/response'
 import { AppError } from '../../../utils/errors'
 import { getWorkshopManager } from '../../../plugins/workshop'
+import { assertSpawnConfigAllowed } from '../../../services/workshop/agents/harness-spawn-policy'
 
 const memberSchema = z.union([
   z.object({ templateId: z.string().min(1), role: z.enum(['lead', 'worker']) }),
@@ -40,6 +41,11 @@ export default defineApiHandler(async (event) => {
   const user = resolveUser(event)
   const body = await readValidatedBody(event, zValidator(createSchema))
   const manager = getWorkshopManager()
+  // 启动面收权(2026-10-28):模板内联成员同样不得由非 admin 指定 command/args/cwd/env
+  if (body.lead) assertSpawnConfigAllowed(body.lead.harness, body.lead.config, user)
+  for (const m of body.members ?? []) {
+    if ('inline' in m) assertSpawnConfigAllowed(m.inline.harness, m.inline.config, user)
+  }
   // 成员模板引用校验:引用的 Agent 模板须操作者可读
   for (const m of body.members ?? []) {
     if ('templateId' in m) {

package/server/api/workshop/channels/[id]/agents/[agentId].patch.ts

@@ -8,6 +8,7 @@ import { resolveUser } from '../../../caller'
 import { AppError } from '../../../../../utils/errors'
 import { defineApiHandler } from '../../../../../utils/response'
 import { getWorkshopManager } from '../../../../../plugins/workshop'
+import { assertSpawnConfigAllowed } from '../../../../../services/workshop/agents/harness-spawn-policy'
 
 export default defineApiHandler(async (event) => {
   const channelId = getRouterParam(event, 'id')!
@@ -19,6 +20,10 @@ export default defineApiHandler(async (event) => {
   manager.requireWritable(channel.ownerUserId, user, 'channel')
   const members = await manager.listChannelAgents(channelId)
   if (!members.some(a => a.id === agentId)) throw new AppError(404, 'NOT_FOUND', `成员不存在: ${agentId}`)
+  if (body?.config) {
+    const member = members.find(a => a.id === agentId)!
+    assertSpawnConfigAllowed(member.harness, body.config, user)
+  }
   const patch: { name?: string, config?: Record<string, unknown>, enabled?: number } = {}
   if (typeof body?.name === 'string' && body.name.trim()) patch.name = body.name.trim()
   if (body?.config && typeof body.config === 'object') patch.config = body.config

package/server/api/workshop/channels/[id]/agents/index.get.ts

@@ -2,19 +2,24 @@
  * GET /api/workshop/channels/:id/agents —— channel 成员列表。
  * 双轨鉴权:用户 token(owner/遗留公共可见)或 agent token(本 channel 成员)。
  * - channel 不存在 → 404 NOT_FOUND
+ *
+ * 2026-10-28 安全修复:响应不再回显 agent token(worker 借此冒充 lead);
+ * config 仅属主/admin 可见,且由 DTO 剔除启动类敏感键。
  */
 import { getRouterParam } from 'h3'
 import { resolveUser, resolveCallerOrNull } from '../../../caller'
 import { defineApiHandler } from '../../../../../utils/response'
 import { AppError } from '../../../../../utils/errors'
 import { getWorkshopManager } from '../../../../../plugins/workshop'
+import { channelAgentSummaries } from '../../../../../services/workshop/agents/agent-dto'
 
 export default defineApiHandler(async (event) => {
   const channelId = getRouterParam(event, 'id')!
   const manager = getWorkshopManager()
   // 双轨:优先按用户 token;无用户 token 时接受本 channel 成员的 agent token
+  let user: { id: string, role: string } | null = null
   try {
-    const user = resolveUser(event)
+    user = resolveUser(event)
     manager.getChannelForUser(channelId, user.id)
   }
   catch (err) {
@@ -23,5 +28,6 @@ export default defineApiHandler(async (event) => {
   }
   const channel = (await manager.listChannels()).find(c => c.id === channelId)
   if (!channel) throw new AppError(404, 'NOT_FOUND', `channel 不存在: ${channelId}`)
-  return manager.listChannelAgents(channelId)
+  const includeConfig = Boolean(user && (user.role === 'admin' || channel.ownerUserId === user.id))
+  return channelAgentSummaries(await manager.listChannelAgents(channelId), { includeConfig })
 })

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

@@ -12,6 +12,7 @@ import { zValidator } from '../../../../../utils/validate'
 import { defineApiHandler } from '../../../../../utils/response'
 import { AppError } from '../../../../../utils/errors'
 import { getWorkshopManager, ensureLeadSchedulerLoop } from '../../../../../plugins/workshop'
+import { assertSpawnConfigAllowed } from '../../../../../services/workshop/agents/harness-spawn-policy'
 
 const createAgentSchema = z.object({
   agentId: z.string().min(1).optional(),
@@ -32,6 +33,12 @@ export default defineApiHandler(async (event) => {
   const ch = manager.getChannelForUser(channelId, user.id)
   manager.requireWritable(ch.ownerUserId, user, 'channel')
   const role = body.role ?? 'worker'
+  // 启动面收权(2026-10-28):成员 config 的 command/args/cwd/env 同样只有 admin 可给
+  if (body.harness) assertSpawnConfigAllowed(body.harness, body.config, user)
+  else if (body.config) {
+    const tplHarness = body.agentId ? manager.getAgent(body.agentId)?.harness : undefined
+    if (tplHarness) assertSpawnConfigAllowed(tplHarness, body.config, user)
+  }
   // 克隆模板时校验模板可读(属主/public 含内置/admin;他人 private → 403)
   if (body.agentId) {
     const tpl = manager.getAgent(body.agentId)

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

@@ -1,11 +1,16 @@
 /**
  * GET /api/workshop/channels/:id —— channel 详情(含 workspace 与成员列表)。
  * - channel 不存在 → 404 NOT_FOUND
+ *
+ * 2026-10-28 安全修复:成员列表经 DTO 投影,永不回显 agent token;
+ * config 仅属主/admin 可见。
  */
-import { getRouterParam } from 'h3'
-import { resolveUser } from '../../caller'
+import { getRouterParam } from 'h3'
+import { resolveUser } from '../../caller'
 import { defineApiHandler } from '../../../../utils/response'
-import { getWorkshopManager, ensureLeadSchedulerLoop } from '../../../../plugins/workshop'
+import { getWorkshopManager, ensureLeadSchedulerLoop } from '../../../../plugins/workshop'
+import { channelAgentSummaries } from '../../../../services/workshop/agents/agent-dto'
+
 export default defineApiHandler(async (event) => {
   const channelId = getRouterParam(event, 'id')!
   const user = resolveUser(event)
@@ -14,5 +19,6 @@ export default defineApiHandler(async (event) => {
   const channel = await manager.getChannel(channelId)
   // 兜底:详情请求时确保 lead 的调度循环已装配(如启动恢复遗漏)
   ensureLeadSchedulerLoop(manager, channelId)
-  return channel
+  const includeConfig = user.role === 'admin' || channel.ownerUserId === user.id
+  return { ...channel, agents: channelAgentSummaries(channel.agents, { includeConfig }) }
 })

package/server/api/workshop/channels.post.ts

@@ -9,6 +9,7 @@ import { readValidatedBody } from 'h3'
 import { zValidator } from '../../utils/validate'
 import { defineApiHandler } from '../../utils/response'
 import { getWorkshopManager, ensureLeadSchedulerLoop } from '../../plugins/workshop'
+import { assertSpawnConfigAllowed } from '../../services/workshop/agents/harness-spawn-policy'
 
 const createChannelSchema = z.object({
   name: z.string().min(1, 'name 必填'),
@@ -38,6 +39,8 @@ const createChannelSchema = z.object({
 export default defineApiHandler(async (event) => {
   const user = resolveUser(event)
   const body = await readValidatedBody(event, zValidator(createChannelSchema))
+  // 启动面收权(2026-10-28):lead harness 的 command/args/cwd/env 只有 admin 能指定
+  if (body.leadAgent) assertSpawnConfigAllowed(body.leadAgent.harness, body.leadAgent.config, user)
   const manager = getWorkshopManager()
   const result = await manager.createChannel({
     name: body.name,

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

@@ -17,17 +17,14 @@
  *   - 向量 1..4096 个有限数;图像 ≤10MB 且 MIME image/*;
  *   - at 缺省=当前时间,回填窗默认 ±1h(env AW_DAQ_INGEST_BACKFILL_MS 可调,上限 7 天)。
  */
-import { createHash } from 'node:crypto'
 import { getHeader, getRouterParam, readBody } from 'h3'
 import { resolveUser } from '@/server/api/workshop/caller'
 import { defineApiHandler } from '@/server/utils/response'
 import { getDaqController } from '@/server/services/workshop/daq/daq-controller'
 import { findDaqTemplate } from '@/server/services/workshop/daq/daq-templates'
 import { getDaqQueue } from '@/server/services/workshop/daq/bus'
-import { getObjectStore } from '@/server/services/workshop/daq/objectstore'
-import { daqObjectKey } from '@/server/services/workshop/daq/objectstore/objectstore-port'
 import type { DaqSampleEnvelope } from '@/server/services/workshop/daq/bus/queue-port'
-import { ingestAuthMode, ingestBackfillWindowMs, isWideBackfillWindow, withinBackfillWindow } from '@/server/services/workshop/daq/ingest-policy'
+import { ingestAuthMode, ingestBackfillWindowMs, ingestFutureSkewMs, ingestTimeVerdict, isWideBackfillWindow } from '@/server/services/workshop/daq/ingest-policy'
 import { recordOps } from '@/server/services/workshop/ops/ops'
 import { AppError } from '@/server/utils/errors'
 
@@ -116,8 +113,12 @@ export default defineApiHandler(async (event) => {
   const atMs = atRaw ? Date.parse(atRaw) : now
   if (!Number.isFinite(atMs)) throw new AppError(400, 'VALIDATION_ERROR', `at 不是合法时间: ${atRaw}(示例 2026-10-19T12:00:00+08:00)`)
   const windowMs = ingestBackfillWindowMs()
-  if (!withinBackfillWindow(atMs, now, windowMs)) {
-    throw new AppError(400, 'VALIDATION_ERROR', `at 超出允许范围(±${Math.round(windowMs / 60_000)} 分钟),请检查时区/时钟。`)
+  const verdict = ingestTimeVerdict(atMs, now, windowMs, ingestFutureSkewMs())
+  if (verdict === 'future') {
+    throw new AppError(400, 'FUTURE_TIMESTAMP', `at 超出当前时间允许的前瞻偏差(最多 ${Math.round(ingestFutureSkewMs() / 1000)}s);请校准上游时钟后重试。`)
+  }
+  if (verdict === 'out-of-window') {
+    throw new AppError(400, 'VALIDATION_ERROR', `at 超出允许的回填范围(${Math.round(windowMs / 60_000)} 分钟),请检查时区/时钟。`)
   }
   const at = new Date(atMs).toISOString()
   const state = ['ok', 'warn', 'alarm', 'offline'].includes(String(body.state ?? '')) ? String(body.state) : 'ok'
@@ -141,27 +142,27 @@ export default defineApiHandler(async (event) => {
     }
     if (buf.length === 0) throw new AppError(400, 'VALIDATION_ERROR', '图像内容为空。')
     if (buf.length > IMAGE_MAX_BYTES) throw new AppError(413, 'PAYLOAD_TOO_LARGE', `图像超过 ${IMAGE_MAX_BYTES / 1024 / 1024}MB 上限。`)
-    const objectKey = daqObjectKey(node.id, atMs, mime.includes('jpeg') ? '.jpg' : mime.includes('webp') ? '.webp' : '.png')
-    await getObjectStore().put(objectKey, buf, mime)
-    const sha256 = createHash('sha256').update(buf).digest('hex')
     const width = Number(body.image && typeof body.image === 'object' ? body.image.width : NaN)
     const height = Number(body.image && typeof body.image === 'object' ? body.image.height : NaN)
+    // A-P1-3(2026-10-28 审查):外部推送与驱动采样/推送订阅走**同一个** processFrameSample
+    // —— 模板 sink 管线(thumbnail/deriveMetric/qualityGate)与落对象存储、sha256/size
+    // 计算都在服务端完成,绝不信任调用方自报的指标/指纹,也不绕过质量门。
+    const processed = await getDaqController().processExternalFrame(node, {
+      kind: 'image',
+      blob: buf,
+      mime,
+      width: Number.isFinite(width) ? width : undefined,
+      height: Number.isFinite(height) ? height : undefined,
+      metrics,
+    }, atMs)
+    if (!processed) throw new AppError(400, 'VALIDATION_ERROR', '图像帧被 sink 管线拒绝(模板/处理器配置不支持该帧)。')
     env = {
       nodeId: node.id,
       templateRef: node.templateRef,
-      value: Number((metrics.avg ?? 0).toFixed(node.decimals)),
+      value: Number((processed.frame.metrics?.avg ?? metrics.avg ?? 0).toFixed(node.decimals)),
       state,
       at,
-      frame: {
-        kind: 'image',
-        objectKey,
-        mime,
-        width: Number.isFinite(width) ? width : undefined,
-        height: Number.isFinite(height) ? height : undefined,
-        sha256,
-        size: buf.length,
-        metrics,
-      },
+      frame: processed.frame,
     }
   }
   else if (kind === 'vector') {
@@ -169,13 +170,16 @@ export default defineApiHandler(async (event) => {
     if (!points || points.length === 0) throw new AppError(400, 'VALIDATION_ERROR', '向量节点的载荷必须提供 points 数组。')
     if (points.length > VECTOR_MAX_POINTS) throw new AppError(413, 'PAYLOAD_TOO_LARGE', `向量点数 ${points.length} 超过 ${VECTOR_MAX_POINTS} 上限。`)
     const avg = points.reduce((a, b) => a + b, 0) / points.length
+    // 同上:派生指标由模板 sink 处理器产生(调用方只提供原始点列/可选初值)
+    const processed = await getDaqController().processExternalFrame(node, { kind: 'vector', points, metrics }, atMs)
+    if (!processed) throw new AppError(400, 'VALIDATION_ERROR', '向量帧被 sink 管线拒绝(模板/处理器配置不支持该帧)。')
     env = {
       nodeId: node.id,
       templateRef: node.templateRef,
-      value: Number((metrics.avg ?? avg).toFixed(node.decimals)),
+      value: Number((processed.frame.metrics?.avg ?? metrics.avg ?? avg).toFixed(node.decimals)),
       state,
       at,
-      frame: { kind: 'vector', points, metrics },
+      frame: processed.frame,
     }
   }
   else {

package/server/api/workshop/daq/[id].patch.ts

@@ -5,6 +5,7 @@ import { getRouterParam, readBody } from 'h3'
 import { resolveUser } from '@/server/api/workshop/caller'
 import { requireLineMode } from '@/server/services/workshop/permissions'
 import { defineApiHandler } from '@/server/utils/response'
+import { AppError } from '@/server/utils/errors'
 import { bindDaqHost } from '@/server/services/workshop/daq/host-bindings'
 import { getDaqController, type DaqPatchInput } from '@/server/services/workshop/daq/daq-controller'
 import { broadcastSceneEvent } from '../../../services/workshop/scene-events'
@@ -17,6 +18,13 @@ export default defineApiHandler(async (event) => {
   const body = await readBody<DaqPatchInput>(event) ?? {}
   // 产线权限:参数下发=操控能力(readonly/无权用户 403)
   requireLineMode(user, getDaqController().byId(id)?.lineId, 'operate')
+  // 驱动/连接配置分权(2026-10-28):http/mqtt 驱动的 URL/topic 由 driverConfig 决定,
+  // operate 可借此让服务端连接任意目标;与节点 create 同口径收敛到 admin。
+  const DAQ_ADMIN_ONLY = ['driver', 'driverConfig'] as const
+  const denied = DAQ_ADMIN_ONLY.filter(k => (body as Record<string, unknown>)[k] !== undefined)
+  if (denied.length > 0 && user.role !== 'admin') {
+    throw new AppError(403, 'DAQ_CONFIG_ADMIN_ONLY', `字段「${denied.join('/')}」决定采集落点与协议参数，仅管理员可修改（当前角色 ${user.role}）。`)
+  }
   const node = getDaqController().patch(id, body)
   recordOps({
     actor: user.id,

package/server/api/workshop/daq/alarms.get.ts

@@ -1,16 +1,18 @@
-/**
- * GET /api/workshop/daq/alarms?scope=open|all&limit= —— 报警列表(S5)。
- * open = 未确认(默认);all = 含已确认历史(审计/复盘)。
- */
-import { getQuery } from 'h3'
-import { resolveUser } from '@/server/api/workshop/caller'
-import { defineApiHandler } from '@/server/utils/response'
-import { getDaqController } from '@/server/services/workshop/daq/daq-controller'
-
-export default defineApiHandler(async (event) => {
-  resolveUser(event)
-  const q = getQuery(event)
-  const scope = q.scope === 'all' ? 'all' : 'open'
-  const limit = Math.min(500, Math.max(1, Number(q.limit) || 100))
-  return { alarms: getDaqController().listAlarms(scope, limit) }
-})
+/**
+ * GET /api/workshop/daq/alarms?scope=open|all&limit= —— 报警列表(S5)。
+ * open = 未确认(默认);all = 含已确认历史(审计/复盘)。
+ */
+import { getQuery } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { defineApiHandler } from '@/server/utils/response'
+import { getDaqController } from '@/server/services/workshop/daq/daq-controller'
+import { daqNodeLineId, filterRowsByLine } from '@/server/services/workshop/line-scope'
+
+export default defineApiHandler(async (event) => {
+  const user = resolveUser(event)
+  const q = getQuery(event)
+  const scope = q.scope === 'all' ? 'all' : 'open'
+  const limit = Math.min(500, Math.max(1, Number(q.limit) || 100))
+  const alarms = getDaqController().listAlarms(scope, limit)
+  return { alarms: filterRowsByLine(user, alarms, a => daqNodeLineId(a.nodeId)) }
+})

package/server/api/workshop/daq/infra/reconnect.post.ts

@@ -1,17 +1,33 @@
 /**
  * POST /api/workshop/daq/infra/reconnect —— 手动重连(探测→Docker 拉起→重建后端→恢复/停用采集)。
+ *
+ * 2026-10-28 安全修复:此前仅 resolveUser —— 任意登录用户都能触发 docker compose、
+ * 重建后端并全局启停采样;总控 /daq/controller 却要求 admin/editor,口径不一致。
+ * 同时加单飞:并发 reconnect 会互相打断采集。
  */
-import { resolveUser } from '@/server/api/workshop/caller'
+import { requireRole } from '@/server/api/workshop/caller'
 import { defineApiHandler } from '@/server/utils/response'
+import { AppError } from '@/server/utils/errors'
 import { daqInfraConfig, daqInfraStatus, type DaqInfraConfig } from '@/server/services/workshop/daq/infra'
 
+const g = globalThis as unknown as { __daqReconnectInFlight?: boolean }
+
 export default defineApiHandler(async (event) => {
-  resolveUser(event)
+  requireRole(event, ['admin', 'editor'])
   const apply = (globalThis as unknown as { __daqApplyInfra?: (c: DaqInfraConfig) => Promise<void> }).__daqApplyInfra
   if (!apply) {
     return { infra: { ...daqInfraStatus(), warning: '启动插件未就绪,稍后重试' } }
   }
-  // cfg 由启动插件闭包持有(与运行配置同源);此处触发一次完整装配
-  await apply(daqInfraConfig())
-  return { infra: daqInfraStatus() }
+  if (g.__daqReconnectInFlight) {
+    throw new AppError(409, 'RECONNECT_IN_FLIGHT', '已有一次基础设施重连在执行,请等待完成后再试')
+  }
+  g.__daqReconnectInFlight = true
+  try {
+    // cfg 由启动插件闭包持有(与运行配置同源);此处触发一次完整装配
+    await apply(daqInfraConfig())
+    return { infra: daqInfraStatus() }
+  }
+  finally {
+    g.__daqReconnectInFlight = false
+  }
 })

package/server/api/workshop/daq/test-driver.post.ts

@@ -3,9 +3,13 @@
  * body: { driver: DaqDriverKind, driverConfig: Record<string, string|number|boolean> }
  * → DriverTestResult { ok, message, sampleValue?, latencyMs? }
  * 前端添加节点向导"测试连接"直达;通过后可直接创建节点开始采集。
+ *
+ * 2026-10-28 安全修复:仅 admin/editor 可调用(此前任意登录用户可提交任意连接配置
+ * 让服务端连内网目标);driverConfig.allowPrivateHost 不再接受调用方自填,
+ * 私网白名单只认服务端开关 AW_TEST_DRIVER_ALLOW_PRIVATE=1。
  */
 import { readBody } from 'h3'
-import { resolveUser } from '@/server/api/workshop/caller'
+import { requireRole } from '@/server/api/workshop/caller'
 import { defineApiHandler } from '@/server/utils/response'
 import { bindDaqHost } from '@/server/services/workshop/daq/host-bindings'
 import { getDaqController } from '@/server/services/workshop/daq/daq-controller'
@@ -14,10 +18,13 @@ import { requireDriverKind } from '@/server/services/workshop/daq/drivers'
 import type { DaqDriverKind } from '#shared/daq-protocol'
 
 export default defineApiHandler(async (event) => {
-  resolveUser(event)
+  requireRole(event, ['admin', 'editor'])
   bindDaqHost(broadcastSceneEvent)
   const body = await readBody<{ driver?: DaqDriverKind, driverConfig?: Record<string, string | number | boolean> }>(event) ?? {}
   if (!body.driver) return { ok: false, message: '缺少 driver' }
-  const result = await getDaqController().testDriver(requireDriverKind(body.driver), body.driverConfig ?? {})
+  const cfg: Record<string, string | number | boolean> = { ...(body.driverConfig ?? {}) }
+  delete cfg.allowPrivateHost
+  if (process.env.AW_TEST_DRIVER_ALLOW_PRIVATE === '1') cfg.allowPrivateHost = 'true'
+  const result = await getDaqController().testDriver(requireDriverKind(body.driver), cfg)
   return { test: result }
 })

package/server/api/workshop/dcw/[id]/param-ledger.get.ts

@@ -6,10 +6,16 @@ import { getRouterParam } from 'h3'
 import { resolveUser } from '@/server/api/workshop/caller'
 import { defineApiHandler } from '@/server/utils/response'
 import { getRecipeRollBackManager } from '@/server/services/workshop/dcw/recipe-rollback-manager'
+import { getDcwController } from '@/server/services/workshop/dcw/dcw-controller'
+import { AppError, ErrorCodes } from '@/server/utils/errors'
+import { requireLineForResource } from '@/server/services/workshop/line-scope'
 
 export default defineApiHandler(async (event) => {
-  resolveUser(event)
+  const user = resolveUser(event)
   const id = getRouterParam(event, 'id') ?? ''
+  const node = getDcwController().byId(id)
+  if (!node) throw new AppError(404, ErrorCodes.NOT_FOUND, `控制节点不存在: ${id}`)
+  requireLineForResource(user, node.lineId, '数控节点', 'readonly')
   const ledger = getRecipeRollBackManager().ledger(id)
   return { ledger }
 })

package/server/api/workshop/dcw/[id]/read.post.ts

@@ -8,11 +8,16 @@ import { resolveUser } from '@/server/api/workshop/caller'
 import { defineApiHandler } from '@/server/utils/response'
 import { bindDcwBroadcast, getDcwController } from '@/server/services/workshop/dcw/dcw-controller'
 import { broadcastSceneEvent } from '@/server/services/workshop/scene-events'
+import { AppError, ErrorCodes } from '@/server/utils/errors'
+import { requireLineForResource } from '@/server/services/workshop/line-scope'
 
 export default defineApiHandler(async (event) => {
-  resolveUser(event)
+  const user = resolveUser(event)
   bindDcwBroadcast(broadcastSceneEvent)
   const id = getRouterParam(event, 'id') ?? ''
+  const node = getDcwController().byId(id)
+  if (!node) throw new AppError(404, ErrorCodes.NOT_FOUND, `控制节点不存在: ${id}`)
+  requireLineForResource(user, node.lineId, '数控节点', 'readonly')
   const read = await getDcwController().readNow(id)
   return { read }
 })

package/server/api/workshop/dcw/[id].patch.ts

@@ -1,40 +1,49 @@
-/**
- * PATCH /api/workshop/dcw/:id —— 单节点参数(名称/驱动/保写周期/量程/启停/落点)。
- *
- * 鉴权:与 write/test/bind 同口径 requireLineMode(..., 'operate')。
- * 本端点可改 driverConfig(落点 host:register)、min/max(直接决定 writeTolerance)、
- * holdIntervalMs(保写心跳周期)与 enabled —— 改完之后**网关自己的心跳**就会把
- * 该节点的既有设定值写进攻击者指定的目标。即「改参数」等价于「远程写 PLC」,
- * 早先此处只有 resolveUser,任何登录用户(零产线授权)都能改任意节点。
- */
-import { createError, getRouterParam, readBody } from 'h3'
-import type { DcwPatchInput } from '@/server/services/workshop/dcw/dcw-controller'
-import { resolveUser } from '@/server/api/workshop/caller'
-import { defineApiHandler } from '@/server/utils/response'
-import { requireLineMode } from '@/server/services/workshop/permissions'
-import { bindDcwBroadcast, getDcwController } from '@/server/services/workshop/dcw/dcw-controller'
-import { broadcastSceneEvent } from '@/server/services/workshop/scene-events'
-import { recordOps } from '@/server/services/workshop/ops/ops'
-
-export default defineApiHandler(async (event) => {
-  const user = resolveUser(event)
-  bindDcwBroadcast(broadcastSceneEvent)
-  const id = getRouterParam(event, 'id') ?? ''
-  const body = await readBody<DcwPatchInput>(event) ?? {}
-  const node0 = getDcwController().byId(id)
-  if (!node0) throw createError({ statusCode: 404, statusMessage: `控制节点不存在: ${id}` })
-  // 目标产线:允许本次 PATCH 迁移产线,则新产线也须有操控权(防止把节点搬到无权产线)
-  const targetLine = body.lineId !== undefined ? String(body.lineId || '') || null : node0.lineId
-  requireLineMode(user, targetLine, 'operate')
-  const node = getDcwController().patch(id, body)
-  // 节点参数/落点/量程/启停变更 = 产线可写面变更,必须进产线日志(含跨线迁移)
-  const changed = Object.keys(body)
-  recordOps({
-    actor: user.id, actorName: user.name, actorKind: 'user',
-    action: 'dcw.patch', kind: 'line', targetKind: 'dcw-node', targetId: id,
-    lineId: node.lineId ?? '',
-    summary: `修改数控节点「${node.name}」(${changed.join('/') || '无变更'})${node0.lineId !== node.lineId ? `:产线 ${node0.lineId || '(无)'} → ${node.lineId || '(无)'}` : ''}`,
-    detail: { keys: changed, fromLine: node0.lineId ?? '', toLine: node.lineId ?? '' },
-  })
-  return { node: node.toView() }
-})
+/**
+ * PATCH /api/workshop/dcw/:id —— 单节点参数(名称/驱动/保写周期/量程/启停/落点)。
+ *
+ * 鉴权:与 write/test/bind 同口径 requireLineMode(..., 'operate')。
+ * 本端点可改 driverConfig(落点 host:register)、min/max(直接决定 writeTolerance)、
+ * holdIntervalMs(保写心跳周期)与 enabled —— 改完之后**网关自己的心跳**就会把
+ * 该节点的既有设定值写进攻击者指定的目标。即「改参数」等价于「远程写 PLC」,
+ * 早先此处只有 resolveUser,任何登录用户(零产线授权)都能改任意节点。
+ */
+import { createError, getRouterParam, readBody } from 'h3'
+import type { DcwPatchInput } from '@/server/services/workshop/dcw/dcw-controller'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { defineApiHandler } from '@/server/utils/response'
+import { AppError } from '@/server/utils/errors'
+import { requireLineMode } from '@/server/services/workshop/permissions'
+import { bindDcwBroadcast, getDcwController } from '@/server/services/workshop/dcw/dcw-controller'
+import { broadcastSceneEvent } from '@/server/services/workshop/scene-events'
+import { recordOps } from '@/server/services/workshop/ops/ops'
+
+export default defineApiHandler(async (event) => {
+  const user = resolveUser(event)
+  bindDcwBroadcast(broadcastSceneEvent)
+  const id = getRouterParam(event, 'id') ?? ''
+  const body = await readBody<DcwPatchInput>(event) ?? {}
+  const node0 = getDcwController().byId(id)
+  if (!node0) throw createError({ statusCode: 404, statusMessage: `控制节点不存在: ${id}` })
+  // 目标产线:允许本次 PATCH 迁移产线,则新产线也须有操控权(防止把节点搬到无权产线)
+  const targetLine = body.lineId !== undefined ? String(body.lineId || '') || null : node0.lineId
+  requireLineMode(user, targetLine, 'operate')
+  // 落点/安全配置分权(2026-10-28):operate 只能改运行参数,不能改"往哪个设备写、
+  // 量程/步限/保持窗、标定函数"。driverConfig 支持 hook/任意 host,等价于代码执行与
+  // 跨线重定向,必须与 create 同权(admin)。此前这里只校验 operate。
+  const ADMIN_ONLY_FIELDS = ['driver', 'driverConfig', 'transform', 'min', 'max', 'decimals', 'stepLimit', 'writeLockSeconds', 'lineId'] as const
+  const deniedFields = ADMIN_ONLY_FIELDS.filter(k => body[k] !== undefined)
+  if (deniedFields.length > 0 && user.role !== 'admin') {
+    throw new AppError(403, 'DCW_CONFIG_ADMIN_ONLY', `字段「${deniedFields.join('/')}」决定设备落点与安全限界，仅管理员可修改（当前角色 ${user.role}）。运行参数（name/enabled/holdIntervalMs/readIntervalMs/semantics/位置）可由产线操控者调整。`)
+  }
+  const node = getDcwController().patch(id, body)
+  // 节点参数/落点/量程/启停变更 = 产线可写面变更,必须进产线日志(含跨线迁移)
+  const changed = Object.keys(body)
+  recordOps({
+    actor: user.id, actorName: user.name, actorKind: 'user',
+    action: 'dcw.patch', kind: 'line', targetKind: 'dcw-node', targetId: id,
+    lineId: node.lineId ?? '',
+    summary: `修改数控节点「${node.name}」(${changed.join('/') || '无变更'})${node0.lineId !== node.lineId ? `:产线 ${node0.lineId || '(无)'} → ${node.lineId || '(无)'}` : ''}`,
+    detail: { keys: changed, fromLine: node0.lineId ?? '', toLine: node.lineId ?? '' },
+  })
+  return { node: node.toView() }
+})

package/server/api/workshop/dcw/journal/index.get.ts

@@ -1,21 +1,25 @@
 /**
  * GET /api/workshop/dcw/journal —— 参数变更账本查询(在册历史;append-only)。
  * 查询参数:nodeId / lineId / source / limit。
+ * 2026-10-28:显式 lineId 需只读授权;未指定时按调用者可见产线过滤。
  */
 import { getQuery } from 'h3'
 import { resolveUser } from '@/server/api/workshop/caller'
 import { defineApiHandler } from '@/server/utils/response'
 import { getRecipeRollBackManager } from '@/server/services/workshop/dcw/recipe-rollback-manager'
+import { filterRowsByLine, requireLineForResource } from '@/server/services/workshop/line-scope'
 
 export default defineApiHandler(async (event) => {
-  resolveUser(event)
+  const user = resolveUser(event)
   const q = getQuery(event)
+  const lineId = q.lineId ? String(q.lineId) : undefined
+  if (lineId) requireLineForResource(user, lineId, '产线', 'readonly')
   const limit = Number(q.limit ?? 100)
   const anchors = getRecipeRollBackManager().journal({
     nodeId: q.nodeId ? String(q.nodeId) : undefined,
-    lineId: q.lineId ? String(q.lineId) : undefined,
+    lineId,
     source: q.source ? String(q.source) : undefined,
     limit: Number.isFinite(limit) ? Math.min(limit, 500) : 100,
   })
-  return { anchors }
+  return { anchors: filterRowsByLine(user, anchors, a => a.lineId) }
 })

package/server/api/workshop/dcw/mes-artifacts/file.get.ts

@@ -10,6 +10,9 @@ import { readFileSync, statSync } from 'node:fs'
 import { basename, join, resolve, sep } from 'node:path'
 import { resolveUser } from '@/server/api/workshop/caller'
 import { mesArtifactsRoot } from '@/server/services/workshop/mes/mes-hook'
+import { getDcwController } from '@/server/services/workshop/dcw/dcw-controller'
+import { AppError, ErrorCodes } from '@/server/utils/errors'
+import { requireLineForResource } from '@/server/services/workshop/line-scope'
 
 const MIME_OF = (name: string): string => {
   const n = name.toLowerCase()
@@ -22,13 +25,16 @@ const MIME_OF = (name: string): string => {
 }
 
 export default defineEventHandler(async (event) => {
-  resolveUser(event)
+  const user = resolveUser(event)
   const q = getQuery(event)
   const nodeId = String(q.node_id ?? '').trim().slice(0, 64)
   const name = basename(String(q.name ?? '').trim())
   if (!nodeId || !name) {
     throw createError({ statusCode: 400, statusMessage: 'node_id 与 name 必填' })
   }
+  const node = getDcwController().byId(nodeId)
+  if (!node) throw new AppError(404, ErrorCodes.NOT_FOUND, `控制节点不存在: ${nodeId}`)
+  requireLineForResource(user, node.lineId, 'MES 点位', 'readonly')
   const root = resolve(join(mesArtifactsRoot(), nodeId))
   const file = resolve(join(root, name))
   if (file !== root && !file.startsWith(root + sep)) {