koishi-plugin-cocoyyy-console 1.1.3-alpha.4 → 1.1.3-alpha.6

package/lib/index.d.ts

@@ -9,6 +9,7 @@ export interface Config {
     tag_config?: my_config.SaveConfig;
     repeat_config?: my_config.RepeatConfig;
     son_config?: my_config.ShitOrNotConfig;
+    wish_config?: my_config.WishConfig;
     game_config?: my_config.GameConfig;
     test?: string;
 }

package/lib/index.js

@@ -38,7 +38,7 @@ __export(src_exports, {
   savePath: () => savePath
 });
 module.exports = __toCommonJS(src_exports);
-var import_koishi14 = require("koishi");
+var import_koishi16 = require("koishi");
 
 // src/utils/configs/function_config.ts
 var import_koishi = require("koishi");
@@ -50,6 +50,7 @@ var FunctionConfigSchema = import_koishi.Schema.object({
   rbq_flag: import_koishi.Schema.boolean().default(true).description("*人功能是否启用"),
   son_flag: import_koishi.Schema.boolean().default(true).description("鉴别史消息功能是否启用"),
   setu_flag: import_koishi.Schema.boolean().default(true).description("随机涩图功能是否启用"),
+  wish_flag: import_koishi.Schema.boolean().default(true).description("许愿功能是否启用"),
   game_flag: import_koishi.Schema.boolean().default(true).description("游戏功能是否启用"),
   kuro_flag: import_koishi.Schema.boolean().default(true).description("鸣潮功能是否启用")
 });
@@ -110,6 +111,13 @@ var AiAPIConfigSchema = import_koishi8.Schema.object({
   api_key: import_koishi8.Schema.string().default("").description("API Key")
 });
 
+// src/utils/configs/wish_config.ts
+var import_koishi9 = require("koishi");
+var WishConfigSchema = import_koishi9.Schema.object({
+  config_path: import_koishi9.Schema.string().default("").description("配置文件路径"),
+  api_model: import_koishi9.Schema.string().default("").description("AI模型")
+});
+
 // src/infra/mysql_init.ts
 var import_sequelize = require("sequelize");
 var sequelize = null;
@@ -572,7 +580,7 @@ function registerMenuCommands(ctx, connected, functionConfig) {
 __name(registerMenuCommands, "registerMenuCommands");
 
 // src/services/tag_func/tag_commands.ts
-var import_koishi10 = require("koishi");
+var import_koishi11 = require("koishi");
 
 // src/services/tag_func/tag_service.ts
 var import_sequelize4 = require("sequelize");
@@ -580,7 +588,7 @@ var import_fs3 = require("fs");
 var import_path3 = require("path");
 
 // src/services/tag_func/img_service.ts
-var import_koishi9 = require("koishi");
+var import_koishi10 = require("koishi");
 var import_path2 = require("path");
 var import_fs2 = require("fs");
 async function loadImageFromUrl(ctx, url) {
@@ -655,7 +663,7 @@ async function randomImgByTag(tag_name, guild_id) {
     if (ImgList.length <= 0) {
       throw new Error("Don't have image!");
     }
-    const random = new import_koishi9.Random(() => Math.random());
+    const random = new import_koishi10.Random(() => Math.random());
     let result = ImgList[random.int(0, ImgList.length)];
     const filePath = result.get("img_url");
     return filePath;
@@ -900,7 +908,7 @@ function registerTagCommands(ctx, connected, savePath2) {
     if (!exec)
       return `获取图片失败`;
     let path2 = (0, import_url.pathToFileURL)(exec).href;
-    return import_koishi10.h.image(path2);
+    return import_koishi11.h.image(path2);
   });
   ctx.command("bind <参数>", "标签绑定别名").action(async ({ session }, ...args) => {
     if (!dev_mode) {
@@ -1043,7 +1051,7 @@ function registerRepeatMiddleware(ctx, config) {
 __name(registerRepeatMiddleware, "registerRepeatMiddleware");
 
 // src/services/rbq_func/rbq_command.ts
-var import_koishi11 = require("koishi");
+var import_koishi12 = require("koishi");
 
 // src/models/rbq_persons.ts
 var import_sequelize5 = require("sequelize");
@@ -1368,7 +1376,7 @@ function registerRbqCommands(ctx, connected) {
     if (!list || list.length === 0) {
       return "当前群聊还没有设置任何rbq";
     }
-    return "当前群聊rbq列表:\n" + list.map((item) => (0, import_koishi11.h)("at", { id: item })).join(",");
+    return "当前群聊rbq列表:\n" + list.map((item) => (0, import_koishi12.h)("at", { id: item })).join(",");
   });
   ctx.command("rbqadd <参数>", "添加rbq").action(async ({ session }, ...args) => {
     if (!dev_mode) {
@@ -1386,7 +1394,7 @@ function registerRbqCommands(ctx, connected) {
     exec = await create_person(session.guildId, uid);
     if (!exec.result)
       return `添加rbq失败: ${exec.error}`;
-    return "已添加rbq:" + (0, import_koishi11.h)("at", { id: uid });
+    return "已添加rbq:" + (0, import_koishi12.h)("at", { id: uid });
   });
   ctx.command("rbqinstead <参数>", "替换rbq").action(async ({ session }, ...args) => {
     if (!dev_mode) {
@@ -1411,12 +1419,12 @@ function registerRbqCommands(ctx, connected) {
       exec = await instead_person(session.guildId, source_uid, new_target);
       if (!exec.result)
         return `替换rbq失败：${exec.error}`;
-      return "倒反天罡！进去吧你，已替换rbq：\n" + (0, import_koishi11.h)("at", { id: source_uid }) + " -> " + (0, import_koishi11.h)("at", { id: new_target });
+      return "倒反天罡！进去吧你，已替换rbq：\n" + (0, import_koishi12.h)("at", { id: source_uid }) + " -> " + (0, import_koishi12.h)("at", { id: new_target });
     }
     exec = await instead_person(session.guildId, source_uid, target_uid);
     if (!exec.result)
       return `替换rbq失败：${exec.error}`;
-    return (0, import_koishi11.h)("p", "已替换rbq：", (0, import_koishi11.h)("at", { id: source_uid }), " -> ", (0, import_koishi11.h)("at", { id: target_uid }));
+    return (0, import_koishi12.h)("p", "已替换rbq：", (0, import_koishi12.h)("at", { id: source_uid }), " -> ", (0, import_koishi12.h)("at", { id: target_uid }));
   });
   ctx.command("rbqadd_txt <参数>", "添加自定义文本").action(async ({ session }, ...args) => {
     if (!dev_mode) {
@@ -1443,10 +1451,10 @@ function registerRbqCommands(ctx, connected) {
         const contents = await get_content_list(session.guildId, target_uid);
         let content2 = "*死你";
         if (contents && contents.length > 0) {
-          const random = new import_koishi11.Random(() => Math.random());
+          const random = new import_koishi12.Random(() => Math.random());
           content2 = contents[random.int(0, contents.length)];
         }
-        return (0, import_koishi11.h)("at", { id: target_uid }) + "还想自己加文本？！\n" + content2;
+        return (0, import_koishi12.h)("at", { id: target_uid }) + "还想自己加文本？！\n" + content2;
       } catch (error) {
         logger.error("[rbq rbqadd_txt] Error:", error);
         return "不能给自己设置文本，请输入其他qq号";
@@ -1476,10 +1484,10 @@ function registerRbqCommands(ctx, connected) {
       const contents = await get_content_list(guildId, matchedUid);
       let content = "*死你";
       if (contents && contents.length > 0) {
-        const random = new import_koishi11.Random(() => Math.random());
+        const random = new import_koishi12.Random(() => Math.random());
         content = contents[random.int(0, contents.length)];
       }
-      return (0, import_koishi11.h)("at", { id: matchedUid }) + " " + content;
+      return (0, import_koishi12.h)("at", { id: matchedUid }) + " " + content;
     } catch (error) {
       logger.error("[rbq middleware] Error:", error);
       return next();
@@ -1528,14 +1536,19 @@ var import_tesseract2 = require("tesseract.js");
 
 // src/utils/ai_axios.ts
 var import_axios = __toESM(require("axios"));
-async function callOpenRouter(api_url, api_key, api_model = "gpt-4o-mini", messages) {
+async function callOpenRouter(api_url, api_key, api_model = "gpt-4o-mini", messages, tools2, tool_choice) {
   try {
+    const requestBody = {
+      model: api_model,
+      messages
+    };
+    if (tools2 && tools2.length > 0) {
+      requestBody.tools = tools2;
+      requestBody.tool_choice = tool_choice ?? "auto";
+    }
     const { data } = await import_axios.default.post(
       api_url,
-      {
-        model: api_model,
-        messages
-      },
+      requestBody,
       {
         headers: {
           Authorization: `Bearer ${api_key}`,
@@ -1544,7 +1557,17 @@ async function callOpenRouter(api_url, api_key, api_model = "gpt-4o-mini", messa
       }
     );
     const choices = data?.choices ?? [];
-    const reply = choices[0]?.message?.content;
+    const message = choices[0]?.message;
+    const reply = message?.content;
+    const tool_calls = message?.tool_calls;
+    if (tool_calls && tool_calls.length > 0) {
+      const firstToolCall = tool_calls[0];
+      return {
+        err: null,
+        resp: firstToolCall.function.arguments,
+        tool_calls
+      };
+    }
     let responseText;
     let err = null;
     if (typeof reply === "string") {
@@ -1557,20 +1580,46 @@ async function callOpenRouter(api_url, api_key, api_model = "gpt-4o-mini", messa
       if (!responseText) {
         err = "OpenRouter 返回空内容";
       }
+    } else if (reply === null) {
+      err = "OpenRouter 返回空内容";
+      responseText = "";
     } else {
       err = "OpenRouter 返回了未知格式，请检查日志";
+      responseText = "";
     }
-    return { err, resp: responseText };
+    return { err, resp: responseText, tool_calls: void 0 };
   } catch (error) {
     const err = error;
     const status = err.response?.status;
-    const detail = err.response?.data?.error || err.response?.data?.message || err.message;
+    const responseData = err.response?.data;
+    let detail = responseData?.error || responseData?.message || err.message;
+    let errorCode = responseData?.code;
+    if (typeof detail === "object" && detail !== null) {
+      const errorMsg = detail.message || detail.error || JSON.stringify(detail);
+      errorCode = detail.code || errorCode;
+      detail = errorMsg;
+    }
     logger.error("[callOpenRouter Error]: OpenRouter 请求失败", {
       status,
+      code: errorCode,
       detail,
-      url: err.config?.url
+      url: err.config?.url,
+      model: api_model,
+      hasTools: tools2 && tools2.length > 0,
+      requestBody: tools2 && tools2.length > 0 ? {
+        model: api_model,
+        hasTools: true,
+        tool_choice: tool_choice ?? "auto"
+      } : void 0
     });
-    const errorMessage = `test error${status ? `(${status})` : ""}: ${detail}`;
+    if (status === 404 && tools2 && tools2.length > 0) {
+      const toolErrorHint = `模型 "${api_model}" 可能不支持工具调用，或模型名称格式不正确（应包含 provider 前缀，如 "deepseek/deepseek-chat-v3.1"）。请检查模型配置。`;
+      return {
+        err: `OpenRouter error(${status}): ${detail}. ${toolErrorHint}`,
+        resp: null
+      };
+    }
+    const errorMessage = `OpenRouter error${status ? `(${status})` : ""}: ${detail}`;
     return { err: errorMessage, resp: null };
   }
 }
@@ -1692,7 +1741,7 @@ __name(is_at_bot_quote, "is_at_bot_quote");
 
 // src/services/himg_func/himg_service.ts
 var import_axios2 = __toESM(require("axios"));
-var import_koishi12 = require("koishi");
+var import_koishi13 = require("koishi");
 async function randomHImg(keywords, ...args) {
   try {
     const r18 = keywords?.[0];
@@ -1700,7 +1749,7 @@ async function randomHImg(keywords, ...args) {
     const params = new URLSearchParams();
     params.append("excludeAI", "true");
     params.append("size", "regular");
-    const random = new import_koishi12.Random(() => Math.random());
+    const random = new import_koishi13.Random(() => Math.random());
     if (r18) {
       if (r18.toLowerCase() === "r18") {
         params.append("r18", "1");
@@ -1721,7 +1770,7 @@ async function randomHImg(keywords, ...args) {
         let author = item.author;
         let url = item.urls.regular;
         let tags2 = item.tags;
-        result_content += "作者: " + author + "\n标签: \n[" + tags2.join(",") + "]\n" + import_koishi12.h.image(url) + "\n";
+        result_content += "作者: " + author + "\n标签: \n[" + tags2.join(",") + "]\n" + import_koishi13.h.image(url) + "\n";
       }
       return {
         result: result_content,
@@ -1777,6 +1826,172 @@ function registerHImgCommands(ctx) {
 }
 __name(registerHImgCommands, "registerHImgCommands");
 
+// src/services/wish_func/wish_command.ts
+var import_koishi14 = require("koishi");
+
+// src/services/wish_func/wish_service.ts
+var chatHistory2 = [];
+var tools = [
+  {
+    type: "function",
+    function: {
+      name: "wish_audit_result",
+      description: "对用户愿望进行合规审计并返回结构化结果",
+      parameters: {
+        type: "object",
+        properties: {
+          category: {
+            type: "string",
+            enum: ["block", "allow"],
+            description: "是否允许该愿望"
+          },
+          reason: {
+            type: "string",
+            description: "block：说明触犯的禁忌类型；allow：说明内容合规"
+          },
+          wish: {
+            type: "string",
+            description: "allow：复述用户愿望（去除语气词）；block：必须为空字符串"
+          }
+        },
+        required: ["category", "reason", "wish"],
+        additionalProperties: false
+      }
+    }
+  },
+  {
+    type: "function",
+    function: {
+      name: "wish_generation_result",
+      description: "生成愿望实现的场景",
+      parameters: {
+        type: "object",
+        properties: {
+          scenario: {
+            type: "string",
+            description: "愿望实现的场景"
+          }
+        },
+        required: ["scenario"],
+        additionalProperties: false
+      }
+    }
+  }
+];
+async function checkAudit(local_config4, wish_content, config, wish_config) {
+  let prompt_msg = "";
+  if (!local_config4) return { result: false, reason: "未加载配置文件，请查看日志" };
+  prompt_msg = local_config4.wish_config?.prompts["audit"];
+  if (!prompt_msg) return { result: false, reason: "未找到prompt，请查看日志" };
+  try {
+    prompt_msg = prompt_msg.replace("{{USER_TEXT}}", wish_content);
+    chatHistory2 = [];
+    chatHistory2.push({ role: "system", content: [{ type: "text", text: prompt_msg }] });
+    const using_model = wish_config.api_model || config.api_model;
+    const { err, resp } = await callOpenRouter(
+      config.api_url,
+      config.api_key,
+      using_model,
+      chatHistory2,
+      tools,
+      { type: "function", function: { name: "wish_audit_result" } }
+    );
+    if (err != null) {
+      logger.error("[checkAudit Error]: " + err);
+      return { result: false, reason: err };
+    }
+    if (!resp) {
+      logger.error("[checkAudit Error]: API返回为空");
+      return { result: false, reason: "API返回为空" };
+    }
+    const json = JSON.parse(resp);
+    if (json.category == "block") {
+      logger.info("[checkAudit Info]: 愿望被拒绝，原因: " + json.reason);
+      return { result: false, reason: json.reason };
+    }
+    if (json.category == "allow" || json.category == "review") {
+      return { result: true, reason: json.reason };
+    }
+    logger.error("[checkAudit Error]: API返回有误，未触发block或allow/review: " + resp);
+    return { result: false, reason: "API返回有误，未触发block或allow/review" };
+  } catch (e) {
+    logger.error("[checkAudit Error]: " + e);
+    return { result: false, reason: "未知错误，请查看日志" };
+  }
+}
+__name(checkAudit, "checkAudit");
+async function gernerationSoluation(local_config4, wish_content, config, wish_config) {
+  let prompt_msg = "";
+  if (!local_config4) return "未加载配置文件，请查看日志";
+  prompt_msg = local_config4.wish_config?.prompts["generation"];
+  if (!prompt_msg) return "未找到prompt，请查看日志";
+  try {
+    prompt_msg = prompt_msg.replace("{{USER_TEXT}}", wish_content);
+    chatHistory2 = [];
+    chatHistory2.push({ role: "system", content: [{ type: "text", text: prompt_msg }] });
+    const using_model = wish_config.api_model || config.api_model;
+    const { err, resp } = await callOpenRouter(
+      config.api_url,
+      config.api_key,
+      using_model,
+      chatHistory2,
+      tools,
+      { type: "function", function: { name: "wish_generation_result" } }
+    );
+    if (err != null) {
+      logger.error("[gernerationSoluation Error]: " + err);
+      return null;
+    }
+    const json = JSON.parse(resp);
+    const scenario = json.scenario;
+    if (!scenario) {
+      logger.info("[gernerationSoluation Info]: API返回有误: " + resp);
+      return null;
+    }
+    return scenario;
+  } catch (e) {
+    logger.error("[gernerationSoluation Error]: " + e);
+    return null;
+  }
+}
+__name(gernerationSoluation, "gernerationSoluation");
+
+// src/services/wish_func/wish_command.ts
+var local_config2 = null;
+var think_flag2 = false;
+function registerWishCommands(ctx, ai_config, wish_config) {
+  if (wish_config?.config_path) {
+    local_config2 = loadYamlConfig(wish_config.config_path);
+    if (local_config2) {
+      logger.info("[loadYamlConfig Info]: Wish 成功加载配置文件");
+    } else {
+      logger.error("[loadYamlConfig Error]: Wish 配置文件加载失败，将使用默认配置");
+    }
+  } else {
+    logger.error("[loadYamlConfig Error]: 未配置 Wish 配置文件路径");
+  }
+  ctx.command("wish <参数>", "许愿").action(async ({ session }, ...args) => {
+    if (!dev_mode) {
+      if (!is_at_bot(session)) return "请提供正确格式，如： @bot wish [愿望消息(不要超过80字)]";
+    }
+    if (think_flag2) return "请等待上一位的祈祷结果";
+    const wish_content = args?.[0];
+    if (!wish_content) return "输入愿望消息，不要超过80字";
+    await session.send("已收到，正在祈祷中...");
+    think_flag2 = true;
+    try {
+      let exec = await checkAudit(local_config2, wish_content, ai_config, wish_config);
+      if (!exec) return "愿望不合规被拒绝，请重新许愿";
+      let exec_generation = await gernerationSoluation(local_config2, wish_content, ai_config, wish_config);
+      if (!exec_generation) return "愿望实现失败，请重新许愿";
+      return (0, import_koishi14.h)("at", { id: session.userId }) + "\n" + exec_generation;
+    } finally {
+      think_flag2 = false;
+    }
+  });
+}
+__name(registerWishCommands, "registerWishCommands");
+
 // src/services/kuro_func/kuro_service.ts
 var import_axios3 = __toESM(require("axios"));
 var import_qs = __toESM(require("qs"));
@@ -2186,7 +2401,7 @@ function registerKuroCommands(ctx, connected) {
 __name(registerKuroCommands, "registerKuroCommands");
 
 // src/services/game_func/game_command.ts
-var import_koishi13 = require("koishi");
+var import_koishi15 = require("koishi");
 
 // src/services/game_func/game_service.ts
 var gameTimeout = null;
@@ -2215,11 +2430,11 @@ __name(clearGameTimeout, "clearGameTimeout");
 // src/services/game_func/games/game_turtlesoup_service.ts
 var is_gaming = false;
 var chatPrompt = [];
-var chatHistory2 = [];
+var chatHistory3 = [];
 async function startSituationPuzzle(config) {
   chatPrompt = [];
-  chatHistory2 = [];
-  const prompt_start = local_config2?.game?.situation_puzzle;
+  chatHistory3 = [];
+  const prompt_start = local_config3?.game?.situation_puzzle;
   chatPrompt.push({ role: "system", content: [{ type: "text", text: prompt_start }] });
   const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatPrompt);
   if (err != null) {
@@ -2234,7 +2449,7 @@ async function startSituationPuzzle(config) {
     logger.info(`[SituationPuzzle Timeout]: 游戏已超时（${GAME_TIMEOUT_MINUTES}分钟），自动结束游戏`);
     is_gaming = false;
     chatPrompt = [];
-    chatHistory2 = [];
+    chatHistory3 = [];
     setGameTimeout(null);
   }, GAME_TIMEOUT_MINUTES * 60 * 1e3);
   logger.info("[startSituationPuzzle Info]: ai api send message success");
@@ -2242,9 +2457,9 @@ async function startSituationPuzzle(config) {
 }
 __name(startSituationPuzzle, "startSituationPuzzle");
 async function questSituationPuzzle(content, config) {
-  chatHistory2 = [...chatPrompt];
-  chatHistory2.push({ role: "user", content: [{ type: "text", text: content }] });
-  const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory2);
+  chatHistory3 = [...chatPrompt];
+  chatHistory3.push({ role: "user", content: [{ type: "text", text: content }] });
+  const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory3);
   if (err != null) {
     logger.error("[questSituationPuzzle Error]: " + err);
     return null;
@@ -2253,7 +2468,7 @@ async function questSituationPuzzle(content, config) {
   if (resp.includes("猜中了")) {
     is_gaming = false;
     chatPrompt = [];
-    chatHistory2 = [];
+    chatHistory3 = [];
     clearGameTimeout();
   } else {
     clearGameTimeout();
@@ -2261,7 +2476,7 @@ async function questSituationPuzzle(content, config) {
       logger.info(`[SituationPuzzle Timeout]: 游戏已超时（${GAME_TIMEOUT_MINUTES}分钟），自动结束游戏`);
       is_gaming = false;
       chatPrompt = [];
-      chatHistory2 = [];
+      chatHistory3 = [];
       setGameTimeout(null);
     }, GAME_TIMEOUT_MINUTES * 60 * 1e3);
   }
@@ -2270,9 +2485,9 @@ async function questSituationPuzzle(content, config) {
 __name(questSituationPuzzle, "questSituationPuzzle");
 async function endSituationPuzzle(config) {
   is_gaming = false;
-  chatHistory2 = [...chatPrompt];
-  chatHistory2.push({ role: "user", content: [{ type: "text", text: "结束游戏，请给出答案" }] });
-  const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory2);
+  chatHistory3 = [...chatPrompt];
+  chatHistory3.push({ role: "user", content: [{ type: "text", text: "结束游戏，请给出答案" }] });
+  const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory3);
   if (err != null) {
     logger.error("[endSituationPuzzle Error]: " + err);
     return null;
@@ -2283,16 +2498,16 @@ async function endSituationPuzzle(config) {
 }
 __name(endSituationPuzzle, "endSituationPuzzle");
 async function rerollSituationPuzzle(config) {
-  chatHistory2 = [...chatPrompt];
-  chatHistory2.push({ role: "user", content: [{ type: "text", text: "重新生成新谜题" }] });
-  const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory2);
+  chatHistory3 = [...chatPrompt];
+  chatHistory3.push({ role: "user", content: [{ type: "text", text: "重新生成新谜题" }] });
+  const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory3);
   if (err != null) {
     logger.error("[rerollSituationPuzzle Error]: " + err);
     chatPrompt.pop();
     return null;
   }
   chatPrompt = [];
-  const prompt_start = local_config2?.game?.situation_puzzle;
+  const prompt_start = local_config3?.game?.situation_puzzle;
   chatPrompt.push({ role: "system", content: [{ type: "text", text: prompt_start }] });
   chatPrompt.push({ role: "assistant", content: [{ type: "text", text: resp }] });
   is_gaming = true;
@@ -2301,7 +2516,7 @@ async function rerollSituationPuzzle(config) {
     logger.info(`[SituationPuzzle Timeout]: 游戏已超时（${GAME_TIMEOUT_MINUTES}分钟），自动结束游戏`);
     is_gaming = false;
     chatPrompt = [];
-    chatHistory2 = [];
+    chatHistory3 = [];
     setGameTimeout(null);
   }, GAME_TIMEOUT_MINUTES * 60 * 1e3);
   logger.info("[rerollSituationPuzzle Info]: ai api send message success");
@@ -2411,7 +2626,7 @@ function getSolution() {
 __name(getSolution, "getSolution");
 
 // src/services/game_func/game_command.ts
-var local_config2 = null;
+var local_config3 = null;
 var is_thinking = false;
 var now_game = null;
 var gameList = [
@@ -2428,12 +2643,13 @@ var gameList = [
 ];
 var commandList = [
   "gamelist",
-  "startgame"
+  "startgame",
+  "endgame"
 ];
 function registerGameCommands(ctx, game_config, ai_config) {
   if (game_config?.config_path) {
-    local_config2 = loadYamlConfig(game_config.config_path);
-    if (local_config2) {
+    local_config3 = loadYamlConfig(game_config.config_path);
+    if (local_config3) {
       logger.info("[loadYamlConfig Info]: Game 成功加载配置文件");
     } else {
       logger.error("[loadYamlConfig Error]: Game 配置文件加载失败，将使用默认配置");
@@ -2442,7 +2658,7 @@ function registerGameCommands(ctx, game_config, ai_config) {
     logger.error("[loadYamlConfig Error]: 未配置 Game 配置文件路径");
   }
   if (GAME_TIMEOUT_MINUTES <= 0) {
-    setGameTimeoutMinutes(local_config2?.game?.timeout_minutes || 10);
+    setGameTimeoutMinutes(local_config3?.game?.timeout_minutes || 10);
   }
   ctx.command("gamelist", "查看所有游戏").action(async ({}) => {
     return `[所有命令都需要@bot]
@@ -2493,7 +2709,6 @@ function registerGameCommands(ctx, game_config, ai_config) {
       let resp_text = "";
       switch (now_game) {
         case gameList[0].command:
-          await session.send("正在结束游戏...");
           resp_text = await endSituationPuzzle(ai_config);
           now_game = null;
           return checkResp(resp_text);
@@ -2539,6 +2754,7 @@ async function situationPuzzleMiddleware(session, ai_config) {
   const withoutTags = content.replace(/<[^>]+>/g, " ");
   const text = withoutTags.replace(/\s+/g, " ").trim();
   try {
+    if (is_thinking) return "正在思考，请耐心等待...";
     is_thinking = true;
     if (text.includes("reroll")) {
       const resp2 = await rerollSituationPuzzle(ai_config);
@@ -2551,7 +2767,7 @@ async function situationPuzzleMiddleware(session, ai_config) {
       return checkResp(resp2);
     }
     const resp = await questSituationPuzzle(text, ai_config);
-    return (0, import_koishi13.h)("at", { id: userId }) + " " + checkResp(resp);
+    return (0, import_koishi15.h)("at", { id: userId }) + " " + checkResp(resp);
   } finally {
     is_thinking = false;
   }
@@ -2568,17 +2784,18 @@ __name(checkResp, "checkResp");
 // src/index.ts
 var name = "cocoyyy-console";
 var dev_mode;
-var Config = import_koishi14.Schema.object({
+var Config = import_koishi16.Schema.object({
   function_config: FunctionConfigSchema.description("功能开关配置"),
   ai_config: AiAPIConfigSchema.description("AI API配置"),
   mysql_config: MysqlConfigSchema.description("MySQL 数据库配置"),
   tag_config: SaveConfigSchema.description("tag图片保存配置"),
   repeat_config: RepeatConfigSchema.description("复读配置"),
   son_config: ShitOrNotConfigSchema.description("SON配置"),
+  wish_config: WishConfigSchema.description("许愿配置"),
   game_config: GameConfigSchema.description("游戏配置"),
-  test: import_koishi14.Schema.string().description("测试")
+  test: import_koishi16.Schema.string().description("测试")
 });
-var logger = new import_koishi14.Logger(name);
+var logger = new import_koishi16.Logger(name);
 var savePath = null;
 async function apply(ctx, config) {
   ctx = ctx.guild();
@@ -2602,6 +2819,8 @@ async function apply(ctx, config) {
     registerShitOrNotCommands(ctx, config?.ai_config, config?.son_config);
   if (config.function_config.setu_flag)
     registerHImgCommands(ctx);
+  if (config.function_config.wish_flag)
+    registerWishCommands(ctx, config?.ai_config, config?.wish_config);
   if (config.function_config.game_flag) {
     registerGameCommands(ctx, config?.game_config, config?.ai_config);
     registerGameMiddleware(ctx, config?.ai_config);

package/lib/services/wish_func/wish_command.d.ts

@@ -0,0 +1,5 @@
+import { Context } from 'koishi';
+import { AiAPIConfig } from '../../utils/configs/ai_config';
+import { WishConfig } from '../../utils/configs/wish_config';
+declare function registerWishCommands(ctx: Context, ai_config: AiAPIConfig, wish_config: WishConfig): void;
+export { registerWishCommands };

package/lib/services/wish_func/wish_service.d.ts

@@ -0,0 +1,8 @@
+import { AiAPIConfig } from '../../utils/configs/ai_config';
+import { WishConfig } from '../../utils/configs/wish_config';
+declare function checkAudit(local_config: any, wish_content: string, config: AiAPIConfig, wish_config: WishConfig): Promise<{
+    result: boolean;
+    reason: string;
+}>;
+declare function gernerationSoluation(local_config: any, wish_content: string, config: AiAPIConfig, wish_config: WishConfig): Promise<any>;
+export { checkAudit, gernerationSoluation };

package/lib/utils/ai_axios.d.ts

@@ -8,8 +8,37 @@ export interface OpenRouterMessage {
         };
     }>;
 }
+export interface OpenRouterTool {
+    type: 'function';
+    function: {
+        name: string;
+        description: string;
+        parameters: {
+            type: string;
+            properties?: Record<string, any>;
+            required?: string[];
+            additionalProperties?: boolean;
+        };
+    };
+}
+export type OpenRouterToolChoice = 'none' | 'auto' | 'required' | {
+    type: 'function';
+    function: {
+        name: string;
+    };
+};
+interface OpenRouterToolCall {
+    id: string;
+    type: 'function';
+    function: {
+        name: string;
+        arguments: string;
+    };
+}
 export interface OpenRouterResult {
     err: string | null;
     resp: string | null;
+    tool_calls?: OpenRouterToolCall[];
 }
-export declare function callOpenRouter(api_url: string, api_key: string, api_model: string, messages: OpenRouterMessage[]): Promise<OpenRouterResult>;
+export declare function callOpenRouter(api_url: string, api_key: string, api_model: string, messages: OpenRouterMessage[], tools?: OpenRouterTool[], tool_choice?: OpenRouterToolChoice): Promise<OpenRouterResult>;
+export {};

package/lib/utils/config.d.ts

@@ -6,3 +6,4 @@ export * from './configs/redis_config';
 export * from './configs/son_config';
 export * from './configs/game_config';
 export * from './configs/ai_config';
+export * from './configs/wish_config';

package/lib/utils/configs/function_config.d.ts

@@ -7,6 +7,7 @@ interface FunctionConfig {
     rbq_flag: boolean;
     son_flag: boolean;
     setu_flag: boolean;
+    wish_flag: boolean;
     game_flag: boolean;
     kuro_flag: boolean;
 }

package/lib/utils/configs/wish_config.d.ts

@@ -0,0 +1,7 @@
+import { Schema } from 'koishi';
+interface WishConfig {
+    config_path?: string;
+    api_model?: string;
+}
+declare const WishConfigSchema: Schema<WishConfig>;
+export { WishConfig, WishConfigSchema, };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cocoyyy-console",
   "description": "自用koishi插件，功能包含复读，记录黑历史，*人等",
-  "version": "1.1.3-alpha.4",
+  "version": "1.1.3-alpha.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [