@ynhcj/xiaoyi-channel 0.0.73-beta → 0.0.75-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/provider.js

@@ -4,12 +4,9 @@ import { getCurrentSessionContext } from "./tools/session-manager.js";
  * 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.
  */
@@ -27,6 +24,7 @@ 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.
@@ -39,11 +37,14 @@ export const xiaoyiProvider = {
     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 +56,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,
         };
     },
     /**
@@ -73,25 +74,24 @@ export const xiaoyiProvider = {
             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;
+            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 conversationId === "string")
-                dynamicHeaders[HEADER_CONVERSATION_ID] = conversationId;
+            if (typeof interactionId === "string")
+                dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
         }
         if (Object.keys(dynamicHeaders).length === 0)
             return underlying;
         return async (model, context, options) => {
             // 记录输入
-            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 +100,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/xiaoyi-add-collection-tool.js

@@ -1,6 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
 import { getCurrentSessionContext } from "./session-manager.js";
+import { XYFileUploadService } from "../file-upload.js";
 /**
  * Duck-typed ToolInputError: openclaw 按 .name 字段匹配，不用 instanceof。
  * 抛出此错误会让 openclaw 返回 HTTP 400 而非 500，
@@ -36,7 +37,7 @@ export const xiaoyiAddCollectionTool = {
             },
             uri: {
                 type: "string",
-                description: "必填字段（IMAGE/FILE类型时）。图片或文件的端存储地址链接。",
+                description: "必填字段（IMAGE/FILE类型时）。图片或文件的地址链接。",
             },
             sourceAppBundleName: {
                 type: "string",
@@ -70,6 +71,15 @@ export const xiaoyiAddCollectionTool = {
         const { config, sessionId, taskId, messageId } = sessionContext;
         // Get WebSocket manager
         const wsManager = getXYWebSocketManager(config);
+        // Handle uri: upload local paths to get public URL
+        let publicUri = uri;
+        if (uri && !uri.startsWith("http://") && !uri.startsWith("https://") && !uri.startsWith("file://")) {
+            const uploadService = new XYFileUploadService(config.fileUploadUrl, config.apiKey, config.uid);
+            publicUri = await uploadService.uploadFileAndGetUrl(uri);
+            if (!publicUri) {
+                throw new Error("本地文件上传失败，无法获取公网URL");
+            }
+        }
         // Build intentParam
         const intentParam = {
             dataType,
@@ -77,8 +87,8 @@ export const xiaoyiAddCollectionTool = {
         if (content) {
             intentParam.content = content;
         }
-        if (uri) {
-            intentParam.uri = uri;
+        if (publicUri) {
+            intentParam.uri = publicUri;
         }
         if (sourceAppBundleName) {
             intentParam.sourceAppBundleName = sourceAppBundleName;

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.73-beta",
+  "version": "0.0.75-beta",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",