@nocobase/plugin-ai 2.1.0-alpha.12 → 2.1.0-alpha.14

package/dist/server/ai-employees/middleware/conversation.d.ts

@@ -26,6 +26,8 @@ export declare const conversationMiddleware: (aiEmployee: AIEmployee, options: {
     }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     ctx: z.ZodAny;
+    appendMessage: z.ZodAny;
 }, z.core.$strip>, {
     ctx: any;
+    appendMessage: any;
 }, readonly (import("@langchain/core/dist/tools").ClientTool | import("@langchain/core/dist/tools").ServerTool)[]>;

package/dist/server/ai-employees/middleware/conversation.js

@@ -77,7 +77,8 @@ const conversationMiddleware = (aiEmployee, options) => {
   return (0, import_langchain.createMiddleware)({
     name: "ConversationMiddleware",
     contextSchema: import_zod.default.object({
-      ctx: import_zod.default.any()
+      ctx: import_zod.default.any(),
+      appendMessage: import_zod.default.any()
     }),
     stateSchema: import_zod.default.object({
       messageId: import_zod.default.coerce.string().optional(),
@@ -125,13 +126,28 @@ const conversationMiddleware = (aiEmployee, options) => {
             toolMessages.map((x) => x.metadata.toolCallId)
           );
         });
-        (_a = runtime.writer) == null ? void 0 : _a.call(runtime, { action: "beforeSendToolMessage", body: { messageId: messageId2, messages: toolMessages } });
+        const currentConversation = {
+          sessionId: aiEmployee.sessionId,
+          username: aiEmployee.employee.username,
+          from: aiEmployee.from
+        };
+        (_a = runtime.writer) == null ? void 0 : _a.call(runtime, {
+          action: "beforeSendToolMessage",
+          body: { messageId: messageId2, messages: toolMessages },
+          currentConversation
+        });
       }
     },
     afterModel: async (state, runtime) => {
       var _a, _b, _c, _d, _e, _f;
       try {
+        const currentConversation = {
+          sessionId: aiEmployee.sessionId,
+          username: aiEmployee.employee.username,
+          from: aiEmployee.from
+        };
         const newState = {
+          messageId: state.messageId,
           lastMessageIndex: {
             lastHumanMessageIndex: state.messages.filter((x) => x.type === "human").length,
             lastAIMessageIndex: state.messages.filter((x) => x.type === "ai").length,
@@ -153,7 +169,7 @@ const conversationMiddleware = (aiEmployee, options) => {
         if (values) {
           await aiEmployee.aiChatConversation.withTransaction(async (conversation, transaction) => {
             const result = await conversation.addMessages(values);
-            state.messageId = result.messageId;
+            newState.messageId = result.messageId;
             if (toolCalls == null ? void 0 : toolCalls.length) {
               const toolsMap = await aiEmployee.getToolsMap();
               const initializedToolCalls = await aiEmployee.initToolCall(
@@ -166,19 +182,36 @@ const conversationMiddleware = (aiEmployee, options) => {
           });
           (_b = runtime.writer) == null ? void 0 : _b.call(runtime, {
             action: "AfterAIMessageSaved",
-            body: { id: aiMessage.id, messageId: state.messageId }
+            body: { id: aiMessage.id, messageId: newState.messageId },
+            currentConversation
           });
         }
         if (toolCalls == null ? void 0 : toolCalls.length) {
           (_c = runtime.writer) == null ? void 0 : _c.call(runtime, {
             action: "initToolCalls",
-            body: { toolCalls }
+            body: { toolCalls },
+            currentConversation
           });
         }
         return newState;
       } catch (e) {
         (_f = (_e = (_d = runtime.context) == null ? void 0 : _d.ctx) == null ? void 0 : _e.logger) == null ? void 0 : _f.error(e);
       }
+    },
+    wrapModelCall: async (request, handler) => {
+      const runtimeContext = request.runtime.context;
+      const appendMessage = runtimeContext == null ? void 0 : runtimeContext.appendMessage;
+      if (Array.isArray(appendMessage) && appendMessage.length) {
+        await aiEmployee.aiChatConversation.withTransaction(async (conversation) => {
+          await conversation.addMessages(convertToolMessage(request.messages.at(-1)));
+          await conversation.addMessages(appendMessage.map((x) => x).map(convertHumanMessage));
+        });
+        request.messages.push(...appendMessage);
+        if (runtimeContext) {
+          delete runtimeContext.appendMessage;
+        }
+      }
+      return handler(request);
     }
   });
 };

package/dist/server/ai-employees/middleware/tools.js

@@ -46,7 +46,16 @@ var import_lodash = __toESM(require("lodash"));
 const toolInteractionMiddleware = (aiEmployee, tools) => {
   const interruptOn = {};
   for (const tool of tools) {
-    interruptOn[tool.definition.name] = aiEmployee.shouldInterruptToolCall(tool);
+    interruptOn[tool.definition.name] = aiEmployee.shouldInterruptToolCall(tool) ? {
+      allowedDecisions: ["approve", "reject", "edit"],
+      description: (toolCall) => JSON.stringify({
+        sessionId: aiEmployee.sessionId,
+        from: aiEmployee.from,
+        username: aiEmployee.employee.username,
+        toolCallId: toolCall.id,
+        toolCallName: toolCall.name
+      })
+    } : false;
   }
   return (0, import_langchain.humanInTheLoopMiddleware)({
     interruptOn
@@ -60,13 +69,23 @@ const toolCallStatusMiddleware = (aiEmployee) => {
     }),
     wrapToolCall: async (request, handler) => {
       var _a, _b, _c, _d;
+      let interrupted = false;
       const { runtime, toolCall } = request;
       const { messageId } = request.state;
+      const currentConversation = {
+        sessionId: aiEmployee.sessionId,
+        username: aiEmployee.employee.username,
+        from: aiEmployee.from
+      };
       const tm = await aiEmployee.getToolCallResult(messageId, request.toolCall.id);
+      if (!tm) {
+        throw new Error(`Tool call result not found for messageId=${messageId}, toolCallId=${request.toolCall.id}`);
+      }
       if (tm.status === "error") {
         (_a = runtime.writer) == null ? void 0 : _a.call(runtime, {
           action: "afterToolCall",
-          body: { toolCall, toolCallResult: tm }
+          body: { toolCall, toolCallResult: tm },
+          currentConversation
         });
         return new import_langchain.ToolMessage({
           tool_call_id: request.toolCall.id,
@@ -78,7 +97,7 @@ const toolCallStatusMiddleware = (aiEmployee) => {
         });
       }
       await aiEmployee.updateToolCallPending(messageId, request.toolCall.id);
-      (_b = runtime.writer) == null ? void 0 : _b.call(runtime, { action: "beforeToolCall", body: { toolCall } });
+      (_b = runtime.writer) == null ? void 0 : _b.call(runtime, { action: "beforeToolCall", body: { toolCall }, currentConversation });
       let result;
       try {
         const toolMessage = await handler(request);
@@ -100,11 +119,16 @@ const toolCallStatusMiddleware = (aiEmployee) => {
         }
         return toolMessage;
       } catch (e) {
+        if (e.name === "GraphInterrupt") {
+          interrupted = true;
+          throw e;
+        }
         aiEmployee.logger.error(e);
         result = { status: "error", content: e.message };
         (_c = runtime.writer) == null ? void 0 : _c.call(runtime, {
           action: "afterToolCallError",
-          body: { toolCall, error: e }
+          body: { toolCall, error: e },
+          currentConversation
         });
         return new import_langchain.ToolMessage({
           tool_call_id: request.toolCall.id,
@@ -115,12 +139,15 @@ const toolCallStatusMiddleware = (aiEmployee) => {
           }
         });
       } finally {
-        await aiEmployee.updateToolCallDone(messageId, request.toolCall.id, result);
-        const toolCallResult = await aiEmployee.getToolCallResult(messageId, request.toolCall.id);
-        (_d = runtime.writer) == null ? void 0 : _d.call(runtime, {
-          action: "afterToolCall",
-          body: { toolCall, toolCallResult }
-        });
+        if (!interrupted) {
+          await aiEmployee.updateToolCallDone(messageId, request.toolCall.id, result);
+          const toolCallResult = await aiEmployee.getToolCallResult(messageId, request.toolCall.id);
+          (_d = runtime.writer) == null ? void 0 : _d.call(runtime, {
+            action: "afterToolCall",
+            body: { toolCall, toolCallResult },
+            currentConversation
+          });
+        }
       }
     }
   });

package/dist/server/ai-employees/prompts.d.ts

@@ -6,7 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export declare function getSystemPrompt({ aiEmployee, personal, task, environment, dataSources, knowledgeBase, availableSkills, }: {
+export declare function getSystemPrompt({ aiEmployee, personal, task, environment, dataSources, knowledgeBase, availableSkills, availableAIEmployees, }: {
     aiEmployee: {
         nickname: string;
         about: string;
@@ -27,4 +27,12 @@ export declare function getSystemPrompt({ aiEmployee, personal, task, environmen
         description: string;
         content?: string;
     }[];
+    availableAIEmployees?: {
+        username: string;
+        nickname: string;
+        position: string;
+        bio: string;
+        greeting: string;
+        skillSettings: any;
+    }[];
 }): string;

package/dist/server/ai-employees/prompts.js

@@ -36,7 +36,8 @@ function getSystemPrompt({
   environment,
   dataSources,
   knowledgeBase,
-  availableSkills
+  availableSkills,
+  availableAIEmployees
 }) {
   const getDatabaseQuotingRules = () => {
     const quotingMap = {
@@ -138,12 +139,33 @@ ${task.context}
 </environment>
 
 ${(availableSkills == null ? void 0 : availableSkills.length) ? `<skills>
-You have access to the following skills (tools groups). When a user's request matches a skill's description, use the getSkill tool to load that skill's detailed content and available tools:
+You have access to the following skills (tools groups). When a user's request matches a skill's description, use the **getSkill** tool to load that skill's detailed content and available tools
 
 ${availableSkills.map((skill) => `- **${skill.name}**: ${skill.description || "No description"}`).join("\n")}
 </skills>
 ` : ""}
 
+${(availableAIEmployees == null ? void 0 : availableAIEmployees.length) ? `<sub_agents>
+  The following ${availableAIEmployees.length} AI employees are currently available as sub agents.
+  Treat this list as the authoritative routing roster for this conversation.
+  Do not call discovery tools just to confirm the same list again.
+  Only use discovery when this section is missing, clearly insufficient for the routing decision, contradictory to the current conversation, or you have strong evidence the roster has changed.
+  If one listed employee is already an obvious fit, dispatch directly.
+  Use profile lookup only when you need deeper instructions before dispatching.
+
+  ${availableAIEmployees.map(
+    (it) => {
+      var _a, _b, _c, _d, _e, _f;
+      return `- ${it.nickname}
+        - username: ${it.username}
+        - description: ${it.bio}
+        - position: ${it.position}
+        ${((_b = (_a = it.skillSettings) == null ? void 0 : _a.skills) == null ? void 0 : _b.length) ? "- skills:" + ((_c = it.skillSettings) == null ? void 0 : _c.skills.join(",")) : ""}
+        ${((_e = (_d = it.skillSettings) == null ? void 0 : _d.tools) == null ? void 0 : _e.length) ? "- tools:" + ((_f = it.skillSettings) == null ? void 0 : _f.tools.map((t) => t.name).join(",")) : ""}`;
+    }
+  )}
+  </sub_agents>` : ""}
+
 ${knowledgeBase ? `<knowledgeBase>${knowledgeBase}</knowledgeBase>` : ""}
 `;
 }

package/dist/server/ai-employees/sub-agents/dispatcher.d.ts

@@ -0,0 +1,36 @@
+/**
+ * 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 { Context } from '@nocobase/actions';
+import { Model } from '@nocobase/database';
+import { ModelRef } from '../ai-employee';
+import type PluginAIServer from '../../plugin';
+import type { UserDecision } from '../../types';
+export type SubAgentTask = {
+    ctx: Context;
+    sessionId: string;
+    employee: Model;
+    model: ModelRef;
+    question: string;
+    skillSettings?: Record<string, any>;
+    writer?: (chunk: any) => void;
+};
+export declare class SubAgentsDispatcher {
+    protected plugin: PluginAIServer;
+    constructor(plugin: PluginAIServer);
+    private extractTextContent;
+    private extractLastMessageText;
+    private resolveSubAgentSessionId;
+    private resolveLastMessage;
+    run(task: SubAgentTask): Promise<string>;
+    isInterrupted(ctx: Context): Promise<boolean>;
+    reject(ctx: Context): Promise<{
+        interruptId?: string;
+        decisions: UserDecision[];
+    }>;
+}

package/dist/server/ai-employees/sub-agents/dispatcher.js

@@ -0,0 +1,225 @@
+/**
+ * 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.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var dispatcher_exports = {};
+__export(dispatcher_exports, {
+  SubAgentsDispatcher: () => SubAgentsDispatcher
+});
+module.exports = __toCommonJS(dispatcher_exports);
+var import_ai_employee = require("../ai-employee");
+class SubAgentsDispatcher {
+  constructor(plugin) {
+    this.plugin = plugin;
+  }
+  extractTextContent(content) {
+    if (typeof content === "string") {
+      return content;
+    }
+    if (Array.isArray(content)) {
+      return content.map((block) => {
+        if (typeof block === "string") {
+          return block;
+        }
+        if (block && typeof block === "object" && "type" in block && block.type === "text") {
+          return typeof block.text === "string" ? block.text : "";
+        }
+        return "";
+      }).join("");
+    }
+    if (content && typeof content === "object" && "content" in content) {
+      return this.extractTextContent(content.content);
+    }
+    return "";
+  }
+  extractLastMessageText(result) {
+    var _a;
+    const messages = result == null ? void 0 : result.messages;
+    if (!Array.isArray(messages) || messages.length === 0) {
+      return "";
+    }
+    return this.extractTextContent((_a = messages.at(-1)) == null ? void 0 : _a.content);
+  }
+  async resolveSubAgentSessionId(ctx) {
+    var _a, _b, _c, _d, _e;
+    const sessionId = (_c = (_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.values) == null ? void 0 : _c.sessionId;
+    if (!sessionId) {
+      return null;
+    }
+    const aiToolMessage = await ctx.db.getRepository("aiToolMessages").findOne({
+      filter: {
+        sessionId,
+        toolName: "dispatch-sub-agent-task",
+        invokeStatus: {
+          $ne: "confirmed"
+        }
+      },
+      sort: ["-id"]
+    });
+    if (!(aiToolMessage == null ? void 0 : aiToolMessage.messageId)) {
+      return null;
+    }
+    const aiMessage = await ctx.db.getRepository("aiMessages").findOne({
+      filter: {
+        sessionId,
+        messageId: aiToolMessage.messageId
+      }
+    });
+    const subAgentConversations = (_d = aiMessage == null ? void 0 : aiMessage.metadata) == null ? void 0 : _d.subAgentConversations;
+    if (!Array.isArray(subAgentConversations) || !subAgentConversations.length) {
+      return null;
+    }
+    return ((_e = subAgentConversations.at(-1)) == null ? void 0 : _e.sessionId) ?? null;
+  }
+  async resolveLastMessage(ctx) {
+    const subSessionId = await this.resolveSubAgentSessionId(ctx);
+    if (!subSessionId) {
+      return null;
+    }
+    return ctx.db.getRepository("aiMessages").findOne({
+      filter: {
+        sessionId: subSessionId
+      },
+      sort: ["-messageId"]
+    });
+  }
+  async run(task) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const { ctx, sessionId, employee, model, question, skillSettings, writer } = task;
+    const { webSearch } = ((_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.values) ?? {};
+    const plugin = ctx.app.pm.get("ai");
+    const userId = (_d = (_c = ctx.auth) == null ? void 0 : _c.user) == null ? void 0 : _d.id;
+    if (!userId) {
+      throw new Error("User not authenticated");
+    }
+    if (!(model == null ? void 0 : model.llmService) || !(model == null ? void 0 : model.model)) {
+      throw new Error("LLM service not configured");
+    }
+    const aiEmployee = new import_ai_employee.AIEmployee({
+      ctx,
+      employee,
+      sessionId,
+      skillSettings,
+      webSearch,
+      model,
+      from: "sub-agent"
+    });
+    const lastMessage = await ctx.db.getRepository("aiMessages").findOne({
+      filter: {
+        sessionId
+      },
+      sort: ["-messageId"]
+    });
+    const decisions = lastMessage ? await plugin.aiConversationsManager.getUserDecisions(lastMessage.messageId) : null;
+    let context;
+    const { messages } = ((_f = (_e = ctx.action) == null ? void 0 : _e.params) == null ? void 0 : _f.values) ?? {};
+    if (messages && ((_g = decisions == null ? void 0 : decisions.decisions) == null ? void 0 : _g.some((it) => it.type === "reject"))) {
+      context = {
+        appendMessage: await aiEmployee.getFormatMessages(messages)
+      };
+    }
+    const result = await aiEmployee.invoke({
+      userDecisions: decisions,
+      userMessages: decisions ? void 0 : [
+        {
+          role: "user",
+          content: {
+            type: "text",
+            content: question
+          }
+        }
+      ],
+      writer,
+      context
+    });
+    writer == null ? void 0 : writer({
+      action: "afterSubAgentInvoke",
+      body: {},
+      currentConversation: {
+        sessionId,
+        username: employee.username,
+        from: "sub-agent"
+      }
+    });
+    return this.extractLastMessageText(result);
+  }
+  async isInterrupted(ctx) {
+    var _a, _b, _c;
+    const sessionId = (_c = (_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.values) == null ? void 0 : _c.sessionId;
+    if (!sessionId) {
+      return false;
+    }
+    const aiToolMessage = await ctx.db.getRepository("aiToolMessages").findOne({
+      filter: {
+        sessionId,
+        toolName: "dispatch-sub-agent-task",
+        invokeStatus: "pending"
+      },
+      sort: ["-id"]
+    });
+    return aiToolMessage ? true : false;
+  }
+  async reject(ctx) {
+    var _a, _b, _c;
+    const plugin = ctx.app.pm.get("ai");
+    const { sessionId } = ((_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.values) ?? {};
+    const conversation = await ctx.db.getRepository("aiConversations").findOne({
+      filter: {
+        sessionId,
+        userId: (_c = ctx.auth) == null ? void 0 : _c.user.id
+      }
+    });
+    if (!conversation) {
+      return;
+    }
+    const lastMessage = await this.resolveLastMessage(ctx);
+    if (!sessionId || !lastMessage) {
+      return;
+    }
+    const userDecision = {
+      type: "reject",
+      message: `The user ignored the tools usage and send new messages`
+    };
+    const [updated] = await ctx.db.getRepository("aiToolMessages").model.update(
+      { userDecision, invokeStatus: "waiting" },
+      {
+        where: {
+          sessionId: lastMessage.get("sessionId"),
+          messageId: lastMessage.get("messageId"),
+          invokeStatus: "interrupted"
+        }
+      }
+    );
+    if (updated > 0) {
+      return await plugin.aiConversationsManager.getUserDecisions(lastMessage.get("messageId"));
+    } else {
+      return null;
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SubAgentsDispatcher
+});

package/dist/server/ai-employees/sub-agents/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 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.
+ */
+export { SubAgentsDispatcher } from './dispatcher';

package/dist/server/ai-employees/sub-agents/index.js

@@ -0,0 +1,36 @@
+/**
+ * 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.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var sub_agents_exports = {};
+__export(sub_agents_exports, {
+  SubAgentsDispatcher: () => import_dispatcher.SubAgentsDispatcher
+});
+module.exports = __toCommonJS(sub_agents_exports);
+var import_dispatcher = require("./dispatcher");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SubAgentsDispatcher
+});

package/dist/server/collections/ai-conversations.js

@@ -50,6 +50,12 @@ var ai_conversations_default = (0, import_database.defineCollection)({
       name: "topicId",
       type: "string"
     },
+    {
+      name: "from",
+      type: "string",
+      defaultValue: "main-agent",
+      allowNull: false
+    },
     {
       name: "user",
       type: "belongsTo",

package/dist/server/llm-providers/anthropic.d.ts

@@ -25,6 +25,7 @@ export declare class AnthropicProvider extends LLMProvider {
     }>;
     parseResponseMessage(message: Model): {
         key: any;
+        createdAt: any;
         content: any;
         role: any;
     };

package/dist/server/llm-providers/anthropic.js

@@ -116,7 +116,7 @@ class AnthropicProvider extends import_provider.LLMProvider {
     }
   }
   parseResponseMessage(message) {
-    const { content: rawContent, messageId, metadata, role, toolCalls, attachments, workContext } = message;
+    const { content: rawContent, messageId, metadata, role, toolCalls, attachments, workContext, createdAt } = message;
     const content = {
       ...rawContent,
       messageId,
@@ -149,6 +149,7 @@ class AnthropicProvider extends import_provider.LLMProvider {
     }
     return {
       key: messageId,
+      createdAt,
       content,
       role
     };

package/dist/server/llm-providers/dashscope.d.ts

@@ -17,8 +17,11 @@ export declare class DashscopeProvider extends LLMProvider {
     chatModel: ReasoningChatOpenAI;
     get baseURL(): string;
     createModel(): ReasoningChatOpenAI;
+    isToolConflict(): boolean;
+    resolveTools(toolDefinitions: any[]): any[];
     parseResponseMessage(message: Model): {
         key: any;
+        createdAt: any;
         content: any;
         role: any;
     };

package/dist/server/llm-providers/dashscope.js

@@ -57,7 +57,9 @@ class DashscopeProvider extends import_provider.LLMProvider {
     const { baseURL, apiKey } = this.serviceOptions || {};
     const { responseFormat, structuredOutput } = this.modelOptions || {};
     const { schema } = structuredOutput || {};
-    const modelKwargs = {};
+    const modelKwargs = {
+      thinking_budget: 4e4
+    };
     if (responseFormat) {
       const responseFormatOptions = {
         type: responseFormat
@@ -71,10 +73,11 @@ class DashscopeProvider extends import_provider.LLMProvider {
     }
     if (((_b = (_a = this.modelOptions) == null ? void 0 : _a.builtIn) == null ? void 0 : _b.webSearch) === true) {
       modelKwargs["enable_search"] = true;
-      modelKwargs["search_options"] = { forced_search: true };
     }
     return new import_reasoning.ReasoningChatOpenAI({
       apiKey,
+      topP: 0.8,
+      temperature: 0.7,
       ...this.modelOptions,
       modelKwargs,
       configuration: {
@@ -83,6 +86,17 @@ class DashscopeProvider extends import_provider.LLMProvider {
       verbose: false
     });
   }
+  isToolConflict() {
+    return true;
+  }
+  resolveTools(toolDefinitions) {
+    var _a, _b;
+    if (this.isToolConflict() && ((_b = (_a = this.modelOptions) == null ? void 0 : _a.builtIn) == null ? void 0 : _b.webSearch) === true) {
+      return [];
+    } else {
+      return toolDefinitions;
+    }
+  }
   parseResponseMessage(message) {
     var _a;
     const result = super.parseResponseMessage(message);

package/dist/server/llm-providers/deepseek.d.ts

@@ -25,6 +25,7 @@ export declare class DeepSeekProvider extends LLMProvider {
     createModel(): ReasoningDeepSeek;
     parseResponseMessage(message: Model): {
         key: any;
+        createdAt: any;
         content: any;
         role: any;
     };