@ynhcj/xiaoyi-channel 0.0.203-beta → 0.0.205-beta

package/dist/src/monitor.js

@@ -10,8 +10,9 @@ import { handleLoginTokenEvent } from "./login-token-handler.js";
 import { handleCronQueryEvent } from "./cron-query-handler.js";
 import { handleMemoryQueryEvent } from "./memory-query-handler.js";
 import { cleanupStaleTempFiles } from "./reply-dispatcher.js";
-import { cleanupStaleSessions, getActiveSessionCount, cleanupAllSessions } from "./tools/session-manager.js";
 import { logger } from "./utils/logger.js";
+import { XYFileUploadService } from "./file-upload.js";
+import { startLogReporter } from "./log-reporter/index.js";
 /**
  * Per-session serial queue that ensures messages from the same session are processed
  * in arrival order while allowing different sessions to run concurrently.
@@ -75,6 +76,8 @@ export async function monitorXYProvider(opts = {}) {
     let globalDispatchInitGate = Promise.resolve();
     // Health check interval
     let healthCheckInterval = null;
+    // Log reporter stop handle
+    let stopLogReporter = null;
     return new Promise((resolve, reject) => {
         // Event handlers (defined early so they can be referenced in cleanup)
         const messageHandler = (message, sessionId, serverId) => {
@@ -214,6 +217,11 @@ export async function monitorXYProvider(opts = {}) {
         };
         const cleanup = () => {
             logger.log("XY gateway: cleaning up...");
+            // Stop log reporter
+            if (stopLogReporter) {
+                stopLogReporter();
+                stopLogReporter = null;
+            }
             // 🔍 Diagnose before cleanup
             logger.log("[DIAGNOSTICS] Checking WebSocket managers before cleanup...");
             diagnoseAllManagers();
@@ -239,8 +247,7 @@ export async function monitorXYProvider(opts = {}) {
             wsManager.disconnect();
             // ✅ Remove manager from cache to prevent reusing dirty state
             removeXYWebSocketManager(account);
-            // Clean up all active sessions
-            cleanupAllSessions();
+            // Session context is ALS-scoped now — nothing global to clean up.
             loggedServers.clear();
             activeMessages.clear();
             logger.log(`[MONITOR-HANDLER] Cleanup complete, cleared active messages and sessions`);
@@ -309,12 +316,7 @@ export async function monitorXYProvider(opts = {}) {
             if (cleaned > 0) {
                 logger.log(`[HEALTH CHECK] Auto-cleaned ${cleaned} manager(s) with orphan connections`);
             }
-            // Cleanup stale sessions (older than 10min TTL)
-            const cleanedSessions = cleanupStaleSessions();
-            const remainingSessions = getActiveSessionCount();
-            if (cleanedSessions > 0 || remainingSessions > 0) {
-                logger.log(`[HEALTH CHECK] Sessions: cleaned=${cleanedSessions}, active=${remainingSessions}`);
-            }
+            // Session context is ALS-scoped — no global session cleanup needed.
             // Cleanup stale temp files (older than 24 hours)
             void cleanupStaleTempFiles();
         }, 6 * 60 * 60 * 1000); // 6 hours
@@ -322,6 +324,15 @@ export async function monitorXYProvider(opts = {}) {
         wsManager.connect()
             .then(() => {
             logger.log("XY gateway: started successfully");
+            // Start log reporter (independent periodic scanner + uploader)
+            startLogReporter({
+                configPath: "/home/ynhcj/.openclaw/log-reporter-config.json",
+                uploadService: new XYFileUploadService(account.fileUploadUrl, account.apiKey, account.uid),
+            }).then((stop) => {
+                stopLogReporter = stop;
+            }).catch((err) => {
+                logger.warn(`Log reporter not started: ${String(err)}`);
+            });
         })
             .catch((err) => {
             // Connection failed but don't reject - continue monitoring for reconnection

package/dist/src/outbound.js

@@ -1,3 +1,7 @@
+// Outbound adapter for XY channel
+// Following feishu/outbound.ts pattern
+// NOTE: Using any for compatibility with SDK 2026.3.24
+import os from "os";
 import { resolveXYConfig } from "./config.js";
 import { XYFileUploadService } from "./file-upload.js";
 import { XYPushService } from "./push.js";
@@ -219,6 +223,7 @@ export const xyOutbound = {
                     },
                 },
                 error: { code: 0 },
+                hostname: os.hostname(),
             }),
         };
         // Get WebSocket manager and send message

package/dist/src/provider.js

@@ -128,6 +128,7 @@ function createRetryingStream(createStream, cronJob) {
             let hasContent = false;
             const buffer = [];
             let errorResult = null;
+            const fullResponseEvents = [];
             for await (const event of stream) {
                 const isContent = CONTENT_EVENT_TYPES.has(event.type);
                 if (!hasContent && !isContent) {
@@ -150,9 +151,14 @@ function createRetryingStream(createStream, cronJob) {
                     if (!hasContent) {
                         logger.log("[xiaoyiprovider] first content event received, switching to streaming mode");
                         hasContent = true;
-                        for (const b of buffer)
+                        for (const b of buffer) {
+                            if (CONTENT_EVENT_TYPES.has(b.type))
+                                fullResponseEvents.push(b);
                             yield b;
+                        }
                     }
+                    if (isContent)
+                        fullResponseEvents.push(event);
                     // IMPORTANT: resolve result() BEFORE yielding terminal events to avoid deadlock.
                     // The SDK calls result() when it sees done/error — if we yield first, the generator
                     // suspends and can never reach resolve, causing a permanent deadlock.
@@ -398,6 +404,10 @@ function trimUserMetadata(text) {
  * bot.ts stores them as MessageSid = "xiaoyi_taskId_deviceType".
  * The "xiaoyi_" prefix ensures extraction only happens for messages
  * routed through xiaoyi-channel, not other channels sharing the provider.
+ *
+ * This is the most reliable source during steer scenarios: ALS still holds
+ * the first message's taskId, but the text extraction sees the latest
+ * injected user message which carries the updated taskId.
  */
 function extractA2AFromConversationInfo(text) {
     const match = text.match(/Conversation info \(untrusted metadata\):\n```json\n([\s\S]*?)\n```/);
@@ -424,7 +434,12 @@ export const xiaoyiProvider = {
      * xiaoyiprovider as long as the provider has a configured baseUrl.
      */
     resolveDynamicModel: (ctx) => {
-        const baseUrl = ctx.providerConfig?.baseUrl;
+        // providerConfig from models.providers.xiaoyiprovider is preferred;
+        // fall back to zai baseUrl when config-driven provider setup is unavailable.
+        let baseUrl = ctx.providerConfig?.baseUrl;
+        if (!baseUrl || typeof baseUrl !== "string") {
+            baseUrl = ctx.config?.models?.providers?.zai?.baseUrl;
+        }
         if (!baseUrl || typeof baseUrl !== "string")
             return null;
         return {
@@ -433,7 +448,7 @@ export const xiaoyiProvider = {
             api: ctx.providerConfig?.api ?? "openai-completions",
             provider: "xiaoyiprovider",
             baseUrl,
-            reasoning: false,
+            reasoning: true,
             input: ["text"],
             cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
             contextWindow: 256_000,
@@ -477,6 +492,8 @@ export const xiaoyiProvider = {
             // ── Extract A2A taskId/deviceType from Conversation info ──
             // bot.ts stores taskId_deviceType as MessageSid, which the framework
             // renders as message_id in the Conversation info JSON block.
+            // This is the priority source: it reflects the latest user message
+            // even during steer when ALS still holds the first message's taskId.
             let extractedTaskId = null;
             let extractedDeviceType = null;
             if (context.messages) {
@@ -502,8 +519,9 @@ export const xiaoyiProvider = {
             // ── Build dynamic headers ────────────────────────────
             // Priority:
             //   1. Cron-triggered: uid → cronUuid, with cron-specific headers
-            //   2. Xiaoyi A2A: taskId extracted from Conversation info (xiaoyi_ prefix)
-            //   3. UID-based fallback: sha256(uid).hex[:32]_timestamp
+            //   2. Xiaoyi A2A: taskId from Conversation info text (latest msg, steer-safe)
+            //   3. ALS fallback: rawTaskId from AsyncLocalStorage
+            //   4. UID-based fallback: sha256(uid).hex[:32]_timestamp
             const isCron = isCronTriggered(context.messages);
             if (isCron) {
                 // fire 期 jobId 桥：把首条消息 `[cron:<jobId> ...]` 解析出的真实 jobId
@@ -533,6 +551,7 @@ export const xiaoyiProvider = {
                     dynamicHeaders["x-cron-title"] = encodeURIComponent(cronTitle);
                 if (context.messages?.length === 1)
                     dynamicHeaders["x-cron-flag"] = "begin";
+                logger.log(`[ALS-PROOF] provider headers source=cron`);
             }
             else if (extractedTaskId) {
                 const sessionId = extractedTaskId.split("&")[0];
@@ -540,14 +559,31 @@ export const xiaoyiProvider = {
                 dynamicHeaders[HEADER_TRACE_ID] = extractedTaskId;
                 dynamicHeaders[HEADER_SESSION_ID] = sessionId;
                 dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
+                logger.log(`[ALS-PROOF] provider headers source=text-extract traceId=${extractedTaskId} sessionId=${sessionId} interactionId=${interactionId}`);
             }
             else {
-                const fallbackPrefix = ctx.extraParams?.[FALLBACK_PREFIX_KEY];
-                if (typeof fallbackPrefix === "string") {
-                    const fallbackValue = `${fallbackPrefix}_${Date.now()}`;
-                    dynamicHeaders[HEADER_TRACE_ID] = fallbackValue;
-                    dynamicHeaders[HEADER_SESSION_ID] = fallbackValue;
-                    dynamicHeaders[HEADER_INTERACTION_ID] = fallbackValue;
+                // ALS fallback: rawTaskId from the per-turn AsyncLocalStorage scope.
+                // Text extraction (above) is preferred because during steer the ALS
+                // scope may still hold the first message's taskId.
+                const als = getCurrentSessionContext();
+                const rawTaskId = als?.taskId;
+                if (rawTaskId) {
+                    const sessionId = rawTaskId.split("&")[0];
+                    const interactionId = rawTaskId.split("&")[1] ?? "";
+                    dynamicHeaders[HEADER_TRACE_ID] = rawTaskId;
+                    dynamicHeaders[HEADER_SESSION_ID] = sessionId;
+                    dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
+                    logger.log(`[ALS-PROOF] provider headers source=ALS traceId=${rawTaskId} sessionId=${sessionId} interactionId=${interactionId}`);
+                }
+                else {
+                    const fallbackPrefix = ctx.extraParams?.[FALLBACK_PREFIX_KEY];
+                    if (typeof fallbackPrefix === "string") {
+                        const fallbackValue = `${fallbackPrefix}_${Date.now()}`;
+                        dynamicHeaders[HEADER_TRACE_ID] = fallbackValue;
+                        dynamicHeaders[HEADER_SESSION_ID] = fallbackValue;
+                        dynamicHeaders[HEADER_INTERACTION_ID] = fallbackValue;
+                    }
+                    logger.log(`[ALS-PROOF] provider headers source=uid-fallback (ALS miss)`);
                 }
             }
             // 记录输入
@@ -560,8 +596,7 @@ export const xiaoyiProvider = {
             if (context.systemPrompt) {
                 logger.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
             }
-            // deviceType: prefer value extracted from Conversation info,
-            // then ALS fallback.
+            // deviceType: prefer text-extracted value, ALS as fallback.
             const deviceType = extractedDeviceType
                 ?? getCurrentSessionContext()?.deviceType;
             // app_ver and sdk_api_version from session context (ALS)
@@ -618,7 +653,7 @@ export const xiaoyiProvider = {
                     deviceSection += `当前用户小艺APP版本是${appVer}\n`;
                 }
                 if (sdkApiVersion) {
-                    deviceSection += `当前用户系统软件API版本是${sdkApiVersion}\n`;
+                    deviceSection += `当前用户系统Rom版本是${sdkApiVersion}\n`;
                 }
                 deviceSection += `You 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;

package/dist/src/reply-dispatcher.d.ts

@@ -9,6 +9,9 @@ export interface CreateXYReplyDispatcherParams {
     steerState: {
         steered: boolean;
     };
+    /** Called at end of onIdle, after final frame is sent. openclaw's waitForIdle() does
+     *  not await the async onIdle, so cleanup must happen inside onIdle itself. */
+    onIdleComplete?: () => void | Promise<void>;
 }
 /**
  * 清理 /tmp/xy_channel 目录中超过 24 小时的旧文件