@ai-setting/roy-agent-core 1.5.5 → 1.5.7

package/dist/index.js

@@ -74,7 +74,7 @@ import {
 } from "./shared/@ai-setting/roy-agent-core-qxnbvgwe.js";
 import {
   WorkflowComponent
-} from "./shared/@ai-setting/roy-agent-core-ya8krqzt.js";
+} from "./shared/@ai-setting/roy-agent-core-dc497hmk.js";
 import {
   init_node_registry_helper,
   registerDecoratorNodeType
@@ -89,14 +89,14 @@ import {
   createWorkflowFromClass
 } from "./shared/@ai-setting/roy-agent-core-7fgf85wc.js";
 import"./shared/@ai-setting/roy-agent-core-1ce3fqrk.js";
-import"./shared/@ai-setting/roy-agent-core-kkp3qmc3.js";
-import"./shared/@ai-setting/roy-agent-core-pc9g3962.js";
-import"./shared/@ai-setting/roy-agent-core-3agad0d9.js";
-import"./shared/@ai-setting/roy-agent-core-rzp9kxne.js";
+import"./shared/@ai-setting/roy-agent-core-wrcy0h6z.js";
+import"./shared/@ai-setting/roy-agent-core-69jskqjg.js";
+import"./shared/@ai-setting/roy-agent-core-jvatggbb.js";
+import"./shared/@ai-setting/roy-agent-core-5x94xmt6.js";
 import {
   AgentComponent,
   AgentComponentConfigSchema
-} from "./shared/@ai-setting/roy-agent-core-f0cc2ep9.js";
+} from "./shared/@ai-setting/roy-agent-core-b0x5dda6.js";
 import {
   AskUserError,
   init_workflow_hil
@@ -117,7 +117,7 @@ import {
 import"./shared/@ai-setting/roy-agent-core-psvxt4c9.js";
 import {
   McpComponent
-} from "./shared/@ai-setting/roy-agent-core-c0jcxnf4.js";
+} from "./shared/@ai-setting/roy-agent-core-pjr12nnd.js";
 import {
   AgentError,
   ComponentError,
@@ -129,7 +129,7 @@ import {
   getErrorCode,
   isRoyError
 } from "./shared/@ai-setting/roy-agent-core-ctdhjv68.js";
-import"./shared/@ai-setting/roy-agent-core-nhdrvfp8.js";
+import"./shared/@ai-setting/roy-agent-core-1akcqxj9.js";
 import {
   SessionComponent
 } from "./shared/@ai-setting/roy-agent-core-81w1963m.js";

package/dist/shared/@ai-setting/{roy-agent-core-nhdrvfp8.js → roy-agent-core-1akcqxj9.js}

@@ -7,6 +7,31 @@ import {
 init_logger();
 import { z } from "zod";
 var logger = createLogger("mcp-adapter");
+function validateRequiredParams(inputSchema, args) {
+  if (!inputSchema) {
+    return { valid: true, missing: [] };
+  }
+  const schema = inputSchema;
+  const required = schema.required ?? [];
+  if (required.length === 0) {
+    return { valid: true, missing: [] };
+  }
+  const missing = [];
+  for (const param of required) {
+    const value = args[param];
+    if (value === undefined || value === null) {
+      missing.push(param);
+    }
+  }
+  if (missing.length > 0) {
+    return {
+      valid: false,
+      missing,
+      error: `Missing required parameter${missing.length > 1 ? "s" : ""}: ${missing.join(", ")}`
+    };
+  }
+  return { valid: true, missing: [] };
+}
 function adaptMcpTool(mcpTool, mcpClient, serverName) {
   const toolName = `mcp_${serverName}_${mcpTool.name}`;
   const description = `MCP tool [${serverName}/${mcpTool.name}]: ${mcpTool.description ?? ""}`;
@@ -16,20 +41,41 @@ function adaptMcpTool(mcpTool, mcpClient, serverName) {
     description,
     parameters: paramsSchema,
     execute: async (args, _ctx) => {
+      const toolArgs = args ?? {};
+      const validation = validateRequiredParams(mcpTool.inputSchema, toolArgs);
+      if (!validation.valid) {
+        logger.warn(`[McpAdapter] Tool call skipped: ${toolName}`, {
+          reason: "missing_required_params",
+          missing: validation.missing
+        });
+        return {
+          success: false,
+          output: "",
+          error: validation.error
+        };
+      }
       try {
         const result = await mcpClient.callTool({
           name: mcpTool.name,
-          arguments: args ?? {}
+          arguments: toolArgs
         });
         return convertMcpCallResult(result);
       } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const errorCode = error?.code;
         logger.error(`[McpAdapter] Tool call failed: ${toolName}`, {
-          error: error instanceof Error ? error.message : String(error)
+          error: errorMessage,
+          errorCode,
+          receivedArgs: toolArgs
         });
+        let userMessage = errorMessage;
+        if (errorCode === -32602) {
+          userMessage = `Invalid parameters for tool "${mcpTool.name}": ${errorMessage}`;
+        }
         return {
           success: false,
           output: "",
-          error: error instanceof Error ? error.message : String(error)
+          error: userMessage
         };
       }
     },

package/dist/shared/@ai-setting/{roy-agent-core-rzp9kxne.js → roy-agent-core-5x94xmt6.js}

@@ -57,7 +57,7 @@ function parseWorkflowFileSync(content, filename) {
     definition
   };
 }
-var DependsOnSchema, RetryConfigSchema, NodeDefinitionSchema, WorkflowConfigSchema, OutputDefinitionSchema, WorkflowMetadataSchema, WorkflowDefinitionSchema, yamlParser = null;
+var DependsOnSchema, RetryConfigSchema, NodeDefinitionSchema, WorkflowConfigSchema, OutputDefinitionSchema, InputParameterSchema, WorkflowInputsSchema, WorkflowMetadataSchema, WorkflowDefinitionSchema, yamlParser = null;
 var init_workflow = __esm(() => {
   DependsOnSchema = z.array(z.string());
   RetryConfigSchema = z.object({
@@ -86,6 +86,13 @@ var init_workflow = __esm(() => {
     source: z.string(),
     path: z.string()
   });
+  InputParameterSchema = z.object({
+    type: z.enum(["string", "number", "boolean", "object", "array"]),
+    description: z.string().optional(),
+    default: z.unknown().optional(),
+    required: z.boolean().default(false)
+  });
+  WorkflowInputsSchema = z.record(z.string(), InputParameterSchema);
   WorkflowMetadataSchema = z.object({
     author: z.string().optional(),
     taskId: z.number().optional(),
@@ -101,6 +108,7 @@ var init_workflow = __esm(() => {
     nodes: z.array(NodeDefinitionSchema).min(1, "At least one node is required"),
     entry: z.union([z.string(), z.array(z.string())]).default("__default_entry__"),
     outputs: z.array(OutputDefinitionSchema).optional().default([]),
+    inputs: WorkflowInputsSchema.optional().default({}),
     metadata: WorkflowMetadataSchema.optional().default({})
   });
 });
@@ -111,9 +119,9 @@ var WorkflowMessageRoleSchema;
 var init_workflow_message = __esm(() => {
   init_workflow_hil();
   WorkflowMessageRoleSchema = z2.enum([
-    "workflow.node.call",
+    "workflow.node.start",
     "workflow.node.interrupt",
-    "workflow.node.result",
+    "workflow.node.end",
     "workflow.node.resume"
   ]);
 });
@@ -203,8 +211,9 @@ var init_event = __esm(() => {
   NodeStartedEventSchema = BaseEventSchema.extend({
     type: z3.literal("node.started"),
     node_id: z3.string(),
-    input: z3.any(),
+    input: z3.any().optional(),
     agentSessionId: z3.string().optional(),
+    userQuery: z3.string().optional(),
     userResponse: z3.string().optional()
   });
   NodeProgressEventSchema = BaseEventSchema.extend({
@@ -338,4 +347,4 @@ var init_types = __esm(() => {
   init_run();
 });
 
-export { BaseEventSchema, WorkflowStartedEventSchema, WorkflowPausedEventSchema, WorkflowResumedEventSchema, WorkflowStoppedEventSchema, WorkflowCompletedEventSchema, WorkflowFailedEventSchema, WorkflowOutputEventSchema, NodeScheduledEventSchema, NodeStartedEventSchema, NodeProgressEventSchema, NodeCompletedEventSchema, NodeFailedEventSchema, NodeSkippedEventSchema, NodeDataEventSchema, NodeAddedEventSchema, NodeRemovedEventSchema, ControlPauseEventSchema, ControlResumeEventSchema, ControlStopEventSchema, NodeInterruptEventSchema, WorkflowAskUserEventSchema, WorkflowEventSchema, createWorkflowEvent, init_event, DependsOnSchema, RetryConfigSchema, NodeDefinitionSchema, WorkflowConfigSchema, OutputDefinitionSchema, WorkflowMetadataSchema, WorkflowDefinitionSchema, parseWorkflowFile, parseWorkflowFileSync, WorkflowMessageRoleSchema, isWorkflowSessionMetadata, getWorkflowSessionStatus, RunStatusSchema, NodeStatusSchema, createNodeExecutionContext, init_types };
+export { BaseEventSchema, WorkflowStartedEventSchema, WorkflowPausedEventSchema, WorkflowResumedEventSchema, WorkflowStoppedEventSchema, WorkflowCompletedEventSchema, WorkflowFailedEventSchema, WorkflowOutputEventSchema, NodeScheduledEventSchema, NodeStartedEventSchema, NodeProgressEventSchema, NodeCompletedEventSchema, NodeFailedEventSchema, NodeSkippedEventSchema, NodeDataEventSchema, NodeAddedEventSchema, NodeRemovedEventSchema, ControlPauseEventSchema, ControlResumeEventSchema, ControlStopEventSchema, NodeInterruptEventSchema, WorkflowAskUserEventSchema, WorkflowEventSchema, createWorkflowEvent, init_event, DependsOnSchema, RetryConfigSchema, NodeDefinitionSchema, WorkflowConfigSchema, OutputDefinitionSchema, InputParameterSchema, WorkflowInputsSchema, WorkflowMetadataSchema, WorkflowDefinitionSchema, parseWorkflowFile, parseWorkflowFileSync, WorkflowMessageRoleSchema, isWorkflowSessionMetadata, getWorkflowSessionStatus, RunStatusSchema, NodeStatusSchema, createNodeExecutionContext, init_types };

package/dist/shared/@ai-setting/{roy-agent-core-pc9g3962.js → roy-agent-core-69jskqjg.js}

@@ -46,55 +46,42 @@ class AgentComponentAdapter {
     const nodeId = config.nodeId || "unknown";
     const runId = config.runId || "unknown";
     const workflowSessionId = config.workflowSessionId;
-    const existingAgentSessionId = config.agentSessionId;
-    const resumeAgentSessionId = resumeOptions?.agentSessionId;
-    const isResume = !!resumeOptions?.userResponse || !!existingAgentSessionId || !!resumeAgentSessionId;
-    let agentSessionId;
-    if (isResume && (this._currentAgentSessionId || existingAgentSessionId || resumeAgentSessionId)) {
-      agentSessionId = resumeAgentSessionId || existingAgentSessionId || this._currentAgentSessionId;
-      if (resumeOptions?.userResponse && this._sessionComponent && agentSessionId) {
-        try {
-          await this._sessionComponent.addMessage(agentSessionId, {
-            role: "user",
-            content: resumeOptions.userResponse,
-            metadata: {
-              type: "user_intent",
-              intent: "workflow.resume",
-              workflowNodeId: nodeId
-            }
-          });
-        } catch (error) {
-          console.warn(`Failed to add user response to agent session ${agentSessionId}:`, error);
-        }
-      }
-    } else {
-      if (this._sessionComponent) {
-        agentSessionId = `${this.agentSessionPrefix}_${runId}_${nodeId}_${Date.now()}`;
-        try {
-          await this._sessionComponent.create({
-            title: `Agent Session: ${config.type} (${agentSessionId})`,
-            metadata: {
-              type: "agent",
-              workflowRunId: runId,
-              workflowNodeId: nodeId
-            }
-          });
-          this._currentAgentSessionId = agentSessionId;
-          if (workflowSessionId) {
-            const mapping = this.runSessionToAgentSessions.get(workflowSessionId) || [];
-            mapping.push(agentSessionId);
-            this.runSessionToAgentSessions.set(workflowSessionId, mapping);
+    const isResume = !!resumeOptions?.userQuery;
+    let agentSessionId = resumeOptions?.agentSessionId || config.agentSessionId || this._currentAgentSessionId;
+    if (!agentSessionId && this._sessionComponent) {
+      agentSessionId = `${this.agentSessionPrefix}_${runId}_${nodeId}_${Date.now()}`;
+      try {
+        await this._sessionComponent.create({
+          title: `Agent Session: ${config.type} (${agentSessionId})`,
+          metadata: {
+            type: "agent",
+            workflowRunId: runId,
+            workflowNodeId: nodeId
           }
-          this.pendingSessions.set(agentSessionId, {
-            agentSessionId,
-            nodeId,
-            runId,
-            createdAt: Date.now()
-          });
-        } catch (error) {
-          console.warn(`Failed to create agent session ${agentSessionId}:`, error);
+        });
+      } catch (error) {
+        console.warn(`Failed to create agent session ${agentSessionId}:`, error);
+      }
+    }
+    if (agentSessionId) {
+      this._currentAgentSessionId = agentSessionId;
+      if (workflowSessionId && this._sessionComponent) {
+        const mapping = this.runSessionToAgentSessions.get(workflowSessionId) || [];
+        if (!mapping.includes(agentSessionId)) {
+          mapping.push(agentSessionId);
+          this.runSessionToAgentSessions.set(workflowSessionId, mapping);
         }
       }
+      if (isResume) {
+        this.pendingSessions.delete(agentSessionId);
+      } else {
+        this.pendingSessions.set(agentSessionId, {
+          agentSessionId,
+          nodeId,
+          runId,
+          createdAt: Date.now()
+        });
+      }
     }
     try {
       const context = {};
@@ -113,7 +100,9 @@ class AgentComponentAdapter {
       if (config.workflowHistory) {
         context.workflowHistory = config.workflowHistory;
       }
-      const result = await this.agentComponent.run(config.type || "general", config.prompt, context);
+      context.additionInfo = config.prompt;
+      const userInput = resumeOptions?.userQuery || "";
+      const result = await this.agentComponent.run(config.type || "general", userInput, context);
       if (result.error?.startsWith("__ASK_USER_ERROR__:")) {
         const jsonStr = result.error.substring("__ASK_USER_ERROR__:".length);
         const errorInfo = JSON.parse(jsonStr);
@@ -153,30 +142,16 @@ class AgentComponentAdapter {
         }
       };
     } finally {
-      if (!isResume) {
+      if (isResume) {
         this._currentAgentSessionId = undefined;
       }
     }
   }
-  async resumeAgent(agentSessionId, userResponse, config) {
-    if (this._sessionComponent) {
-      try {
-        await this._sessionComponent.addMessage(agentSessionId, {
-          role: "user",
-          content: userResponse,
-          metadata: {
-            type: "user_intent",
-            intent: "workflow.resume"
-          }
-        });
-        this.pendingSessions.delete(agentSessionId);
-        this._currentAgentSessionId = agentSessionId;
-      } catch (error) {
-        console.warn(`Failed to add user response to agent session ${agentSessionId}:`, error);
-      }
-    }
+  async resumeAgent(agentSessionId, userQuery, config) {
+    this.pendingSessions.delete(agentSessionId);
+    this._currentAgentSessionId = agentSessionId;
     config.agentSessionId = agentSessionId;
-    return this.run(config, { userResponse });
+    return this.run(config, { userQuery, agentSessionId });
   }
   getPendingSession(agentSessionId) {
     return this.pendingSessions.get(agentSessionId);

package/dist/shared/@ai-setting/{roy-agent-core-f0cc2ep9.js → roy-agent-core-b0x5dda6.js}

@@ -834,11 +834,11 @@ class AgentComponent extends BaseComponent {
         content: ctx.systemPrompt
       });
     }
-    if (ctx.additionInfo) {
+    if (ctx.context?.additionInfo) {
       messages.push({
         role: "user",
         content: `额外信息：
-${ctx.additionInfo}`
+${ctx.context.additionInfo}`
       });
     }
     messages.push(...ctx.messages);

package/dist/shared/@ai-setting/{roy-agent-core-ya8krqzt.js → roy-agent-core-dc497hmk.js}

@@ -12,7 +12,7 @@ import {
   WorkflowEngine,
   exports_engine,
   init_engine
-} from "./roy-agent-core-kkp3qmc3.js";
+} from "./roy-agent-core-wrcy0h6z.js";
 import {
   BaseComponent
 } from "./roy-agent-core-kkbwepqb.js";
@@ -134,14 +134,15 @@ class WorkflowComponent extends BaseComponent {
     if (!agentRunner && this._workflowEnv) {
       const agentComponent = this._workflowEnv.getComponent("agent");
       if (agentComponent) {
-        const { AgentComponentAdapter } = await import("./roy-agent-core-z2t8hse8.js");
-        agentRunner = new AgentComponentAdapter(agentComponent);
+        const { AgentComponentAdapter } = await import("./roy-agent-core-dh9d7a3m.js");
+        agentRunner = new AgentComponentAdapter(agentComponent, {}, this.sessionComponent);
       }
     }
     const registry = new NodeRegistry({
       toolRegistry: toolComponent,
       skillRegistry: skillComponent,
-      agentRunner
+      agentRunner,
+      sessionComponent: this.sessionComponent
     });
     registerDecoratorNodeType2(registry);
     const engine = new WorkflowEngine(registry);

package/dist/shared/@ai-setting/{roy-agent-core-z2t8hse8.js → roy-agent-core-dh9d7a3m.js}

@@ -1,7 +1,7 @@
 import {
   AgentComponentAdapter,
   init_agent_component_adapter
-} from "./roy-agent-core-pc9g3962.js";
+} from "./roy-agent-core-69jskqjg.js";
 import"./roy-agent-core-e25xkv53.js";
 import"./roy-agent-core-fs0mn2jk.js";
 init_agent_component_adapter();

package/dist/shared/@ai-setting/{roy-agent-core-qw0ebh1d.js → roy-agent-core-gq20wsgv.js}

@@ -10,7 +10,7 @@ function inferNextNode(messages, definition) {
   const lastMessage = messages[messages.length - 1];
   const metadata = lastMessage.metadata;
   switch (metadata?.type) {
-    case "workflow.node.call":
+    case "workflow.node.start":
       return {
         type: "resume_node",
         nodeId: metadata.workflowNodeId,
@@ -22,16 +22,16 @@ function inferNextNode(messages, definition) {
         nodeId: metadata.workflowNodeId,
         agentSessionId: metadata.agentSessionId
       };
-    case "workflow.node.result":
+    case "workflow.node.end":
       return getNextNodes(metadata.workflowNodeId, definition);
     default:
-      const lastCall = findLastCallMessage(messages);
-      if (lastCall) {
-        const callMetadata = lastCall.metadata;
+      const lastStart = findLastStartMessage(messages);
+      if (lastStart) {
+        const startMetadata = lastStart.metadata;
         return {
           type: "resume_node",
-          nodeId: callMetadata.workflowNodeId,
-          agentSessionId: callMetadata.agentSessionId
+          nodeId: startMetadata.workflowNodeId,
+          agentSessionId: startMetadata.agentSessionId
         };
       }
       return { type: "entry_node", nodeId: definition.entryNode };
@@ -53,10 +53,10 @@ function findLastInterruptMessage(messages) {
   }
   return null;
 }
-function findLastCallMessage(messages) {
+function findLastStartMessage(messages) {
   for (let i = messages.length - 1;i >= 0; i--) {
     const msg = messages[i];
-    if (msg.metadata?.type === "workflow.node.call") {
+    if (msg.metadata?.type === "workflow.node.start") {
       return msg;
     }
   }
@@ -64,18 +64,18 @@ function findLastCallMessage(messages) {
 }
 function parseNodeOutputs(messages) {
   const outputs = new Map;
-  let lastCallNodeId = null;
+  let lastStartNodeId = null;
   for (const msg of messages) {
     const metadata = msg.metadata;
-    if (metadata?.type === "workflow.node.call") {
-      lastCallNodeId = metadata.workflowNodeId;
-    } else if (metadata?.type === "workflow.node.result" && lastCallNodeId) {
+    if (metadata?.type === "workflow.node.start") {
+      lastStartNodeId = metadata.workflowNodeId;
+    } else if (metadata?.type === "workflow.node.end" && lastStartNodeId) {
       try {
-        outputs.set(lastCallNodeId, JSON.parse(msg.content));
+        outputs.set(lastStartNodeId, JSON.parse(msg.content));
       } catch {
-        outputs.set(lastCallNodeId, msg.content);
+        outputs.set(lastStartNodeId, msg.content);
       }
-      lastCallNodeId = null;
+      lastStartNodeId = null;
     }
   }
   return outputs;
@@ -94,6 +94,37 @@ function getAgentSessionIdFromInterrupt(messages) {
   const metadata = lastInterrupt.metadata;
   return metadata?.agentSessionId || null;
 }
+function extractResumeInfo(messages) {
+  const nodeOutputs = parseNodeOutputs(messages);
+  let pendingNodeId;
+  let agentSessionId;
+  let hasInterrupt = false;
+  let lastInterruptQuery;
+  for (const msg of messages) {
+    const metadata = msg.metadata;
+    if (metadata?.type === "workflow.node.start") {
+      pendingNodeId = metadata.workflowNodeId;
+      if (metadata?.agentSessionId && !agentSessionId) {
+        agentSessionId = metadata.agentSessionId;
+      }
+    } else if (metadata?.type === "workflow.node.end") {
+      pendingNodeId = undefined;
+      agentSessionId = undefined;
+    } else if (metadata?.type === "workflow.node.interrupt") {
+      pendingNodeId = metadata.workflowNodeId;
+      agentSessionId = metadata.agentSessionId;
+      hasInterrupt = true;
+      lastInterruptQuery = msg.content;
+    }
+  }
+  return {
+    pendingNodeId,
+    agentSessionId,
+    hasInterrupt,
+    nodeOutputs,
+    lastInterruptQuery
+  };
+}
 var init_session_recovery = () => {};
 init_session_recovery();
 
@@ -102,6 +133,7 @@ export {
   inferNextNode,
   hasPendingAskUser,
   getAgentSessionIdFromInterrupt,
+  findLastStartMessage,
   findLastInterruptMessage,
-  findLastCallMessage
+  extractResumeInfo
 };

package/dist/shared/@ai-setting/{roy-agent-core-3agad0d9.js → roy-agent-core-jvatggbb.js}

@@ -49,7 +49,7 @@ class ToolNode {
         input = { message: resolvedMessage };
         console.log(`[ToolNode] message input: ${resolvedMessage}`);
       } else {
-        input = this.definition.config?.input ?? this.definition.config?.args ?? {};
+        input = this.definition.config?.input ?? this.definition.config?.inputs ?? this.definition.config?.args ?? {};
         input = this.resolveTemplateReferences(input, context.previousOutputs, context.input);
       }
       let output;

package/dist/shared/@ai-setting/{roy-agent-core-c0jcxnf4.js → roy-agent-core-pjr12nnd.js}

@@ -4,7 +4,7 @@ import {
 } from "./roy-agent-core-ctdhjv68.js";
 import {
   adaptMcpTool
-} from "./roy-agent-core-nhdrvfp8.js";
+} from "./roy-agent-core-1akcqxj9.js";
 import {
   toEnvKey
 } from "./roy-agent-core-qxhq8ven.js";