@ynhcj/xiaoyi-channel 0.0.51-next → 0.0.52-next

package/dist/src/bot.js

@@ -8,7 +8,7 @@ import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse, se
 import { registerSession, unregisterSession, runWithSessionContext } from "./tools/session-manager.js";
 import { configManager } from "./utils/config-manager.js";
 import { addPushId } from "./utils/pushid-manager.js";
-import { getPushDataById, getPushDataAfterTimestamp } from "./utils/pushdata-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";
 /**
@@ -61,53 +61,34 @@ export async function handleXYMessage(params) {
         }
         // Parse the A2A message (for regular messages)
         const parsed = parseA2AMessage(message);
+        console.log("Parsed A2A message:", JSON.stringify(parsed, null, 2));
         // ========== 检测 Trigger 消息 ==========
         // 如果消息中包含 Trigger 事件数据，直接返回 pushData 内容，不走正常流程
         const triggerData = extractTriggerData(parsed.parts);
         if (triggerData) {
-            log(`[BOT] 📌 Detected Trigger message`);
+            log(`[BOT] 📌 Detected Trigger message with pushDataId: ${triggerData.pushDataId}`);
             log(`[BOT]   - Session ID: ${parsed.sessionId}`);
             log(`[BOT]   - Task ID: ${parsed.taskId}`);
             try {
-                const config = resolveXYConfig(cfg);
-                if ("pushDataId" in triggerData) {
-                    // 单条查询：按 pushDataId 返回
-                    log(`[BOT]   - Type: pushDataId = ${triggerData.pushDataId}`);
-                    const pushDataItem = await getPushDataById(triggerData.pushDataId);
-                    if (!pushDataItem) {
-                        error(`[BOT] ❌ pushData not found for ID: ${triggerData.pushDataId}`);
-                        return;
-                    }
-                    log(`[BOT] ✅ Found pushData, sending direct response`);
-                    await sendA2AResponse({
-                        config,
-                        sessionId: parsed.sessionId,
-                        taskId: parsed.taskId,
-                        messageId: parsed.messageId,
-                        text: pushDataItem.dataDetail,
-                        append: false,
-                        final: true,
-                    });
-                }
-                else {
-                    // 批量查询：按 timestamp 返回所有之后的 push 数据
-                    log(`[BOT]   - Type: timestamp = ${triggerData.timestamp}`);
-                    const items = await getPushDataAfterTimestamp(triggerData.timestamp);
-                    const result = items.map(item => ({
-                        pushDataId: item.pushDataId,
-                        pushData: item.dataDetail,
-                    }));
-                    log(`[BOT] ✅ Found ${result.length} pushData items after timestamp, sending response`);
-                    await sendA2AResponse({
-                        config,
-                        sessionId: parsed.sessionId,
-                        taskId: parsed.taskId,
-                        messageId: parsed.messageId,
-                        text: JSON.stringify(result),
-                        append: false,
-                        final: true,
-                    });
+                // 读取 pushData
+                const pushDataItem = await getPushDataById(triggerData.pushDataId);
+                if (!pushDataItem) {
+                    error(`[BOT] ❌ pushData not found for ID: ${triggerData.pushDataId}`);
+                    return;
                 }
+                log(`[BOT] ✅ Found pushData, sending direct response`);
+                log(`[BOT]   - pushDataId: ${pushDataItem.pushDataId}`);
+                const config = resolveXYConfig(cfg);
+                // 直接发送响应（final=true，不走 openclaw 流程）
+                await sendA2AResponse({
+                    config,
+                    sessionId: parsed.sessionId,
+                    taskId: parsed.taskId,
+                    messageId: parsed.messageId,
+                    text: pushDataItem.dataDetail,
+                    append: false,
+                    final: true,
+                });
                 log(`[BOT] ✅ Trigger response sent successfully, exiting early`);
                 return; // 提前返回，不继续处理
             }

package/dist/src/file-download.js

@@ -7,7 +7,7 @@ import { logger } from "./utils/logger.js";
  * Download a file from URL to local path.
  */
 export async function downloadFile(url, destPath) {
-    logger.debug(`Downloading file from ${url} to ${destPath}`);
+    console.log(`Downloading file from ${url} to ${destPath}`);
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), 30000); // 30 seconds timeout
     try {

package/dist/src/parser.d.ts

@@ -49,16 +49,13 @@ export declare function extractPushId(parts: A2AMessagePart[]): string | null;
  * (same level as push_id).
  */
 export declare function extractDeviceType(parts: A2AMessagePart[]): string | null;
-export type TriggerData = {
-    pushDataId: string;
-} | {
-    timestamp: string;
-};
 /**
  * Extract Trigger event data from message parts.
- * Looks for Trigger events with pushDataId or timestamp in data parts.
+ * Looks for Trigger events with pushDataId in data parts.
  */
-export declare function extractTriggerData(parts: A2AMessagePart[]): TriggerData | null;
+export declare function extractTriggerData(parts: A2AMessagePart[]): {
+    pushDataId: string;
+} | null;
 /**
  * Validate A2A request structure.
  */

package/dist/src/parser.js

@@ -90,7 +90,7 @@ export function extractDeviceType(parts) {
 }
 /**
  * Extract Trigger event data from message parts.
- * Looks for Trigger events with pushDataId or timestamp in data parts.
+ * Looks for Trigger events with pushDataId in data parts.
  */
 export function extractTriggerData(parts) {
     for (const part of parts) {
@@ -99,15 +99,10 @@ export function extractTriggerData(parts) {
             if (Array.isArray(events)) {
                 for (const event of events) {
                     if (event.header?.namespace === "Common" && event.header?.name === "Trigger") {
-                        const dataMap = event.payload?.dataMap;
-                        const pushDataId = dataMap?.pushDataId;
+                        const pushDataId = event.payload?.dataMap?.pushDataId;
                         if (pushDataId && typeof pushDataId === "string") {
                             return { pushDataId };
                         }
-                        const timestamp = dataMap?.timestamp;
-                        if (timestamp && typeof timestamp === "string") {
-                            return { timestamp };
-                        }
                     }
                 }
             }

package/dist/src/provider.js

@@ -117,26 +117,8 @@ export const xiaoyiProvider = {
             // 异步监听输出（不阻塞 stream 返回）
             stream.result().then((result) => {
                 console.log(`[xiaoyiprovider] stream completed, usage: input=${result.usage?.input} output=${result.usage?.output}`);
-            }, (err) => console.log(`[xiaoyiprovider] stream error: ${err}`));
-            // 用 Proxy 拦截 result()，检查 usage 是否为全零（表示上下文超长）
-            return new Proxy(stream, {
-                get(target, prop, receiver) {
-                    if (prop === "result") {
-                        const originalResult = target.result.bind(target);
-                        return () => originalResult().then((result) => {
-                            if (result?.usage?.input === 0 && result?.usage?.output === 0) {
-                                const error = new Error("This model's maximum context length was exceeded.");
-                                error.type = "invalid_request_error";
-                                error.code = "context_length_exceeded";
-                                error.param = "messages";
-                                throw error;
-                            }
-                            return result;
-                        });
-                    }
-                    return Reflect.get(target, prop, receiver);
-                },
-            });
+            }, (err) => console.log(`[xiaoyiprovider] stream error: ${JSON.stringify(err)}`));
+            return stream;
         };
     },
 };

package/dist/src/tools/upload-file-tool.js

@@ -18,10 +18,10 @@ export const uploadFileTool = {
     label: "Upload File",
     description: `工具能力描述：将手机本地文件上传并获取可公网访问的 URL。
 
-  前置工具调用：此工具使用前必须先调用 search_file 或者 QueryCollection 工具获取文件的 uri
+  前置工具调用：此工具使用前必须先调用 search_file 或者 query_collection 工具获取文件的 uri=
 
   工具参数说明：
-  a. 入参中的fileInfos数组，每个元素必须包含mediaUri字段（对应于search_file工具或者QueryCollection返回结果中的uri），必须与search_file或者QueryCollection结果中对应的uri完全保持一致，不要自行修改。
+  a. 入参中的fileInfos数组，每个元素必须包含mediaUri字段（对应于search_file工具或者query_collection返回结果中的uri），必须与search_file或者query_collection结果中对应的uri完全保持一致，不要自行修改。
   b. fileInfos中的timeout字段是可选的，表示上传文件超时时间，单位是毫秒，默认是20000（20秒）。
   c. fileInfos 是文件在手机本地的信息数组（从 search_file 工具响应中获取）。限制：每次最多支持传入 5 条文件信息。
 

package/dist/src/tools/xiaoyi-add-collection-tool.js

@@ -28,6 +28,7 @@ export const xiaoyiAddCollectionTool = {
 ● dataType:必填字段，数据类型为string，功能描述是标识数据类型。HYPER_LINK标识网页，TEXT标识文本，IMAGE标识图片，FILE标识文件。
 ● title:非必填字段，数据类型为string，功能描述是标识文件类型数据的文件名称。适用于FILE类型。
 说明：如果dataType为HYPER_LINK或TEXT，则content字段必填且不能为空；如果dataType为IMAGE或FILE，则uri字段必填且不能为空。当用户希望收藏海报、截图等图片类数据时，请将数据以图片IMAGE的形式存入到小艺帮记；当用户希望收藏电子书、笔记、报告、素材、文档、合同、协议、简历、证书、报表、日志、安装包、压缩包等描述的文件时，请将数据以文件FILE的形式存入到小艺帮记。
+当你成功收藏这个数据到小艺帮记后，请在最后显示"已成功把数据添加到[小艺帮记](vassistant://voice/main?page=CollectionPage&jumpHomePageTab=myCollection)"，
   注意:
   a. 操作超时时间为60秒,请勿重复调用此工具
   b. 如果遇到各类调用失败场景,最多只能重试一次，不可以重复调用多次。

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

@@ -22,11 +22,6 @@ export declare function searchPushData(keywords?: string): Promise<PushDataItem[
  * 获取所有推送数据
  */
 export declare function getAllPushData(): Promise<PushDataItem[]>;
-/**
- * 获取指定时间戳之后的所有推送数据
- * @param timestamp - Unix 时间戳（秒或毫秒）
- */
-export declare function getPushDataAfterTimestamp(timestamp: string): Promise<PushDataItem[]>;
 /**
  * 清空所有推送数据（用于测试或重置）
  */

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

@@ -157,39 +157,6 @@ export async function getAllPushData() {
         return [];
     }
 }
-/**
- * 将 Unix 时间戳（秒或毫秒）转为 YYYYMMDD HHmmss 北京时间字符串
- */
-function unixToBeijingStr(ts) {
-    let ms = Number(ts);
-    if (isNaN(ms))
-        return "";
-    // 秒级时间戳（小于 1e12）转为毫秒
-    if (ms < 1e12)
-        ms *= 1000;
-    return formatBeijingTime(new Date(ms));
-}
-/**
- * 获取指定时间戳之后的所有推送数据
- * @param timestamp - Unix 时间戳（秒或毫秒）
- */
-export async function getPushDataAfterTimestamp(timestamp) {
-    try {
-        const target = unixToBeijingStr(timestamp);
-        if (!target) {
-            logger.warn(`[PushDataManager] Invalid timestamp: ${timestamp}`);
-            return [];
-        }
-        const list = await readPushDataList();
-        const results = list.filter(item => item.time >= target);
-        logger.log(`[PushDataManager] Query after timestamp ${timestamp} (UTC+8: ${target}): found ${results.length} items`);
-        return results;
-    }
-    catch (error) {
-        logger.error(`[PushDataManager] Failed to get pushData after timestamp:`, error);
-        return [];
-    }
-}
 /**
  * 清空所有推送数据（用于测试或重置）
  */

package/package.json

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