mioku-plugin-chat 2.6.0 → 2.7.0

package/db.ts

@@ -381,6 +381,11 @@ export async function initDatabase(): Promise<ChatDatabase> {
       VALUES ($hash, $url, $type, $description, $emotion, $character, $filePath, $createdAt)
       ON CONFLICT(hash) DO UPDATE SET
         url = excluded.url,
+        type = excluded.type,
+        description = excluded.description,
+        emotion = excluded.emotion,
+        character = excluded.character,
+        file_path = excluded.file_path,
         created_at = excluded.created_at
     `),
     getImageByHash: db.prepare(`SELECT * FROM images WHERE hash = $hash`),
@@ -710,9 +715,9 @@ export async function initDatabase(): Promise<ChatDatabase> {
         $url: image.url,
         $type: image.type,
         $description: image.description,
-        $emotion: image.emotion ?? null,
-        $character: image.character ?? null,
-        $filePath: image.filePath ?? null,
+        $emotion: null,
+        $character: null,
+        $filePath: null,
         $createdAt: image.createdAt,
       });
     },
@@ -726,9 +731,6 @@ export async function initDatabase(): Promise<ChatDatabase> {
         url: row.url,
         type: row.type,
         description: row.description,
-        emotion: row.emotion,
-        character: row.character,
-        filePath: row.file_path,
         createdAt: row.created_at,
       };
     },
@@ -742,9 +744,6 @@ export async function initDatabase(): Promise<ChatDatabase> {
         url: row.url,
         type: row.type,
         description: row.description,
-        emotion: row.emotion,
-        character: row.character,
-        filePath: row.file_path,
         createdAt: row.created_at,
       };
     },
@@ -757,9 +756,6 @@ export async function initDatabase(): Promise<ChatDatabase> {
         url: row.url,
         type: row.type,
         description: row.description,
-        emotion: row.emotion,
-        character: row.character,
-        filePath: row.file_path,
         createdAt: row.created_at,
       }));
     },

package/handlers/idle-debug.ts

@@ -2,8 +2,8 @@ import type { MiokiContext } from "mioki";
 import type { AIService } from "mioku";
 import type { ChatPluginContext } from "../context";
 import type { ChatConfig, TargetMessage } from "../types";
+import { finalizeChatTurn } from "../core/chat-turn";
 import { getBotRole } from "../utils";
-import { buildStructuredUserInputFromTarget } from "../manage/group-structured-history";
 
 export async function handleIdleCheckDebug(
   pluginCtx: ChatPluginContext,
@@ -16,7 +16,8 @@ export async function handleIdleCheckDebug(
     await e.reply("只有主人才能使用这个指令~");
     return;
   }
-  const groupIdStr = e.message[0]?.text?.replace("/空闲检查", "")?.trim() || "";
+  const groupIdStr =
+    e.message[0]?.text?.replace("/空闲检查", "")?.trim() || "";
   const targetGroupId = parseInt(groupIdStr, 10);
   if (!targetGroupId) {
     await e.reply("请指定群号，如：/空闲检查 123456");
@@ -25,108 +26,106 @@ export async function handleIdleCheckDebug(
 
   const groupSessionId = `group:${targetGroupId}`;
   try {
-    const now = Date.now();
-    const botNickname =
-      cfg.nicknames[0] || ctx.pickBot(e.self_id).nickname || "Bot";
-    ctx.logger.info(`[Debug] Manual idle check: group ${targetGroupId}`);
-
-    const { history } = await pluginCtx.getGroupHistoryMessages(
-      targetGroupId,
-      groupSessionId,
-      ctx,
-      cfg.historyCount,
-      pluginCtx.db,
-      e.self_id,
-      pluginCtx.buildHistoryMediaOptions(pluginCtx.aiInstance, cfg),
-    );
-    const planResult = await pluginCtx.humanize.actionPlanner.plan(
+    await pluginCtx.sessionTurnScheduler.run(
       groupSessionId,
-      botNickname,
-      history,
-      "[Check if you want to answer the call]",
-      true,
-    );
+      "idle-debug",
+      async () => {
+        const now = Date.now();
+        const botNickname =
+          cfg.nicknames[0] || ctx.pickBot(e.self_id).nickname || "Bot";
+        ctx.logger.info(`[Debug] Manual idle check: group ${targetGroupId}`);
 
-    if (planResult.action !== "reply") {
-      await e.reply(
-        `[空闲检测] 群 ${targetGroupId}\n决定: ${planResult.action}\n原因: ${planResult.reason}`,
-      );
-      return;
-    }
+        const { history } = await pluginCtx.getGroupHistoryMessages(
+          targetGroupId,
+          groupSessionId,
+          ctx,
+          cfg.historyCount,
+          pluginCtx.db,
+          e.self_id,
+          pluginCtx.buildHistoryMediaOptions(pluginCtx.aiInstance, cfg),
+        );
+        const planResult = await pluginCtx.humanize.actionPlanner.plan(
+          groupSessionId,
+          botNickname,
+          history,
+          "[Check if you want to answer the call]",
+          true,
+        );
 
-    const targetMessage: TargetMessage = {
-      userName: "系统",
-      userId: 0,
-      userRole: "member",
-      content: "[No one in the group is talking? I'll answer!]",
-      messageId: 0,
-      timestamp: now,
-    };
-    const botRole = await getBotRole(targetGroupId, ctx, e.self_id);
-    const toolCtx = pluginCtx.buildToolContext({
-      ctx,
-      event: null,
-      groupSessionId,
-      groupId: targetGroupId,
-      userId: 0,
-      config: cfg,
-      aiService: ctx.services!.ai as AIService,
-      db: pluginCtx.db,
-      botRole,
-      humanize: pluginCtx.humanize,
-      targetMessage,
-      selfId: e.self_id,
-    });
+        if (planResult.action !== "reply") {
+          await e.reply(
+            `[空闲检测] 群 ${targetGroupId}\n决定: ${planResult.action}\n原因: ${planResult.reason}`,
+          );
+          return;
+        }
 
-    const result = await pluginCtx.runWithRateLimitGuard(
-      () =>
-        pluginCtx.runChat(
-          pluginCtx.aiInstance,
-          toolCtx,
-          history,
+        const targetMessage: TargetMessage = {
+          userName: "系统",
+          userId: 0,
+          userRole: "member",
+          content: "[No one in the group is talking? I'll answer!]",
+          messageId: 0,
+          timestamp: now,
+        };
+        const botRole = await getBotRole(targetGroupId, ctx, e.self_id);
+        const toolCtx = pluginCtx.buildToolContext({
+          ctx,
+          event: null,
+          groupSessionId,
+          groupId: targetGroupId,
+          userId: 0,
+          config: cfg,
+          aiService: ctx.services!.ai as AIService,
+          db: pluginCtx.db,
+          botRole,
+          humanize: pluginCtx.humanize,
           targetMessage,
-          {
-            config: cfg,
-            botNickname,
-            botRole: toolCtx.botRole,
-            aiService: ctx.services!.ai as AIService,
-            isGroup: true,
-            plannerThoughts: `You stumbled upon some message in this group and decided to reply.\nQuote messages from group friends appropriately (using [reply:message ID] format).\nDon't mention your intentions like "I'm here to answer".`,
-            replyContext: { type: "idle" },
-          },
-          pluginCtx.humanize,
-          pluginCtx.skillManager,
-        ),
-      { groupId: targetGroupId, label: "idle-check" },
-    );
-    if (!result) {
-      await e.reply(`[空闲检测] 群 ${targetGroupId} 因限流被跳过`);
-      return;
-    }
+          selfId: e.self_id,
+        });
 
-    await pluginCtx.sendAIResponse(
-      {
-        ctx,
-        groupId: targetGroupId,
-        messages: result.messages,
-        config: cfg,
-        sentIndices: toolCtx.sentMessageIndices,
+        const result = await pluginCtx.runWithRateLimitGuard(
+          () =>
+            pluginCtx.runChat(
+              pluginCtx.aiInstance,
+              toolCtx,
+              history,
+              targetMessage,
+              {
+                config: cfg,
+                botNickname,
+                botRole: toolCtx.botRole,
+                aiService: ctx.services!.ai as AIService,
+                isGroup: true,
+                plannerThoughts:
+                  'You stumbled upon some message in this group and decided to reply.\nQuote messages from group friends appropriately (using [reply:message ID] format).\nDon\'t mention your intentions like "I\'m here to answer".',
+                replyContext: { type: "idle" },
+              },
+              pluginCtx.humanize,
+              pluginCtx.skillManager,
+            ),
+          { groupId: targetGroupId, label: "idle-check" },
+        );
+        if (!result) {
+          await e.reply(`[空闲检测] 群 ${targetGroupId} 因限流被跳过`);
+          return;
+        }
+
+        await finalizeChatTurn(pluginCtx, {
+          event: null,
+          cfg,
+          result,
+          groupId: targetGroupId,
+          groupSessionId,
+          userId: 0,
+          selfId: e.self_id,
+          toolCtx,
+          send: true,
+          isLive: true,
+        });
+        await e.reply(
+          `[空闲检测] 群 ${targetGroupId} 已发送回复: ${planResult.reason}`,
+        );
       },
-      e.self_id,
-    );
-    const now2 = Date.now();
-    pluginCtx.saveBotMessages(
-      targetGroupId,
-      groupSessionId,
-      result.messages,
-      now2,
-      cfg,
-      pluginCtx.db,
-      ctx,
-      e.self_id,
-    );
-    await e.reply(
-      `[空闲检测] 群 ${targetGroupId} 已发送回复: ${planResult.reason}`,
     );
   } catch (err) {
     ctx.logger.error(`[Debug] Idle check failed: ${err}`);

package/handlers/message.ts

@@ -104,10 +104,6 @@ export function createMessageHandler(
                     groupId,
                     label: "image-analysis",
                   }),
-                allowedCharacters:
-                  cfg.emoji?.characters && cfg.emoji.characters.length > 0
-                    ? cfg.emoji.characters
-                    : undefined,
               }).catch((err) =>
                 ctx.logger.error(`[image-analyzer] Failed: ${err}`),
               );
@@ -232,24 +228,7 @@ export function createMessageHandler(
       }
     }
 
-    // 检查是否在处理中
-    const processingSet = runtimeState.processingSet;
-    if (isGroup && groupId && groupSessionId) {
-      if (processingSet.has(groupSessionId)) {
-        if ((atBot || mentionedNickname) && !runtimeState.isRateLimitBlocked()) {
-          pluginCtx.queueManager.enqueue(groupSessionId, e, cfg);
-          pluginCtx.rateLimiter.recordInteraction(groupId, userId);
-        }
-        return;
-      }
-      processingSet.add(groupSessionId);
-    } else {
-      const triggerKey = `personal:${userId}`;
-      if (processingSet.has(triggerKey)) return;
-      processingSet.add(triggerKey);
-    }
-
-    try {
+    const runTriggeredMessage = async (): Promise<void> => {
       if (atBot) {
         if (!pluginCtx.rateLimiter.canProcess(userId, groupId, text)) return;
 
@@ -279,9 +258,10 @@ export function createMessageHandler(
       }
 
       if (quotedBot || mentionedNickname) {
+        if (!groupId || !groupSessionId) return;
         const { history } = await pluginCtx.getGroupHistoryMessages(
-          groupId!,
-          groupSessionId!,
+          groupId,
+          groupSessionId,
           ctx,
           cfg.historyCount,
           pluginCtx.db,
@@ -291,7 +271,7 @@ export function createMessageHandler(
         const botNickname =
           cfg.nicknames[0] || ctx.pickBot(e.self_id).nickname || "Bot";
         const planResult = await pluginCtx.humanize.actionPlanner.plan(
-          groupSessionId!,
+          groupSessionId,
           botNickname,
           history,
           text,
@@ -300,18 +280,39 @@ export function createMessageHandler(
         if (!pluginCtx.rateLimiter.canProcess(userId, groupId, text)) return;
         pluginCtx.rateLimiter.record(userId, groupId, text);
         await processChat(e, pluginCtx, runtimeState);
+      }
+    };
+
+    if (isGroup && groupId && groupSessionId) {
+      if (!atBot && !quotedBot && !mentionedNickname) return;
+      if (pluginCtx.sessionTurnScheduler.isBusy(groupSessionId)) {
+        if (!runtimeState.isRateLimitBlocked()) {
+          pluginCtx.queueManager.enqueue(groupSessionId, e, cfg);
+          pluginCtx.rateLimiter.recordInteraction(groupId, userId);
+          pluginCtx.queueProcessor.scheduleQueuedMessages(
+            groupSessionId,
+            e.self_id,
+          );
+        }
         return;
       }
+
+      await pluginCtx.sessionTurnScheduler.run(
+        groupSessionId,
+        "message",
+        runTriggeredMessage,
+      );
+      return;
+    }
+
+    const triggerKey = `personal:${userId}`;
+    const processingSet = runtimeState.processingSet;
+    if (processingSet.has(triggerKey)) return;
+    processingSet.add(triggerKey);
+    try {
+      await runTriggeredMessage();
     } finally {
-      if (isGroup && groupId && groupSessionId) {
-        processingSet.delete(groupSessionId);
-        await pluginCtx.queueProcessor.processQueuedMessages(
-          groupSessionId,
-          e.self_id,
-        );
-      } else {
-        processingSet.delete(`personal:${userId}`);
-      }
+      processingSet.delete(triggerKey);
     }
   };
 }

package/handlers/poke.ts

@@ -2,6 +2,7 @@ import type { ChatPluginContext, ChatHandlerState } from "../context";
 import type { TargetMessage } from "../types";
 import { getBotRole, isGroupAllowed } from "../utils";
 import { buildStructuredUserInputFromTarget } from "../manage/group-structured-history";
+import { finalizeChatTurn } from "../core/chat-turn";
 import { POKE_COOLDOWN_MS } from "./message";
 
 export function createPokeHandler(
@@ -25,141 +26,118 @@ export function createPokeHandler(
     const groupSessionId = `group:${groupId}`;
     if (runtimeState.isRateLimitBlocked()) return;
 
-    const processingSet = runtimeState.processingSet;
-    if (processingSet.has(groupSessionId)) {
-      if (!runtimeState.isRateLimitBlocked()) {
-        pluginCtx.queueManager.enqueue(groupSessionId, e, cfg);
-      }
-      return;
-    }
-
-    processingSet.add(groupSessionId);
-    pluginCtx.sessionManager.getOrCreate(groupSessionId, "group", groupId);
-
     try {
-      const userId = e.user_id || e.operator_id;
-      const botRole = await getBotRole(groupId, ctx, e.self_id);
-      const botNickname =
-        cfg.nicknames[0] || ctx.pickBot(e.self_id).nickname || "Bot";
-
-      let senderName = String(userId);
-      try {
-        const memberInfo = await ctx
-          .pickBot(e.self_id)
-          .getGroupMemberInfo(groupId, userId);
-        senderName =
-          (memberInfo as any).card ||
-          (memberInfo as any).nickname ||
-          String(userId);
-      } catch {}
+      await pluginCtx.sessionTurnScheduler.run(
+        groupSessionId,
+        "poke",
+        async () => {
+          pluginCtx.sessionManager.getOrCreate(
+            groupSessionId,
+            "group",
+            groupId,
+          );
+          const userId = e.user_id || e.operator_id;
+          const botRole = await getBotRole(groupId, ctx, e.self_id);
+          const botNickname =
+            cfg.nicknames[0] || ctx.pickBot(e.self_id).nickname || "Bot";
 
-      const targetMessage: TargetMessage = {
-        userName: senderName,
-        userId,
-        userRole: "member",
-        content: `[${senderName} poked you]`,
-        timestamp: Date.now(),
-      };
+          let senderName = String(userId);
+          try {
+            const memberInfo = await ctx
+              .pickBot(e.self_id)
+              .getGroupMemberInfo(groupId, userId);
+            senderName =
+              (memberInfo as any).card ||
+              (memberInfo as any).nickname ||
+              String(userId);
+          } catch {}
 
-      const { history } = await pluginCtx.getGroupHistoryMessages(
-        groupId,
-        groupSessionId,
-        ctx,
-        cfg.historyCount,
-        pluginCtx.db,
-        e.self_id,
-        pluginCtx.buildHistoryMediaOptions(pluginCtx.aiInstance, cfg),
-      );
-      const { groupName, memberCount } = await pluginCtx.getGroupInfoData(
-        ctx,
-        groupId,
-        e.self_id,
-      );
+          const targetMessage: TargetMessage = {
+            userName: senderName,
+            userId,
+            userRole: "member",
+            content: `[${senderName} poked you]`,
+            timestamp: Date.now(),
+          };
 
-      const toolCtx = pluginCtx.buildToolContext({
-        ctx,
-        event: e,
-        groupSessionId,
-        groupId,
-        userId,
-        config: cfg,
-        aiService: pluginCtx.aiService,
-        db: pluginCtx.db,
-        botRole,
-        humanize: pluginCtx.humanize,
-        targetMessage,
-        selfId: e.self_id,
-      });
+          const { history } = await pluginCtx.getGroupHistoryMessages(
+            groupId,
+            groupSessionId,
+            ctx,
+            cfg.historyCount,
+            pluginCtx.db,
+            e.self_id,
+            pluginCtx.buildHistoryMediaOptions(pluginCtx.aiInstance, cfg),
+          );
+          const { groupName, memberCount } =
+            await pluginCtx.getGroupInfoData(ctx, groupId, e.self_id);
 
-      const result = await pluginCtx.runWithRateLimitGuard(
-        () =>
-          pluginCtx.runChat(
-            pluginCtx.aiInstance,
-            toolCtx,
-            history,
+          const toolCtx = pluginCtx.buildToolContext({
+            ctx,
+            event: e,
+            groupSessionId,
+            groupId,
+            userId,
+            config: cfg,
+            aiService: pluginCtx.aiService,
+            db: pluginCtx.db,
+            botRole,
+            humanize: pluginCtx.humanize,
             targetMessage,
-            {
-              config: cfg,
-              groupName,
-              memberCount,
-              botNickname,
-              botRole,
-              aiService: pluginCtx.aiService,
-              isGroup: true,
-              replyContext: {
-                type: "poked",
-                targetUser: targetMessage.userName,
-                targetMessage: targetMessage.content,
-              },
-            },
-            pluginCtx.humanize,
-            pluginCtx.skillManager,
-            {
-              manager: pluginCtx.groupStructuredHistory,
-              ttlMs: cfg.groupStructuredHistoryTtlMs,
-              currentUserInputs: [
-                buildStructuredUserInputFromTarget(targetMessage),
-              ],
-            },
-          ),
-        { userId, groupId, label: "poke" },
-      );
-      if (!result) return;
+            selfId: e.self_id,
+          });
 
-      await pluginCtx.sendAIResponse(
-        {
-          ctx,
-          groupId,
-          messages: result.messages,
-          config: cfg,
-          sentIndices: toolCtx.sentMessageIndices,
-        },
-        e.self_id,
-      );
+          const result = await pluginCtx.runWithRateLimitGuard(
+            () =>
+              pluginCtx.runChat(
+                pluginCtx.aiInstance,
+                toolCtx,
+                history,
+                targetMessage,
+                {
+                  config: cfg,
+                  groupName,
+                  memberCount,
+                  botNickname,
+                  botRole,
+                  aiService: pluginCtx.aiService,
+                  isGroup: true,
+                  replyContext: {
+                    type: "poked",
+                    targetUser: targetMessage.userName,
+                    targetMessage: targetMessage.content,
+                  },
+                },
+                pluginCtx.humanize,
+                pluginCtx.skillManager,
+                {
+                  manager: pluginCtx.groupStructuredHistory,
+                  ttlMs: cfg.groupStructuredHistoryTtlMs,
+                  currentUserInputs: [
+                    buildStructuredUserInputFromTarget(targetMessage),
+                  ],
+                },
+              ),
+            { userId, groupId, label: "poke" },
+          );
+          if (!result) return;
 
-      const now = Date.now();
-      pluginCtx.saveBotMessages(
-        groupId,
-        groupSessionId,
-        result.messages,
-        now,
-        cfg,
-        pluginCtx.db,
-        ctx,
-        e.self_id,
-      );
-      pluginCtx.idleCheckManager.recordBotMessages(
-        groupSessionId,
-        result.messages.length,
-        e.self_id,
+          await finalizeChatTurn(pluginCtx, {
+            event: e,
+            cfg,
+            result,
+            groupId,
+            groupSessionId,
+            userId,
+            selfId: e.self_id,
+            toolCtx,
+            send: true,
+            isLive: true,
+          });
+        },
       );
-
-      await pluginCtx.sendEmoji(ctx, groupId, result.emojiPath, e.self_id);
-      pluginCtx.sessionManager.touch(groupSessionId);
     } catch (err) {
       ctx.logger.error(`Poke processing failed: ${err}`);
-    } finally {
-      processingSet.delete(groupSessionId);
     }
   };
 }