labring
diff --git a/‎packages/service/core/ai/llm/agentCall.ts‎
Lines changed: 8 additions & 2 deletions b/‎packages/service/core/ai/llm/agentCall.ts‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎packages/service/core/workflow/dispatch/ai/agent/constants.ts‎
Lines changed: 16 additions & 36 deletions b/‎packages/service/core/workflow/dispatch/ai/agent/constants.ts‎
Lines changed: 16 additions & 36 deletions
diff --git a/‎packages/service/core/workflow/dispatch/ai/agent/index.ts‎
Lines changed: 129 additions & 21 deletions b/‎packages/service/core/workflow/dispatch/ai/agent/index.ts‎
Lines changed: 129 additions & 21 deletions
@@ -32,7 +32,10 @@ type RunAgentCallProps = {
     name: string;
     avatar: string;
   };
-  handleToolResponse: (e: ChatCompletionMessageToolCall) => Promise<{
+  handleToolResponse: (e: {
+    call: ChatCompletionMessageToolCall;
+    context: ChatCompletionMessageParam[];
+  }) => Promise<{
     response: string;
     usages: ChatNodeUsageType[];
     isEnd: boolean;
@@ -124,7 +127,10 @@ export const runAgentCall = async ({
     let isEndSign = false;
     for await (const tool of toolCalls) {
       // TODO: 加入交互节点处理
-      const { response, usages, isEnd } = await handleToolResponse(tool);
+      const { response, usages, isEnd } = await handleToolResponse({
+        call: tool,
+        context: requestMessages
+      });
 
       if (isEnd) {
         isEndSign = true;
 
@@ -1,58 +1,38 @@
 import type { ChatCompletionTool } from '@fastgpt/global/core/ai/type';
 
-export const getTopAgentDefaultPrompt = () => {
-  return `你是一位Supervisor Agent，具备以下核心能力：
-
-## 核心能力
-1. **计划制定与管理**：根据用户需求制定详细的执行计划，并实时跟踪和调整计划进度
-2. **工具调用编排**：可以调用各种工具来完成特定任务，支持并行和串行工具调用
-3. **上下文理解**：能够理解对话历史、文档内容和当前状态
-4. **自主决策**：根据当前情况和计划进度做出最优决策
-
-## 工作流程
-1. **需求分析**：深入理解用户需求，识别关键目标和约束条件
-2. **计划制定**：使用 plan_agent 工具制定详细的执行计划
-3. **工具编排**：根据计划选择和调用合适的工具
-4. **结果处理**：分析工具返回结果，判断是否满足预期
-5. **计划调整**：根据执行结果动态调整计划
-6. **最终输出**：给出完整、准确的回答
-
-## 特殊指令
+export enum SubAppIds {
+  plan = 'plan_agent',
+  stop = 'stop_agent',
+  model = 'model_agent',
+  fileRead = 'file_read'
+}
+
+export const getTopAgentConstantPrompt = () => {
+  return `## 特殊指令
 - 对于复杂任务，必须先使用 plan_agent 制定计划
 - 在执行过程中如需调整计划，再次调用 plan_agent
 - 始终保持计划的可见性和可追踪性
-- 遇到错误时要有容错和重试机制
-
-请始终保持专业、准确、有条理的回答风格，确保用户能够清楚了解执行进度和结果。`;
-};
-
-export const PlanAgentTool: ChatCompletionTool = {
-  type: 'function',
-  function: {
-    name: 'plan_agent',
-    description:
-      '如果用户的任务非常复杂，可以先使用 plan_agent 制定计划，然后根据计划使用其他工具来完成任务。'
-  }
+- 每次有新的进度完成时，都要调用 plan_agent 更新计划
+- 遇到错误时要有容错和重试机制`;
 };
 
-export const StopAgentId = 'stop_agent';
 export const StopAgentTool: ChatCompletionTool = {
   type: 'function',
   function: {
-    name: StopAgentId,
-    description: '如果完成了所有的任务，可调用次工具。'
+    name: SubAppIds.stop,
+    description: '如果完成了所有的任务，可调用此工具。'
   }
 };
 
-/* 
+/*
   结构：
   [url1,url2,url2]
   [
     {id:1,url: url1},
     {id:2,url: url2}
   ]
 */
-export const getFileReadTool = (urls: string[]): ChatCompletionTool => {
+export const getFileReadTool = (urls?: string[]): ChatCompletionTool => {
   return {
     type: 'function',
     function: {
@@ -64,7 +44,7 @@ export const getFileReadTool = (urls: string[]): ChatCompletionTool => {
           file_path: {
             type: 'string',
             description: '文件ID',
-            enum: urls.map((url, index) => `${index + 1}`)
+            enum: urls?.map((_, index) => `${index + 1}`)
           }
         },
         required: ['file_path']
 
@@ -27,18 +27,25 @@ import {
 import { formatModelChars2Points } from '../../../../../support/wallet/usage/utils';
 import { getHistoryPreview } from '@fastgpt/global/core/chat/utils';
 import {
+  applyDiff,
   filterToolResponseToPreview,
   formatToolResponse,
   getToolNodesByIds,
-  initToolNodes
+  initToolNodes,
+  parseToolArgs
 } from '../utils';
-import { getTopAgentDefaultPrompt, StopAgentId, StopAgentTool } from './constants';
+import { getFileReadTool, getTopAgentConstantPrompt, StopAgentTool, SubAppIds } from './constants';
 import { runWorkflow } from '../..';
-import json5 from 'json5';
 import type { ChatCompletionTool } from '@fastgpt/global/core/ai/type';
 import type { ToolNodeItemType } from './type';
 import { textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils';
 import { sliceStrStartEnd } from '@fastgpt/global/common/string/tools';
+import { transferPlanAgent } from '../sub/plan';
+import { transferModelAgent } from '../sub/model';
+import { PlanAgentTool } from '../sub/plan/constants';
+import { ModelAgentTool } from '../sub/model/constants';
+import { getSubIdsByAgentSystem, parseAgentSystem } from './utils';
+import { getChildAppPreviewNode } from '../../../../../core/app/plugin/controller';
 
 export type DispatchAgentModuleProps = ModuleDispatchProps<{
   [NodeInputKeyEnum.history]?: ChatItemType[];
@@ -81,7 +88,8 @@ export const dispatchRunAgent = async (props: DispatchAgentModuleProps): Promise
       history = 6,
       fileUrlList: fileLinks,
       temperature,
-      aiChatTopP
+      aiChatTopP,
+      planConfig
     }
   } = props;
 
@@ -95,7 +103,8 @@ export const dispatchRunAgent = async (props: DispatchAgentModuleProps): Promise
     }
 
     // Init tool params
-    const toolNodeIds = filterToolNodeIdByEdges({ nodeId, edges: runtimeEdges });
+    // const toolNodeIds = filterToolNodeIdByEdges({ nodeId, edges: runtimeEdges });
+    const toolNodeIds = getSubIdsByAgentSystem(systemPrompt);
     const toolNodes = getToolNodesByIds({ toolNodeIds, runtimeNodes });
     // TODO: 补充系统 agent
     const toolNodesMap = new Map<string, ToolNodeItemType>();
@@ -110,12 +119,14 @@ export const dispatchRunAgent = async (props: DispatchAgentModuleProps): Promise
       };
     };
 
-    const subApps = getSubApps({ toolNodes });
+    const subApps = getSubApps({ toolNodes, urls: fileLinks });
+
+    const combinedSystemPrompt = `${parseAgentSystem({ systemPrompt, toolNodesMap })}\n\n${getTopAgentConstantPrompt()}`;
 
     // TODO: 把 files 加入 query 中。
     const messages: ChatItemType[] = (() => {
       const value: ChatItemType[] = [
-        ...getSystemPrompt_ChatItemType(systemPrompt || getTopAgentDefaultPrompt()),
+        ...getSystemPrompt_ChatItemType(combinedSystemPrompt),
         // Add file input prompt to histories
         ...chatHistories,
         {
@@ -159,15 +170,107 @@ export const dispatchRunAgent = async (props: DispatchAgentModuleProps): Promise
         isAborted: res ? () => res.closed : undefined,
 
         getToolInfo,
-        handleToolResponse: async (call) => {
+        handleToolResponse: async ({ call, context }) => {
           const toolId = call.function.name;
 
-          if (toolId === StopAgentId) {
+          if (toolId === SubAppIds.stop) {
             return {
               response: '',
               usages: [],
               isEnd: true
             };
+          } else if (toolId === SubAppIds.plan) {
+            const planModel = planConfig?.model ?? model;
+            const { instruction } = parseToolArgs<{ instruction: string }>(call.function.arguments);
+
+            const { content, inputTokens, outputTokens } = await transferPlanAgent({
+              model: planModel,
+              instruction,
+              histories: GPTMessages2Chats({
+                messages: context.slice(1, -1),
+                getToolInfo
+              }),
+              onStreaming({ text, fullText }) {
+                //TODO: 需要一个新的 plan sse event
+                if (!fullText) return;
+                workflowStreamResponse?.({
+                  event: SseResponseEventEnum.toolResponse,
+                  data: {
+                    tool: {
+                      id: call.id,
+                      toolName: '',
+                      toolAvatar: '',
+                      params: '',
+                      response: sliceStrStartEnd(fullText, 5000, 5000)
+                    }
+                  }
+                });
+              }
+            });
+
+            const lastPlanCallIndex = context
+              .slice(0, -1)
+              .findLastIndex(
+                (c) =>
+                  c.role === 'assistant' &&
+                  c.tool_calls?.some((tc) => tc.function?.name === SubAppIds.plan)
+              );
+            const originalContent =
+              lastPlanCallIndex !== -1 ? (context[lastPlanCallIndex + 1].content as string) : '';
+
+            const applyedContent = applyDiff({
+              original: originalContent,
+              patch: content
+            });
+
+            // workflowStreamResponse?.({
+            //   event: SseResponseEventEnum.toolResponse,
+            //   data: {
+            //     tool: {
+            //       id: call.id,
+            //       toolName: '',
+            //       toolAvatar: '',
+            //       params: '',
+            //       response: sliceStrStartEnd(applyedContent, 5000, 5000)
+            //     }
+            //   }
+            // });
+
+            return {
+              response: content,
+              usages: [],
+              isEnd: false
+            };
+          } else if (toolId === SubAppIds.model) {
+            const { systemPrompt, task } = parseToolArgs<{ systemPrompt: string; task: string }>(
+              call.function.arguments
+            );
+
+            const { content, inputTokens, outputTokens } = await transferModelAgent({
+              model,
+              systemPrompt,
+              task,
+              onStreaming({ text, fullText }) {
+                if (!fullText) return;
+                workflowStreamResponse?.({
+                  event: SseResponseEventEnum.toolResponse,
+                  data: {
+                    tool: {
+                      id: call.id,
+                      toolName: '',
+                      toolAvatar: '',
+                      params: '',
+                      response: sliceStrStartEnd(fullText, 5000, 5000)
+                    }
+                  }
+                });
+              }
+            });
+            return {
+              response: content,
+              usages: [],
+              isEnd: false
+            };
           }
 
           const node = toolNodesMap.get(toolId);
@@ -179,14 +282,7 @@ export const dispatchRunAgent = async (props: DispatchAgentModuleProps): Promise
             };
           }
 
-          const startParams = (() => {
-            try {
-              return json5.parse(call.function.arguments);
-            } catch {
-              return {};
-            }
-          })();
-
+          const startParams = parseToolArgs(call.function.arguments);
           initToolNodes(runtimeNodes, [node.nodeId], startParams);
           const { toolResponses, flowUsages, flowResponses } = await runWorkflow({
             ...props,
@@ -323,9 +419,20 @@ export const dispatchRunAgent = async (props: DispatchAgentModuleProps): Promise
   }
 };
 
-const getSubApps = ({ toolNodes }: { toolNodes: ToolNodeItemType[] }): ChatCompletionTool[] => {
+const getSubApps = ({
+  toolNodes,
+  urls
+}: {
+  toolNodes: ToolNodeItemType[];
+  urls?: string[];
+}): ChatCompletionTool[] => {
   // System Tools: Plan Agent, stop sign, model agent.
-  const systemTools: ChatCompletionTool[] = [];
+  const systemTools: ChatCompletionTool[] = [
+    PlanAgentTool,
+    StopAgentTool,
+    ModelAgentTool,
+    getFileReadTool(urls)
+  ];
 
   // Node Tools
   const nodeTools = toolNodes.map<ChatCompletionTool>((item: ToolNodeItemType) => {
@@ -334,7 +441,7 @@ const getSubApps = ({ toolNodes }: { toolNodes: ToolNodeItemType[] }): ChatCompl
         type: 'function',
         function: {
           name: item.nodeId,
-          description: item.intro || item.name,
+          description: `调用${item.flowNodeType}:${item.name || item.intro}完成任务`,
           parameters: item.jsonSchema
         }
       };
@@ -357,7 +464,7 @@ const getSubApps = ({ toolNodes }: { toolNodes: ToolNodeItemType[] }): ChatCompl
       type: 'function',
       function: {
         name: item.nodeId,
-        description: item.toolDescription || item.intro || item.name,
+        description: `调用${item.flowNodeType}:${item.name || item.toolDescription || item.intro}完成任务`,
         parameters: {
           type: 'object',
           properties,
@@ -366,6 +473,7 @@ const getSubApps = ({ toolNodes }: { toolNodes: ToolNodeItemType[] }): ChatCompl
       }
     };
   });
+  console.dir(nodeTools, { depth: null });
 
   return [...systemTools, ...nodeTools];
 };