alemonjs-aichat 1.0.31-beta.2 → 1.0.31

package/lib/api/aitools.js

@@ -181,7 +181,7 @@ const tools = [
                         description: "要执行的终端命令",
                     },
                 },
-                required: ["command"],
+                required: ["userId", "command"],
             },
         },
     },
@@ -234,7 +234,7 @@ const tools = [
         type: "function",
         function: {
             name: "MemoryOperation",
-            description: "这个工具用于获取或修改对于用户的记忆数据, 包括用户形象, 用户偏好, 历史对话等. 你可以使用这个工具来存储一些需要长期记忆的信息, 例如用户的兴趣爱好, 重要事件等. 当你想要获取或修改这些信息时, 可以调用这个工具并提供具体的操作指令和数据. 例如, 在聊天过程中他对你的态度,以及他喜欢的东西等,可以通过这个工具及时记录下来, 也可以通过这个工具获取之前的对话记录,便于继续之前的话题",
+            description: "这个工具用于获取或修改对于用户的记忆数据, 包括用户形象, 用户偏好, 历史对话等. 你可以使用这个工具来存储一些需要长期记忆的信息, 例如用户的兴趣爱好, 重要事件等, 在不认识对方时可以尝试一下获取. 当你想要获取或修改这些信息时, 可以调用这个工具并提供具体的操作指令和数据. 例如, 在聊天过程中他对你的态度,以及他喜欢的东西等,可以通过这个工具及时记录下来, 也可以通过这个工具获取之前的对话记录,便于继续之前的话题",
             parameters: {
                 type: "object",
                 properties: {

package/lib/response/tools/res.js

@@ -55,7 +55,7 @@ var res = onResponse(selects, async (e) => {
                 message.send(format(Text("你又再骗我画涩图了喵~已经保存到主人的收藏夹了，不给你看，哼!~")));
             }
             else {
-                message.send(format(Text("画图完成喵~\n"), Text(content), Image(res[0])));
+                message.send(format(Text("画图完成喵~\n"), Text(content), Image(imgUrl)));
             }
             await redisClient.addImgUrl(e.guid, imgUrl);
         }
@@ -66,7 +66,7 @@ var res = onResponse(selects, async (e) => {
                 message.send(format(Text(json.error)));
             }
             catch (error) {
-                message.send(format(Text("修图报错了喵~")));
+                message.send(format(Text("修图报错了喵~:" + res)));
             }
         }
     }

package/lib/response/zreply/capi.js

@@ -4,7 +4,7 @@ import OpenAi from 'openai';
 import { TTSClient } from '../../api/tts.js';
 import { availableTools } from '../../api/aitools.js';
 import redisClient from '../../config.js';
-import { shouldSkipAIReply, getChatConfig, buildUserMessage } from './getChatConfig.js';
+import { shouldSkipAIReply, getChatConfig, buildUserMessage, getDeepThoughtReasoning } from './getChatConfig.js';
 import { createTTSMessage } from './tts.js';
 import { parseAIReply } from './tools.js';
 
@@ -44,46 +44,34 @@ const CApiReply = async (e) => {
             createParams["tools"] = cfg.toolConfig.cApiToolList;
             createParams["tool_choice"] = "auto";
         }
-        if (cfg.deepThoughtSwitch === "0") {
-            createParams["verbosity"] = "low";
-        }
-        createParams["stream"] = true;
+        const deepThoughtReasoning = getDeepThoughtReasoning(cfg);
+        Object.assign(createParams, deepThoughtReasoning);
+        createParams["stream"] = false;
+        log("请求AI，参数：", createParams);
         const stream = (await openai.chat.completions.create(createParams));
+        log("AI回复原始数据:\n", JSON.stringify(stream, null, 2));
         let fullContent = "";
         let toolCalls = [];
-        for await (const chunk of stream) {
-            const delta = chunk.choices?.[0]?.delta;
-            if (!delta)
-                continue;
-            if (delta.content) {
-                fullContent += delta.content;
-            }
-            if (delta.tool_calls) {
-                for (const tc of delta.tool_calls) {
-                    if (tc.index !== undefined) {
-                        if (!toolCalls[tc.index]) {
-                            toolCalls[tc.index] = {
-                                id: tc.id || "",
-                                type: "function",
-                                function: { name: "", arguments: "" },
-                            };
-                        }
-                        if (tc.id)
-                            toolCalls[tc.index].id = tc.id;
-                        if (tc.function?.name)
-                            toolCalls[tc.index].function.name += tc.function.name;
-                        if (tc.function?.arguments)
-                            toolCalls[tc.index].function.arguments += tc.function.arguments;
-                    }
-                }
-            }
+        const completion = stream;
+        const aiReplyMessage = completion?.choices?.[0]?.message;
+        if (aiReplyMessage?.content) {
+            fullContent = aiReplyMessage.content;
+        }
+        if (Array.isArray(aiReplyMessage?.tool_calls)) {
+            toolCalls = aiReplyMessage.tool_calls.map((tc) => ({
+                id: tc.id || "",
+                type: "function",
+                function: {
+                    name: tc.function?.name || "",
+                    arguments: tc.function?.arguments || "",
+                },
+            }));
         }
         let res = {
             choices: [
                 {
                     message: {
-                        role: "assistant",
-                        content: fullContent || null,
+                        ...aiReplyMessage,
                         tool_calls: toolCalls.length > 0 ? toolCalls : undefined,
                     },
                 },
@@ -95,13 +83,17 @@ const CApiReply = async (e) => {
         }
         messages.push(usermessage);
         await redisClient.addAIChatHistory(e.guid, usermessage);
+        if (res.choices[0].message?.tool_calls && fullContent.trim() !== "") {
+            message.send(format(Text(fullContent)));
+        }
         // 检查是否有工具调用需要处理
         while (res.choices[0].message?.tool_calls?.length) {
             const responseMessage = res.choices[0].message;
+            log("AI返回工具调用，内容：-----", res.choices[0]);
             // 先处理对话
             messages.push(responseMessage);
             await redisClient.addAIChatHistory(e.guid, responseMessage);
-            console.log("模型决定调用工具：", responseMessage.tool_calls);
+            log("模型决定调用工具：", responseMessage.tool_calls);
             if (cfg.toolConfig.toolPromptSwitch === "1") {
                 const useToolsMessage = responseMessage.tool_calls.map((toolCall) => {
                     return `工具调用: ${toolCall.function.name}(${cfg.toolConfig.toolPromptArgsSwitch === "1" ? toolCall.function.arguments : ""})`;
@@ -165,6 +157,7 @@ const CApiReply = async (e) => {
                     tool_call_id: toolCall.id,
                     name: functionName,
                     content: toolContent,
+                    reasoning_content: responseMessage.reasoning_content || "",
                 });
                 // 记录工具调用结果
                 await redisClient.addAIChatHistory(e.guid, {
@@ -172,15 +165,20 @@ const CApiReply = async (e) => {
                     tool_call_id: toolCall.id,
                     name: functionName,
                     content: toolContent,
+                    reasoning_content: responseMessage.reasoning_content || "",
                 });
             }
-            // 重新请求
-            res = await openai.chat.completions.create({
+            const params = {
                 model: cfg.config.model,
                 messages: messages,
                 tools: cfg.toolConfig.cApiToolList,
                 tool_choice: "auto",
-            });
+            };
+            const deepThoughtReasoning = getDeepThoughtReasoning(cfg);
+            Object.assign(params, deepThoughtReasoning);
+            log("重新请求AI，参数：", params);
+            // 重新请求
+            res = await openai.chat.completions.create(params);
             // 检查是否还有工具调用需要处理
             if (!res.choices || res.choices.length === 0) {
                 log("AI未返回内容");
@@ -193,7 +191,7 @@ const CApiReply = async (e) => {
             log("AI选择不回复");
             return;
         }
-        console.log("AI回复原文:\n", reply);
+        console.log("AI回复原文:\n", JSON.stringify(res, null, 2));
         // 处理消息
         // 提取ai发送的消息有多少条
         const aireply = parseAIReply(reply, cfg, message, e);

package/lib/response/zreply/getChatConfig.js

@@ -101,16 +101,25 @@ const getChatConfig = async (e) => {
   当场景为私聊时, 用户昵称前方会出现[私聊]标识
   当平台适配环境较好时,用户消息前面会包含消息id, 例如: [私聊]用户昵称(用户id)(发送时间)(msgid:消息id):消息内容
   你发送的消息内容会被框架自动加上消息id, 以便你在需要撤回消息时使用
+
   ### 你的回复格式
   ${botName}:消息内容
   #### 拒绝回复:
   在讨论中如果你觉得不适合回复或觉得与你无关又或者不感兴趣, 可以直接回复"[]"来拒绝本次回复, 例如:
   ${botName}:[]
-
+  #### 图片
+  ${botName}:<img=http://example.com/image.jpg>
+  ${botName}:<img=./path/to/image.jpg>
+  #### 艾特用户
+  ${botName}:<at=用户id>消息内容
+  #### 撤回消息
+  ${botName}:<revoke=消息id>
   ${complexOutputIsOpen === "1" && isOpenTTSReply === "1"
-        ? ""
+        ? `#### 语音
+  ${botName}:<tts=你好这是一个语音消息>
+  #### 切换音色
+  ${botName}:<音色=派蒙-默认><tts=这是派蒙的默认声音哦>`
         : "#### 语音回复: 当前不可用"}
-  
   ${isOpenR18 === "1"
         ? ""
         : `
@@ -330,5 +339,48 @@ const buildUserMessage = async (e, cfg, mode = "capi") => {
         ],
     };
 };
+const getDeepThoughtReasoning = (cfg) => {
+    if (cfg.deepThoughtSwitch === "1") {
+        // 开启深度思考, 深度 中等medium
+        if (cfg.config.model.includes("deepseek")) {
+            return {
+                thinking: { type: "enabled" },
+                reasoning_effort: "medium",
+            };
+        }
+        if (cfg.config.model.includes("doubao")) {
+            return {
+                reasoning: {
+                    effort: "medium",
+                },
+            };
+        }
+        if (cfg.config.model.includes("qwen")) {
+            return {
+                enable_thinking: true,
+            };
+        }
+    }
+    else {
+        // 关闭深度思考
+        if (cfg.config.model.includes("deepseek")) {
+            return {
+                thinking: { type: "disabled" },
+            };
+        }
+        if (cfg.config.model.includes("doubao")) {
+            return {
+                reasoning: {
+                    effort: "minimal",
+                },
+            };
+        }
+        if (cfg.config.model.includes("qwen")) {
+            return {
+                enable_thinking: false,
+            };
+        }
+    }
+};
 
-export { buildUserMessage, getChatConfig, normalizeTools, shouldSkipAIReply };
+export { buildUserMessage, getChatConfig, getDeepThoughtReasoning, normalizeTools, shouldSkipAIReply };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs-aichat",
-  "version": "1.0.31-beta.2",
+  "version": "1.0.31",
   "description": "alemonjs-aichat",
   "author": "suancaixianyu",
   "license": "MIT",
@@ -19,10 +19,10 @@
     "@alemonjs/bubble": "^2.1.10",
     "@alemonjs/db": "^0.0.16",
     "@alemonjs/onebot": "^2.1.14",
-    "@types/node": "^22",
-    "alemonjs": "2.1.57",
+    "@types/node": "^22.19.17",
+    "alemonjs": "2.1.65",
     "cssnano": "^7",
-    "jsxp": "^1.3.0",
+    "jsxp": "^1.4.0",
     "lvyjs": "^0.2.25",
     "pm2": "^5",
     "tailwindcss": "3"

package/skills/send-media/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: send-media
-description: 发送媒体文件, 包括文本、图片、音频和视频等格式规范
+description: 发送媒体文件, 包括文本、图片、音频和视频等格式规范, 在与用户对话之前请务必仔细阅读该技能文档, 以免发送消息失败
 ---
 
 # Send Media Skill
@@ -25,7 +25,7 @@ description: 发送媒体文件, 包括文本、图片、音频和视频等格
 
 ```txt
 小咸鱼: <img=http://example.com/image.jpg>
-小咸鱼: <img=/path/to/image.jpg>
+小咸鱼: <img=./path/to/image.jpg>
 ```
 
 ## 3. 发送音频