@ynhcj/xiaoyi-channel 0.0.175-beta → 0.0.177-beta

package/dist/src/bot.js

@@ -1,3 +1,4 @@
+import { updateSessionStoreEntry, updateSessionStore, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { getXYRuntime } from "./runtime.js";
 import { createXYReplyDispatcher } from "./reply-dispatcher.js";
 import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractDeviceType, extractModelName, extractTriggerData, extractRunCrossTaskContext } from "./parser.js";
@@ -173,6 +174,51 @@ export async function handleXYMessage(params) {
                 modelName,
                 runCrossTaskContext: runCrossTaskContext ?? undefined,
             });
+            // 🔑 Sync A2A modelName to OpenClaw session store so that session_status
+            // reports the correct model. Without this, session_status returns the
+            // configured default model instead of the A2A-specified one.
+            if (modelName && modelName.trim() !== "" && modelName.toLowerCase() !== "none") {
+                try {
+                    const storePath = resolveStorePath();
+                    const result = await updateSessionStoreEntry({
+                        storePath,
+                        sessionKey: route.sessionKey,
+                        update: async () => ({
+                            providerOverride: "xiaoyiprovider",
+                            modelOverride: modelName,
+                            modelOverrideSource: "user",
+                            model: "",
+                            modelProvider: "",
+                        }),
+                    });
+                    if (!result) {
+                        // Session entry doesn't exist yet (first message, xy_channel
+                        // bypasses the standard turn kernel). Create a minimal entry
+                        // with the override via updateSessionStore.
+                        await updateSessionStore(storePath, (store) => {
+                            if (!store[route.sessionKey]) {
+                                store[route.sessionKey] = {
+                                    // sessionId must pass validateSessionId regex /^[a-z0-9][a-z0-9._-]{0,127}$/i
+                                    // route.sessionKey like "agent:main:direct:xxx" contains colons which are invalid.
+                                    // Use parsed.sessionId (raw UUID from A2A) which is always safe.
+                                    sessionId: parsed.sessionId,
+                                    updatedAt: Date.now(),
+                                    providerOverride: "xiaoyiprovider",
+                                    modelOverride: modelName,
+                                    modelOverrideSource: "user",
+                                };
+                            }
+                        });
+                        log.log(`[BOT] Created session entry with model override: xiaoyiprovider/${modelName}`);
+                    }
+                    else {
+                        log.log(`[BOT] Patched session store model override: xiaoyiprovider/${modelName}`);
+                    }
+                }
+                catch (patchErr) {
+                    log.error(`[BOT] Failed to patch session model override:`, patchErr);
+                }
+            }
             // 🔑 发送初始状态更新
             log.log(`[BOT] Sending initial status update`);
             void sendStatusUpdate({

package/dist/src/cron-query-handler.js

@@ -93,7 +93,7 @@ export async function handleCronQueryEvent(context, cfg) {
                 taskId,
                 messageId,
                 command,
-                final: true,
+                final: false,
             });
             logger.log(`[CRON-QUERY] Sent response via sendCommand, action=${action}`);
         }

package/dist/src/formatter.js

@@ -217,12 +217,11 @@ export async function sendCommand(params) {
     if (commands.length === 0) {
         throw new Error("sendCommand requires command or commands.");
     }
-    // ── Cron mode: route through push channel ──────────────────────
-    // Detected via: (a) sessionId "cron-" prefix from synthetic session, OR
-    //               (b) toolCallId marked by before_tool_call hook from openclaw's sessionKey.
+    // ── Cron mode: disabled ────────────────────────────────────────
+    // sendCommandViaPush is disabled in this version. Cron-triggered
+    // tool calls that try to send commands will be rejected.
     if (sessionId.startsWith("cron-") || isCronToolCall(toolCallId)) {
-        const { sendCommandViaPush } = await import("./cron-command.js");
-        return sendCommandViaPush({ config, command: commands[0] });
+        throw new Error("sendCommandViaPush is disabled in this version");
     }
     // ── Normal mode: WebSocket ─────────────────────────────────────
     // Dynamic lookup: use latest taskId/messageId from task-manager (handles steer/interrupt),

package/dist/src/provider.js

@@ -417,6 +417,32 @@ export const xiaoyiProvider = {
     docsPath: "/providers/models",
     auth: [],
     isCacheTtlEligible: () => true,
+    /**
+     * Dynamic model resolution for A2A-specified model names.
+     * A2A messages carry a dynamic modelName that isn't in any static catalog.
+     * This hook lets OpenClaw's resolveModelAsync accept any model ID under
+     * xiaoyiprovider as long as the provider has a configured baseUrl.
+     */
+    resolveDynamicModel: (ctx) => {
+        const baseUrl = ctx.providerConfig?.baseUrl;
+        if (!baseUrl || typeof baseUrl !== "string")
+            return null;
+        return {
+            id: ctx.modelId,
+            name: ctx.modelId,
+            api: ctx.providerConfig?.api ?? "openai-completions",
+            provider: "xiaoyiprovider",
+            baseUrl,
+            reasoning: false,
+            input: ["text"],
+            cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+            contextWindow: 128_000,
+            maxTokens: 8192,
+            ...(ctx.providerConfig?.headers && typeof ctx.providerConfig.headers === "object"
+                ? { headers: ctx.providerConfig.headers }
+                : {}),
+        };
+    },
     /**
      * Store uid-based fallback prefix for lazy timestamp generation in wrapStreamFn.
      * Session-level headers (traceId / sessionId / interactionId) are resolved
@@ -570,12 +596,6 @@ export const xiaoyiProvider = {
                 const deviceSection = `\n\n## Current User Device Context\nThe current user is using the following device: ${displayDevice}\nYou need to be aware of the user's current device and provide guidance accordingly. If the response involves device-related tools or actions, you must tailor the reply based on the user's current device, using device-specific references such as "saved to the Notes/Calendar on your {deviceType}.\n"`;
                 context.systemPrompt = (context.systemPrompt ?? "") + deviceSection;
             }
-            // Append current LLM model to systemPrompt
-            const currentModelName = getCurrentSessionContext()?.modelName;
-            if (currentModelName && currentModelName.trim() !== "" && currentModelName.toLowerCase() !== "none") {
-                const modelSection = `\n\n## Current LLM MODEL\n${currentModelName}`;
-                context.systemPrompt = (context.systemPrompt ?? "") + modelSection;
-            }
             // ── Trim user message metadata ──────────────────────
             if (context.messages) {
                 for (const msg of context.messages) {

package/dist/src/tools/create-all-tools.js

@@ -17,10 +17,6 @@ import { createGetCollectionToolSchemaTool } from "./get-collection-tool-schema.
 // import { createGetEmailToolSchemaTool } from "./get-email-tool-schema.js";
 import { createLoginTokenTool } from "./login-token-tool.js";
 import { createAgentAsSkillTool } from "./agent-as-skill-tool.js";
-import { createDiscoverCrossDevicesTool } from "./discover-cross-devices-tool.js";
-import { createSendCrossDeviceTaskTool } from "./send-cross-device-task-tool.js";
-import { createDisplayA2UICardTool } from "./display-a2ui-card-tool.js";
-import { createCheckPluginPrivilegeTool } from "./check-plugin-privilege-tool.js";
 import { logger } from "../utils/logger.js";
 /**
  * Create all XY channel tools for the given session context.
@@ -36,9 +32,9 @@ export function createAllTools(ctx) {
     logger.log(`[CREATE-ALL-TOOLS] creating tools`);
     return [
         createLocationTool(ctx),
-        createDiscoverCrossDevicesTool(ctx),
-        createSendCrossDeviceTaskTool(ctx),
-        createDisplayA2UICardTool(ctx),
+        // createDiscoverCrossDevicesTool(ctx),
+        // createSendCrossDeviceTaskTool(ctx),
+        // createDisplayA2UICardTool(ctx),
         createCallDeviceTool(ctx),
         createGetNoteToolSchemaTool(ctx),
         createGetCalendarToolSchemaTool(ctx),
@@ -57,6 +53,6 @@ export function createAllTools(ctx) {
         createSaveSelfEvolutionSkillTool(ctx),
         createLoginTokenTool(ctx),
         createAgentAsSkillTool(ctx),
-        createCheckPluginPrivilegeTool(ctx),
+        // createCheckPluginPrivilegeTool(ctx),
     ];
 }

package/dist/src/tools/send-html-card-tool.js

@@ -12,7 +12,7 @@ export function createSendHtmlCardTool(ctx) {
     return {
         name: "send_html_card",
         label: "Send HTML Card",
-        description: `工具能力描述：当需要把生成的html文件发送给用户时，优先使用这个工具。以H5卡片的形式展示HTML页面内容，用户可以直接在卡片中查看。如果用户要求原始文件，才使用send_file_to_user发送html文件，否则html的文件回传均使用此工具。
+        description: `工具能力描述：支持以H5卡片的形式展示HTML页面内容，用户可以直接在卡片中查看。
 
 工具参数说明：
 a. htmlUrl 和 htmlLocal 至少填写一个
@@ -22,8 +22,7 @@ c. htmlLocal 是本地HTML文件路径，会先上传获取预览链接再以卡
 注意事项：
 a. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如果超时或失败，最多重试一次
 b. 最后要把最终的html的公网地址作为工具执行结果返回回去，要以markdown超链接的形式返回给用户，必须严格保留完整的url，包含url的鉴权鉴权信息，返回给用户的url必须是完整的
-c. html类型的文件回传给用户优先用这个工具,当用户说“生成xxxxhtml然后发我”或者“生成网页游戏烦我”这种表述时使用send_html_card工具
-d. 如果使用这个工具把html文件回传，则生成的html要尽可能适配用户的设备，如果用户使用的是手机，则尽可能生成竖屏的html的预览效果`,
+c. 仅当用户或者skill中显示说明使用send_html_card工具时才调用此工具`,
         parameters: {
             type: "object",
             properties: {

package/package.json

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