koishi-plugin-chatluna-toolbox 0.0.15 → 0.0.16

package/lib/index.js

@@ -589,13 +589,12 @@ var DEFAULT_XML_REFERENCE_PROMPT = `## \u52A8\u4F5C\u6307\u4EE4
   - id: user_id
   - duration: \u7981\u8A00\u65F6\u957F\uFF0C\u5355\u4F4D\u79D2\uFF0C\u4F20 0 \u8868\u793A\u89E3\u9664\u7981\u8A00
   - \u9002\u7528\u573A\u666F:
-    - \u4F60\u5728\u672C\u7FA4\u4E3A\u7BA1\u7406\u5458
-    - \u7528\u4E8E\u7981\u8A00\u6216\u89E3\u9664\u7981\u8A00\u6307\u5B9A\u7FA4\u6210\u5458
+    - \u4F60\u5728\u672C\u7FA4\u4E3A\u7BA1\u7406\u5458\u65F6\u7528\u4E8E\u7981\u8A00\u6216\u89E3\u9664\u7981\u8A00\u6307\u5B9A\u7FA4\u6210\u5458
 4. \u64A4\u56DE\u6D88\u606F: <delete message_id=""/>
   - message_id: \u6D88\u606F ID
   - \u9002\u7528\u573A\u666F:
-    - \u4F60\u5728\u672C\u7FA4\u4E3A\u7BA1\u7406\u5458
-    - \u7528\u4E8E\u64A4\u56DE\u6307\u5B9A\u6D88\u606F
+    - \u64A4\u56DE\u81EA\u5DF1\u53D1\u7684\u6D88\u606F
+    - \u4F60\u5728\u672C\u7FA4\u4E3A\u7BA1\u7406\u5458\u65F6\u64A4\u56DE\u5176\u4ED6\u7528\u6237\u53D1\u9001\u7684\u6D88\u606F
 
 \u683C\u5F0F\u793A\u4F8B:
 \`\`\`xml
@@ -760,6 +759,7 @@ function createLogger(ctx, config) {
 
 // src/features/native-tools/tools/delete-msg.ts
 var import_zod = require("zod");
+var import_tools = require("@langchain/core/tools");
 
 // src/features/native-tools/onebot-api.ts
 function ensureOneBotSession(session) {
@@ -789,19 +789,33 @@ function getSession(runnable) {
 }
 
 // src/features/native-tools/tools/delete-msg.ts
+function assertOneBotSuccess(result) {
+  const response = result;
+  if (!response || typeof response !== "object") return;
+  const status = String(response.status || "").toLowerCase();
+  const failed = status === "failed" || !!status && status !== "ok" || typeof response.retcode === "number" && response.retcode !== 0;
+  if (!failed) return;
+  const reason = response.wording || response.message || response.status;
+  const retcode = typeof response.retcode === "number" ? ` (retcode: ${response.retcode})` : "";
+  throw new Error(`${reason || "OneBot returned failed"}${retcode}`);
+}
 async function sendDeleteMessage(params) {
-  const { session, messageId, log } = params;
+  const { session, message_id, log } = params;
   try {
     if (!session) return "No session context available.";
-    const messageIdRaw = messageId.trim();
-    if (!messageIdRaw) return "messageId is required.";
+    const messageIdRaw = message_id.trim();
+    if (!messageIdRaw) return "message_id is required.";
     const numericId = /^\d+$/.test(messageIdRaw) ? Number(messageIdRaw) : messageIdRaw;
     if (session.platform === "onebot") {
       const { error, internal } = ensureOneBotSession(session);
       if (error) return error;
-      await callOneBotAPI(internal, "delete_msg", { message_id: numericId }, [
-        "deleteMsg"
-      ]);
+      const result = await callOneBotAPI(
+        internal,
+        "delete_msg",
+        { message_id: numericId },
+        ["deleteMsg"]
+      );
+      assertOneBotSuccess(result);
       const success = `Message deleted by ID ${messageIdRaw}.`;
       log?.("info", success);
       return success;
@@ -823,18 +837,18 @@ async function sendDeleteMessage(params) {
 }
 function createDeleteMessageTool(deps) {
   const { toolName, description, log } = deps;
-  const tool = {
-    name: toolName || "delete_msg",
-    description: description || DEFAULT_DELETE_MESSAGE_TOOL_DESCRIPTION,
-    schema: import_zod.z.object({
-      messageId: import_zod.z.string().min(1, "messageId is required").describe("Specific message ID to delete.")
-    }),
+  return new class extends import_tools.StructuredTool {
+    name = toolName || "delete_msg";
+    description = description || DEFAULT_DELETE_MESSAGE_TOOL_DESCRIPTION;
+    schema = import_zod.z.object({
+      message_id: import_zod.z.string().min(1, "message_id is required").describe("Specific message ID to delete.")
+    }).strict();
     async _call(input, _manager, runnable) {
       try {
         const session = getSession(runnable);
         return await sendDeleteMessage({
           session,
-          messageId: input.messageId,
+          message_id: input.message_id,
           log
         });
       } catch (error) {
@@ -842,13 +856,12 @@ function createDeleteMessageTool(deps) {
         return `delete_msg failed: ${error.message}`;
       }
     }
-  };
-  return tool;
+  }();
 }
 
 // src/features/native-tools/tools/poke.ts
 var import_zod2 = require("zod");
-var import_tools = require("@langchain/core/tools");
+var import_tools2 = require("@langchain/core/tools");
 async function sendPoke(params) {
   try {
     const { session, userId, groupId, log, protocol } = params;
@@ -858,11 +871,11 @@ async function sendPoke(params) {
       session: validatedSession
     } = ensureOneBotSession(session);
     if (error) return error;
-    const resolvedGroupId = groupId?.trim() || validatedSession?.guildId || validatedSession?.channelId || validatedSession?.roomId;
+    const resolvedGroupId = groupId?.trim() || validatedSession?.guildId || validatedSession?.roomId;
     const payload = { user_id: userId };
     if (resolvedGroupId) payload.group_id = resolvedGroupId;
+    const action = payload.group_id ? "group_poke" : "friend_poke";
     if (protocol === "llbot") {
-      const action = payload.group_id ? "group_poke" : "friend_poke";
       if (typeof internal._request === "function") {
         await internal._request(action, payload);
       } else if (typeof internal[action] === "function") {
@@ -871,7 +884,9 @@ async function sendPoke(params) {
         throw new Error(`\u5F53\u524D\u9002\u914D\u5668\u672A\u5B9E\u73B0 ${action} API\u3002`);
       }
     } else if (typeof internal._request === "function") {
-      await internal._request("send_poke", payload);
+      await internal._request(action, payload);
+    } else if (typeof internal[action] === "function") {
+      await internal[action](payload);
     } else if (typeof internal.sendPoke === "function") {
       await internal.sendPoke(
         payload.group_id,
@@ -893,7 +908,7 @@ async function sendPoke(params) {
 }
 function createPokeTool(deps) {
   const { toolName, description, log, protocol } = deps;
-  return new class extends import_tools.StructuredTool {
+  return new class extends import_tools2.StructuredTool {
     name = toolName || "poke_user";
     description = description || DEFAULT_POKE_TOOL_DESCRIPTION;
     schema = import_zod2.z.object({
@@ -915,7 +930,7 @@ function createPokeTool(deps) {
 
 // src/features/native-tools/tools/set-group-ban.ts
 var import_zod3 = require("zod");
-var import_tools2 = require("@langchain/core/tools");
+var import_tools3 = require("@langchain/core/tools");
 function resolveGroupId(session, groupId) {
   return groupId?.trim() || (session.guildId || "").trim() || (session.channelId || "").trim() || (session.roomId || "").trim();
 }
@@ -965,7 +980,7 @@ async function sendGroupBan(params) {
 }
 function createSetGroupBanTool(deps) {
   const { toolName, description, protocol, log } = deps;
-  return new class extends import_tools2.StructuredTool {
+  return new class extends import_tools3.StructuredTool {
     name = toolName || "set_group_ban";
     description = description || DEFAULT_SET_GROUP_BAN_TOOL_DESCRIPTION;
     schema = import_zod3.z.object({
@@ -989,7 +1004,7 @@ function createSetGroupBanTool(deps) {
 
 // src/features/native-tools/tools/set-group-card.ts
 var import_zod4 = require("zod");
-var import_tools3 = require("@langchain/core/tools");
+var import_tools4 = require("@langchain/core/tools");
 async function sendSetGroupCard(params) {
   try {
     const { session, userId, card, groupId, log } = params;
@@ -1020,7 +1035,7 @@ async function sendSetGroupCard(params) {
 }
 function createSetGroupCardTool(deps) {
   const { toolName, description, log } = deps;
-  return new class extends import_tools3.StructuredTool {
+  return new class extends import_tools4.StructuredTool {
     name = toolName || "set_group_card";
     description = description || DEFAULT_SET_GROUP_CARD_TOOL_DESCRIPTION;
     schema = import_zod4.z.object({
@@ -1042,7 +1057,7 @@ function createSetGroupCardTool(deps) {
 
 // src/features/native-tools/tools/set-group-special-title.ts
 var import_zod5 = require("zod");
-var import_tools4 = require("@langchain/core/tools");
+var import_tools5 = require("@langchain/core/tools");
 function resolveGroupId2(session, groupId) {
   return groupId?.trim() || (session.guildId || "").trim() || (session.channelId || "").trim() || (session.roomId || "").trim();
 }
@@ -1082,7 +1097,7 @@ async function sendSetGroupSpecialTitle(params) {
 }
 function createSetGroupSpecialTitleTool(deps) {
   const { toolName, description, protocol, log } = deps;
-  return new class extends import_tools4.StructuredTool {
+  return new class extends import_tools5.StructuredTool {
     name = toolName || "set_group_special_title";
     description = description || DEFAULT_SET_GROUP_SPECIAL_TITLE_TOOL_DESCRIPTION;
     schema = import_zod5.z.object({
@@ -1106,7 +1121,7 @@ function createSetGroupSpecialTitleTool(deps) {
 
 // src/features/native-tools/tools/set-msg-emoji.ts
 var import_zod6 = require("zod");
-var import_tools5 = require("@langchain/core/tools");
+var import_tools6 = require("@langchain/core/tools");
 async function sendMsgEmoji(params) {
   try {
     const { session, messageId, emojiId, log, protocol } = params;
@@ -1137,7 +1152,7 @@ async function sendMsgEmoji(params) {
 }
 function createSetMsgEmojiTool(deps) {
   const { toolName, description, log, protocol } = deps;
-  return new class extends import_tools5.StructuredTool {
+  return new class extends import_tools6.StructuredTool {
     name = toolName || "set_msg_emoji";
     description = description || DEFAULT_SET_MSG_EMOJI_TOOL_DESCRIPTION;
     schema = import_zod6.z.object({
@@ -1159,7 +1174,7 @@ function createSetMsgEmojiTool(deps) {
 
 // src/features/native-tools/tools/profile.ts
 var import_zod7 = require("zod");
-var import_tools6 = require("@langchain/core/tools");
+var import_tools7 = require("@langchain/core/tools");
 var genders = {
   unknown: "0",
   male: "1",
@@ -1186,7 +1201,7 @@ async function sendSetProfile(params) {
 }
 function createSetProfileTool(deps) {
   const { toolName, description, log, protocol } = deps;
-  return new class extends import_tools6.StructuredTool {
+  return new class extends import_tools7.StructuredTool {
     name = toolName || "set_self_profile";
     description = description || DEFAULT_SET_SELF_PROFILE_TOOL_DESCRIPTION;
     schema = import_zod7.z.object({
@@ -1209,7 +1224,7 @@ function createSetProfileTool(deps) {
 
 // src/features/native-tools/tools/set-qq-avatar.ts
 var import_zod8 = require("zod");
-var import_tools7 = require("@langchain/core/tools");
+var import_tools8 = require("@langchain/core/tools");
 function isHttpUrl(value) {
   return /^https?:\/\//i.test(value);
 }
@@ -1237,7 +1252,7 @@ async function fetchImageAsOneBotFile(ctx, imageUrl) {
     throw new Error(`\u65E0\u6CD5\u8BFB\u53D6\u5934\u50CF\u56FE\u7247\uFF1A${error.message}`);
   }
 }
-function assertOneBotSuccess(result) {
+function assertOneBotSuccess2(result) {
   const response = result;
   if (!response || typeof response !== "object") return;
   const failed = response.status === "failed" || typeof response.retcode === "number" && response.retcode !== 0;
@@ -1257,7 +1272,7 @@ async function sendSetQQAvatar(params) {
     const result = await callOneBotAPI(internal, "set_qq_avatar", { file }, [
       "setQQAvatar"
     ]);
-    assertOneBotSuccess(result);
+    assertOneBotSuccess2(result);
     const message = "QQ \u5934\u50CF\u5DF2\u66F4\u65B0\u3002";
     log?.("info", message);
     return message;
@@ -1268,7 +1283,7 @@ async function sendSetQQAvatar(params) {
 }
 function createSetQQAvatarTool(deps) {
   const { ctx, toolName, description, log } = deps;
-  return new class extends import_tools7.StructuredTool {
+  return new class extends import_tools8.StructuredTool {
     name = toolName || "set_qq_avatar";
     description = description || DEFAULT_SET_QQ_AVATAR_TOOL_DESCRIPTION;
     schema = import_zod8.z.object({
@@ -1687,7 +1702,7 @@ function registerCharacterReplyTools(deps) {
             if (typeof action.message_id !== "string") continue;
             await sendDeleteMessage({
               session,
-              messageId: action.message_id,
+              message_id: action.message_id,
               log
             });
           }
@@ -1787,7 +1802,7 @@ function createXmlProcessor(deps) {
         if (messageIds.length > 0) handled = true;
         for (const messageId of messageIds) {
           try {
-            await runDelete({ session, messageId, log });
+            await runDelete({ session, message_id: messageId, log });
           } catch (error) {
             log?.("warn", "XML \u89E6\u53D1\u64A4\u56DE\u5931\u8D25", error);
           }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-toolbox",
   "description": "为 ChatLuna 提供更多原生工具、XML 工具与变量，仅支持 onebot 平台。",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [