@ynhcj/xiaoyi-channel 0.0.100-next → 0.0.101-next

package/dist/src/formatter.js

@@ -2,6 +2,7 @@
 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.
  */
@@ -111,9 +112,13 @@ export async function sendReasoningTextUpdate(params) {
 export async function sendStatusUpdate(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: {
@@ -132,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
@@ -141,12 +146,12 @@ export async function sendStatusUpdate(params) {
         msgType: "agent_response",
         agentId: config.agentId,
         sessionId,
-        taskId,
+        taskId: currentTaskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // 📋 Log complete response body
     log(`[A2A_STATUS] 📤 Sending A2A status-update:`);
-    log(`[A2A_STATUS]   - taskId: ${taskId}`);
+    log(`[A2A_STATUS]   - taskId: ${currentTaskId}`);
     log(`[A2A_STATUS]   - text: "${text}"`);
     await wsManager.sendMessage(sessionId, outboundMessage);
 }
@@ -155,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,
@@ -178,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
@@ -187,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/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/package.json

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