@ai-setting/roy-agent-core 1.6.5 → 1.6.7

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

@@ -613,8 +613,37 @@ function createWorkflowSearchTool(workflowService) {
 
 // src/env/workflow/tools/run-workflow.ts
 init_logger();
+init_decorator();
 import { z as z8 } from "zod";
 var logger7 = createLogger("run-workflow-tool");
+function synthFallbackRunId(now = Date.now()) {
+  return `workflow_${now}_fallback_${Math.random().toString(36).slice(2, 8)}`;
+}
+function attemptStopOnTimeout(workflowService, runId, reason) {
+  if (typeof workflowService.stopRun !== "function")
+    return;
+  workflowService.stopRun(runId, reason).catch((stopErr) => {
+    logger7.warn(`Failed to stop workflow ${runId} after timeout: ${stopErr instanceof Error ? stopErr.message : String(stopErr)}`);
+  });
+}
+function buildErrorReturn(args) {
+  const { errorRunId, status, errorMessage, durationMs } = args;
+  const errorWithRunId = `${errorMessage} (runId: ${errorRunId})`;
+  return {
+    success: false,
+    output: {
+      run_id: errorRunId,
+      status,
+      error: errorWithRunId,
+      duration_ms: durationMs
+    },
+    error: errorWithRunId,
+    metadata: {
+      execution_time_ms: durationMs,
+      run_id: errorRunId
+    }
+  };
+}
 var RunWorkflowInputSchema = z8.object({
   workflow_name: z8.string().describe("Name of the workflow to run"),
   input: z8.record(z8.any()).optional().describe("Input to pass to the workflow"),
@@ -622,8 +651,24 @@ var RunWorkflowInputSchema = z8.object({
   node_config: z8.record(z8.string(), z8.record(z8.string(), z8.any())).optional().describe("Per-node runtime config overrides keyed by node id (Task #1974). " + "Shallow-merged into each node's effective config; input wins over nodeDef.config."),
   session: z8.string().regex(/^workflow_/, { message: "session must start with 'workflow_'" }).optional().describe("Existing session ID (workflow_xxx) to resume from. Mutually exclusive with fresh `input` runs.")
 }).strict();
+
+class RunWorkflowToolRunner {
+  executeImpl;
+  constructor(executeImpl) {
+    this.executeImpl = executeImpl;
+  }
+  async execute(args, ctx) {
+    return this.executeImpl(args, ctx);
+  }
+}
+__legacyDecorateClassTS([
+  TracedAs("workflow.run-workflow-tool.execute", {
+    recordParams: true,
+    recordResult: true
+  })
+], RunWorkflowToolRunner.prototype, "execute", null);
 function createRunWorkflowTool(workflowService) {
-  return {
+  const tool = {
     name: "workflow_run",
     description: "Run a workflow by name with optional input, OR resume an existing workflow run via the `session` field (the runId itself acts as session ID, both have `workflow_` prefix natively — pass the workflow run's runId directly). Returns run_id (== session_id, ALWAYS populated — even on timeout/abort/error paths), status, output, error, and duration_ms. Default timeout: 30 minutes.",
     parameters: RunWorkflowInputSchema,
@@ -655,14 +700,23 @@ function createRunWorkflowTool(workflowService) {
       const parentSessionId = ctxSessionId ?? envSessionId;
       let timeoutHandle;
       let durationMs;
-      let capturedRunId = session ? session : undefined;
+      const reservedRunId = synthFallbackRunId();
+      let timedOut = false;
+      let capturedByCallback = false;
+      let capturedRunId = session ? session : reservedRunId;
       const onSessionCreated = (sid) => {
         capturedRunId = sid;
+        capturedByCallback = true;
+        if (timedOut) {
+          attemptStopOnTimeout(workflowService, sid, "timed out");
+        }
       };
       try {
         let result;
+        const fallbackRunId = reservedRunId;
         const baseOptions = {
           ...parentSessionId ? { parentSessionId } : {},
+          ...session ? {} : { runId: reservedRunId },
           onSessionCreated,
           ...node_config ? { nodeConfig: node_config } : {}
         };
@@ -680,6 +734,8 @@ function createRunWorkflowTool(workflowService) {
             executeCall(),
             new Promise((_, reject) => {
               timeoutHandle = setTimeout(() => {
+                timedOut = true;
+                attemptStopOnTimeout(workflowService, capturedRunId ?? reservedRunId, "timed out");
                 reject(new Error("Workflow execution timed out"));
               }, timeout);
             })
@@ -691,7 +747,7 @@ function createRunWorkflowTool(workflowService) {
           clearTimeout(timeoutHandle);
         }
         durationMs = Date.now() - startTime;
-        const finalRunId = capturedRunId ?? result.runId ?? "";
+        const finalRunId = capturedByCallback ? capturedRunId : result.runId ?? "";
         return {
           success: result.status === "completed" || result.status === "paused",
           output: {
@@ -715,59 +771,44 @@ function createRunWorkflowTool(workflowService) {
         }
         durationMs = Date.now() - startTime;
         const errorMessage = error instanceof Error ? error.message : String(error);
-        const errorRunId = capturedRunId ?? "";
+        const errorRunId = capturedRunId ?? reservedRunId;
         if (errorMessage.includes("Workflow not found")) {
-          return {
-            success: false,
-            output: {
-              run_id: errorRunId,
-              status: "failed",
-              error: `Workflow not found: ${workflow_name}`,
-              duration_ms: durationMs
-            },
-            error: `Workflow not found: ${workflow_name}`,
-            metadata: {
-              execution_time_ms: durationMs,
-              run_id: errorRunId
-            }
-          };
+          return buildErrorReturn({
+            errorRunId,
+            status: "failed",
+            errorMessage: `Workflow not found: ${workflow_name}`,
+            durationMs
+          });
         }
-        if (errorMessage.includes("abort") || errorMessage.includes("timed out")) {
-          return {
-            success: false,
-            output: {
-              run_id: errorRunId,
-              status: "timeout",
-              error: `Workflow execution timed out or was aborted: ${workflow_name}`,
-              duration_ms: durationMs
-            },
-            error: `Workflow execution timed out or was aborted: ${workflow_name}`,
-            metadata: {
-              execution_time_ms: durationMs,
-              run_id: errorRunId
-            }
-          };
+        const isTimeoutLike = errorMessage.includes("abort") || errorMessage.includes("timed out") || errorMessage.includes("execution timeout:");
+        if (isTimeoutLike) {
+          if (!timedOut) {
+            attemptStopOnTimeout(workflowService, errorRunId, "timed out");
+          }
+          return buildErrorReturn({
+            errorRunId,
+            status: "timeout",
+            errorMessage: `Workflow execution timed out or was aborted: ${workflow_name}`,
+            durationMs
+          });
         }
         if (logger7?.error) {
           logger7.error(`Failed to run workflow: ${workflow_name}`, { error: errorMessage });
         }
-        return {
-          success: false,
-          output: {
-            run_id: errorRunId,
-            status: "failed",
-            error: `Failed to run workflow ${workflow_name}: ${errorMessage}`,
-            duration_ms: durationMs
-          },
-          error: `Failed to run workflow ${workflow_name}: ${errorMessage}`,
-          metadata: {
-            execution_time_ms: durationMs,
-            run_id: errorRunId
-          }
-        };
+        return buildErrorReturn({
+          errorRunId,
+          status: "failed",
+          errorMessage: `Failed to run workflow ${workflow_name}: ${errorMessage}`,
+          durationMs
+        });
       }
     }
   };
+  const runner = new RunWorkflowToolRunner(tool.execute);
+  return {
+    ...tool,
+    execute: runner.execute.bind(runner)
+  };
 }
 var _runWorkflowTool = null;
 var _workflowService = null;

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

@@ -6,7 +6,7 @@ import {
   WorkflowEngine,
   exports_engine,
   init_engine
-} from "./roy-agent-core-fb3wyr3d.js";
+} from "./roy-agent-core-39rvx3fw.js";
 import {
   askUserTool,
   createRunWorkflowTool,
@@ -18,7 +18,7 @@ import {
   createWorkflowSearchTool,
   createWorkflowTagListTool,
   createWorkflowValidateTool
-} from "./roy-agent-core-5rjccr3c.js";
+} from "./roy-agent-core-ka4b12eg.js";
 import {
   WorkflowService
 } from "./roy-agent-core-b75jtybq.js";
@@ -141,7 +141,7 @@ class WorkflowComponent extends BaseComponent {
     if (!agentRunner && this._workflowEnv) {
       const agentComponent = this._workflowEnv.getComponent("agent");
       if (agentComponent) {
-        const { AgentComponentAdapter } = await import("./roy-agent-core-y1m7c2v7.js");
+        const { AgentComponentAdapter } = await import("./roy-agent-core-8jmkghjc.js");
         agentRunner = new AgentComponentAdapter(agentComponent, {}, this.sessionComponent);
       }
     }

package/dist/shared/@ai-setting/{roy-agent-core-155408xq.js → roy-agent-core-r08qk37k.js}

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

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

@@ -98,10 +98,10 @@ function createTaskTool(taskComponent) {
     description: `
       Create a new task for tracking work.
 
-      ## ⚠️ CALL task_tree(depth=2) BEFORE THIS TOOL
+      ## ⚠️ CALL task_tree(depth=1) BEFORE THIS TOOL
 
       Before calling \`task_create\`, you **MUST** first call
-      \`task_tree(depth=2)\` to inspect the existing task hierarchy.
+      \`task_tree(depth=1)\` to inspect the existing task hierarchy.
       This is critical because:
 
       1. Avoid duplicating root tasks (root tasks should stay ≤ 10).
@@ -109,7 +109,7 @@ function createTaskTool(taskComponent) {
       3. Avoid creating stranded/orphan tasks.
 
       Workflow:
-        step 1: task_tree({depth: 2})
+        step 1: task_tree({depth: 1})
         step 2: read the tree, then decide per "Decision Tree" below
         step 3: task_create({...})
 

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

@@ -241,15 +241,30 @@ var init_agent_component_adapter = __esm(() => {
           });
         }
       }
+      let timeoutHandle;
       try {
         const outputSchema = config.options?.outputSchema;
         const context = {};
         context.model = config.options?.model;
-        if (config.options?.timeout) {
-          context.abort = new AbortController;
+        const configuredTimeout = config.options?.timeout;
+        const deadlineController = typeof configuredTimeout === "number" && configuredTimeout > 0 ? new AbortController : undefined;
+        if (deadlineController) {
+          const timeoutMsFinal = configuredTimeout;
+          timeoutHandle = setTimeout(() => {
+            if (process.env["DEBUG"]) {
+              console.warn(`[AgentComponentAdapter] agent '${config.type || "general"}' timeout ${timeoutMsFinal}ms elapsed, aborting THIS run only.`);
+            }
+            deadlineController.abort(new Error(`Agent ${config.type || "general"} timed out after ${timeoutMsFinal}ms`));
+          }, timeoutMsFinal);
+          if (typeof timeoutHandle.unref === "function") {
+            timeoutHandle.unref();
+          }
         }
-        if (signal) {
-          context.abort = signal;
+        const signals = [signal, deadlineController?.signal].filter((value) => value !== undefined);
+        if (signals.length === 1) {
+          context.abort = signals[0];
+        } else if (signals.length > 1) {
+          context.abort = AbortSignal.any(signals);
         }
         context.sessionId = agentSessionId;
         if (config.options?.allowedTools) {
@@ -326,6 +341,9 @@ var init_agent_component_adapter = __esm(() => {
           }
         };
       } finally {
+        if (timeoutHandle) {
+          clearTimeout(timeoutHandle);
+        }
         if (isResume) {
           this._currentAgentSessionId = undefined;
         }

package/package.json

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