@ai-setting/roy-agent-core 1.5.43 → 1.5.45

package/dist/env/workflow/index.js

@@ -1,17 +1,35 @@
 import {
   WorkflowComponent
-} from "../../shared/@ai-setting/roy-agent-core-bmr6bdfb.js";
-import"../../shared/@ai-setting/roy-agent-core-0rtxwr28.js";
-import"../../shared/@ai-setting/roy-agent-core-2jnzv9at.js";
-import"../../shared/@ai-setting/roy-agent-core-69jskqjg.js";
+} from "../../shared/@ai-setting/roy-agent-core-cr8xer31.js";
+import"../../shared/@ai-setting/roy-agent-core-9bmtxmp6.js";
+import"../../shared/@ai-setting/roy-agent-core-nn9dmffw.js";
+import"../../shared/@ai-setting/roy-agent-core-6atd905e.js";
+import"../../shared/@ai-setting/roy-agent-core-44g4dhzg.js";
+import"../../shared/@ai-setting/roy-agent-core-dbxm76wf.js";
 import"../../shared/@ai-setting/roy-agent-core-4t40mkpv.js";
-import"../../shared/@ai-setting/roy-agent-core-jvatggbb.js";
+import"../../shared/@ai-setting/roy-agent-core-6vxg2gmr.js";
+import"../../shared/@ai-setting/roy-agent-core-0vbdz0x7.js";
+import"../../shared/@ai-setting/roy-agent-core-nhfy3p8q.js";
+import {
+  Edge,
+  NodeAs,
+  Workflow,
+  WorkflowConverter,
+  WorkflowEdges,
+  createWorkflowFromClass
+} from "../../shared/@ai-setting/roy-agent-core-h0x19xgn.js";
+import {
+  DecoratorNode,
+  init_decorator_node
+} from "../../shared/@ai-setting/roy-agent-core-1ce3fqrk.js";
+import"../../shared/@ai-setting/roy-agent-core-v002ynpa.js";
 import {
   BaseEventSchema,
   ControlPauseEventSchema,
   ControlResumeEventSchema,
   ControlStopEventSchema,
   DependsOnSchema,
+  EdgeDefinitionSchema,
   InputParameterSchema,
   NodeAddedEventSchema,
   NodeCompletedEventSchema,
@@ -28,10 +46,12 @@ import {
   OutputDefinitionSchema,
   RetryConfigSchema,
   RunStatusSchema,
+  TemplateUnresolvedError,
   WorkflowAskUserEventSchema,
   WorkflowCompletedEventSchema,
   WorkflowConfigSchema,
   WorkflowDefinitionSchema,
+  WorkflowError,
   WorkflowEventSchema,
   WorkflowFailedEventSchema,
   WorkflowInputsSchema,
@@ -42,37 +62,28 @@ import {
   WorkflowResumedEventSchema,
   WorkflowStartedEventSchema,
   WorkflowStoppedEventSchema,
+  WorkflowValidationError,
   createNodeExecutionContext,
   createWorkflowEvent,
   getWorkflowSessionStatus,
   init_types,
   isWorkflowSessionMetadata,
+  nodeNotFound,
   parseWorkflowFile,
-  parseWorkflowFileSync
-} from "../../shared/@ai-setting/roy-agent-core-5x94xmt6.js";
-import"../../shared/@ai-setting/roy-agent-core-0vbdz0x7.js";
-import {
-  Edge,
-  NodeAs,
-  Workflow,
-  WorkflowConverter,
-  WorkflowEdges,
-  createWorkflowFromClass
-} from "../../shared/@ai-setting/roy-agent-core-7fgf85wc.js";
-import {
-  DecoratorNode,
-  init_decorator_node
-} from "../../shared/@ai-setting/roy-agent-core-1ce3fqrk.js";
+  parseWorkflowFileSync,
+  pathNotFound,
+  unresolvedVariable
+} from "../../shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
 import {
   AskUserError,
   createNodeInterruptEvent,
   createWorkflowAskUserEvent
 } from "../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import"../../shared/@ai-setting/roy-agent-core-q5qj0fes.js";
-import"../../shared/@ai-setting/roy-agent-core-4jqq077c.js";
-import"../../shared/@ai-setting/roy-agent-core-2dhd60aw.js";
-import"../../shared/@ai-setting/roy-agent-core-jqy2mdyq.js";
-import"../../shared/@ai-setting/roy-agent-core-z33en0cz.js";
+import"../../shared/@ai-setting/roy-agent-core-6e3wz81d.js";
+import"../../shared/@ai-setting/roy-agent-core-vdwvamre.js";
+import"../../shared/@ai-setting/roy-agent-core-rgj6hq15.js";
+import"../../shared/@ai-setting/roy-agent-core-rm3hay00.js";
 import"../../shared/@ai-setting/roy-agent-core-10n2jh7p.js";
 import"../../shared/@ai-setting/roy-agent-core-58k274fg.js";
 import"../../shared/@ai-setting/roy-agent-core-c6592r3c.js";
@@ -82,8 +93,11 @@ import"../../shared/@ai-setting/roy-agent-core-fs0mn2jk.js";
 init_decorator_node();
 init_types();
 export {
+  unresolvedVariable,
+  pathNotFound,
   parseWorkflowFileSync,
   parseWorkflowFile,
+  nodeNotFound,
   isWorkflowSessionMetadata,
   getWorkflowSessionStatus,
   createWorkflowFromClass,
@@ -91,6 +105,7 @@ export {
   createWorkflowAskUserEvent,
   createNodeInterruptEvent,
   createNodeExecutionContext,
+  WorkflowValidationError,
   WorkflowStoppedEventSchema,
   WorkflowStartedEventSchema,
   WorkflowResumedEventSchema,
@@ -101,6 +116,7 @@ export {
   WorkflowInputsSchema,
   WorkflowFailedEventSchema,
   WorkflowEventSchema,
+  WorkflowError,
   WorkflowEdges,
   WorkflowDefinitionSchema,
   WorkflowConverter,
@@ -109,6 +125,7 @@ export {
   WorkflowCompletedEventSchema,
   WorkflowAskUserEventSchema,
   Workflow,
+  TemplateUnresolvedError,
   RunStatusSchema,
   RetryConfigSchema,
   OutputDefinitionSchema,
@@ -126,6 +143,7 @@ export {
   NodeAs,
   NodeAddedEventSchema,
   InputParameterSchema,
+  EdgeDefinitionSchema,
   Edge,
   DependsOnSchema,
   DecoratorNode,

package/dist/env/workflow/nodes/index.js

@@ -5,7 +5,11 @@ import {
   init_skill_node,
   init_tool_node,
   init_workflow_node
-} from "../../../shared/@ai-setting/roy-agent-core-jvatggbb.js";
+} from "../../../shared/@ai-setting/roy-agent-core-6vxg2gmr.js";
+import"../../../shared/@ai-setting/roy-agent-core-q5qj0fes.js";
+import"../../../shared/@ai-setting/roy-agent-core-10n2jh7p.js";
+import"../../../shared/@ai-setting/roy-agent-core-58k274fg.js";
+import"../../../shared/@ai-setting/roy-agent-core-c6592r3c.js";
 import"../../../shared/@ai-setting/roy-agent-core-fs0mn2jk.js";
 
 // src/env/workflow/nodes/index.ts

package/dist/env/workflow/tools/index.js

@@ -3,6 +3,13 @@ import {
   askUserTool,
   askUserToolInstance
 } from "../../../shared/@ai-setting/roy-agent-core-0vbdz0x7.js";
+import {
+  WORKFLOW_SUBMIT_OUTPUT_TOOL_NAME,
+  WorkflowJsonOutputMarker,
+  createSubmitJsonOutputTool,
+  init_submit_json_output_tool,
+  parseWorkflowJsonOutput
+} from "../../../shared/@ai-setting/roy-agent-core-nhfy3p8q.js";
 import"../../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   createLogger,
@@ -147,13 +154,20 @@ function resetRunWorkflowTool() {
   _runWorkflowTool = null;
   _workflowService = null;
 }
+
+// src/env/workflow/tools/index.ts
+init_submit_json_output_tool();
 export {
   resetRunWorkflowTool,
+  parseWorkflowJsonOutput,
   initRunWorkflowTool,
   getRunWorkflowTool,
+  createSubmitJsonOutputTool,
   createRunWorkflowTool,
   askUserToolInstance,
   askUserTool,
+  WorkflowJsonOutputMarker,
+  WORKFLOW_SUBMIT_OUTPUT_TOOL_NAME,
   RunWorkflowInputSchema,
   AskUserInputSchema
 };

package/dist/env/workflow/types/index.js

@@ -4,6 +4,7 @@ import {
   ControlResumeEventSchema,
   ControlStopEventSchema,
   DependsOnSchema,
+  EdgeDefinitionSchema,
   InputParameterSchema,
   NodeAddedEventSchema,
   NodeCompletedEventSchema,
@@ -20,10 +21,12 @@ import {
   OutputDefinitionSchema,
   RetryConfigSchema,
   RunStatusSchema,
+  TemplateUnresolvedError,
   WorkflowAskUserEventSchema,
   WorkflowCompletedEventSchema,
   WorkflowConfigSchema,
   WorkflowDefinitionSchema,
+  WorkflowError,
   WorkflowEventSchema,
   WorkflowFailedEventSchema,
   WorkflowInputsSchema,
@@ -34,14 +37,18 @@ import {
   WorkflowResumedEventSchema,
   WorkflowStartedEventSchema,
   WorkflowStoppedEventSchema,
+  WorkflowValidationError,
   createNodeExecutionContext,
   createWorkflowEvent,
   getWorkflowSessionStatus,
   init_types,
   isWorkflowSessionMetadata,
+  nodeNotFound,
   parseWorkflowFile,
-  parseWorkflowFileSync
-} from "../../../shared/@ai-setting/roy-agent-core-5x94xmt6.js";
+  parseWorkflowFileSync,
+  pathNotFound,
+  unresolvedVariable
+} from "../../../shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
 import {
   AskUserError,
   createNodeInterruptEvent,
@@ -51,14 +58,18 @@ import"../../../shared/@ai-setting/roy-agent-core-fs0mn2jk.js";
 init_types();
 
 export {
+  unresolvedVariable,
+  pathNotFound,
   parseWorkflowFileSync,
   parseWorkflowFile,
+  nodeNotFound,
   isWorkflowSessionMetadata,
   getWorkflowSessionStatus,
   createWorkflowEvent,
   createWorkflowAskUserEvent,
   createNodeInterruptEvent,
   createNodeExecutionContext,
+  WorkflowValidationError,
   WorkflowStoppedEventSchema,
   WorkflowStartedEventSchema,
   WorkflowResumedEventSchema,
@@ -69,10 +80,12 @@ export {
   WorkflowInputsSchema,
   WorkflowFailedEventSchema,
   WorkflowEventSchema,
+  WorkflowError,
   WorkflowDefinitionSchema,
   WorkflowConfigSchema,
   WorkflowCompletedEventSchema,
   WorkflowAskUserEventSchema,
+  TemplateUnresolvedError,
   RunStatusSchema,
   RetryConfigSchema,
   OutputDefinitionSchema,
@@ -89,6 +102,7 @@ export {
   NodeCompletedEventSchema,
   NodeAddedEventSchema,
   InputParameterSchema,
+  EdgeDefinitionSchema,
   DependsOnSchema,
   ControlStopEventSchema,
   ControlResumeEventSchema,

package/dist/env/workflow/utils/index.js

@@ -1,3 +1,11 @@
+import {
+  TemplateResolver,
+  init_template_resolver,
+  resolveTemplateString,
+  resolveTemplates
+} from "../../../shared/@ai-setting/roy-agent-core-v002ynpa.js";
+import"../../../shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
+import"../../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   TracedAs,
   init_decorator
@@ -9,199 +17,9 @@ import {
   __legacyDecorateClassTS
 } from "../../../shared/@ai-setting/roy-agent-core-fs0mn2jk.js";
 
-// src/env/workflow/utils/template-resolver.ts
-class TemplateResolver {
-  input;
-  previousOutputs;
-  constructor(options = {}) {
-    this.input = options.input ?? {};
-    this.previousOutputs = options.previousOutputs ?? new Map;
-  }
-  static fromContext(context) {
-    return new TemplateResolver({
-      input: context.input,
-      previousOutputs: context.previousOutputs
-    });
-  }
-  resolveValue(input) {
-    if (input === null || input === undefined) {
-      return input;
-    }
-    if (typeof input === "string") {
-      const pureTemplate = this.extractPureTemplate(input);
-      if (pureTemplate) {
-        return this.resolvePureTemplate(pureTemplate);
-      }
-      return this.resolveString(input);
-    }
-    if (Array.isArray(input)) {
-      return input.map((item) => this.resolveValue(item));
-    }
-    if (typeof input === "object") {
-      const resolved = {};
-      for (const [key, value] of Object.entries(input)) {
-        resolved[key] = this.resolveValue(value);
-      }
-      return resolved;
-    }
-    return input;
-  }
-  extractPureTemplate(str) {
-    const trimmed = str.trim();
-    if (trimmed.startsWith("{{") && trimmed.endsWith("}}") && trimmed.length > 4) {
-      const content = trimmed.slice(2, -2).trim();
-      if (!content.includes("{{") && !content.includes("}}")) {
-        return content;
-      }
-    }
-    return null;
-  }
-  resolvePureTemplate(templateContent) {
-    const value = this.resolveTemplateContent(templateContent);
-    return value;
-  }
-  resolveTemplateContent(templateContent) {
-    const trimmed = templateContent.trim();
-    if (trimmed.startsWith("input.")) {
-      return this.getNestedValue(this.input, trimmed.slice(6));
-    }
-    if (trimmed.startsWith("nodes.")) {
-      return this.resolveNodePath(trimmed.slice(6));
-    }
-    if (trimmed !== "input" && trimmed !== "nodes") {
-      const segments = trimmed.split(".");
-      const nodeId = segments[0];
-      const restPath = segments.slice(1).join(".") || undefined;
-      return this.resolveNodePath(`${nodeId}${restPath ? "." + restPath : ""}`);
-    }
-    return;
-  }
-  resolveString(template) {
-    if (!template || typeof template !== "string") {
-      return template;
-    }
-    let resolved = template;
-    resolved = resolved.replace(/\{\{input\.([^}]+)\}\}/g, (match, path) => {
-      const value = this.getNestedValue(this.input, path);
-      return this.stringify(value, match);
-    });
-    resolved = resolved.replace(/\{\{nodes\.([^}]+)\}\}/g, (match, path) => {
-      const value = this.resolveNodePath(path);
-      return this.stringify(value, match);
-    });
-    resolved = resolved.replace(/\{\{([a-zA-Z_][a-zA-Z0-9_-]*)(?:\.([^}]+))?\}\}/g, (match, nodeId, path) => {
-      if (nodeId === "input") {
-        return match;
-      }
-      if (nodeId === "nodes") {
-        return match;
-      }
-      const value = this.resolveNodePath(`${nodeId}${path ? "." + path : ""}`);
-      return this.stringify(value, match);
-    });
-    return resolved;
-  }
-  resolveNodePath(path) {
-    const segments = path.split(".");
-    const nodeId = segments[0];
-    if (!nodeId) {
-      return;
-    }
-    let value = this.previousOutputs.get(nodeId);
-    if (value === undefined) {
-      const normalizedUnderscore = nodeId.replace(/-/g, "_");
-      const normalizedHyphen = nodeId.replace(/_/g, "-");
-      if (normalizedUnderscore !== nodeId) {
-        value = this.previousOutputs.get(normalizedUnderscore);
-      }
-      if (value === undefined && normalizedHyphen !== nodeId) {
-        value = this.previousOutputs.get(normalizedHyphen);
-      }
-    }
-    if (value === undefined) {
-      return;
-    }
-    if (segments.length === 1) {
-      if (value && typeof value === "object" && "result" in value && !("nodes" in value)) {
-        value = value.result;
-      }
-      return value;
-    }
-    const secondSegment = segments[1];
-    if (secondSegment === "result" || secondSegment === "output") {
-      if (value && typeof value === "object" && "result" in value) {
-        value = value.result;
-        if (segments.length === 2) {
-          return value;
-        }
-        for (let i = 2;i < segments.length; i++) {
-          if (value === null || value === undefined) {
-            return;
-          }
-          value = value[segments[i]];
-        }
-        return value;
-      }
-    }
-    for (let i = 1;i < segments.length; i++) {
-      if (value === null || value === undefined) {
-        return;
-      }
-      value = value[segments[i]];
-    }
-    return value;
-  }
-  getNestedValue(obj, path) {
-    if (!obj || !path) {
-      return;
-    }
-    const segments = path.split(".");
-    let current = obj;
-    for (const segment of segments) {
-      if (current === null || current === undefined) {
-        return;
-      }
-      if (typeof current !== "object") {
-        return;
-      }
-      current = current[segment];
-    }
-    return current;
-  }
-  stringify(value, originalTemplate) {
-    if (value === undefined) {
-      return originalTemplate;
-    }
-    if (typeof value === "string") {
-      return value;
-    }
-    if (value === null) {
-      return "null";
-    }
-    return JSON.stringify(value);
-  }
-  containsTemplates(str) {
-    if (typeof str !== "string") {
-      return false;
-    }
-    return /\{\{[^}]+\}\}/.test(str);
-  }
-  extractTemplates(str) {
-    if (typeof str !== "string") {
-      return [];
-    }
-    const matches = str.match(/\{\{[^}]+\}\}/g);
-    return matches ?? [];
-  }
-}
-function resolveTemplates(input, context) {
-  const resolver = TemplateResolver.fromContext(context);
-  return resolver.resolveValue(input);
-}
-function resolveTemplateString(template, context) {
-  const resolver = TemplateResolver.fromContext(context);
-  return resolver.resolveString(template);
-}
+// src/env/workflow/utils/index.ts
+init_template_resolver();
+
 // src/env/workflow/utils/recovery-validator.ts
 init_decorator();
 
@@ -461,9 +279,10 @@ class RecoveryValidator {
   validateConditionBranches(state, definition) {
     const errors = [];
     const edges = definition.edges || definition.connections || [];
-    const conditionalEdges = edges.filter((e) => e.condition);
+    const conditionalEdges = edges.filter((e) => e.when || e.condition);
     for (const edge of conditionalEdges) {
-      const conditionVars = this.extractVariableRefs(edge.condition);
+      const condition = edge.when || edge.condition;
+      const conditionVars = this.extractVariableRefs(condition);
       for (const varRef of conditionVars) {
         if (!state.nodeOutputs.has(varRef) && !state.variables.has(varRef)) {
           errors.push({
@@ -471,7 +290,7 @@ class RecoveryValidator {
             nodeId: edge.target || edge.to,
             description: `条件分支无法确定：变量 ${varRef} 不存在`,
             suggestedAction: "CONFIRM" /* CONFIRM */,
-            context: { variable: varRef, condition: edge.condition }
+            context: { variable: varRef, condition }
           });
         }
       }