agentworkshop 0.7.39 → 0.7.41

package/server/services/system-config.ts

@@ -44,8 +44,10 @@ export interface ConfigGroup {
   label: string
   labelKey?: string
   description: string
-  /** 排序权重(小在前);内置分组按 schema 声明顺序 ×10 */
-  order: number
+  /** 排序权重(小在前);内置分组按 schema 声明顺序 ×10。
+   *  可缺省:持久化条目与插件声明允许不写 order,由 shared/config/groups.mjs 的
+   *  mergeGroups 沿用内置声明顺序兜底(消费侧见 nextGroupOrder/updateGroup 均按可缺省处理)。 */
+  order?: number
   /** 前端默认折叠态(用户本地展开偏好优先) */
   collapsed: boolean
   collapsible: boolean
@@ -105,6 +107,23 @@ export interface ConfigEventPayload {
 
 type Listener = (payload: ConfigEventPayload) => void
 
+/** runtimeConfig 的动态视图:PUBLIC_FIELDS(public.*)/ROOT_FIELDS(根字段)/daq.* 三处动态读写共用 */
+type RuntimeConfigView = Record<string, unknown> & { public: Record<string, unknown> }
+
+/** 从 catch 的 unknown 值取可读错误文本(与原先的 String(err?.message ?? err) 运行时完全等价) */
+function errorText(err: unknown): string {
+  return String((err as { message?: unknown } | null | undefined)?.message ?? err)
+}
+
+/** 以可写记录视图取 runtimeConfig.daq:缺失/非对象时就地落一个空对象(与原先的兜底赋值等价) */
+function daqView(rc: RuntimeConfigView): Record<string, unknown> {
+  const current = rc.daq
+  if (current && typeof current === 'object') return current as Record<string, unknown>
+  const created: Record<string, unknown> = {}
+  rc.daq = created
+  return created
+}
+
 declare global {
   var __systemConfig: SystemConfigService | undefined
 }
@@ -169,7 +188,7 @@ export class SystemConfigService {
       }
     }
     catch (err) {
-      console.warn('[system-config] 遗留设置迁移失败(不阻断启动):', String(err?.message ?? err))
+      console.warn('[system-config] 遗留设置迁移失败(不阻断启动):', errorText(err))
     }
   }
 
@@ -217,7 +236,7 @@ export class SystemConfigService {
       saveGroups(toSave, this.groupsPath)
     }
     catch (err) {
-      console.warn('[system-config] 分组注册表落盘失败(本次仅内存生效):', String(err?.message ?? err))
+      console.warn('[system-config] 分组注册表落盘失败(本次仅内存生效):', errorText(err))
     }
   }
 
@@ -345,7 +364,8 @@ export class SystemConfigService {
 
   /** 从当前 runtimeConfig 读取某 key 的构建期基准值 */
   private readBase(key: string): unknown {
-    const rc = useRuntimeConfig() as Record<string, unknown>
+    const rc = useRuntimeConfig() as RuntimeConfigView
+    // 保留 ?.:public 缺失时按 undefined 处理(与改动前一致,不引入抛错路径)
     if (PUBLIC_FIELDS[key]) return rc.public?.[PUBLIC_FIELDS[key]]
     if (ROOT_FIELDS[key]) return rc[ROOT_FIELDS[key]]
     if (key.startsWith(DAQ_PREFIX)) return getPath(rc.daq, key.slice(DAQ_PREFIX.length))
@@ -357,7 +377,7 @@ export class SystemConfigService {
    *  视图以本服务内存 effective 为唯一实时源，前端经 SSE 消费；SSR 读取在下次启动后对齐。 */
   private applyToRuntime(key: string, value: unknown): void {
     try {
-      const rc = useRuntimeConfig() as Record<string, unknown>
+      const rc = useRuntimeConfig() as RuntimeConfigView
       if (PUBLIC_FIELDS[key]) {
         rc.public[PUBLIC_FIELDS[key]] = value
         return
@@ -367,8 +387,7 @@ export class SystemConfigService {
         return
       }
       if (key.startsWith(DAQ_PREFIX)) {
-        if (!rc.daq || typeof rc.daq !== 'object') rc.daq = {}
-        setPath(rc.daq, key.slice(DAQ_PREFIX.length), value)
+        setPath(daqView(rc), key.slice(DAQ_PREFIX.length), value)
       }
     }
     catch {
@@ -456,7 +475,7 @@ export class SystemConfigService {
       if (existsSync(this.root)) this.watcher.push(watch(this.root, { persistent: false }, handler))
     }
     catch (err) {
-      console.warn('[system-config] 文件监听不可用（外部写入将不热重载）:', String(err?.message ?? err))
+      console.warn('[system-config] 文件监听不可用（外部写入将不热重载）:', errorText(err))
     }
   }
 

package/server/services/workshop/agents/adapters/one-shot-cli-agent.ts

@@ -19,6 +19,7 @@ import type { ChildProcess } from 'node:child_process'
 import { createLogger } from '../../logger'
 import type {
   AgentEvent,
+  AgentInterface,
   AgentRunContext,
   AgentRunRequest,
 } from '../agent-interface'
@@ -183,7 +184,7 @@ export class OneShotCliAgentImpl extends BaseAgentImpl implements AgentInterface
   }
 
   /** HITL:一次性 CLI 家族无程序化审批面(能力面如实声明 hitl:false) */
-  async respondHitl(): Promise<void> {
+  override async respondHitl(): Promise<void> {
     throw new Error(`${this.spec.harnessId} 无 HITL 应答面`)
   }
 

package/server/services/workshop/agents/agent-interface.ts

@@ -72,8 +72,10 @@ export interface AgentWorkspace {
     toChannelName: string
     toLeadAgentId: string
   }>
-  /** (仅 lead)其他团队概览:同主其余 channel 的场景任务(进行中/近期完成)——跨团队协同的观察面 */
-  listOtherTeams(): Promise<Array<{
+  /** (仅 lead)其他团队概览:同主其余 channel 的场景任务(进行中/近期完成)——跨团队协同的观察面。
+   *  同步返回:唯一实现(manager.listOtherTeamsOverview)与工具桥直调方(manager.invokeAgentWorkspaceTool)均按数组消费;
+   *  声明为 Promise 会与实现漂移(await 同步值仍合法,故异步消费方不受影响)。 */
+  listOtherTeams(): Array<{
     channelId: string
     name: string
     description: string
@@ -82,16 +84,16 @@ export interface AgentWorkspace {
     sharedMemories: number
     activeTasks: Array<{ id: string, title: string, state: string }>
     recentCompleted: Array<{ title: string }>
-  }>>
-  /** (全员)跨团队共享记忆检索:其他 channel 的 __team__ 公共域,只读,带团队归属 */
-  searchOtherTeamsMemory(input: { query: string, limit?: number }): Promise<Array<{
+  }>
+  /** (全员)跨团队共享记忆检索:其他 channel 的 __team__ 公共域,只读,带团队归属。同步返回,同 listOtherTeams */
+  searchOtherTeamsMemory(input: { query: string, limit?: number }): Array<{
     channelId: string
     channelName: string
     title: string
     content: string
     importance: number
     createdAt: string
-  }>>
+  }>
   /**
    * 拒绝指派给自己的任务(能力/范畴不匹配):任务置 FAILED(调度器改派他人),
    * 并向派发方(任务创建者,缺省 channel lead)回执拒绝原因。

package/server/services/workshop/agents/base-agent.ts

@@ -43,11 +43,24 @@ export interface BaseAgentIdentity {
   channelId?: string
 }
 
+/**
+ * configRecord() 的视图类型:基类真正读取的公共配置键。
+ * 各 harness 的强类型配置(XxxAgentConfig)均以可选键声明这三项 → 子类直接 `return this.config` 即满足。
+ * 刻意不用 Record<string, unknown> 当返回类型:那会逼迫子类配置类型打开 index signature,
+ * 让子类内部配置键的拼写错误静默退化为 unknown(类型洞),而基类实际只用这三个键。
+ */
+export interface BaseAgentConfigView {
+  superviseTimeoutMs?: number
+  systemPromptPrefix?: string
+  scenarioPrompt?: string
+}
+
 export abstract class BaseAgentImpl implements AgentInterface {
   protected workspace: AgentRunContext['workspace'] | null = null
   protected readonly toolState: HostToolSessionState = createSessionState()
   protected readonly bridgeCtx: HostToolBridgeContext
-  protected roster: ReturnType<typeof createRosterCache>
+  /** 名册缓存:仅由 refreshIdentity() 装配(构造函数必经路径),故用明确赋值断言 */
+  protected roster!: ReturnType<typeof createRosterCache>
 
   protected selfAgentId = ''
   protected agentName = 'agent'
@@ -70,8 +83,8 @@ export abstract class BaseAgentImpl implements AgentInterface {
   /** 引擎标识(日志/登记;如 'dsh'/'pi') */
   protected abstract get harnessId(): string
 
-  /** 子类强类型配置的 Record 视图(基类只读公共键) */
-  protected abstract configRecord(): Record<string, unknown>
+  /** 子类强类型配置的公共键视图(基类只读;子类 `return this.config` 即可) */
+  protected abstract configRecord(): BaseAgentConfigView
 
   protected makeRoster(): ReturnType<typeof createRosterCache> {
     return createRosterCache({
@@ -141,7 +154,8 @@ export abstract class BaseAgentImpl implements AgentInterface {
 
   // ===== lead 调度回合(模板方法) =====
 
-  private supervising = false
+  /** supervise 互斥位(子类 supervise 实现与本字段共享同一实例字段,故为 protected;纯可见性修饰,无运行时差异) */
+  protected supervising = false
 
   async supervise(snapshot: SupervisionSnapshot, ctx: AgentRunContext, opts?: { signal?: AbortSignal }): Promise<SupervisionDecision[]> {
     if (this.supervising) return []

package/server/services/workshop/agents/claude-agent.ts

@@ -75,7 +75,9 @@ type PermissionVerdict
 export class ClaudeSdkAgentImpl extends BaseAgentImpl implements AgentInterface {
   private readonly config: ClaudeAgentConfig
 
-  private agentRole: 'lead' | 'worker' = 'worker'
+  // agentRole 由 BaseAgentImpl 持有(protected):子类再声明同名私有字段会以字段初始化器
+  // 覆盖基类 identity 装配的角色(lead 身份丢失)。此处仅收窄可见性声明,运行时代码不变。
+  protected override agentRole: 'lead' | 'worker' = 'worker'
   /** SDK 会话句柄(动态类型:依赖包可能未安装) */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private session: any = null
@@ -162,7 +164,7 @@ export class ClaudeSdkAgentImpl extends BaseAgentImpl implements AgentInterface
   }
 
   /** HITL 应答:canUseTool 挂起的权限请求 → allow/deny(fail-closed) */
-  async respondHitl(kind: string, id: string, outcome: {
+  override async respondHitl(kind: string, id: string, outcome: {
     confirmed?: boolean
     cancelled?: boolean
     comment?: string
@@ -544,7 +546,9 @@ export class ClaudeSdkAgentImpl extends BaseAgentImpl implements AgentInterface
       agentId: this.selfAgentId,
       agentName: this.agentName,
       channelId: this.channelId,
-      pid: null,
+      // claude SDK 是进程内 harness(无子进程 pid):HitlRegisterInput.pid 缺省即"无终端路由"。
+      // 唯一的 pid 消费方 /api/workshop/hitl/respond 只在 omp-dialog 分支用 item.pid 且按真值判定,
+      // 故省略等价于原 pid:null(null 与 undefined 同为假值,协议 AepHitlItem.pid?: number 本不允许 null)。
       method: 'confirm',
       title: `claude 权限请求:${toolName}`,
       detail: JSON.stringify(input).slice(0, 500),

package/server/services/workshop/agents/codex-agent.ts

@@ -27,7 +27,7 @@ import { peerPrompt, systemManual, toolArgsPreview, workerPrompt } from './promp
 import { getHitlRegistry } from './hitl-registry'
 import { harnessSettings } from '../settings'
 import { StdioJsonRpcClient } from './adapters/stdio-jsonrpc'
-import { BaseAgentImpl } from './base-agent'
+import { BaseAgentImpl, type BaseAgentConfigView } from './base-agent'
 import { generateMcpBridgeEnv } from './harness-env'
 
 const log = createLogger('workshop.codex')
@@ -115,7 +115,7 @@ export class CodexAgentImpl extends BaseAgentImpl implements AgentInterface {
     return 'codex'
   }
 
-  protected configRecord(): Record<string, unknown> {
+  protected configRecord(): BaseAgentConfigView {
     return this.config
   }
 
@@ -180,7 +180,7 @@ export class CodexAgentImpl extends BaseAgentImpl implements AgentInterface {
   }
 
   /** HITL 应答:审批请求 → JSON-RPC 应答(decision) */
-  async respondHitl(kind: string, id: string, outcome: {
+  override async respondHitl(kind: string, id: string, outcome: {
     confirmed?: boolean
     cancelled?: boolean
     value?: string

package/server/services/workshop/agents/dsh-agent.ts

@@ -26,7 +26,7 @@ import { peerPrompt, systemManual, toolArgsPreview, workerPrompt } from './promp
 import { getHitlRegistry } from './hitl-registry'
 import { harnessSettings } from '../settings'
 import { StdioJsonRpcClient, type JsonRpcRequestIncoming } from './adapters/stdio-jsonrpc'
-import { BaseAgentImpl } from './base-agent'
+import { BaseAgentImpl, type BaseAgentConfigView } from './base-agent'
 import { generateMcpBridgeEnv } from './harness-env'
 
 const log = createLogger('workshop.dsh')
@@ -106,7 +106,7 @@ export class DshAgentImpl extends BaseAgentImpl implements AgentInterface {
     return 'dsh'
   }
 
-  protected configRecord(): Record<string, unknown> {
+  protected configRecord(): BaseAgentConfigView {
     return this.config
   }
 
@@ -159,7 +159,7 @@ export class DshAgentImpl extends BaseAgentImpl implements AgentInterface {
   }
 
   /** HITL 应答:session/request_permission → allow/reject/cancelled(fail-closed) */
-  async respondHitl(kind: string, id: string, outcome: {
+  override async respondHitl(kind: string, id: string, outcome: {
     confirmed?: boolean
     cancelled?: boolean
     value?: string

package/server/services/workshop/agents/goose-agent.ts

@@ -42,7 +42,6 @@ const spec: OneShotEngineSpec = {
     return args
   },
   promptDelivery: 'arg',
-  promptDelivery: 'arg',
   promptArgFlag: '-t',
   engineEnv: (config) => {
     const key = typeof config.apiKey === 'string' ? config.apiKey : ''

package/server/services/workshop/agents/harness-terminal.ts

@@ -33,9 +33,22 @@ import {
 
 const log = createLogger('workshop.harness-terminal')
 
+/**
+ * 会话 meta:本 hub 只接纳已完成身份绑定的 harness 进程(attachTerminalTap 的入参全为非空字符串),
+ * 故内部用比协议层更窄的类型 —— TermSessionMeta 允许 null 是为了容忍"未绑定进程"的通用视图,
+ * 而此处消费方(hitl-registry.register 要求 agentId: string)不必被迫处理不存在的 null。
+ * 纯类型收窄:任何写入本字段的值本来就只有 attachTerminalTap 一处,且其中无 null。
+ */
+type BoundSessionMeta = Omit<TermSessionMeta, 'agentId' | 'channelId' | 'name' | 'role'> & {
+  agentId: string
+  channelId: string
+  name: string
+  role: 'lead' | 'worker'
+}
+
 /** 终端会话(一个 pid 一份;进程退出后保留缓冲供事后查看) */
 interface TerminalSession {
-  meta: TermSessionMeta
+  meta: BoundSessionMeta
   client: OmpRpcClient
   seq: number
   ring: TermFrame[]

package/server/services/workshop/agents/hermes-agent.ts

@@ -64,7 +64,9 @@ export interface HermesAgentConfig {
 export class HermesAgentImpl extends BaseAgentImpl implements AgentInterface {
   private readonly config: HermesAgentConfig
 
-  private agentRole: 'lead' | 'worker' = 'worker'
+  // agentRole 由 BaseAgentImpl 持有(protected);同名私有声明会遮蔽基类 identity 角色。
+  // 仅收窄可见性声明,运行时代码不变(ensureClient 仍按 ctx.role 同步)。
+  protected override agentRole: 'lead' | 'worker' = 'worker'
   private client: StdioJsonRpcClient | null = null
   private clientStarting: Promise<void> | null = null
   private sessionId: string | null = null
@@ -138,7 +140,7 @@ export class HermesAgentImpl extends BaseAgentImpl implements AgentInterface {
     return 'deferred'
   }
 
-  async respondHitl(kind: string, id: string, outcome: {
+  override async respondHitl(kind: string, id: string, outcome: {
     confirmed?: boolean
     cancelled?: boolean
   }): Promise<void> {

package/server/services/workshop/agents/host-tool-bridge.ts

@@ -21,7 +21,7 @@ import type { WorkspaceTask } from '../types/task'
 import type { RpcHostToolDefinition } from './adapters/omp-rpc-client'
 import { loadHostToolDefs } from '../prompts/loader'
 import { daqRuntimeSettings } from '../settings'
-import { toolAmlDatasetBuild, toolAmlDatasetStats, toolAmlJobCancel, toolAmlJobLogs, toolAmlJobStatus, toolAmlJobSubmit, toolAmlLeaderboard, toolAmlModelPromote, toolAmlModelReference, toolAmlNodeCatalog, toolDaqFrames, toolDaqQuery, toolDcwControl, toolDcwJudge, toolDcwJournal, toolDcwRead, toolDcwRollback, toolLineContext, toolMyIndustrialNodes, toolOpsLog, toolRecipeLog, toolRecipeRollback, toolRecipeUpdate, toolRecipeVersions } from './industrial-tools'
+import { toolAmlDatasetBuild, toolAmlDatasetStats, toolAmlJobCancel, toolAmlJobLogs, toolAmlJobStatus, toolAmlJobSubmit, toolAmlLeaderboard, toolAmlModelPromote, toolAmlModelReference, toolAmlNodeCatalog, toolDaqFrames, toolDaqQuery, toolDcwControl, toolDcwJudge, toolDcwJournal, toolDcwRead, toolDcwRollback, toolLineContext, toolMyIndustrialNodes, toolOpsLog, toolParamControl, toolParamRead, toolRecipeLog, toolRecipeRollback, toolRecipeUpdate, toolRecipeVersions } from './industrial-tools'
 import { listPluginTools, pluginOfTool } from './plugin-tools'
 import { getChannelPluginsRepo } from '../db/channel-plugins.repo'
 import { extractTaskMode } from '../runtime/execution-mode'
@@ -186,6 +186,10 @@ export async function dispatchHostTool(ctx: HostToolBridgeContext, req: HostTool
       return toolDcwControl(identity.agentId, args as { node_id?: string, value?: number | string, hypothesis?: string, task_id?: string })
     case 'dcw_read':
       return toolDcwRead(identity.agentId, args as { node_id?: string })
+    case 'param_control':
+      return toolParamControl(identity.agentId, args as { param?: string, value?: number | string, hypothesis?: string, task_id?: string, line_id?: string })
+    case 'param_read':
+      return toolParamRead(identity.agentId, args as { param?: string, line_id?: string })
     case 'daq_query':
       return toolDaqQuery(identity.agentId, args as Parameters<typeof toolDaqQuery>[1])
     case 'daq_frames':

package/server/services/workshop/agents/industrial-context.ts

@@ -13,6 +13,7 @@ import { getDcwLineRepo } from '../dcw/dcw-line.repo'
 import { getActiveLineRun } from '../dcw/line-run'
 import { findDcwTemplate } from '../dcw/dcw-templates'
 import { getDaqNodeRepo } from '../daq/daq-node.repo'
+import type { DaqNode } from '../daq/daq-node'
 import { findDaqTemplate } from '../daq/daq-templates'
 import { getDeviceTwinRepo } from '../assets/device-twin.repo'
 import { getRecipeRollBackManager } from '../dcw/recipe-rollback-manager'
@@ -159,9 +160,11 @@ export function buildIndustrialContext(agentId: string): string {
     if (twinNames.size > 0) lines.push(`- 关联设备孪生: ${Array.from(twinNames).join(' | ')}`)
     // 当前报警透出(只报本 Agent 绑定的数采节点):越限即报警是工况里最需要
     // Agent 优先感知的事实 —— 不注入的话,Agent 只能靠 daq_query 事后发现
+    // 类型谓词(不收窄就无法在下游安全读 n.name/n.value/n.unit):
+    // `!!n && ...` 与原 `n && ...` 的真值判定完全一致,只补返回类型标注。
     const alarms = daqIds
       .map(id => getDaqNodeRepo().byId(id))
-      .filter(n => n && n.lineId === lineId && n.state === 'alarm')
+      .filter((n): n is DaqNode => !!n && n.lineId === lineId && n.state === 'alarm')
     if (alarms.length > 0) {
       lines.push(`- **当前报警**: ${alarms.map(n => `${n.name} 实时 ${n.value ?? '?'}${n.unit} 处于报警态(越量程或越配方监控窗口)`)},应优先判读(设定-响应滞后 vs 真实异常)并处置`)
     }

package/server/services/workshop/agents/industrial-tools.ts

@@ -19,6 +19,9 @@ import { daqRuntimeSettings } from '../settings'
 import { getDaqNodeRepo } from '../daq/daq-node.repo'
 import { findDaqTemplate } from '../daq/daq-templates'
 import { getRecipeRollBackManager } from '../dcw/recipe-rollback-manager'
+import { getDcwParamRepo } from '../dcw/param-map.repo'
+import { limitsBreakdownOf } from '../dcw/param-limits'
+import type { DcwParamView } from '../../../../shared/dcw-protocol'
 import { getOps, recordOps } from '../ops/ops'
 import { getDcwLineRepo } from '../dcw/dcw-line.repo'
 import { getDcwProductRepo } from '../dcw/dcw-product.repo'
@@ -75,7 +78,10 @@ export async function toolMyIndustrialNodes(agentId: string): Promise<{ text: st
 ---
 通用规则:
 1. 一个 Agent 可绑定多个节点;先读本清单理解每个节点的物理意义与操作守则,再动手。
-2. 数控下发 dcw_control(node_id, value):目标值必须落在「安全量程 ∩ 活动配方工艺窗口」;单次调幅建议按语义卡的步进指引。下发前/后用 dcw_read(node_id) 读 PLC 当前值取证复核(被动观测免审批)。
+2. 数控下发优先用 param_control(param, value) 以**工艺参数**寻址(key 语义稳定,跨批次/换配方不变);
+   dcw_control(node_id, value) 为节点直接寻址的兼容面。设定值受四层限界联锁
+   (节点安全量程 ∩ 工艺参数基准限界 ∩ 活动产品限界 ∩ 活动配方工艺窗口)逐层收窄,
+   越界一律拒绝 —— 用户与 Agent 一体约束,无旁路。下发前/后用 param_read(param) 读 PLC 当前值取证复核(被动观测免审批)。
 3. 数据获取 daq_query(不传 node_id = 全部数采节点),支持按产线/产品/配方/时间检索;解读数据时结合语义卡的判读方法。
 4. 改动设定后等待工艺响应(热惯性/传动惯量)再评估,避免连续大幅调整。
 5. 调控闭环:每次下发自动开一条优化记录(open);观察数采后用 dcw_judge 落判定(keep/rollback/uncertain);
@@ -130,11 +136,8 @@ export async function toolDcwControl(agentId: string, args: { node_id?: string,
     if (approvals.hasPendingFor(agentId, nodeId)) {
       return { text: `你对该节点已有一条待审批的下发指令,请等待用户处理后再发新指令(避免审批堆积)。`, isError: true }
     }
-    const run = node.lineId ? getActiveLineRun(node.lineId) : null
-    const recipe = run ? getDcwController().listRecipes().find(r => r.id === run.recipeId) : undefined
-    const param = recipe?.params.find(p => p.nodeId === nodeId)
-    const detail = `${node.name}(${tpl?.ch ?? node.templateKey})设定 ${value}${node.unit}`
-      + (param && (param.min != null || param.max != null) ? `,配方窗口 ${param.min ?? '-∞'}~${param.max ?? '+∞'}${node.unit}` : `,安全量程 ${node.min}~${node.max}${node.unit}`)
+    const bd = limitsBreakdownOf(node)
+    const detail = `${node.name}(${tpl?.ch ?? node.templateKey})设定 ${value}${node.unit},有效写入区间 ${bd.effective.min}~${bd.effective.max}${node.unit}(${bd.layers.map(l => l.label).join(' ∩ ')})`
     const ap = await approvals.request(agentId, nodeId, 'dcw', detail)
     if (!ap.approved) {
       return { text: `指令未执行:用户${ap.comment.includes('超时') ? '未在时限内批准(超时)' : `拒绝了本次下发`}。用户备注:${ap.comment || '(无)'}` }
@@ -236,6 +239,161 @@ function writeToleranceOf(node: { decimals: number, min: number, max: number }):
   return Math.max(0.5 * 10 ** -node.decimals, (node.max - node.min) * 0.005)
 }
 
+/** 工艺参数解析(param_control/param_read 共用):pp-id 优先,其次按 key;跨产线同名需 line_id 消歧 */
+function resolveParamRef(ref: string, lineId?: string): { ok: true, param: DcwParamView } | { ok: false, text: string, isError: true } {
+  const repo = getDcwParamRepo()
+  const trimmed = String(ref ?? '').trim()
+  if (!trimmed) {
+    return { ok: false, text: 'param 必填:工艺参数 id(pp-*)或参数 key(见 my_industrial_nodes)。', isError: true }
+  }
+  const row = trimmed.startsWith('pp-') ? repo.byId(trimmed) : undefined
+  if (row) {
+    const view = repo.viewOf(row)
+    if (!view) return { ok: false, text: `工艺参数 ${trimmed} 的执行节点已不存在(映射悬空)。`, isError: true }
+    if (lineId && view.lineId !== lineId) {
+      return { ok: false, text: `工艺参数 ${view.key} 不属于产线 ${lineId}(实际归属:${view.lineId || '未分配'})。`, isError: true }
+    }
+    return { ok: true, param: view }
+  }
+  const hits = repo.byKey(trimmed)
+    .map(r => repo.viewOf(r))
+    .filter((v): v is DcwParamView => v != null)
+  const scoped = lineId ? hits.filter(v => v.lineId === lineId) : hits
+  if (scoped.length === 1) return { ok: true, param: scoped[0]! }
+  if (scoped.length === 0) {
+    const catalog = repo.listViews().slice(0, 12).map(v => `${v.key}(${v.name})`).join('、')
+    return { ok: false, text: `未找到工艺参数「${trimmed}」${lineId ? `(产线 ${lineId})` : ''}。可用参数:${catalog || '无 —— 请先让用户创建写控节点生成参数面'}。`, isError: true }
+  }
+  return { ok: false, text: `工艺参数「${trimmed}」命中 ${scoped.length} 条同名映射,请附加 line_id 消歧或改用参数 id(${scoped.map(v => v.id).join(' / ')})。`, isError: true }
+}
+
+/** 参数面权限摘要(工具回包统一口径;不透出寄存器等 PLC 寻址细节) */
+function paramLimitsText(param: DcwParamView): string {
+  const node = getDcwController().byId(param.nodeId)
+  if (!node) return '执行节点已删除'
+  const bd = limitsBreakdownOf(node)
+  const layers = bd.layers.filter(l => l.min != null || l.max != null).map(l => l.label).join(' ∩ ')
+  return `有效写入区间 ${bd.effective.min}~${bd.effective.max}${param.unit}(约束层:${layers || '无'})`
+}
+
+/** 工具:param_control —— 按工艺参数下发设定值(推荐的参数语义寻址面)。
+ *  权限沿用节点绑定(参数 → 执行节点);限界联锁(参数基准 ∩ 产品 ∩ 配方 ∩ 节点安全量程)
+ *  在网关咽喉点统一生效。args.hypothesis 声明本次假设(入册),args.task_id 关联任务。 */
+export async function toolParamControl(agentId: string, args: {
+  param?: string
+  value?: number | string
+  hypothesis?: string
+  task_id?: string
+  line_id?: string
+}): Promise<{ text: string, isError?: boolean }> {
+  const resolved = resolveParamRef(String(args.param ?? ''), args.line_id ? String(args.line_id) : undefined)
+  if (!resolved.ok) return resolved
+  const param = resolved.param
+  const value = Number(args.value)
+  if (!Number.isFinite(value)) {
+    return { text: '设定值 value 必须为数字。', isError: true }
+  }
+  const repo = getAgentNodeBindingRepo()
+  const binding = repo.find(agentId, param.nodeId, 'dcw')
+  if (!binding) {
+    const mine = repo.byAgent(agentId).filter(b => b.kind === 'dcw')
+    return {
+      text: mine.length
+        ? `无权操作工艺参数「${param.key}」(执行节点 ${param.nodeId} 未绑定给你)。你有权控制的数控节点:${mine.map(b => b.nodeId).join(', ')}。`
+        : '你尚未绑定任何数控节点,无权下发控制指令。请在数字孪生界面绑定数控节点。',
+      isError: true,
+    }
+  }
+  const node = getDcwController().byId(param.nodeId)
+  if (!node) {
+    repo.removeAgentNode(agentId, param.nodeId, 'dcw')
+    return { text: `工艺参数「${param.key}」的执行节点已不存在(可能被删除),原绑定已自动清理。`, isError: true }
+  }
+  if (!node.enabled) {
+    return { text: `工艺参数「${param.key}」的执行节点「${node.name}」已停用(控制已暂停),无法下发。`, isError: true }
+  }
+  // 手动确认模式:与 dcw_control 同源审批面,备注回给 Agent
+  if (binding.mode === 'manual') {
+    const approvals = getToolApprovals()
+    if (approvals.hasPendingFor(agentId, param.nodeId)) {
+      return { text: '你对该执行节点已有一条待审批的下发指令,请等待用户处理后再发新指令(避免审批堆积)。', isError: true }
+    }
+    const detail = `工艺参数「${param.key}」(${param.name})设定 ${value}${param.unit},${paramLimitsText(param)}`
+    const ap = await approvals.request(agentId, param.nodeId, 'dcw', detail)
+    if (!ap.approved) {
+      return { text: `指令未执行:用户${ap.comment.includes('超时') ? '未在时限内批准(超时)' : `拒绝了本次下发`}。用户备注:${ap.comment || '(无)'}` }
+    }
+    if (!repo.find(agentId, param.nodeId, 'dcw')) {
+      return { text: '指令未执行:审批通过时你的该节点绑定已被解除(权限在批准时失效)。', isError: true }
+    }
+  }
+  try {
+    const meta = {
+      source: 'agent' as const,
+      actor: agentId,
+      actorName: agentBadgeLabel(agentId),
+      taskId: args.task_id ? String(args.task_id) : undefined,
+      hypothesis: args.hypothesis ? String(args.hypothesis) : '',
+    }
+    const outcome = await getDcwController().writeParam(param.id, value, meta)
+    if (outcome.ok) {
+      const stable = getRecipeRollBackManager().journal({ nodeId: param.nodeId, limit: 10 }).find(a => a.prevValue != null && a.prevValue !== a.newValue)
+      const loopTxt = [
+        outcome.recordId ? `优化记录 ${outcome.recordId} 已开窗(观察数采后 dcw_judge 落判定)` : null,
+        stable ? `上一稳定锚:${stable.prevValue}${param.unit}(可 dcw_rollback 回退)` : null,
+      ].filter(Boolean).join(';')
+      return {
+        text: `下发成功:工艺参数「${param.key}」(${param.name})设定 ${value}${param.unit} → 执行节点「${node.name}」;回读 ${outcome.readback != null ? `${outcome.readback}${param.unit}` : '不支持'}一致。${paramLimitsText(param)}。${outcome.message}${loopTxt ? `\n[调控闭环] ${loopTxt}` : ''}`,
+      }
+    }
+    return { text: `下发失败:${outcome.message}(工艺参数 ${param.key},执行节点「${node.name}」;${paramLimitsText(param)};当前设定值保持 ${node.value ?? '原值'}${param.unit} 未被改动)`, isError: true }
+  }
+  catch (err) {
+    const msg = err instanceof Error ? err.message : String(err)
+    return { text: `下发被拒绝:${msg}(工艺参数 ${param.key};${paramLimitsText(param)})`, isError: true }
+  }
+}
+
+/** 工具:param_read —— 按工艺参数读取 PLC 当前值(被动观测免审批) */
+export async function toolParamRead(agentId: string, args: {
+  param?: string
+  line_id?: string
+}): Promise<{ text: string, isError?: boolean }> {
+  const resolved = resolveParamRef(String(args.param ?? ''), args.line_id ? String(args.line_id) : undefined)
+  if (!resolved.ok) return resolved
+  const param = resolved.param
+  const repo = getAgentNodeBindingRepo()
+  if (!repo.find(agentId, param.nodeId, 'dcw')) {
+    const mine = repo.byAgent(agentId).filter(b => b.kind === 'dcw')
+    return {
+      text: mine.length
+        ? `无权读取工艺参数「${param.key}」(执行节点 ${param.nodeId} 未绑定给你)。你有权读取的数控节点:${mine.map(b => b.nodeId).join(', ')}。`
+        : '你尚未绑定任何数控节点,无权读取控制通道数据。请在数字孪生界面绑定数控节点。',
+      isError: true,
+    }
+  }
+  const node = getDcwController().byId(param.nodeId)
+  if (!node) {
+    repo.removeAgentNode(agentId, param.nodeId, 'dcw')
+    return { text: `工艺参数「${param.key}」的执行节点已不存在(可能被删除),原绑定已自动清理。`, isError: true }
+  }
+  try {
+    const read = await getDcwController().readParam(param.id)
+    if (!read.ok && read.value == null && !node.readValue) {
+      return { text: `读取失败:${read.message}(执行节点「${node.name}」驱动 ${node.driver} 可能不支持读取;可改用 daq_query 查关联数采通道)`, isError: true }
+    }
+    const readTxt = read.value != null
+      ? `${Number(read.value.toFixed(param.decimals))}${param.unit} @ ${read.at.slice(11, 19)}`
+      : (node.readValue != null ? `${node.readValue}${param.unit}(最近一次)` : '无读数')
+    return {
+      text: `读取成功:工艺参数「${param.key}」(${param.name})\n  PLC 读数(ACT): ${readTxt}\n  当前设定(SET): ${node.value != null ? `${node.value}${param.unit}` : '从未下发'}\n  ${paramLimitsText(param)}`,
+    }
+  }
+  catch (err) {
+    return { text: `读取被拒绝:${err instanceof Error ? err.message : String(err)}(工艺参数 ${param.key})`, isError: true }
+  }
+}
+
 /**
  * 数采目标集解析(工具共用鉴权面):Agent 绑定(kind=daq)为权限边界 ——
  * node_id/line_id 只能缩小范围,不能放大(越权节点一律拒绝)。

package/server/services/workshop/agents/omp-agent.ts

@@ -18,7 +18,7 @@
  * 与 codex/dsh/opencode impl 全引擎一致。协议权威:omp://rpc.md。
  */
 import { createLogger } from '../logger'
-import { BaseAgentImpl } from './base-agent'
+import { BaseAgentImpl, type BaseAgentConfigView } from './base-agent'
 import { randomUUID } from 'node:crypto'
 import type {
   AgentEvent,
@@ -133,8 +133,8 @@ export class OmpRpcAgentImpl extends BaseAgentImpl implements AgentInterface {
     return 'omp'
   }
 
-  protected configRecord(): Record<string, unknown> {
-    return this.config as unknown as Record<string, unknown>
+  protected configRecord(): BaseAgentConfigView {
+    return this.config
   }
 
   /**
@@ -205,7 +205,9 @@ export class OmpRpcAgentImpl extends BaseAgentImpl implements AgentInterface {
   /** 当前回合产生的 assistant 文本(供诊断) */
   private turnText = ''
   /** agent 身份信息(factory 注入;无需等待 init()) */
-  private agentRole: 'lead' | 'worker' = 'worker'
+  // agentRole 由 BaseAgentImpl 持有(protected);同名私有声明会遮蔽基类 identity 角色。
+  // 仅收窄可见性声明,运行时代码不变(构造函数与 ensureClient 仍显式同步)。
+  protected override agentRole: 'lead' | 'worker' = 'worker'
 
   // ===== 上下文治理(70% 无中断压缩环)=====
   /** 压缩进行中(平台 gate 与 omp 原生压缩共用互斥位) */
@@ -421,7 +423,7 @@ export class OmpRpcAgentImpl extends BaseAgentImpl implements AgentInterface {
 
   // ===== 生命周期 =====
 
-  async init(input: { agent: AgentInfo, channelId: string }): Promise<void> {
+  override async init(input: { agent: AgentInfo, channelId: string }): Promise<void> {
     this.agentInfo = input.agent
     this.channelId = input.channelId
     this.agentName = input.agent.name
@@ -550,10 +552,13 @@ export class OmpRpcAgentImpl extends BaseAgentImpl implements AgentInterface {
 
   // ===== supervise() =====
 
-  /** supervise 单飞守卫:同一 client 不并发 LLM 回合(残留回合与下一 prompt 混流的根因) */
-  private supervising = false
+  /**
+   * supervise 单飞守卫:同一 client 不并发 LLM 回合(残留回合与下一 prompt 混流的根因)。
+   * 守卫位由 BaseAgentImpl 的 protected supervising 承载 —— 本类原先的私有重复声明与基类构成
+   * "两个私有声明"(TS2415),而 JS 只有一个实例字段,故删除后语义与运行时完全一致。
+   */
 
-  async supervise(snapshot: SupervisionSnapshot, ctx: AgentRunContext, opts?: { signal?: AbortSignal }): Promise<SupervisionDecision[]> {
+  override async supervise(snapshot: SupervisionSnapshot, ctx: AgentRunContext, opts?: { signal?: AbortSignal }): Promise<SupervisionDecision[]> {
     await this.ensureClient(ctx)
     if (!this.client) return []
     if (this.supervising) return [] // 上一轮 supervise 未收口:跳过本拍(节流即正确)
@@ -1109,7 +1114,8 @@ export class OmpRpcAgentImpl extends BaseAgentImpl implements AgentInterface {
       const client = new OmpRpcClient({
         command,
         mode: this.rpcMode,
-        args: [...(this.config.thinkingLevel ? ['--thinking', this.config.thinkingLevel] : [])],
+        // 重复键 args 的生效者是下一行(JS 对象字面量后写覆盖先写):保留生效语义,删除被覆盖项。
+        // (原 ['--thinking', level] 从未真正传给 omp —— 见报告"未修的缺陷"一节。)
         args: this.config.args,
         cwd: this.config.cwd ?? process.cwd(),
         // 进程退出 → 注册表标记(供运行时资源监控);pid=-1 表示无法取得,忽略