@ynhcj/xiaoyi-channel 0.0.218-next → 0.0.220-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 } 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";
@@ -65,11 +65,16 @@ function registerCronDetectionHook(api) {
     api.on("before_tool_call", async (event, ctx) => {
         if (ctx.sessionKey?.startsWith("cron:") && 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

@@ -323,7 +323,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);
+                    // 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);
                     return;
                 }
                 log.log(`[BOT-STEER] Direct steer failed (queued=false), falling through to dispatchReplyFromConfig`);

package/dist/src/reply-dispatcher.js

@@ -142,7 +142,10 @@ export function createXYReplyDispatcher(params) {
     // ── append: false streaming state ─────────────────────────────
     // Instead of computing deltas, we always send the full text with
     // append: false.  Model-call boundaries are detected via startsWith.
-    let crossTurnPrefix = sessionFullTextMap.get(sessionId) ?? "";
+    // crossTurnPrefix: 仅在 steer 时继承上一轮内容，新消息从空开始。
+    let crossTurnPrefix = steerState.steered
+        ? (sessionFullTextMap.get(sessionId) ?? "")
+        : "";
     let prevModelText = ""; // completed model calls within this turn
     let currentModelText = ""; // current model call's full accumulated text
     // ──────────────────────────────────────────────────────────────

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

@@ -26,6 +26,14 @@ export declare function markCronToolCall(toolCallId: string): void;
 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

@@ -39,6 +39,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.218-next",
+  "version": "0.0.220-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",