@ynhcj/xiaoyi-channel 0.0.39-next → 0.0.40-next

package/dist/src/bot.d.ts

@@ -8,6 +8,7 @@ export interface HandleXYMessageParams {
     runtime: RuntimeEnv;
     message: A2AJsonRpcRequest;
     accountId: string;
+    webSocketSessionId?: string;
 }
 /**
  * Handle an incoming A2A message.

package/dist/src/bot.js

@@ -9,6 +9,7 @@ import { registerSession, unregisterSession, runWithSessionContext } from "./too
 import { configManager } from "./utils/config-manager.js";
 import { addPushId } from "./utils/pushid-manager.js";
 import { getPushDataById } from "./utils/pushdata-manager.js";
+import { saveRuntimeInfo } from "./utils/runtime-manager.js";
 import { registerTaskId, decrementTaskIdRef, lockTaskId, unlockTaskId, hasActiveTask, } from "./task-manager.js";
 /**
  * Handle an incoming A2A message.
@@ -16,7 +17,7 @@ import { registerTaskId, decrementTaskIdRef, lockTaskId, unlockTaskId, hasActive
  * Runtime is expected to be validated before calling this function.
  */
 export async function handleXYMessage(params) {
-    const { cfg, runtime, message, accountId } = params;
+    const { cfg, runtime, message, accountId, webSocketSessionId } = params;
     const log = runtime?.log ?? console.log;
     const error = runtime?.error ?? console.error;
     // 每次收到消息时更新缓存，供 steer 注入使用
@@ -125,6 +126,13 @@ export async function handleXYMessage(params) {
         else {
             log(`[BOT] ℹ️  No push_id found in message, will use config default`);
         }
+        // 保存 runtime 信息到 .xiaoyiruntime 文件（异步，不阻塞主流程）
+        saveRuntimeInfo(webSocketSessionId || parsed.sessionId, // SESSION_ID (WebSocket 层级，如果没有则 fallback)
+        parsed.sessionId, // CONVERSATION_ID (param 里的 sessionId)
+        parsed.taskId // TASK_ID (param.id)
+        ).catch((err) => {
+            error(`[BOT] Failed to save runtime info:`, err);
+        });
         // Resolve configuration (needed for status updates)
         const config = resolveXYConfig(cfg);
         // ✅ Resolve agent route (following feishu pattern)
@@ -231,6 +239,7 @@ export async function handleXYMessage(params) {
             messageId: parsed.messageId,
             agentId: route.accountId,
         };
+        log(`[BOT-DISPATCH] ⏳ withReplyDispatcher starting, sessionKey=${route.sessionKey}`);
         await core.channel.reply.withReplyDispatcher({
             dispatcher,
             onSettled: () => {
@@ -249,12 +258,32 @@ export async function handleXYMessage(params) {
             },
             run: () => 
             // 🔐 Use AsyncLocalStorage to provide session context to tools
-            runWithSessionContext(sessionContext, () => core.channel.reply.dispatchReplyFromConfig({
-                ctx: ctxPayload,
-                cfg,
-                dispatcher,
-                replyOptions,
-            })),
+            runWithSessionContext(sessionContext, async () => {
+                log(`[BOT-DISPATCH] ⏳ dispatchReplyFromConfig starting...`);
+                log(`[BOT-DISPATCH]   - sessionKey: ${ctxPayload.SessionKey}`);
+                log(`[BOT-DISPATCH]   - provider: ${ctxPayload.Provider}`);
+                log(`[BOT-DISPATCH]   - surface: ${ctxPayload.Surface}`);
+                log(`[BOT-DISPATCH]   - from: ${ctxPayload.From}`);
+                log(`[BOT-DISPATCH]   - body length: ${ctxPayload.Body?.length ?? 0}`);
+                try {
+                    const result = await core.channel.reply.dispatchReplyFromConfig({
+                        ctx: ctxPayload,
+                        cfg,
+                        dispatcher,
+                        replyOptions,
+                    });
+                    log(`[BOT-DISPATCH] ✅ dispatchReplyFromConfig returned`);
+                    log(`[BOT-DISPATCH]   - result: ${JSON.stringify(result)}`);
+                    return result;
+                }
+                catch (dispatchErr) {
+                    error(`[BOT-DISPATCH] ❌ dispatchReplyFromConfig threw`);
+                    error(`[BOT-DISPATCH]   - error name: ${dispatchErr instanceof Error ? dispatchErr.name : "unknown"}`);
+                    error(`[BOT-DISPATCH]   - error message: ${String(dispatchErr)}`);
+                    error(`[BOT-DISPATCH]   - error stack: ${dispatchErr instanceof Error ? dispatchErr.stack?.slice(0, 500) : "N/A"}`);
+                    throw dispatchErr;
+                }
+            }),
         });
         log(`[BOT] ✅ Dispatcher completed for session: ${parsed.sessionId}`);
         log(`xy: dispatch complete (session=${parsed.sessionId})`);

package/dist/src/formatter.d.ts

@@ -15,6 +15,8 @@ export interface SendA2AResponseParams {
         fileType: string;
         fileId: string;
     }>;
+    errorCode?: number | string;
+    errorMessage?: string;
 }
 /**
  * Send an A2A artifact update response.

package/dist/src/formatter.js

@@ -6,10 +6,10 @@ import { getXYRuntime } from "./runtime.js";
  * Send an A2A artifact update response.
  */
 export async function sendA2AResponse(params) {
-    const { config, sessionId, taskId, messageId, text, append, final, files } = params;
+    const { config, sessionId, taskId, messageId, text, append, final, files, errorCode, errorMessage } = params;
     const runtime = getXYRuntime();
     const log = runtime?.log ?? console.log;
-    const error = runtime?.error ?? console.error;
+    const errorFn = runtime?.error ?? console.error;
     // Build artifact update event
     const artifact = {
         taskId,
@@ -42,6 +42,14 @@ export async function sendA2AResponse(params) {
         id: messageId,
         result: artifact,
     };
+    // 🔑 添加 error 字段（仅当提供 errorCode 时）
+    if (errorCode !== undefined) {
+        jsonRpcResponse.error = {
+            code: errorCode,
+            message: errorMessage ?? "任务执行异常，请重试",
+        };
+        log(`[A2A_RESPONSE] ⚠️ Including error code: ${errorCode}`);
+    }
     // Send via WebSocket
     const wsManager = getXYWebSocketManager(config);
     const outboundMessage = {

package/dist/src/monitor.js

@@ -83,6 +83,7 @@ export async function monitorXYProvider(opts = {}) {
                         runtime,
                         message,
                         accountId, // ✅ Pass accountId ("default")
+                        webSocketSessionId: sessionId, // ✅ 传递 WebSocket 层级的 sessionId
                     });
                 }
                 catch (err) {

package/dist/src/reply-dispatcher.js

@@ -235,9 +235,11 @@ export function createXYReplyDispatcher(params) {
                         text: "任务执行异常，请重试~",
                         append: false,
                         final: true,
+                        errorCode: 99921111,
+                        errorMessage: "任务执行异常，请重试",
                     });
                     finalSent = true;
-                    log(`[ON_IDLE] ✅ Sent error response`);
+                    log(`[ON_IDLE] ✅ Sent error response with code: 99921111`);
                 }
                 catch (err) {
                     error(`[ON_IDLE] Failed to send error response:`, err);

package/dist/src/utils/runtime-manager.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 保存 runtime 信息到 .xiaoyiruntime 文件
+ * @param webSocketSessionId - WebSocket 层级的 sessionId (SESSION_ID)
+ * @param conversationId - param 里的 sessionId (CONVERSATION_ID)
+ * @param taskId - 任务 ID (param.id)
+ */
+export declare function saveRuntimeInfo(webSocketSessionId: string, conversationId: string, taskId: string): Promise<void>;

package/dist/src/utils/runtime-manager.js

@@ -0,0 +1,42 @@
+// xiaoyi runtime 持久化管理器
+import { promises as fs } from "fs";
+import * as path from "path";
+import { logger } from "./logger.js";
+const RUNTIME_FILE = "/home/sandbox/.openclaw/.xiaoyiruntime";
+/**
+ * 确保目录存在
+ */
+async function ensureDirectoryExists(filePath) {
+    const dir = path.dirname(filePath);
+    try {
+        await fs.mkdir(dir, { recursive: true });
+    }
+    catch (error) {
+        logger.error(`[RuntimeManager] Failed to create directory ${dir}:`, error);
+    }
+}
+/**
+ * 保存 runtime 信息到 .xiaoyiruntime 文件
+ * @param webSocketSessionId - WebSocket 层级的 sessionId (SESSION_ID)
+ * @param conversationId - param 里的 sessionId (CONVERSATION_ID)
+ * @param taskId - 任务 ID (param.id)
+ */
+export async function saveRuntimeInfo(webSocketSessionId, conversationId, taskId) {
+    if (!webSocketSessionId || !conversationId || !taskId) {
+        logger.warn(`[RuntimeManager] Invalid params: SESSION_ID=${webSocketSessionId}, CONVERSATION_ID=${conversationId}, TASK_ID=${taskId}`);
+        return;
+    }
+    try {
+        await ensureDirectoryExists(RUNTIME_FILE);
+        const content = `SESSION_ID=${webSocketSessionId}\nCONVERSATION_ID=${conversationId}\nTASK_ID=${taskId}\n`;
+        await fs.writeFile(RUNTIME_FILE, content, "utf-8");
+        logger.log(`[RuntimeManager] ✅ Saved runtime info to .xiaoyiruntime`);
+        logger.log(`[RuntimeManager]   - SESSION_ID: ${webSocketSessionId}`);
+        logger.log(`[RuntimeManager]   - CONVERSATION_ID: ${conversationId}`);
+        logger.log(`[RuntimeManager]   - TASK_ID: ${taskId}`);
+    }
+    catch (error) {
+        logger.error(`[RuntimeManager] Failed to save runtime info:`, error);
+        // 不抛出异常，避免影响主流程
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.39-next",
+  "version": "0.0.40-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",
@@ -59,13 +59,12 @@
   "dependencies": {
     "ws": "^8.14.2",
     "uuid": "^9.0.0",
-    "node-fetch": "^2.7.0"
+    "node-fetch": "^3.3.2"
   },
   "devDependencies": {
     "@types/ws": "^8.5.8",
     "@types/uuid": "^9.0.5",
     "@types/node": "^20.8.0",
-    "@types/node-fetch": "^2.6.2",
     "typescript": "^5.9.2"
   }
 }