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

package/dist/index.js

@@ -5,7 +5,7 @@ import { xyPlugin } from "./src/channel.js";
 import registerSentinelHook from "./src/cspl/sentinel_hook.js";
 import registerSkillScopeHook from "./src/cspl/skill_scope_hook.js";
 import { setXYRuntime } from "./src/runtime.js";
-import { markCronToolCall, clearCronToolCall, getCurrentSessionContext, setCronToolRunInfo, clearCronToolRunInfo } from "./src/tools/session-manager.js";
+import { markCronToolCall, clearCronToolCall, getCurrentSessionContext, setCronToolRunInfo, clearCronToolRunInfo, isCronActive } from "./src/tools/session-manager.js";
 import { configManager } from "./src/utils/config-manager.js";
 import { setJobPushId } from "./src/utils/cron-push-map.js";
 import { getAllPushIds } from "./src/utils/pushid-manager.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.
@@ -63,7 +84,9 @@ function registerSkillsDiagnosticHook(api) {
  */
 function registerCronDetectionHook(api) {
     api.on("before_tool_call", async (event, ctx) => {
-        if (ctx.sessionKey?.startsWith("cron:") && event.toolCallId) {
+        // sessionKey 前缀依赖 openclaw 版本行为，不一定可靠；
+        // isCronActive() 由 provider.ts 根据消息内容 [cron:...] 设置，更可靠。
+        if ((ctx.sessionKey?.startsWith("cron:") || isCronActive()) && event.toolCallId) {
             markCronToolCall(event.toolCallId);
             // 存储 runId，供 call_device_tool 在 ALS 缺失时构造合成 SessionContext
             if (event.runId) {

package/dist/src/bot.js

@@ -322,11 +322,10 @@ export async function handleXYMessage(params) {
                 });
                 if (queued) {
                     log.log(`[BOT-STEER] Direct steer succeeded — message injected into active run`);
-                    // Steer message taskId refCount is no longer needed since we skip the dispatcher.
-                    // Use expectedTaskId to only remove the steer's own task — passing no
-                    // expectedTaskId would wipe the entire session binding and cause the next
-                    // steer to be misdetected as a new message (isUpdate=false).
-                    decrementTaskIdRef(parsed.sessionId, parsed.taskId);
+                    // Steer message taskId stays in the binding so getActiveTaskId()
+                    // resolves to the latest taskId for onPartialReply replies.
+                    // Cleanup happens via the original dispatcher's onIdleComplete →
+                    // decrementTaskIdRef(sessionId) which removes the entire binding.
                     return;
                 }
                 log.log(`[BOT-STEER] Direct steer failed (queued=false), falling through to dispatchReplyFromConfig`);

package/dist/src/provider.js

@@ -9,7 +9,7 @@
 //   models.providers.xiaoyiprovider.models = [...]
 import { createHash } from "crypto";
 import { logger } from "./utils/logger.js";
-import { getCurrentSessionContext, setCurrentCronJobId } from "./tools/session-manager.js";
+import { getCurrentSessionContext, setCurrentCronJobId, markCronDetected } from "./tools/session-manager.js";
 import { selfEvolutionManager } from "./utils/self-evolution-manager.js";
 import { setCompactionConfig, setCompactionSessionSnapshot } from "./compaction-provider.js";
 // ── Retry config ──────────────────────────────────────────────
@@ -560,6 +560,9 @@ export const xiaoyiProvider = {
             //   4. UID-based fallback: sha256(uid).hex[:32]_timestamp
             const isCron = isCronTriggered(context.messages);
             if (isCron) {
+                // 通知 before_tool_call hook：当前请求是 cron 触发。
+                // 不依赖 openclaw 的 sessionKey 前缀（部分版本可能不设置）。
+                markCronDetected();
                 // fire 期 jobId 桥：把首条消息 `[cron:<jobId> ...]` 解析出的真实 jobId
                 // 绑定到本次 cron run 的合成 sessionId。sendCommand 凭同一 sessionId
                 // 反查 jobId → cron-push-map → 正确设备的 pushId（多设备路由）。

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/dist/src/tools/session-manager.d.ts

@@ -20,6 +20,10 @@ export interface SessionContext {
      *  Tools should use the push channel instead of WebSocket sendCommand. */
     isCron?: boolean;
 }
+/** Mark that the current request is cron-triggered (called by provider). */
+export declare function markCronDetected(): void;
+/** Check whether a cron request was recently detected. */
+export declare function isCronActive(ttlMs?: number): boolean;
 /** Mark a toolCallId as originating from a cron trigger. */
 export declare function markCronToolCall(toolCallId: string): void;
 /** Check whether a toolCallId is from a cron trigger. */

package/dist/src/tools/session-manager.js

@@ -14,6 +14,20 @@ import { AsyncLocalStorage } from "async_hooks";
 import { logger } from "../utils/logger.js";
 import { getCurrentTaskId, getCurrentMessageId } from "../task-manager.js";
 const _g = globalThis;
+// ── Cron request detection ──────────────────────────────────────────
+// The provider detects cron from [cron:...] in message text and sets
+// this timestamp.  The before_tool_call hook checks it as a fallback
+// when openclaw's sessionKey does not have the "cron:" prefix.
+// Timestamp-based so it self-expires and requires no explicit cleanup.
+let __xyCronDetectedTs = 0;
+/** Mark that the current request is cron-triggered (called by provider). */
+export function markCronDetected() {
+    __xyCronDetectedTs = Date.now();
+}
+/** Check whether a cron request was recently detected. */
+export function isCronActive(ttlMs = 120_000) {
+    return Date.now() - __xyCronDetectedTs < ttlMs;
+}
 // ── Cron tool-call tracking ─────────────────────────────────────────
 // Global Map keyed by toolCallId to track whether a specific tool call
 // originated from a cron/scheduled task.  Populated by the

package/package.json

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