@ai-setting/roy-agent-core 1.5.80 → 1.5.83

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

@@ -11,7 +11,7 @@ import {
 import {
   TemplateResolver,
   init_template_resolver
-} from "./roy-agent-core-99j4w3fx.js";
+} from "./roy-agent-core-gb9gbkc3.js";
 import {
   SkillNode,
   ToolNode,
@@ -19,7 +19,7 @@ import {
   init_skill_node,
   init_tool_node,
   init_workflow_node
-} from "./roy-agent-core-ajx32wzj.js";
+} from "./roy-agent-core-j754zgb4.js";
 import {
   WorkflowError,
   createWorkflowEvent,

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

@@ -393,65 +393,11 @@ init_logger();
 init_decorator();
 var logger2 = createLogger("AutoTaskPlugin");
 function createAutoTaskPlugin(config) {
-  const threshold = config?.threshold ?? 30;
+  const threshold = config?.threshold ?? 20;
   const agentName = config?.agentName ?? "default";
-  const llmRef = config?.llmComponent ?? null;
-  const toolRef = config?.toolComponent ?? null;
-  const toolChoiceModel = config?.model;
-  const subagentType = config?.subagentType ?? "roy";
+  const agentComponent = config?.agentComponent ?? null;
+  const subagentType = config?.subagentType ?? "task-agent";
   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})`);
@@ -468,87 +414,53 @@ function createAutoTaskPlugin(config) {
       }
       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)}...)`);
+      if (!agentComponent || typeof agentComponent.run !== "function") {
+        logger2.warn(`[AutoTaskPlugin] agentComponent not provided or invalid (session=${sid.slice(0, 12)}...)`);
         return { continue: true };
       }
-      const msgs = [];
-      for (const m of ctx.messages) {
+      let userQuery = "";
+      for (let i = ctx.messages.length - 1;i >= 0; i--) {
+        const m = ctx.messages[i];
         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 });
-          }
+          userQuery = typeof m.content === "string" ? m.content : JSON.stringify(m.content);
+          break;
         }
       }
-      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: []
+      if (!userQuery) {
+        userQuery = "分析项目结构并执行相关任务";
+      }
+      logger2.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 beforeMsg = `
 
-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);
+---
+⏳ **${subagentType} 正在执行**: ${shortDesc}（等待结果...）`;
+      if (ctx.toolResult?.result?.output !== undefined) {
+        ctx.toolResult.result.output += beforeMsg;
       }
-      if (!args) {
-        logger2.warn(`[AutoTaskPlugin] Failed to get delegate_task args after retry (session=${sid.slice(0, 12)}...)`);
-        return { continue: true };
+      let taskAgentFinalText = "";
+      try {
+        const taskAgentResult = await agentComponent.run(subagentType, userQuery, {
+          sessionId: sid,
+          traceId,
+          persistSession: false
+        });
+        taskAgentFinalText = taskAgentResult?.finalText || "";
+        logger2.info(`[AutoTaskPlugin] task-agent completed (session=${sid.slice(0, 12)}..., finalTextLength=${taskAgentFinalText.length})`);
+      } catch (err) {
+        logger2.error(`[AutoTaskPlugin] task-agent failed: ${err instanceof Error ? err.message : String(err)}`);
+        taskAgentFinalText = `❌ **${subagentType} 执行失败**: ${err instanceof Error ? err.message : String(err)}`;
       }
-      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";
+      if (taskAgentFinalText && ctx.toolResult?.result?.output !== undefined) {
         const injection = `
 
 ---
-\uD83D\uDE80 **Task Delegated**: 已通过 delegate_task 委托给子 agent（${subagentType}）在后台运行。
-
-⏳ 请等待后台任务运行结果通知，无需额外操作。
-
-\uD83D\uDCCB 后台进程 ID: \`${bgProcessId}\`
+${taskAgentFinalText}
 ---`;
         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] task-agent finalText injected (session=${sid.slice(0, 12)}...)`);
+      } else if (!ctx.toolResult?.result?.output) {
+        logger2.warn(`[AutoTaskPlugin] toolResult unavailable for injection`);
       }
       return { continue: true };
     } catch (err) {
@@ -556,15 +468,15 @@ Call delegate_task now.`
       return { continue: true };
     }
   }
-  const execute = wrapFunction(executeImpl, "plugin.auto-task.tool-call-hook", {
+  const execute = wrapFunction(executeImpl, "plugin.auto-task.launch-agent", {
     recordParams: false,
     recordResult: true,
     log: true
   });
   return {
     name: "AutoTaskPlugin",
-    version: "3.0.0",
-    description: "ReAct iteration 达到阈值时通过 LLM 生成 delegate_task 入参并直接调用",
+    version: "4.5.0",
+    description: "ReAct iteration 达到阈值时 await task-agent 执行并提取 delegate_task 结果注入 tool result",
     hooks: [
       { point: "agent:after.tool", priority: 50 }
     ],

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

@@ -66,7 +66,8 @@ var UpdateTaskToolSchema = z.object({
   due_date: z.string().optional(),
   tags: z.array(z.string()).optional(),
   project_path: z.string().optional().describe("Project path, identifies which project this task belongs to"),
-  context: z.string().optional().describe("Task context information for storing additional context")
+  context: z.string().optional().describe("Task context information for storing additional context"),
+  parent_task_id: z.union([z.number(), z.null()]).optional().describe("Parent task ID (set to null to make it a root task)")
 });
 var DeleteTaskToolSchema = z.object({
   task_id: z.number().describe("Task ID")
@@ -143,8 +144,12 @@ function createTaskTool(taskComponent) {
          then create the child task with that parent_task_id.
       
       **Example:**
-      - First: task_list(depth=0) → find root task #619 "roy-agent"
-      - Then: task_create(title="New feature", parent_task_id=619, ...)
+      - First: task_list(depth=0) → find an appropriate root task for your project
+        (e.g. one whose title matches your project name). Use the returned root task's
+        id as \`parent_task_id\` — do NOT hardcode a specific id; the root task id varies
+        across deployments and resets.
+      - Then: task_create(title="New feature", parent_task_id=<root_task_id>, ...)
+        where \`<root_task_id>\` is the id returned by task_list, NOT a hardcoded number.
     `,
     parameters: CreateTaskToolSchema,
     execute: async (args, ctx) => {
@@ -442,6 +447,22 @@ function batchDeleteTaskTool(taskComponent) {
 init_env_context();
 init_logger();
 var logger2 = createLogger("tool:update-task");
+async function detectCycle(taskComponent, taskId, newParentId) {
+  const visited = new Set;
+  let currentId = newParentId;
+  while (currentId !== null && currentId !== undefined) {
+    if (currentId === taskId)
+      return true;
+    if (visited.has(currentId))
+      break;
+    visited.add(currentId);
+    const currentTask = await taskComponent.getTask(currentId);
+    if (!currentTask)
+      break;
+    currentId = currentTask.parent_task_id;
+  }
+  return false;
+}
 function updateTaskTool(taskComponent) {
   return {
     name: "task_update",
@@ -451,6 +472,17 @@ function updateTaskTool(taskComponent) {
       const params = UpdateTaskToolSchema.parse(args);
       const sessionId = ctx.session_id || "unknown";
       try {
+        if (params.parent_task_id !== undefined && params.parent_task_id !== null) {
+          const hasCycle = await detectCycle(taskComponent, params.task_id, params.parent_task_id);
+          if (hasCycle) {
+            return {
+              success: false,
+              output: "",
+              error: `Circular reference detected: setting parent_task_id to ${params.parent_task_id} for task #${params.task_id} would create a cycle`,
+              metadata: { execution_time_ms: 0 }
+            };
+          }
+        }
         const task = await taskComponent.updateTask(params.task_id, {
           title: params.title,
           description: params.description,
@@ -463,7 +495,8 @@ function updateTaskTool(taskComponent) {
           due_date: params.due_date,
           tags: params.tags,
           project_path: params.project_path,
-          context: params.context
+          context: params.context,
+          parent_task_id: params.parent_task_id
         });
         if (!task) {
           return {