@ynhcj/xiaoyi-channel 0.0.127-beta → 0.0.129-beta

package/dist/index.d.ts

@@ -1,11 +1,8 @@
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 declare const _default: {
     id: string;
     name: string;
     description: string;
-    configSchema: import("openclaw/plugin-sdk").ChannelConfigSchema;
-    register: (api: OpenClawPluginApi) => void;
-    channelPlugin: import("openclaw/plugin-sdk").ChannelPlugin;
-    setChannelRuntime?: (runtime: import("openclaw/plugin-sdk").PluginRuntime) => void;
-};
+    configSchema: import("openclaw/plugin-sdk").OpenClawPluginConfigSchema;
+    register: NonNullable<import("openclaw/plugin-sdk/core").OpenClawPluginDefinition["register"]>;
+} & Pick<import("openclaw/plugin-sdk/core").OpenClawPluginDefinition, "kind" | "reload" | "nodeHostCommands" | "securityAuditCollectors">;
 export default _default;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { defineChannelPluginEntry } from "openclaw/plugin-sdk/core";
+import { definePluginEntry } from "openclaw/plugin-sdk/core";
 import { xiaoyiProvider } from "./src/provider.js";
 import { xyPlugin } from "./src/channel.js";
 import { callCsplApi } from "./src/cspl/call-api.js";
@@ -9,61 +9,79 @@ import { tryInjectSteer } from "./src/steer-injector.js";
 import { registerSelfEvolutionToolResultNudge } from "./src/self-evolution-tool-result-nudge.js";
 import { createBeforePromptBuildHandler } from "./src/skill-retriever/hooks.js";
 import { normalizeToolRetrieverConfig } from "./src/skill-retriever/config.js";
-export default defineChannelPluginEntry({
-    id: "xiaoyi-channel",
-    name: "Xiaoyi Channel",
-    description: "Xiaoyi channel plugin - Xiaoyi A2A protocol integration",
-    plugin: xyPlugin,
-    setRuntime: setXYRuntime,
-    registerFull(api) {
-        api.registerProvider(xiaoyiProvider);
-        // SKILL RETRIEVER HOOK: before_prompt_build hook
-        const pluginConfig = api.pluginConfig || {};
-        const skillRetrieverConfig = normalizeToolRetrieverConfig({
-            enabled: pluginConfig.skillRetrieverEnabled ?? true,
-            maxTools: pluginConfig.skillRetrieverMaxTools ?? 2,
-            includeUninstalledOnly: true,
-            envFilePath: "~/.openclaw/.xiaoyienv",
-            timeoutMs: pluginConfig.skillRetrieverTimeoutMs ?? 1000,
-        });
-        const beforePromptBuildHandler = createBeforePromptBuildHandler(skillRetrieverConfig);
-        api.on("before_prompt_build", beforePromptBuildHandler);
-        registerSelfEvolutionToolResultNudge(api);
-        api.on("after_tool_call", async (event, ctx) => {
-            if (!ALLOWED_TOOLS.includes(event.toolName)) {
+function registerFullHooks(api) {
+    // SKILL RETRIEVER HOOK: before_prompt_build hook
+    const pluginConfig = api.pluginConfig || {};
+    const skillRetrieverConfig = normalizeToolRetrieverConfig({
+        enabled: pluginConfig.skillRetrieverEnabled ?? true,
+        maxTools: pluginConfig.skillRetrieverMaxTools ?? 2,
+        includeUninstalledOnly: true,
+        envFilePath: "~/.openclaw/.xiaoyienv",
+        timeoutMs: pluginConfig.skillRetrieverTimeoutMs ?? 1000,
+    });
+    const beforePromptBuildHandler = createBeforePromptBuildHandler(skillRetrieverConfig);
+    api.on("before_prompt_build", beforePromptBuildHandler);
+    registerSelfEvolutionToolResultNudge(api);
+    api.on("after_tool_call", async (event, ctx) => {
+        if (!ALLOWED_TOOLS.includes(event.toolName)) {
+            return;
+        }
+        console.log(`[SENTINEL HOOK] after_tool_call triggered: toolName=${event.toolName}, sessionKey=${ctx.sessionKey ?? "none"}`);
+        try {
+            const resultText = extractResultText(event, event.toolName);
+            const resultLength = resultText.length;
+            if (resultLength <= MIN_TEXT_LENGTH || resultLength > MAX_TOTAL_LENGTH) {
                 return;
             }
-            console.log(`[SENTINEL HOOK] after_tool_call triggered: toolName=${event.toolName}, sessionKey=${ctx.sessionKey ?? "none"}`);
-            try {
-                const resultText = extractResultText(event, event.toolName);
-                const resultLength = resultText.length;
-                if (resultLength <= MIN_TEXT_LENGTH || resultLength > MAX_TOTAL_LENGTH) {
-                    return;
-                }
-                const questionText = {
-                    subSceneID: "TOOL_OUTPUT",
-                    tool: event.toolName,
-                    output: [{ content: "" }],
-                };
-                const originText = processText(resultText);
-                questionText.output[0].content = originText;
-                let finalJson = JSON.stringify(questionText);
-                if (finalJson.length > MAX_TEXT_LENGTH) {
-                    const diff = finalJson.length - MAX_TEXT_LENGTH;
-                    const { text: trimmed } = validateAndTruncateText(originText, MAX_TEXT_LENGTH - diff);
-                    questionText.output[0].content = trimmed;
-                    finalJson = JSON.stringify(questionText);
-                }
-                const response = await callCsplApi(finalJson, api.config);
-                const result = parseSecurityResult(response);
-                console.log(`[SENTINEL HOOK] Security result: status=${result.status}`);
-                if (result.status === "REJECT") {
-                    await tryInjectSteer(ctx.sessionKey, STEER_ABORT_MESSAGE);
-                }
+            const questionText = {
+                subSceneID: "TOOL_OUTPUT",
+                tool: event.toolName,
+                output: [{ content: "" }],
+            };
+            const originText = processText(resultText);
+            questionText.output[0].content = originText;
+            let finalJson = JSON.stringify(questionText);
+            if (finalJson.length > MAX_TEXT_LENGTH) {
+                const diff = finalJson.length - MAX_TEXT_LENGTH;
+                const { text: trimmed } = validateAndTruncateText(originText, MAX_TEXT_LENGTH - diff);
+                questionText.output[0].content = trimmed;
+                finalJson = JSON.stringify(questionText);
             }
-            catch (err) {
-                api.logger.error(`[SENTINEL HOOK] after_tool_call error: ${err}`);
+            const response = await callCsplApi(finalJson, api.config);
+            const result = parseSecurityResult(response);
+            console.log(`[SENTINEL HOOK] Security result: status=${result.status}`);
+            if (result.status === "REJECT") {
+                await tryInjectSteer(ctx.sessionKey, STEER_ABORT_MESSAGE);
             }
-        });
+        }
+        catch (err) {
+            api.logger.error(`[SENTINEL HOOK] after_tool_call error: ${err}`);
+        }
+    });
+}
+export default definePluginEntry({
+    id: "xiaoyi-channel",
+    name: "Xiaoyi Channel",
+    description: "Xiaoyi channel plugin - Xiaoyi A2A protocol integration",
+    register(api) {
+        // Always register the provider so wrapStreamFn/prepareExtraParams work
+        // in ALL registration modes (not just "full").
+        api.registerProvider(xiaoyiProvider);
+        if (api.registrationMode === "cli-metadata") {
+            return;
+        }
+        if (api.registrationMode === "tool-discovery") {
+            registerFullHooks(api);
+            return;
+        }
+        // Register channel plugin and set runtime
+        api.registerChannel({ plugin: xyPlugin });
+        setXYRuntime(api.runtime);
+        if (api.registrationMode === "discovery") {
+            return;
+        }
+        if (api.registrationMode === "full") {
+            registerFullHooks(api);
+        }
     },
 });

package/dist/provider-discovery.d.ts

@@ -0,0 +1,2 @@
+import { xiaoyiProvider } from "./src/provider.js";
+export default xiaoyiProvider;

package/dist/provider-discovery.js

@@ -0,0 +1,4 @@
+// Provider discovery entry for fast-path provider resolution.
+// Exported as default so normalizeDiscoveryModule can unwrap it via .default.
+import { xiaoyiProvider } from "./src/provider.js";
+export default xiaoyiProvider;

package/dist/src/bot.js

@@ -90,6 +90,7 @@ export async function handleXYMessage(params) {
                     text: pushDataItem.dataDetail,
                     append: false,
                     final: true,
+                    runtime,
                 });
                 log(`[BOT] ✅ Trigger response sent successfully, exiting early`);
                 return; // 提前返回，不继续处理
@@ -162,6 +163,7 @@ export async function handleXYMessage(params) {
             taskId: parsed.taskId,
             messageId: parsed.messageId,
             agentId: route.accountId,
+            deviceType,
         });
         // 🔑 发送初始状态更新（第二条消息也要发，用新taskId）
         log(`[STATUS] Sending initial status update for session ${parsed.sessionId}`);
@@ -172,6 +174,7 @@ export async function handleXYMessage(params) {
             messageId: parsed.messageId,
             text: isSecondMessage ? "新消息已接收，正在处理..." : "任务正在处理中，请稍候~",
             state: "working",
+            runtime,
         }).catch((err) => {
             error(`Failed to send initial status update:`, err);
         });

package/dist/src/formatter.d.ts

@@ -17,6 +17,7 @@ export interface SendA2AResponseParams {
     }>;
     errorCode?: number | string;
     errorMessage?: string;
+    runtime?: any;
 }
 /**
  * Send an A2A artifact update response.
@@ -49,6 +50,7 @@ export interface SendStatusUpdateParams {
     messageId: string;
     text: string;
     state: "submitted" | "working" | "input-required" | "completed" | "canceled" | "failed" | "unknown";
+    runtime?: any;
 }
 /**
  * Send an A2A task status update.

package/dist/src/formatter.js

@@ -2,11 +2,13 @@
 import { v4 as uuidv4 } from "uuid";
 import { getXYWebSocketManager } from "./client.js";
 import { logger } from "./utils/logger.js";
+import { getCurrentTaskId, getCurrentMessageId } from "./task-manager.js";
 /**
  * Send an A2A artifact update response.
  */
 export async function sendA2AResponse(params) {
-    const { config, sessionId, taskId, messageId, text, append, final, files, errorCode, errorMessage } = params;
+    const { config, sessionId, taskId, messageId, text, append, final, files, errorCode, errorMessage, runtime } = params;
+    const log = runtime?.log ?? console.log;
     // Build artifact update event
     const artifact = {
         taskId,
@@ -45,7 +47,7 @@ export async function sendA2AResponse(params) {
             code: errorCode,
             message: errorMessage ?? "任务执行异常，请重试",
         };
-        logger.log(`[A2A_RESPONSE] ⚠️ Including error code: ${errorCode}`);
+        log(`[A2A_RESPONSE] ⚠️ Including error code: ${errorCode}`);
     }
     // Send via WebSocket
     const wsManager = getXYWebSocketManager(config);
@@ -57,13 +59,13 @@ export async function sendA2AResponse(params) {
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // 📋 Log complete response body
-    logger.log(`[A2A_RESPONSE] 📤 Sending A2A artifact-update response: taskId: ${taskId}`);
-    logger.log(`[A2A_RESPONSE]   - append: ${append}`);
-    logger.log(`[A2A_RESPONSE]   - final: ${final}`);
-    logger.log(`[A2A_RESPONSE]   - text: ${text.length <= 10 ? text : text.slice(0, 5) + '***' + text.slice(-5)}`);
-    logger.log(`[A2A_RESPONSE]   - files count: ${files?.length ?? 0}`);
+    log(`[A2A_RESPONSE] 📤 Sending A2A artifact-update response: taskId: ${taskId}`);
+    log(`[A2A_RESPONSE]   - append: ${append}`);
+    log(`[A2A_RESPONSE]   - final: ${final}`);
+    log(`[A2A_RESPONSE]   - text: ${text.length <= 10 ? text : text.slice(0, 5) + '***' + text.slice(-5)}`);
+    log(`[A2A_RESPONSE]   - files count: ${files?.length ?? 0}`);
     await wsManager.sendMessage(sessionId, outboundMessage);
-    logger.log(`[A2A_RESPONSE] ✅ Message sent successfully`);
+    log(`[A2A_RESPONSE] ✅ Message sent successfully`);
 }
 /**
  * Send an A2A artifact-update with reasoningText part.
@@ -108,10 +110,15 @@ export async function sendReasoningTextUpdate(params) {
  * Follows A2A protocol standard format with nested status object.
  */
 export async function sendStatusUpdate(params) {
-    const { config, sessionId, taskId, messageId, text, state } = params;
+    const { config, sessionId, taskId, messageId, text, state, runtime } = params;
+    const log = runtime?.log ?? console.log;
+    // Dynamic lookup: use latest taskId/messageId from task-manager (handles steer/interrupt),
+    // fall back to closure-captured values
+    const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+    const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
     // Build status update event following A2A protocol standard
     const statusUpdate = {
-        taskId,
+        taskId: currentTaskId,
         kind: "status-update",
         final: false, // Status updates should not end the stream
         status: {
@@ -130,7 +137,7 @@ export async function sendStatusUpdate(params) {
     // Build JSON-RPC response
     const jsonRpcResponse = {
         jsonrpc: "2.0",
-        id: messageId,
+        id: currentMessageId,
         result: statusUpdate,
     };
     // Send via WebSocket
@@ -139,13 +146,13 @@ export async function sendStatusUpdate(params) {
         msgType: "agent_response",
         agentId: config.agentId,
         sessionId,
-        taskId,
+        taskId: currentTaskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // 📋 Log complete response body
-    logger.log(`[A2A_STATUS] 📤 Sending A2A status-update:`);
-    logger.log(`[A2A_STATUS]   - taskId: ${taskId}`);
-    logger.log(`[A2A_STATUS]   - text: "${text}"`);
+    log(`[A2A_STATUS] 📤 Sending A2A status-update:`);
+    log(`[A2A_STATUS]   - taskId: ${currentTaskId}`);
+    log(`[A2A_STATUS]   - text: "${text}"`);
     await wsManager.sendMessage(sessionId, outboundMessage);
 }
 /**
@@ -153,10 +160,14 @@ export async function sendStatusUpdate(params) {
  */
 export async function sendCommand(params) {
     const { config, sessionId, taskId, messageId, command } = params;
+    // Dynamic lookup: use latest taskId/messageId from task-manager (handles steer/interrupt),
+    // fall back to closure-captured values
+    const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+    const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
     // Build artifact update with command as data
     // Wrap command in commands array as per protocol requirement
     const artifact = {
-        taskId,
+        taskId: currentTaskId,
         kind: "artifact-update",
         append: false,
         lastChunk: true,
@@ -176,7 +187,7 @@ export async function sendCommand(params) {
     // Build JSON-RPC response
     const jsonRpcResponse = {
         jsonrpc: "2.0",
-        id: messageId,
+        id: currentMessageId,
         result: artifact,
     };
     // Send via WebSocket
@@ -185,11 +196,11 @@ export async function sendCommand(params) {
         msgType: "agent_response",
         agentId: config.agentId,
         sessionId,
-        taskId,
+        taskId: currentTaskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // 📋 Log complete response body
-    logger.log(`[A2A_COMMAND] 📤 Sending A2A command: taskId: ${taskId}`);
+    logger.log(`[A2A_COMMAND] 📤 Sending A2A command: taskId: ${currentTaskId}`);
     await wsManager.sendMessage(sessionId, outboundMessage);
     logger.log(`[A2A_COMMAND] ✅ Command sent successfully`);
 }

package/dist/src/monitor.js

@@ -227,6 +227,7 @@ export async function monitorXYProvider(opts = {}) {
                         text: notificationText,
                         append: false,
                         final: true,
+                        runtime,
                     }).catch(err => {
                         error(`[MONITOR] Failed to send restart notification to session ${binding.sessionId}: ${String(err)}`);
                     }));

package/dist/src/provider.js

@@ -10,7 +10,6 @@
 import { createHash } from "crypto";
 import { getCurrentSessionContext } from "./tools/session-manager.js";
 import { selfEvolutionManager } from "./utils/self-evolution-manager.js";
-import { logger } from "./utils/logger.js";
 // ── Retry config ──────────────────────────────────────────────
 const RETRY_DELAYS_MS = [10_000, 20_000, 40_000, 60_000, 60_000];
 const MAX_RETRY_ATTEMPTS = 5;
@@ -127,7 +126,7 @@ function createRetryingStream(createStream, cronJob) {
                 if (!hasContent && !isContent) {
                     // ── Buffer phase (no content yet) ──
                     if (event.type === "done") {
-                        logger.log(`[xiaoyiprovider] stream completed (no content), usage: input=${event.message?.usage?.input} output=${event.message?.usage?.output}`);
+                        console.log(`[xiaoyiprovider] stream completed (no content), usage: input=${event.message?.usage?.input} output=${event.message?.usage?.output}`);
                         for (const b of buffer)
                             yield b;
                         resultResolve(event.message);
@@ -142,7 +141,7 @@ function createRetryingStream(createStream, cronJob) {
                 else {
                     // ── Streaming phase ──
                     if (!hasContent) {
-                        logger.log("[xiaoyiprovider] first content event received, switching to streaming mode");
+                        console.log("[xiaoyiprovider] first content event received, switching to streaming mode");
                         hasContent = true;
                         for (const b of buffer)
                             yield b;
@@ -151,13 +150,13 @@ function createRetryingStream(createStream, cronJob) {
                     // The SDK calls result() when it sees done/error — if we yield first, the generator
                     // suspends and can never reach resolve, causing a permanent deadlock.
                     if (event.type === "done") {
-                        logger.log(`[xiaoyiprovider] stream completed, usage: input=${event.message?.usage?.input} output=${event.message?.usage?.output}`);
+                        console.log(`[xiaoyiprovider] stream completed, usage: input=${event.message?.usage?.input} output=${event.message?.usage?.output}`);
                         resultResolve(event.message);
                         yield event;
                         return;
                     }
                     if (event.type === "error") {
-                        logger.log(`[xiaoyiprovider] stream error after content: ${event.error?.errorMessage}`);
+                        console.log(`[xiaoyiprovider] stream error after content: ${event.error?.errorMessage}`);
                         errorResult = event.error;
                         break; // break inner loop, proceed to retry decision
                     }
@@ -168,15 +167,15 @@ function createRetryingStream(createStream, cronJob) {
             if (errorResult?.stopReason === "error" && isRetryableProviderError(errorResult.errorMessage)) {
                 if (attempt < MAX_RETRY_ATTEMPTS - 1) {
                     const delayMs = getRetryDelayMs(attempt + 1, cronJob);
-                    logger.log(`[xiaoyiprovider] retryable error (attempt ${attempt + 1}/${MAX_RETRY_ATTEMPTS}): ` +
+                    console.log(`[xiaoyiprovider] retryable error (attempt ${attempt + 1}/${MAX_RETRY_ATTEMPTS}): ` +
                         `${errorResult.errorMessage} — retrying in ${delayMs}ms`);
                     await sleep(delayMs);
                     continue; // discard buffer, retry with a new stream
                 }
-                logger.log(`[xiaoyiprovider] all ${MAX_RETRY_ATTEMPTS} retries exhausted, surfacing last error`);
+                console.log(`[xiaoyiprovider] all ${MAX_RETRY_ATTEMPTS} retries exhausted, surfacing last error`);
             }
             else if (errorResult) {
-                logger.log(`[xiaoyiprovider] non-retryable error: ${errorResult.errorMessage}`);
+                console.log(`[xiaoyiprovider] non-retryable error: ${errorResult.errorMessage}`);
             }
             // Non-retryable or retries exhausted — yield buffered events.
             // Resolve before yielding the terminal event to avoid the same deadlock.
@@ -196,7 +195,7 @@ function createRetryingStream(createStream, cronJob) {
             return;
         }
         // Safety: final fallback attempt
-        logger.log("[xiaoyiprovider] entering final fallback attempt");
+        console.log("[xiaoyiprovider] entering final fallback attempt");
         const lastStream = await createStream();
         for await (const event of lastStream) {
             if (event.type === "done") {
@@ -439,6 +438,7 @@ export const xiaoyiProvider = {
      * since the default agent timeout is 48 hours).
      */
     wrapStreamFn: (ctx) => {
+        console.log("[xiaoyiprovider] wrapStreamFn CALLED — provider resolved by openclaw");
         const underlying = ctx.streamFn;
         if (!underlying)
             return underlying;
@@ -485,13 +485,17 @@ export const xiaoyiProvider = {
                 }
             }
             // 记录输入
-            logger.log(`[xiaoyiprovider] input messages count: ${context.messages?.length ?? 0}`);
+            console.log(`[xiaoyiprovider] input messages count: ${context.messages?.length ?? 0}`);
             if (context.systemPrompt) {
-                logger.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
+                console.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
             }
-            // Reuse deviceType from extraParams instead of calling getCurrentSessionContext()
-            // again (which may be ambiguous in multi-session or async scenarios).
-            const deviceType = ctx.extraParams?.[DEVICE_TYPE_KEY] || undefined;
+            // Prefer deviceType from extraParams (set by prepareExtraParams).
+            // Fall back to getCurrentSessionContext() because OpenClaw caches
+            // resolvePreparedExtraParams by provider/modelId – the cache key does
+            // not include session-specific data, so deviceType may be missing
+            // from the cached extraParams even when a session is active.
+            const extraParamsDeviceType = ctx.extraParams?.[DEVICE_TYPE_KEY] || undefined;
+            const deviceType = extraParamsDeviceType ?? getCurrentSessionContext()?.deviceType;
             // 在发送给模型前，优化 systemPrompt 结构
             if (context.systemPrompt) {
                 let sp = context.systemPrompt;
@@ -518,11 +522,11 @@ export const xiaoyiProvider = {
                         sp = sp.replace('## Runtime', combined + '\n\n## Runtime');
                     }
                 }
-                logger.log(`[xiaoyiprovider] system prompt optimized: ${beforeLen} -> ${sp.length}`);
+                console.log(`[xiaoyiprovider] system prompt optimized: ${beforeLen} -> ${sp.length}`);
                 context.systemPrompt = sp;
             }
             const selfEvolutionEnabled = await selfEvolutionManager.isEnabled();
-            logger.log(`[selfEvolution] selfEvolution flag: ${selfEvolutionEnabled}`);
+            console.log(`[selfEvolution] selfEvolution flag: ${selfEvolutionEnabled}`);
             context.systemPrompt = applySelfEvolutionPrompt(context.systemPrompt, selfEvolutionEnabled);
             // Append device context to systemPrompt (using pre-captured deviceType from prepareExtraParams)
             if (deviceType) {
@@ -550,7 +554,7 @@ export const xiaoyiProvider = {
             // ── Retry-capable streaming ──────────────────────────────
             const cronJob = isCronTriggered(context.messages);
             if (cronJob)
-                logger.log("[xiaoyiprovider] detected cron-triggered request, using extended retry delays");
+                console.log("[xiaoyiprovider] detected cron-triggered request, using extended retry delays");
             const makeStream = () => underlying(model, context, {
                 ...options,
                 headers: {

package/dist/src/reply-dispatcher.js

@@ -95,6 +95,7 @@ export function createXYReplyDispatcher(params) {
                 messageId: currentMessageId, // 🔑 动态messageId
                 text: "任务正在处理中，请稍候~",
                 state: "working",
+                runtime,
             }).catch((err) => {
                 error(`Failed to send status update:`, err);
             });
@@ -161,6 +162,7 @@ export function createXYReplyDispatcher(params) {
                         messageId: currentMessageId,
                         text: "处理失败，请稍后重试",
                         state: "failed",
+                        runtime,
                     });
                 }
                 catch (statusError) {
@@ -196,6 +198,7 @@ export function createXYReplyDispatcher(params) {
                         messageId: currentMessageId,
                         text: "任务处理已完成~",
                         state: "completed",
+                        runtime,
                     });
                     log(`[ON_IDLE] ✅ Sent completion status update`);
                     // 🔑 使用动态taskId发送最终响应
@@ -207,6 +210,7 @@ export function createXYReplyDispatcher(params) {
                         text: accumulatedText,
                         append: false,
                         final: true,
+                        runtime,
                     });
                     finalSent = true;
                     log(`[ON_IDLE] ✅ Sent final response with taskId=${currentTaskId}`);
@@ -226,6 +230,7 @@ export function createXYReplyDispatcher(params) {
                         messageId: currentMessageId,
                         text: "任务处理中断了~",
                         state: "failed",
+                        runtime,
                     });
                     log(`[ON_IDLE] ✅ Sent failure status update`);
                     await sendA2AResponse({
@@ -238,6 +243,7 @@ export function createXYReplyDispatcher(params) {
                         final: true,
                         errorCode: 99921111,
                         errorMessage: "任务执行异常，请重试",
+                        runtime,
                     });
                     finalSent = true;
                     log(`[ON_IDLE] ✅ Sent error response with code: 99921111`);
@@ -282,6 +288,7 @@ export function createXYReplyDispatcher(params) {
                             messageId: currentMessageId,
                             text: `正在使用工具: ${toolName}...`,
                             state: "working",
+                            runtime,
                         });
                         log(`[TOOL START] ✅ Sent status update for tool start: ${toolName}`);
                     }
@@ -310,6 +317,7 @@ export function createXYReplyDispatcher(params) {
                             messageId: currentMessageId,
                             text: resultText,
                             state: "working",
+                            runtime,
                         });
                         log(`[TOOL RESULT] ✅ Sent tool result as status update`);
                     }

package/dist/src/tools/send-file-to-user-tool.js

@@ -1,6 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { XYFileUploadService } from "../file-upload.js";
 import { logger } from "../utils/logger.js";
+import { getCurrentTaskId, getCurrentMessageId } from "../task-manager.js";
 import fetch from "node-fetch";
 import fs from "fs/promises";
 import path from "path";
@@ -122,6 +123,9 @@ b. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如
             },
         },
         async execute(toolCallId, params) {
+            // Dynamic lookup: use latest taskId/messageId from task-manager (handles steer/interrupt)
+            const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+            const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
             // Set timeout for the entire operation (2 minutes)
             const TOOL_TIMEOUT = 120000; // 2 minutes in milliseconds
             let timeoutHandle = null;
@@ -211,17 +215,17 @@ b. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如
                         msgType: "agent_response",
                         agentId: config.agentId,
                         sessionId: sessionId,
-                        taskId: taskId,
+                        taskId: currentTaskId,
                         msgDetail: JSON.stringify({
                             jsonrpc: "2.0",
-                            id: taskId,
+                            id: currentMessageId,
                             result: {
                                 kind: "artifact-update",
                                 append: true,
                                 lastChunk: false,
                                 final: false,
                                 artifact: {
-                                    artifactId: taskId,
+                                    artifactId: currentTaskId,
                                     parts: [
                                         {
                                             kind: "file",
@@ -237,7 +241,7 @@ b. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如
                             error: { code: 0 },
                         }),
                     };
-                    logger.log(`[SEND-FILE-TO-USER] 🚀 EXEC sending: sessionId=${sessionId} taskId=${taskId} fileName=${fileName}`);
+                    logger.log(`[SEND-FILE-TO-USER] 🚀 EXEC sending: sessionId=${sessionId} taskId=${currentTaskId} fileName=${fileName}`);
                     // Send WebSocket message
                     await wsManager.sendMessage(sessionId, agentResponse);
                     logger.log(`send ${fileName} file to user success`);

package/dist/src/tools/xiaoyi-gui-tool.js

@@ -1,6 +1,7 @@
 // XiaoYi GUI tool implementation - simulates phone screen interactions
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
 /**
  * XiaoYi GUI tool - executes phone app interactions through GUI agent.
  * Simulates user interactions on phone screen (click, swipe, input, navigation, etc.)
@@ -38,6 +39,8 @@ export function createXiaoyiGuiTool(ctx) {
             required: ["query"],
         },
         async execute(toolCallId, params) {
+            // Dynamic lookup: use latest taskId from task-manager (handles steer/interrupt)
+            const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
             // Validate parameters
             if (!params.query || typeof params.query !== "string") {
                 throw new Error("Missing or invalid required parameter: query must be a non-empty string");
@@ -53,7 +56,7 @@ export function createXiaoyiGuiTool(ctx) {
                 payload: {
                     query: params.query,
                     sessionId: sessionId,
-                    interactionId: taskId, // taskId corresponds to interactionId
+                    interactionId: currentTaskId, // taskId corresponds to interactionId; use dynamic lookup for steer safety
                 },
             };
             // Send command and wait for response (5 minute timeout)

package/dist/src/utils/logger.js

@@ -1,34 +1,36 @@
 // Logging utilities for XY channel
 import { getXYRuntime } from "../runtime.js";
-/**
- * Log a message using the OpenClaw runtime logger.
- */
-function logMessage(level, message, ...args) {
+function getRuntime() {
     try {
-        const runtime = getXYRuntime();
-        const logFn = runtime[level];
-        if (logFn) {
-            const formattedMessage = `[XY] ${message}`;
-            logFn(formattedMessage, ...args);
-        }
+        return getXYRuntime();
     }
-    catch (error) {
-        // Fallback to console if runtime not available
-        console[level](`[XY] ${message}`, ...args);
+    catch {
+        return undefined;
     }
 }
+function getLog() {
+    const runtime = getRuntime();
+    return runtime?.log ?? console.log;
+}
+function getWarn() {
+    const runtime = getRuntime();
+    return runtime?.warn ?? console.warn;
+}
+function getError() {
+    const runtime = getRuntime();
+    return runtime?.error ?? console.error;
+}
 export const logger = {
     log(message, ...args) {
-        logMessage("log", message, ...args);
+        getLog()(message, ...args);
     },
     warn(message, ...args) {
-        logMessage("warn", message, ...args);
+        getWarn()(message, ...args);
     },
     error(message, ...args) {
-        logMessage("error", message, ...args);
+        getError()(message, ...args);
     },
     debug(message, ...args) {
-        // Debug messages go to log level
-        logMessage("log", `[DEBUG] ${message}`, ...args);
+        getLog()(`[DEBUG] ${message}`, ...args);
     },
 };

package/openclaw.plugin.json

@@ -2,6 +2,7 @@
   "id": "xiaoyi-channel",
   "channels": ["xiaoyi-channel"],
   "providers": ["xiaoyiprovider"],
+  "providerDiscoveryEntry": "./dist/provider-discovery.js",
   "skills": [],
   "configSchema": {
     "type": "object",

package/package.json

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