@buz-extensions/buz 1.0.0-beta.13 → 1.0.0-beta.15

package/index.ts

@@ -1,5 +1,4 @@
-import { defineChannelPluginEntry } from "openclaw/plugin-sdk/core";
-import type { ChannelPlugin } from "openclaw/plugin-sdk/line";
+import type { ChannelPlugin, OpenClawPluginApi } from "openclaw/plugin-sdk/line";
 import { emptyPluginConfigSchema, buildChannelConfigSchema } from "openclaw/plugin-sdk/line";
 import { z } from "zod";
 
@@ -179,11 +178,16 @@ export const buzChannelPlugin = {
   },
 } as any;
 
-export default defineChannelPluginEntry({
+const plugin = {
   id: "buz",
   name: "buz Plugin",
   description: "Connects OpenClaw to buz",
-  plugin: buzChannelPlugin as ChannelPlugin,
   configSchema: emptyPluginConfigSchema(),
-  setRuntime: setBuzRuntime,
-});
+  register(api: OpenClawPluginApi) {
+    setBuzRuntime(api.runtime);
+    api.registerChannel({ plugin: buzChannelPlugin as ChannelPlugin });
+  },
+};
+
+export { setBuzRuntime, getBuzRuntime, buzChannelPlugin };
+export default plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buz-extensions/buz",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.15",
   "description": "OpenClaw buz channel plugin",
   "type": "module",
   "license": "MIT",

package/src/inbound.ts

@@ -14,7 +14,13 @@ function resolveDefaultAgentIdCompat(cfg: any): string {
   return firstAgentId || "default";
 }
 
-function resolveStorePath(cfg: any): string {
+function resolveStorePath(cfg: any, agentId: string): string {
+  const core = getBuzRuntime();
+  const resolver = core?.channel?.session?.resolveStorePath;
+  if (typeof resolver === "function") {
+    return resolver(cfg?.session?.store, { agentId });
+  }
+
   const configuredPath = cfg?.session?.storePath || ".openclaw/sessions";
   if (configuredPath.startsWith("/") || configuredPath.startsWith("~")) {
     return configuredPath.replace(/^~/, homedir());
@@ -22,6 +28,27 @@ function resolveStorePath(cfg: any): string {
   return resolve(homedir(), configuredPath);
 }
 
+function buildSessionKey(params: {
+  core: any;
+  agentId: string;
+  accountId: string;
+  isGroup: boolean;
+  conversationId: string;
+}) {
+  const { core, agentId, accountId, isGroup, conversationId } = params;
+  const buildAgentSessionKey = core?.channel?.routing?.buildAgentSessionKey;
+  if (typeof buildAgentSessionKey === "function") {
+    return buildAgentSessionKey({
+      agentId,
+      channel: "buz",
+      accountId,
+      chatType: isGroup ? "group" : "direct",
+      conversationId,
+    });
+  }
+  return `agent:${agentId}:buz:${accountId}:${isGroup ? "group" : "direct"}:${conversationId}`;
+}
+
 export async function handleInboundMessage(ctx: any, inboundMsg: any) {
   console.log("[buz inbound] =========================================");
   console.log("[buz inbound] handleInboundMessage called");
@@ -30,69 +57,79 @@ export async function handleInboundMessage(ctx: any, inboundMsg: any) {
 
   const accountId = ctx.account.accountId;
   const cfg = ctx.cfg;
+  const core = getBuzRuntime().core;
   const agentId = resolveDefaultAgentIdCompat(cfg);
 
   console.log("[buz inbound] accountId:", accountId);
   console.log("[buz inbound] agentId:", agentId);
 
-  const fromTarget =
-    inboundMsg.chat_type === "group"
-      ? `buz:group:${inboundMsg.group_id}:${inboundMsg.sender_id}`
-      : `buz:${inboundMsg.sender_id}`;
+  const isGroup = inboundMsg.chat_type === "group";
+  const senderId = String(inboundMsg.sender_id || "").trim();
+  const senderName = String(inboundMsg.sender_name || inboundMsg.sender_id || "").trim() || undefined;
+  const conversationId = String(isGroup ? inboundMsg.group_id : inboundMsg.sender_id || "").trim();
+  const rawBody = String(inboundMsg.content_text || "");
+  const messageSid = String(inboundMsg.message_id || Date.now().toString());
 
-  const toTarget =
-    inboundMsg.chat_type === "group"
-      ? `buz:group:${inboundMsg.group_id}`
-      : `buz:${inboundMsg.sender_id}`;
-
-  const conversationId =
-    inboundMsg.chat_type === "group" ? inboundMsg.group_id : inboundMsg.sender_id;
+  const fromTarget = isGroup ? `buz:group:${conversationId}:${senderId}` : `buz:${senderId}`;
+  const toTarget = isGroup ? `buz:group:${conversationId}` : `buz:${senderId}`;
+  const sessionKey = buildSessionKey({
+    core,
+    agentId,
+    accountId,
+    isGroup,
+    conversationId,
+  });
 
   console.log("[buz inbound] fromTarget:", fromTarget);
   console.log("[buz inbound] toTarget:", toTarget);
   console.log("[buz inbound] conversationId:", conversationId);
+  console.log("[buz inbound] sessionKey:", sessionKey);
 
-  const ctxPayload = {
-    MessageSid: inboundMsg.message_id || Date.now().toString(),
-    MessageSids: [inboundMsg.message_id || Date.now().toString()],
-    SessionKey: `buz:${accountId}:${conversationId}`,
+  const finalizeInboundContext = core?.channel?.reply?.finalizeInboundContext;
+  const baseCtxPayload = {
+    MessageSid: messageSid,
+    MessageSids: [messageSid],
+    SessionKey: sessionKey,
     ConversationId: conversationId,
     From: fromTarget,
     To: toTarget,
-    Body: inboundMsg.content_text || "",
-    BodyForAgent: inboundMsg.content_text || "",
-    BodyForCommands: inboundMsg.content_text || "",
+    Body: rawBody,
+    BodyForAgent: rawBody,
+    BodyForCommands: rawBody,
     Channel: "buz",
-    SenderName: inboundMsg.sender_name || inboundMsg.sender_id,
+    Provider: "buz",
+    Surface: "buz",
+    OriginatingChannel: "buz",
+    OriginatingTo: toTarget,
+    AccountId: accountId,
+    ChatType: isGroup ? "group" : "direct",
+    SenderName: senderName,
+    SenderId: senderId || undefined,
   };
+  const ctxPayload =
+    typeof finalizeInboundContext === "function"
+      ? finalizeInboundContext(baseCtxPayload)
+      : baseCtxPayload;
 
   console.log("[buz inbound] ctxPayload:", JSON.stringify(ctxPayload, null, 2));
 
-  const storePath = resolveStorePath(cfg);
+  const storePath = resolveStorePath(cfg, agentId);
   console.log("[buz inbound] storePath:", storePath);
-  console.log("[buz inbound] sessionKey:", ctxPayload.SessionKey);
+  console.log("[buz inbound] dispatching via recordInboundSessionAndDispatchReply...");
 
   try {
-    console.log("[buz inbound] dispatching via recordInboundSessionAndDispatchReply...");
-    
-    // Get core from runtime
-    const core = getBuzRuntime().core;
-    
     await recordInboundSessionAndDispatchReply({
-      recordInboundSession: core.channel.session.recordInboundSession,
-      dispatchReplyWithBufferedBlockDispatcher: core.channel.reply.dispatchReplyWithBufferedBlockDispatcher,
-      storePath,
-      ctxPayload,
-      agentId,
+      cfg,
       channel: "buz",
       accountId,
-      deliver: async (payload: any, info: any) => {
-        console.log(
-          "[buz inbound] deliver called:",
-          info?.kind,
-          "text:",
-          payload?.text?.substring?.(0, 50),
-        );
+      agentId,
+      routeSessionKey: sessionKey,
+      storePath,
+      ctxPayload,
+      recordInboundSession: core.channel.session.recordInboundSession,
+      dispatchReplyWithBufferedBlockDispatcher: core.channel.reply.dispatchReplyWithBufferedBlockDispatcher,
+      deliver: async (payload: any) => {
+        console.log("[buz inbound] deliver called text:", payload?.text?.substring?.(0, 50));
         if (!payload?.text) {
           return;
         }
@@ -100,7 +137,7 @@ export async function handleInboundMessage(ctx: any, inboundMsg: any) {
           to: toTarget,
           text: payload.text,
           accountId,
-          replyToId: inboundMsg.message_id,
+          replyToId: messageSid,
         });
         console.log("[buz inbound] reply sent successfully via gRPC");
       },
@@ -114,7 +151,7 @@ export async function handleInboundMessage(ctx: any, inboundMsg: any) {
         disableBlockStreaming: true,
       },
     });
-    
+
     console.log("[buz inbound] message dispatched successfully");
     ctx.log?.info?.(
       `[${accountId}] Successfully dispatched inbound message from ${inboundMsg.sender_id}`,