@ynhcj/xiaoyi-channel 0.0.221-next → 0.0.222-next

package/dist/index.js

@@ -44,14 +44,35 @@ function extractSkillNameFromPath(filePath) {
  * the `after_tool_call` hook and write the skill name to the skills log.
  */
 function registerSkillsDiagnosticHook(api) {
-    api.on("after_tool_call", async (event, _ctx) => {
-        if (event.toolName !== "read")
-            return;
-        const skillName = extractSkillNameFromPath(event.params?.path);
+    // Tool name → skill name mapping for direct tool-based skill usage logging
+    const TOOL_SKILL_MAP = {
+        get_user_location: "GetCurrentLocation",
+        get_calendar_tool_schema: "Schedule",
+        get_note_tool_schema: "memorandum",
+        get_photo_tool_schema: "gallery",
+        get_contact_tool_schema: "contact",
+        get_device_file_tool_schema: "file",
+        get_alarm_tool_schema: "clock",
+        message: "message",
+        get_phone_tool_schema: "phone",
+        get_collection_tool_schema: "xiaoyi-collection",
+    };
+    // Log skill usage for known device tools on before_tool_call
+    api.on("before_tool_call", async (event, _ctx) => {
+        const skillName = TOOL_SKILL_MAP[event.toolName];
         if (skillName) {
             writeSkillUsage(skillName);
         }
     });
+    // Detect SKILL.md reads on after_tool_call (original behavior)
+    api.on("after_tool_call", async (event, _ctx) => {
+        if (event.toolName === "read") {
+            const skillName = extractSkillNameFromPath(event.params?.path);
+            if (skillName) {
+                writeSkillUsage(skillName);
+            }
+        }
+    });
 }
 /**
  * Register the cron detection hook.

package/dist/src/reply-dispatcher.js

@@ -507,16 +507,9 @@ export function createXYReplyDispatcher(params) {
                 if (text.length === 0)
                     return;
                 hasSentResponse = true;
-                // 检测新模型调用：同一模型调用内 text 是递增的（"好的"→"好的，已查到"），
-                // 跨模型调用时 text 会刷新，此时 !text.startsWith(currentModelText) 为 true
-                if (currentModelText && !text.startsWith(currentModelText)) {
-                    // 锁存上一个模型调用的完整文本
-                    prevModelText += currentModelText;
-                }
-                currentModelText = text;
-                const sep = prevModelText ? "\n" : "";
-                const fullText = crossTurnPrefix + prevModelText + sep + text;
-                // 串行化发送，避免 ws.send 乱序
+                // 串行化回调进入：SDK fire-and-forget 模式下多个 onPartialReply
+                // 可能并发执行，processingLock 保证 currentModelText/prevModelText
+                // 的读写和 ws.send 都在互斥临界区内。
                 const prevLock = processingLock;
                 let releaseLock;
                 processingLock = new Promise((resolve) => {
@@ -524,6 +517,15 @@ export function createXYReplyDispatcher(params) {
                 });
                 try {
                     await prevLock;
+                    // 检测新模型调用：同一模型调用内 text 是递增的（"好的"→"好的，已查到"），
+                    // 跨模型调用时 text 会刷新，此时 !text.startsWith(currentModelText) 为 true
+                    if (currentModelText && !text.startsWith(currentModelText)) {
+                        // 锁存上一个模型调用的完整文本
+                        prevModelText += currentModelText;
+                    }
+                    currentModelText = text;
+                    const sep = prevModelText ? "\n" : "";
+                    const fullText = crossTurnPrefix + prevModelText + sep + text;
                     await sendA2AResponse({
                         config,
                         sessionId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.221-next",
+  "version": "0.0.222-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",