koishi-plugin-satori-ai 1.3.6 → 1.3.7

package/lib/index.js

@@ -284,11 +284,11 @@ function filterResponse(prompt, words) {
   const lastAnswer5 = answerMatches5 ? answerMatches5[answerMatches5.length - 1] : null;
   const answerContent = lastAnswer || lastDoubao || lastAnswer3 || lastAnswer4 || lastAnswer5;
   if (!answerContent) {
-    return { content: "有点问题，稍后再来吧", error: true };
+    return { content: "有点问题，请重置对话", error: true };
   }
   const regex = /<p>|<\/p>|<doubaothinking>|<\/doubaothinking>|<\/p|<answer>|<\/answer>|<br>|<\/br>|<br\/>/g;
   const cleanedContent = answerContent.replace(regex, "");
-  return cleanedContent ? { content: cleanedContent, error: false } : { content: "有点问题，稍后再来吧", error: true };
+  return cleanedContent ? { content: cleanedContent, error: false } : { content: "有点问题，请重置对话", error: true };
 }
 __name(filterResponse, "filterResponse");
 function addOutputCensor(session, word, baseURL) {
@@ -311,6 +311,45 @@ async function updateUserPWithTicket(ctx, user, adjustment) {
   }
 }
 __name(updateUserPWithTicket, "updateUserPWithTicket");
+function findLongestCommonSubstring(str1, str2) {
+  if (!str1 || !str2)
+    return 0;
+  const m = str1.length;
+  const n = str2.length;
+  const dp = Array(m + 1).fill(null).map(() => Array(n + 1).fill(0));
+  let maxLength = 0;
+  for (let i = 1; i <= m; i++) {
+    for (let j = 1; j <= n; j++) {
+      if (str1[i - 1] === str2[j - 1]) {
+        dp[i][j] = dp[i - 1][j - 1] + 1;
+        maxLength = Math.max(maxLength, dp[i][j]);
+      }
+    }
+  }
+  return maxLength;
+}
+__name(findLongestCommonSubstring, "findLongestCommonSubstring");
+function countCommonChars(str1, str2) {
+  const chars1 = /* @__PURE__ */ new Map();
+  const chars2 = /* @__PURE__ */ new Map();
+  for (const char of str1) {
+    if (/[\u4e00-\u9fff]/.test(char)) {
+      chars1.set(char, (chars1.get(char) || 0) + 1);
+    }
+  }
+  for (const char of str2) {
+    if (/[\u4e00-\u9fff]/.test(char)) {
+      chars2.set(char, (chars2.get(char) || 0) + 1);
+    }
+  }
+  let commonCount = 0;
+  for (const [char, count1] of chars1) {
+    const count2 = chars2.get(char) || 0;
+    commonCount += Math.min(count1, count2);
+  }
+  return commonCount;
+}
+__name(countCommonChars, "countCommonChars");
 
 // src/api.ts
 var logger2 = new import_koishi2.Logger("satori-api");
@@ -702,22 +741,12 @@ var MemoryManager = class {
   calculateMatchScore(content, keywords) {
     if (keywords.length === 0)
       return { score: 0, count: 0 };
-    const escapedKeywords = keywords.map((k) => escapeRegExp(k));
-    const regex = new RegExp(escapedKeywords.join("|"), "gi");
-    const chineseRegex = /[\u4e00-\u9fa5]/g;
-    const regex2 = new RegExp(`[${this.charactersToRemove.join("")}]`, "g");
-    content = content.replace(regex2, "");
-    const matches = content.match(regex) || [];
-    let count = 0;
-    matches.forEach((match) => {
-      const chineseCount = (match.match(chineseRegex) || []).length;
-      const englishCount = match.length - chineseCount;
-      count += chineseCount * 2 + englishCount;
-    });
-    const totalChinese = (content.match(chineseRegex) || []).length;
-    const totalEnglish = content.length - totalChinese;
-    const totalWeight = totalChinese * 2 + totalEnglish;
-    const ratio = totalWeight > 0 ? count / totalWeight : 0;
+    const regex = new RegExp(`[${this.charactersToRemove.join("")}]`, "g");
+    content = content.replace(regex, "");
+    const Keyword = keywords.map((k) => escapeRegExp(k)).join("");
+    const length = findLongestCommonSubstring(content, Keyword);
+    const count = countCommonChars(content, Keyword);
+    const ratio = (length * length + count) / content.length;
     return { score: ratio, count };
   }
   // 格式化匹配结果
@@ -732,7 +761,8 @@ var MemoryManager = class {
       matched = matched.slice(0, topN < matched.length ? topN : matched.length);
       if (type === "common") {
         const result = `${prefixMap[type]}{
-${matched.map((entry) => entry.content).join("\n")} ${date}
+${matched.map((entry) => entry.content).join("\n")} 
+${date}
 }
 `;
         return result;
@@ -3664,7 +3694,7 @@ ${payload}`);
   getThinkingPrompt(user, prompt) {
     const reasonerPrompt = this.config.reasoner_prompt;
     const promptForNoReasoner = `#请你在回复时先进行分析思考，并且模仿思维链的模式输出思考内容，${reasonerPrompt};
-#你在思考时必须以 "<think>" 开头, "</think>" 结尾。仔细揣摩用户意图，完整输出思考内容后在输出正式的回复内容;
+#你在思考时必须以 "<think>" 开头, "</think>" 结尾。仔细揣摩用户意图，**完整输出思考内容后**再输出正式的回复内容;
 #注意：你的正式回复内容必须使用“<p>”开头，使用“</p>”结尾，并且无论如何都要把标签输出完整
 `;
     const promptForReasoner = `#你在思考时必须以 "嗯" 开头。仔细揣摩用户意图，思考结束后返回符合要求的回复。
@@ -3766,7 +3796,7 @@ ${useNoReasoner ? promptForNoReasoner : promptForReasoner}
     const filePath = path7.join(this.config.dataDir, "common_sense.txt");
     await this.memoryManager.saveLongTermMemory(session, [{
       role: "user",
-      content
+      content: content.replace(/\"/g, "'").trim()
     }], filePath);
     return session.text("commands.sat.common_sense.messages.succeed", [content]);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-satori-ai",
   "description": "基于 Satori 适配器的智能对话插件，具备用户画像、长期记忆、常识管理和好感度系统",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "types": "lib/index.d.ts",