@ynhcj/xiaoyi-channel 0.0.50-next → 0.0.51-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 } from "./utils/pushdata-manager.js";
+import { getPushDataById, getPushDataAfterTimestamp } from "./utils/pushdata-manager.js";
 import { saveRuntimeInfo } from "./utils/runtime-manager.js";
 import { registerTaskId, decrementTaskIdRef, lockTaskId, unlockTaskId, hasActiveTask, } from "./task-manager.js";
 /**
@@ -65,29 +65,49 @@ export async function handleXYMessage(params) {
         // 如果消息中包含 Trigger 事件数据，直接返回 pushData 内容，不走正常流程
         const triggerData = extractTriggerData(parsed.parts);
         if (triggerData) {
-            log(`[BOT] 📌 Detected Trigger message with pushDataId: ${triggerData.pushDataId}`);
+            log(`[BOT] 📌 Detected Trigger message`);
             log(`[BOT]   - Session ID: ${parsed.sessionId}`);
             log(`[BOT]   - Task ID: ${parsed.taskId}`);
             try {
-                // 读取 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,
-                });
+                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,
+                    });
+                }
                 log(`[BOT] ✅ Trigger response sent successfully, exiting early`);
                 return; // 提前返回，不继续处理
             }

package/dist/src/channel.js

@@ -29,7 +29,6 @@ import { xiaoyiAddCollectionTool } from "./tools/xiaoyi-add-collection-tool.js";
 import { xiaoyiDeleteCollectionTool } from "./tools/xiaoyi-delete-collection-tool.js";
 import { saveMediaToGalleryTool } from "./tools/save-media-to-gallery-tool.js";
 import { saveFileToPhoneTool } from "./tools/save-file-to-phone-tool.js";
-import { findPcDevicesTool } from "./tools/find-pc-devices-tool.js";
 import { filterToolsByDevice } from "./tools/device-tool-map.js";
 import { getCurrentSessionContext } from "./tools/session-manager.js";
 import { logger } from "./utils/logger.js";
@@ -72,7 +71,7 @@ export const xyPlugin = {
     },
     outbound: xyOutbound,
     agentTools: () => {
-        const allTools = [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, viewPushResultTool, imageReadingTool, timestampToUtc8Tool, xiaoyiCollectionTool, xiaoyiAddCollectionTool, xiaoyiDeleteCollectionTool, saveMediaToGalleryTool, saveFileToPhoneTool, findPcDevicesTool];
+        const allTools = [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, viewPushResultTool, imageReadingTool, timestampToUtc8Tool, xiaoyiCollectionTool, xiaoyiAddCollectionTool, xiaoyiDeleteCollectionTool, saveMediaToGalleryTool, saveFileToPhoneTool];
         const ctx = getCurrentSessionContext();
         const filtered = filterToolsByDevice(allTools, ctx?.deviceType);
         logger.log(`[DEVICE-FILTER] deviceType=${ctx?.deviceType ?? "(none)"}, tools: ${allTools.length} → ${filtered.length} (${filtered.map(t => t.name).join(", ")})`);

package/dist/src/parser.d.ts

@@ -49,13 +49,16 @@ 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 in data parts.
+ * Looks for Trigger events with pushDataId or timestamp in data parts.
  */
-export declare function extractTriggerData(parts: A2AMessagePart[]): {
-    pushDataId: string;
-} | null;
+export declare function extractTriggerData(parts: A2AMessagePart[]): TriggerData | 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 in data parts.
+ * Looks for Trigger events with pushDataId or timestamp in data parts.
  */
 export function extractTriggerData(parts) {
     for (const part of parts) {
@@ -99,10 +99,15 @@ export function extractTriggerData(parts) {
             if (Array.isArray(events)) {
                 for (const event of events) {
                     if (event.header?.namespace === "Common" && event.header?.name === "Trigger") {
-                        const pushDataId = event.payload?.dataMap?.pushDataId;
+                        const dataMap = event.payload?.dataMap;
+                        const pushDataId = 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

@@ -101,6 +101,12 @@ export const xiaoyiProvider = {
             if (context.systemPrompt) {
                 console.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
             }
+            // 在发送给模型前，删除 systemPrompt 中 ## Tooling 与 TOOLS.md 声明之间的内容
+            if (context.systemPrompt) {
+                const before = context.systemPrompt.length;
+                context.systemPrompt = context.systemPrompt.replace(/(## Tooling)[\s\S]*?(TOOLS\.md does not control tool availability; it is user guidance for how to use external tools\.)/, "$1\n\n$2");
+                console.log(`[xiaoyiprovider] system prompt trimmed: ${before} -> ${context.systemPrompt.length}`);
+            }
             const stream = await underlying(model, context, {
                 ...options,
                 headers: {
@@ -109,8 +115,28 @@ export const xiaoyiProvider = {
                 },
             });
             // 异步监听输出（不阻塞 stream 返回）
-            stream.result().then((err) => console.log(`[xiaoyiprovider] error: ${err}`));
-            return 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);
+                },
+            });
         };
     },
 };

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

@@ -8,13 +8,15 @@ import { getCurrentSessionContext } from "./session-manager.js";
 export const searchFileTool = {
     name: "search_file",
     label: "Search File",
-    description: `搜索手机或PC/电脑文件系统的文件。
+    description: `搜索手机文件系统的文件。
 
-【重要】使用场景与调用流程：
-1. 搜索手机文件：当用户明确说明要从手机搜索时（如"从手机里面搜索xxxx"、"在手机上查找文件xxxx"），直接调用此工具，无需传入 udid。
-2. 搜索PC/电脑文件：当用户要求搜索PC/电脑上的文件时（如"帮我找一下PC上的xxx文件"、"搜索电脑上的xxx"），必须先调用 find_pc_devices 工具获取设备ID（udid），然后将 udid 传入此工具进行搜索。
+【重要】使用约束：此工具仅在用户显著说明要从手机搜索时才执行，例如：
+- "从我手机里面搜索xxxx"
+- "从手机文件系统找一下xxxx"
+- "在手机上查找文件xxxx"
+- "搜索手机里的文件"
 
-如果用户没有明确说明从手机或PC搜索（如仅说"搜索文件"、"找一下xxxx"），应默认从 openclaw 本地的文件系统查询，不要调用此工具。
+如果用户没有明确说明从手机搜索（如仅说"搜索文件"、"找一下xxxx"），应默认从 openclaw 本地的文件系统查询，不要调用此工具。
 
 功能说明：根据关键词搜索文件名称或内容，返回匹配的文件列表（包括文件名、路径、大小、修改时间等信息）。
 
@@ -26,10 +28,6 @@ export const searchFileTool = {
                 type: "string",
                 description: "搜索关键词，用于匹配文件名称、后缀名或文件内容",
             },
-            udid: {
-                type: "string",
-                description: "PC/电脑设备ID。当搜索PC/电脑上的文件时，需要先通过 find_pc_devices 工具获取设备ID后传入。搜索手机文件时不需要传入此参数。",
-            },
         },
         required: ["query"],
     },
@@ -64,7 +62,6 @@ export const searchFileTool = {
                     timeOut: 5,
                     intentParam: {
                         query: params.query.trim(),
-                        ...(params.udid ? { udid: params.udid } : {}),
                     },
                     permissionId: [],
                     achieveType: "INTENT",

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

@@ -16,19 +16,14 @@ import { getCurrentSessionContext } from "./session-manager.js";
 export const uploadFileTool = {
     name: "upload_file",
     label: "Upload File",
-    description: `工具能力描述：将手机或PC/电脑本地文件上传并获取可公网访问的 URL。
+    description: `工具能力描述：将手机本地文件上传并获取可公网访问的 URL。
 
   前置工具调用：此工具使用前必须先调用 search_file 或者 QueryCollection 工具获取文件的 uri
 
-  使用场景与调用流程：
-  1. 上传手机文件：直接调用此工具，无需传入 udid。
-  2. 上传PC/电脑文件：当用户要求上传PC/电脑上的文件时，需要先通过 find_pc_devices 工具获取设备ID（udid），然后将 udid 传入此工具。
-
   工具参数说明：
   a. 入参中的fileInfos数组，每个元素必须包含mediaUri字段（对应于search_file工具或者QueryCollection返回结果中的uri），必须与search_file或者QueryCollection结果中对应的uri完全保持一致，不要自行修改。
   b. fileInfos中的timeout字段是可选的，表示上传文件超时时间，单位是毫秒，默认是20000（20秒）。
-  c. fileInfos 是文件在本地的信息数组（从 search_file 工具响应中获取）。限制：每次最多支持传入 5 条文件信息。
-  d. udid 是PC/电脑设备ID，仅在上传PC/电脑文件时需要传入（通过 find_pc_devices 工具获取）。
+  c. fileInfos 是文件在手机本地的信息数组（从 search_file 工具响应中获取）。限制：每次最多支持传入 5 条文件信息。
 
   注意事项：
   a. 操作超时时间为60秒,请勿重复调用此工具,如果超时或失败,最多重试一次。
@@ -41,10 +36,6 @@ export const uploadFileTool = {
                 // 具体的类型验证和转换在 execute 函数内部进行
                 description: "文件信息数组，每个元素包含mediaUri（必需）和timeout（可选，默认20000）。必须先通过 search_file 工具获取。每次最多支持 5 条文件信息。",
             },
-            udid: {
-                type: "string",
-                description: "PC/电脑设备ID。当上传PC/电脑上的文件时，需要先通过 find_pc_devices 工具获取设备ID后传入。上传手机文件时不需要传入此参数。",
-            },
         },
         required: ["fileInfos"],
     },
@@ -108,7 +99,7 @@ export const uploadFileTool = {
         // Get WebSocket manager
         const wsManager = getXYWebSocketManager(config);
         // Get public URLs for the files
-        const fileUrls = await getFileUrls(wsManager, config, sessionId, taskId, messageId, fileInfos, params.udid);
+        const fileUrls = await getFileUrls(wsManager, config, sessionId, taskId, messageId, fileInfos);
         return {
             content: [
                 {
@@ -127,7 +118,7 @@ export const uploadFileTool = {
  * Get public URLs for files using fileInfos
  * Returns array of publicly accessible file URLs
  */
-async function getFileUrls(wsManager, config, sessionId, taskId, messageId, fileInfos, udid) {
+async function getFileUrls(wsManager, config, sessionId, taskId, messageId, fileInfos) {
     const command = {
         header: {
             namespace: "Common",
@@ -145,7 +136,6 @@ async function getFileUrls(wsManager, config, sessionId, taskId, messageId, file
                 timeOut: 5,
                 intentParam: {
                     fileInfos: fileInfos,
-                    ...(udid ? { udid } : {}),
                 },
                 permissionId: [],
                 achieveType: "INTENT",

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

@@ -22,6 +22,11 @@ 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,6 +157,39 @@ 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.50-next",
+  "version": "0.0.51-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",