koishi-plugin-chatluna-think-viewer 2.2.4 → 2.2.6

package/index.js

@@ -1,4 +1,4 @@
-const { Schema, h } = require('koishi');
+const { Schema, h } = require('koishi');
 const { Bot } = require('@satorijs/core');
 
 const name = 'chatluna-think-viewer';
@@ -8,8 +8,8 @@ const inject = {
   chatluna: { required: false },
 };
 
-const defaultForbidden = [
-  '<think>[\\s\\S]*?<\\/think>',
+const defaultForbidden = [
+  '<think>[\\s\\S]*?<\\/think>',
   '<status>[\\s\\S]*?<\\/status>',
   '<output>[\\s\\S]*?<\\/output>',
   '<analysis>[\\s\\S]*?<\\/analysis>',
@@ -19,16 +19,16 @@ const defaultForbidden = [
   '"role"\\s*:\\s*"assistant"',
   '"analysis"\\s*:',
   '"thought"\\s*:',
-  '(?:human_relations|人际关系)\\s*[:=]',
-  '(?:memory|记忆|记忆点|总结)\\s*[:=]',
+  '(?:human_relations|浜洪檯鍏崇郴)\\s*[:=]',
+  '(?:memory|璁板繂|璁板繂鐐箌鎬荤粨)\\s*[:=]',
 ];
 
-// 严格 <output><message>... 结构：允许文�?/ <at>user_id</at> 文本 / <sticker>url</sticker>
-// ������ 1~5 �� <message>��@ ֻ���ܴ����ֵ� user_id
+// 涓ユ牸 <output><message>... 缁撴瀯锛氬厑璁告枃鏈?/ <at>user_id</at> 鏂囨湰 / <sticker>url</sticker>
+// 仅允许 1~5 条 <message>，@ 只接受纯数字的 user_id
 const strictOutputPattern =
   '^\\s*<output>\\s*(<message>(?:<at>\\d+<\\/at>\\s*)?(?:<sticker>[^<]*<\\/sticker>|[^<]*)<\\/message>\\s*){1,5}<\\/output>\\s*$';
 
-const Config = Schema.intersect([
+const Config = Schema.intersect([
   Schema.object({
     command: Schema.string().default('think').description('\u67e5\u770b\u601d\u8003\u5185\u5bb9\u7684\u6307\u4ee4\u540d'),
     keywords: Schema.array(Schema.string()).default(['\u67e5\u770b\u601d\u8003', '\u4e0a\u6b21\u601d\u8003']).description('\u53ef\u65e0\u524d\u7f00\u89e6\u53d1\u7684\u5173\u952e\u8bcd'),
@@ -42,7 +42,7 @@ const Config = Schema.intersect([
     guardDelay: Schema.number().default(1).min(0).max(60).description('\u64a4\u56de\u5ef6\u8fdf\uff08\u79d2\uff09'),
     guardAllowPrivate: Schema.boolean().default(true).description('\u662f\u5426\u5728\u79c1\u804a\u4e2d\u4e5f\u542f\u7528\u62e6\u622a'),
     guardGroups: Schema.array(Schema.string()).default([]).description('\u53ea\u5728\u8fd9\u4e9b\u7fa4\u751f\u6548\uff0c\u7559\u7a7a\u8868\u793a\u5168\u90e8'),
-    guardKeywordMode: Schema.boolean().default(true).description('true \u65f6\u6309\u5173\u952e\u8bcd\u5b50\u4e32\u5339\u914d（\u4e0d\u533a\u5206\u5927\u5c0f\u5199）\uff0cfalse \u65f6\u6309\u6b63\u5219\u5339\u914d'),
+    guardKeywordMode: Schema.boolean().default(true).description('true \u65f6\u6309\u5173\u952e\u8bcd\u5b50\u4e32\u5339\u914d锛圽u4e0d\u533a\u5206\u5927\u5c0f\u5199锛塡uff0cfalse \u65f6\u6309\u6b63\u5219\u5339\u914d'),
     guardForbiddenPatterns: Schema.array(Schema.string())
       .default(defaultForbidden)
       .description('\u547d\u4e2d\u5373\u89c6\u4e3a\u5f02\u5e38\u7684\u6a21\u5f0f\uff0c\u7528\u4e8e\u907f\u514d\u601d\u8003\u6cc4\u9732\u6216\u0020\u004a\u0053\u004f\u004e\u0020\u751f\u51fa'),
@@ -60,23 +60,33 @@ const Config = Schema.intersect([
   }).description('\u5f02\u5e38\u8f93\u51fa\u81ea\u52a8\u5904\u7406'),
 ]);
 
-function extractText(content) {
-  if (content == null) return '';
-  const normalized = h.normalize(content);
-  const parts = [];
-  for (const el of normalized) {
-    if (typeof el === 'string') {
-      parts.push(el);
-      continue;
-    }
-    if (Array.isArray(el.children) && el.children.length) {
-      parts.push(extractText(el.children));
-    }
-    const textLike = el.attrs?.content ?? el.attrs?.text ?? el.children?.join?.('') ?? '';
-    if (textLike) parts.push(textLike);
-  }
-  return parts.join('');
-}
+function extractText(content) {
+  // Normalize varied content types to plain text so we can regex <think>.
+  if (content == null) return '';
+  if (typeof content === 'string') return content;
+  if (Array.isArray(content)) return content.map(extractText).join('');
+
+  const parts = [];
+  // Try koishi segment normalization first.
+  try {
+    for (const el of h.normalize([content])) {
+      if (typeof el === 'string') {
+        parts.push(el);
+        continue;
+      }
+      if (Array.isArray(el.children) && el.children.length) {
+        parts.push(extractText(el.children));
+      }
+      const textLike = el.attrs?.content ?? el.attrs?.text ?? el.children?.join?.('') ?? '';
+      if (textLike) parts.push(textLike);
+    }
+  } catch {
+    // Fallback for plain objects (e.g., LangChain AIMessage with {text, content})
+    const candidate = content.text ?? content.content;
+    if (candidate) parts.push(String(candidate));
+  }
+  return parts.join('');
+}
 
 function extractThink(text) {
   // \u67d0\u4e9b\u6a21\u578b/\u4e2d\u95f4\u4ef6\u4f1a\u5728\u540c\u4e00\u6761\u6d88\u606f\u91cc\u591a\u6b21\u51fa\u73b0 <think>\uff0c\u53d6\u6700\u540e\u4e00\u6b21
@@ -313,10 +323,42 @@ function apply(ctx, config) {
   });
 
   // \u5f02\u5e38\u8f93\u51fa\u81ea\u52a8\u5904\u7406
-  applyGuard(ctx, config);
-}
-
-module.exports = {
+  applyGuard(ctx, config);
+
+  // Hot-fix chatluna-character completionMessages trimming bug:
+  // it used to drop newest messages; we wrap getTemp to trim from the head.
+  const service = ctx.chatluna_character;
+  if (service && typeof service.getTemp === 'function') {
+    const originalGetTemp = service.getTemp.bind(service);
+    service.getTemp = async function patchedGetTemp(session) {
+      const temp = await originalGetTemp(session);
+      const limit = () => {
+        const c = service._config?.modelCompletionCount ?? 3;
+        return Math.max(2, c * 2);
+      };
+      if (Array.isArray(temp.completionMessages) && !temp.completionMessages._thinkViewerPatched) {
+        const arr = temp.completionMessages;
+        const originalPush = arr.push;
+        arr.push = function patchedPush(...args) {
+          const res = originalPush.apply(this, args);
+          const max = limit();
+          if (this.length > max) {
+            this.splice(0, this.length - max);
+          }
+          return res;
+        };
+        Object.defineProperty(arr, '_thinkViewerPatched', { value: true, enumerable: false });
+      }
+      return temp;
+    };
+
+    ctx.on('dispose', () => {
+      service.getTemp = originalGetTemp;
+    });
+  }
+}
+
+module.exports = {
   name,
   apply,
   Config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-chatluna-think-viewer",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "main": "index.js",
   "description": "通过命令/关键词查看 chatluna-character 最近一次回复的 <think> 思考内容，并在消息格式异常时自动拦截/撤回。",
   "license": "MIT",