mioku-plugin-chat 2.9.11 → 2.10.1

package/configs/base.ts

@@ -4,4 +4,4 @@ export const BASE_CONFIG = {
   historyCount: 100,
   maxIterations: 20,
   enableMediaRecognition: true,
-};
+};

package/core/chat-engine.ts

@@ -721,7 +721,6 @@ function cleanMarkers(text: string): string {
   let cleaned = stripThinkBlocks(text).trim();
 
   cleaned = cleaned
-    .replace(/<Ai>\s*<think>[\s\S]*?<\/Ai>/gi, "")
     .replace(/<｜｜DSML｜｜tool_calls>[\s\S]*?<\/｜｜DSML｜｜tool_calls>/gi, "")
     .replace(/<｜｜DSML｜｜invoke[^>]*>[\s\S]*?<\/｜｜DSML｜｜invoke>/gi, "")
     .replace(
@@ -824,7 +823,7 @@ function stripThinkBlocks(text: string): string {
     source = afterOpen.slice(close.end);
   }
 
-  return output.replace(/<\/think\s*>/gi, "");
+  return output.replace(/<\/?(?:think|thinking)\s*>/gi, "");
 }
 
 function createThinkTagStreamFilter() {
@@ -840,7 +839,7 @@ function createThinkTagStreamFilter() {
         if (insideThink) {
           const close = findThinkCloseTag(buffer);
           if (!close) {
-            buffer = force ? "" : keepTagPrefixSuffix(buffer, "</think>");
+            buffer = force ? "" : keepTagPrefixSuffix(buffer, "</thinking>");
             break;
           }
 
@@ -851,7 +850,7 @@ function createThinkTagStreamFilter() {
 
         const open = findThinkOpenTag(buffer);
         if (!open) {
-          const keep = force ? "" : keepTagPrefixSuffix(buffer, "<think");
+          const keep = force ? "" : keepTagPrefixSuffix(buffer, "<thinking>");
           output += buffer.slice(0, buffer.length - keep.length);
           buffer = keep;
           break;
@@ -862,38 +861,22 @@ function createThinkTagStreamFilter() {
         insideThink = true;
       }
 
-      return output.replace(/<\/think\s*>/gi, "");
+      return output.replace(/<\/?(?:think|thinking)\s*>/gi, "");
     },
   };
 }
 
 function findThinkOpenTag(text: string): { index: number; end: number } | null {
-  const lower = text.toLowerCase();
-  const index = lower.indexOf("<think");
-  if (index < 0) {
-    return null;
-  }
-
-  const afterName = text[index + "<think".length];
-  if (afterName && !/[\s>]/.test(afterName)) {
-    const next = findThinkOpenTag(text.slice(index + 1));
-    return next
-      ? { index: index + 1 + next.index, end: index + 1 + next.end }
-      : null;
-  }
-
-  const closeIndex = text.indexOf(">", index + "<think".length);
-  if (closeIndex < 0) {
-    return { index, end: text.length };
-  }
-
-  return { index, end: closeIndex + 1 };
+  const match = /<(think|thinking)\b[^>]*>/i.exec(text);
+  return match
+    ? { index: match.index, end: match.index + match[0].length }
+    : null;
 }
 
 function findThinkCloseTag(
   text: string,
 ): { index: number; end: number } | null {
-  const match = /<\/think\s*>/i.exec(text);
+  const match = /<\/(think|thinking)\s*>/i.exec(text);
   return match
     ? { index: match.index, end: match.index + match[0].length }
     : null;

package/core/chat-turn.ts

@@ -351,7 +351,7 @@ export async function processChat(
               }
             : undefined,
         ),
-      { userId, groupId, label: isGroup ? "group-chat" : "private-chat" },
+      { userId, groupId, label: isGroup ? "group-chat" : "private-chat", skipRetryOnRateLimit: true },
     );
 
     if (!result) {

package/handlers/idle-debug.ts

@@ -104,7 +104,7 @@ export async function handleIdleCheckDebug(
               pluginCtx.humanize,
               pluginCtx.skillManager,
             ),
-          { groupId: targetGroupId, label: "idle-check" },
+          { groupId: targetGroupId, label: "idle-check", skipRetryOnRateLimit: true },
         );
         if (!result) {
           await e.reply(`[空闲检测] 群 ${targetGroupId} 因限流被跳过`);

package/handlers/message.ts

@@ -98,6 +98,7 @@ export function createMessageHandler(
                 userId,
                 groupId,
                 label: "history-media",
+                skipRetryOnRateLimit: true,
               }),
           )
         : undefined;
@@ -114,6 +115,7 @@ export function createMessageHandler(
                     userId,
                     groupId,
                     label: "image-analysis",
+                    skipRetryOnRateLimit: true,
                   }),
               }).catch((err) =>
                 ctx.logger.error(`[image-analyzer] Failed: ${err}`),

package/handlers/poke.ts

@@ -120,7 +120,7 @@ export function createPokeHandler(
                   ],
                 },
               ),
-            { userId, groupId, label: "poke" },
+            { userId, groupId, label: "poke", skipRetryOnRateLimit: true },
           );
           if (!result) return;
 

package/index.ts

@@ -342,7 +342,7 @@ export default definePlugin({
       return;
     }
 
-    roleModels = resolved.models;
+roleModels = resolved.models;
     roleIsMultimodal = resolved.isMultimodal;
     await refreshBaseCache();
 

package/manage/cooldown.ts

@@ -277,7 +277,7 @@ export class CooldownManager {
             ),
           },
         ),
-      { userId: targetMessage.userId, groupId, label: "cooldown" },
+      { userId: targetMessage.userId, groupId, label: "cooldown", skipRetryOnRateLimit: true },
     );
     if (!result) return;
 
@@ -414,7 +414,7 @@ export class CooldownManager {
             ),
           },
         ),
-      { userId: targetMessage.userId, groupId, label: "cooldown-planner" },
+      { userId: targetMessage.userId, groupId, label: "cooldown-planner", skipRetryOnRateLimit: true },
     );
     if (!result) {
       this.ctx.logger.warn(

package/manage/idle-check.ts

@@ -277,7 +277,7 @@ export class IdleCheckManager {
           this.humanize,
           this.skillManager,
         ),
-      { groupId, label: "idle-check" },
+      { groupId, label: "idle-check", skipRetryOnRateLimit: true },
     );
     if (!result) {
       this.groupMessageCount.set(groupSessionId, 0);

package/manage/queue-processor.ts

@@ -199,7 +199,7 @@ export class QueueProcessor {
       }, this.humanize, this.skillManager, {
         manager: this.groupStructuredHistory, ttlMs: cfg.groupStructuredHistoryTtlMs, currentUserInputs: structuredUserInputs,
       }),
-      { userId: targetMessage.userId, groupId, label: "dynamic-delay" },
+      { userId: targetMessage.userId, groupId, label: "dynamic-delay", skipRetryOnRateLimit: true },
     );
     if (!result) return;
 
@@ -280,7 +280,7 @@ export class QueueProcessor {
         }, this.humanize, this.skillManager, {
           manager: this.groupStructuredHistory, ttlMs: cfg.groupStructuredHistoryTtlMs, currentUserInputs: structuredUserInputs,
         }),
-        { userId: targetMessage.userId, groupId, label: "queue" },
+        { userId: targetMessage.userId, groupId, label: "queue", skipRetryOnRateLimit: true },
       );
       if (!result) return;
 

package/manage/rate-limit-guard.ts

@@ -1,12 +1,38 @@
 import type { RateLimiter } from "./rate-limiter";
 
-const RATE_LIMIT_RETRY_DELAY_MS = 5_000;
-const RATE_LIMIT_MAX_RETRIES = 2;
+const RATE_LIMIT_RETRY_DELAYS_MS = [5_000, 10_000, 30_000, 60_000];
 
 type Logger = { warn: (...args: unknown[]) => void };
 
-// Wraps an AI request with global rate-limit blocking + per-user/group RPM
-// limiting. On a 429 it backs off and retries up to RATE_LIMIT_MAX_RETRIES.
+function isRateLimitError(err: unknown): boolean {
+  if (err === null || err === undefined) return false;
+  const s = String(err).toLowerCase();
+  return s.includes("429") || s.includes("rate limit") || s.includes("rate_limit");
+}
+
+async function retryOn429<T>(
+  fn: () => Promise<T>,
+  log: Logger,
+  label?: string,
+): Promise<T> {
+  let attempt = 0;
+  while (true) {
+    try {
+      return await fn();
+    } catch (err) {
+      if (!isRateLimitError(err)) throw err;
+      if (attempt >= RATE_LIMIT_RETRY_DELAYS_MS.length) throw err;
+      const delay = RATE_LIMIT_RETRY_DELAYS_MS[attempt];
+      const attemptLabel = `${attempt + 1}/${RATE_LIMIT_RETRY_DELAYS_MS.length}`;
+      log.warn(
+        `[Chat]${label ? ` ${label}` : ""} 命中 429，等待 ${delay / 1000}s 后第 ${attemptLabel} 次重试: ${err}`,
+      );
+      attempt += 1;
+      await new Promise((resolve) => setTimeout(resolve, delay));
+    }
+  }
+}
+
 export class RateLimitGuard {
   private blockedUntil = 0;
 
@@ -20,17 +46,17 @@ export class RateLimitGuard {
   }
 
   private markBlocked(): void {
-    this.blockedUntil = Date.now() + RATE_LIMIT_RETRY_DELAY_MS;
-  }
-
-  private isRateLimitError(err: unknown): boolean {
-    const s = String(err).toLowerCase();
-    return s.includes("429") || s.includes("rate limit");
+    this.blockedUntil = Date.now() + RATE_LIMIT_RETRY_DELAYS_MS[0];
   }
 
   async run<T>(
     request: () => Promise<T>,
-    opts?: { userId?: number; groupId?: number; label?: string },
+    opts?: {
+      userId?: number;
+      groupId?: number;
+      label?: string;
+      skipRetryOnRateLimit?: boolean;
+    },
   ): Promise<T | null> {
     if (this.isBlocked()) {
       this.log.warn(
@@ -46,25 +72,15 @@ export class RateLimitGuard {
     }
     this.rateLimiter.recordAIRequest(opts?.userId, opts?.groupId);
 
-    let retries = 0;
-    while (true) {
-      try {
-        const result = await request();
-        this.blockedUntil = 0;
-        return result;
-      } catch (err) {
-        if (!this.isRateLimitError(err)) throw err;
-        this.markBlocked();
-        if (retries >= RATE_LIMIT_MAX_RETRIES) throw err;
-        retries += 1;
-        this.log.warn(
-          `[Chat] Rate limit hit, waiting ${RATE_LIMIT_RETRY_DELAY_MS / 1000}s...`,
-        );
-        await new Promise((resolve) =>
-          setTimeout(resolve, RATE_LIMIT_RETRY_DELAY_MS),
-        );
-        if (this.isBlocked()) this.blockedUntil = 0;
-      }
+    if (opts?.skipRetryOnRateLimit) {
+      return await request();
+    }
+
+    try {
+      return await retryOn429(request, this.log, opts?.label);
+    } catch (err) {
+      this.markBlocked();
+      throw err;
     }
   }
-}
+}

package/manage/types.ts

@@ -21,7 +21,12 @@ export type HistoryMediaOptions = {
 
 export type RunRateLimitGuard = <T>(
   request: () => Promise<T>,
-  opts?: { userId?: number; groupId?: number; label?: string },
+  opts?: {
+    userId?: number;
+    groupId?: number;
+    label?: string;
+    skipRetryOnRateLimit?: boolean;
+  },
 ) => Promise<T | null>;
 
 export type GetGroupHistoryMessages = (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-chat",
-  "version": "2.9.11",
+  "version": "2.10.1",
   "description": "AI 智能聊天插件",
   "main": "index.ts",
   "type": "module",