@ai-setting/roy-agent-core 1.5.64 → 1.5.66

package/dist/env/agent/index.js

@@ -1,8 +1,8 @@
 import {
   AgentComponent,
   AgentComponentConfigSchema
-} from "../../shared/@ai-setting/roy-agent-core-kap6q69x.js";
-import"../../shared/@ai-setting/roy-agent-core-ecaptews.js";
+} from "../../shared/@ai-setting/roy-agent-core-marga2es.js";
+import"../../shared/@ai-setting/roy-agent-core-ecth1zak.js";
 import"../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import"../../shared/@ai-setting/roy-agent-core-nx3c3ce2.js";
 import"../../shared/@ai-setting/roy-agent-core-qxnbvgwe.js";

package/dist/env/index.js

@@ -21,15 +21,16 @@ import"../shared/@ai-setting/roy-agent-core-xp8xrxgc.js";
 import"../shared/@ai-setting/roy-agent-core-az13yzmc.js";
 import {
   WorkflowComponent
-} from "../shared/@ai-setting/roy-agent-core-70gt0tp0.js";
-import"../shared/@ai-setting/roy-agent-core-0jc06hhg.js";
-import"../shared/@ai-setting/roy-agent-core-v4g5ntf2.js";
+} from "../shared/@ai-setting/roy-agent-core-1yaa58cp.js";
+import"../shared/@ai-setting/roy-agent-core-fjexv5nm.js";
+import"../shared/@ai-setting/roy-agent-core-56xsjjyw.js";
 import"../shared/@ai-setting/roy-agent-core-zgtmazxg.js";
 import"../shared/@ai-setting/roy-agent-core-6d5v531t.js";
 import"../shared/@ai-setting/roy-agent-core-6atd905e.js";
-import"../shared/@ai-setting/roy-agent-core-bcpp60ww.js";
+import"../shared/@ai-setting/roy-agent-core-99j4w3fx.js";
+import"../shared/@ai-setting/roy-agent-core-ddwa0n6h.js";
 import"../shared/@ai-setting/roy-agent-core-4t40mkpv.js";
-import"../shared/@ai-setting/roy-agent-core-9r8pew8y.js";
+import"../shared/@ai-setting/roy-agent-core-ajx32wzj.js";
 import"../shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
 import"../shared/@ai-setting/roy-agent-core-0vbdz0x7.js";
 import"../shared/@ai-setting/roy-agent-core-nhfy3p8q.js";
@@ -38,8 +39,8 @@ import"../shared/@ai-setting/roy-agent-core-1ce3fqrk.js";
 import {
   AgentComponent,
   AgentComponentConfigSchema
-} from "../shared/@ai-setting/roy-agent-core-kap6q69x.js";
-import"../shared/@ai-setting/roy-agent-core-ecaptews.js";
+} from "../shared/@ai-setting/roy-agent-core-marga2es.js";
+import"../shared/@ai-setting/roy-agent-core-ecth1zak.js";
 import"../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   TaskComponent

package/dist/env/llm/index.js

@@ -8,13 +8,13 @@ import {
   ProviderCapabilitiesSchema,
   ProviderConfigSchema,
   ProviderManager
-} from "../../shared/@ai-setting/roy-agent-core-zv2hwptv.js";
+} from "../../shared/@ai-setting/roy-agent-core-qskhsjmc.js";
 import {
   createInvokeConfig,
   invoke,
   invokeNonStream,
   parseModelString
-} from "../../shared/@ai-setting/roy-agent-core-ecaptews.js";
+} from "../../shared/@ai-setting/roy-agent-core-ecth1zak.js";
 import"../../shared/@ai-setting/roy-agent-core-ctdhjv68.js";
 import"../../shared/@ai-setting/roy-agent-core-qxhq8ven.js";
 import"../../shared/@ai-setting/roy-agent-core-rgckng3p.js";

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

@@ -6,12 +6,13 @@ import {
   Scheduler,
   WorkflowEngine,
   init_engine
-} from "../../../shared/@ai-setting/roy-agent-core-v4g5ntf2.js";
+} from "../../../shared/@ai-setting/roy-agent-core-56xsjjyw.js";
 import"../../../shared/@ai-setting/roy-agent-core-zgtmazxg.js";
 import"../../../shared/@ai-setting/roy-agent-core-6d5v531t.js";
 import"../../../shared/@ai-setting/roy-agent-core-6atd905e.js";
-import"../../../shared/@ai-setting/roy-agent-core-bcpp60ww.js";
-import"../../../shared/@ai-setting/roy-agent-core-9r8pew8y.js";
+import"../../../shared/@ai-setting/roy-agent-core-99j4w3fx.js";
+import"../../../shared/@ai-setting/roy-agent-core-ddwa0n6h.js";
+import"../../../shared/@ai-setting/roy-agent-core-ajx32wzj.js";
 import"../../../shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
 import"../../../shared/@ai-setting/roy-agent-core-nhfy3p8q.js";
 import"../../../shared/@ai-setting/roy-agent-core-e25xkv53.js";

package/dist/env/workflow/index.js

@@ -1,14 +1,15 @@
 import {
   WorkflowComponent
-} from "../../shared/@ai-setting/roy-agent-core-70gt0tp0.js";
-import"../../shared/@ai-setting/roy-agent-core-0jc06hhg.js";
-import"../../shared/@ai-setting/roy-agent-core-v4g5ntf2.js";
+} from "../../shared/@ai-setting/roy-agent-core-1yaa58cp.js";
+import"../../shared/@ai-setting/roy-agent-core-fjexv5nm.js";
+import"../../shared/@ai-setting/roy-agent-core-56xsjjyw.js";
 import"../../shared/@ai-setting/roy-agent-core-zgtmazxg.js";
 import"../../shared/@ai-setting/roy-agent-core-6d5v531t.js";
 import"../../shared/@ai-setting/roy-agent-core-6atd905e.js";
-import"../../shared/@ai-setting/roy-agent-core-bcpp60ww.js";
+import"../../shared/@ai-setting/roy-agent-core-99j4w3fx.js";
+import"../../shared/@ai-setting/roy-agent-core-ddwa0n6h.js";
 import"../../shared/@ai-setting/roy-agent-core-4t40mkpv.js";
-import"../../shared/@ai-setting/roy-agent-core-9r8pew8y.js";
+import"../../shared/@ai-setting/roy-agent-core-ajx32wzj.js";
 import {
   BaseEventSchema,
   ControlPauseEventSchema,

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

@@ -5,7 +5,7 @@ import {
   init_skill_node,
   init_tool_node,
   init_workflow_node
-} from "../../../shared/@ai-setting/roy-agent-core-9r8pew8y.js";
+} from "../../../shared/@ai-setting/roy-agent-core-ajx32wzj.js";
 import"../../../shared/@ai-setting/roy-agent-core-k05v31rc.js";
 import"../../../shared/@ai-setting/roy-agent-core-shme7set.js";
 import"../../../shared/@ai-setting/roy-agent-core-7z9b1fm8.js";

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

@@ -3,7 +3,11 @@ import {
   init_template_resolver,
   resolveTemplateString,
   resolveTemplates
-} from "../../../shared/@ai-setting/roy-agent-core-bcpp60ww.js";
+} from "../../../shared/@ai-setting/roy-agent-core-99j4w3fx.js";
+import {
+  getFromMapWithNormalization,
+  init_node_id_utils
+} from "../../../shared/@ai-setting/roy-agent-core-ddwa0n6h.js";
 import"../../../shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
 import"../../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
@@ -19,6 +23,7 @@ import {
 
 // src/env/workflow/utils/index.ts
 init_template_resolver();
+init_node_id_utils();
 
 // src/env/workflow/utils/recovery-validator.ts
 init_decorator();
@@ -448,6 +453,7 @@ __legacyDecorateClassTS([
 export {
   resolveTemplates,
   resolveTemplateString,
+  getFromMapWithNormalization,
   ValidationErrorType,
   TemplateResolver,
   SuggestedAction,

package/dist/index.js

@@ -11,7 +11,7 @@ import {
   ModelLimitsSchema,
   ProviderCapabilitiesSchema,
   ProviderConfigSchema
-} from "./shared/@ai-setting/roy-agent-core-zv2hwptv.js";
+} from "./shared/@ai-setting/roy-agent-core-qskhsjmc.js";
 import {
   ConfigComponent
 } from "./shared/@ai-setting/roy-agent-core-prdngx28.js";
@@ -89,18 +89,19 @@ import {
 } from "./shared/@ai-setting/roy-agent-core-az13yzmc.js";
 import {
   WorkflowComponent
-} from "./shared/@ai-setting/roy-agent-core-70gt0tp0.js";
+} from "./shared/@ai-setting/roy-agent-core-1yaa58cp.js";
 import {
   init_node_registry_helper,
   registerDecoratorNodeType
-} from "./shared/@ai-setting/roy-agent-core-0jc06hhg.js";
-import"./shared/@ai-setting/roy-agent-core-v4g5ntf2.js";
+} from "./shared/@ai-setting/roy-agent-core-fjexv5nm.js";
+import"./shared/@ai-setting/roy-agent-core-56xsjjyw.js";
 import"./shared/@ai-setting/roy-agent-core-zgtmazxg.js";
 import"./shared/@ai-setting/roy-agent-core-6d5v531t.js";
 import"./shared/@ai-setting/roy-agent-core-6atd905e.js";
-import"./shared/@ai-setting/roy-agent-core-bcpp60ww.js";
+import"./shared/@ai-setting/roy-agent-core-99j4w3fx.js";
+import"./shared/@ai-setting/roy-agent-core-ddwa0n6h.js";
 import"./shared/@ai-setting/roy-agent-core-4t40mkpv.js";
-import"./shared/@ai-setting/roy-agent-core-9r8pew8y.js";
+import"./shared/@ai-setting/roy-agent-core-ajx32wzj.js";
 import"./shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
 import"./shared/@ai-setting/roy-agent-core-0vbdz0x7.js";
 import"./shared/@ai-setting/roy-agent-core-nhfy3p8q.js";
@@ -115,13 +116,13 @@ import"./shared/@ai-setting/roy-agent-core-1ce3fqrk.js";
 import {
   AgentComponent,
   AgentComponentConfigSchema
-} from "./shared/@ai-setting/roy-agent-core-kap6q69x.js";
+} from "./shared/@ai-setting/roy-agent-core-marga2es.js";
 import {
   createInvokeConfig,
   invoke,
   invokeNonStream,
   parseModelString
-} from "./shared/@ai-setting/roy-agent-core-ecaptews.js";
+} from "./shared/@ai-setting/roy-agent-core-ecth1zak.js";
 import {
   AskUserError,
   init_workflow_hil

package/dist/shared/@ai-setting/{roy-agent-core-70gt0tp0.js → roy-agent-core-1yaa58cp.js}

@@ -1,12 +1,12 @@
 import {
   exports_node_registry_helper,
   init_node_registry_helper
-} from "./roy-agent-core-0jc06hhg.js";
+} from "./roy-agent-core-fjexv5nm.js";
 import {
   WorkflowEngine,
   exports_engine,
   init_engine
-} from "./roy-agent-core-v4g5ntf2.js";
+} from "./roy-agent-core-56xsjjyw.js";
 import {
   WorkflowService
 } from "./roy-agent-core-4t40mkpv.js";
@@ -97,7 +97,7 @@ class WorkflowComponent extends BaseComponent {
       return;
     try {
       const { NodeRegistry } = await import("../../env/workflow/engine/index.js");
-      const { registerDecoratorNodeType: registerDecoratorNodeType2 } = await import("./roy-agent-core-c6vet6xc.js");
+      const { registerDecoratorNodeType: registerDecoratorNodeType2 } = await import("./roy-agent-core-d6597yp0.js");
       this.nodeRegistry = new NodeRegistry;
       registerDecoratorNodeType2(this.nodeRegistry);
       this.decoratorsRegistered = true;
@@ -128,7 +128,7 @@ class WorkflowComponent extends BaseComponent {
   }
   async runWorkflow(definition, input, options) {
     const { NodeRegistry } = await import("../../env/workflow/engine/index.js");
-    const { registerDecoratorNodeType: registerDecoratorNodeType2 } = await import("./roy-agent-core-c6vet6xc.js");
+    const { registerDecoratorNodeType: registerDecoratorNodeType2 } = await import("./roy-agent-core-d6597yp0.js");
     const toolComponent = this.toolComponent || this._workflowEnv?.getComponent("tool");
     const skillComponent = this._workflowEnv?.getComponent("skill");
     let agentRunner = this.agentRunner;

package/dist/shared/@ai-setting/{roy-agent-core-v4g5ntf2.js → roy-agent-core-56xsjjyw.js}

@@ -11,7 +11,7 @@ import {
 import {
   TemplateResolver,
   init_template_resolver
-} from "./roy-agent-core-bcpp60ww.js";
+} from "./roy-agent-core-99j4w3fx.js";
 import {
   SkillNode,
   ToolNode,
@@ -19,7 +19,7 @@ import {
   init_skill_node,
   init_tool_node,
   init_workflow_node
-} from "./roy-agent-core-9r8pew8y.js";
+} from "./roy-agent-core-ajx32wzj.js";
 import {
   WorkflowError,
   createWorkflowEvent,
@@ -79,7 +79,7 @@ class EventBus {
       try {
         await handler(event);
       } catch (error) {
-        console.error("Event handler error:", error);
+        logger.error("Event handler error:", error);
       }
       this.off(eventType, wrappedHandler);
     };
@@ -121,7 +121,7 @@ class EventBus {
     try {
       await handler(event);
     } catch (error) {
-      console.error("Event handler error:", error);
+      logger.error("Event handler error:", error);
     }
   }
   clear() {
@@ -141,7 +141,11 @@ class EventBus {
     };
   }
 }
-var init_event_bus = () => {};
+var logger;
+var init_event_bus = __esm(() => {
+  init_logger();
+  logger = createLogger("workflow.eventbus");
+});
 
 // src/env/workflow/engine/dag-manager.ts
 class DAGManager {
@@ -600,7 +604,7 @@ class Scheduler {
   }
   markCompleted(nodeId) {
     if (nodeId === "__end__" || nodeId === "__END__") {
-      logger.debug(`[Scheduler] Workflow marked as completed via __end__`);
+      logger2.debug(`[Scheduler] Workflow marked as completed via __end__`);
       return;
     }
     this.running.delete(nodeId);
@@ -756,10 +760,10 @@ class Scheduler {
     return result;
   }
 }
-var logger;
+var logger2;
 var init_scheduler = __esm(() => {
   init_logger();
-  logger = createLogger("workflow.scheduler");
+  logger2 = createLogger("workflow.scheduler");
 });
 
 // src/env/workflow/engine/executor.ts
@@ -1092,22 +1096,22 @@ var init_executor = __esm(() => {
     }
   };
   __legacyDecorateClassTS([
-    TracedAs("workflow.executor.executeNode", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.executor.executeNode", { recordParams: true, recordResult: true })
   ], Executor.prototype, "executeNode", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.executor.writeNodeStart", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.executor.writeNodeStart", { recordParams: true, recordResult: true })
   ], Executor.prototype, "writeNodeStart", null);
   __legacyDecorateClassTS([
     TracedAs("workflow.executor.attachAgentSessionToLastStart", { log: true })
   ], Executor.prototype, "attachAgentSessionToLastStart", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.executor.writeNodeInterrupt", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.executor.writeNodeInterrupt", { recordParams: true, recordResult: true })
   ], Executor.prototype, "writeNodeInterrupt", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.executor.writeNodeEnd", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.executor.writeNodeEnd", { recordParams: true, recordResult: true })
   ], Executor.prototype, "writeNodeEnd", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.executor.writeNodeResume", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.executor.writeNodeResume", { recordParams: true, recordResult: true })
   ], Executor.prototype, "writeNodeResume", null);
 });
 
@@ -1510,7 +1514,7 @@ var init_agent_node = __esm(() => {
     }
   };
   __legacyDecorateClassTS([
-    TracedAs("workflow.agent.execute", { log: true })
+    TracedAs("workflow.agent.execute")
   ], AgentNode.prototype, "execute", null);
   __legacyDecorateClassTS([
     TracedAs("agent.node.createAgentSubSession", { recordParams: true, recordResult: true, log: true })
@@ -1661,7 +1665,7 @@ var init_agent_session_metadata = () => {};
 
 // src/env/workflow/engine/engine.ts
 import { EventEmitter } from "events";
-var logger2, WorkflowEngine;
+var logger3, WorkflowEngine;
 var init_engine = __esm(() => {
   init_event();
   init_workflow_hil();
@@ -1675,7 +1679,7 @@ var init_engine = __esm(() => {
   init_decorator();
   init_template_resolver();
   init_workflow_error();
-  logger2 = createLogger("workflow:engine");
+  logger3 = createLogger("workflow:engine");
   WorkflowEngine = class WorkflowEngine extends EventEmitter {
     activeSessions = new Map;
     sessionIdCounter = 0;
@@ -1736,7 +1740,7 @@ var init_engine = __esm(() => {
           metadata
         });
       }
-      logger2.info(`[WorkflowEngine] Created session: ${sessionId}`);
+      logger3.info(`[WorkflowEngine] Created session: ${sessionId}`);
       return sessionId;
     }
     async run(sessionId, options) {
@@ -1806,7 +1810,7 @@ var init_engine = __esm(() => {
             }
           });
           metadata.input = { ...existingInput, ...newInput };
-          logger2.info(`[WorkflowEngine] Updated session ${sessionId} input with resume user input`);
+          logger3.info(`[WorkflowEngine] Updated session ${sessionId} input with resume user input`);
         }
       }
       const messages = this.sessionComponent ? await this.sessionComponent.getMessages(sessionId) : [];
@@ -1938,7 +1942,7 @@ var init_engine = __esm(() => {
         agentSessionId,
         restoredOutputs: resumeInfo?.nodeOutputs
       }).catch((error) => {
-        logger2.error(`Workflow ${sessionId} scheduling error:`, error);
+        logger3.error(`Workflow ${sessionId} scheduling error:`, error);
         this.failWorkflow(sessionState, error);
       });
       if (options?.sync !== false) {
@@ -1974,7 +1978,7 @@ var init_engine = __esm(() => {
         });
       }
       await sessionState.eventBus.publish(createWorkflowEvent("workflow.paused", this.getRunIdFromSessionId(sessionId), {}));
-      logger2.info(`[WorkflowEngine] Workflow paused: ${sessionId}`);
+      logger3.info(`[WorkflowEngine] Workflow paused: ${sessionId}`);
     }
     async stop(sessionId, reason) {
       const sessionState = this.activeSessions.get(sessionId);
@@ -2029,7 +2033,7 @@ var init_engine = __esm(() => {
       eventBus.on("node.interrupt", async (event) => {
         if (event.type !== "node.interrupt")
           return;
-        logger2.info(`Workflow paused at node "${event.node_id}" - ask_user pending`);
+        logger3.info(`Workflow paused at node "${event.node_id}" - ask_user pending`);
         sessionState.status = "paused";
         sessionState.abortController.abort();
         if (this.sessionComponent) {
@@ -2110,7 +2114,7 @@ var init_engine = __esm(() => {
           break;
         }
         if (sessionState.config.loopEnabled && sessionState.loopIterationCount >= maxIterations) {
-          logger2.error(`[WorkflowEngine] Max loop iterations ${maxIterations} exceeded`);
+          logger3.error(`[WorkflowEngine] Max loop iterations ${maxIterations} exceeded`);
           sessionState.rejectCompleted(new WorkflowError(`Workflow exceeded maximum loop iterations: ${maxIterations}`));
           await this.stop(sessionState.sessionId, "Max iterations exceeded");
           return;
@@ -2125,12 +2129,18 @@ var init_engine = __esm(() => {
     }
     waitForNextNodeEvent(sessionState, signal) {
       return new Promise((resolve) => {
-        const timeoutId = setTimeout(() => {
-          cleanup();
-          resolve();
-        }, 100);
+        const state = sessionState.scheduler.getState();
+        const hasRunningNodes = state.running.length > 0;
+        let timeoutId;
+        if (!hasRunningNodes) {
+          timeoutId = setTimeout(() => {
+            cleanup();
+            resolve();
+          }, 100);
+        }
         const cleanup = () => {
-          clearTimeout(timeoutId);
+          if (timeoutId !== undefined)
+            clearTimeout(timeoutId);
           sessionState.eventBus.off("node.completed", onCompleted);
           sessionState.eventBus.off("node.failed", onFailed);
         };
@@ -2218,12 +2228,12 @@ var init_engine = __esm(() => {
     }
     async preExecuteValidation(nodeId, nodeDef, context, options) {
       if (!nodeDef) {
-        logger2.warn(`Node ${nodeId} has no configuration`);
+        logger3.warn(`Node ${nodeId} has no configuration`);
         return;
       }
       const config = nodeDef.config || {};
       if (context.debug) {
-        logger2.debug(`Pre-execute validation for node ${nodeId}`, {
+        logger3.debug(`Pre-execute validation for node ${nodeId}`, {
           workflowInput: context.workflowInput,
           previousOutputs: Array.from(context.previousOutputs.keys()),
           hasTemplateResolver: !!context.templateResolver
@@ -2235,7 +2245,7 @@ var init_engine = __esm(() => {
           if (options?.strict) {
             context.templateResolver.resolveStrict(config, nodeId);
           }
-          logger2.warn(`[WorkflowEngine] Node "${nodeId}" has unresolved templates:`, unresolved);
+          logger3.warn(`[WorkflowEngine] Node "${nodeId}" has unresolved templates:`, unresolved);
         }
       }
     }
@@ -2246,7 +2256,7 @@ var init_engine = __esm(() => {
       try {
         await this.preExecuteValidation(nodeId, nodeDef, context, { strict: strictMode });
       } catch (err) {
-        logger2.error(`[WorkflowEngine] Strict validation failed for node ${nodeId}:`, err);
+        logger3.error(`[WorkflowEngine] Strict validation failed for node ${nodeId}:`, err);
         scheduler.markFailed(nodeId);
         return;
       }
@@ -2283,9 +2293,9 @@ var init_engine = __esm(() => {
         input: sessionState.config.workflowInput || {},
         previousOutputs: new Map(sessionState.nodeOutputs)
       });
-      logger2.debug(`[WorkflowEngine] Processing edges after "${completedNodeId}" completed. edges=${JSON.stringify(sessionState.edges)}`);
+      logger3.debug(`[WorkflowEngine] Processing edges after "${completedNodeId}" completed. edges=${JSON.stringify(sessionState.edges)}`);
       const edgeResult = scheduler.processEdgesAfterCompletion(completedNodeId, sessionState.edges, templateResolver, sessionState.config.loopEnabled);
-      logger2.debug(`[WorkflowEngine] Edge processing result: ${JSON.stringify(edgeResult)}`);
+      logger3.debug(`[WorkflowEngine] Edge processing result: ${JSON.stringify(edgeResult)}`);
       for (const nodeId of edgeResult.resetNodes) {
         sessionState.nodeOutputs.delete(nodeId);
       }
@@ -2299,7 +2309,7 @@ var init_engine = __esm(() => {
         if (sessionState.config.loopEnabled) {
           const nextCount = sessionState.loopIterationCount + edgeResult.reEntries.length;
           if (nextCount > sessionState.config.maxIterations) {
-            logger2.error(`[WorkflowEngine] Max loop iterations ${sessionState.config.maxIterations} exceeded (next=${nextCount})`);
+            logger3.error(`[WorkflowEngine] Max loop iterations ${sessionState.config.maxIterations} exceeded (next=${nextCount})`);
             await this.failWorkflow(sessionState, new WorkflowError(`Workflow exceeded maximum loop iterations: ${sessionState.config.maxIterations}`));
             return;
           }
@@ -2307,12 +2317,12 @@ var init_engine = __esm(() => {
         } else {
           sessionState.loopIterationCount += edgeResult.reEntries.length;
         }
-        logger2.debug(`[WorkflowEngine] Loop iteration #${sessionState.loopIterationCount}: re-entering ${edgeResult.reEntries.join(", ")}`);
+        logger3.debug(`[WorkflowEngine] Loop iteration #${sessionState.loopIterationCount}: re-entering ${edgeResult.reEntries.join(", ")}`);
       }
       const workflowInput = sessionState.config.workflowInput || {};
       for (const targetId of edgeResult.toStart) {
         if (targetId === "__end__" || targetId === "__END__") {
-          logger2.info(`[WorkflowEngine] Workflow terminated via __end__ edge from node "${completedNodeId}"`);
+          logger3.info(`[WorkflowEngine] Workflow terminated via __end__ edge from node "${completedNodeId}"`);
           scheduler.markCompleted("__end__");
           await this.completeWorkflow(sessionState);
         } else {
@@ -2498,7 +2508,7 @@ var init_engine = __esm(() => {
     TracedAs("workflow.engine.run", { recordParams: true, recordResult: true, log: true })
   ], WorkflowEngine.prototype, "run", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.runWithResume", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.engine.runWithResume", { recordParams: true, recordResult: true })
   ], WorkflowEngine.prototype, "runWithResume", null);
   __legacyDecorateClassTS([
     TracedAs("workflow.engine.runWorkflow", { recordParams: true, recordResult: true, log: true })
@@ -2510,34 +2520,34 @@ var init_engine = __esm(() => {
     TracedAs("workflow.engine.stop", { recordParams: true, recordResult: true, log: true })
   ], WorkflowEngine.prototype, "stop", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.scheduleAndExecute", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.engine.scheduleAndExecute", { recordParams: true, recordResult: true })
   ], WorkflowEngine.prototype, "scheduleAndExecute", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.waitForNextNodeEvent", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.engine.waitForNextNodeEvent", { recordParams: true, recordResult: true })
   ], WorkflowEngine.prototype, "waitForNextNodeEvent", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.startNode", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.engine.startNode", { recordParams: true, recordResult: true })
   ], WorkflowEngine.prototype, "startNode", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.writeNodeStart", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.engine.writeNodeStart", { recordParams: true, recordResult: true })
   ], WorkflowEngine.prototype, "writeNodeStart", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.resumeNode", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.engine.resumeNode", { recordParams: true, recordResult: true })
   ], WorkflowEngine.prototype, "resumeNode", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.preExecuteValidation", { log: true })
+    TracedAs("workflow.engine.preExecuteValidation")
   ], WorkflowEngine.prototype, "preExecuteValidation", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.buildNodeContext", { log: true })
+    TracedAs("workflow.engine.buildNodeContext")
   ], WorkflowEngine.prototype, "buildNodeContext", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.checkAndFinalize", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.engine.checkAndFinalize", { recordParams: true, recordResult: true })
   ], WorkflowEngine.prototype, "checkAndFinalize", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.completeWorkflow", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.engine.completeWorkflow", { recordParams: true, recordResult: true })
   ], WorkflowEngine.prototype, "completeWorkflow", null);
   __legacyDecorateClassTS([
-    TracedAs("workflow.engine.failWorkflow", { recordParams: true, recordResult: true, log: true })
+    TracedAs("workflow.engine.failWorkflow", { recordParams: true, recordResult: true })
   ], WorkflowEngine.prototype, "failWorkflow", null);
 });
 

package/dist/shared/@ai-setting/{roy-agent-core-bcpp60ww.js → roy-agent-core-99j4w3fx.js}

@@ -1,3 +1,7 @@
+import {
+  getFromMapWithNormalization,
+  init_node_id_utils
+} from "./roy-agent-core-ddwa0n6h.js";
 import {
   init_types,
   nodeNotFound,
@@ -26,6 +30,7 @@ var TemplateResolver;
 var init_template_resolver = __esm(() => {
   init_decorator();
   init_types();
+  init_node_id_utils();
   TemplateResolver = class TemplateResolver {
     input;
     previousOutputs;
@@ -127,17 +132,7 @@ var init_template_resolver = __esm(() => {
       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);
-        }
-      }
+      let value = getFromMapWithNormalization(this.previousOutputs, nodeId);
       if (value === undefined) {
         return;
       }

package/dist/shared/@ai-setting/{roy-agent-core-9r8pew8y.js → roy-agent-core-ajx32wzj.js}

@@ -123,7 +123,7 @@ var init_tool_node = __esm(() => {
     }
   };
   __legacyDecorateClassTS([
-    TracedAs("workflow.tool.execute", { log: true })
+    TracedAs("workflow.tool.execute")
   ], ToolNode.prototype, "execute", null);
 });
 
@@ -178,7 +178,7 @@ var init_skill_node = __esm(() => {
     }
   };
   __legacyDecorateClassTS([
-    TracedAs("workflow.skill.execute", { log: true })
+    TracedAs("workflow.skill.execute")
   ], SkillNode.prototype, "execute", null);
 });
 

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

@@ -3,7 +3,8 @@ import {
   hasDecoratorNodes,
   init_node_registry_helper,
   registerDecoratorNodeType
-} from "./roy-agent-core-0jc06hhg.js";
+} from "./roy-agent-core-fjexv5nm.js";
+import"./roy-agent-core-ddwa0n6h.js";
 import"./roy-agent-core-1ce3fqrk.js";
 import"./roy-agent-core-k05v31rc.js";
 import"./roy-agent-core-shme7set.js";

package/dist/shared/@ai-setting/roy-agent-core-ddwa0n6h.js

@@ -0,0 +1,23 @@
+import {
+  __esm
+} from "./roy-agent-core-fs0mn2jk.js";
+
+// src/env/workflow/utils/node-id-utils.ts
+function getFromMapWithNormalization(map, key) {
+  let value = map.get(key);
+  if (value !== undefined) {
+    return value;
+  }
+  const normalizedUnderscore = key.replace(/-/g, "_");
+  const normalizedHyphen = key.replace(/_/g, "-");
+  if (normalizedUnderscore !== key) {
+    value = map.get(normalizedUnderscore);
+  }
+  if (value === undefined && normalizedHyphen !== key) {
+    value = map.get(normalizedHyphen);
+  }
+  return value;
+}
+var init_node_id_utils = () => {};
+
+export { getFromMapWithNormalization, init_node_id_utils };

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

@@ -209,6 +209,13 @@ function generateProviderOptions(providerType, options) {
   }
   return result;
 }
+function convertToolChoice(toolChoice) {
+  if (!toolChoice)
+    return;
+  if (typeof toolChoice === "string")
+    return toolChoice;
+  return { type: "tool", toolName: toolChoice.function.name };
+}
 function createEnvEventEmitter(env, context) {
   if (!env) {
     logger.warn("[invoke] createEnvEventEmitter: env is null/undefined, streaming events will be disabled");
@@ -217,10 +224,6 @@ function createEnvEventEmitter(env, context) {
   return (event) => {
     try {
       const fullType = `llm.${event.type}`;
-      logger.info(`[invoke] Pushing LLM event: ${fullType}`, {
-        hasPayload: !!event,
-        payloadType: typeof event
-      });
       env.pushEnvEvent({
         id: randomUUID(),
         type: fullType,
@@ -232,7 +235,6 @@ function createEnvEventEmitter(env, context) {
         },
         payload: event
       });
-      logger.info(`[invoke] LLM event pushed successfully: ${fullType}`);
     } catch (err) {
       logger.warn("Failed to push env event", { error: String(err), eventType: event.type });
     }
@@ -381,7 +383,7 @@ async function invoke(config, options, ctx) {
         includeUsage: true
       },
       allowSystemInMessages: true,
-      toolChoice: options.toolChoice ?? "auto"
+      toolChoice: convertToolChoice(options.toolChoice)
     };
     const result = await streamText(streamTextOptions);
     let fullContent = "";
@@ -568,7 +570,8 @@ async function invokeNonStream(config, options, ctx) {
     temperature: providerOptions.temperature,
     maxTokens: providerOptions.maxTokens,
     abortSignal: ctx.abort,
-    allowSystemInMessages: true
+    allowSystemInMessages: true,
+    toolChoice: convertToolChoice(options.toolChoice)
   });
   const usage = result.usage;
   const usageInfo = usage ? {

package/dist/shared/@ai-setting/{roy-agent-core-0jc06hhg.js → roy-agent-core-fjexv5nm.js}

@@ -1,3 +1,7 @@
+import {
+  getFromMapWithNormalization,
+  init_node_id_utils
+} from "./roy-agent-core-ddwa0n6h.js";
 import {
   DecoratorNode,
   init_decorator_node
@@ -93,7 +97,7 @@ var init_condition_node = __esm(() => {
     }
   };
   __legacyDecorateClassTS([
-    TracedAs("workflow.condition.execute", { log: true })
+    TracedAs("workflow.condition.execute")
   ], ConditionNode.prototype, "execute", null);
 });
 
@@ -113,17 +117,7 @@ class MergeNode {
       const deps = this.definition.depends_on || [];
       const outputs = {};
       for (const depId of deps) {
-        let output = context.previousOutputs.get(depId);
-        if (output === undefined) {
-          const normalizedUnderscore = depId.replace(/-/g, "_");
-          const normalizedHyphen = depId.replace(/_/g, "-");
-          if (normalizedUnderscore !== depId) {
-            output = context.previousOutputs.get(normalizedUnderscore);
-          }
-          if (output === undefined && normalizedHyphen !== depId) {
-            output = context.previousOutputs.get(normalizedHyphen);
-          }
-        }
+        const output = getFromMapWithNormalization(context.previousOutputs, depId);
         if (output !== undefined) {
           outputs[depId] = output;
         }
@@ -180,7 +174,9 @@ class MergeNode {
     return result;
   }
 }
-var init_merge_node = () => {};
+var init_merge_node = __esm(() => {
+  init_node_id_utils();
+});
 
 // src/env/workflow/utils/node-registry-helper.ts
 var exports_node_registry_helper = {};

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

@@ -1,6 +1,6 @@
 import {
   withTimeout
-} from "./roy-agent-core-ecaptews.js";
+} from "./roy-agent-core-ecth1zak.js";
 import {
   AskUserError,
   init_workflow_hil

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

@@ -1,6 +1,6 @@
 import {
   invoke
-} from "./roy-agent-core-ecaptews.js";
+} from "./roy-agent-core-ecth1zak.js";
 import {
   ContextError,
   ErrorCodes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-core",
-  "version": "1.5.64",
+  "version": "1.5.66",
   "type": "module",
   "description": "Core SDK for roy-agent - Environment, Components, Tools, Sessions, Tasks",
   "main": "./dist/index.js",