@ynhcj/xiaoyi-channel 0.0.78-beta → 0.0.80-beta

package/dist/index.js

@@ -20,13 +20,13 @@ const plugin = {
         setXYRuntime(api.runtime);
         api.registerChannel({ plugin: xyPlugin });
         api.registerProvider(xiaoyiProvider);
-        // CSPL after_tool_call hook: 监听工具结果，发送至 CSPL API 进行安全检测
+        // SENTINEL HOOK after_tool_call hook: 监听工具结果，发送至安全检测 API 进行安全检测
         // 如果响应为 REJECT，注入 steer 消息中止当前对话
         api.on("after_tool_call", async (event, ctx) => {
             if (!ALLOWED_TOOLS.includes(event.toolName)) {
                 return;
             }
-            console.log(`[CSPL] after_tool_call triggered: toolName=${event.toolName}, sessionKey=${ctx.sessionKey ?? "none"}`);
+            console.log(`[SENTINEL HOOK] after_tool_call triggered: toolName=${event.toolName}, sessionKey=${ctx.sessionKey ?? "none"}`);
             try {
                 const resultText = extractResultText(event, event.toolName);
                 const resultLength = resultText.length;
@@ -35,6 +35,7 @@ const plugin = {
                 }
                 // 构造 sentinel_hook 格式的 payload: { tool, output: [{ content }] }
                 const questionText = {
+                    subSceneID: 'TOOL_OUTPUT',
                     tool: event.toolName,
                     output: [{ content: "" }],
                 };
@@ -49,13 +50,13 @@ const plugin = {
                 }
                 const response = await callCsplApi(finalJson, api.config);
                 const result = parseSecurityResult(response);
-                console.log(`[CSPL] Security result: status=${result.status}`);
+                console.log(`[SENTINEL HOOK] Security result: status=${result.status}`);
                 if (result.status === "REJECT") {
                     await tryInjectSteer(ctx.sessionKey, STEER_ABORT_MESSAGE);
                 }
             }
             catch (err) {
-                api.logger.error(`[CSPL] after_tool_call error: ${err}`);
+                api.logger.error(`[SENTINEL HOOK] after_tool_call error: ${err}`);
             }
         });
     },

package/dist/src/cspl/call-api.js

@@ -1,4 +1,4 @@
-// CSPL API 请求模块
+// SENTINEL HOOK API 请求模块
 import https from "node:https";
 import { URL } from "node:url";
 import { randomBytes } from "node:crypto";
@@ -8,8 +8,10 @@ function generateTraceId() {
     return randomBytes(16).toString("hex");
 }
 function buildHeaders(config) {
+    const traceId = generateTraceId();
+    console.log(`[SENTINEL HOOK] trace-id: ${traceId}`);
     return {
-        "x-hag-trace-id": generateTraceId(),
+        "x-hag-trace-id": traceId,
         "x-uid": config.uid,
         "x-api-key": config.apiKey,
         "x-request-from": config.requestFrom,
@@ -30,13 +32,13 @@ function buildRequestOptions(url, headers, timeout) {
 }
 function parseResponse(data) {
     if (!data?.trim())
-        throw new Error("[CSPL] API response is empty");
+        throw new Error("[SENTINEL HOOK] API response is empty");
     const json = JSON.parse(data);
     if (json.retCode && json.retCode !== "0") {
-        throw new Error(`[CSPL] API error: ${json.retMsg || "unknown"}`);
+        throw new Error(`[SENTINEL HOOK] API error: ${json.retMsg || "unknown"}`);
     }
     if (!json.retCode && json.code) {
-        throw new Error(`[CSPL] Backend error: ${json.desc || "unknown"}`);
+        throw new Error(`[SENTINEL HOOK] Backend error: ${json.desc || "unknown"}`);
     }
     return json;
 }
@@ -47,12 +49,13 @@ export async function callCsplApi(questionText, cfg) {
         questionText,
         textSource: config.textSource,
         action: config.action,
+        extra: JSON.stringify({ userId: config.uid }),
     };
     return new Promise((resolve, reject) => {
         const options = buildRequestOptions(config.api.url, headers, config.api.timeout);
         const req = https.request(options, (res) => {
             if (res.statusCode && res.statusCode >= HTTP_STATUS_BAD_REQUEST) {
-                reject(new Error(`[CSPL] HTTP error: ${res.statusCode}`));
+                reject(new Error(`[SENTINEL HOOK] HTTP error: ${res.statusCode}`));
                 return;
             }
             let data = "";
@@ -62,23 +65,23 @@ export async function callCsplApi(questionText, cfg) {
             res.on("end", () => {
                 try {
                     const result = parseResponse(data);
-                    console.log(`[CSPL API] ✅ 请求成功`);
+                    console.log(`[SENTINEL HOOK] ✅ 请求成功`);
                     resolve(result);
                 }
                 catch (e) {
-                    console.error(`[CSPL API] ❌ 请求失败: ${e instanceof Error ? e.message : String(e)}`);
+                    console.error(`[SENTINEL HOOK] ❌ 请求失败: ${e instanceof Error ? e.message : String(e)}`);
                     reject(e);
                 }
             });
         });
         req.on("error", (error) => {
-            console.error(`[CSPL API] ❌ 请求错误: ${error instanceof Error ? error.message : String(error)}`);
+            console.error(`[SENTINEL HOOK] ❌ 请求错误: ${error instanceof Error ? error.message : String(error)}`);
             reject(error);
         });
         req.on("timeout", () => {
-            console.error(`[CSPL API] ⏰ 请求超时 (${config.api.timeout}ms)`);
+            console.error(`[SENTINEL HOOK] ⏰ 请求超时 (${config.api.timeout}ms)`);
             req.destroy();
-            reject(new Error("[CSPL] Request timeout"));
+            reject(new Error("[SENTINEL HOOK] Request timeout"));
         });
         req.write(JSON.stringify(payload));
         req.end();

package/dist/src/cspl/config.js

@@ -7,7 +7,7 @@ import { logger } from "../utils/logger.js";
 let cachedConfig = null;
 function readServiceUrl() {
     if (!fs.existsSync(ENV_FILE_PATH)) {
-        throw new Error(`[CSPL] Environment file not found: ${ENV_FILE_PATH}`);
+        throw new Error(`[SENTINEL HOOK] Environment file not found: ${ENV_FILE_PATH}`);
     }
     const envData = fs.readFileSync(ENV_FILE_PATH, "utf-8");
     for (const line of envData.split("\n")) {
@@ -22,7 +22,7 @@ function readServiceUrl() {
         if (key === "SERVICE_URL" && value)
             return value;
     }
-    throw new Error("[CSPL] Missing SERVICE_URL in env file");
+    throw new Error("[SENTINEL HOOK] Missing SERVICE_URL in env file");
 }
 /**
  * 构建 CSPL 配置。uid 和 apiKey 复用 XYChannelConfig，避免重复配置。
@@ -45,6 +45,6 @@ export function getCsplConfig(cfg) {
         textSource: CSPL_STATIC_CONFIG.textSource,
         action: CSPL_STATIC_CONFIG.action,
     };
-    logger.log("[CSPL] Config loaded (uid/apiKey from XYChannelConfig)");
+    logger.log("[SENTINEL HOOK] Config loaded (uid/apiKey from XYChannelConfig)");
     return cachedConfig;
 }

package/dist/src/cspl/constants.d.ts

@@ -10,6 +10,7 @@ export interface ApiPayload {
     questionText: string;
     textSource: string;
     action: string;
+    extra: string;
 }
 export interface ApiResponse {
     data?: {

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,7 +115,9 @@ export const xiaoyiProvider = {
                 },
             });
             // 异步监听输出（不阻塞 stream 返回）
-            stream.result().then((err) => console.log(`[xiaoyiprovider] error: ${err}`));
+            stream.result().then((result) => {
+                console.log(`[xiaoyiprovider] stream completed, usage: input=${result.usage?.input} output=${result.usage?.output}`);
+            }, (err) => console.log(`[xiaoyiprovider] stream error: ${JSON.stringify(err)}`));
             return stream;
         };
     },

package/dist/src/tools/find-pc-devices-tool.d.ts

@@ -0,0 +1,5 @@
+/**
+ * XY find PC devices tool - finds all PC devices associated with the user.
+ * Returns device IDs for use in subsequent file search operations.
+ */
+export declare const findPcDevicesTool: any;

package/dist/src/tools/find-pc-devices-tool.js

@@ -0,0 +1,98 @@
+import { getXYWebSocketManager } from "../client.js";
+import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from "./session-manager.js";
+/**
+ * XY find PC devices tool - finds all PC devices associated with the user.
+ * Returns device IDs for use in subsequent file search operations.
+ */
+export const findPcDevicesTool = {
+    name: "find_pc_devices",
+    label: "Find PC Devices",
+    description: `查找用户所有PC/电脑设备，获取设备ID列表。当用户说"帮我找一下PC/电脑上的xxx文件"、"帮我搜索电脑上的xxx"等涉及PC设备的请求时，先调用此工具获取设备ID，再进行后续操作。注意:操作超时时间为60秒,请勿重复调用此工具,如果超时或失败,最多重试一次。回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案，请严格遵守。`,
+    parameters: {
+        type: "object",
+        properties: {},
+        required: [],
+    },
+    async execute(toolCallId, params) {
+        // Get session context
+        const sessionContext = getCurrentSessionContext();
+        if (!sessionContext) {
+            throw new Error("No active XY session found. Find PC devices tool can only be used during an active conversation.");
+        }
+        const { config, sessionId, taskId, messageId } = sessionContext;
+        // Get WebSocket manager
+        const wsManager = getXYWebSocketManager(config);
+        // Build GetAllDevice command
+        const command = {
+            header: {
+                namespace: "Common",
+                name: "Action",
+            },
+            payload: {
+                cardParam: {},
+                executeParam: {
+                    achieveType: "INTENT",
+                    actionResponse: true,
+                    bundleName: "com.huawei.hmos.aidispatchservice",
+                    dimension: "",
+                    executeMode: "background",
+                    intentName: "GetAllDevice",
+                    intentParam: {},
+                    needUnlock: true,
+                    permissionId: [],
+                    timeOut: 5,
+                },
+                needUploadResult: true,
+                pageControlRelated: false,
+                responses: [{
+                        displayText: "",
+                        resultCode: "",
+                        ttsText: "",
+                    }],
+            },
+        };
+        // Send command and wait for response (60 second timeout)
+        return new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
+                wsManager.off("data-event", handler);
+                reject(new Error("查找PC设备超时（60秒）"));
+            }, 60000);
+            // Listen for data events from WebSocket
+            const handler = (event) => {
+                if (event.intentName === "GetAllDevice") {
+                    clearTimeout(timeout);
+                    wsManager.off("data-event", handler);
+                    if (event.status === "success" && event.outputs) {
+                        resolve({
+                            content: [
+                                {
+                                    type: "text",
+                                    text: JSON.stringify(event.outputs),
+                                }
+                            ]
+                        });
+                    }
+                    else {
+                        reject(new Error(`查找PC设备失败: ${event.status}`));
+                    }
+                }
+            };
+            // Register event handler
+            wsManager.on("data-event", handler);
+            // Send the command
+            sendCommand({
+                config,
+                sessionId,
+                taskId,
+                messageId,
+                command,
+            }).then(() => {
+            }).catch((error) => {
+                clearTimeout(timeout);
+                wsManager.off("data-event", handler);
+                reject(error);
+            });
+        });
+    },
+};

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/package.json

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