@ynhcj/xiaoyi 1.9.6 → 1.9.8

package/dist/channel.d.ts

@@ -1,4 +1,4 @@
-import type { ChannelOutboundContext, OutboundDeliveryResult, ChannelGatewayStartAccountContext, ChannelGatewayStopAccountContext, ChannelGatewayProbeAccountContext, ChannelMessagingNormalizeTargetContext, ChannelStatusGetAccountStatusContext } from "openclaw";
+import type { ChannelOutboundContext, OutboundDeliveryResult, ChannelGatewayContext, ChannelMessagingNormalizeTargetContext, ChannelStatusGetAccountStatusContext, OpenClawConfig } from "openclaw";
 import { XiaoYiChannelConfig } from "./types";
 /**
  * Resolved XiaoYi account configuration (single account mode)
@@ -34,8 +34,8 @@ export declare const xiaoyiPlugin: {
      * Config adapter - single account mode
      */
     config: {
-        listAccountIds: (cfg: any) => string[];
-        resolveAccount: (cfg: any, accountId?: string | null) => {
+        listAccountIds: (cfg: OpenClawConfig) => string[];
+        resolveAccount: (cfg: OpenClawConfig, accountId?: string | null) => {
             accountId: string;
             config: {
                 enabled: boolean;
@@ -46,9 +46,12 @@ export declare const xiaoyiPlugin: {
             };
             enabled: boolean;
         };
-        defaultAccountId: (cfg: any) => "default" | undefined;
-        isConfigured: (account: any) => boolean;
-        describeAccount: (account: any) => {
+        defaultAccountId: (cfg: OpenClawConfig) => "default" | undefined;
+        isConfigured: (account: any, cfg: OpenClawConfig) => boolean;
+        isEnabled: (account: any, cfg: OpenClawConfig) => boolean;
+        disabledReason: (account: any, cfg: OpenClawConfig) => string;
+        unconfiguredReason: (account: any, cfg: OpenClawConfig) => string;
+        describeAccount: (account: any, cfg: OpenClawConfig) => {
             accountId: any;
             name: string;
             enabled: any;
@@ -68,12 +71,8 @@ export declare const xiaoyiPlugin: {
      * Gateway adapter - manage connections
      */
     gateway: {
-        startAccount: (ctx: ChannelGatewayStartAccountContext) => Promise<void>;
-        stopAccount: (ctx: ChannelGatewayStopAccountContext) => Promise<void>;
-        probeAccount: (ctx: ChannelGatewayProbeAccountContext) => Promise<{
-            status: string;
-            message: string;
-        }>;
+        startAccount: (ctx: ChannelGatewayContext<ResolvedXiaoYiAccount>) => Promise<void>;
+        stopAccount: (ctx: ChannelGatewayContext<ResolvedXiaoYiAccount>) => Promise<void>;
     };
     /**
      * Messaging adapter - normalize targets

package/dist/channel.js

@@ -70,7 +70,7 @@ exports.xiaoyiPlugin = {
             // Single account mode: always return "default"
             return "default";
         },
-        isConfigured: (account) => {
+        isConfigured: (account, cfg) => {
             // Safely check if all required fields are present and non-empty
             if (!account || !account.config) {
                 return false;
@@ -83,7 +83,16 @@ exports.xiaoyiPlugin = {
             const hasAgentId = typeof config.agentId === 'string' && config.agentId.trim().length > 0;
             return hasWsUrl && hasAk && hasSk && hasAgentId;
         },
-        describeAccount: (account) => ({
+        isEnabled: (account, cfg) => {
+            return account?.enabled !== false;
+        },
+        disabledReason: (account, cfg) => {
+            return "Channel is disabled in configuration";
+        },
+        unconfiguredReason: (account, cfg) => {
+            return "Missing required configuration: wsUrl, ak, sk, or agentId";
+        },
+        describeAccount: (account, cfg) => ({
             accountId: account.accountId,
             name: 'XiaoYi',
             enabled: account.enabled,
@@ -188,8 +197,8 @@ exports.xiaoyiPlugin = {
             console.log("XiaoYi: startAccount() called - START");
             const runtime = (0, runtime_1.getXiaoYiRuntime)();
             const resolvedAccount = ctx.account;
-            // Save handleInboundMessage callback to runtime for later use
-            runtime.setHandleInboundMessage(ctx.handleInboundMessage);
+            // Store the runtime environment for accessing handleInboundMessage
+            runtime.setRuntime(ctx.runtime);
             // Start WebSocket connection (single account mode)
             await runtime.start(resolvedAccount.config);
             // Setup message handler IMMEDIATELY after connection is established
@@ -199,16 +208,18 @@ exports.xiaoyiPlugin = {
             }
             // Setup message handler
             connection.on("message", async (message) => {
+                // Get runtime dynamically to handle module reloads
+                const runtime = (0, runtime_1.getXiaoYiRuntime)();
                 // Store sessionId -> taskId mapping in runtime
                 runtime.setTaskIdForSession(message.sessionId, message.id);
-                // Get handleInboundMessage from runtime
-                const handleInboundMessage = runtime.getHandleInboundMessage();
-                if (!handleInboundMessage) {
-                    console.error("handleInboundMessage not available");
+                // Get handleInboundMessage from runtime environment
+                const runtimeEnv = runtime.getRuntime();
+                if (!runtimeEnv || !runtimeEnv.channel?.reply?.handleInboundMessage) {
+                    console.error("handleInboundMessage not available in runtime");
                     return;
                 }
                 // Convert A2A message to OpenClaw inbound message format
-                await handleInboundMessage({
+                await runtimeEnv.channel.reply.handleInboundMessage({
                     channel: "xiaoyi",
                     accountId: resolvedAccount.accountId,
                     from: message.sender.id,
@@ -229,8 +240,9 @@ exports.xiaoyiPlugin = {
             connection.on("cancel", async (data) => {
                 console.log(`Handling cancel request for task: ${data.taskId}`);
                 // Emit cancel event to OpenClaw runtime
-                if (runtime.getRuntime()) {
-                    runtime.getRuntime().emit("task:cancel", {
+                const runtimeEnv = runtime.getRuntime();
+                if (runtimeEnv) {
+                    runtimeEnv.emit("task:cancel", {
                         channel: "xiaoyi",
                         accountId: resolvedAccount.accountId,
                         taskId: data.taskId,
@@ -247,14 +259,6 @@ exports.xiaoyiPlugin = {
             const runtime = (0, runtime_1.getXiaoYiRuntime)();
             runtime.stop();
         },
-        probeAccount: async (ctx) => {
-            const runtime = (0, runtime_1.getXiaoYiRuntime)();
-            const isConnected = runtime.isConnected();
-            return {
-                status: isConnected ? "healthy" : "unhealthy",
-                message: isConnected ? "Connected" : "Disconnected",
-            };
-        },
     },
     /**
      * Messaging adapter - normalize targets

package/dist/runtime.d.ts

@@ -9,7 +9,6 @@ export declare class XiaoYiRuntime {
     private runtime;
     private config;
     private sessionToTaskIdMap;
-    private handleInboundMessage;
     private instanceId;
     constructor();
     getInstanceId(): string;
@@ -21,14 +20,6 @@ export declare class XiaoYiRuntime {
      * Get OpenClaw runtime
      */
     getRuntime(): any;
-    /**
-     * Set handleInboundMessage callback
-     */
-    setHandleInboundMessage(handler: (message: any) => Promise<void>): void;
-    /**
-     * Get handleInboundMessage callback
-     */
-    getHandleInboundMessage(): ((message: any) => Promise<void>) | null;
     /**
      * Start connection (single account mode)
      */

package/dist/runtime.js

@@ -14,7 +14,6 @@ class XiaoYiRuntime {
         this.runtime = null;
         this.config = null;
         this.sessionToTaskIdMap = new Map(); // Map sessionId to taskId
-        this.handleInboundMessage = null; // Store handleInboundMessage callback
         this.instanceId = `runtime_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
         console.log(`XiaoYi: Created new runtime instance: ${this.instanceId}`);
     }
@@ -33,20 +32,6 @@ class XiaoYiRuntime {
     getRuntime() {
         return this.runtime;
     }
-    /**
-     * Set handleInboundMessage callback
-     */
-    setHandleInboundMessage(handler) {
-        console.log(`XiaoYi: [${this.instanceId}] Setting handleInboundMessage callback`);
-        this.handleInboundMessage = handler;
-    }
-    /**
-     * Get handleInboundMessage callback
-     */
-    getHandleInboundMessage() {
-        console.log(`XiaoYi: [${this.instanceId}] Getting handleInboundMessage callback, available:`, !!this.handleInboundMessage);
-        return this.handleInboundMessage;
-    }
     /**
      * Start connection (single account mode)
      */
@@ -85,9 +70,8 @@ class XiaoYiRuntime {
             this.connection = null;
             console.log("XiaoYi channel stopped");
         }
-        // Clear session mappings and handlers
+        // Clear session mappings
         this.sessionToTaskIdMap.clear();
-        this.handleInboundMessage = null;
     }
     /**
      * Get WebSocket manager
@@ -132,8 +116,12 @@ const GLOBAL_KEY = Symbol.for('__xiaoyi_runtime_instance__');
 function getXiaoYiRuntime() {
     const g = global;
     if (!g[GLOBAL_KEY]) {
+        console.log("XiaoYi: Creating NEW runtime instance (global storage)");
         g[GLOBAL_KEY] = new XiaoYiRuntime();
     }
+    else {
+        console.log(`XiaoYi: Reusing EXISTING runtime instance: ${g[GLOBAL_KEY].getInstanceId()}`);
+    }
     return g[GLOBAL_KEY];
 }
 function setXiaoYiRuntime(runtime) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi",
-  "version": "1.9.6",
+  "version": "1.9.8",
   "description": "XiaoYi channel plugin for OpenClaw",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",