@ai-setting/roy-agent-core 1.5.107 → 1.5.109

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

@@ -1,7 +1,7 @@
 import {
   TAG_MAX_COUNT,
   TAG_MIN_COUNT
-} from "./roy-agent-core-e7t3rj0e.js";
+} from "./roy-agent-core-b75jtybq.js";
 import {
   validateWorkflowDefinition
 } from "./roy-agent-core-8wd3qwx5.js";
@@ -38,7 +38,7 @@ var askUserTool = {
   parameters: AskUserInputSchema,
   async execute(args, context) {
     const runId = context.metadata?.runId || "unknown";
-    const sessionId = context.metadata?.sessionId || `workflow_${runId}`;
+    const sessionId = context.metadata?.sessionId || runId;
     const nodeId = context.metadata?.nodeId || "unknown";
     let fullQuery = args.query;
     if (args.options && args.options.length > 0) {
@@ -619,12 +619,13 @@ 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"),
   sync: z8.boolean().default(true).describe("Wait for completion (default: true)"),
-  timeout: z8.number().positive().optional().describe("Timeout in milliseconds (default: 1800000 = 30 min)")
+  timeout: z8.number().positive().optional().describe("Timeout in milliseconds (default: 1800000 = 30 min)"),
+  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.")
 });
 function createRunWorkflowTool(workflowService) {
   return {
     name: "workflow_run",
-    description: "Run a workflow by name with optional input. Returns run_id, status, output, error, and duration_ms. Default timeout: 30 minutes.",
+    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,
     sandbox: {
       enabled: false
@@ -640,8 +641,13 @@ function createRunWorkflowTool(workflowService) {
     },
     execute: async (args, ctx) => {
       const startTime = Date.now();
-      const { workflow_name, input, sync = true, timeout = 1800000 } = args;
-      logger7.info(`Running workflow: ${workflow_name}`, { input, sync, timeout });
+      const { workflow_name, input, session, sync = true, timeout = 1800000 } = args;
+      logger7.info(`Running workflow: ${workflow_name}`, {
+        input,
+        sync,
+        timeout,
+        ...session ? { resumeSession: session } : {}
+      });
       const ctxSessionId = typeof ctx?.session_id === "string" && isValidSessionId(ctx.session_id) ? ctx.session_id : undefined;
       const envSessionId = typeof process.env.ROY_PARENT_SESSION_ID === "string" && isValidSessionId(process.env.ROY_PARENT_SESSION_ID) ? process.env.ROY_PARENT_SESSION_ID : undefined;
       if (process.env.ROY_PARENT_SESSION_ID && !envSessionId) {
@@ -650,14 +656,29 @@ function createRunWorkflowTool(workflowService) {
       const parentSessionId = ctxSessionId ?? envSessionId;
       let timeoutHandle;
       let durationMs;
+      let capturedRunId = session ? session : undefined;
+      const onSessionCreated = (sid) => {
+        capturedRunId = sid;
+      };
       try {
         let result;
+        const baseOptions = {
+          sync,
+          ...parentSessionId ? { parentSessionId } : {},
+          onSessionCreated
+        };
+        const executeCall = async () => {
+          if (session) {
+            return workflowService.resumeSession(session, {
+              ...baseOptions,
+              ...input ? { input } : {}
+            });
+          }
+          return workflowService.runWorkflow(workflow_name, input, baseOptions);
+        };
         if (timeout) {
           result = await Promise.race([
-            workflowService.runWorkflow(workflow_name, input, {
-              sync,
-              ...parentSessionId ? { parentSessionId } : {}
-            }),
+            executeCall(),
             new Promise((_, reject) => {
               timeoutHandle = setTimeout(() => {
                 reject(new Error("Workflow execution timed out"));
@@ -665,39 +686,39 @@ function createRunWorkflowTool(workflowService) {
             })
           ]);
         } else {
-          result = await workflowService.runWorkflow(workflow_name, input, {
-            sync,
-            ...parentSessionId ? { parentSessionId } : {}
-          });
+          result = await executeCall();
         }
         if (timeoutHandle) {
           clearTimeout(timeoutHandle);
         }
         durationMs = Date.now() - startTime;
+        const finalRunId = capturedRunId ?? result.runId ?? "";
         if (sync) {
           return {
             success: result.status === "completed",
             output: {
-              run_id: result.runId,
+              run_id: finalRunId,
               status: result.status,
               output: result.output,
               error: result.error,
               duration_ms: result.durationMs || durationMs
             },
             metadata: {
-              execution_time_ms: durationMs
+              execution_time_ms: durationMs,
+              run_id: finalRunId
             }
           };
         } else {
           return {
             success: true,
             output: {
-              run_id: result.runId,
+              run_id: finalRunId,
               status: result.status,
               duration_ms: durationMs
             },
             metadata: {
-              execution_time_ms: durationMs
+              execution_time_ms: durationMs,
+              run_id: finalRunId
             }
           };
         }
@@ -707,23 +728,36 @@ function createRunWorkflowTool(workflowService) {
         }
         durationMs = Date.now() - startTime;
         const errorMessage = error instanceof Error ? error.message : String(error);
+        const errorRunId = capturedRunId ?? "";
         if (errorMessage.includes("Workflow not found")) {
           return {
             success: false,
-            output: "",
+            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
+              execution_time_ms: durationMs,
+              run_id: errorRunId
             }
           };
         }
         if (errorMessage.includes("abort") || errorMessage.includes("timed out")) {
           return {
             success: false,
-            output: "",
+            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
+              execution_time_ms: durationMs,
+              run_id: errorRunId
             }
           };
         }
@@ -732,10 +766,16 @@ function createRunWorkflowTool(workflowService) {
         }
         return {
           success: false,
-          output: "",
+          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
+            execution_time_ms: durationMs,
+            run_id: errorRunId
           }
         };
       }

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

@@ -3,14 +3,14 @@ import {
 } from "./roy-agent-core-j7jeqxhd.js";
 import {
   truncateOutputInline
-} from "./roy-agent-core-nbsw8k13.js";
+} from "./roy-agent-core-a8pm6hya.js";
 import {
   AskUserError,
   init_workflow_hil
 } from "./roy-agent-core-e25xkv53.js";
 import {
   AgentRegistry
-} from "./roy-agent-core-k31c3kvz.js";
+} from "./roy-agent-core-as3phr7n.js";
 import {
   ContextError
 } from "./roy-agent-core-ctdhjv68.js";

package/package.json

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

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

@@ -1,117 +0,0 @@
-import {
-  init_decorator,
-  wrapFunction
-} from "./roy-agent-core-cg146hmg.js";
-import {
-  createLogger,
-  init_logger
-} from "./roy-agent-core-vyygk314.js";
-
-// src/env/task/plugins/auto-task-plugin.ts
-init_logger();
-init_decorator();
-var logger = createLogger("AutoTaskPlugin");
-var ITERATION_TASK_TRIGGER_BEGIN = `
-[[ITERATION_TASK_TRIGGER_BEGIN]]
-`;
-var ITERATION_TASK_TRIGGER_END = `[[ITERATION_TASK_TRIGGER_END]]
-`;
-function wrapAutoTaskMetadata(content) {
-  return `${ITERATION_TASK_TRIGGER_BEGIN}${content}${ITERATION_TASK_TRIGGER_END}`;
-}
-function createAutoTaskPlugin(config) {
-  const threshold = config?.threshold ?? 20;
-  const agentName = config?.agentName ?? "default";
-  const agentComponent = config?.agentComponent ?? null;
-  const subagentType = config?.subagentType ?? "task-agent";
-  let lastProcessedTraceId = "";
-  async function executeImpl(ctx) {
-    try {
-      logger.info(`[AutoTaskPlugin:ENTER] agentName=${ctx.agent.name} iteration=${ctx.iteration} threshold=${threshold}`);
-      logger.debug(`[AutoTaskPlugin] agentName=${ctx.agent.name} iteration=${ctx.iteration} threshold=${threshold}) expected=${agentName})`);
-      if (ctx.agent.name !== agentName)
-        return { continue: true };
-      logger.debug(`[AutoTaskPlugin] iteration=${ctx.iteration} (threshold=${threshold})`);
-      if (ctx.iteration !== threshold)
-        return { continue: true };
-      const traceId = ctx.context?.traceId ?? ctx.context?.sessionId ?? "unknown";
-      const sid = ctx.context?.sessionId ?? "unknown";
-      if (traceId === lastProcessedTraceId) {
-        logger.debug(`[AutoTaskPlugin] skip - traceId=${traceId.slice(0, 20)}... already processed`);
-        return { continue: true };
-      }
-      lastProcessedTraceId = traceId;
-      logger.debug(`[AutoTaskPlugin] new query detected (traceId=${traceId.slice(0, 20)}...)`);
-      if (!agentComponent || typeof agentComponent.run !== "function") {
-        logger.warn(`[AutoTaskPlugin] agentComponent not provided or invalid (session=${sid.slice(0, 12)}...)`);
-        return { continue: true };
-      }
-      let userQuery = "";
-      for (let i = ctx.messages.length - 1;i >= 0; i--) {
-        const m = ctx.messages[i];
-        if (m.role === "user") {
-          userQuery = typeof m.content === "string" ? m.content : JSON.stringify(m.content);
-          break;
-        }
-      }
-      if (!userQuery) {
-        userQuery = "分析项目结构并执行相关任务";
-      }
-      logger.info(`[AutoTaskPlugin] Calling agentComponent.run("${subagentType}") at iteration ${ctx.iteration} (session=${sid.slice(0, 12)}..., persistSession=false)`);
-      const shortDesc = typeof userQuery === "string" ? userQuery.slice(0, 50) : "分析需求";
-      const placeholderContent = `⏳ **${subagentType} 正在执行**: ${shortDesc}（等待结果...）`;
-      const placeholderBlock = wrapAutoTaskMetadata(placeholderContent);
-      if (ctx.toolResult?.result?.output !== undefined) {
-        const originalOutput = ctx.toolResult.result.output;
-        ctx.toolResult.result.output = placeholderBlock + `
-
-` + originalOutput;
-        logger.info(`[AutoTaskPlugin] placeholder prepended (session=${sid.slice(0, 12)}...)`);
-      }
-      let taskAgentFinalText = "";
-      try {
-        const taskAgentResult = await agentComponent.run(subagentType, userQuery, {
-          sessionId: sid,
-          traceId,
-          persistSession: false
-        });
-        taskAgentFinalText = taskAgentResult?.finalText || "";
-        logger.info(`[AutoTaskPlugin] task-agent completed (session=${sid.slice(0, 12)}..., finalTextLength=${taskAgentFinalText.length})`);
-      } catch (err) {
-        logger.error(`[AutoTaskPlugin] task-agent failed: ${err instanceof Error ? err.message : String(err)}`);
-        taskAgentFinalText = `❌ **${subagentType} 执行失败**: ${err instanceof Error ? err.message : String(err)}`;
-      }
-      if (taskAgentFinalText && ctx.toolResult?.result?.output !== undefined) {
-        const finalBlock = wrapAutoTaskMetadata(taskAgentFinalText);
-        const current = ctx.toolResult.result.output;
-        const updated = placeholderBlock && current.includes(placeholderBlock) ? current.replace(placeholderBlock, finalBlock) : finalBlock + `
-
-` + current;
-        ctx.toolResult.result.output = updated;
-        logger.info(`[AutoTaskPlugin] task-agent finalText injected (session=${sid.slice(0, 12)}...)`);
-      } else if (!ctx.toolResult?.result?.output) {
-        logger.warn(`[AutoTaskPlugin] toolResult unavailable for injection`);
-      }
-      return { continue: true };
-    } catch (err) {
-      logger.error(`[AutoTaskPlugin] hook failed: ${err instanceof Error ? err.message : String(err)}`);
-      return { continue: true };
-    }
-  }
-  const execute = wrapFunction(executeImpl, "plugin.auto-task.launch-agent", {
-    recordParams: false,
-    recordResult: true,
-    log: true
-  });
-  return {
-    name: "AutoTaskPlugin",
-    version: "4.6.0",
-    description: "ReAct iteration 达到阈值时 await task-agent 执行并提取 delegate_task 结果注入 tool result",
-    hooks: [
-      { point: "agent:after.tool", priority: 50 }
-    ],
-    execute
-  };
-}
-
-export { ITERATION_TASK_TRIGGER_BEGIN, ITERATION_TASK_TRIGGER_END, createAutoTaskPlugin };