diff --git a/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/AIEmployeeChatProvider.tsx b/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/AIEmployeeChatProvider.tsx
deleted file mode 100644
index 3f4d6aa565..0000000000
--- a/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/AIEmployeeChatProvider.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-import React, { useContext } from 'react';
-import { withDynamicSchemaProps } from '@nocobase/client';
-import { createContext } from 'react';
-import { AttachmentProps } from './types';
-
-export type AIEmployeeChatContext = {
-  attachments?: Record<string, AttachmentProps>;
-  actions?: Record<
-    string,
-    {
-      title: string;
-      description?: string;
-      icon?: React.ReactNode;
-      action: (aiMessage: string) => void;
-    }
-  >;
-  variableScopes?: any;
-};
-
-export const AIEmployeeChatContext = createContext<AIEmployeeChatContext>({} as AIEmployeeChatContext);
-
-export const AIEmployeeChatProvider: React.FC<AIEmployeeChatContext> = withDynamicSchemaProps((props) => {
-  return <AIEmployeeChatContext.Provider value={props}>{props.children}</AIEmployeeChatContext.Provider>;
-});
-
-export const useAIEmployeeChatContext = () => {
-  return useContext(AIEmployeeChatContext);
-};
diff --git a/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/chatbox/ChatMessagesProvider.tsx b/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/chatbox/ChatMessagesProvider.tsx
index abc472634c..dff79451fa 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/chatbox/ChatMessagesProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/chatbox/ChatMessagesProvider.tsx
@@ -12,9 +12,11 @@ import { AIEmployee, Message, ResendOptions, SendOptions } from '../types'; // 
 import React, { useState } from 'react';
 import { uid } from '@formily/shared';
 import { useT } from '../../locale';
-import { useAPIClient, useRequest } from '@nocobase/client';
+import { useAPIClient, usePlugin, useRequest } from '@nocobase/client';
 import { useChatConversations } from './ChatConversationsProvider';
 import { useLoadMoreObserver } from './useLoadMoreObserver';
+import { useAISelectionContext } from '../selector/AISelectorProvider';
+import PluginAIClient from '../..';
 
 interface ChatMessagesContextValue {
   messages: Message[];
@@ -41,6 +43,8 @@ export const useChatMessages = () => useContext(ChatMessagesContext);
 export const ChatMessagesProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
   const t = useT();
   const api = useAPIClient();
+  const { ctx } = useAISelectionContext();
+  const plugin = usePlugin('ai') as PluginAIClient;
   const [messages, setMessages] = useState<Message[]>([]);
   const [responseLoading, setResponseLoading] = useState(false);
   const { currentConversation } = useChatConversations();
@@ -101,11 +105,15 @@ export const ChatMessagesProvider: React.FC<{ children: React.ReactNode }> = ({
     });
   };
 
-  const processStreamResponse = async (stream: any) => {
+  const processStreamResponse = async (stream: any, sessionId: string, aiEmployee: AIEmployee) => {
     const reader = stream.getReader();
     const decoder = new TextDecoder();
     let result = '';
     let error = false;
+    let tool: {
+      name: string;
+      args: any;
+    };
 
     try {
       // eslint-disable-next-line no-constant-condition
@@ -123,22 +131,42 @@ export const ChatMessagesProvider: React.FC<{ children: React.ReactNode }> = ({
         for (const line of lines) {
           try {
             const data = JSON.parse(line.replace(/^data: /, ''));
-            if (data.body) content += data.body;
-            if (data.type === 'error') error = true;
+            if (data.body && typeof data.body === 'string') {
+              content += data.body;
+            }
+            if (data.type === 'error') {
+              error = true;
+            }
+            if (data.type === 'tool') {
+              tool = data.body;
+            }
           } catch (e) {
             console.error('Error parsing stream data:', e);
           }
         }
 
         result += content;
-        updateLastMessage((last) => ({
-          ...last,
-          content: {
-            ...last.content,
-            content: (last.content as any).content + content,
-          },
-          loading: false,
-        }));
+        if (result) {
+          updateLastMessage((last) => ({
+            ...last,
+            content: {
+              ...last.content,
+              content: (last.content as any).content + content,
+            },
+            loading: false,
+          }));
+        }
+        if (tool) {
+          console.log(ctx, tool);
+          const t = plugin.aiManager.tools.get(tool.name);
+          if (t) {
+            await t.invoke(ctx, tool.args);
+            callTool({
+              sessionId,
+              aiEmployee,
+            });
+          }
+        }
       }
     } catch (err) {
       console.error(err);
@@ -225,7 +253,7 @@ export const ChatMessagesProvider: React.FC<{ children: React.ReactNode }> = ({
         return;
       }
 
-      await processStreamResponse(sendRes.data);
+      await processStreamResponse(sendRes.data, sessionId, aiEmployee);
       messagesServiceRef.current.run(sessionId);
     } catch (err) {
       if (err.name === 'CanceledError') {
@@ -272,7 +300,7 @@ export const ChatMessagesProvider: React.FC<{ children: React.ReactNode }> = ({
         return;
       }
 
-      await processStreamResponse(sendRes.data);
+      await processStreamResponse(sendRes.data, sessionId, aiEmployee);
       messagesServiceRef.current.run(sessionId);
     } catch (err) {
       if (err.name === 'CanceledError') {
@@ -302,30 +330,33 @@ export const ChatMessagesProvider: React.FC<{ children: React.ReactNode }> = ({
     setResponseLoading(false);
   }, [currentConversation]);
 
-  const callTool = useCallback(async ({ sessionId, messageId, aiEmployee }) => {
-    addMessage({
-      key: uid(),
-      role: aiEmployee.username,
-      content: { type: 'text', content: '' },
-      loading: true,
-    });
-
-    try {
-      const sendRes = await api.request({
-        url: 'aiConversations:callTool',
-        method: 'POST',
-        headers: { Accept: 'text/event-stream' },
-        data: { sessionId, messageId },
-        responseType: 'stream',
-        adapter: 'fetch',
+  const callTool = useCallback(
+    async ({ sessionId, messageId, aiEmployee }: { sessionId: string; messageId?: string; aiEmployee: AIEmployee }) => {
+      addMessage({
+        key: uid(),
+        role: aiEmployee.username,
+        content: { type: 'text', content: '' },
+        loading: true,
       });
 
-      await processStreamResponse(sendRes.data);
-      messagesServiceRef.current.run(sessionId);
-    } catch (err) {
-      throw err;
-    }
-  }, []);
+      try {
+        const sendRes = await api.request({
+          url: 'aiConversations:callTool',
+          method: 'POST',
+          headers: { Accept: 'text/event-stream' },
+          data: { sessionId, messageId },
+          responseType: 'stream',
+          adapter: 'fetch',
+        });
+
+        await processStreamResponse(sendRes.data, sessionId, aiEmployee);
+        messagesServiceRef.current.run(sessionId);
+      } catch (err) {
+        throw err;
+      }
+    },
+    [],
+  );
 
   const loadMoreMessages = useCallback(async () => {
     const messagesService = messagesServiceRef.current;
diff --git a/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/chatbox/ToolCard.tsx b/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/chatbox/ToolCard.tsx
index 48cbf15621..9e8fb76a03 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/chatbox/ToolCard.tsx
+++ b/packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/chatbox/ToolCard.tsx
@@ -20,13 +20,14 @@ import { Schema } from '@formily/react';
 import PluginAIClient from '../..';
 import { useChatMessages } from './ChatMessagesProvider';
 import { useChatBoxContext } from './ChatBoxContext';
+import { useAISelectionContext } from '../selector/AISelectorProvider';
 
 const useDefaultAction = (messageId: string) => {
   const currentEmployee = useChatBoxContext('currentEmployee');
   const { currentConversation } = useChatConversations();
   const { callTool } = useChatMessages();
   return {
-    callAction: () => {
+    invoke: () => {
       callTool({
         sessionId: currentConversation,
         messageId,
@@ -42,16 +43,20 @@ const CallButton: React.FC<{
   args: any;
 }> = ({ name, messageId, args }) => {
   const t = useT();
+  const { ctx } = useAISelectionContext();
   const plugin = usePlugin('ai') as PluginAIClient;
   const tool = plugin.aiManager.tools.get(name);
-  const useAction = tool?.useAction || useDefaultAction;
-  const { callAction } = useAction(messageId);
+  const { invoke: invokeDefault } = useDefaultAction(messageId);
+  const invoke = async () => {
+    await tool?.invoke?.(ctx, args);
+    invokeDefault();
+  };
 
   return (
     <Button
       onClick={(e) => {
         e.stopPropagation();
-        callAction(args);
+        invoke();
       }}
       variant="link"
       color="primary"
diff --git a/packages/plugins/@nocobase/plugin-ai/src/client/index.tsx b/packages/plugins/@nocobase/plugin-ai/src/client/index.tsx
index ec817ed2af..63fcdad76b 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-ai/src/client/index.tsx
@@ -23,10 +23,6 @@ import { useAISelectionContext } from './ai-employees/selector/AISelectorProvide
 import { googleGenAIProviderOptions } from './llm-providers/google-genai';
 import { AIEmployeeTrigger } from './workflow/triggers/ai-employee';
 const { AIEmployeesProvider } = lazy(() => import('./ai-employees/AIEmployeesProvider'), 'AIEmployeesProvider');
-const { AIEmployeeChatProvider } = lazy(
-  () => import('./ai-employees/AIEmployeeChatProvider'),
-  'AIEmployeeChatProvider',
-);
 const { Employees } = lazy(() => import('./ai-employees/manager/Employees'), 'Employees');
 const { LLMServices } = lazy(() => import('./llm-services/LLMServices'), 'LLMServices');
 const { MessagesSettings } = lazy(() => import('./chat-settings/Messages'), 'MessagesSettings');
@@ -49,7 +45,6 @@ export class PluginAIClient extends Plugin {
     this.app.use(AIEmployeesProvider);
     this.app.addComponents({
       AIEmployeeButton,
-      AIEmployeeChatProvider,
       AIContextCollector,
       CardItem: withAISelectable(CardItem, {
         selectType: 'blocks',
@@ -101,21 +96,18 @@ export class PluginAIClient extends Plugin {
       Component: MessagesSettings,
     });
     this.aiManager.registerTool('formFiller', {
-      useAction() {
-        const { ctx } = useAISelectionContext();
-        return {
-          callAction: (params) => {
-            const { form: uid, data } = params;
-            if (!uid || !data) {
-              return;
-            }
-            const form = ctx[uid]?.form;
-            if (!form) {
-              return;
-            }
-            form.values = data;
-          },
-        };
+      invoke: (ctx, params) => {
+        const { form: uid, data } = params;
+        console.log(params);
+        if (!uid || !data) {
+          return;
+        }
+        const form = ctx[uid]?.form;
+        if (!form) {
+          return;
+        }
+        form.values = data;
+        console.log('====', form.values);
       },
     });
 
diff --git a/packages/plugins/@nocobase/plugin-ai/src/client/llm-providers/google-genai/MessageRenderer.tsx b/packages/plugins/@nocobase/plugin-ai/src/client/llm-providers/google-genai/MessageRenderer.tsx
index 259db4083a..e6c37cbc58 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/client/llm-providers/google-genai/MessageRenderer.tsx
+++ b/packages/plugins/@nocobase/plugin-ai/src/client/llm-providers/google-genai/MessageRenderer.tsx
@@ -42,9 +42,7 @@ export const MessageRenderer: React.FC<{
       }}
     >
       {typeof content === 'string' && <Markdown markdown={content} />}
-      {msg.tool_calls?.length && !msg.metadata?.autoCallTool && (
-        <ToolCard tools={msg.tool_calls} messageId={msg.messageId} />
-      )}
+      {msg.tool_calls?.length && <ToolCard tools={msg.tool_calls} messageId={msg.messageId} />}
     </div>
   );
 };
diff --git a/packages/plugins/@nocobase/plugin-ai/src/client/manager/ai-manager.ts b/packages/plugins/@nocobase/plugin-ai/src/client/manager/ai-manager.ts
index f749377963..e8334d5998 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/client/manager/ai-manager.ts
+++ b/packages/plugins/@nocobase/plugin-ai/src/client/manager/ai-manager.ts
@@ -21,9 +21,7 @@ export type LLMProviderOptions = {
 };
 
 export type ToolOptions = {
-  useAction: () => {
-    callAction: (params: any) => void | Promise<void>;
-  };
+  invoke: (ctx: any, params: any) => void | Promise<void>;
 };
 
 export class AIManager {
diff --git a/packages/plugins/@nocobase/plugin-ai/src/server/llm-providers/google-genai.ts b/packages/plugins/@nocobase/plugin-ai/src/server/llm-providers/google-genai.ts
index 90675f6cfc..551e42225c 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/server/llm-providers/google-genai.ts
+++ b/packages/plugins/@nocobase/plugin-ai/src/server/llm-providers/google-genai.ts
@@ -10,6 +10,7 @@
 import { ChatGoogleGenerativeAI } from '@langchain/google-genai';
 import { LLMProvider } from './provider';
 import axios from 'axios';
+import { Model } from '@nocobase/database';
 
 export class GoogleGenAIProvider extends LLMProvider {
   declare chatModel: ChatGoogleGenerativeAI;
@@ -62,6 +63,40 @@ export class GoogleGenAIProvider extends LLMProvider {
       return { code: 500, errMsg: e.message };
     }
   }
+
+  parseResponseMessage(message: Model) {
+    const { content: rawContent, messageId, metadata, role, toolCalls } = message;
+    const autoCallTool = metadata?.autoCallTool;
+    const content = {
+      ...rawContent,
+      messageId,
+      metadata,
+    };
+
+    if (!autoCallTool && toolCalls) {
+      content.tool_calls = toolCalls;
+    }
+
+    if (Array.isArray(content.content) && autoCallTool) {
+      const messages = content.content.filter((msg) => msg.type !== 'functionCaller');
+      const hasText = messages.some((msg) => msg.type === 'text');
+
+      if (!hasText && toolCalls?.length) {
+        messages.unshift({
+          type: 'text',
+          text: 'I’m trying to use my skills to complete the task.',
+        });
+      }
+
+      content.content = messages;
+    }
+
+    return {
+      key: messageId,
+      content,
+      role,
+    };
+  }
 }
 
 export const googleGenAIProviderOptions = {
diff --git a/packages/plugins/@nocobase/plugin-ai/src/server/llm-providers/provider.ts b/packages/plugins/@nocobase/plugin-ai/src/server/llm-providers/provider.ts
index 8e099f3054..25df9d9ee9 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/server/llm-providers/provider.ts
+++ b/packages/plugins/@nocobase/plugin-ai/src/server/llm-providers/provider.ts
@@ -11,6 +11,8 @@ import { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import axios from 'axios';
 import { parseMessages } from './handlers/parse-messages';
 import { Application } from '@nocobase/server';
+import { Model } from '@nocobase/database';
+import { parseResponseMessage } from '../utils';
 
 export abstract class LLMProvider {
   serviceOptions: Record<string, any>;
@@ -27,7 +29,7 @@ export abstract class LLMProvider {
 
   constructor(opts: {
     app: Application;
-    serviceOptions: any;
+    serviceOptions?: any;
     chatOptions?: {
       messages?: any[];
       tools?: any[];
@@ -97,4 +99,8 @@ export abstract class LLMProvider {
       return { code: 500, errMsg: e.message };
     }
   }
+
+  parseResponseMessage(message: Model) {
+    return parseResponseMessage(message);
+  }
 }
diff --git a/packages/plugins/@nocobase/plugin-ai/src/server/manager/ai-manager.ts b/packages/plugins/@nocobase/plugin-ai/src/server/manager/ai-manager.ts
index 0371c7a8f1..4f52ad9b03 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/server/manager/ai-manager.ts
+++ b/packages/plugins/@nocobase/plugin-ai/src/server/manager/ai-manager.ts
@@ -13,6 +13,7 @@ import { Registry } from '@nocobase/utils';
 import { ZodObject } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
 import PluginAIServer from '../plugin';
+import { Context } from '@nocobase/actions';
 
 export type LLMProviderOptions = {
   title: string;
@@ -27,10 +28,11 @@ export type LLMProviderOptions = {
 interface BaseToolProps {
   title: string;
   description: string;
+  execution?: 'frontend' | 'backend';
   name?: string;
   schema?: any;
-  invoke?: (
-    plugin: PluginAIServer,
+  invoke: (
+    ctx: Context,
     args: Record<string, any>,
   ) => Promise<{
     status: 'success' | 'error';
@@ -107,6 +109,7 @@ export class AIManager {
     } else {
       result.invoke = tool.invoke;
       result.schema = processSchema(tool.schema);
+      result.execution = tool.execution;
     }
 
     return result;
diff --git a/packages/plugins/@nocobase/plugin-ai/src/server/resource/aiConversations.ts b/packages/plugins/@nocobase/plugin-ai/src/server/resource/aiConversations.ts
index 4647c9a630..10d4e721b2 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/server/resource/aiConversations.ts
+++ b/packages/plugins/@nocobase/plugin-ai/src/server/resource/aiConversations.ts
@@ -12,6 +12,7 @@ import PluginAIServer from '../plugin';
 import { Model } from '@nocobase/database';
 import { concat } from '@langchain/core/utils/stream';
 import { LLMProvider } from '../../../server';
+import { parseResponseMessage } from '../utils';
 
 async function parseUISchema(ctx: Context, content: string) {
   const regex = /\{\{\$nUISchema\.([^}]+)\}\}/g;
@@ -58,7 +59,7 @@ async function formatMessages(ctx: Context, messages: any[]) {
       formattedMessages.push({
         role: 'tool',
         content,
-        tool_call_id: msg.toolCalls?.id,
+        tool_call_id: msg.metadata?.toolCall?.id,
       });
       continue;
     }
@@ -222,7 +223,7 @@ async function processChatStream(
   }
 
   if (gathered?.tool_calls?.length && aiEmployee.skillSettings?.autoCall) {
-    await callTool(ctx, gathered.tool_calls[0], sessionId, aiEmployee);
+    await callTool(ctx, gathered.tool_calls[0], sessionId, aiEmployee, true);
   }
 
   ctx.res.end();
@@ -273,14 +274,21 @@ async function callTool(
   },
   sessionId: string,
   aiEmployee: Model,
+  autoCall = false,
 ) {
   const plugin = ctx.app.pm.get('ai') as PluginAIServer;
   try {
     const tool = await plugin.aiManager.getTool(toolCall.name);
     if (!tool) {
       sendErrorResponse(ctx, 'Tool not found');
+      return;
     }
-    const result = await tool.invoke(plugin, toolCall.args);
+    if (tool.execution === 'frontend' && autoCall) {
+      ctx.res.write(`data: ${JSON.stringify({ type: 'tool', body: toolCall })}\n\n`);
+      ctx.res.end();
+      return;
+    }
+    const result = await tool.invoke(ctx, toolCall.args);
     if (result.status === 'error') {
       sendErrorResponse(ctx, result.content);
     }
@@ -303,11 +311,11 @@ async function callTool(
           type: 'text',
           content: result.content,
         },
-        toolCalls: toolCall,
         metadata: {
           model,
           provider: service.provider,
           autoCallTool: aiEmployee.skillSettings?.autoCall,
+          toolCall,
         },
       },
     });
@@ -399,6 +407,7 @@ export default {
     },
 
     async getMessages(ctx: Context, next: Next) {
+      const plugin = ctx.app.pm.get('ai') as PluginAIServer;
       const userId = ctx.auth?.user.id;
       if (!userId) {
         return ctx.throw(403);
@@ -444,19 +453,15 @@ export default {
 
       ctx.body = {
         rows: data.map((row: Model) => {
-          const content = {
-            ...row.content,
-            messageId: row.messageId,
-            metadata: row.metadata,
-          };
-          if (!row.metadata?.autoCallTool && row.toolCalls) {
-            content.tool_calls = row.toolCalls;
+          const providerOptions = plugin.aiManager.llmProviders.get(row.metadata?.provider);
+          if (!providerOptions) {
+            return parseResponseMessage(row);
           }
-          return {
-            key: row.messageId,
-            content,
-            role: row.role,
-          };
+          const Provider = providerOptions.provider;
+          const provider = new Provider({
+            app: ctx.app,
+          });
+          return provider.parseResponseMessage(row);
         }),
         hasMore,
         cursor: newCursor,
@@ -536,7 +541,7 @@ export default {
         const { provider, model, service } = await getLLMService(ctx, employee, formattedMessages);
         const { stream, signal } = await prepareChatStream(ctx, sessionId, provider);
         await processChatStream(ctx, stream, sessionId, {
-          aiEmployee,
+          aiEmployee: employee,
           signal,
           model,
           provider: service.provider,
@@ -651,8 +656,9 @@ export default {
       setupSSEHeaders(ctx);
 
       const { sessionId, messageId } = ctx.action.params.values || {};
-      if (!sessionId || !messageId) {
-        sendErrorResponse(ctx, 'sessionId and messageId are required');
+      if (!sessionId) {
+        sendErrorResponse(ctx, 'sessionId is required');
+        return next();
       }
       try {
         const conversation = await ctx.db.getRepository('aiConversations').findOne({
@@ -664,16 +670,31 @@ export default {
         });
         if (!conversation) {
           sendErrorResponse(ctx, 'conversation not found');
+          return next();
         }
         const employee = conversation.aiEmployee;
-        const message = await ctx.db.getRepository('aiConversations.messages', sessionId).findOne({
-          filter: {
-            messageId,
-          },
-        });
+        let message: Model;
+        if (messageId) {
+          message = await ctx.db.getRepository('aiConversations.messages', sessionId).findOne({
+            filter: {
+              messageId,
+            },
+          });
+        } else {
+          message = await ctx.db.getRepository('aiConversations.messages', sessionId).findOne({
+            sort: ['-messageId'],
+          });
+        }
+
+        if (!message) {
+          sendErrorResponse(ctx, 'message not found');
+          return next();
+        }
+
         const tools = message.toolCalls;
         if (!tools?.length) {
           sendErrorResponse(ctx, 'No tool calls found');
+          return next();
         }
         await callTool(ctx, tools[0], sessionId, employee);
       } catch (err) {
diff --git a/packages/plugins/@nocobase/plugin-ai/src/server/tools/form-fillter.ts b/packages/plugins/@nocobase/plugin-ai/src/server/tools/form-fillter.ts
index afd5075993..78645238ac 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/server/tools/form-fillter.ts
+++ b/packages/plugins/@nocobase/plugin-ai/src/server/tools/form-fillter.ts
@@ -13,8 +13,15 @@ import { ToolOptions } from '../manager/ai-manager';
 export const formFillter: ToolOptions = {
   title: '{{t("Form filler")}}',
   description: '{{t("Fill the form with the given content")}}',
+  execution: 'frontend',
   schema: z.object({
     form: z.string().describe('The UI Schema ID of the target form to be filled.'),
     data: z.record(z.any()).describe("Structured data matching the form's JSON Schema, to be assigned to form.values."),
   }),
+  invoke: async () => {
+    return {
+      status: 'success',
+      content: 'I have filled the form with the provided data.',
+    };
+  },
 };
diff --git a/packages/plugins/@nocobase/plugin-ai/src/server/tools/workflow-caller.ts b/packages/plugins/@nocobase/plugin-ai/src/server/tools/workflow-caller.ts
index 2bda7f2211..d1b9a7fd8b 100644
--- a/packages/plugins/@nocobase/plugin-ai/src/server/tools/workflow-caller.ts
+++ b/packages/plugins/@nocobase/plugin-ai/src/server/tools/workflow-caller.ts
@@ -11,6 +11,7 @@ import { ToolOptions } from '../manager/ai-manager';
 import { z } from 'zod';
 import PluginAIServer from '../plugin';
 import PluginWorkflowServer, { Processor, EXECUTION_STATUS } from '@nocobase/plugin-workflow';
+import { Context } from '@nocobase/actions';
 
 interface ParameterConfig {
   name: string;
@@ -81,8 +82,8 @@ const buildSchema = (config: ToolConfig): z.ZodObject<any> => {
   return schema.describe(config.description || '');
 };
 
-const invoke = async (plugin: PluginAIServer, workflow: Workflow, args: Record<string, any>) => {
-  const workflowPlugin = plugin.app.pm.get('workflow') as PluginWorkflowServer;
+const invoke = async (ctx: Context, workflow: Workflow, args: Record<string, any>) => {
+  const workflowPlugin = ctx.app.pm.get('workflow') as PluginWorkflowServer;
   const processor = (await workflowPlugin.trigger(workflow as any, {
     ...args,
   })) as Processor;
@@ -114,7 +115,7 @@ export const workflowCaller: ToolOptions = {
         title: workflow.title,
         description: workflow.description,
         schema: buildSchema(config),
-        invoke: async (plugin: PluginAIServer, args: Record<string, any>) => invoke(plugin, workflow, args),
+        invoke: async (ctx: Context, args: Record<string, any>) => invoke(ctx, workflow, args),
       };
     });
   },
@@ -133,7 +134,7 @@ export const workflowCaller: ToolOptions = {
       title: workflow.title,
       description: workflow.description,
       schema: buildSchema(config),
-      invoke: async (plugin: PluginAIServer, args: Record<string, any>) => invoke(plugin, workflow, args),
+      invoke: async (ctx: Context, args: Record<string, any>) => invoke(ctx, workflow, args),
     };
   },
 };
diff --git a/packages/plugins/@nocobase/plugin-ai/src/server/utils.ts b/packages/plugins/@nocobase/plugin-ai/src/server/utils.ts
new file mode 100644
index 0000000000..29f6305289
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-ai/src/server/utils.ts
@@ -0,0 +1,26 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Model } from '@nocobase/database';
+
+export function parseResponseMessage(row: Model) {
+  const content = {
+    ...row.content,
+    messageId: row.messageId,
+    metadata: row.metadata,
+  };
+  if (!row.metadata?.autoCallTool && row.toolCalls) {
+    content.tool_calls = row.toolCalls;
+  }
+  return {
+    key: row.messageId,
+    content,
+    role: row.role,
+  };
+}