@ynhcj/xiaoyi-channel 0.0.1-beta → 0.0.1-next

package/dist/src/bot.js

@@ -6,6 +6,7 @@ import { resolveXYConfig } from "./config.js";
 import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse } from "./formatter.js";
 import { registerSession, unregisterSession } from "./tools/session-manager.js";
 import { configManager } from "./utils/config-manager.js";
+import { registerTaskId, decrementTaskIdRef, lockTaskId, unlockTaskId, hasActiveTask, } from "./task-manager.js";
 /**
  * Handle an incoming A2A message.
  * This is the main entry point for message processing.
@@ -56,6 +57,22 @@ export async function handleXYMessage(params) {
         }
         // Parse the A2A message (for regular messages)
         const parsed = parseA2AMessage(message);
+        // 🔑 检测steer模式和是否是第二条消息
+        const isSteerMode = cfg.messages?.queue?.mode === "steer";
+        const isSecondMessage = isSteerMode && hasActiveTask(parsed.sessionId);
+        if (isSecondMessage) {
+            log(`[BOT] 🔄 STEER MODE - Second message detected (will be follower)`);
+            log(`[BOT]   - Session: ${parsed.sessionId}`);
+            log(`[BOT]   - New taskId: ${parsed.taskId} (will replace current)`);
+        }
+        // 🔑 注册taskId（第二条消息会覆盖第一条的taskId）
+        const { isUpdate, refCount } = registerTaskId(parsed.sessionId, parsed.taskId, parsed.messageId, { incrementRef: true } // 增加引用计数
+        );
+        // 🔑 如果是第一条消息，锁定taskId防止被过早清理
+        if (!isUpdate) {
+            lockTaskId(parsed.sessionId);
+            log(`[BOT] 🔒 Locked taskId for first message`);
+        }
         // Extract and update push_id if present
         const pushId = extractPushId(parsed.parts);
         if (pushId) {
@@ -83,11 +100,12 @@ export async function handleXYMessage(params) {
             },
         });
         log(`xy: resolved route accountId=${route.accountId}, sessionKey=${route.sessionKey}`);
-        // Register session context for tools
+        // 🔑 注册session（带引用计数）
         log(`[BOT] 📝 About to register session for tools...`);
         log(`[BOT]   - sessionKey: ${route.sessionKey}`);
         log(`[BOT]   - sessionId: ${parsed.sessionId}`);
         log(`[BOT]   - taskId: ${parsed.taskId}`);
+        log(`[BOT]   - isSecondMessage: ${isSecondMessage}`);
         registerSession(route.sessionKey, {
             config,
             sessionId: parsed.sessionId,
@@ -96,6 +114,18 @@ export async function handleXYMessage(params) {
             agentId: route.accountId,
         });
         log(`[BOT] ✅ Session registered for tools`);
+        // 🔑 发送初始状态更新（第二条消息也要发，用新taskId）
+        log(`[STATUS] Sending initial status update for session ${parsed.sessionId}`);
+        void sendStatusUpdate({
+            config,
+            sessionId: parsed.sessionId,
+            taskId: parsed.taskId,
+            messageId: parsed.messageId,
+            text: isSecondMessage ? "新消息已接收，正在处理..." : "任务正在处理中，请稍后~",
+            state: "working",
+        }).catch((err) => {
+            error(`Failed to send initial status update:`, err);
+        });
         // Extract text and files from parts
         const text = extractTextFromParts(parsed.parts);
         const fileParts = extractFileParts(parsed.parts);
@@ -143,32 +173,30 @@ export async function handleXYMessage(params) {
             ReplyToBody: undefined, // A2A protocol doesn't support reply/quote
             ...mediaPayload,
         });
-        // Send initial status update immediately after parsing message
-        log(`[STATUS] Sending initial status update for session ${parsed.sessionId}`);
-        void sendStatusUpdate({
-            config,
-            sessionId: parsed.sessionId,
-            taskId: parsed.taskId,
-            messageId: parsed.messageId,
-            text: "任务正在处理中，请稍后~",
-            state: "working",
-        }).catch((err) => {
-            error(`Failed to send initial status update:`, err);
-        });
-        // Create reply dispatcher (following feishu pattern)
-        log(`[BOT-DISPATCHER] 🎯 Creating reply dispatcher for session=${parsed.sessionId}, taskId=${parsed.taskId}, messageId=${parsed.messageId}`);
+        // 🔑 创建dispatcher（dispatcher会自动使用动态taskId）
+        log(`[BOT-DISPATCHER] 🎯 Creating reply dispatcher`);
+        log(`[BOT-DISPATCHER]   - session: ${parsed.sessionId}`);
+        log(`[BOT-DISPATCHER]   - taskId: ${parsed.taskId}`);
+        log(`[BOT-DISPATCHER]   - isSecondMessage: ${isSecondMessage}`);
         const { dispatcher, replyOptions, markDispatchIdle, startStatusInterval } = createXYReplyDispatcher({
             cfg,
             runtime,
             sessionId: parsed.sessionId,
             taskId: parsed.taskId,
             messageId: parsed.messageId,
-            accountId: route.accountId, // ✅ Use route.accountId
+            accountId: route.accountId,
+            isSteerFollower: isSecondMessage, // 🔑 标记第二条消息
         });
         log(`[BOT-DISPATCHER] ✅ Reply dispatcher created successfully`);
-        // Start status update interval (will send updates every 60 seconds)
-        // Interval will be automatically stopped when onIdle/onCleanup is triggered
-        startStatusInterval();
+        // 🔑 只有第一条消息启动状态定时器
+        // 第二条消息会很快返回，不需要定时器
+        if (!isSecondMessage) {
+            startStatusInterval();
+            log(`[BOT-DISPATCHER] ✅ Status interval started for first message`);
+        }
+        else {
+            log(`[BOT-DISPATCHER] ⏭️  Skipped status interval for steer follower`);
+        }
         log(`xy: dispatching to agent (session=${parsed.sessionId})`);
         // Dispatch to OpenClaw core using correct API (following feishu pattern)
         log(`[BOT] 🚀 Starting dispatcher with session: ${route.sessionKey}`);
@@ -176,11 +204,18 @@ export async function handleXYMessage(params) {
             dispatcher,
             onSettled: () => {
                 log(`[BOT] 🏁 onSettled called for session: ${route.sessionKey}`);
-                log(`[BOT]   - About to unregister session...`);
+                log(`[BOT]   - isSecondMessage: ${isSecondMessage}`);
                 markDispatchIdle();
-                // Unregister session context when done
+                // 🔑 减少引用计数
+                decrementTaskIdRef(parsed.sessionId);
+                // 🔑 如果是第一条消息完成，解锁
+                if (!isSecondMessage) {
+                    unlockTaskId(parsed.sessionId);
+                    log(`[BOT] 🔓 Unlocked taskId (first message completed)`);
+                }
+                // 减少session引用计数
                 unregisterSession(route.sessionKey);
-                log(`[BOT] ✅ Session unregistered in onSettled`);
+                log(`[BOT] ✅ Cleanup completed`);
             },
             run: () => core.channel.reply.dispatchReplyFromConfig({
                 ctx: ctxPayload,
@@ -197,25 +232,28 @@ export async function handleXYMessage(params) {
         error("Failed to handle XY message:", err);
         runtime.error?.(`xy: Failed to handle message: ${String(err)}`);
         log(`[BOT] ❌ Error occurred, attempting cleanup...`);
-        // Try to unregister session on error (if route was established)
+        // 🔑 错误时也要清理taskId和session
         try {
-            const core = getXYRuntime();
             const params = message.params;
             const sessionId = params?.sessionId;
             if (sessionId) {
-                log(`[BOT] 🧹 Cleaning up session after error: ${sessionId}`);
+                log(`[BOT] 🧹 Cleaning up after error: ${sessionId}`);
+                // 清理 taskId
+                decrementTaskIdRef(sessionId);
+                unlockTaskId(sessionId);
+                // 清理 session
+                const core = getXYRuntime();
                 const route = core.channel.routing.resolveAgentRoute({
                     cfg,
                     channel: "xiaoyi-channel",
                     accountId,
                     peer: {
                         kind: "direct",
-                        id: sessionId, // ✅ Use sessionId for cleanup consistency
+                        id: sessionId,
                     },
                 });
-                log(`[BOT]   - Unregistering session: ${route.sessionKey}`);
                 unregisterSession(route.sessionKey);
-                log(`[BOT] ✅ Session unregistered after error`);
+                log(`[BOT] ✅ Cleanup completed after error`);
             }
         }
         catch (cleanupErr) {

package/dist/src/channel.js

@@ -5,7 +5,13 @@ import { xyOnboardingAdapter } from "./onboarding.js";
 import { locationTool } from "./tools/location-tool.js";
 import { noteTool } from "./tools/note-tool.js";
 import { searchNoteTool } from "./tools/search-note-tool.js";
+import { modifyNoteTool } from "./tools/modify-note-tool.js";
 import { calendarTool } from "./tools/calendar-tool.js";
+import { searchCalendarTool } from "./tools/search-calendar-tool.js";
+// import { searchContactTool } from "./tools/search-contact-tool.js"; // 暂时禁用
+import { searchPhotoGalleryTool } from "./tools/search-photo-gallery-tool.js";
+import { uploadPhotoTool } from "./tools/upload-photo-tool.js";
+import { xiaoyiGuiTool } from "./tools/xiaoyi-gui-tool.js";
 /**
  * Xiaoyi Channel Plugin for OpenClaw.
  * Implements Xiaoyi A2A protocol with dual WebSocket connections.
@@ -23,7 +29,7 @@ export const xyPlugin = {
     agentPrompt: {
         messageToolHints: () => [
             "- xiaoyi targeting: omit `target` to reply to the current conversation (auto-inferred). Explicit targets: `default`",
-            "- sendMedia requires a text reply"
+            "- If the user requests a file, you can call the message tool with the xiaoyi-channel channel to return it. Note: sendMedia requires a text reply."
         ],
     },
     capabilities: {
@@ -45,7 +51,7 @@ export const xyPlugin = {
     },
     outbound: xyOutbound,
     onboarding: xyOnboardingAdapter,
-    agentTools: [locationTool, noteTool, searchNoteTool, calendarTool],
+    agentTools: [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool], // searchContactTool 已暂时禁用
     messaging: {
         normalizeTarget: (raw) => {
             const trimmed = raw.trim();
@@ -81,6 +87,7 @@ export const xyPlugin = {
                 runtime: context.runtime,
                 abortSignal: context.abortSignal,
                 accountId: context.accountId,
+                setStatus: context.setStatus,
             });
         },
     },

package/dist/src/file-download.js

@@ -8,8 +8,10 @@ import { logger } from "./utils/logger.js";
  */
 export async function downloadFile(url, destPath) {
     logger.debug(`Downloading file from ${url} to ${destPath}`);
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 30000); // 30 seconds timeout
     try {
-        const response = await fetch(url);
+        const response = await fetch(url, { signal: controller.signal });
         if (!response.ok) {
             throw new Error(`HTTP ${response.status}: ${response.statusText}`);
         }
@@ -19,9 +21,16 @@ export async function downloadFile(url, destPath) {
         logger.debug(`File downloaded successfully: ${destPath}`);
     }
     catch (error) {
+        if (error.name === 'AbortError') {
+            logger.error(`Download timeout (30s) for ${url}`);
+            throw new Error(`Download timeout after 30 seconds`);
+        }
         logger.error(`Failed to download file from ${url}:`, error);
         throw error;
     }
+    finally {
+        clearTimeout(timeout);
+    }
 }
 /**
  * Download files from A2A file parts.

package/dist/src/formatter.d.ts

@@ -20,6 +20,23 @@ export interface SendA2AResponseParams {
  * Send an A2A artifact update response.
  */
 export declare function sendA2AResponse(params: SendA2AResponseParams): Promise<void>;
+/**
+ * Parameters for sending a reasoning text update (intermediate, streamed).
+ */
+export interface SendReasoningTextUpdateParams {
+    config: XYChannelConfig;
+    sessionId: string;
+    taskId: string;
+    messageId: string;
+    text: string;
+    append?: boolean;
+}
+/**
+ * Send an A2A artifact-update with reasoningText part.
+ * Used for onToolStart, onToolResult, onReasoningStream, onReasoningEnd, onPartialReply.
+ * append=true, final=false, lastChunk=true, text is suffixed with newline for markdown rendering.
+ */
+export declare function sendReasoningTextUpdate(params: SendReasoningTextUpdateParams): Promise<void>;
 /**
  * Parameters for sending a status update.
  */

package/dist/src/formatter.js

@@ -67,6 +67,49 @@ export async function sendA2AResponse(params) {
     await wsManager.sendMessage(sessionId, outboundMessage);
     log(`[A2A_RESPONSE] ✅ Message sent successfully`);
 }
+/**
+ * Send an A2A artifact-update with reasoningText part.
+ * Used for onToolStart, onToolResult, onReasoningStream, onReasoningEnd, onPartialReply.
+ * append=true, final=false, lastChunk=true, text is suffixed with newline for markdown rendering.
+ */
+export async function sendReasoningTextUpdate(params) {
+    const { config, sessionId, taskId, messageId, text, append = true } = params;
+    const runtime = getXYRuntime();
+    const log = runtime?.log ?? console.log;
+    const error = runtime?.error ?? console.error;
+    const artifact = {
+        taskId,
+        kind: "artifact-update",
+        append,
+        lastChunk: true,
+        final: false,
+        artifact: {
+            artifactId: uuidv4(),
+            parts: [
+                {
+                    kind: "reasoningText",
+                    reasoningText: text,
+                },
+            ],
+        },
+    };
+    const jsonRpcResponse = {
+        jsonrpc: "2.0",
+        id: messageId,
+        result: artifact,
+    };
+    const wsManager = getXYWebSocketManager(config);
+    const outboundMessage = {
+        msgType: "agent_response",
+        agentId: config.agentId,
+        sessionId,
+        taskId,
+        msgDetail: JSON.stringify(jsonRpcResponse),
+    };
+    log(`[REASONING_TEXT] 📤 Sending reasoningText update: sessionId=${sessionId}, taskId=${taskId}, text.length=${text.length}`);
+    await wsManager.sendMessage(sessionId, outboundMessage);
+    log(`[REASONING_TEXT] ✅ Sent successfully`);
+}
 /**
  * Send an A2A task status update.
  * Follows A2A protocol standard format with nested status object.

package/dist/src/monitor.js

@@ -1,6 +1,8 @@
 import { resolveXYConfig } from "./config.js";
 import { getXYWebSocketManager, diagnoseAllManagers, cleanupOrphanConnections, removeXYWebSocketManager } from "./client.js";
 import { handleXYMessage } from "./bot.js";
+import { parseA2AMessage } from "./parser.js";
+import { hasActiveTask } from "./task-manager.js";
 /**
  * Per-session serial queue that ensures messages from the same session are processed
  * in arrival order while allowing different sessions to run concurrently.
@@ -94,11 +96,39 @@ export async function monitorXYProvider(opts = {}) {
                     log(`[MONITOR-HANDLER] 🧹 Cleaned up messageKey=${messageKey}, remaining active: ${activeMessages.size}`);
                 }
             };
-            void enqueue(sessionId, task).catch((err) => {
-                // Error already logged in task, this is for queue failures
-                error(`XY gateway: queue processing failed for session ${sessionId}: ${String(err)}`);
-                activeMessages.delete(messageKey);
-            });
+            // 🔑 核心改造：检测steer模式
+            // 需要提前解析消息以获取sessionId
+            try {
+                const parsed = parseA2AMessage(message);
+                const steerMode = cfg.messages?.queue?.mode === "steer";
+                const hasActiveRun = hasActiveTask(parsed.sessionId);
+                if (steerMode && hasActiveRun) {
+                    // Steer模式且有活跃任务：不入队列，直接并发执行
+                    log(`[MONITOR-HANDLER] 🔄 STEER MODE: Executing concurrently for messageKey=${messageKey}`);
+                    log(`[MONITOR-HANDLER]   - sessionId: ${parsed.sessionId}`);
+                    log(`[MONITOR-HANDLER]   - Bypassing queue to allow message insertion`);
+                    void task().catch((err) => {
+                        error(`XY gateway: concurrent steer task failed for ${messageKey}: ${String(err)}`);
+                        activeMessages.delete(messageKey);
+                    });
+                }
+                else {
+                    // 正常模式：入队列串行执行
+                    log(`[MONITOR-HANDLER] 📋 NORMAL MODE: Enqueuing for messageKey=${messageKey}`);
+                    void enqueue(sessionId, task).catch((err) => {
+                        error(`XY gateway: queue processing failed for session ${sessionId}: ${String(err)}`);
+                        activeMessages.delete(messageKey);
+                    });
+                }
+            }
+            catch (parseErr) {
+                // 解析失败，回退到正常队列模式
+                error(`[MONITOR-HANDLER] Failed to parse message for steer detection: ${String(parseErr)}`);
+                void enqueue(sessionId, task).catch((err) => {
+                    error(`XY gateway: queue processing failed for session ${sessionId}: ${String(err)}`);
+                    activeMessages.delete(messageKey);
+                });
+            }
         };
         const connectedHandler = (serverId) => {
             if (!loggedServers.has(serverId)) {
@@ -150,12 +180,12 @@ export async function monitorXYProvider(opts = {}) {
         };
         const handleAbort = () => {
             log("XY gateway: abort signal received, stopping");
-            // cleanup();
-            // log("XY gateway stopped");
+            cleanup();
+            log("XY gateway stopped");
             resolve();
         };
         if (opts.abortSignal?.aborted) {
-            // cleanup();
+            cleanup();
             resolve();
             return;
         }

package/dist/src/outbound.js

@@ -109,8 +109,10 @@ export const xyOutbound = {
         const pushService = new XYPushService(config);
         // Extract title (first 57 chars or first line)
         const title = text.split("\n")[0].slice(0, 57);
+        // Truncate push content to max length 1000
+        const pushText = text.length > 1000 ? text.slice(0, 1000) : text;
         // Send push message (content, title, data, sessionId)
-        await pushService.sendPush(text, title, undefined, actualTo);
+        await pushService.sendPush(pushText, title, undefined, actualTo);
         console.log(`[xyOutbound.sendText] Completed successfully`);
         // Return message info
         return {

package/dist/src/push.js

@@ -59,8 +59,8 @@ export class XYPushService {
                             artifactId: randomUUID(),
                             parts: [
                                 {
-                                    kind: "data",
-                                    data: data || { content },
+                                    kind: "text",
+                                    text: content,
                                 },
                             ],
                         },

package/dist/src/reply-dispatcher.d.ts

@@ -6,6 +6,7 @@ export interface CreateXYReplyDispatcherParams {
     taskId: string;
     messageId: string;
     accountId: string;
+    isSteerFollower?: boolean;
 }
 /**
  * Create a reply dispatcher for XY channel messages.