@ynhcj/xiaoyi-channel 0.0.176-beta → 0.0.178-beta

package/dist/src/bot.js

@@ -1,4 +1,4 @@
-import { updateSessionStoreEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
+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";
@@ -33,7 +33,6 @@ 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;
@@ -179,16 +178,41 @@ export async function handleXYMessage(params) {
             // configured default model instead of the A2A-specified one.
             if (modelName && modelName.trim() !== "" && modelName.toLowerCase() !== "none") {
                 try {
-                    await updateSessionStoreEntry({
-                        storePath: resolveStorePath(),
+                    const storePath = resolveStorePath();
+                    const result = await updateSessionStoreEntry({
+                        storePath,
                         sessionKey: route.sessionKey,
                         update: async () => ({
                             providerOverride: "xiaoyiprovider",
                             modelOverride: modelName,
                             modelOverrideSource: "user",
+                            model: "",
+                            modelProvider: "",
                         }),
                     });
-                    log.log(`[BOT] Patched session store model override: xiaoyiprovider/${modelName}`);
+                    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);

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

package/dist/src/reply-dispatcher.js

@@ -116,10 +116,6 @@ export function createXYReplyDispatcher(params) {
     let hasSentResponse = false;
     let finalSent = false;
     let accumulatedText = "";
-    let accumulatedReasoningHistory = "";
-    let lastReasoningText = "";
-    let accumulatedReplyHistory = "";
-    let lastReplyText = "";
     const initialRunCrossTaskContext = getCurrentSessionContext()?.runCrossTaskContext;
     const getRunCrossTaskContext = () => {
         return getCurrentSessionContext()?.runCrossTaskContext ?? initialRunCrossTaskContext;
@@ -408,26 +404,12 @@ export function createXYReplyDispatcher(params) {
                 }
                 try {
                     if (text.length > 0) {
-                        // 🔑 检测是否是新一轮思考：当前text比上一次短，或不以上次内容开头
-                        const isNewRound = lastReasoningText.length > 0 &&
-                            text.length < lastReasoningText.length;
-                        if (isNewRound) {
-                            // 将上一轮思考追加到历史
-                            accumulatedReasoningHistory += (accumulatedReasoningHistory ? "\n\n" : "") + lastReasoningText;
-                        }
-                        // 更新当前轮最后一次text
-                        lastReasoningText = text;
-                        // 🔑 拼接历史 + 当前轮内容
-                        const fullText = accumulatedReasoningHistory
-                            ? accumulatedReasoningHistory + "\n\n" + text
-                            : text;
-                        // 🔑 将模型真实的thinking/reasoning内容通过reasoningText转发
                         await sendReasoningTextUpdate({
                             config,
                             sessionId,
                             taskId: currentTaskId,
                             messageId: currentMessageId,
-                            text: fullText,
+                            text,
                             append: false,
                         });
                     }
@@ -443,31 +425,17 @@ export function createXYReplyDispatcher(params) {
                 }
                 const currentTaskId = getActiveTaskId();
                 const currentMessageId = getActiveMessageId();
-                let text = payload.text ?? "";
+                const text = payload.text ?? "";
                 try {
                     if (text.length > 0) {
-                        // 🔑 检测是否是新一轮回复：当前text比上一次短，或不以上次内容开头
-                        const isNewRound = lastReplyText.length > 0 &&
-                            (text.length < lastReplyText.length || !text.startsWith(lastReplyText));
-                        if (isNewRound) {
-                            // 将上一轮回复追加到历史
-                            accumulatedReplyHistory += (accumulatedReplyHistory ? "\n\n" : "") + lastReplyText;
-                        }
-                        // 更新当前轮最后一次text
-                        lastReplyText = text;
-                        // 🔑 拼接历史 + 当前轮内容
-                        const fullText = accumulatedReplyHistory
-                            ? accumulatedReplyHistory + "\n\n" + text
-                            : text;
                         accumulatedText += text;
                         hasSentResponse = true;
-                        // 🔑 流式文本通过 A2A text 通道发送（而非 reasoningText）
                         await sendA2AResponse({
                             config,
                             sessionId,
                             taskId: currentTaskId,
                             messageId: currentMessageId,
-                            text: fullText,
+                            text,
                             append: false,
                             final: false,
                             log: false,

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

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