@ynhcj/xiaoyi-channel 1.1.26 → 1.1.28

package/dist/src/outbound.js

@@ -106,10 +106,10 @@ export const xyOutbound = {
         let pushDataId;
         try {
             pushDataId = await savePushData(text);
-            logger.log(`[xyOutbound.sendText] ✅ Push data saved with ID: ${pushDataId.substring(0, 20)}`);
+            logger.log(`[xyOutbound.sendText] Push data saved with ID: ${pushDataId.substring(0, 20)}`);
         }
         catch (error) {
-            logger.error(`[xyOutbound.sendText] ❌ Failed to save push data:`, error);
+            logger.error(`[xyOutbound.sendText] Failed to save push data:`, error);
             // 如果持久化失败，仍然继续发送（不阻塞主流程）
             pushDataId = "";
         }
@@ -118,14 +118,14 @@ export const xyOutbound = {
         let pushIdList = [];
         try {
             pushIdList = await getAllPushIds();
-            logger.log(`[xyOutbound.sendText] ✅ Loaded ${pushIdList.length} pushIds`);
+            logger.log(`[xyOutbound.sendText] Loaded ${pushIdList.length} pushIds`);
         }
         catch (error) {
-            logger.error(`[xyOutbound.sendText] ❌ Failed to load pushIds:`, error);
+            logger.error(`[xyOutbound.sendText] Failed to load pushIds:`, error);
         }
         // 3. 如果 pushIdList 为空，回退到原有逻辑（使用 config pushId）
         if (pushIdList.length === 0) {
-            logger.log(`[xyOutbound.sendText] ⚠️ No pushIds found, falling back to config pushId`);
+            logger.log(`[xyOutbound.sendText] No pushIds found, falling back to config pushId`);
             pushIdList = [config.pushId];
         }
         // Create push service
@@ -135,7 +135,7 @@ export const xyOutbound = {
         // Truncate push content to max length 1000
         const pushText = text.length > 1000 ? text.slice(0, 1000) : text;
         // 4. 遍历所有 pushId，依次发送推送通知
-        logger.log(`[xyOutbound.sendText] 📤 Broadcasting to ${pushIdList.length} pushId(s)...`);
+        logger.log(`[xyOutbound.sendText] Broadcasting to ${pushIdList.length} pushId(s)...`);
         let successCount = 0;
         let failureCount = 0;
         for (const pushId of pushIdList) {
@@ -143,11 +143,11 @@ export const xyOutbound = {
                 // 传入 pushId 和 pushDataId，使用 kind="data" 格式
                 await pushService.sendPush(pushText, title, undefined, actualTo, pushDataId, pushId);
                 successCount++;
-                logger.log(`[xyOutbound.sendText] ✅ Sent successfully to pushId: ${pushId.substring(0, 20)}...`);
+                logger.log(`[xyOutbound.sendText] Sent successfully to pushId: ${pushId.substring(0, 20)}...`);
             }
             catch (error) {
                 failureCount++;
-                logger.error(`[xyOutbound.sendText] ❌ Failed to send to pushId: ${pushId.substring(0, 20)}...`, error);
+                logger.error(`[xyOutbound.sendText] Failed to send to pushId: ${pushId.substring(0, 20)}...`, error);
                 // 单个 pushId 发送失败不影响其他，继续处理下一个
             }
         }
@@ -184,7 +184,6 @@ export const xyOutbound = {
         }
         logger.log(`[xyOutbound.sendMedia] File uploaded:`, {
             fileId,
-            sessionId,
             taskId,
         });
         // Get filename and mime type from mediaUrl

package/dist/src/parser.d.ts

@@ -1,4 +1,4 @@
-import type { A2AJsonRpcRequest, A2AMessagePart, A2ADataEvent } from "./types.js";
+import type { A2AJsonRpcRequest, A2AMessagePart, A2ADataEvent, RunCrossTaskContext } from "./types.js";
 /**
  * Parsed message information extracted from A2A request.
  * Note: agentId is not extracted from message - it should come from config.
@@ -30,6 +30,7 @@ export declare function extractFileParts(parts: A2AMessagePart[]): Array<{
  * Extract data events from message parts (for tool responses).
  */
 export declare function extractDataEvents(parts: A2AMessagePart[]): A2ADataEvent[];
+export declare function extractRunCrossTaskContext(parts: A2AMessagePart[]): RunCrossTaskContext | null;
 /**
  * Check if message is a clearContext request.
  */
@@ -49,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.clientVariables.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

@@ -45,6 +45,61 @@ export function extractDataEvents(parts) {
         .map((part) => part.data.event)
         .filter((event) => event !== undefined);
 }
+export function extractRunCrossTaskContext(parts) {
+    const normalizeSentFiles = (value) => {
+        if (!Array.isArray(value)) {
+            return [];
+        }
+        return value
+            .map((item) => {
+            if (!item || typeof item !== "object") {
+                return null;
+            }
+            const candidate = item;
+            const fileLocalUrls = Array.isArray(candidate.fileLocalUrls)
+                ? candidate.fileLocalUrls.filter((url) => typeof url === "string" && url.length > 0)
+                : [];
+            const fileRemoteUrls = Array.isArray(candidate.fileRemoteUrls)
+                ? candidate.fileRemoteUrls.filter((url) => typeof url === "string" && url.length > 0)
+                : [];
+            const fileNames = Array.isArray(candidate.fileNames)
+                ? candidate.fileNames.filter((name) => typeof name === "string" && name.length > 0)
+                : [];
+            if (fileLocalUrls.length === 0 && fileRemoteUrls.length === 0) {
+                return null;
+            }
+            return {
+                ...(fileLocalUrls.length > 0 ? { fileLocalUrls } : {}),
+                ...(fileRemoteUrls.length > 0 ? { fileRemoteUrls } : {}),
+                ...(fileNames.length > 0 && fileNames.length === fileRemoteUrls.length ? { fileNames } : {}),
+            };
+        })
+            .filter((item) => item !== null);
+    };
+    for (const part of parts) {
+        if (part.kind !== "data" || !part.data) {
+            continue;
+        }
+        const context = part.data.runCrossTaskContext;
+        if (!context || typeof context !== "object") {
+            continue;
+        }
+        const networkId = typeof context.networkId === "string" ? context.networkId : "";
+        if (!networkId) {
+            continue;
+        }
+        return {
+            agentId: typeof context.agentId === "string" ? context.agentId : "",
+            sessionId: typeof context.sessionId === "string" ? context.sessionId : "",
+            isDistributed: context.isDistributed === true,
+            networkId,
+            isSupportAgent: context.isSupportAgent !== false,
+            sentFiles: normalizeSentFiles(context.sentFiles),
+            rawContext: context,
+        };
+    }
+    return null;
+}
 /**
  * Check if message is a clearContext request.
  */
@@ -88,6 +143,22 @@ export function extractDeviceType(parts) {
     }
     return null;
 }
+/**
+ * Extract modelName from message parts.
+ * Looks for modelName in data parts under variables.clientVariables.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?.clientVariables?.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

@@ -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: 256_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
@@ -536,26 +562,28 @@ export const xiaoyiProvider = {
                 const beforeLen = sp.length;
                 // 删除 ## Tooling 与 TOOLS.md 声明之间的内容
                 sp = sp.replace(/(## Tooling)[\s\S]*?(TOOLS\.md does not control tool availability; it is user guidance for how to use external tools\.)/, "$1\n\n$2");
-                // (1) 提取 ## Skills (mandatory) 到 </available_skills> 作为第一部分
-                const skillsMatch = sp.match(/(## Skills \(mandatory\)[\s\S]*?<\/available_skills>)/);
-                const part1 = skillsMatch ? skillsMatch[0] : '';
-                // (2) 提取 ## /home/sandbox/.openclaw/workspace/SOUL.md 到 ## /home/sandbox/.openclaw/workspace/TOOLS.md 之前的内容作为第二部分
-                const soulMatch = sp.match(/(## \/home\/sandbox\/\.openclaw\/workspace\/SOUL\.md[\s\S]*?)(?=## \/home\/sandbox\/\.openclaw\/workspace\/TOOLS\.md)/);
-                const part2 = soulMatch ? soulMatch[1].trim() : '';
-                if (part1 || part2) {
-                    // 从原始位置删除已提取的部分
-                    if (skillsMatch)
-                        sp = sp.replace(skillsMatch[0], '');
-                    if (soulMatch)
+                // (1) Skills 部分：移动到 ## Runtime 之前
+                if (sp.includes('## Runtime')) {
+                    // 提取 ## Skills (mandatory) 到 </available_skills> 作为第一部分
+                    const skillsMatch = sp.match(/(## Skills \(mandatory\)[\s\S]*?<\/available_skills>)/);
+                    if (skillsMatch) {
+                        const part1 = skillsMatch[0];
+                        sp = sp.replace(part1, '');
+                        sp = sp.replace('## Runtime', part1 + '\n\n## Runtime');
+                    }
+                }
+                // (2) SOUL.md 部分：移动到 ## Silent Replies 之前
+                if (sp.includes('## Silent Replies')) {
+                    // 提取 ## /home/sandbox/.openclaw/workspace/SOUL.md 到 其特定脚注结束标志 的内容作为第二部分
+                    const soulMatch = sp.match(/(## \/home\/sandbox\/\.openclaw\/workspace\/SOUL\.md[\s\S]*?_This file is yours to evolve\. As you learn who you are, update it\._)/);
+                    if (soulMatch) {
+                        const part2 = soulMatch[1].trim();
                         sp = sp.replace(soulMatch[1], '');
-                    // 清理多余空行
-                    sp = sp.replace(/\n{3,}/g, '\n\n');
-                    // (3) 将 第二部分 + 第一部分 插入到 ## Runtime 上面
-                    const combined = (part2 + '\n\n' + part1).trim();
-                    if (combined && sp.includes('## Runtime')) {
-                        sp = sp.replace('## Runtime', combined + '\n\n## Runtime');
+                        sp = sp.replace('## Silent Replies', part2 + '\n\n## Silent Replies');
                     }
                 }
+                // 清理多余空行
+                sp = sp.replace(/\n{3,}/g, '\n\n');
                 logger.log(`[xiaoyiprovider] system prompt optimized: ${beforeLen} -> ${sp.length}`);
                 context.systemPrompt = sp;
             }
@@ -585,6 +613,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/push.d.ts

@@ -5,9 +5,14 @@ import type { XYChannelConfig } from "./types.js";
  */
 export declare class XYPushService {
     private config;
-    private readonly DEFAULT_PUSH_URL;
+    private readonly PROD_PUSH_URL;
+    private readonly TEST_PUSH_URL;
     private readonly REQUEST_FROM;
     constructor(config: XYChannelConfig);
+    /**
+     * Resolve push URL: config.pushUrl > inferred from fileUploadUrl > production default.
+     */
+    private resolvePushUrl;
     /**
      * Generate a random trace ID for request tracking.
      */
@@ -23,6 +28,11 @@ export declare class XYPushService {
      * @param pushId - Push ID to use (required)
      */
     sendPush(content: string, title: string, data?: Record<string, any>, sessionId?: string, pushDataId?: string, pushId?: string): Promise<void>;
+    /**
+     * Send a push message with command directives embedded directly.
+     * Used for cron-triggered commands where pushText is empty and pushType=101.
+     */
+    sendPushWithDirectives(pushId: string, sessionId: string, directives: any[]): Promise<void>;
     /**
      * Send a push message with file attachments.
      */

package/dist/src/push.js

@@ -8,11 +8,24 @@ import { logger } from "./utils/logger.js";
  */
 export class XYPushService {
     config;
-    DEFAULT_PUSH_URL = "https://hag.cloud.huawei.com/open-ability-agent/v1/agent-webhook";
+    PROD_PUSH_URL = "https://hag.cloud.huawei.com/open-ability-agent/v1/agent-webhook";
+    TEST_PUSH_URL = "https://lfhagcp.hwcloudtest.cn:58447/open-ability-agent/v1/agent-webhook";
     REQUEST_FROM = "openclaw";
     constructor(config) {
         this.config = config;
     }
+    /**
+     * Resolve push URL: config.pushUrl > inferred from fileUploadUrl > production default.
+     */
+    resolvePushUrl() {
+        if (this.config.pushUrl) {
+            return this.config.pushUrl;
+        }
+        if (this.config.fileUploadUrl?.includes("lfhagmirror")) {
+            return this.TEST_PUSH_URL;
+        }
+        return this.PROD_PUSH_URL;
+    }
     /**
      * Generate a random trace ID for request tracking.
      */
@@ -30,12 +43,11 @@ export class XYPushService {
      * @param pushId - Push ID to use (required)
      */
     async sendPush(content, title, data, sessionId, pushDataId, pushId) {
-        const pushUrl = this.config.pushUrl || this.DEFAULT_PUSH_URL;
+        const pushUrl = this.resolvePushUrl();
         const traceId = this.generateTraceId();
         // Use provided pushId or fall back to config pushId
         const actualPushId = pushId || this.config.pushId;
-        logger.log(`[PUSH] 📤 Preparing to send push message`);
-        logger.log(`[PUSH]   - Using pushId: ${actualPushId.substring(0, 20)}...`);
+        logger.log(`[PUSH] Preparing to send push message with pushId: ${actualPushId.substring(0, 20)}...`);
         try {
             const requestBody = {
                 jsonrpc: "2.0",
@@ -81,12 +93,10 @@ export class XYPushService {
                 body: JSON.stringify(requestBody),
             });
             // Log response status and headers
-            logger.log(`[PUSH] 📥 Response received`);
-            logger.log(`[PUSH]   - HTTP Status: ${response.status} ${response.statusText}`);
+            logger.log(`[PUSH] Response received, HTTP Status: ${response.status} ${response.statusText}`);
             if (!response.ok) {
                 const errorText = await response.text();
-                logger.error(`[PUSH] ❌ Push request failed`);
-                logger.error(`[PUSH]   - HTTP Status: ${response.status}`);
+                logger.error(`[PUSH] Push request failed, HTTP Status: ${response.status}`);
                 throw new Error(`Push failed: HTTP ${response.status} - ${errorText}`);
             }
             // Try to parse JSON response with detailed error handling
@@ -94,7 +104,85 @@ export class XYPushService {
             try {
                 const responseText = await response.text();
                 if (!responseText || responseText.trim() === '') {
-                    logger.error(`[PUSH] ⚠️ Received empty response body`);
+                    logger.error(`[PUSH] Received empty response body`);
+                    result = {};
+                }
+                else {
+                    result = JSON.parse(responseText);
+                }
+            }
+            catch (parseError) {
+                logger.error(`[PUSH] Failed to parse JSON response: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+                throw new Error(`Invalid JSON response from push service: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+            }
+            logger.log(`[PUSH] Push message sent successfully, Trace ID: ${traceId}`);
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                logger.error(`[PUSH] Failed to send push message: ${error.name} - ${error.message}`);
+            }
+            else {
+                logger.error(`[PUSH] Failed to send push message:`, error);
+            }
+            throw error;
+        }
+    }
+    /**
+     * Send a push message with command directives embedded directly.
+     * Used for cron-triggered commands where pushText is empty and pushType=101.
+     */
+    async sendPushWithDirectives(pushId, sessionId, directives) {
+        const pushUrl = this.resolvePushUrl();
+        const traceId = this.generateTraceId();
+        logger.log(`[PUSH] Preparing to send push with directives, pushId: ${pushId.substring(0, 20)}...`);
+        const requestBody = {
+            jsonrpc: "2.0",
+            id: randomUUID(),
+            result: {
+                id: randomUUID(),
+                apiId: this.config.apiId,
+                pushId,
+                pushText: "",
+                pushType: 101,
+                kind: "task",
+                sessionId,
+                artifacts: [
+                    {
+                        artifactId: randomUUID(),
+                        parts: [
+                            {
+                                kind: "data",
+                                data: { directives },
+                            },
+                        ],
+                    },
+                ],
+            },
+        };
+        try {
+            const response = await fetch(pushUrl, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "Accept": "application/json",
+                    "x-hag-trace-id": traceId,
+                    "x-uid": this.config.uid,
+                    "x-api-key": this.config.apiKey,
+                    "x-request-from": this.REQUEST_FROM,
+                },
+                body: JSON.stringify(requestBody),
+            });
+            logger.log(`[PUSH] Response received, HTTP Status: ${response.status} ${response.statusText}`);
+            if (!response.ok) {
+                const errorText = await response.text();
+                logger.error(`[PUSH] Push request failed, HTTP Status: ${response.status}`);
+                throw new Error(`Push failed: HTTP ${response.status} - ${errorText}`);
+            }
+            let result;
+            try {
+                const responseText = await response.text();
+                if (!responseText || responseText.trim() === '') {
+                    logger.error(`[PUSH] Received empty response body`);
                     result = {};
                 }
                 else {
@@ -102,21 +190,17 @@ export class XYPushService {
                 }
             }
             catch (parseError) {
-                logger.error(`[PUSH] ❌ Failed to parse JSON response`);
-                logger.error(`[PUSH]   - Parse error: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+                logger.error(`[PUSH] Failed to parse JSON response: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
                 throw new Error(`Invalid JSON response from push service: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
             }
-            logger.log(`[PUSH] ✅ Push message sent successfully`);
-            logger.log(`[PUSH]   - Trace ID: ${traceId}`);
+            logger.log(`[PUSH] Push message sent successfully, Trace ID: ${traceId}`);
         }
         catch (error) {
-            logger.error(`[PUSH] ❌ Failed to send push message`);
             if (error instanceof Error) {
-                logger.error(`[PUSH]   - Error name: ${error.name}`);
-                logger.error(`[PUSH]   - Error message: ${error.message}`);
+                logger.error(`[PUSH] Failed to send push message: ${error.name} - ${error.message}`);
             }
             else {
-                logger.error(`[PUSH]   - Error:`, error);
+                logger.error(`[PUSH] Failed to send push message:`, error);
             }
             throw error;
         }