skill-auto-loader-hook-paperfly777 0.1.5 → 0.1.7

package/index.ts

@@ -5,7 +5,7 @@ import { definePluginEntry } from "openclaw/plugin-sdk/core";
 
 // 插件固定 ID：对应 openclaw.json 里的 plugins.entries.<id>
 const PLUGIN_ID = "skill-auto-loader-hook";
-const INJECTION_MARKER = "Skill Auto Loader Hook";
+const XML_BLOCK_TAG = "skill-auto-loader-hook";
 
 type RoutingRule = {
   id: string;
@@ -129,7 +129,10 @@ function extractLatestUserText(event: unknown): string {
     }
     const content = extractTextFromContent(msgObj.content);
     if (content.trim()) {
-      return sanitizeUserText(content.trim());
+      const sanitized = sanitizeUserText(content.trim());
+      if (sanitized) {
+        return sanitized;
+      }
     }
   }
 
@@ -137,6 +140,15 @@ function extractLatestUserText(event: unknown): string {
   return sanitizeUserText(fallbackPrompt.trim());
 }
 
+// 删除历史插件注入的 XML 块，避免下轮继续把旧内容带进来。
+function stripInjectedXmlBlocks(text: string): string {
+  if (!text) {
+    return "";
+  }
+  const blockPattern = new RegExp(`<${XML_BLOCK_TAG}>[\\s\\S]*?<\\/${XML_BLOCK_TAG}>`, "gi");
+  return text.replace(blockPattern, "").trim();
+}
+
 // 清洗“最新用户消息”中的历史插件注入内容。
 // 目标：只保留用户本次真实输入，不把旧注入块再次带进来。
 function sanitizeUserText(text: string): string {
@@ -144,19 +156,23 @@ function sanitizeUserText(text: string): string {
     return "";
   }
 
-  let cleaned = text;
-  const markerIndex = cleaned.indexOf(INJECTION_MARKER);
-  if (markerIndex >= 0) {
-    cleaned = cleaned.slice(0, markerIndex);
-  }
+  let cleaned = stripInjectedXmlBlocks(text);
 
+  // 去掉常见的 UI 时间包装。
   cleaned = cleaned.replace(/\[?[A-Z][a-z]{2}\s+\d{4}-\d{2}-\d{2}.*?\]\s*/g, "");
 
+  // 去掉插件固定说明段的高频前缀，避免它们继续污染本轮输入。
+  cleaned = cleaned.replace(/当前 OpenClaw 默认模型：.*$/gm, "");
+  cleaned = cleaned.replace(/本轮用户消息：.*$/gm, "");
+  cleaned = cleaned.replace(/请结合以下信息判断本轮是否需要优先使用某个 skill。*$/gm, "");
+  cleaned = cleaned.replace(/一、候选 skill（已过滤）[\s\S]*$/m, "");
+
   const lines = cleaned
     .split(/\r?\n/)
     .map((line) => line.trim())
     .filter(Boolean)
-    .filter((line) => !line.includes(INJECTION_MARKER));
+    .filter((line) => !line.includes(`<${XML_BLOCK_TAG}>`))
+    .filter((line) => !line.includes(`</${XML_BLOCK_TAG}>`));
 
   if (lines.length === 0) {
     return "";
@@ -203,7 +219,17 @@ function getDefaultModelInfo(openclawConfigPath: string): string {
   const root = cfg as Record<string, unknown>;
   const directModel = safeString(root.model);
   const channelsModel = safeString((root.channels as Record<string, unknown> | undefined)?.model);
-
+  const agentsPrimaryModel = safeString(
+    ((root.agents as Record<string, unknown> | undefined)?.defaults as Record<string, unknown> | undefined)?.model &&
+      (((root.agents as Record<string, unknown> | undefined)?.defaults as Record<string, unknown> | undefined)?.model as Record<
+        string,
+        unknown
+      >)?.primary,
+  );
+
+  if (agentsPrimaryModel) {
+    return agentsPrimaryModel;
+  }
   if (directModel) {
     return directModel;
   }
@@ -427,6 +453,7 @@ function buildRoutingPrompt(
   routerCfg: RouterFileConfig,
 ): string {
   const lines: string[] = [];
+  lines.push(`<${XML_BLOCK_TAG}>`);
   lines.push("【Skill Auto Loader Hook】请在正式回答前，先完成本轮 skill 路由判断。");
   lines.push(`当前 OpenClaw 默认模型：${defaultModel}`);
   lines.push(`本轮用户消息：${userText}`);
@@ -448,6 +475,7 @@ function buildRoutingPrompt(
   lines.push("");
   lines.push("四、执行方式");
   lines.push("请把路由判断体现在你后续的实际执行中：若需要 skill，则优先按判断结果使用；若不需要，则正常回答。");
+  lines.push(`</${XML_BLOCK_TAG}>`);
   return lines.join("\n");
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skill-auto-loader-hook-paperfly777",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "OpenClaw hook plugin that routes each user message to the most relevant installed skill.",
   "license": "MIT",
   "type": "module",