agentworkshop 0.8.0 → 0.8.1

package/server/services/workshop/agents/industrial/grant-guard.ts

@@ -37,7 +37,10 @@ const WRITE_TOOLS = new Set([
   // 本体(ONT):知识起草与发布提议属产线域写向动作(不写设备,但会改变控制侧知识来源)
   'ontology_draft_create',
   'ontology_draft_update',
+  'ontology_draft_autofix',
   'ontology_publish_propose',
+  // AML 模型人读身份(名称/描述)维护:写元数据,不触达产线设备
+  'aml_model_annotate',
 ])
 
 /** 无需复核的纯协作/管理面工具(不触达产线数据) */
@@ -125,7 +128,18 @@ async function resolveTargetLines(agentId: string, toolName: string, args: Recor
       }
     }
   }
-  // 本体版本 → 版本产线(版本比较的归属面)  // 本体版本 → 版本产线(版本比较的归属面)
+  // AML 模型 → 数据集所属产线(model_id 元数据写/引用面)
+  const modelIdArg = one(args.model_id ?? args.modelId)
+  if (modelIdArg) {
+    const { getAmlRuntime } = await import('@/server/services/workshop/aml/runtime')
+    const db = getAmlRuntime().db
+    const m = db.prepare('SELECT dataset_id AS datasetId FROM aml_models WHERE id = ?').get(modelIdArg) as { datasetId?: string } | undefined
+    if (m?.datasetId) {
+      const d = db.prepare('SELECT line_id AS lineId FROM aml_datasets WHERE id = ?').get(m.datasetId) as { lineId?: string } | undefined
+      if (d?.lineId) lines.add(d.lineId)
+    }
+  }
+  // 本体版本 → 版本产线(版本比较的归属面)
   const ontologyId = one(args.ontology_id ?? args.ontologyId)
   if (ontologyId) {
     const { getAmlRuntime } = await import('@/server/services/workshop/aml/runtime')

package/server/services/workshop/agents/industrial/index.ts

@@ -22,7 +22,7 @@ export { toolDcwJudge, toolDcwRollback, toolDcwJournal } from './dcw-judge-tools
 export { toolOpsLog, toolRecipeLog, toolRecipeCatalog, toolRecipeCreate, toolLineContext, toolRecipeVersions, toolRecipeUpdate, toolRecipeRollback, toolRecipeTrial, toolRecipeApply } from './ops-tools'
 export { toolMesCatalog, toolMesFetch, toolMesExport, toolMesDatasetRead, toolMesDatasets } from './mes-tools'
 export { toolAmlNodeCatalog, toolAmlDatasetBuild, toolAmlDatasetStats } from './aml-dataset-tools'
-export { toolAmlJobSubmit, toolAmlJobStatus, toolAmlJobLogs, toolAmlJobCancel, toolAmlLeaderboard, toolAmlModelFind, toolAmlModelPromote, toolAmlModelReference, toolAmlTrainingPlanList, toolAmlTrainingPlanTrain, toolAmlTrainingPlanCreate } from './aml-job-tools'
+export { toolAmlJobSubmit, toolAmlJobStatus, toolAmlJobLogs, toolAmlJobCancel, toolAmlLeaderboard, toolAmlModelFind, toolAmlModelPromote, toolAmlModelReference, toolAmlModelAnnotate, toolAmlTrainingPlanList, toolAmlTrainingPlanTrain, toolAmlTrainingPlanCreate } from './aml-job-tools'
 
 export { toolOptimizationExplore } from './optimization-tools'
 export { toolTwinProviderCatalog, toolTwinSceneDiscover, toolTwinSceneCompile, toolTwinSceneFreeze, toolTwinSceneRead, toolTwinPhysicsSpecDraft, toolTwinPhysicsSpecValidate, toolTwinPhysicsSpecCompile, toolTwinSnapshotCreate, toolTwinTrialRun, toolMpcOptimize, toolTwinGateEvaluate, toolTwinCalibrationRequest, toolTwinBayesOptimize } from './twin-tools'
@@ -32,7 +32,7 @@ export { toolLineStart, toolLineStop, toolLineStatus } from './line-tools'
 export { toolAnalysisSave, toolAnalysisQuery } from './analysis-tools'
 export { toolOptimizerProfilePropose } from './optimizer-tools'
 export {
-  toolOntologySceneInspect, toolOntologyDraftCreate, toolOntologyDraftValidate,
+  toolOntologySceneInspect, toolOntologyNodeNeighbors, toolOntologyDraftCreate, toolOntologyDraftValidate, toolOntologyDraftAutofix,
   toolOntologyDraftUpdate, toolOntologyRuleExplain, toolOntologyCompilePreview,
   toolOntologyPublishPropose, toolOntologyVersionCompare,
 } from './ontology-tools'

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

@@ -1,9 +1,9 @@
 /**
- * 本体工具族(7 件)—— Agent 侧的「读 / 起草 / 校验 / 解释 / 编译预览 / 提议发布 / 版本比较」。
+ * 本体工具族(10 件)—— Agent 侧的「读 / 邻接 / 起草 / 校验 / 解释 / 编译预览 / 提议发布 / 版本比较」。
  *
- * 治理:本族由 grant-guard(WVO: publish_propose 属写族)与 tool-verify(引用面)复核;
- * **没有**任何工具能直接发布版本或写设备 —— 发布仅 admin 在 REST 面执行,
- * Agent 只能 draft_create 起草、publish_propose 提请第二人批准。
+ * 治理:本族由 grant-guard(WVO: draft_create/draft_update/draft_autofix/publish_propose 属写族)
+ * 与 tool-verify(引用面)复核;**没有**任何工具能直接发布版本或写设备 ——
+ * 发布仅 admin 在 REST 面执行,Agent 只能 draft_create 起草、publish_propose 提请第二人批准。
  *
  * 归属:Agent 起草的草稿 owner = agentId(审计可见 actorKind='agent');
  * 读取面按 agentOpsScope 的产线/节点范围收窄。
@@ -15,8 +15,10 @@ import { getOntologyRepo, parseDraftRow } from '../../ontology/repo'
 import type { Actor } from '../../ontology/ontology.service'
 import {
   compileDraft, createDraft, getDraft, requestRuleApproval, sceneSubgraph,
-  updateDraft, validateDraft, compareVersions, getVersion, listVersions,
+  updateDraft, validateDraft, compareVersions, getVersion, listVersions, autoFixDraft,
 } from '../../ontology/ontology.service'
+import { parseSubgraphOptions } from '../../ontology/subgraph.core'
+import { subgraphAroundForLine } from '../../ontology/subgraph.service'
 
 import type { OntologyDraftDoc } from '../../ontology/contracts'
 
@@ -91,7 +93,42 @@ export async function toolOntologySceneInspect(agentId: string, args: Record<str
   }
 }
 
-/** 2) 创建草稿(可空白起点或克隆已发布版本) */
+/** 2) 节点邻接/多跳子图(只读):回答「这个节点关联哪些边、间接关联什么」 */
+export async function toolOntologyNodeNeighbors(agentId: string, args: Record<string, unknown>): Promise<HostToolResult> {
+  const lineId = stringArg(args, 'line_id')
+  const entityKey = stringArg(args, 'entity_key')
+  if (!lineId) return fail('ontology_node_neighbors 需要 line_id(line_context 可看到当前产线 id)')
+  if (!entityKey) return fail('ontology_node_neighbors 需要 entity_key(可先用 ontology_scene_inspect 查实体 key)')
+  try {
+    assertLineInScope(agentId, lineId)
+    const opts = parseSubgraphOptions({
+      hops: args.hops,
+      direction: args.direction,
+      kinds: args.kinds,
+    })
+    const sub = subgraphAroundForLine(lineId, entityKey, opts)
+    if (!sub) return ok(`产线 ${lineId} 尚未发布任何本体(0 实体/0 规则);可先用 ontology_draft_create 起草。`)
+    const neighbors = sub.nodes.filter(n => n.hop > 0)
+    return ok([
+      `邻接子图: center=${entityKey} 本体=${sub.ontologyId}@${sub.version} hops=${opts.hops} direction=${opts.direction}`
+      + ` nodes=${sub.nodes.length} edges=${sub.edges.length}${sub.truncated ? ' truncated=true(受 limit 截断)' : ''}`,
+      `中心: ${sub.center.key} [${sub.center.kind}/${sub.center.role ?? '未定角色'}] ${sub.center.name}`
+      + `${sub.center.unit ? `(${sub.center.unit})` : ''}${sub.center.description ? ` — ${sub.center.description}` : ''}`
+      + `${sub.center.bindings.length ? ` ← ${sub.center.bindings.map(b => `${b.platformKind}:${b.platformId}${b.targetSub ? `#${b.targetSub}` : ''}(${b.direction},${b.status})`).join(', ')}` : '(未绑定)'}`,
+      neighbors.length ? '邻居节点:' : '邻居节点: (无)',
+      ...neighbors.map(n => `- ${n.key} hop=${n.hop} [${n.kind}/${n.role ?? '未定角色'}] ${n.name}`
+        + `${n.unit ? `(${n.unit})` : ''}`),
+      sub.edges.length ? '关联边:' : '关联边: (无)',
+      ...sub.edges.map(e => `- ${e.id} kind=${e.kind} ${e.srcKey} -> ${e.dstKey} hop=${e.hop} dir=${e.direction} tier=${e.evidenceTier}`),
+      '提示:需要规则/守卫/绑定全貌用 ontology_scene_inspect;解释单条规则用 ontology_rule_explain;版本差异用 ontology_version_compare。',
+    ].join('\n'))
+  }
+  catch (err) {
+    return fail((err as Error).message)
+  }
+}
+
+/** 3) 创建草稿(可空白起点或克隆已发布版本) */
 export async function toolOntologyDraftCreate(agentId: string, args: Record<string, unknown>): Promise<HostToolResult> {
   const ontologyId = stringArg(args, 'ontology_id')
   const lineId = stringArg(args, 'line_id')
@@ -142,6 +179,29 @@ export async function toolOntologyDraftValidate(agentId: string, args: Record<st
   }
 }
 
+/** 3b) 自动修复草稿(安全规范化;证据不伪造,平台绑定漂移仍如实报告) */
+export async function toolOntologyDraftAutofix(agentId: string, args: Record<string, unknown>): Promise<HostToolResult> {
+  const draftId = stringArg(args, 'draft_id')
+  if (!draftId) return fail('ontology_draft_autofix 需要 draft_id')
+  try {
+    const detail = autoFixDraft(draftId, agentActor(agentId))
+    const errors = detail.validation.issues.filter(i => i.severity === 'error')
+    return ok([
+      detail.fixes.length
+        ? `草稿 ${draftId} 自动修复 ${detail.fixes.length} 项(rev=${detail.draft.rev}):`
+        : `草稿 ${draftId} 无需修复(rev=${detail.draft.rev})。`,
+      ...detail.fixes.slice(0, 20).map(f => `- [${f.code}] ${f.path}: ${f.message}`),
+      `修复后校验:${detail.validation.ok ? '通过' : `未通过(${errors.length} 个错误)`}${detail.bindings.ok ? '' : `;绑定失败 ${detail.bindings.failures.length} 项(平台侧,需核对真实节点/配方)`}`,
+      errors.length ? '剩余错误:' : '',
+      ...errors.slice(0, 10).map(i => `- [${i.code}] ${i.path}: ${i.message}`),
+      detail.validation.ok ? '下一步:ontology_draft_validate 复核 → ontology_publish_propose 提请发布。' : '剩余错误需补充真实证据/实体后再修复,不能由自动修复伪造。',
+    ].filter(Boolean).join('\n'))
+  }
+  catch (err) {
+    return fail((err as Error).message)
+  }
+}
+
 /** 4) 规则解释(DSL + 决策 + 人读来源) */
 export async function toolOntologyRuleExplain(agentId: string, args: Record<string, unknown>): Promise<HostToolResult> {
   const ruleId = stringArg(args, 'rule_id')

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

@@ -16,7 +16,7 @@ import { getDcwParamRepo } from '../../dcw/param-map.repo'
 import { getOps } from '../../ops/ops'
 import { settingOf } from '../../settings'
 import { fanoutQuery, windowOf } from './audit-query'
-import { assertRecipeCreate, assertRecipeOperation, recipeApprovalPayload } from './recipe-gate'
+import { assertRecipeCreate, assertRecipeOperation, recipeApprovalPayload, type ActiveRecipeContext } from './recipe-gate'
 
 // ================================================================
 // 运维日志 / Recipe 变更史查询(Agent 自查面:负责产线 scoped)
@@ -779,7 +779,7 @@ export async function toolRecipeUpdate(agentId: string, args: {
           const old = recipe.params.find(x => x.nodeId === String(p.node_id).trim())?.value
           return { nodeId: String(p.node_id).trim(), name: node?.name ?? String(p.node_id), from: old ?? null, to: Number(p.value), unit: node?.unit }
         }),
-        runId: gate.activeRunId,
+        context: gate.activeContext,
       }) },
     )
     if (!gateDecision.approved) {
@@ -788,7 +788,7 @@ export async function toolRecipeUpdate(agentId: string, args: {
       }
     }
     if (gateDecision.comment) hitlNote = `\n人工附言:${gateDecision.comment}`
-    const stale = await revalidateApprovedAction(agentId, recipe, 'update', 'recipe_update', { recipe_id: recipeId })
+    const stale = await revalidateApprovedAction(agentId, recipe, 'update', 'recipe_update', { recipe_id: recipeId }, gate.activeContext)
     if (stale) return stale
   }
   // 旧值快照(repo.update 原地改写 recipe.params,事后再取会把 before 读成新值)
@@ -887,7 +887,7 @@ export async function toolRecipeRollback(agentId: string, args: {
       recipe.id,
       `${emergency ? '【应急豁免频控】' : ''}配方回退:「${recipe.name}」→ ${toLastGood ? '已知良好批次冻结' : `v${version}`}${dispatch ? '(统一回退:定义回退+整批重下发)' : '(仅定义回退)'} | 理由:${reason} | 批准=执行回退;拒绝可附指导`,
       `${emergency ? '【应急】' : ''}配方回退审批`,
-      { payload: { ...recipeApprovalPayload('rollback', recipe.id, recipe.name, { reason, runId: gate.activeRunId }), ...(emergency ? { emergency: true } : {}) } },
+      { payload: { ...recipeApprovalPayload('rollback', recipe.id, recipe.name, { reason, context: gate.activeContext }), ...(emergency ? { emergency: true } : {}) } },
     )
     gateApprovalId = gateDecision.id
     if (!gateDecision.approved) {
@@ -896,11 +896,15 @@ export async function toolRecipeRollback(agentId: string, args: {
       }
     }
     if (gateDecision.comment) hitlNote = `\n人工附言:${gateDecision.comment}`
-    const stale = await revalidateApprovedAction(agentId, recipe, 'rollback', 'recipe_rollback', { recipe_id: recipeId })
+    const stale = await revalidateApprovedAction(agentId, recipe, 'rollback', 'recipe_rollback', { recipe_id: recipeId }, gate.activeContext)
     if (stale) return stale
   }
   try {
     if (dispatch) {
+      if (gate.hitlRequired) {
+        const staleAtDispatch = approvedContextError(agentId, recipe, 'rollback', gate.activeContext)
+        if (staleAtDispatch) return staleAtDispatch
+      }
       const { recipe: updated, run, definitionNoop } = await getDcwController().rollbackRecipeAndDispatch(recipeId, {
         version: toLastGood ? undefined : version,
         toLastGood,
@@ -979,23 +983,46 @@ async function hitlDispatchGate(agentId: string, recipeId: string, detail: strin
 }
 
 /**
- * 审批返回「批准」后的二次授权复核(2026-10-18):审批可能挂起数分钟,
- * 期间绑定/产线授权/运行批次都可能被撤销。批准不等于授权仍然有效:
+ * 审批返回「批准」后的二次状态复核:审批可能挂起数分钟,
+ * 期间绑定/产线授权/活动产线上下文都可能变化。批准不等于授权与上下文仍然有效:
  *  - 重新跑 assertRecipeOperation(绑定/二级认证/运行门);
+ *  - 将当前 line/product/recipe/run 元组与审批时快照比较,变化即拒绝;
  *  - 重新跑 grant-guard(频道属主的产线 grant,收权即失活)。
- * 任一失败 → 本次不执行,回包说明原因(Agent 可据此重新申请)。
+ * 任一失败 → 本次不执行,回包说明原因(Agent 可据此核实上下文并重新申请)。
  */
+function approvedContextError(
+  agentId: string,
+  recipe: { id: string, name: string, lineId?: string, access?: { requireAuth?: boolean, authorizedAgentIds?: string[] } },
+  op: 'update' | 'dispatch' | 'trial' | 'rollback',
+  expectedContext: ActiveRecipeContext,
+): { text: string, isError: true } | null {
+  const currentGate = assertRecipeOperation(agentId, recipe, op)
+  if (!currentGate.ok) {
+    return { text: `人工已批准,但审批期间授权已失效,本次未执行:${currentGate.text}`, isError: true }
+  }
+  const current = currentGate.activeContext
+  if (current.lineId !== expectedContext.lineId
+    || current.runId !== expectedContext.runId
+    || current.recipeId !== expectedContext.recipeId
+    || current.productId !== expectedContext.productId) {
+    return {
+      text: '人工已批准,但审批期间产线/产品/配方/批次上下文已变化,本次未执行。请核查当前运行上下文后重新提交。',
+      isError: true,
+    }
+  }
+  return null
+}
+
 export async function revalidateApprovedAction(
   agentId: string,
   recipe: { id: string, name: string, lineId?: string, access?: { requireAuth?: boolean, authorizedAgentIds?: string[] } },
   op: 'update' | 'dispatch' | 'trial' | 'rollback',
   toolName: string,
   args: Record<string, unknown>,
+  expectedContext: ActiveRecipeContext,
 ): Promise<{ text: string, isError: true } | null> {
-  const again = assertRecipeOperation(agentId, recipe, op)
-  if (!again.ok) {
-    return { text: `人工已批准,但审批期间授权已失效,本次未执行:${again.text}`, isError: true }
-  }
+  const initialContextError = approvedContextError(agentId, recipe, op, expectedContext)
+  if (initialContextError) return initialContextError
   try {
     // manager 未装配(单测/嵌入)→ 只做绑定与运行门复核;装配后叠加产线 grant 复核
     const g = globalThis as typeof globalThis & {
@@ -1011,6 +1038,11 @@ export async function revalidateApprovedAction(
   catch (err) {
     return { text: `人工已批准,但审批后权限复核不可用,本次未执行:${err instanceof Error ? err.message : String(err)}。请稍后重试。`, isError: true }
   }
+  // Grant lookup is asynchronous. Re-read the active tuple after that await so
+  // queued line/run changes cannot pass between the initial comparison and the
+  // caller's dispatch continuation.
+  const changedAfterGrantCheck = approvedContextError(agentId, recipe, op, expectedContext)
+  if (changedAfterGrantCheck) return changedAfterGrantCheck
   return null
 }
 
@@ -1086,7 +1118,7 @@ export async function toolRecipeTrial(agentId: string, args: {
             const old = recipe.params.find(x => x.nodeId === p.nodeId)?.value
             return { nodeId: p.nodeId, name: node?.name ?? p.nodeId, from: old ?? null, to: p.value, unit: node?.unit }
           }),
-          runId: gate.activeRunId,
+          context: gate.activeContext,
         }), ...(emergency ? { emergency: true } : {}) } },
       )
       gateApprovalId = gateDecision.id
@@ -1097,8 +1129,10 @@ export async function toolRecipeTrial(agentId: string, args: {
       }
       // 人工附言随批准回执回流(Agent 与审计都能看到放行时人的原话)
       if (gateDecision.comment) hitlNote = `\n人工附言:${gateDecision.comment}`
-      const stale = await revalidateApprovedAction(agentId, recipe, 'trial', 'recipe_trial', { recipe_id: recipeId })
+      const stale = await revalidateApprovedAction(agentId, recipe, 'trial', 'recipe_trial', { recipe_id: recipeId }, gate.activeContext)
       if (stale) return stale
+      const staleAtDispatch = approvedContextError(agentId, recipe, 'trial', gate.activeContext)
+      if (staleAtDispatch) return staleAtDispatch
     }
     const run = await getDcwController().applyRecipe(recipeId, { overrides: list, trial: true, agentDispatch: true, agentApprovalId: gateApprovalId, emergency })
     // ACK 鉴定三段口径(2026-10-08):ok 只是命令受理,未证实/失败必须如实回给 Agent
@@ -1187,7 +1221,7 @@ export async function toolRecipeApply(agentId: string, args: {
             const node = getDcwController().byId(p.nodeId)
             return { nodeId: p.nodeId, name: node?.name ?? p.nodeId, from: null, to: p.value, unit: node?.unit }
           }),
-          runId: gate.activeRunId,
+          context: gate.activeContext,
         }), recipeVersion: dispatch.version, ...(emergency ? { emergency: true } : {}) } },
       )
       gateApprovalId = gateDecision.id
@@ -1198,7 +1232,7 @@ export async function toolRecipeApply(agentId: string, args: {
       }
       // 人工附言随批准回执回流(与 recipe_trial 同口径)
       if (gateDecision.comment) hitlNote = `\n人工附言:${gateDecision.comment}`
-      const stale = await revalidateApprovedAction(agentId, recipe, 'dispatch', 'recipe_apply', { recipe_id: recipeId })
+      const stale = await revalidateApprovedAction(agentId, recipe, 'dispatch', 'recipe_apply', { recipe_id: recipeId }, gate.activeContext)
       if (stale) return stale
     }
     // 放在最后一次 await 之后,与 applyRecipe 的同步取值/建批之间不再让出执行权。
@@ -1206,6 +1240,10 @@ export async function toolRecipeApply(agentId: string, args: {
     if (!currentRecipe || JSON.stringify(currentRecipe) !== approvedDefinition) {
       return { text: '配方在审批期间已变更,与本次审批展示的快照不一致,本次未执行。请核查最新配方后重新提交 recipe_apply。', isError: true }
     }
+    if (gate.hitlRequired) {
+      const staleAtDispatch = approvedContextError(agentId, recipe, 'dispatch', gate.activeContext)
+      if (staleAtDispatch) return staleAtDispatch
+    }
     // 完整覆盖集让控制器复制每个已批准值,逐参数异步写期间也不再共享可变配方参数。
     const run = await getDcwController().applyRecipe(recipeId, { overrides: dispatch.params, agentDispatch: true, agentApprovalId: gateApprovalId, emergency })
     // ACK 鉴定三段口径(2026-10-08):ok 只是命令受理,未证实/失败必须如实回给 Agent

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

@@ -233,6 +233,8 @@ export async function toolOptimizerProfilePropose(agentId: string, args: Record<
       templateRef: args.template_ref as Parameters<typeof proposeProfileAdoption>[0]['templateRef'],
       solverRef: args.solver_ref as Parameters<typeof proposeProfileAdoption>[0]['solverRef'],
       reason,
+      profileName: str(args.profile_name),
+      profileDescription: str(args.profile_description),
     })
 
     if (!result.decision.approved) {

package/server/services/workshop/agents/industrial/recipe-gate.ts

@@ -20,12 +20,19 @@ import { getActiveLineRun } from '../../dcw/line-run'
 
 export type RecipeOp = 'update' | 'dispatch' | 'trial' | 'rollback' | 'create'
 
+export type ActiveRecipeContext = {
+  lineId: string
+  runId: string
+  recipeId: string
+  productId: string
+}
+
 export type RecipeGateResult
-  = | { ok: true, binding: AgentNodeBinding, hitlRequired: boolean, activeRunId: string }
+  = | { ok: true, binding: AgentNodeBinding, hitlRequired: boolean, activeContext: ActiveRecipeContext }
     | { ok: false, text: string }
 
 /** 运行门:该配方当前是否有活动批次(未结束的 run) */
-export function activeRunOfRecipe(recipeId: string): { id: string } | null {
+export function activeRunOfRecipe(recipeId: string): ActiveRecipeContext | null {
   const run = getDcwController().listRuns().find(r => r.recipeId === recipeId && !r.endedAt)
   if (!run) return null
   // 反僵尸交叉校验(鲁棒性):DB 行未结束 ≠ 产线在运行 —— 多次 apply/崩溃/重启会泄漏
@@ -33,8 +40,13 @@ export function activeRunOfRecipe(recipeId: string): { id: string } | null {
   // 权威运行态是 line-run 注册表(内存+line-runs.json 落盘,崩溃可恢复):
   // run 所属产线必须在注册表中运行,且注册表的活跃批次就是本批次。
   const active = getActiveLineRun(run.lineId)
-  if (!active || active.runId !== run.id) return null
-  return { id: run.id }
+  if (!active || active.runId !== run.id || active.recipeId !== recipeId) return null
+  return {
+    lineId: active.lineId,
+    runId: active.runId,
+    recipeId: active.recipeId,
+    productId: active.productId,
+  }
 }
 
 /** 统一鉴权门:绑定 → 二级认证 → 运行门;返回绑定与 HITL 判定(不做挂起,挂起由调用方执行) */
@@ -74,7 +86,7 @@ export function assertRecipeOperation(
   // ⑤ 全局开关兼容位:security.recipeDispatchApproval 开启时即便 auto 也挂审批(保留语义)
   const globalGate = false // 由调用方按 settingOf('security.recipeDispatchApproval') 叠加(本模块不依赖设置服务)
   void globalGate
-  return { ok: true, binding, hitlRequired: binding.mode === 'manual' || lineManual, activeRunId: run.id }
+  return { ok: true, binding, hitlRequired: binding.mode === 'manual' || lineManual, activeContext: run }
 }
 
 /** 新建配方的授权门(尚无 recipe 可绑定):要求 Agent 在该线至少有一个写向绑定
@@ -116,6 +128,7 @@ export function assertRecipeCreate(agentId: string, lineId: string): { ok: true,
 export function recipeApprovalPayload(op: RecipeOp, recipeId: string, recipeName: string, extra: {
   reason: string
   params?: Array<{ nodeId: string, name: string, from: number | null, to: number, unit?: string }>
+  context?: ActiveRecipeContext
   runId?: string
 }): Record<string, unknown> {
   return {
@@ -126,6 +139,6 @@ export function recipeApprovalPayload(op: RecipeOp, recipeId: string, recipeName
     recipeName,
     reason: extra.reason,
     ...(extra.params ? { params: extra.params } : {}),
-    ...(extra.runId ? { runId: extra.runId } : {}),
+    ...(extra.context ? { context: { ...extra.context }, runId: extra.context.runId } : extra.runId ? { runId: extra.runId } : {}),
   }
 }

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

@@ -278,7 +278,7 @@ export async function toolRecipePropose(agentId: string, args: {
   }
 
   // 批准不等于授权仍有效:复核绑定/认证/运行门/产线 grant(审批期间可能被撤销)
-  const stale = await revalidateApprovedAction(agentId, recipe, 'dispatch', 'recipe_propose', { recipe_id: recipeId })
+  const stale = await revalidateApprovedAction(agentId, recipe, 'dispatch', 'recipe_propose', { recipe_id: recipeId }, gate.activeContext)
   if (stale) return stale
 
   // ---------- ⑦b 批准(choice 已由 decide 链 fail-closed 归一):选定包整批下发 ----------

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

@@ -0,0 +1,38 @@
+import type { AgentWorkspace } from '../agent-interface'
+import type { AgentSessionEvent } from '../adapters/omp-rpc-client'
+import { toolArgsPreview } from '../prompt-builder'
+
+/** Compact, history-compatible audit line for a host tool used during lead supervision. */
+export function supervisionToolHistoryMessage(event: AgentSessionEvent): string | null {
+  const toolName = typeof event.toolName === 'string' && event.toolName ? event.toolName : 'tool'
+  if (event.type === 'tool_execution_start') {
+    return `🔧 ${toolName}${toolArgsPreview(event.args)}`
+  }
+  if (event.type !== 'tool_execution_end') return null
+
+  const rawResult = event.result ?? event.output ?? ''
+  let summary: string
+  if (typeof rawResult === 'string') {
+    summary = rawResult
+  }
+  else {
+    try {
+      summary = JSON.stringify(rawResult) ?? ''
+    }
+    catch {
+      summary = '(不可序列化结果)'
+    }
+  }
+  summary = summary.slice(0, 300)
+  return `🔧 ${toolName} ${event.isError === true ? '❌ 失败' : '✅ 完成'}${summary ? `: ${summary}` : ''}`
+}
+
+/** Persist a supervisor host-tool event against the active root task when it is still open. */
+export async function recordSupervisionToolHistory(
+  workspace: Pick<AgentWorkspace, 'reportTask'>,
+  taskId: string,
+  event: AgentSessionEvent,
+): Promise<void> {
+  const message = supervisionToolHistoryMessage(event)
+  if (message) await workspace.reportTask({ taskId, message })
+}

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

@@ -7,6 +7,7 @@ import type { AgentEvent, AgentRunContext, AgentRunRequest, SupervisionDecision,
 import type { HostToolCallRequest } from '../adapters/omp-rpc-client'
 import { extractJsonArray, parseSteerBanner, peerPrompt, supervisePrompt, systemManual, workerPrompt } from '../prompt-builder'
 import { log } from './helpers'
+import { recordSupervisionToolHistory } from './supervision-history'
 
 export abstract class OmpRpcAgentImplToolsSteer extends OmpRpcAgentImplLifecycle {
   /** 引擎无关工具面:REST/MCP 桥直调与 omp 内部 host_tool_call 共用同一实现 */
@@ -97,6 +98,12 @@ export abstract class OmpRpcAgentImplToolsSteer extends OmpRpcAgentImplLifecycle
     return new Promise<SupervisionDecision[]>((resolve) => {
       let assistantText = ''
       let resolved = false
+      const activeRootTask = snapshot.tasks.find(task =>
+        task.id === snapshot.activeRootId
+        && task.assigneeId === this.selfAgentId
+        && ['SUBMITTED', 'ASSIGNED', 'WORKING', 'WAITING'].includes(task.state),
+      )
+      let taskHistoryWrites = Promise.resolve()
 
       const finish = (decisions: SupervisionDecision[]) => {
         if (resolved) return
@@ -107,7 +114,7 @@ export abstract class OmpRpcAgentImplToolsSteer extends OmpRpcAgentImplLifecycle
         unsub()
         if (hardTimer) clearTimeout(hardTimer)
         signalUnsub?.()
-        resolve(decisions)
+        void taskHistoryWrites.then(() => resolve(decisions), () => resolve(decisions))
       }
 
       const abortTurn = (reason: string): void => {
@@ -118,6 +125,16 @@ export abstract class OmpRpcAgentImplToolsSteer extends OmpRpcAgentImplLifecycle
       }
 
       const unsub = this.client!.onEvent((event) => {
+        if (activeRootTask && (event.type === 'tool_execution_start' || event.type === 'tool_execution_end')) {
+          // Lead supervision is not a workerTurn, so its host-tool events do not
+          // pass through promptAndStream's task event mapper. Persist them on the
+          // active root while it is open, preserving tool-call/result chronology.
+          taskHistoryWrites = taskHistoryWrites.then(async () => {
+            await recordSupervisionToolHistory(ctx.workspace, activeRootTask.id, event)
+          }).catch((err) => {
+            log.error(`[OmpRpcAgent:${this.selfAgentId}] supervise task-history write failed:`, err)
+          })
+        }
         if (event.type === 'message_update' && event.assistantMessageEvent?.type === 'text_delta') {
           this.streaming = true
           assistantText += event.assistantMessageEvent.delta ?? ''

package/server/services/workshop/aml/aml.repo.ts

@@ -460,6 +460,22 @@ export function createAmlRepo(db: DatabaseSync) {
       updateNote(id: string, note: string): void {
         db.prepare('UPDATE aml_models SET note = ? WHERE id = ?').run(note, id)
       },
+      /** 人读身份维护(Agent/REST 共用):只改 label/description,不改阶段与工件 */
+      updateIdentity(id: string, patch: { label?: string, description?: string }): void {
+        const sets: string[] = []
+        const args: unknown[] = []
+        if (patch.label !== undefined) {
+          sets.push('label = ?')
+          args.push(patch.label.slice(0, 200))
+        }
+        if (patch.description !== undefined) {
+          sets.push('description = ?')
+          args.push(patch.description.slice(0, 500))
+        }
+        if (!sets.length) return
+        args.push(id)
+        db.prepare(`UPDATE aml_models SET ${sets.join(', ')} WHERE id = ?`).run(...(args as never[]))
+      },
     },
   }
 }

package/server/services/workshop/daq/bus/index.ts

@@ -22,16 +22,23 @@ export async function getDaqQueue(): Promise<DaqQueuePort> {
 
 /** 重连/初始装配:按 infra 判定结果(重新)构建 MQTT 或进程内队列 */
 export async function rebuildDaqQueue(online: boolean, url?: string | null): Promise<DaqQueuePort> {
-  // 换装前释放旧 adapter(mqtt 连接 / inproc 泵),防重建泄漏
-  await g.__daqQueue?.close?.()
   if (!online || !url) {
-    if (g.__daqQueue?.backend !== 'inproc') {
-      g.__daqQueue = new InProcQueueAdapter()
+    // Reuse an in-process adapter without closing it. close() clears consumers and
+    // stops its pump; getDaqQueue() will not initialize an existing instance again.
+    if (g.__daqQueue?.backend === 'inproc') {
       await g.__daqQueue.init()
-      log.warn('[daq-queue] 降级进程内队列')
+      return g.__daqQueue
     }
+    // When falling back from MQTT, install a fresh adapter; the controller reattaches
+    // its consumer after this replacement.
+    await g.__daqQueue?.close?.()
+    g.__daqQueue = new InProcQueueAdapter()
+    await g.__daqQueue.init()
+    log.warn('[daq-queue] 降级进程内队列')
     return g.__daqQueue
   }
+  // Release the previous adapter before a transition to MQTT.
+  await g.__daqQueue?.close?.()
   try {
     const adapter = new MqttQueueAdapter(url)
     await adapter.init()