@ynhcj/xiaoyi-channel 0.0.168-beta → 0.0.170-beta

package/dist/src/bot.js

@@ -1,6 +1,6 @@
 import { getXYRuntime } from "./runtime.js";
 import { createXYReplyDispatcher } from "./reply-dispatcher.js";
-import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractDeviceType, extractTriggerData, extractRunCrossTaskContext } from "./parser.js";
+import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractDeviceType, extractModelName, extractTriggerData, extractRunCrossTaskContext } from "./parser.js";
 import { downloadFilesFromParts } from "./file-download.js";
 import { resolveXYConfig } from "./config.js";
 import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse, sendA2AResponse } from "./formatter.js";
@@ -32,6 +32,7 @@ export async function handleXYMessage(params) {
     try {
         // Check for special messages BEFORE parsing (these have different param structures)
         const messageMethod = message.method;
+        logger.log(`[BOT] Received A2A message: ${JSON.stringify(message)}`);
         // Handle clearContext messages (sessionId at top level, no params)
         if (messageMethod === "clearContext" || messageMethod === "clear_context") {
             const sessionId = message.sessionId ?? message.params?.sessionId;
@@ -138,6 +139,11 @@ export async function handleXYMessage(params) {
         if (deviceType) {
             log.log(`[BOT] Extracted deviceType: ${deviceType}`);
         }
+        // Extract modelName if present (used by provider.ts to override model.id)
+        const modelName = extractModelName(parsed.parts);
+        if (modelName) {
+            log.log(`[BOT] Extracted modelName: ${modelName}`);
+        }
         const runCrossTaskContext = extractRunCrossTaskContext(parsed.parts);
         // Resolve configuration (needed for status updates)
         const config = resolveXYConfig(cfg);
@@ -164,6 +170,7 @@ export async function handleXYMessage(params) {
                 messageId: parsed.messageId,
                 agentId: route.accountId,
                 deviceType,
+                modelName,
                 runCrossTaskContext: runCrossTaskContext ?? undefined,
             });
             // 🔑 发送初始状态更新
@@ -311,6 +318,7 @@ export async function handleXYMessage(params) {
             messageId: parsed.messageId,
             agentId: route.accountId,
             deviceType,
+            modelName,
             runCrossTaskContext: runCrossTaskContext ?? undefined,
         };
         log.log(`[BOT-DISPATCH] withReplyDispatcher starting, sessionKey=${route.sessionKey}`);

package/dist/src/parser.d.ts

@@ -50,6 +50,12 @@ export declare function extractPushId(parts: A2AMessagePart[]): string | null;
  * (same level as push_id).
  */
 export declare function extractDeviceType(parts: A2AMessagePart[]): string | null;
+/**
+ * Extract modelName from message parts.
+ * Looks for modelName in data parts under variables.memoryVariables.modelName
+ * (same level as systemVariables).
+ */
+export declare function extractModelName(parts: A2AMessagePart[]): string | null;
 /**
  * Extract Trigger event data from message parts.
  * Looks for Trigger events with pushDataId in data parts.

package/dist/src/parser.js

@@ -143,6 +143,22 @@ export function extractDeviceType(parts) {
     }
     return null;
 }
+/**
+ * Extract modelName from message parts.
+ * Looks for modelName in data parts under variables.memoryVariables.modelName
+ * (same level as systemVariables).
+ */
+export function extractModelName(parts) {
+    for (const part of parts) {
+        if (part.kind === "data" && part.data) {
+            const modelName = part.data.variables?.memoryVariables?.modelName;
+            if (modelName && typeof modelName === "string" && modelName.trim() !== "" && modelName.toLowerCase() !== "none") {
+                return modelName;
+            }
+        }
+    }
+    return null;
+}
 /**
  * Extract Trigger event data from message parts.
  * Looks for Trigger events with pushDataId in data parts.

package/dist/src/provider.js

@@ -587,6 +587,12 @@ export const xiaoyiProvider = {
                     }
                 }
             }
+            // ── Override model.id if A2A message specified modelName ──
+            const modelNameOverride = getCurrentSessionContext()?.modelName;
+            if (modelNameOverride && modelNameOverride.trim() !== "" && modelNameOverride.toLowerCase() !== "none") {
+                logger.log(`[xiaoyiprovider] overriding model.id: ${model.id} → ${modelNameOverride}`);
+                model = { ...model, id: modelNameOverride };
+            }
             // ── Retry-capable streaming ──────────────────────────────
             const cronJob = isCronTriggered(context.messages);
             if (cronJob)

package/dist/src/tools/check-plugin-privilege-tool.js

@@ -62,7 +62,9 @@ export function createCheckPluginPrivilegeTool(ctx) {
             "SendShortMessage（发送短信）, " +
             "StartCall（打电话）。" +
             "【多次调用】如果用户的定时任务指令中涉及多个端侧工具，则依次分别调用此工具检查每个工具的权限。如果调用超时失败，最多重试一次。" +
-            "【回复约束】如果工具返回没有授权或其他报错，只需要完整描述没有授权或其他报错内容即可，不需要主动给用户提供解决方案。",
+            "【回复约束】如果工具返回没有授权或其他报错，只需要完整描述没有授权或其他报错内容即可，不需要主动给用户提供解决方案。" +
+            "【使用约束1】只要是创建定时任务且涉及端插件的使用，则必须调用此工具检查权限" +
+            "【使用约束2】如果是定时任务执行过程中，禁止调用此工具，此工具仅在创建定时任务时按需调用",
         parameters: {
             type: "object",
             properties: {

package/dist/src/tools/session-manager.d.ts

@@ -8,6 +8,9 @@ export interface SessionContext {
     messageId: string;
     agentId: string;
     deviceType?: string;
+    /** Model name extracted from A2A user variables (variables.memoryVariables.modelName).
+     *  When set, provider.ts replaces model.id in the OpenAI request body. */
+    modelName?: string;
     runCrossTaskContext?: RunCrossTaskContext;
     /** When true, this context was created for a cron/scheduled task execution.
      *  Tools should use the push channel instead of WebSocket sendCommand. */

package/package.json

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