@ynhcj/xiaoyi-channel 0.0.159-beta → 0.0.159-next

package/dist/src/file-upload.js

@@ -235,6 +235,108 @@ export class XYFileUploadService {
             }
         }
     }
+    /**
+     * Upload a file and return a preview-able URL (needPreview=true).
+     * Same as uploadFileAndGetUrl but adds needPreview flag to get a directly viewable URL.
+     */
+    async uploadFileAndGetPreviewUrl(filePath, objectType = "TEMPORARY_MATERIAL_DOC") {
+        let localFilePath = filePath;
+        let isTempFile = false;
+        try {
+            // Handle remote URLs by downloading first
+            if (isRemoteUrl(filePath)) {
+                localFilePath = await downloadToTempFile(filePath);
+                isTempFile = true;
+            }
+            // Read file
+            const fileBuffer = await fs.readFile(localFilePath);
+            const fileName = path.basename(localFilePath);
+            const fileSha256 = calculateSHA256(fileBuffer);
+            const fileSize = fileBuffer.length;
+            // Phase 1: Prepare
+            logger.log(`[XY File Upload] Phase 1 (preview): Prepare upload for ${fileName}`);
+            const prepareResp = await fetch(`${this.baseUrl}/osms/v1/file/manager/prepare`, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "x-uid": this.uid,
+                    "x-api-key": this.apiKey,
+                    "x-request-from": "openclaw",
+                },
+                body: JSON.stringify({
+                    objectType,
+                    fileName,
+                    fileSha256,
+                    fileSize,
+                    fileOwnerInfo: {
+                        uid: this.uid,
+                        teamId: this.uid,
+                    },
+                    useEdge: false,
+                }),
+            });
+            if (!prepareResp.ok) {
+                throw new Error(`Prepare failed: HTTP ${prepareResp.status}`);
+            }
+            const prepareData = await prepareResp.json();
+            if (prepareData.code !== "0") {
+                throw new Error(`Prepare failed: ${prepareData.desc}`);
+            }
+            const { objectId, draftId, uploadInfos } = prepareData;
+            logger.log(`[XY File Upload] Prepare (preview) complete: objectId=${objectId}, draftId=${draftId}`);
+            // Phase 2: Upload
+            logger.log(`[XY File Upload] Phase 2 (preview): Upload file data`);
+            const uploadInfo = uploadInfos[0];
+            const uploadResp = await fetch(uploadInfo.url, {
+                method: uploadInfo.method,
+                headers: uploadInfo.headers,
+                body: fileBuffer,
+            });
+            if (!uploadResp.ok) {
+                throw new Error(`Upload failed: HTTP ${uploadResp.status}`);
+            }
+            logger.log(`[XY File Upload] Upload (preview) complete`);
+            // Phase 3: CompleteAndQuery with needPreview=true
+            logger.log(`[XY File Upload] Phase 3 (preview): CompleteAndQuery with needPreview=true`);
+            const completeResp = await fetch(`${this.baseUrl}/osms/v1/file/manager/completeAndQuery`, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "x-uid": this.uid,
+                    "x-api-key": this.apiKey,
+                    "x-request-from": "openclaw",
+                },
+                body: JSON.stringify({
+                    objectId,
+                    draftId,
+                    needPreview: true,
+                    expireTime: 259200,
+                }),
+            });
+            if (!completeResp.ok) {
+                throw new Error(`CompleteAndQuery (preview) failed: HTTP ${completeResp.status}`);
+            }
+            const completeData = await completeResp.json();
+            const fileUrl = completeData?.fileDetailInfo?.url || "";
+            if (!fileUrl) {
+                throw new Error("No file URL returned from completeAndQuery (preview)");
+            }
+            logger.log(`[XY File Upload] File upload with preview URL successful`);
+            return fileUrl;
+        }
+        catch (error) {
+            logger.error(`[XY File Upload] File upload with preview URL failed for ${filePath}:`, error);
+            throw error;
+        }
+        finally {
+            if (isTempFile) {
+                try {
+                    await fs.unlink(localFilePath);
+                }
+                catch { }
+            }
+        }
+    }
     /**
      * Upload multiple files and return their file IDs.
      */

package/dist/src/formatter.d.ts

@@ -17,6 +17,7 @@ export interface SendA2AResponseParams {
     }>;
     errorCode?: number | string;
     errorMessage?: string;
+    log?: boolean;
 }
 /**
  * Send an A2A artifact update response.
@@ -81,6 +82,35 @@ export interface SendCommandParams {
  * listening in the calling tool works unchanged.
  */
 export declare function sendCommand(params: SendCommandParams): Promise<void>;
+/**
+ * Parameters for sending a card (e.g., HTML H5 card).
+ */
+export interface SendCardParams {
+    config: XYChannelConfig;
+    sessionId: string;
+    taskId: string;
+    messageId: string;
+    /** toolCallId from the tool's execute() — used for cron detection via hook-set Map. */
+    toolCallId?: string;
+    /** When true, the artifact-update is sent with final=true. Default: false. */
+    final?: boolean;
+    /** Array of card data objects to send. */
+    cardsInfo: CardDataObject[];
+}
+/**
+ * Card data object for sending display cards.
+ */
+export interface CardDataObject {
+    cardName: string;
+    cardData: Record<string, any>;
+    displayType: string;
+}
+/**
+ * Send a card (e.g., HTML H5 card) as an artifact update (final=false).
+ *
+ * Cron-aware: same routing logic as sendCommand.
+ */
+export declare function sendCard(params: SendCardParams): Promise<void>;
 /**
  * Parameters for sending a clearContext response.
  */

package/dist/src/formatter.js

@@ -42,7 +42,7 @@ function buildTextPreview(text) {
  * Send an A2A artifact update response.
  */
 export async function sendA2AResponse(params) {
-    const { config, sessionId, taskId, messageId, text, append, final, files, errorCode, errorMessage } = params;
+    const { config, sessionId, taskId, messageId, text, append, final, files, errorCode, errorMessage, log: shouldLog = true } = params;
     const log = logger.withContext(sessionId, taskId);
     // 审批桥接：将 OpenClaw 的审批提示翻译成用户友好的确认文案
     const bridgedText = text === undefined ? text : rewriteOutboundApprovalText(sessionId, text);
@@ -97,11 +97,14 @@ export async function sendA2AResponse(params) {
         taskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
-    // Log complete response body
-    const redactedText = redactSensitiveText(bridgedText ?? "");
-    log.log(`[A2A_RESPONSE] Sending artifact-update, append=${append}, final=${final}, text=${buildTextPreview(redactedText)}, files=${files?.length ?? 0}, sensitive=${containsSensitiveInfo(bridgedText ?? "")}`);
+    if (shouldLog) {
+        const redactedText = redactSensitiveText(bridgedText ?? "");
+        log.log(`[A2A_RESPONSE] Sending artifact-update, append=${append}, final=${final}, text=${buildTextPreview(redactedText)}, files=${files?.length ?? 0}, sensitive=${containsSensitiveInfo(bridgedText ?? "")}`);
+    }
     await wsManager.sendMessage(sessionId, outboundMessage);
-    log.log(`[A2A_RESPONSE] Message sent successfully`);
+    if (shouldLog) {
+        log.log(`[A2A_RESPONSE] Message sent successfully`);
+    }
 }
 /**
  * Send an A2A artifact-update with reasoningText part.
@@ -214,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),
@@ -269,6 +271,59 @@ export async function sendCommand(params) {
     await wsManager.sendMessage(sessionId, outboundMessage);
     log.log(`[A2A_COMMAND] Command sent successfully`);
 }
+/**
+ * Send a card (e.g., HTML H5 card) as an artifact update (final=false).
+ *
+ * Cron-aware: same routing logic as sendCommand.
+ */
+export async function sendCard(params) {
+    const { config, sessionId, taskId, messageId, toolCallId } = params;
+    // ── Cron mode: route through push channel ──────────────────────
+    if (sessionId.startsWith("cron-") || isCronToolCall(toolCallId)) {
+        throw new Error("sendCard does not support cron mode");
+    }
+    // ── Normal mode: WebSocket ─────────────────────────────────────
+    const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+    const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
+    const log = logger.withContext(sessionId, currentTaskId);
+    // Build artifact update with cardsInfo as data
+    const artifact = {
+        taskId: currentTaskId,
+        kind: "artifact-update",
+        append: false,
+        lastChunk: true,
+        final: params.final ?? false,
+        artifact: {
+            artifactId: uuidv4(),
+            parts: [
+                {
+                    kind: "data",
+                    data: {
+                        cardsInfo: params.cardsInfo,
+                    },
+                },
+            ],
+        },
+    };
+    // Build JSON-RPC response
+    const jsonRpcResponse = {
+        jsonrpc: "2.0",
+        id: currentMessageId,
+        result: artifact,
+    };
+    // Send via WebSocket
+    const wsManager = getXYWebSocketManager(config);
+    const outboundMessage = {
+        msgType: "agent_response",
+        agentId: config.agentId,
+        sessionId,
+        taskId: currentTaskId,
+        msgDetail: JSON.stringify(jsonRpcResponse),
+    };
+    log.log(`[A2A_CARD] Sending card`);
+    await wsManager.sendMessage(sessionId, outboundMessage);
+    log.log(`[A2A_CARD] Card sent successfully`);
+}
 /**
  * Send a clearContext response.
  */

package/dist/src/monitor.js

@@ -116,35 +116,45 @@ export async function monitorXYProvider(opts = {}) {
                 }
             };
             // 🔑 核心改造：检测steer模式
-            // 需要提前解析消息以获取sessionId
-            try {
-                const parsed = parseA2AMessage(message);
-                const steerMode = cfg.messages?.queue?.mode === "steer";
-                const hasActiveRun = hasActiveTask(parsed.sessionId);
-                if (steerMode && hasActiveRun) {
-                    // Steer模式且有活跃任务：不入队列，直接并发执行
-                    logger.log(`[MONITOR-HANDLER] STEER MODE: Executing concurrently for messageKey=${messageKey}`);
-                    void task().catch((err) => {
-                        logger.error(`XY gateway: concurrent steer task failed for ${messageKey}: ${String(err)}`);
-                        activeMessages.delete(messageKey);
-                    });
+            // clearContext / tasks/cancel 没有 params，跳过 parseA2AMessage 直接入队
+            const messageMethod = message.method;
+            if (messageMethod === "clearContext" || messageMethod === "clear_context"
+                || messageMethod === "tasks/cancel" || messageMethod === "tasks_cancel") {
+                void enqueue(sessionId, task).catch((err) => {
+                    logger.error(`XY gateway: queue processing failed: ${String(err)}`);
+                    activeMessages.delete(messageKey);
+                });
+            }
+            else {
+                try {
+                    const parsed = parseA2AMessage(message);
+                    const steerMode = cfg.messages?.queue?.mode === "steer";
+                    const hasActiveRun = hasActiveTask(parsed.sessionId);
+                    if (steerMode && hasActiveRun) {
+                        // Steer模式且有活跃任务：不入队列，直接并发执行
+                        logger.log(`[MONITOR-HANDLER] STEER MODE: Executing concurrently for messageKey=${messageKey}`);
+                        void task().catch((err) => {
+                            logger.error(`XY gateway: concurrent steer task failed for ${messageKey}: ${String(err)}`);
+                            activeMessages.delete(messageKey);
+                        });
+                    }
+                    else {
+                        // 正常模式：入队列串行执行
+                        void enqueue(sessionId, task).catch((err) => {
+                            logger.error(`XY gateway: queue processing failed: ${String(err)}`);
+                            activeMessages.delete(messageKey);
+                        });
+                    }
                 }
-                else {
-                    // 正常模式：入队列串行执行
+                catch (parseErr) {
+                    // 解析失败，回退到正常队列模式
+                    logger.error(`[MONITOR-HANDLER] Failed to parse message for steer detection: ${String(parseErr)}`);
                     void enqueue(sessionId, task).catch((err) => {
                         logger.error(`XY gateway: queue processing failed: ${String(err)}`);
                         activeMessages.delete(messageKey);
                     });
                 }
             }
-            catch (parseErr) {
-                // 解析失败，回退到正常队列模式
-                logger.error(`[MONITOR-HANDLER] Failed to parse message for steer detection: ${String(parseErr)}`);
-                void enqueue(sessionId, task).catch((err) => {
-                    logger.error(`XY gateway: queue processing failed: ${String(err)}`);
-                    activeMessages.delete(messageKey);
-                });
-            }
         };
         const connectedHandler = (serverId) => {
             if (!loggedServers.has(serverId)) {
@@ -175,7 +185,9 @@ export async function monitorXYProvider(opts = {}) {
         };
         const selfEvolutionHandler = (context) => {
             logger.log(`[MONITOR] Received self-evolution-event, dispatching to handler...`);
-            handleSelfEvolutionEvent(context, runtime);
+            handleSelfEvolutionEvent(context, cfg).catch((err) => {
+                logger.error(`[MONITOR] Failed to handle self-evolution-event:`, err);
+            });
         };
         const selfEvolutionStateGetHandler = (context) => {
             logger.log(`[MONITOR] Received self-evolution-state-get-event, dispatching to handler...`);

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.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

@@ -46,6 +46,36 @@ export function extractDataEvents(parts) {
         .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;
@@ -64,7 +94,7 @@ export function extractRunCrossTaskContext(parts) {
             isDistributed: context.isDistributed === true,
             networkId,
             isSupportAgent: context.isSupportAgent !== false,
-            fileUrls: Array.isArray(context.fileUrls) ? context.fileUrls.filter((url) => typeof url === "string") : [],
+            sentFiles: normalizeSentFiles(context.sentFiles),
             rawContext: context,
         };
     }
@@ -113,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: 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
@@ -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)