alemonjs-aichat 1.0.39 → 1.0.40

package/lib/response/zreply/capi.js

@@ -1,4 +1,4 @@
-import { useMessage, Text, Audio, ImageURL, ImageFile, Mention } from 'alemonjs';
+import { useMessage, Audio, Text, ImageURL, ImageFile, Mention } from 'alemonjs';
 import { log } from 'console';
 import OpenAi from 'openai';
 import { TTSClient } from '../../api/tts.js';
@@ -6,7 +6,7 @@ import { availableTools } from '../../api/aitools.js';
 import redisClient, { DEFAULT_CAPI_CONTEXT_LIMIT } from '../../config.js';
 import { getChatConfig, shouldSkipAIReply, buildUserMessage, getDeepThoughtReasoning } from './getChatConfig.js';
 import { createTTSMessage } from './tts.js';
-import { parseAIReply } from './tools.js';
+import { parseAIReply, sendAIReplyToOutput } from './tools.js';
 
 const selects = onSelects(["message.create", "private.message.create"]);
 let currentModel = "派蒙-默认"; // 默认音色
@@ -16,6 +16,9 @@ const AUTO_SUMMARY_DETAIL_MAX_LENGTH = 2000;
 const sendAIReply = async (reply, cfg, e, message) => {
     const aireply = await parseAIReply(reply, cfg, e, message);
     console.log("aireply", aireply);
+    if (await sendAIReplyToOutput(message, aireply)) {
+        return aireply;
+    }
     if (aireply?.ttsMessages) {
         for (const ttsMsg of aireply.ttsMessages) {
             const ttsMessage = await createTTSMessage(ttsMsg.text, new TTSClient(), ttsMsg.model ?? currentModel);
@@ -31,6 +34,12 @@ const sendAIReply = async (reply, cfg, e, message) => {
     }
     return aireply;
 };
+const sendOutputText = async (message, text) => {
+    if (typeof message?.sendText === "function") {
+        return await message.sendText(text);
+    }
+    return await message.send(format(Text(text)));
+};
 const appendPendingGuidanceMessages = async (guid, messages) => {
     const queuedMessages = await redisClient.drainAIGuidanceMessages(guid);
     if (!queuedMessages.length) {
@@ -46,6 +55,30 @@ const appendPendingGuidanceMessages = async (guid, messages) => {
     await redisClient.addAIChatHistoryBatch(guid, guidanceMessages);
     return guidanceMessages;
 };
+const extractTextValue = (value) => {
+    if (typeof value === "string") {
+        return value;
+    }
+    if (Array.isArray(value)) {
+        return value
+            .map((item) => extractTextValue(item))
+            .filter((text) => text.trim() !== "")
+            .join("\n");
+    }
+    if (value && typeof value === "object") {
+        return extractTextValue(value.text ?? value.content ?? value.summary ?? "");
+    }
+    return "";
+};
+const getToolCallDisplayContent = (message) => {
+    const content = extractTextValue(message?.content);
+    if (content.trim() !== "") {
+        return content;
+    }
+    return extractTextValue(message?.reasoning_content ??
+        message?.reasoningContent ??
+        message?.reasoning);
+};
 const getTextLength = (value) => {
     if (typeof value === "string") {
         return value.length;
@@ -159,7 +192,7 @@ const recordCapiContextStats = async (guid, model, messages, completion) => {
         usageAvailable: Boolean(usage),
     });
 };
-const CApiReply = async (e) => {
+const CApiReply = async (e, outputMessage) => {
     console.log("e.UserId", e.UserId, e.bot);
     const cfg = await getChatConfig(e);
     if (await shouldSkipAIReply(e, cfg)) {
@@ -168,7 +201,7 @@ const CApiReply = async (e) => {
         };
     }
     // 创建消息
-    const [message] = useMessage(e);
+    const [message] = outputMessage ? [outputMessage] : useMessage(e);
     const usermessage = await buildUserMessage(e, cfg, "capi");
     try {
         const openai = new OpenAi({
@@ -176,6 +209,79 @@ const CApiReply = async (e) => {
             apiKey: cfg.config.key,
             timeout: 300000,
         });
+        const shouldStreamToOutput = typeof outputMessage?.streamTextDelta === "function";
+        const requestChatCompletion = async (params, requestMessages) => {
+            if (!shouldStreamToOutput) {
+                const completion = await openai.chat.completions.create(params);
+                await recordCapiContextStats(e.guid, cfg.config.model, requestMessages, completion);
+                return completion;
+            }
+            const streamParams = {
+                ...params,
+                stream: true,
+            };
+            const stream = (await openai.chat.completions.create(streamParams));
+            let content = "";
+            let reasoningContent = "";
+            const toolCalls = [];
+            const ensureToolCall = (index) => {
+                if (!toolCalls[index]) {
+                    toolCalls[index] = {
+                        id: "",
+                        type: "function",
+                        function: {
+                            name: "",
+                            arguments: "",
+                        },
+                    };
+                }
+                return toolCalls[index];
+            };
+            for await (const chunk of stream) {
+                const delta = chunk?.choices?.[0]?.delta || {};
+                const text = extractTextValue(delta.content ?? "");
+                if (text) {
+                    content += text;
+                    await outputMessage.streamTextDelta(text);
+                }
+                const reasoningDelta = extractTextValue(delta.reasoning_content ?? delta.reasoningContent ?? "");
+                if (reasoningDelta) {
+                    reasoningContent += reasoningDelta;
+                }
+                if (Array.isArray(delta.tool_calls)) {
+                    for (const item of delta.tool_calls) {
+                        const indexValue = Number(item.index);
+                        const index = Number.isFinite(indexValue) ? indexValue : 0;
+                        const toolCall = ensureToolCall(index);
+                        if (item.id)
+                            toolCall.id = item.id;
+                        if (item.type)
+                            toolCall.type = item.type;
+                        if (item.function?.name) {
+                            toolCall.function.name += item.function.name;
+                        }
+                        if (item.function?.arguments) {
+                            toolCall.function.arguments += item.function.arguments;
+                        }
+                    }
+                }
+            }
+            const normalizedToolCalls = toolCalls.filter((item) => item?.function?.name);
+            return {
+                choices: [
+                    {
+                        message: {
+                            role: "assistant",
+                            content,
+                            reasoning_content: reasoningContent,
+                            tool_calls: normalizedToolCalls.length
+                                ? normalizedToolCalls
+                                : undefined,
+                        },
+                    },
+                ],
+            };
+        };
         const systemMessage = {
             role: "system",
             content: cfg.systemPrompt + `\n性格约束:${cfg.config.systemPrompt}`,
@@ -196,18 +302,17 @@ const CApiReply = async (e) => {
         }
         const deepThoughtReasoning = getDeepThoughtReasoning(cfg);
         Object.assign(createParams, deepThoughtReasoning);
-        createParams["stream"] = false;
+        if (!shouldStreamToOutput) {
+            createParams["stream"] = false;
+        }
         // log("请求AI，参数：", createParams);
-        const stream = (await openai.chat.completions.create(createParams));
-        await recordCapiContextStats(e.guid, cfg.config.model, messages, stream);
+        const stream = await requestChatCompletion(createParams, messages);
         log("AI回复原始数据:\n", JSON.stringify(stream, null, 2));
         let fullContent = "";
         let toolCalls = [];
         const completion = stream;
         const aiReplyMessage = completion?.choices?.[0]?.message;
-        if (aiReplyMessage?.content) {
-            fullContent = aiReplyMessage.content;
-        }
+        fullContent = getToolCallDisplayContent(aiReplyMessage);
         if (Array.isArray(aiReplyMessage?.tool_calls)) {
             toolCalls = aiReplyMessage.tool_calls.map((tc) => ({
                 id: tc.id || "",
@@ -261,8 +366,7 @@ const CApiReply = async (e) => {
                         params.tool_choice = "auto";
                     }
                     Object.assign(params, getDeepThoughtReasoning(cfg));
-                    res = await openai.chat.completions.create(params);
-                    await recordCapiContextStats(e.guid, cfg.config.model, messages, res);
+                    res = await requestChatCompletion(params, messages);
                     if (!res.choices || res.choices.length === 0) {
                         log("AI未返回内容");
                         return;
@@ -274,7 +378,7 @@ const CApiReply = async (e) => {
                 log("AI返回工具调用，内容：-----", res.choices[0]);
                 // 先处理对话
                 if (toolRound >= 10 && toolRound % 10 === 0) {
-                    await message.send(format(Text(`AI正在连续调用工具，第 ${toolRound} 轮处理中，请稍等`)));
+                    await sendOutputText(message, `AI正在连续调用工具，第 ${toolRound} 轮处理中，请稍等`);
                 }
                 messages.push(responseMessage);
                 log("模型决定调用工具：", responseMessage.tool_calls);
@@ -282,11 +386,14 @@ const CApiReply = async (e) => {
                     const useToolsMessage = responseMessage.tool_calls.map((toolCall) => {
                         return `工具调用: ${toolCall.function.name}(${cfg.toolConfig.toolPromptArgsSwitch === "1" ? toolCall.function.arguments : ""})`;
                     });
-                    const msgId = await message.send(format(Text(useToolsMessage.join("\n"))));
+                    const msgId = await sendOutputText(message, useToolsMessage.join("\n"));
                     if (cfg.toolConfig.toolPromptRevokeSwitch === "1") {
                         // 10秒后撤回工具调用提示
                         setTimeout(() => {
-                            message.delete({ messageId: msgId[0].data.message_id });
+                            const messageId = msgId?.[0]?.data?.message_id;
+                            if (messageId && typeof message?.delete === "function") {
+                                message.delete({ messageId });
+                            }
                         }, 10000);
                     }
                 }
@@ -333,6 +440,9 @@ const CApiReply = async (e) => {
                             };
                         }
                     }
+                    if (typeof message?.sendToolResult === "function") {
+                        await message.sendToolResult(functionName, functionResult);
+                    }
                     const toolContent = JSON.stringify(typeof functionResult === "undefined"
                         ? { ok: true, result: null }
                         : functionResult);
@@ -366,8 +476,7 @@ const CApiReply = async (e) => {
                 Object.assign(params, deepThoughtReasoning);
                 // log("重新请求AI，参数：", params);
                 // 重新请求
-                res = await openai.chat.completions.create(params);
-                await recordCapiContextStats(e.guid, cfg.config.model, messages, res);
+                res = await requestChatCompletion(params, messages);
                 // 检查是否还有工具调用需要处理
                 if (!res.choices || res.choices.length === 0) {
                     log("AI未返回内容");
@@ -400,7 +509,7 @@ const CApiReply = async (e) => {
     catch (error) {
         await redisClient.setAIToolLoopProcessing(e.guid, false);
         console.error("AI回复出错", error);
-        message.send(format(Text("AI回复出错了\n" + error)));
+        await sendOutputText(message, "AI回复出错了\n" + error);
         return {
             next: true,
         };

package/lib/response/zreply/rapi.js

@@ -15,14 +15,14 @@ const drainPendingGuidanceInputs = async (guid) => {
         .map((item) => item?.rapiMessage || item)
         .filter(Boolean);
 };
-const RApiReply = async (e) => {
+const RApiReply = async (e, outputMessage) => {
     const cfg = await getChatConfig(e);
     if (await shouldSkipAIReply(e, cfg)) {
         return {
             next: true,
         };
     }
-    const [message] = useMessage();
+    const [message] = outputMessage ? [outputMessage] : useMessage(e);
     const openai = new OpenAi({
         baseURL: cfg.config.host,
         apiKey: cfg.config.key,
@@ -58,6 +58,9 @@ const RApiReply = async (e) => {
                 if (event.type === "response.output_text.delta") {
                     const text = event.delta ?? "";
                     fullText += text;
+                    if (text && typeof message?.streamTextDelta === "function") {
+                        await message.streamTextDelta(text);
+                    }
                 }
                 // 更稳妥：从 output_item.done 读取完整 function_call
                 if (event.type === "response.output_item.done" &&
@@ -157,7 +160,11 @@ const RApiReply = async (e) => {
             let newText = "";
             for await (const event of toolResponse) {
                 if (event.type === "response.output_text.delta") {
-                    newText += event.delta;
+                    const text = event.delta ?? "";
+                    newText += text;
+                    if (text && typeof message?.streamTextDelta === "function") {
+                        await message.streamTextDelta(text);
+                    }
                 }
                 if (event.type === "response.completed") {
                     previousResponseId = event.response.id;

package/lib/response/zreply/tools.js

@@ -1,4 +1,4 @@
-import { format, Audio, ImageURL, ImageFile, Text, Mention } from 'alemonjs';
+import { Audio, ImageURL, ImageFile, Text, format, Mention } from 'alemonjs';
 import redisClient from '../../config.js';
 import { TTSClient } from '../../api/tts.js';
 import { createTTSMessage } from './tts.js';
@@ -128,6 +128,12 @@ const sendReplyMessages = async (replyMessages, e, cfg, message) => {
         await message.send(format(...components));
     }
 };
+const sendParsedReplyToCustomOutput = async (message, aireply) => {
+    if (typeof message?.sendAIReply !== "function")
+        return false;
+    await message.sendAIReply(aireply);
+    return true;
+};
 const parseAIReply = async (newText, cfg, e, message) => {
     const replyMessages = newText.split(new RegExp(`${cfg.botName}:`, "g"));
     const replyMessagesResult = [];
@@ -199,7 +205,7 @@ const parseAIOutput = (raw) => {
                 const imgs = text.match(/!\[[^\]]+\]\([^\)]+\)/g) || [];
                 if (imgs.length) {
                     imgs.forEach((img) => {
-                        const urlMatch = img.match(/!\[[^\]]+\]\([^\)]+\)/);
+                        const urlMatch = img.match(/!\[[^\]]+\]\(([^)]+)\)/);
                         if (urlMatch) {
                             result.push({ type: "image", url: urlMatch[1] });
                         }
@@ -240,6 +246,10 @@ const parseAIOutput = (raw) => {
     return result;
 };
 const renderMessages = async (items, message) => {
+    if (typeof message?.sendRapiItems === "function") {
+        await message.sendRapiItems(items);
+        return;
+    }
     const components = [];
     for (const item of items) {
         switch (item.type) {
@@ -259,5 +269,6 @@ const renderMessages = async (items, message) => {
     }
     await message.send(format(...components));
 };
+const sendAIReplyToOutput = sendParsedReplyToCustomOutput;
 
-export { handleTTS, parseAIOutput, parseAIReply, renderMessages, sendReplyMessages };
+export { handleTTS, parseAIOutput, parseAIReply, renderMessages, sendAIReplyToOutput, sendReplyMessages };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs-aichat",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "alemonjs-aichat",
   "author": "suancaixianyu",
   "license": "MIT",
@@ -24,7 +24,6 @@
     "@types/ssh2": "^1.15.5",
     "alemonjs": "2.1.65",
     "cssnano": "^7",
-    "jsxp": "^1.4.0",
     "lvyjs": "^0.2.25",
     "pm2": "^5",
     "tailwindcss": "3"
@@ -49,11 +48,18 @@
     "@aws-sdk/client-s3": "^3.975.0",
     "@aws-sdk/s3-request-presigner": "^3.975.0",
     "ai": "^6.0.105",
+    "jsxp": "^1.4.0",
+    "koa": "^3.2.0",
+    "koa-router": "^14.0.0",
+    "koa-send": "^5.0.1",
+    "koa-static": "^5.0.0",
     "mime-types": "^3.0.2",
     "node-fetch": "^3.3.2",
     "openai": "^6.34.0",
+    "react": "^19.2.5",
+    "react-dom": "^19.2.5",
     "sharp": "^0.34.5",
-    "zod": "^4.3.6",
-    "ssh2": "^1.17.0"
+    "ssh2": "^1.17.0",
+    "zod": "^4.3.6"
   }
 }