@ai-setting/roy-agent-core 1.5.78 → 1.5.79

package/dist/env/agent/index.js

@@ -1,7 +1,7 @@
 import {
   AgentComponent,
   AgentComponentConfigSchema
-} from "../../shared/@ai-setting/roy-agent-core-w6j4zyps.js";
+} from "../../shared/@ai-setting/roy-agent-core-4ws3w7cx.js";
 import"../../shared/@ai-setting/roy-agent-core-r0m0at3x.js";
 import"../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import"../../shared/@ai-setting/roy-agent-core-zf62vkc4.js";

package/dist/env/event-source/index.js

@@ -4,7 +4,7 @@ import {
   builtInHandlers,
   getBuiltInHandler,
   larkCliHandler
-} from "../../shared/@ai-setting/roy-agent-core-f9xyqx9s.js";
+} from "../../shared/@ai-setting/roy-agent-core-7mw366pc.js";
 import {
   BUILT_IN_EVENT_SOURCE_TYPES,
   BUILT_IN_EVENT_SOURCE_TYPE_LIST,
@@ -15,7 +15,7 @@ import {
   validateEventSourceConfig
 } from "../../shared/@ai-setting/roy-agent-core-xb4hvk1m.js";
 import"../../shared/@ai-setting/roy-agent-core-v8xa6vs8.js";
-import"../../shared/@ai-setting/roy-agent-core-r12a2qfv.js";
+import"../../shared/@ai-setting/roy-agent-core-n9tw52zb.js";
 import"../../shared/@ai-setting/roy-agent-core-az13yzmc.js";
 import"../../shared/@ai-setting/roy-agent-core-92z6t4he.js";
 import"../../shared/@ai-setting/roy-agent-core-qxhq8ven.js";

package/dist/env/index.js

@@ -1,11 +1,11 @@
 import {
   BaseEnvironment
-} from "../shared/@ai-setting/roy-agent-core-gb9rb9ny.js";
+} from "../shared/@ai-setting/roy-agent-core-8x1gmqcv.js";
 import {
   EventSourceComponent,
   builtInHandlers,
   larkCliHandler
-} from "../shared/@ai-setting/roy-agent-core-f9xyqx9s.js";
+} from "../shared/@ai-setting/roy-agent-core-7mw366pc.js";
 import {
   EventSourceInitHooks,
   getDefaultConfigForType,
@@ -17,15 +17,15 @@ import"../shared/@ai-setting/roy-agent-core-v8xa6vs8.js";
 import {
   PluginComponent
 } from "../shared/@ai-setting/roy-agent-core-t1ef8hf2.js";
-import"../shared/@ai-setting/roy-agent-core-r12a2qfv.js";
+import"../shared/@ai-setting/roy-agent-core-n9tw52zb.js";
 import"../shared/@ai-setting/roy-agent-core-az13yzmc.js";
 import {
   WorkflowComponent
-} from "../shared/@ai-setting/roy-agent-core-vqkzn45t.js";
+} from "../shared/@ai-setting/roy-agent-core-s83ararq.js";
 import"../shared/@ai-setting/roy-agent-core-fjexv5nm.js";
-import"../shared/@ai-setting/roy-agent-core-4hh4s0w1.js";
-import"../shared/@ai-setting/roy-agent-core-9adgwts7.js";
-import"../shared/@ai-setting/roy-agent-core-fkv7ewz9.js";
+import"../shared/@ai-setting/roy-agent-core-jazhr292.js";
+import"../shared/@ai-setting/roy-agent-core-m4qjnhz6.js";
+import"../shared/@ai-setting/roy-agent-core-7z8fzxck.js";
 import"../shared/@ai-setting/roy-agent-core-6atd905e.js";
 import"../shared/@ai-setting/roy-agent-core-99j4w3fx.js";
 import"../shared/@ai-setting/roy-agent-core-ddwa0n6h.js";
@@ -33,13 +33,13 @@ import"../shared/@ai-setting/roy-agent-core-4t40mkpv.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";
+import"../shared/@ai-setting/roy-agent-core-whw7jap0.js";
 import"../shared/@ai-setting/roy-agent-core-h0x19xgn.js";
 import"../shared/@ai-setting/roy-agent-core-1ce3fqrk.js";
 import {
   AgentComponent,
   AgentComponentConfigSchema
-} from "../shared/@ai-setting/roy-agent-core-w6j4zyps.js";
+} from "../shared/@ai-setting/roy-agent-core-4ws3w7cx.js";
 import"../shared/@ai-setting/roy-agent-core-r0m0at3x.js";
 import"../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {

package/dist/env/task/plugins/index.js

@@ -9,7 +9,7 @@ import {
   formatExtractorInput,
   formatExtractorInputFromDescription,
   parseExtractorOutput
-} from "../../../shared/@ai-setting/roy-agent-core-r12a2qfv.js";
+} from "../../../shared/@ai-setting/roy-agent-core-n9tw52zb.js";
 import"../../../shared/@ai-setting/roy-agent-core-az13yzmc.js";
 import"../../../shared/@ai-setting/roy-agent-core-92z6t4he.js";
 import"../../../shared/@ai-setting/roy-agent-core-qg4rma4c.js";

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

@@ -6,15 +6,15 @@ import {
   Scheduler,
   WorkflowEngine,
   init_engine
-} from "../../../shared/@ai-setting/roy-agent-core-4hh4s0w1.js";
-import"../../../shared/@ai-setting/roy-agent-core-9adgwts7.js";
-import"../../../shared/@ai-setting/roy-agent-core-fkv7ewz9.js";
+} from "../../../shared/@ai-setting/roy-agent-core-jazhr292.js";
+import"../../../shared/@ai-setting/roy-agent-core-m4qjnhz6.js";
+import"../../../shared/@ai-setting/roy-agent-core-7z8fzxck.js";
 import"../../../shared/@ai-setting/roy-agent-core-6atd905e.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-whw7jap0.js";
 import"../../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import"../../../shared/@ai-setting/roy-agent-core-7tp56w6n.js";
 import"../../../shared/@ai-setting/roy-agent-core-qg4rma4c.js";

package/dist/env/workflow/index.js

@@ -1,10 +1,10 @@
 import {
   WorkflowComponent
-} from "../../shared/@ai-setting/roy-agent-core-vqkzn45t.js";
+} from "../../shared/@ai-setting/roy-agent-core-s83ararq.js";
 import"../../shared/@ai-setting/roy-agent-core-fjexv5nm.js";
-import"../../shared/@ai-setting/roy-agent-core-4hh4s0w1.js";
-import"../../shared/@ai-setting/roy-agent-core-9adgwts7.js";
-import"../../shared/@ai-setting/roy-agent-core-fkv7ewz9.js";
+import"../../shared/@ai-setting/roy-agent-core-jazhr292.js";
+import"../../shared/@ai-setting/roy-agent-core-m4qjnhz6.js";
+import"../../shared/@ai-setting/roy-agent-core-7z8fzxck.js";
 import"../../shared/@ai-setting/roy-agent-core-6atd905e.js";
 import"../../shared/@ai-setting/roy-agent-core-99j4w3fx.js";
 import"../../shared/@ai-setting/roy-agent-core-ddwa0n6h.js";
@@ -62,7 +62,7 @@ import {
   unresolvedVariable
 } from "../../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";
+import"../../shared/@ai-setting/roy-agent-core-whw7jap0.js";
 import {
   Edge,
   NodeAs,

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

@@ -9,7 +9,7 @@ import {
   createSubmitJsonOutputTool,
   init_submit_json_output_tool,
   parseWorkflowJsonOutput
-} from "../../../shared/@ai-setting/roy-agent-core-nhfy3p8q.js";
+} from "../../../shared/@ai-setting/roy-agent-core-whw7jap0.js";
 import"../../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   createLogger,

package/dist/index.js

@@ -57,13 +57,13 @@ import {
   BaseEnvironment,
   generateDescendingId,
   generateId
-} from "./shared/@ai-setting/roy-agent-core-gb9rb9ny.js";
+} from "./shared/@ai-setting/roy-agent-core-8x1gmqcv.js";
 import {
   EventSourceComponent,
   builtInHandlers,
   getBuiltInHandler,
   larkCliHandler
-} from "./shared/@ai-setting/roy-agent-core-f9xyqx9s.js";
+} from "./shared/@ai-setting/roy-agent-core-7mw366pc.js";
 import {
   BUILT_IN_EVENT_SOURCE_TYPES,
   BUILT_IN_EVENT_SOURCE_TYPE_LIST,
@@ -83,20 +83,20 @@ import {
 import {
   TaskTagPlugin,
   createAutoTaskPlugin
-} from "./shared/@ai-setting/roy-agent-core-r12a2qfv.js";
+} from "./shared/@ai-setting/roy-agent-core-n9tw52zb.js";
 import {
   BasePlugin
 } from "./shared/@ai-setting/roy-agent-core-az13yzmc.js";
 import {
   WorkflowComponent
-} from "./shared/@ai-setting/roy-agent-core-vqkzn45t.js";
+} from "./shared/@ai-setting/roy-agent-core-s83ararq.js";
 import {
   init_node_registry_helper,
   registerDecoratorNodeType
 } from "./shared/@ai-setting/roy-agent-core-fjexv5nm.js";
-import"./shared/@ai-setting/roy-agent-core-4hh4s0w1.js";
-import"./shared/@ai-setting/roy-agent-core-9adgwts7.js";
-import"./shared/@ai-setting/roy-agent-core-fkv7ewz9.js";
+import"./shared/@ai-setting/roy-agent-core-jazhr292.js";
+import"./shared/@ai-setting/roy-agent-core-m4qjnhz6.js";
+import"./shared/@ai-setting/roy-agent-core-7z8fzxck.js";
 import"./shared/@ai-setting/roy-agent-core-6atd905e.js";
 import"./shared/@ai-setting/roy-agent-core-99j4w3fx.js";
 import"./shared/@ai-setting/roy-agent-core-ddwa0n6h.js";
@@ -104,7 +104,7 @@ import"./shared/@ai-setting/roy-agent-core-4t40mkpv.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";
+import"./shared/@ai-setting/roy-agent-core-whw7jap0.js";
 import {
   Edge,
   NodeAs,
@@ -116,7 +116,7 @@ import"./shared/@ai-setting/roy-agent-core-1ce3fqrk.js";
 import {
   AgentComponent,
   AgentComponentConfigSchema
-} from "./shared/@ai-setting/roy-agent-core-w6j4zyps.js";
+} from "./shared/@ai-setting/roy-agent-core-4ws3w7cx.js";
 import {
   createInvokeConfig,
   invoke,

package/dist/shared/@ai-setting/{roy-agent-core-w6j4zyps.js → roy-agent-core-4ws3w7cx.js}

@@ -512,6 +512,12 @@ class AgentComponent extends BaseComponent {
         toolNames: tools.map((t) => t.name)
       });
     }
+    if (context?.extraTools?.length) {
+      tools = [...tools, ...context.extraTools];
+      logger.debug(`[getAvailableTools] After extraTools: ${tools.length} tools`, {
+        extraToolNames: context.extraTools.map((t) => t.name)
+      });
+    }
     logger.debug(`[getAvailableTools] Final tools: ${tools.length}`, {
       toolNames: tools.map((t) => t.name)
     });
@@ -1102,7 +1108,16 @@ ${additionInfo}`
       };
       let result;
       const isLongRunningTool = toolName === "delegate_task" || toolName === "stop_task" || toolName === "bash";
-      if (this.toolComponent?.execute) {
+      const isExtraTool = this.toolComponent?.getTool ? !this.toolComponent.getTool(toolName) : false;
+      if (isExtraTool) {
+        logger.debug(`[executeTool] Tool "${toolName}" is an extraTool, executing directly`);
+        const toolPromise = tool.execute(toolCall.arguments, toolContext);
+        if (isLongRunningTool) {
+          result = await toolPromise;
+        } else {
+          result = await withTimeout(toolPromise, 120000, `Tool '${toolName}' execution timeout after 120s`);
+        }
+      } else if (this.toolComponent?.execute) {
         const toolPromise = this.toolComponent.execute(request);
         if (isLongRunningTool) {
           result = await toolPromise;

package/dist/shared/@ai-setting/{roy-agent-core-f9xyqx9s.js → roy-agent-core-7mw366pc.js}

@@ -1,7 +1,7 @@
 import {
   TaskTagPlugin,
   createLarkCliTaskNotifyHook
-} from "./roy-agent-core-r12a2qfv.js";
+} from "./roy-agent-core-n9tw52zb.js";
 import {
   envKeyToConfigKey
 } from "./roy-agent-core-qxhq8ven.js";

package/dist/shared/@ai-setting/{roy-agent-core-fkv7ewz9.js → roy-agent-core-7z8fzxck.js}

@@ -3,7 +3,7 @@ import {
   createSubmitJsonOutputTool,
   init_submit_json_output_tool,
   parseWorkflowJsonOutput
-} from "./roy-agent-core-nhfy3p8q.js";
+} from "./roy-agent-core-whw7jap0.js";
 import {
   AskUserError,
   init_workflow_hil
@@ -45,6 +45,12 @@ function describeOutputSchema(schema) {
 var init_output_schema_hint = () => {};
 
 // src/env/workflow/plugins/workflow-json-output-plugin.ts
+function getFallbackModel(hookCtx) {
+  const fromMetadata = hookCtx.context.metadata?.workflowJsonOutputFallbackModel;
+  if (typeof fromMetadata === "string" && fromMetadata.length > 0)
+    return fromMetadata;
+  return process.env.WORKFLOW_JSON_OUTPUT_FALLBACK_MODEL || DEFAULT_FALLBACK_MODEL;
+}
 function isWorkflowJsonOutputEnabled(pluginEnabled) {
   return pluginEnabled?.[WORKFLOW_JSON_OUTPUT_PLUGIN_KEY] === true;
 }
@@ -81,14 +87,70 @@ async function runWorkflowJsonOutputExtraction(hookCtx, llmComponent) {
   if (hookCtx.structuredOutputExtracted) {
     return;
   }
-  const extracted = await extractStructuredJsonViaLlm(llmComponent, hookCtx.messages, schema, {
-    model: hookCtx.context.model ?? hookCtx.agent.config.model,
-    sessionId: hookCtx.context.sessionId,
-    abortSignal: hookCtx.context.abort
-  });
+  const extracted = extractStructuredJsonFromMessages(hookCtx.messages, schema);
   if (extracted) {
     hookCtx.structuredOutputExtracted = extracted;
+    logger.info("Workflow JSON output extracted from ReAct messages (no second LLM invoke)");
+    return;
+  }
+  logger.warn(`Workflow JSON extraction: Phase 1 (ReAct messages) returned no workflow_submit_output. ` + `Attempting Phase 2 fallback with model=${getFallbackModel(hookCtx)}.`);
+  try {
+    const fallbackExtracted = await extractStructuredJsonViaLlm(llmComponent, hookCtx.messages, schema, {
+      model: getFallbackModel(hookCtx),
+      sessionId: hookCtx.context.sessionId,
+      abortSignal: hookCtx.context.abort
+    });
+    if (fallbackExtracted) {
+      hookCtx.structuredOutputExtracted = fallbackExtracted;
+      logger.info(`Workflow JSON output extracted via fallback LLM (${getFallbackModel(hookCtx)})`);
+    } else {
+      logger.warn(`Workflow JSON extraction: Phase 2 fallback (${getFallbackModel(hookCtx)}) also failed to extract structured output. ` + `Check if the fallback model is available and supports forced toolChoice.`);
+    }
+  } catch (error) {
+    logger.error(`Workflow JSON extraction: Phase 2 fallback (${getFallbackModel(hookCtx)}) threw error`, { error: String(error) });
+  }
+}
+function tryExtractToolCall(submitTool, tc) {
+  const name = tc.function?.name ?? tc.name;
+  if (name !== WORKFLOW_SUBMIT_OUTPUT_TOOL_NAME)
+    return;
+  const argsRaw = tc.function?.arguments ?? tc.arguments;
+  const argsStr = typeof argsRaw === "string" ? argsRaw : JSON.stringify(argsRaw ?? {});
+  try {
+    return submitTool.parameters.parse(JSON.parse(argsStr));
+  } catch {
+    return;
+  }
+}
+function extractStructuredJsonFromMessages(messages, schema) {
+  const submitTool = createSubmitJsonOutputTool(schema);
+  for (let i = messages.length - 1;i >= 0; i--) {
+    const msg = messages[i];
+    if (msg.role !== "assistant")
+      continue;
+    const toolCalls = msg.tool_calls ?? msg.toolCalls ?? [];
+    if (toolCalls.length) {
+      for (let j = toolCalls.length - 1;j >= 0; j--) {
+        const result = tryExtractToolCall(submitTool, toolCalls[j]);
+        if (result)
+          return result;
+      }
+    }
+    if (Array.isArray(msg.content)) {
+      for (let k = msg.content.length - 1;k >= 0; k--) {
+        const part = msg.content[k];
+        if (part?.type !== "tool-call")
+          continue;
+        const result = tryExtractToolCall(submitTool, {
+          name: part.toolName,
+          arguments: part.args ?? part.arguments
+        });
+        if (result)
+          return result;
+      }
+    }
   }
+  return;
 }
 async function extractStructuredJsonViaLlm(llmComponent, historyMessages, schema, options = {}) {
   const submitTool = createSubmitJsonOutputTool(schema);
@@ -97,43 +159,48 @@ async function extractStructuredJsonViaLlm(llmComponent, historyMessages, schema
     content: "Based on the conversation above, call workflow_submit_output exactly once with structured JSON. " + `${describeOutputSchema(schema)}.`
   };
   const messages = [...historyMessages, extractionUserMessage].map(toLLMMessage);
-  const result = await llmComponent.invoke({
-    messages,
-    tools: [
-      {
-        name: submitTool.name,
-        description: submitTool.description ?? "",
-        parameters: submitTool.parameters
-      }
-    ],
-    toolChoice: {
-      type: "function",
-      function: { name: WORKFLOW_SUBMIT_OUTPUT_TOOL_NAME }
-    },
-    model: options.model,
-    context: {
-      sessionId: options.sessionId
-    },
-    abortSignal: options.abortSignal,
-    skipThresholdCheck: true
-  });
-  const toolCalls = result.output?.toolCalls ?? [];
-  for (let i = toolCalls.length - 1;i >= 0; i--) {
-    const tc = toolCalls[i];
-    const name = tc.function?.name ?? tc.name;
-    if (name !== WORKFLOW_SUBMIT_OUTPUT_TOOL_NAME) {
-      continue;
+  for (let attempt = 0;attempt < 2; attempt++) {
+    const msgs = [...messages];
+    if (attempt === 1) {
+      msgs.push({
+        role: "user",
+        content: "You MUST call workflow_submit_output now with the structured JSON. Do NOT write text. Only call the tool."
+      });
     }
-    const argsRaw = tc.function?.arguments ?? tc.arguments;
-    const argsStr = typeof argsRaw === "string" ? argsRaw : JSON.stringify(argsRaw ?? {});
-    try {
-      const parsed = submitTool.parameters.parse(JSON.parse(argsStr));
-      return parsed;
-    } catch {
-      const fromExecute = await submitTool.execute(JSON.parse(argsStr));
-      const fromMarker = parseWorkflowJsonOutput(fromExecute.output);
-      if (fromMarker) {
-        return fromMarker;
+    const result = await llmComponent.invoke({
+      messages: msgs,
+      tools: [
+        {
+          name: submitTool.name,
+          description: submitTool.description ?? "",
+          parameters: submitTool.parameters
+        }
+      ],
+      model: options.model,
+      context: {
+        sessionId: options.sessionId
+      },
+      abortSignal: options.abortSignal,
+      skipThresholdCheck: true
+    });
+    const toolCalls = result.output?.toolCalls ?? [];
+    for (let i = toolCalls.length - 1;i >= 0; i--) {
+      const tc = toolCalls[i];
+      const name = tc.function?.name ?? tc.name;
+      if (name !== WORKFLOW_SUBMIT_OUTPUT_TOOL_NAME) {
+        continue;
+      }
+      const argsRaw = tc.function?.arguments ?? tc.arguments;
+      const argsStr = typeof argsRaw === "string" ? argsRaw : JSON.stringify(argsRaw ?? {});
+      try {
+        const parsed = submitTool.parameters.parse(JSON.parse(argsStr));
+        return parsed;
+      } catch {
+        const fromExecute = await submitTool.execute(JSON.parse(argsStr));
+        const fromMarker = parseWorkflowJsonOutput(fromExecute.output);
+        if (fromMarker) {
+          return fromMarker;
+        }
       }
     }
   }
@@ -180,7 +247,7 @@ function toLLMMessage(msg) {
   }
   return { role: msg.role, content: "" };
 }
-var logger, WORKFLOW_JSON_OUTPUT_SOURCE_ID = "workflow", WORKFLOW_JSON_OUTPUT_PLUGIN_NAME = "json-output", WORKFLOW_JSON_OUTPUT_PLUGIN_KEY, HOOK_POINT = "agent:after.react", HOOK_NAME, registered = false, tracedRunWorkflowJsonOutputExtraction, tracedExtractStructuredJsonViaLlm;
+var logger, WORKFLOW_JSON_OUTPUT_SOURCE_ID = "workflow", WORKFLOW_JSON_OUTPUT_PLUGIN_NAME = "json-output", WORKFLOW_JSON_OUTPUT_PLUGIN_KEY, DEFAULT_FALLBACK_MODEL = "minimax/MiniMax-M3", HOOK_POINT = "agent:after.react", HOOK_NAME, registered = false, tracedRunWorkflowJsonOutputExtraction, tracedExtractStructuredJsonViaLlm;
 var init_workflow_json_output_plugin = __esm(() => {
   init_global_hook_manager();
   init_workflow_hil();
@@ -195,4 +262,4 @@ var init_workflow_json_output_plugin = __esm(() => {
   tracedExtractStructuredJsonViaLlm = wrapFunction(extractStructuredJsonViaLlm, "workflow.json_output.extract_via_llm", { recordParams: false, recordResult: true, log: true });
 });
 
-export { WORKFLOW_JSON_OUTPUT_SOURCE_ID, WORKFLOW_JSON_OUTPUT_PLUGIN_NAME, WORKFLOW_JSON_OUTPUT_PLUGIN_KEY, isWorkflowJsonOutputEnabled, registerWorkflowJsonOutputPlugin, unregisterWorkflowJsonOutputPlugin, runWorkflowJsonOutputExtraction, extractStructuredJsonViaLlm, tracedRunWorkflowJsonOutputExtraction, tracedExtractStructuredJsonViaLlm, init_workflow_json_output_plugin };
+export { WORKFLOW_JSON_OUTPUT_SOURCE_ID, WORKFLOW_JSON_OUTPUT_PLUGIN_NAME, WORKFLOW_JSON_OUTPUT_PLUGIN_KEY, isWorkflowJsonOutputEnabled, registerWorkflowJsonOutputPlugin, unregisterWorkflowJsonOutputPlugin, runWorkflowJsonOutputExtraction, extractStructuredJsonFromMessages, extractStructuredJsonViaLlm, tracedRunWorkflowJsonOutputExtraction, tracedExtractStructuredJsonViaLlm, init_workflow_json_output_plugin };

package/dist/shared/@ai-setting/{roy-agent-core-gb9rb9ny.js → roy-agent-core-8x1gmqcv.js}

@@ -1,6 +1,6 @@
 import {
   createAutoTaskPlugin
-} from "./roy-agent-core-r12a2qfv.js";
+} from "./roy-agent-core-n9tw52zb.js";
 import {
   ContextError,
   ErrorCodes
@@ -195,9 +195,14 @@ class BaseEnvironment extends BaseComponent {
       });
       logger.info(`[handle_query] Created default receptionist agent with deniedTools: ${defaultDeniedTools.length} tools denied`);
       try {
-        const autoTaskPlugin = createAutoTaskPlugin();
+        const llmRef = this.getComponent("llm");
+        const toolRef = this.getComponent("tool");
+        const autoTaskPlugin = createAutoTaskPlugin({
+          llmComponent: llmRef ?? undefined,
+          toolComponent: toolRef ?? undefined
+        });
         agentComponent.registerPlugin("default", autoTaskPlugin);
-        logger.info("[handle_query] AutoTaskPlugin registered on default agent");
+        logger.info("[handle_query] AutoTaskPlugin v3 registered on default agent");
       } catch (err) {
         logger.warn(`[handle_query] Failed to register AutoTaskPlugin: ${err}`);
       }

package/dist/shared/@ai-setting/{roy-agent-core-4hh4s0w1.js → roy-agent-core-jazhr292.js}

@@ -1,7 +1,7 @@
 import {
   AgentComponentAdapter,
   init_agent_component_adapter
-} from "./roy-agent-core-9adgwts7.js";
+} from "./roy-agent-core-m4qjnhz6.js";
 import {
   buildWorkflowNodeMetadata,
   getWorkflowNodeIdFromMetadata,
@@ -34,7 +34,7 @@ import {
   jsonSchemaToZod,
   parseWorkflowJsonOutput,
   validateJsonOutputSchema
-} from "./roy-agent-core-nhfy3p8q.js";
+} from "./roy-agent-core-whw7jap0.js";
 import {
   AskUserError,
   createNodeInterruptEvent,
@@ -1452,7 +1452,8 @@ var init_agent_node = __esm(() => {
             model: effectiveModel,
             allowedTools: effectiveAllowedTools,
             deniedTools: effectiveDeniedTools,
-            outputSchema: outputConfig.schema
+            outputSchema: outputConfig.schema,
+            workflowJsonOutputFallbackModel: options.workflowJsonOutputFallbackModel
           },
           workflowHistory: context.workflowHistory,
           nodeId: this.definition.id,
@@ -2423,9 +2424,19 @@ var init_engine = __esm(() => {
       const durationMs = Date.now() - sessionState.startedAt.getTime();
       const sessionId = sessionState.sessionId;
       const runId = this.getRunIdFromSessionId(sessionId);
-      const output = {};
+      const dagAnalysis = sessionState.dagManager.analyze();
+      const exitNodes = new Set(dagAnalysis.exitNodes);
+      const exitOutput = {};
       for (const [nodeId, nodeOutput] of sessionState.nodeOutputs) {
-        output[nodeId] = nodeOutput;
+        if (exitNodes.has(nodeId)) {
+          exitOutput[nodeId] = nodeOutput;
+        }
+      }
+      const singleExit = exitNodes.size === 1 ? Array.from(exitNodes)[0] : undefined;
+      const finalOutput = singleExit && exitOutput[singleExit] !== undefined ? exitOutput[singleExit] : exitOutput;
+      const allNodeOutputs = {};
+      for (const [nodeId, nodeOutput] of sessionState.nodeOutputs) {
+        allNodeOutputs[nodeId] = nodeOutput;
       }
       if (this.sessionComponent) {
         const metadata = await this.getSessionMetadata(sessionId);
@@ -2435,7 +2446,7 @@ var init_engine = __esm(() => {
             status: "completed",
             completedAt: Date.now(),
             durationMs,
-            output,
+            output: allNodeOutputs,
             pendingNodeId: undefined,
             pauseReason: undefined,
             agentSessions: markAllAgentSessionsCompleted(metadata.agentSessions)
@@ -2443,13 +2454,13 @@ var init_engine = __esm(() => {
         });
       }
       await sessionState.eventBus.publish(createWorkflowEvent("workflow.completed", runId, {
-        result: output,
+        result: finalOutput,
         duration_ms: durationMs
       }), true);
       sessionState.resolveCompleted({
         runId,
         status: "completed",
-        output,
+        output: finalOutput,
         durationMs
       });
       this.cleanupSession(sessionState);

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

@@ -3,7 +3,11 @@ import {
   init_workflow_json_output_plugin,
   registerWorkflowJsonOutputPlugin,
   tracedExtractStructuredJsonViaLlm
-} from "./roy-agent-core-fkv7ewz9.js";
+} from "./roy-agent-core-7z8fzxck.js";
+import {
+  createSubmitJsonOutputTool,
+  init_submit_json_output_tool
+} from "./roy-agent-core-whw7jap0.js";
 import {
   AskUserError,
   init_workflow_hil
@@ -23,6 +27,7 @@ var init_agent_component_adapter = __esm(() => {
   init_workflow_hil();
   init_workflow_json_output_plugin();
   init_decorator();
+  init_submit_json_output_tool();
   AgentComponentAdapter = class AgentComponentAdapter {
     agentComponent;
     options;
@@ -134,13 +139,24 @@ var init_agent_component_adapter = __esm(() => {
           runId,
           nodeId,
           sessionId: agentSessionId,
-          outputSchema
+          outputSchema,
+          workflowJsonOutputFallbackModel: config.options?.workflowJsonOutputFallbackModel
         };
         if (outputSchema) {
           context.pluginEnabled = {
             ...context.pluginEnabled ?? {},
             [WORKFLOW_JSON_OUTPUT_PLUGIN_KEY]: true
           };
+          const submitTool = createSubmitJsonOutputTool(outputSchema);
+          context.extraTools = [
+            ...context.extraTools ?? [],
+            {
+              name: submitTool.name,
+              description: submitTool.description ?? "",
+              parameters: submitTool.parameters,
+              execute: submitTool.execute
+            }
+          ];
         }
         if (config.workflowHistory) {
           context.workflowHistory = config.workflowHistory;

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

@@ -393,29 +393,163 @@ init_logger();
 init_decorator();
 var logger2 = createLogger("AutoTaskPlugin");
 function createAutoTaskPlugin(config) {
-  const threshold = config?.threshold ?? 10;
+  const threshold = config?.threshold ?? 30;
   const agentName = config?.agentName ?? "default";
-  const triggeredSessions = new Set;
+  const llmRef = config?.llmComponent ?? null;
+  const toolRef = config?.toolComponent ?? null;
+  const toolChoiceModel = config?.model;
+  const subagentType = config?.subagentType ?? "roy";
+  let lastProcessedTraceId = "";
+  let cachedDelegateToolInfo = undefined;
+  function getDelegateToolInfoImpl() {
+    if (cachedDelegateToolInfo !== undefined)
+      return cachedDelegateToolInfo;
+    if (!toolRef || typeof toolRef.getTool !== "function") {
+      cachedDelegateToolInfo = null;
+      return null;
+    }
+    const tool = toolRef.getTool("delegate_task");
+    if (!tool) {
+      cachedDelegateToolInfo = null;
+      return null;
+    }
+    cachedDelegateToolInfo = {
+      name: tool.name,
+      description: tool.description || "",
+      parameters: tool.parameters ?? {}
+    };
+    return cachedDelegateToolInfo;
+  }
+  const getDelegateToolInfo = wrapFunction(getDelegateToolInfoImpl, "plugin.auto-task.get-tool-info", { recordParams: false, recordResult: true, log: true });
+  async function tryInvokeForDelegateImpl(msgs, delegateToolInfo, model, sid) {
+    const result = await llmRef.invoke({
+      messages: msgs,
+      tools: [delegateToolInfo],
+      model,
+      context: { sessionId: sid },
+      skipThresholdCheck: true
+    });
+    const toolCalls = result?.output?.toolCalls;
+    if (!toolCalls || toolCalls.length === 0) {
+      logger2.warn(`[AutoTaskPlugin] LLM returned no toolCalls (session=${sid.slice(0, 12)}...)`);
+      return null;
+    }
+    for (const tc of toolCalls) {
+      const tcName = tc.function?.name ?? tc.name;
+      if (tcName !== "delegate_task")
+        continue;
+      const rawArgs = tc.function?.arguments ?? tc.arguments;
+      try {
+        const args = JSON.parse(typeof rawArgs === "string" ? rawArgs : JSON.stringify(rawArgs ?? {}));
+        if (args.description && args.prompt) {
+          return args;
+        }
+        logger2.warn(`[AutoTaskPlugin] delegate_task args missing required fields: ${JSON.stringify(args).slice(0, 100)}`);
+      } catch {
+        logger2.warn(`[AutoTaskPlugin] Failed to parse delegate_task args: ${String(rawArgs).slice(0, 100)}`);
+      }
+    }
+    return null;
+  }
+  const tryInvokeForDelegate = wrapFunction(tryInvokeForDelegateImpl, "plugin.auto-task.invoke-llm", { recordParams: true, recordResult: true, log: true });
   async function executeImpl(ctx) {
     try {
+      logger2.debug(`[AutoTaskPlugin] agentName=${ctx.agent.name} (expected=${agentName})`);
       if (ctx.agent.name !== agentName)
         return { continue: true };
+      logger2.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 (triggeredSessions.has(sid))
+      if (traceId === lastProcessedTraceId) {
+        logger2.debug(`[AutoTaskPlugin] skip - traceId=${traceId.slice(0, 20)}... already processed`);
         return { continue: true };
-      triggeredSessions.add(sid);
-      const tr = ctx.toolResult;
-      if (tr && tr.result && tr.result.output !== undefined) {
-        tr.result.output = (tr.result.output || "") + `
+      }
+      lastProcessedTraceId = traceId;
+      logger2.debug(`[AutoTaskPlugin] new query detected (traceId=${traceId.slice(0, 20)}...)`);
+      if (!llmRef || !toolRef) {
+        logger2.warn(`[AutoTaskPlugin] llmComponent or toolComponent not provided at creation (session=${sid.slice(0, 12)}...)`);
+        return { continue: true };
+      }
+      const delegateToolInfo = getDelegateToolInfo();
+      if (!delegateToolInfo) {
+        logger2.warn(`[AutoTaskPlugin] delegate_task tool not found in toolComponent (session=${sid.slice(0, 12)}...)`);
+        return { continue: true };
+      }
+      const msgs = [];
+      for (const m of ctx.messages) {
+        if (m.role === "user") {
+          msgs.push({
+            role: "user",
+            content: typeof m.content === "string" ? m.content : JSON.stringify(m.content)
+          });
+        } else if (m.role === "assistant") {
+          const text = typeof m.content === "string" ? m.content : "";
+          if (text.trim()) {
+            msgs.push({ role: "assistant", content: text });
+          }
+        }
+      }
+      msgs.push({
+        role: "user",
+        content: `Based on the conversation above, please call \`delegate_task\` to hand off the current work to a sub-agent.
+
+Parameters for delegate_task:
+- description: A short 3-8 word title describing this work
+- prompt: Detailed instructions for the sub-agent to continue the work
+- subagent_type: Use "${subagentType}"
+- similar_task_ids: []
+
+Call delegate_task now.`
+      });
+      const model = toolChoiceModel ?? ctx.context?.model ?? ctx.agent?.config?.model;
+      logger2.info(`[AutoTaskPlugin] Invoking LLM (model=${model}) for delegate_task args at iteration ${ctx.iteration} (session=${sid.slice(0, 12)}...)`);
+      let args = await tryInvokeForDelegate(msgs, delegateToolInfo, model, sid);
+      if (!args) {
+        logger2.info(`[AutoTaskPlugin] Retrying with alternative prompt (session=${sid.slice(0, 12)}...)`);
+        msgs.push({
+          role: "user",
+          content: `Please call \`delegate_task\` now with description (short title), prompt (detailed instructions), subagent_type="${subagentType}", and similar_task_ids=[].`
+        });
+        args = await tryInvokeForDelegate(msgs, delegateToolInfo, model, sid);
+      }
+      if (!args) {
+        logger2.warn(`[AutoTaskPlugin] Failed to get delegate_task args after retry (session=${sid.slice(0, 12)}...)`);
+        return { continue: true };
+      }
+      logger2.info(`[AutoTaskPlugin] LLM generated delegate_task args: description="${String(args.description).slice(0, 50)}", subagent_type=${args.subagent_type}`);
+      const execResult = await toolRef.execute({
+        name: "delegate_task",
+        args: {
+          description: args.description,
+          prompt: args.prompt,
+          subagent_type: args.subagent_type || subagentType,
+          similar_task_ids: args.similar_task_ids || []
+        },
+        context: {
+          session_id: sid,
+          agent: ctx.agent.name
+        },
+        skipHooks: true
+      });
+      if (execResult.success && ctx.toolResult?.result?.output !== undefined) {
+        const bgProcessId = execResult.result?.bgProcessId ?? "unknown";
+        const injection = `
 
 ---
-` + "\uD83D\uDEA8 **IMPORTANT: You MUST call `delegate_task` now.**\n\n" + "This session has reached " + ctx.iteration + " ReAct iterations. " + "**You are REQUIRED to stop your current work and call `delegate_task` immediately.** " + `Do NOT continue the current ReAct loop. You MUST hand off the remaining work to a sub-agent.
+\uD83D\uDE80 **Task Delegated**: 已通过 delegate_task 委托给子 agent（${subagentType}）在后台运行。
 
-` + "**You MUST call the tool `delegate_task` with these parameters:**\n" + "- `description`: A short 3-5 word summary of the task\n" + "- `prompt`: Detailed instructions for the sub-agent to continue the work\n" + '- `subagent_type`: Use `"roy"` for general tasks\n\n' + "**Failure to call `delegate_task` will result in the work being lost.**\n" + "---";
+⏳ 请等待后台任务运行结果通知，无需额外操作。
+
+\uD83D\uDCCB 后台进程 ID: \`${bgProcessId}\`
+---`;
+        ctx.toolResult.result.output += injection;
+        logger2.info(`[AutoTaskPlugin] delegate_task called (bgProcessId=${bgProcessId}, session=${sid.slice(0, 12)}...)`);
+      } else {
+        const errMsg = execResult?.output || execResult?.error || "unknown error";
+        logger2.warn(`[AutoTaskPlugin] delegate_task execution failed: success=${execResult?.success}, error=${String(errMsg).slice(0, 200)}`);
       }
-      logger2.info(`[AutoTaskPlugin] Prompted delegate_task at iteration ${ctx.iteration} (session=${sid.slice(0, 12)}...)`);
       return { continue: true };
     } catch (err) {
       logger2.error(`[AutoTaskPlugin] hook failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -429,8 +563,8 @@ function createAutoTaskPlugin(config) {
   });
   return {
     name: "AutoTaskPlugin",
-    version: "1.0.0",
-    description: "ReAct iteration 达到阈值时提示 agent 用 delegate_task 将工作转为 task",
+    version: "3.0.0",
+    description: "ReAct iteration 达到阈值时通过 LLM 生成 delegate_task 入参并直接调用",
     hooks: [
       { point: "agent:after.tool", priority: 50 }
     ],

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

@@ -1,9 +1,9 @@
 import {
   AgentComponentAdapter,
   init_agent_component_adapter
-} from "./roy-agent-core-9adgwts7.js";
-import"./roy-agent-core-fkv7ewz9.js";
-import"./roy-agent-core-nhfy3p8q.js";
+} from "./roy-agent-core-m4qjnhz6.js";
+import"./roy-agent-core-7z8fzxck.js";
+import"./roy-agent-core-whw7jap0.js";
 import"./roy-agent-core-e25xkv53.js";
 import"./roy-agent-core-7tp56w6n.js";
 import"./roy-agent-core-qg4rma4c.js";

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

@@ -2,6 +2,7 @@ import {
   WORKFLOW_JSON_OUTPUT_PLUGIN_KEY,
   WORKFLOW_JSON_OUTPUT_PLUGIN_NAME,
   WORKFLOW_JSON_OUTPUT_SOURCE_ID,
+  extractStructuredJsonFromMessages,
   extractStructuredJsonViaLlm,
   init_workflow_json_output_plugin,
   isWorkflowJsonOutputEnabled,
@@ -10,8 +11,8 @@ import {
   tracedExtractStructuredJsonViaLlm,
   tracedRunWorkflowJsonOutputExtraction,
   unregisterWorkflowJsonOutputPlugin
-} from "./roy-agent-core-fkv7ewz9.js";
-import"./roy-agent-core-nhfy3p8q.js";
+} from "./roy-agent-core-7z8fzxck.js";
+import"./roy-agent-core-whw7jap0.js";
 import"./roy-agent-core-e25xkv53.js";
 import"./roy-agent-core-7tp56w6n.js";
 import"./roy-agent-core-qg4rma4c.js";
@@ -31,6 +32,7 @@ export {
   registerWorkflowJsonOutputPlugin,
   isWorkflowJsonOutputEnabled,
   extractStructuredJsonViaLlm,
+  extractStructuredJsonFromMessages,
   WORKFLOW_JSON_OUTPUT_SOURCE_ID,
   WORKFLOW_JSON_OUTPUT_PLUGIN_NAME,
   WORKFLOW_JSON_OUTPUT_PLUGIN_KEY

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

@@ -6,7 +6,7 @@ import {
   WorkflowEngine,
   exports_engine,
   init_engine
-} from "./roy-agent-core-4hh4s0w1.js";
+} from "./roy-agent-core-jazhr292.js";
 import {
   WorkflowService
 } from "./roy-agent-core-4t40mkpv.js";
@@ -136,7 +136,7 @@ class WorkflowComponent extends BaseComponent {
       const agentComponent = this._workflowEnv.getComponent("agent");
       const llmComponent = this._workflowEnv.getComponent("llm");
       if (agentComponent) {
-        const { AgentComponentAdapter } = await import("./roy-agent-core-assbmxe0.js");
+        const { AgentComponentAdapter } = await import("./roy-agent-core-nc0n0bdc.js");
         agentRunner = new AgentComponentAdapter(agentComponent, {}, this.sessionComponent, llmComponent);
       }
     }
@@ -208,7 +208,7 @@ class WorkflowComponent extends BaseComponent {
       const sessionComponent = this._workflowEnv?.getComponent("session");
       componentLogger.info(`initSqliteService - toolComponent: ${!!toolComponent}, llmComponent: ${!!llmComponent}, skillRegistry: ${!!skillComponent}, sessionComponent: ${!!sessionComponent}`);
       if (llmComponent) {
-        const { registerWorkflowJsonOutputPlugin } = await import("./roy-agent-core-yakvqh1d.js");
+        const { registerWorkflowJsonOutputPlugin } = await import("./roy-agent-core-qf9gvx02.js");
         registerWorkflowJsonOutputPlugin(llmComponent);
       }
       this.createService({

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

@@ -77,13 +77,35 @@ function propertyToZod(prop) {
     case "number":
     case "integer":
       return z.number();
+    case "array":
+      if (prop.items) {
+        return z.array(propertyToZod(prop.items));
+      }
+      return z.array(z.unknown());
+    case "object":
+      if (prop.properties) {
+        const required = new Set(prop.required ?? []);
+        const shape = {};
+        for (const [key, subProp] of Object.entries(prop.properties)) {
+          let field = propertyToZod(subProp);
+          if (subProp.description) {
+            field = field.describe(subProp.description);
+          }
+          if (!required.has(key)) {
+            field = field.optional();
+          }
+          shape[key] = field;
+        }
+        return z.object(shape);
+      }
+      return z.record(z.unknown());
     default:
       return z.unknown();
   }
 }
 var SUPPORTED_PROPERTY_TYPES;
 var init_json_schema_to_zod = __esm(() => {
-  SUPPORTED_PROPERTY_TYPES = new Set(["boolean", "string", "number", "integer"]);
+  SUPPORTED_PROPERTY_TYPES = new Set(["boolean", "string", "number", "integer", "array", "object"]);
 });
 
 // src/env/workflow/tools/submit-json-output-tool.ts

package/package.json

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