agentworkshop 0.8.0 → 0.8.1

package/server/services/workshop/agents/adapters/omp-rpc-client/frames.ts

@@ -1,111 +1,129 @@
-/**
- * OmpRpcClientFrames —— 内部:宿主工具调用 / 分块装配 / 退出与错误通知
- * (拆分层,承 OmpRpcClientStdout;方法体与原文件逐行一致)
- */
-import { OmpRpcClientStdout } from './stdout'
-import type { AgentSessionEvent } from './types'
-import type { HostToolCallFrame, RpcChunkFrame } from './helpers'
-import { CHUNK_TTL_MS } from './helpers'
-
-export abstract class OmpRpcClientFrames extends OmpRpcClientStdout {
-  /** 处理 host_tool_call:调 handler → 发 host_tool_result */
-  protected async handleHostToolCall(req: HostToolCallFrame): Promise<void> {
-    const { id, toolCallId, toolName, arguments: args } = req
-    let result: { text: string, isError?: boolean }
-
-    if (this.hostToolHandler) {
-      try {
-        result = await this.hostToolHandler({ id, toolCallId, toolName, arguments: args ?? {} })
-      }
-      catch (err) {
-        result = { text: `工具执行异常: ${err instanceof Error ? err.message : String(err)}`, isError: true }
-      }
-    }
-    else {
-      result = { text: `无 host tool handler 注册(toolName=${toolName})`, isError: true }
-    }
-
-    // 发送 host_tool_result
-    const resultFrame = {
-      type: 'host_tool_result' as const,
-      id,
-      result: {
-        content: [{ type: 'text' as const, text: result.text }],
-        ...(result.isError ? { isError: true } : {}),
-      },
-    }
-    try {
-      this.child?.stdin?.write(JSON.stringify(resultFrame) + '\n')
-    }
-    catch {
-      // 进程可能已关闭
-    }
-  }
-
-  /** v2 chunk 重组 */
-  protected handleChunk(frame: RpcChunkFrame): void {
-    const { chunkId, index, count, byteLength, data } = frame
-    if (!chunkId || typeof index !== 'number' || typeof count !== 'number') return
-
-    // TTL 清扫:残缺分片(丢失/乱序未收齐)30s 后释放
-    const now = Date.now()
-    for (const [cid, b] of this.chunkBuffers) {
-      if (now - b.at > CHUNK_TTL_MS) this.chunkBuffers.delete(cid)
-    }
-
-    let buf = this.chunkBuffers.get(chunkId)
-    if (!buf) {
-      buf = { count, parts: new Map(), at: now }
-      this.chunkBuffers.set(chunkId, buf)
-    }
-    buf.at = now
-    buf.parts.set(index, data ?? '')
-
-    // 全部分片到齐 → 重组
-    if (buf.parts.size === buf.count) {
-      const sorted = [...buf.parts.entries()].sort((a, b) => a[0] - b[0])
-      const b64 = sorted.map(([, d]) => d).join('')
-      this.chunkBuffers.delete(chunkId)
-      try {
-        const json = Buffer.from(b64, 'base64').toString('utf-8')
-        const frame = JSON.parse(json)
-        void byteLength
-        this.dispatchFrame(frame)
-      }
-      catch {
-        // chunk 重组失败:忽略
-      }
-    }
-  }
-
-  /** 子进程退出处理(exit 事件 / OS 存活校准 reconcile 共用;幂等) */
-  protected handleExit(code: number | null): void {
-    if (this.exited) return
-    this.exited = true
-    this.exitCode = code
-    this.options.onExit?.(this.child?.pid ?? -1, code)
-    // 拒绝所有 pending
-    for (const [, p] of this.pending) {
-      clearTimeout(p.timer)
-      p.reject(new Error(`omp 子进程退出(code=${code})`))
-    }
-    this.pending.clear()
-
-    // 通知事件监听器
-    for (const fn of this.eventListeners) {
-      try {
-        fn({ type: '__process_exit__', isTerminal: true } as unknown as AgentSessionEvent)
-      }
-      catch { /* ignore */ }
-    }
-  }
-
-  protected notifyError(err: Error): void {
-    for (const fn of this.eventListeners) {
-      try {
-        fn({ type: '__error__', isTerminal: true, messages: [], ...(err.message ? { error: err.message } : {}) } as unknown as AgentSessionEvent)
-      }
-      catch { /* ignore */ }
-    }
-  }
-}
+/**
+ * OmpRpcClientFrames —— 内部:宿主工具调用 / 分块装配 / 退出与错误通知
+ * (拆分层,承 OmpRpcClientStdout;方法体与原文件逐行一致)
+ */
+import { OmpRpcClientStdout } from './stdout'
+import type { AgentSessionEvent } from './types'
+import type { HostToolCallFrame, RpcChunkFrame } from './helpers'
+import { CHUNK_TTL_MS } from './helpers'
+
+export abstract class OmpRpcClientFrames extends OmpRpcClientStdout {
+  /** 处理 host_tool_call:调 handler → 发 host_tool_result */
+  protected async handleHostToolCall(req: HostToolCallFrame): Promise<void> {
+    const { id, toolCallId, toolName, arguments: args } = req
+    let result: { text: string, isError?: boolean }
+
+    for (const fn of this.eventListeners) {
+      try {
+        fn({ type: 'tool_execution_start', toolCallId, toolName, args: args ?? {} })
+      }
+      catch {
+        // 事件 listener 异常不影响工具执行
+      }
+    }
+
+    if (this.hostToolHandler) {
+      try {
+        result = await this.hostToolHandler({ id, toolCallId, toolName, arguments: args ?? {} })
+      }
+      catch (err) {
+        result = { text: `工具执行异常: ${err instanceof Error ? err.message : String(err)}`, isError: true }
+      }
+    }
+    else {
+      result = { text: `无 host tool handler 注册(toolName=${toolName})`, isError: true }
+    }
+
+    for (const fn of this.eventListeners) {
+      try {
+        fn({ type: 'tool_execution_end', toolCallId, toolName, isError: result.isError === true, result: result.text })
+      }
+      catch {
+        // 事件 listener 异常不影响工具结果
+      }
+    }
+
+    // 发送 host_tool_result
+    const resultFrame = {
+      type: 'host_tool_result' as const,
+      id,
+      result: {
+        content: [{ type: 'text' as const, text: result.text }],
+        ...(result.isError ? { isError: true } : {}),
+      },
+    }
+    try {
+      this.child?.stdin?.write(JSON.stringify(resultFrame) + '\n')
+    }
+    catch {
+      // 进程可能已关闭
+    }
+  }
+
+  /** v2 chunk 重组 */
+  protected handleChunk(frame: RpcChunkFrame): void {
+    const { chunkId, index, count, byteLength, data } = frame
+    if (!chunkId || typeof index !== 'number' || typeof count !== 'number') return
+
+    // TTL 清扫:残缺分片(丢失/乱序未收齐)30s 后释放
+    const now = Date.now()
+    for (const [cid, b] of this.chunkBuffers) {
+      if (now - b.at > CHUNK_TTL_MS) this.chunkBuffers.delete(cid)
+    }
+
+    let buf = this.chunkBuffers.get(chunkId)
+    if (!buf) {
+      buf = { count, parts: new Map(), at: now }
+      this.chunkBuffers.set(chunkId, buf)
+    }
+    buf.at = now
+    buf.parts.set(index, data ?? '')
+
+    // 全部分片到齐 → 重组
+    if (buf.parts.size === buf.count) {
+      const sorted = [...buf.parts.entries()].sort((a, b) => a[0] - b[0])
+      const b64 = sorted.map(([, d]) => d).join('')
+      this.chunkBuffers.delete(chunkId)
+      try {
+        const json = Buffer.from(b64, 'base64').toString('utf-8')
+        const frame = JSON.parse(json)
+        void byteLength
+        this.dispatchFrame(frame)
+      }
+      catch {
+        // chunk 重组失败:忽略
+      }
+    }
+  }
+
+  /** 子进程退出处理(exit 事件 / OS 存活校准 reconcile 共用;幂等) */
+  protected handleExit(code: number | null): void {
+    if (this.exited) return
+    this.exited = true
+    this.exitCode = code
+    this.options.onExit?.(this.child?.pid ?? -1, code)
+    // 拒绝所有 pending
+    for (const [, p] of this.pending) {
+      clearTimeout(p.timer)
+      p.reject(new Error(`omp 子进程退出(code=${code})`))
+    }
+    this.pending.clear()
+
+    // 通知事件监听器
+    for (const fn of this.eventListeners) {
+      try {
+        fn({ type: '__process_exit__', isTerminal: true } as unknown as AgentSessionEvent)
+      }
+      catch { /* ignore */ }
+    }
+  }
+
+  protected notifyError(err: Error): void {
+    for (const fn of this.eventListeners) {
+      try {
+        fn({ type: '__error__', isTerminal: true, messages: [], ...(err.message ? { error: err.message } : {}) } as unknown as AgentSessionEvent)
+      }
+      catch { /* ignore */ }
+    }
+  }
+}

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

@@ -9,14 +9,14 @@
  * 该族**不依赖 workspace**,由 dispatch 在 workspace 门控之前分流(保持原分发顺序)。
  */
 import type { HostToolResult } from '../types'
-import { toolLineStart, toolLineStop, toolLineStatus, toolAmlDatasetBuild, toolAmlDatasetStats, toolAmlJobCancel, toolAmlJobLogs, toolAmlJobStatus, toolAmlJobSubmit, toolAmlLeaderboard, toolAmlModelFind, toolAmlModelPromote, toolAmlModelReference, toolAmlNodeCatalog, toolAmlTrainingPlanCreate, toolAmlTrainingPlanList, toolAmlTrainingPlanTrain, toolDaqExport, toolDaqFrames, toolDaqQuery, toolDcwControl, toolDcwJudge, toolDcwJournal, toolDcwRollback, toolLineContext, toolMesCatalog, toolMesDatasetRead, toolMesDatasets, toolMesExport, toolMesFetch, toolMyIndustrialNodes, toolOpsLog, toolParamControl, toolRecipeApply, toolRecipeCatalog, toolRecipeCreate, toolRecipeLog, toolRecipeRollback, toolRecipeTrial, toolRecipeUpdate, toolRecipeVersions, toolOptimizationExplore, toolTwinProviderCatalog, toolTwinSceneDiscover, toolTwinSceneCompile, toolTwinSceneFreeze, toolTwinSceneRead, toolTwinPhysicsSpecDraft, toolTwinPhysicsSpecValidate, toolTwinPhysicsSpecCompile, toolTwinSnapshotCreate, toolTwinTrialRun, toolMpcOptimize, toolTwinGateEvaluate, toolTwinBayesOptimize, toolTwinCalibrationRequest, toolAnalysisSave, toolAnalysisQuery } from '../../industrial'
+import { toolLineStart, toolLineStop, toolLineStatus, toolAmlDatasetBuild, toolAmlDatasetStats, toolAmlJobCancel, toolAmlJobLogs, toolAmlJobStatus, toolAmlJobSubmit, toolAmlLeaderboard, toolAmlModelFind, toolAmlModelPromote, toolAmlModelReference, toolAmlModelAnnotate, toolAmlNodeCatalog, toolAmlTrainingPlanCreate, toolAmlTrainingPlanList, toolAmlTrainingPlanTrain, toolDaqExport, toolDaqFrames, toolDaqQuery, toolDcwControl, toolDcwJudge, toolDcwJournal, toolDcwRollback, toolLineContext, toolMesCatalog, toolMesDatasetRead, toolMesDatasets, toolMesExport, toolMesFetch, toolMyIndustrialNodes, toolOpsLog, toolParamControl, toolRecipeApply, toolRecipeCatalog, toolRecipeCreate, toolRecipeLog, toolRecipeRollback, toolRecipeTrial, toolRecipeUpdate, toolRecipeVersions, toolOptimizationExplore, toolTwinProviderCatalog, toolTwinSceneDiscover, toolTwinSceneCompile, toolTwinSceneFreeze, toolTwinSceneRead, toolTwinPhysicsSpecDraft, toolTwinPhysicsSpecValidate, toolTwinPhysicsSpecCompile, toolTwinSnapshotCreate, toolTwinTrialRun, toolMpcOptimize, toolTwinGateEvaluate, toolTwinBayesOptimize, toolTwinCalibrationRequest, toolAnalysisSave, toolAnalysisQuery } from '../../industrial'
 
 import { toolExpCollect } from '../../industrial/exp-tools'
 import { toolRecipePropose } from '../../industrial/recipe-propose-tools'
 import { toolAmlActivity } from '../../industrial/aml-activity'
 import { toolOptimizerCancel, toolOptimizerCapabilities, toolOptimizerPlanGet, toolOptimizerProfilePropose, toolOptimizerSolve, toolOptimizerStatus } from '../../industrial/optimizer-tools'
 import { toolIndustrialResources } from '../../industrial/resources-tools'
-import { toolOntologyCompilePreview, toolOntologyDraftCreate, toolOntologyDraftUpdate, toolOntologyDraftValidate, toolOntologyPublishPropose, toolOntologyRuleExplain, toolOntologySceneInspect, toolOntologyVersionCompare } from '../../industrial/ontology-tools'
+import { toolOntologyCompilePreview, toolOntologyDraftAutofix, toolOntologyDraftCreate, toolOntologyDraftUpdate, toolOntologyDraftValidate, toolOntologyNodeNeighbors, toolOntologyPublishPropose, toolOntologyRuleExplain, toolOntologySceneInspect, toolOntologyVersionCompare } from '../../industrial/ontology-tools'
 
 type IndustrialToolHandler = (agentId: string, args: Record<string, unknown>, channelId?: string) => Promise<HostToolResult>
 
@@ -36,6 +36,7 @@ const INDUSTRIAL_HANDLERS = new Map<string, IndustrialToolHandler>([
   ['aml_model_find', (agentId, args) => toolAmlModelFind(agentId, args as Parameters<typeof toolAmlModelFind>[1])],
   ['aml_model_promote', (agentId, args) => toolAmlModelPromote(agentId, args as Parameters<typeof toolAmlModelPromote>[1])],
   ['aml_model_reference', (agentId, args) => toolAmlModelReference(agentId, args as Parameters<typeof toolAmlModelReference>[1])],
+  ['aml_model_annotate', (agentId, args) => toolAmlModelAnnotate(agentId, args as Parameters<typeof toolAmlModelAnnotate>[1])],
   ['aml_training_plan_list', (agentId, args) => toolAmlTrainingPlanList(agentId, args)],
   ['aml_training_plan_create', (agentId, args) => toolAmlTrainingPlanCreate(agentId, args as Parameters<typeof toolAmlTrainingPlanCreate>[1])],
   ['aml_training_plan_train', (agentId, args) => toolAmlTrainingPlanTrain(agentId, args as Parameters<typeof toolAmlTrainingPlanTrain>[1])],
@@ -96,11 +97,13 @@ const INDUSTRIAL_HANDLERS = new Map<string, IndustrialToolHandler>([
   ['optimizer_cancel', (agentId, args) => toolOptimizerCancel(agentId, args)],
   // 模型采纳(OW-adopt):Agent 发起 Profile 新版本采纳提议,HITL 批准后发布+重绑
   ['optimizer_profile_propose', (agentId, args) => toolOptimizerProfilePropose(agentId, args)],
-  // 本体工具族(ONT):只读子图/起草/校验/解释/编译预览/提议发布/版本比较/草稿内容写
+  // 本体工具族(ONT):只读子图/邻接/起草/校验/解释/编译预览/提议发布/版本比较/草稿内容写
   ['ontology_scene_inspect', (agentId, args) => toolOntologySceneInspect(agentId, args)],
+  ['ontology_node_neighbors', (agentId, args) => toolOntologyNodeNeighbors(agentId, args)],
   ['ontology_draft_create', (agentId, args) => toolOntologyDraftCreate(agentId, args)],
   ['ontology_draft_update', (agentId, args) => toolOntologyDraftUpdate(agentId, args)],
   ['ontology_draft_validate', (agentId, args) => toolOntologyDraftValidate(agentId, args)],
+  ['ontology_draft_autofix', (agentId, args) => toolOntologyDraftAutofix(agentId, args)],
   ['ontology_rule_explain', (agentId, args) => toolOntologyRuleExplain(agentId, args)],
   ['ontology_compile_preview', (agentId, args) => toolOntologyCompilePreview(agentId, args)],
   ['ontology_publish_propose', (agentId, args) => toolOntologyPublishPropose(agentId, args)],