@xiaozhi-pro/openclaw-plugin 1.0.9 → 1.0.10

package/dist/api.d.ts

@@ -1,2 +1,2 @@
 export { xiaozhiProPlugin } from "./src/channel.js";
-export { setXiaozhiProRuntime, getXiaozhiProRuntime } from "./src/runtime.js";
+export { setXiaozhiProRuntime, getXiaozhiProRuntime, tryGetXiaozhiProRuntime } from "./src/runtime.js";

package/dist/api.js

@@ -1,2 +1,2 @@
 export { xiaozhiProPlugin } from "./src/channel.js";
-export { setXiaozhiProRuntime, getXiaozhiProRuntime } from "./src/runtime.js";
+export { setXiaozhiProRuntime, getXiaozhiProRuntime, tryGetXiaozhiProRuntime } from "./src/runtime.js";

package/dist/src/channel.js

@@ -10,7 +10,7 @@ import { createEmptyChannelDirectoryAdapter } from "openclaw/plugin-sdk/director
 import { createHybridChannelConfigAdapter, createScopedDmSecurityResolver, } from "openclaw/plugin-sdk/channel-config-helpers";
 import { formatAllowFromLowercase } from "openclaw/plugin-sdk/allow-from";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
-import { getXiaozhiProRuntime } from "./runtime.js";
+import { tryGetXiaozhiProRuntime } from "./runtime.js";
 import { listAccountIds, resolveAccount, } from "./accounts.js";
 import { XiaozhiProConfigSchema } from "./config-schema.js";
 import { connectXiaozhiProWs, sendXiaozhiProWsMessage, } from "./ws-client.js";
@@ -68,7 +68,7 @@ export const xiaozhiProPlugin = createChatChannelPlugin({
         // ============================================================================
         gateway: {
             startAccount: async (ctx) => {
-                const { cfg, accountId, log, abortSignal } = ctx;
+                const { cfg, accountId, log, abortSignal, channelRuntime } = ctx;
                 const account = resolveAccount(cfg, accountId);
                 if (!account.token) {
                     log?.warn?.("token 未配置，跳过启动");
@@ -85,6 +85,8 @@ export const xiaozhiProPlugin = createChatChannelPlugin({
                             account,
                             accountId,
                             msg,
+                            cfg,
+                            channelRuntime: channelRuntime ?? undefined,
                         });
                     },
                 });
@@ -122,7 +124,7 @@ export const xiaozhiProPlugin = createChatChannelPlugin({
             resolvePolicy: (account) => account.dmPolicy,
             resolveAllowFrom: (account) => account.allowedUserIds,
             policyPathSuffix: "dmPolicy",
-            defaultPolicy: "allowlist",
+            defaultPolicy: "open",
         }),
     },
     // 出站适配器（用于 agent 主动推送等场景）
@@ -148,22 +150,24 @@ async function dispatchXiaozhiProInboundEvent(params) {
     if (isDuplicateMessage(params.msg.messageId)) {
         return;
     }
-    const rt = getXiaozhiProRuntime();
-    if (!rt.channel?.inbound?.run || !rt.channel?.routing?.resolveAgentRoute) {
+    // 优先使用 gateway ctx 注入的 channelRuntime，后备使用全局 runtime store
+    const globalRt = tryGetXiaozhiProRuntime();
+    const channelRt = params.channelRuntime ?? globalRt?.channel;
+    if (!channelRt?.inbound?.run || !channelRt?.routing?.resolveAgentRoute) {
         console.error("[xiaozhi-pro] 运行时未就绪，丢弃消息。请确认插件已正确注册并重启服务。");
         return;
     }
-    const currentCfg = rt.config.current();
+    const currentCfg = params.cfg;
     // 1. 解析路由（哪个 agent 处理这个对话）
-    const route = rt.channel.routing.resolveAgentRoute({
+    const route = channelRt.routing.resolveAgentRoute({
         cfg: currentCfg,
         channel: CHANNEL_ID,
         accountId: params.accountId,
         peer: { kind: "direct", id: params.msg.senderId },
     });
-    const sessionKey = `xiaozhi-pro:${route.agentId}:${params.msg.senderId}`;
+    const sessionKey = route.sessionKey;
     // 2. 通过 inbound.run() 分发给 agent
-    await rt.channel.inbound.run({
+    await channelRt.inbound.run({
         channel: CHANNEL_ID,
         accountId: params.accountId,
         raw: params.msg,
@@ -179,7 +183,7 @@ async function dispatchXiaozhiProInboundEvent(params) {
             }),
             // resolveTurn：构建完整上下文 + 回复投递回调
             resolveTurn: async (input) => {
-                const msgCtx = rt.channel.inbound.buildContext({
+                const msgCtx = channelRt.inbound.buildContext({
                     channel: CHANNEL_ID,
                     accountId: params.accountId,
                     timestamp: input.timestamp,
@@ -202,17 +206,17 @@ async function dispatchXiaozhiProInboundEvent(params) {
                         bodyForAgent: input.textForAgent,
                     },
                 });
-                const storePath = rt.channel.session.resolveStorePath(currentCfg.session?.store, { agentId: route.agentId });
+                const storePath = channelRt.session.resolveStorePath(currentCfg.session?.store, { agentId: route.agentId });
                 return {
                     cfg: currentCfg,
                     channel: CHANNEL_ID,
                     accountId: params.accountId,
                     agentId: route.agentId,
-                    routeSessionKey: route.sessionKey,
+                    routeSessionKey: sessionKey,
                     storePath,
                     ctxPayload: msgCtx,
-                    recordInboundSession: rt.channel.session.recordInboundSession,
-                    dispatchReplyWithBufferedBlockDispatcher: rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher,
+                    recordInboundSession: channelRt.session.recordInboundSession,
+                    dispatchReplyWithBufferedBlockDispatcher: channelRt.reply.dispatchReplyWithBufferedBlockDispatcher,
                     delivery: {
                         durable: () => ({ to: params.msg.senderId }),
                         // agent 回复通过这个回调投递 → 发 WS 回小智Pro

package/dist/src/runtime.d.ts

@@ -1,3 +1,3 @@
 import { type PluginRuntime } from "openclaw/plugin-sdk/runtime-store";
-declare const setXiaozhiProRuntime: (next: PluginRuntime) => void, getXiaozhiProRuntime: () => PluginRuntime;
-export { setXiaozhiProRuntime, getXiaozhiProRuntime };
+declare const setXiaozhiProRuntime: (next: PluginRuntime) => void, getXiaozhiProRuntime: () => PluginRuntime, tryGetXiaozhiProRuntime: () => PluginRuntime | null;
+export { setXiaozhiProRuntime, getXiaozhiProRuntime, tryGetXiaozhiProRuntime };

package/dist/src/runtime.js

@@ -1,7 +1,7 @@
 // 小智Pro插件运行时存储
 import { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store";
-const { setRuntime: setXiaozhiProRuntime, getRuntime: getXiaozhiProRuntime } = createPluginRuntimeStore({
+const { setRuntime: setXiaozhiProRuntime, getRuntime: getXiaozhiProRuntime, tryGetRuntime: tryGetXiaozhiProRuntime } = createPluginRuntimeStore({
     pluginId: "xiaozhi-pro",
     errorMessage: "小智Pro插件运行时未初始化 - 插件未注册",
 });
-export { setXiaozhiProRuntime, getXiaozhiProRuntime };
+export { setXiaozhiProRuntime, getXiaozhiProRuntime, tryGetXiaozhiProRuntime };

package/dist/src/ws-client.js

@@ -10,6 +10,8 @@ export function connectXiaozhiProWs(config) {
     let reconnectTimer = null;
     let reconnectAttempts = 0;
     let authFatal = false;
+    // 记录 auth_ok 返回的 user_id，作为 sender_id 的后备
+    let authenticatedUserId = null;
     const MAX_RECONNECT_DELAY = 60_000;
     function connect() {
         if (abortSignal.aborted || authFatal)
@@ -20,14 +22,15 @@ export function connectXiaozhiProWs(config) {
             log?.info?.(`[xiaozhi-pro] WS 已连接: ${url}`);
             // 发送 auth 消息（和小智Pro服务端协议对齐）
             const token = account.token;
-            log?.info?.(`[xiaozhi-pro] 发送认证: token=${token} (长度=${token.length})`);
+            log?.info?.(`[xiaozhi-pro] 发送认证: token=${token.length > 8 ? token.slice(0, 4) + "****" + token.slice(-4) : "****"} (长度=${token.length})`);
             ws.send(JSON.stringify({ type: "auth", token }));
         });
         ws.on("message", (raw) => {
             try {
                 const data = JSON.parse(raw.toString());
                 if (data.type === "auth_ok") {
-                    log?.info?.(`[xiaozhi-pro] 认证成功: user_id=${data.user_id}`);
+                    authenticatedUserId = data.user_id ?? null;
+                    log?.info?.(`[xiaozhi-pro] 认证成功: user_id=${authenticatedUserId}`);
                     return;
                 }
                 if (data.type === "auth_fail") {
@@ -49,15 +52,16 @@ export function connectXiaozhiProWs(config) {
                 // 服务端推送的入站消息
                 if (data.type === "message" || data.type === "response") {
                     const text = data.text ?? "";
-                    const senderId = data.sender_id ?? data.user_id ?? "";
+                    // 优先用消息中的 sender_id，后备用 auth_ok 的 user_id
+                    const senderId = data.sender_id ?? data.user_id ?? authenticatedUserId ?? "";
                     log?.info?.(`[xiaozhi-pro] 收到消息: type=${data.type}, sender=${senderId}, text=${text.slice(0, 200)}`);
                     // 入站消息，分发给 agent
                     onMessage({
                         type: "message",
-                        senderId: data.sender_id ?? data.user_id ?? "",
+                        senderId,
                         text: data.text ?? "",
                         chatType: data.chat_type ?? "dm",
-                        chatId: data.chat_id ?? "",
+                        chatId: data.chat_id ?? senderId,
                         messageId: data.message_id ?? `msg-${Date.now()}`,
                         timestamp: data.timestamp ?? Date.now(),
                     }).catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaozhi-pro/openclaw-plugin",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "小智Pro (XiaoZhi Pro) channel plugin for OpenClaw via WebSocket",
   "type": "module",
   "main": "./dist/index.js",