@ai-setting/roy-agent-core 1.5.51 → 1.5.53

package/dist/shared/@ai-setting/{roy-agent-core-2k4r9grg.js → roy-agent-core-g7qhnsz3.js}

@@ -1,3 +1,6 @@
+import {
+  withTimeout
+} from "./roy-agent-core-4ch3ghj6.js";
 import {
   AskUserError,
   init_workflow_hil
@@ -10,7 +13,7 @@ import {
 } from "./roy-agent-core-ctdhjv68.js";
 import {
   SessionMessageConverter
-} from "./roy-agent-core-7b35emr7.js";
+} from "./roy-agent-core-ew29335n.js";
 import {
   envKeyToConfigKey
 } from "./roy-agent-core-qxhq8ven.js";
@@ -671,7 +674,8 @@ class AgentComponent extends BaseComponent {
                 if (typeof tc.function.arguments === "string") {
                   argsStr = tc.function.arguments;
                   try {
-                    argsObj = JSON.parse(argsStr);
+                    const parsed = JSON.parse(argsStr);
+                    argsObj = typeof parsed === "string" ? { _raw: parsed } : parsed;
                   } catch {
                     argsObj = { _raw: argsStr };
                   }
@@ -683,7 +687,8 @@ class AgentComponent extends BaseComponent {
                 if (typeof tc.arguments === "string") {
                   argsStr = tc.arguments;
                   try {
-                    argsObj = JSON.parse(argsStr);
+                    const parsed = JSON.parse(argsStr);
+                    argsObj = typeof parsed === "string" ? { _raw: parsed } : parsed;
                   } catch {
                     argsObj = { _raw: argsStr };
                   }
@@ -721,7 +726,14 @@ class AgentComponent extends BaseComponent {
               }
               const func = toolCall.function;
               const tcName = func?.name || toolCall.name || "unknown";
-              const tcArgs = func?.arguments ? typeof func.arguments === "string" ? JSON.parse(func.arguments) : func.arguments : toolCall.arguments;
+              const tcArgs = func?.arguments ? typeof func.arguments === "string" ? (() => {
+                const parsed = JSON.parse(func.arguments);
+                if (typeof parsed === "string") {
+                  logger.warn(`[agent.component] Tool "${tcName}" arguments are double-stringified, wrapping in { _raw }`);
+                  return { _raw: parsed };
+                }
+                return parsed;
+              })() : func.arguments : toolCall.arguments;
               hookCtx.currentToolCall = {
                 id: toolCall.id,
                 name: tcName,
@@ -789,11 +801,15 @@ class AgentComponent extends BaseComponent {
                 });
               }
               for (const tc of llmOutput.toolCalls) {
+                const tcInput = typeof tc.function?.arguments === "string" ? (() => {
+                  const parsed = JSON.parse(tc.function.arguments);
+                  return typeof parsed === "string" ? { _raw: parsed } : parsed;
+                })() : tc.arguments || {};
                 assistantParts.push({
                   type: "tool-call",
                   toolCallId: tc.id,
                   toolName: tc.function?.name || tc.name || "unknown",
-                  input: typeof tc.function?.arguments === "string" ? JSON.parse(tc.function.arguments) : tc.arguments || {}
+                  input: tcInput
                 });
               }
               this.pushMessage(hookCtx, {
@@ -952,6 +968,16 @@ class AgentComponent extends BaseComponent {
     }
     logger.info(`Agent aborted: ${agentName}`);
   }
+  abortAll() {
+    for (const key of this.aborted.keys()) {
+      this.aborted.set(key, true);
+    }
+    for (const [key, controller] of this.abortControllers) {
+      controller.abort();
+      logger.debug(`[abortAll] AbortController.abort() called for run: ${key}`);
+    }
+    logger.info(`All agents aborted (${this.abortControllers.size} runs)`);
+  }
   async _buildAdditionInfo(ctx) {
     let additionInfo = ctx.context?.additionInfo || "";
     const currentTaskId = getCurrentTaskId();
@@ -989,7 +1015,7 @@ ${additionInfo}`
       const convertedMessages = messages.map(toLLMMessage);
       logger.debug(`[invokeLLM] Calling LLMComponent.invoke with ${convertedMessages.length} messages`);
       try {
-        const result = await this.llmComponent.invoke({
+        const llmPromise = this.llmComponent.invoke({
           messages: convertedMessages,
           tools: ctx.tools.map((t) => ({
             name: t.name,
@@ -1003,6 +1029,7 @@ ${additionInfo}`
           },
           abortSignal: ctx.context.abort
         });
+        const result = await withTimeout(llmPromise, 120000, "LLM invocation timeout after 120s");
         logger.debug("[invokeLLM] LLMComponent.invoke returned successfully");
         return {
           content: result.output?.content || "",
@@ -1076,11 +1103,22 @@ ${additionInfo}`
         context: toolContext
       };
       let result;
+      const isLongRunningTool = toolName === "delegate_task" || toolName === "stop_task" || toolName === "bash";
       if (this.toolComponent?.execute) {
-        result = await this.toolComponent.execute(request);
+        const toolPromise = this.toolComponent.execute(request);
+        if (isLongRunningTool) {
+          result = await toolPromise;
+        } else {
+          result = await withTimeout(toolPromise, 120000, `Tool '${toolName}' execution timeout after 120s`);
+        }
       } else {
         logger.debug(`[executeTool] No ToolComponent available, executing tool directly`);
-        result = await tool.execute(toolCall.arguments, toolContext);
+        const toolPromise = tool.execute(toolCall.arguments, toolContext);
+        if (isLongRunningTool) {
+          result = await toolPromise;
+        } else {
+          result = await withTimeout(toolPromise, 120000, `Tool '${toolName}' execution timeout after 120s`);
+        }
       }
       this.pushEnvEvent({
         type: "tool.result",