@ynhcj/xiaoyi-channel 0.0.212-beta → 0.0.213-beta

package/dist/index.js

@@ -11,6 +11,43 @@ import { registerSelfEvolutionToolResultNudge } from "./src/self-evolution-tool-
 import { createBeforePromptBuildHandler } from "./src/skill-retriever/hooks.js";
 import { normalizeToolRetrieverConfig } from "./src/skill-retriever/config.js";
 import { registerCLIHook } from "./src/tools/hmos-cli.js";
+import { writeSkillUsage } from "./src/utils/skills-logger.js";
+/**
+ * Parse a file path string to detect if it refers to a SKILL.md file within
+ * a skills directory. Returns the skill name (parent directory) if so.
+ *
+ * Matches paths like:
+ *   ~/.openclaw/workspace/skills/my-skill/SKILL.md
+ *   /home/user/core_skills/my-skill/SKILL.md
+ *   skills/my-skill/SKILL.md
+ */
+function extractSkillNameFromPath(filePath) {
+    if (typeof filePath !== "string" || !filePath)
+        return null;
+    // Normalize common path prefixes
+    const normalized = filePath.replace(/^~\//, "/home/").replace(/\\/g, "/");
+    // Match: .../skills/<skillName>/SKILL.md  or  .../skills/<skillName>/...
+    // Also match: .../core_skills/<skillName>/SKILL.md
+    const match = normalized.match(/\/(?:core_)?skills\/([^/]+)\/SKILL\.md$/i);
+    return match ? match[1] : null;
+}
+/**
+ * Register the skills diagnostic event listener via after_tool_call hook.
+ *
+ * When openclaw fires a `skill.used` diagnostic event, the skill's SKILL.md
+ * is typically read by the model first.  We detect SKILL.md reads through
+ * 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);
+        if (skillName) {
+            writeSkillUsage(skillName);
+        }
+    });
+}
 /**
  * Register the cron detection hook.
  *
@@ -211,6 +248,8 @@ const pluginEntry = definePluginEntry({
             registerCronDetectionHook(api);
             // CLI exec hook: intercepts built-in exec for HarmonyOS CLI skill tools
             registerCLIHook(api);
+            // Skills diagnostic hook: log skill usage (detected via SKILL.md reads)
+            registerSkillsDiagnosticHook(api);
         }
     },
 });

package/dist/src/bot.d.ts

@@ -24,8 +24,3 @@ export interface HandleXYMessageParams {
  * Runtime is expected to be validated before calling this function.
  */
 export declare function handleXYMessage(params: HandleXYMessageParams): Promise<void>;
-/**
- * 由 provider.ts 在 wrapStreamFn 调用时触发。
- * 这是模型 API 被调用的精确时刻，此时 isStreaming 一定为 true。
- */
-export declare function notifyModelStreaming(sessionId: string): void;

package/dist/src/bot.js

@@ -310,9 +310,6 @@ export async function handleXYMessage(params) {
             return;
         }
         // ── First message (non-steer) path below ──────────────────────
-        // 🔑 立即创建 streaming 信号——必须在文件下载等耗时操作之前，
-        // 否则 steer 消息的 dispatchSteerWhenReady 会找不到信号而跳过等待。
-        createStreamingSignal(parsed.sessionId);
         // File download — only for real user messages, steer injections have no files
         let mediaPayload = {};
         if (!skipReg) {
@@ -372,7 +369,6 @@ export async function handleXYMessage(params) {
                 return;
             cleaned = true;
             log.log(`[BOT] Cleanup started`);
-            streamingSignals.delete(parsed.sessionId);
             decrementTaskIdRef(parsed.sessionId);
             log.log(`[BOT] Cleanup completed`);
         };
@@ -495,45 +491,22 @@ function buildXYMediaPayload(mediaList) {
         MediaTypes: mediaTypes.length > 0 ? mediaTypes : undefined,
     };
 }
+// ─────────────────────────────────────────────────────────────
+// Steer 串行队列
+// ─────────────────────────────────────────────────────────────
 // Use globalThis to survive module deduplication — provider.ts may load a
 // different copy of bot.ts, so a plain module-level Map would be two objects.
 const _g = globalThis;
-if (!_g.__xyStreamingSignals)
-    _g.__xyStreamingSignals = new Map();
 if (!_g.__xySteerQueues)
     _g.__xySteerQueues = new Map();
 if (!_g.__xyDispatcherUpdaters)
     _g.__xyDispatcherUpdaters = new Map();
-const streamingSignals = _g.__xyStreamingSignals;
 const steerQueues = _g.__xySteerQueues;
 const dispatcherUpdaters = _g.__xyDispatcherUpdaters;
-/**
- * 由 provider.ts 在 wrapStreamFn 调用时触发。
- * 这是模型 API 被调用的精确时刻，此时 isStreaming 一定为 true。
- */
-export function notifyModelStreaming(sessionId) {
-    const log = logger.withContext(sessionId, "");
-    const signal = streamingSignals.get(sessionId);
-    if (signal) {
-        // 不删除 signal——后续 steer 需要靠它判断模型已在 streaming。
-        // 清理由第一条消息的 onSettled 兜底。
-        signal.notify();
-        log.log(`[STEER-QUEUE] Model streaming signal fired`);
-    }
-}
-function createStreamingSignal(sessionId) {
-    const log = logger.withContext(sessionId, "");
-    let resolve;
-    const promise = new Promise(r => { resolve = r; });
-    const signal = { promise, notify: resolve };
-    streamingSignals.set(sessionId, signal);
-    log.log(`[STEER-QUEUE] Streaming signal created`);
-    return signal;
-}
 /**
  * 将 steer 消息放入 per-session 串行队列。
- * 等待第一条消息的 streaming 信号（deliver 首次触发），然后 dispatch。
- * 多个 steer 按到达顺序串行处理，无需重试。
+ * 通过指数退避轮询注入（queueAgentHarnessMessage），直到 Pi agent 接受消息或 run 结束。
+ * 多个 steer 按到达顺序串行处理。
  */
 function enqueueSteer(params) {
     const { sessionId } = params;
@@ -552,69 +525,52 @@ function enqueueSteer(params) {
     });
     return next;
 }
+/**
+ * Poll the active embedded run with exponential backoff until the steer message
+ * is accepted or the run completes.
+ *
+ * Replaces the previous signal-based approach (notifyModelStreaming) which fired
+ * from wrapStreamFn too early — before the Pi agent had set state.isStreaming=true.
+ * queueAgentHarnessMessage internally checks isStreaming(), so we retry until the
+ * Pi agent is ready to accept messages.
+ */
 async function dispatchSteerWhenReady(params) {
     const { sessionId, steerText } = params;
     const log = logger.withContext(sessionId, params.parsed.taskId);
-    // 1. 等待第一条消息开始 streaming
-    //    signal 可能尚未创建（第一条消息还在文件下载等耗时操作中），
-    //    轮询等待直到 signal 出现，最長等待 ~5 秒。
-    let signal = streamingSignals.get(sessionId);
-    if (!signal) {
-        log.log(`[STEER-QUEUE] Signal not yet created, polling`);
-        for (let i = 0; i < 50; i++) {
-            await new Promise(r => setTimeout(r, 100));
-            signal = streamingSignals.get(sessionId);
-            if (signal)
-                break;
-            if (!hasActiveTask(sessionId)) {
-                log.log(`[STEER-QUEUE] First message completed while waiting, skip steer`);
-                return;
-            }
-        }
-    }
-    if (signal) {
-        log.log(`[STEER-QUEUE] Waiting for streaming signal`);
-        await signal.promise;
-        log.log(`[STEER-QUEUE] Streaming signal received`);
-    }
-    else {
-        // 轮询超时且 hasActiveTask 仍为 true——说明第一条消息可能卡在异常路径，
-        // 没有创建 signal。此时放弃，避免并发碰撞。
-        log.log(`[STEER-QUEUE] Signal never appeared after polling, skip steer to avoid collision`);
-        return;
-    }
-    // 2. 第一条消息已结束 → 放弃
-    if (!hasActiveTask(sessionId)) {
-        log.log(`[STEER-QUEUE] First message completed, skip steer`);
-        return;
-    }
-    // 3. 直接注入到活跃的 Pi run 中，不创建独立 dispatcher。
-    //    模型回复通过第一条消息的 dispatcher 的 onPartialReply 流式发出，
-    //    使用 registerTaskId + updateFallbackTaskId 已同步的最新 taskId。
     const mediaPaths = params.mediaPayload?.MediaPaths;
     const fileHint = mediaPaths && mediaPaths.length > 0
         ? `\n【用户上传附件】：${JSON.stringify(mediaPaths)}`
         : "";
     const steerMessage = `${steerText}${fileHint}`;
     log.log(`[STEER-QUEUE] Injecting steer message directly into active run`);
-    const STEER_RETRY_MAX = 3;
-    const STEER_RETRY_DELAY_MS = 500;
-    let injected = false;
-    for (let attempt = 0; attempt < STEER_RETRY_MAX; attempt++) {
-        injected = queueAgentHarnessMessage(sessionId, steerMessage, {
+    // Exponential backoff polling until:
+    //   1. Injection succeeds (queueAgentHarnessMessage returns true)
+    //   2. The original run has completed (hasActiveTask returns false)
+    //   3. Maximum total wait time exceeded
+    const MAX_WAIT_MS = 30_000;
+    const MAX_BACKOFF_MS = 4_000;
+    const BASE_DELAY_MS = 500;
+    const startedAt = Date.now();
+    let attempt = 0;
+    while (Date.now() - startedAt < MAX_WAIT_MS) {
+        // Termination: first message's run has already finished
+        if (!hasActiveTask(sessionId)) {
+            log.log(`[STEER-QUEUE] First message completed, skip steer`);
+            return;
+        }
+        const injected = queueAgentHarnessMessage(sessionId, steerMessage, {
             steeringMode: "all",
         });
-        if (injected)
-            break;
-        if (attempt < STEER_RETRY_MAX - 1 && hasActiveTask(sessionId)) {
-            log.log(`[STEER-QUEUE] Retry ${attempt + 1}/${STEER_RETRY_MAX}: run not accepting, waiting ${STEER_RETRY_DELAY_MS}ms`);
-            await new Promise(r => setTimeout(r, STEER_RETRY_DELAY_MS));
+        if (injected) {
+            log.log(`[STEER-QUEUE] Steer injected successfully on attempt ${attempt}`);
+            return;
         }
+        // Exponential backoff: min(BASE_DELAY_MS * 2^attempt, MAX_BACKOFF_MS)
+        const delay = Math.min(BASE_DELAY_MS * Math.pow(2, attempt), MAX_BACKOFF_MS);
+        log.log(`[STEER-QUEUE] Attempt ${attempt}: run not accepting, retrying in ${delay}ms`);
+        await new Promise(r => setTimeout(r, delay));
+        attempt++;
     }
-    if (injected) {
-        log.log(`[STEER-QUEUE] Steer message injected successfully`);
-    }
-    else {
-        log.log(`[STEER-QUEUE] Steer injection failed after ${STEER_RETRY_MAX} attempts — run may not be accepting messages`);
-    }
+    // Max wait exceeded — model may still be in provider retry loop or unresponsive
+    log.log(`[STEER-QUEUE] Steer injection failed after ${MAX_WAIT_MS}ms timeout`);
 }

package/dist/src/log-reporter/index.js

@@ -32,6 +32,11 @@ const MONITORS = [
         businessType: "openclaw-init",
         jsonParse: false,
     },
+    {
+        path: "/tmp/openclaw/skills-{year}{month}{day}.log",
+        businessType: "openclaw-skill",
+        jsonParse: false,
+    },
 ];
 // ── State ────────────────────────────────────────────────────────────────────
 let intervalId = null;

package/dist/src/provider.js

@@ -11,7 +11,6 @@ import { createHash } from "crypto";
 import { logger } from "./utils/logger.js";
 import { getCurrentSessionContext, setCurrentCronJobId } from "./tools/session-manager.js";
 import { selfEvolutionManager } from "./utils/self-evolution-manager.js";
-import { notifyModelStreaming } from "./bot.js";
 // ── Retry config ──────────────────────────────────────────────
 const RETRY_DELAYS_MS = [10_000, 20_000, 40_000, 60_000, 60_000];
 const MAX_RETRY_ATTEMPTS = 5;
@@ -588,17 +587,13 @@ export const xiaoyiProvider = {
             }
             // 记录输入
             logger.log(`[xiaoyiprovider] input messages count: ${context.messages?.length ?? 0}`);
-            // 🔑 通知 steer 队列：模型 API 已被调用，此时 isStreaming 一定为 true
-            const sessionCtx = getCurrentSessionContext();
-            if (sessionCtx?.sessionId) {
-                notifyModelStreaming(sessionCtx.sessionId);
-            }
             if (context.systemPrompt) {
                 logger.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
             }
             // deviceType: prefer text-extracted value, ALS as fallback.
+            const sessionCtx = getCurrentSessionContext();
             const deviceType = extractedDeviceType
-                ?? getCurrentSessionContext()?.deviceType;
+                ?? sessionCtx?.deviceType;
             // app_ver and sdk_api_version from session context (ALS)
             const appVer = sessionCtx?.appVer;
             const sdkApiVersion = sessionCtx?.sdkApiVersion;

package/dist/src/utils/skills-logger.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Write a skill-usage record to the skills log.
+ * Format: |YYYYMMDDThhmmss|skillName|
+ */
+export declare function writeSkillUsage(skillName: string): void;

package/dist/src/utils/skills-logger.js

@@ -0,0 +1,76 @@
+// Skills usage logger
+// Format: |timestamp|skillName|
+import { mkdirSync, readdirSync, unlinkSync, statSync } from "fs";
+import { join } from "path";
+import pino from "pino";
+// ── Configuration ──
+const LOG_DIR = "/tmp/openclaw";
+const LOG_PREFIX = "skills";
+const MAX_AGE_DAYS = 30;
+// ── UTC+8 helpers ──
+function getTodayDateStr() {
+    const utc8 = new Date(Date.now() + 8 * 60 * 60 * 1000);
+    return `${utc8.getUTCFullYear()}${String(utc8.getUTCMonth() + 1).padStart(2, "0")}${String(utc8.getUTCDate()).padStart(2, "0")}`;
+}
+function formatTimestampUTC8() {
+    const utc8 = new Date(Date.now() + 8 * 60 * 60 * 1000);
+    const y = utc8.getUTCFullYear();
+    const M = String(utc8.getUTCMonth() + 1).padStart(2, "0");
+    const D = String(utc8.getUTCDate()).padStart(2, "0");
+    const h = String(utc8.getUTCHours()).padStart(2, "0");
+    const m = String(utc8.getUTCMinutes()).padStart(2, "0");
+    const s = String(utc8.getUTCSeconds()).padStart(2, "0");
+    return `${y}${M}${D}T${h}${m}${s}`;
+}
+function getLogFilePath(dateStr) {
+    return join(LOG_DIR, `${LOG_PREFIX}-${dateStr ?? getTodayDateStr()}.log`);
+}
+// ── Ensure log directory ──
+try {
+    mkdirSync(LOG_DIR, { recursive: true });
+}
+catch { }
+// ── Cleanup expired logs (older than MAX_AGE_DAYS) ──
+function cleanupOldLogs() {
+    try {
+        const files = readdirSync(LOG_DIR);
+        const cutoff = Date.now() - MAX_AGE_DAYS * 24 * 60 * 60 * 1000;
+        for (const f of files) {
+            if (!f.startsWith(LOG_PREFIX) || !f.endsWith(".log"))
+                continue;
+            const fp = join(LOG_DIR, f);
+            try {
+                if (statSync(fp).mtimeMs < cutoff)
+                    unlinkSync(fp);
+            }
+            catch { }
+        }
+    }
+    catch { }
+}
+// Run cleanup on module load
+cleanupOldLogs();
+// Schedule periodic cleanup every 6 hours
+const cleanupTimer = setInterval(cleanupOldLogs, 6 * 60 * 60 * 1000);
+cleanupTimer.unref?.();
+// ── File destination with daily rotation ──
+let currentDate = getTodayDateStr();
+const dest = pino.destination({ dest: getLogFilePath(currentDate), sync: false, mkdir: true });
+// ── Rotation check ──
+function checkRotation() {
+    const today = getTodayDateStr();
+    if (today !== currentDate) {
+        currentDate = today;
+        dest.reopen(getLogFilePath(today));
+        cleanupOldLogs();
+    }
+}
+/**
+ * Write a skill-usage record to the skills log.
+ * Format: |YYYYMMDDThhmmss|skillName|
+ */
+export function writeSkillUsage(skillName) {
+    checkRotation();
+    const timestamp = formatTimestampUTC8();
+    dest.write(`|${timestamp}|${skillName}|\n`);
+}

package/package.json

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