@ynhcj/xiaoyi-channel 0.0.74-beta → 0.0.76-beta

package/dist/index.js

@@ -1,5 +1,6 @@
 import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
 import { xyPlugin } from "./src/channel.js";
+import { xiaoyiProvider } from "./src/provider.js";
 import { setXYRuntime } from "./src/runtime.js";
 import { tryInjectSteer } from "./src/steer-injector.js";
 import { callCsplApi } from "./src/cspl/call-api.js";
@@ -18,6 +19,7 @@ const plugin = {
     register(api) {
         setXYRuntime(api.runtime);
         api.registerChannel({ plugin: xyPlugin });
+        api.registerProvider(xiaoyiProvider);
         // CSPL after_tool_call hook: 监听工具结果，发送至 CSPL API 进行安全检测
         // 如果响应为 REJECT，注入 steer 消息中止当前对话
         api.on("after_tool_call", async (event, ctx) => {

package/dist/src/channel.js

@@ -24,7 +24,6 @@ import { sendFileToUserTool } from "./tools/send-file-to-user-tool.js";
 import { viewPushResultTool } from "./tools/view-push-result-tool.js";
 import { imageReadingTool } from "./tools/image-reading-tool.js";
 import { timestampToUtc8Tool } from "./tools/timestamp-to-utc8-tool.js";
-import { sendCommandToCarTool } from "./tools/send-command-to-car-tool.js";
 import { xiaoyiCollectionTool } from "./tools/xiaoyi-collection-tool.js";
 import { xiaoyiAddCollectionTool } from "./tools/xiaoyi-add-collection-tool.js";
 import { xiaoyiDeleteCollectionTool } from "./tools/xiaoyi-delete-collection-tool.js";
@@ -71,7 +70,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, sendCommandToCarTool, xiaoyiCollectionTool, xiaoyiAddCollectionTool, xiaoyiDeleteCollectionTool, saveMediaToGalleryTool];
+        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];
         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/provider.js

@@ -1,20 +1,27 @@
+// Xiaoyi Provider
+// Wraps any OpenAI-compatible endpoint and injects dynamic headers
+// (taskId, sessionId, conversationId) from the current XY channel session.
+// Falls back to uid-based values when no session context is available.
+//
+// Users configure the underlying model in config:
+//   models.providers.xiaoyiprovider.baseUrl = "https://..."
+//   models.providers.xiaoyiprovider.api = "openai-completions"
+//   models.providers.xiaoyiprovider.models = [...]
+import { createHash } from "crypto";
 import { getCurrentSessionContext } from "./tools/session-manager.js";
 /**
  * Dynamic header keys injected via extraParams and forwarded to the HTTP request.
  * Correspond to the three fields written to .xiaoyiruntime:
  *   TASK_ID, SESSION_ID, CONVERSATION_ID
  */
-const HEADER_TASK_ID = "x-task-id";
+const HEADER_TRACE_ID = "x-hag-trace-id";
 const HEADER_SESSION_ID = "x-session-id";
-const HEADER_CONVERSATION_ID = "x-conversation-id";
-const EXTRA_PARAM_TASK_ID = "x-task-id";
-const EXTRA_PARAM_SESSION_ID = "x-session-id";
-const EXTRA_PARAM_CONVERSATION_ID = "x-conversation-id";
+const HEADER_INTERACTION_ID = "x-interaction-id";
 /**
- * Encode uid to base64 and take first 32 chars.
+ * Encode uid via SHA-256 and take first 32 hex chars.
  */
 function encodeUid(uid) {
-    return Buffer.from(uid).toString("base64").slice(0, 32);
+    return createHash("sha256").update(uid).digest("hex").slice(0, 32);
 }
 /**
  * Get uid from plugin config (OpenClawConfig -> plugins -> xiaoyi-channel -> config).
@@ -27,23 +34,27 @@ export const xiaoyiProvider = {
     label: "Xiaoyi Provider",
     docsPath: "/providers/models",
     auth: [],
+    isCacheTtlEligible: () => true,
     /**
      * Inject dynamic session params into extraParams so they flow
      * through to wrapStreamFn's ctx.extraParams.
      *
      * Priority:
      *   1. Session context (from AsyncLocalStorage, set by bot.ts)
-     *   2. uid-based fallback: base64(uid)[:32]_timestamp
+     *   2. uid-based fallback: sha256(uid).hex[:32]_timestamp
      *   3. No uid available → return undefined (no headers injected)
      */
     prepareExtraParams: (ctx) => {
         const sessionCtx = getCurrentSessionContext();
         if (sessionCtx) {
+            const taskId = sessionCtx.taskId;
+            const sessionId = taskId.split("&")[0];
+            const interactionId = taskId.split("&")[1] || "";
             return {
                 ...ctx.extraParams,
-                [EXTRA_PARAM_TASK_ID]: sessionCtx.taskId,
-                [EXTRA_PARAM_SESSION_ID]: sessionCtx.sessionId,
-                [EXTRA_PARAM_CONVERSATION_ID]: sessionCtx.messageId,
+                [HEADER_TRACE_ID]: taskId,
+                [HEADER_SESSION_ID]: sessionId,
+                [HEADER_INTERACTION_ID]: interactionId,
             };
         }
         // Fallback: uid-based values
@@ -55,9 +66,9 @@ export const xiaoyiProvider = {
         const fallbackValue = `${prefix}_${ts}`;
         return {
             ...ctx.extraParams,
-            [EXTRA_PARAM_TASK_ID]: fallbackValue,
-            [EXTRA_PARAM_SESSION_ID]: fallbackValue,
-            [EXTRA_PARAM_CONVERSATION_ID]: fallbackValue,
+            [HEADER_TRACE_ID]: fallbackValue,
+            [HEADER_SESSION_ID]: fallbackValue,
+            [HEADER_INTERACTION_ID]: fallbackValue,
         };
     },
     /**
@@ -71,27 +82,25 @@ export const xiaoyiProvider = {
         const underlying = ctx.streamFn;
         if (!underlying)
             return underlying;
-        const dynamicHeaders = {};
-        if (ctx.extraParams) {
-            const taskId = ctx.extraParams[EXTRA_PARAM_TASK_ID];
-            const sessionId = ctx.extraParams[EXTRA_PARAM_SESSION_ID];
-            const conversationId = ctx.extraParams[EXTRA_PARAM_CONVERSATION_ID];
-            if (typeof taskId === "string")
-                dynamicHeaders[HEADER_TASK_ID] = taskId;
-            if (typeof sessionId === "string")
-                dynamicHeaders[HEADER_SESSION_ID] = sessionId;
-            if (typeof conversationId === "string")
-                dynamicHeaders[HEADER_CONVERSATION_ID] = conversationId;
-        }
-        if (Object.keys(dynamicHeaders).length === 0)
-            return underlying;
         return async (model, context, options) => {
+            // 每次请求时从 ctx.extraParams 动态读取 header
+            const dynamicHeaders = {};
+            if (ctx.extraParams) {
+                const traceId = ctx.extraParams[HEADER_TRACE_ID];
+                const sessionId = ctx.extraParams[HEADER_SESSION_ID];
+                const interactionId = ctx.extraParams[HEADER_INTERACTION_ID];
+                if (typeof traceId === "string")
+                    dynamicHeaders[HEADER_TRACE_ID] = traceId;
+                if (typeof sessionId === "string")
+                    dynamicHeaders[HEADER_SESSION_ID] = sessionId;
+                if (typeof interactionId === "string")
+                    dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
+            }
             // 记录输入
-            console.log(`[xiaoyiprovider] input messages count: ${context.messages.length}`);
+            console.log(`[xiaoyiprovider] input messages count: ${context.messages?.length ?? 0}`);
             if (context.systemPrompt) {
                 console.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
             }
-            console.log(`[xiaoyiprovider] headers: ${JSON.stringify(dynamicHeaders)}`);
             const stream = await underlying(model, context, {
                 ...options,
                 headers: {
@@ -100,7 +109,7 @@ export const xiaoyiProvider = {
                 },
             });
             // 异步监听输出（不阻塞 stream 返回）
-            stream.result().then((msg) => console.log(`[xiaoyiprovider] output: ${JSON.stringify(msg)}`), (err) => console.log(`[xiaoyiprovider] error: ${err}`));
+            stream.result().then((err) => console.log(`[xiaoyiprovider] error: ${err}`));
             return stream;
         };
     },

package/dist/src/tools/device-tool-map.js

@@ -13,7 +13,6 @@ const DEVICE_TOOL_POLICY = {
             "call_phone",
             "send_message",
             "search_message",
-            "send_command_to_car",
             "search_contact",
             "QueryCollection",
             "AddCollection",

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

@@ -20,7 +20,14 @@ class ToolInputError extends Error {
 export const xiaoyiAddCollectionTool = {
     name: "AddCollection",
     label: "Add XiaoYi Collection",
-    description: `向小艺收藏中添加公共知识数据，可以给用户提供个性化体验。用户希望保存到个人化知识库中的数据都可以调用本技能。不同类型的数据对应的数据要求如下：
+    description: `向小艺收藏中添加公共知识数据，可以给用户提供个性化体验。任何用户希望保存到个人化知识库中的数据都可以调用本技能。不同类型的数据对应的数据要求如下：
+请求入参说明：
+● content:必填字段，数据类型为string，功能描述是该字段是用户添加收藏的链接url或文本原文。适用于HYPER_LINK和TEXT类型。
+● uri:必填字段，数据类型为string，功能描述是该字段是图片或文件的端存储地址链接。适用于IMAGE和FILE类型。
+● sourceAppBundleName:非必填字段，数据类型为string，功能描述是标识该数据的来源应用。
+● dataType:必填字段，数据类型为string，功能描述是标识数据类型。HYPER_LINK标识网页，TEXT标识文本，IMAGE标识图片，FILE标识文件。
+● title:非必填字段，数据类型为string，功能描述是标识文件类型数据的文件名称。适用于FILE类型。
+说明：如果dataType为HYPER_LINK或TEXT，则content字段必填且不能为空；如果dataType为IMAGE或FILE，则uri字段必填且不能为空。当用户希望收藏海报、截图等图片类数据时，请将数据以图片IMAGE的形式存入到小艺帮记；当用户希望收藏电子书、笔记、报告、素材、文档、合同、协议、简历、证书、报表、日志、安装包、压缩包等描述的文件时，请将数据以文件FILE的形式存入到小艺帮记。
   注意:
   a. 操作超时时间为60秒,请勿重复调用此工具
   b. 如果遇到各类调用失败场景,最多只能重试一次，不可以重复调用多次。
@@ -47,12 +54,16 @@ export const xiaoyiAddCollectionTool = {
                 type: "string",
                 description: "必填字段。标识数据类型：HYPER_LINK表示网页，TEXT表示文本，IMAGE表示图片，FILE表示文件。",
             },
+            title: {
+                type: "string",
+                description: "非必填字段。标识文件类型数据的文件名称。适用于FILE类型。",
+            },
         },
         required: ["dataType"],
     },
     async execute(toolCallId, params) {
         // Validate parameters
-        const { content, uri, sourceAppBundleName, dataType } = params;
+        const { content, uri, sourceAppBundleName, dataType, title } = params;
         const validTypes = ["HYPER_LINK", "TEXT", "IMAGE", "FILE"];
         if (!dataType || !validTypes.includes(dataType)) {
             throw new ToolInputError(`dataType必填且必须为 HYPER_LINK、TEXT、IMAGE、FILE 之一，当前值: ${dataType}`);
@@ -93,6 +104,9 @@ export const xiaoyiAddCollectionTool = {
         if (sourceAppBundleName) {
             intentParam.sourceAppBundleName = sourceAppBundleName;
         }
+        if (title) {
+            intentParam.title = title;
+        }
         // Build AddCollection command
         const command = {
             header: {

package/openclaw.plugin.json

@@ -1,6 +1,7 @@
 {
   "id": "xiaoyi-channel",
   "channels": ["xiaoyi-channel"],
+  "providers": ["xiaoyiprovider"],
   "skills": [],
   "configSchema": {
     "type": "object",

package/package.json

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