@ynhcj/xiaoyi-channel 0.0.219-next → 0.0.221-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 } 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";
@@ -63,13 +63,20 @@ 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) {
+                setCronToolRunInfo(event.toolCallId, event.runId);
+            }
         }
     });
     api.on("after_tool_call", async (event, ctx) => {
         if (event.toolCallId) {
             clearCronToolCall(event.toolCallId);
+            clearCronToolRunInfo(event.toolCallId);
         }
         // 捕获对话创建的 cron job：agent 调 cron(add) 后，从 result 拿 jobId，
         // 配合当前会话的 pushId，写入 jobId↔pushId 映射，供 fire 时反查设备。

package/dist/src/bot.js

@@ -322,8 +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.
-                    decrementTaskIdRef(parsed.sessionId);
+                    // 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/tools/call-device-tool.js

@@ -24,7 +24,7 @@ import { sendEmailTool } from "./send-email-tool.js";
 import { searchEmailTool } from "./search-email-tool.js";
 import { getCachedXYWebSocketManager } from "../client.js";
 import { sendStatusUpdate } from "../formatter.js";
-import { getCurrentSessionContext } from './session-manager.js';
+import { getCurrentSessionContext, runWithSessionContext, isCronToolCall, getCronToolRunInfo } from './session-manager.js';
 /**
  * call_device_tool - 通用端工具调度器。
  * LLM 必须先通过 get_xxx_tool_schema 获取具体工具 schema，再用本工具执行。
@@ -77,9 +77,26 @@ export const callDeviceTool = {
         required: ["toolName", "arguments"],
     },
     async execute(toolCallId, params) {
-        const ctx = getCurrentSessionContext();
+        let ctx = getCurrentSessionContext();
         const wsManager = getCachedXYWebSocketManager();
         const config = wsManager.config;
+        // Cron mode: ALS is not available (cron does not go through bot.ts →
+        // runWithSessionContext).  Build a synthetic SessionContext so that
+        // sub-tools don't crash on null ALS and sendCommand() can route
+        // through sendCommandViaPush.
+        let isSyntheticCtx = false;
+        if (!ctx && isCronToolCall(toolCallId)) {
+            const runInfo = getCronToolRunInfo(toolCallId);
+            ctx = {
+                config,
+                sessionId: `cron-${(runInfo?.runId ?? toolCallId).replace(/-/g, "")}`,
+                taskId: runInfo?.runId ?? toolCallId,
+                messageId: "",
+                agentId: config.agentId,
+                isCron: true,
+            };
+            isSyntheticCtx = true;
+        }
         const sessionId = ctx?.sessionId ?? "";
         const taskId = ctx?.taskId ?? "";
         const messageId = ctx?.messageId ?? "";
@@ -110,6 +127,11 @@ export const callDeviceTool = {
             };
         }
         try {
+            // Wrap sub-tool with synthetic ALS context so getCurrentSessionContext()
+            // returns non-null inside the sub-tool's execute().
+            if (isSyntheticCtx) {
+                return await runWithSessionContext(ctx, () => tool.execute(toolCallId, toolArgs));
+            }
             return await tool.execute(toolCallId, toolArgs);
         }
         catch (error) {

package/dist/src/tools/session-manager.d.ts

@@ -20,12 +20,24 @@ 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. */
 export declare function isCronToolCall(toolCallId?: string): boolean;
 /** Clean up a cron tool call marker after use. */
 export declare function clearCronToolCall(toolCallId: string): void;
+/** Store the openclaw runId for a cron-triggered tool call. */
+export declare function setCronToolRunInfo(toolCallId: string, runId: string): void;
+/** Get the stored runId for a cron-triggered tool call. */
+export declare function getCronToolRunInfo(toolCallId: string): {
+    runId: string;
+} | undefined;
+/** Clean up cron tool run info after use. */
+export declare function clearCronToolRunInfo(toolCallId: string): void;
 /** 把 fire 期解析出的 jobId 绑定到当前 cron run 的合成 sessionId。 */
 export declare function setCurrentCronJobId(cronSessionId: string, jobId: string): void;
 /** 凭合成 cron sessionId 取本次 run 的 jobId（供 sendCommand 反查 pushId）。 */

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
@@ -39,6 +53,29 @@ export function isCronToolCall(toolCallId) {
 export function clearCronToolCall(toolCallId) {
     cronToolCallMap.delete(toolCallId);
 }
+// ── Cron tool run info ─────────────────────────────────────────────
+// When a cron-triggered tool executes, ALS is not available (cron does
+// not go through bot.ts → runWithSessionContext).  We store the runId
+// from the before_tool_call event so call_device_tool can construct a
+// synthetic SessionContext for sub-tool execution.
+if (!_g.__xyCronToolRunInfo) {
+    _g.__xyCronToolRunInfo = new Map();
+}
+const cronToolRunInfoMap = _g.__xyCronToolRunInfo;
+/** Store the openclaw runId for a cron-triggered tool call. */
+export function setCronToolRunInfo(toolCallId, runId) {
+    if (toolCallId && runId) {
+        cronToolRunInfoMap.set(toolCallId, { runId });
+    }
+}
+/** Get the stored runId for a cron-triggered tool call. */
+export function getCronToolRunInfo(toolCallId) {
+    return cronToolRunInfoMap.get(toolCallId);
+}
+/** Clean up cron tool run info after use. */
+export function clearCronToolRunInfo(toolCallId) {
+    cronToolRunInfoMap.delete(toolCallId);
+}
 // ── Cron session ↔ jobId bridge ────────────────────────────────────
 // fire 期 jobId 传递桥。provider.ts 在 isCron 分支从首条消息
 // `[cron:<jobId> ...]` 解析出真实 jobId，写入合成 cron sessionId；

package/package.json

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