@newbase-clawchat/openclaw-clawchat 2026.4.24 → 2026.4.30

package/index.ts

@@ -1,11 +1,11 @@
 // import { defineChannelPluginEntry } from "openclaw/plugin-sdk/core";
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { openclawClawlingPlugin } from "./src/channel.ts";
+import { registerOpenclawClawlingCommands } from "./src/commands.ts";
 import { setOpenclawClawlingRuntime } from "./src/runtime.ts";
 import { registerOpenclawClawlingTools } from "./src/tools.ts";
 import { openclawClawlingConfigSchema } from "./src/config.ts";
 
-
 export default {
   id: "openclaw-clawchat",
   name: "Clawling Chat",
@@ -14,6 +14,7 @@ export default {
   register(api: OpenClawPluginApi) {
     setOpenclawClawlingRuntime(api.runtime);
     api.registerChannel({ plugin: openclawClawlingPlugin });
+    registerOpenclawClawlingCommands(api);
     registerOpenclawClawlingTools(api);
   }
 }

package/openclaw.plugin.json

@@ -1,6 +1,26 @@
 {
   "id": "openclaw-clawchat",
   "channels": ["openclaw-clawchat"],
+  "skills": ["./skills"],
+  "activation": {
+    "onStartup": true,
+    "onChannels": ["openclaw-clawchat"],
+    "onCommands": ["clawchat-login"]
+  },
+  "commandAliases": [
+    { "name": "clawchat-login", "kind": "runtime-slash" }
+  ],
+  "contracts": {
+    "tools": [
+      "clawchat_activate",
+      "clawchat_get_account_profile",
+      "clawchat_get_user_profile",
+      "clawchat_list_account_friends",
+      "clawchat_update_account_profile",
+      "clawchat_upload_avatar_image",
+      "clawchat_upload_media_file"
+    ]
+  },
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
@@ -9,8 +29,10 @@
       "websocketUrl": { "type": "string" },
       "baseUrl": { "type": "string" },
       "token": { "type": "string" },
+      "refreshToken": { "type": "string" },
       "userId": { "type": "string" },
       "replyMode": { "type": "string", "enum": ["static", "stream"] },
+      "groupMode": { "type": "string", "enum": ["mention", "all"] },
       "forwardThinking": { "type": "boolean" },
       "forwardToolCalls": { "type": "boolean" },
       "stream": {
@@ -28,7 +50,8 @@
         "properties": {
           "initialDelay": { "type": "integer", "minimum": 100 },
           "maxDelay": { "type": "integer", "minimum": 100 },
-          "jitterRatio": { "type": "number", "minimum": 0 }
+          "jitterRatio": { "type": "number", "minimum": 0 },
+          "maxRetries": { "type": "integer", "minimum": 0 }
         }
       },
       "heartbeat": {
@@ -48,5 +71,62 @@
         }
       }
     }
+  },
+  "channelConfigs": {
+    "openclaw-clawchat": {
+      "label": "Clawling Chat",
+      "description": "Clawling Protocol v2 over WebSocket (chat-sdk).",
+      "schema": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "enabled": { "type": "boolean" },
+          "websocketUrl": { "type": "string" },
+          "baseUrl": { "type": "string" },
+          "token": { "type": "string" },
+          "refreshToken": { "type": "string" },
+          "userId": { "type": "string" },
+          "replyMode": { "type": "string", "enum": ["static", "stream"] },
+          "groupMode": { "type": "string", "enum": ["mention", "all"] },
+          "forwardThinking": { "type": "boolean" },
+          "forwardToolCalls": { "type": "boolean" },
+          "stream": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "flushIntervalMs": { "type": "integer", "minimum": 10 },
+              "minChunkChars": { "type": "integer", "minimum": 1 },
+              "maxBufferChars": { "type": "integer", "minimum": 1 }
+            }
+          },
+          "reconnect": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "initialDelay": { "type": "integer", "minimum": 100 },
+              "maxDelay": { "type": "integer", "minimum": 100 },
+              "jitterRatio": { "type": "number", "minimum": 0 },
+              "maxRetries": { "type": "integer", "minimum": 0 }
+            }
+          },
+          "heartbeat": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "interval": { "type": "integer", "minimum": 1000 },
+              "timeout": { "type": "integer", "minimum": 1000 }
+            }
+          },
+          "ack": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "timeout": { "type": "integer", "minimum": 100 },
+              "autoResendOnTimeout": { "type": "boolean" }
+            }
+          }
+        }
+      }
+    }
   }
 }

package/package.json

@@ -1,15 +1,23 @@
 {
   "name": "@newbase-clawchat/openclaw-clawchat",
-  "version": "2026.4.24",
+  "version": "2026.4.30",
   "description": "OpenClaw ClawChat channel plugin",
   "files": [
+    "dist",
     "index.ts",
     "src",
+    "skills",
     "openclaw.plugin.json",
     "README.md"
   ],
   "type": "module",
   "scripts": {
+    "build": "tsc -p tsconfig.build.json",
+    "test": "vitest",
+    "test:e2e:install-clawchat-plugin": "bash .e2e/run-install-clawchat-plugin-e2e.sh",
+    "test:e2e:install-clawchat-plugin:smoke": "node --test .e2e/run-install-clawchat-plugin-e2e.test.mjs",
+    "dev:openclaw-source": "test -d tmp/openclaw || git clone --depth=1 https://github.com/openclaw/openclaw.git tmp/openclaw",
+    "prepack": "npm run build",
     "typecheck": "tsc --noEmit",
     "prepublishOnly": "npm run typecheck",
     "release": "npm run prepublishOnly && npm publish"
@@ -20,11 +28,12 @@
   },
   "devDependencies": {
     "@types/node": "^25.5.0",
-    "openclaw": "^2026.3.23",
-    "typescript": "^5.4.0"
+    "openclaw": "2026.4.29",
+    "typescript": "^5.4.0",
+    "vitest": "^4.1.5"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.3.23"
+    "openclaw": "^2026.4.29"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -38,19 +47,22 @@
     "extensions": [
       "./index.ts"
     ],
+    "runtimeExtensions": [
+      "./dist/index.js"
+    ],
     "channel": {
       "id": "openclaw-clawchat",
-      "label": "openclaw-clawchat",
-      "selectionLabel": "openclaw-clawchat",
+      "label": "Clawling Chat",
+      "selectionLabel": "Clawling Chat",
       "docsPath": "/channels/openclaw-clawchat",
       "docsLabel": "openclaw-clawchat",
-      "blurb":  "OpenClaw ClawChat channel plugin",
-      "order": 70
+      "blurb": "Clawling Protocol v2 over WebSocket (chat-sdk).",
+      "order": 110
     },
     "install": {
       "npmSpec": "@newbase-clawchat/openclaw-clawchat",
       "defaultChoice": "npm",
-      "minHostVersion": ">=2026.3.23"
+      "minHostVersion": ">=2026.4.29"
     }
   }
 }

package/skills/clawchat-account-tools/SKILL.md

@@ -0,0 +1,26 @@
+---
+name: clawchat-account-tools
+description: Use when a user asks to view or update the configured ClawChat account profile, inspect a ClawChat user profile, list account friends, change avatar/bio/nickname, or upload/share ClawChat media files.
+---
+
+# ClawChat Account Tools
+
+Use these tools for ClawChat account/profile, friends, avatar, and media-file requests. The configured ClawChat account is not the OpenClaw agent persona.
+
+## Tool Selection
+
+| User intent | Tool | Notes |
+| --- | --- | --- |
+| View the configured ClawChat account profile | `clawchat_get_account_profile` | Returns account user id, nickname/display name, avatar, and bio. |
+| Inspect another ClawChat user profile | `clawchat_get_user_profile` | Requires a concrete `userId`; do not infer it from nicknames. |
+| List account friends or contacts | `clawchat_list_account_friends` | Use `page` and `pageSize` when paging through results. |
+| Update account nickname, avatar URL, or bio | `clawchat_update_account_profile` | Pass at least one of `nickname`, `avatar_url`, or `bio`. |
+| Upload a local avatar image | `clawchat_upload_avatar_image` | Returns a hosted avatar URL; then call `clawchat_update_account_profile` with `avatar_url` to set it. |
+| Upload/share a non-avatar local media file | `clawchat_upload_media_file` | Returns a public URL. If the file should be sent in chat, use the message tool with `media`. |
+
+## Boundaries
+
+- Do not treat ClawChat account profile changes as OpenClaw agent persona changes.
+- Use avatar upload only for account avatar/profile-picture changes.
+- Use media upload for non-avatar local files.
+- For activation, login, or invite-code requests, use the activation skill instead.

package/skills/clawchat-activate/SKILL.md

@@ -0,0 +1,47 @@
+---
+name: clawchat-activate
+description: |
+  Activate or log in OpenClaw ClawChat. Use when the user asks to activate, connect, bind, or log in ClawChat, or provides a ClawChat invite code (six uppercase letters/digits, e.g. A1B2C3).
+---
+
+# ClawChat Activation
+
+Activation should use the `clawchat_activate` tool when that tool is available. The tool runs the same invite-code login runtime as OpenClaw channel login and persists credentials into `channels.openclaw-clawchat`.
+
+If the tool is not available because the Gateway has not loaded this plugin yet, fall back to OpenClaw channel login. Do not edit config files manually and do not try to execute slash commands from this skill.
+
+## Workflow
+
+1. Check whether the user is trying to activate or log in ClawChat.
+2. If `clawchat_activate` is available and the invite code is known, call it with the invite code.
+3. If the invite code is not known, ask the user for it before calling `clawchat_activate`.
+4. If `clawchat_activate` is not available, execute the channel login command:
+
+```bash
+openclaw channels login --channel openclaw-clawchat
+```
+5. Do not append the invite code to the command; `openclaw channels login` has no code argument.
+6. When the command prompts for an invite code, provide the user's invite code if one was already present, otherwise ask the user for it.
+7. After activation succeeds, rely on OpenClaw's `channels.*` config hot reload when the plugin is already loaded. Verify channel status if available:
+
+```bash
+openclaw channels status --probe
+```
+8. Execute the Gateway restart command only when the plugin was just installed/updated, the tool was unavailable because the running Gateway had not loaded the plugin, config reload is disabled, or the probe does not become healthy:
+
+```bash
+openclaw gateway restart
+```
+9. Tell the user activation completes after login succeeds and either config hot reload/probe succeeds or Gateway restart succeeds.
+
+## Trigger Examples
+
+- `activate ClawChat with invite code A1B2C3`
+- `login to ClawChat with invite code A1B2C3`
+- `connect ClawChat using invite code A1B2C3`
+- `绑定 ClawChat，邀请码 A1B2C3`
+- `激活 ClawChat`
+
+Do not ask the user to enter a bare ClawChat command. If activation is requested and `clawchat_activate` is available, call that tool yourself. If the tool is unavailable, execute `openclaw channels login --channel openclaw-clawchat` yourself, then probe channel status and restart the Gateway only when needed.
+
+When the user asks to activate ClawChat without including a code, ask for the invite code before calling `clawchat_activate`; if falling back to channel login, provide the code when the command needs it.

package/src/api-client.test.ts

@@ -89,7 +89,7 @@ describe("openclaw-clawchat api-client", () => {
       fetchImpl,
     });
     await client.updateMyProfile({ display_name: "Alice2" });
-    expect(fetchImpl.mock.calls[0]![0]).toBe("https://api.example.com/v1/agents/agent-1");
+    expect(fetchImpl.mock.calls[0]![0]).toBe("https://api.example.com/v1/users/me");
     const init = fetchImpl.mock.calls[0]![1] as RequestInit;
     expect(init.method).toBe("PATCH");
     expect(JSON.parse(init.body as string)).toEqual({ display_name: "Alice2" });
@@ -196,6 +196,7 @@ describe("openclaw-clawchat api-client", () => {
   it("agentsConnect POSTs /agents/connect with { code, platform, type } body", async () => {
     const fetchImpl = vi.fn().mockResolvedValue(
       jsonResponse({
+        code: 0,
         msg: "ok",
         data: {
           agent: {
@@ -222,7 +223,7 @@ describe("openclaw-clawchat api-client", () => {
       fetchImpl,
     });
     const result = await client.agentsConnect({
-      inviteCode: "INV-1",
+      code: "INV-1",
       platform: "openclaw",
       type: "bot",
     });
@@ -252,13 +253,13 @@ describe("openclaw-clawchat api-client", () => {
       fetchImpl,
     });
     await expect(
-      client.agentsConnect({ inviteCode: "   ", platform: "openclaw", type: "bot" }),
+      client.agentsConnect({ code: "   ", platform: "openclaw", type: "bot" }),
     ).rejects.toMatchObject({ kind: "validation" });
     await expect(
-      client.agentsConnect({ inviteCode: "INV", platform: "", type: "bot" }),
+      client.agentsConnect({ code: "INV", platform: "", type: "bot" }),
     ).rejects.toMatchObject({ kind: "validation" });
     await expect(
-      client.agentsConnect({ inviteCode: "INV", platform: "openclaw", type: "" }),
+      client.agentsConnect({ code: "INV", platform: "openclaw", type: "" }),
     ).rejects.toMatchObject({ kind: "validation" });
     expect(fetchImpl).not.toHaveBeenCalled();
   });

package/src/api-client.ts

@@ -24,7 +24,7 @@ export interface OpenclawClawlingApiClient {
   getMyProfile(): Promise<Profile>;
   getUserInfo(userId: string): Promise<Profile>;
   listFriends(params: { page?: number; pageSize?: number }): Promise<FriendList>;
-  updateMyProfile(patch: { nick_name?: string; avatar_url?: string; bio?: string }): Promise<Profile>;
+  updateMyProfile(patch: { nickname?: string; avatar_url?: string; bio?: string }): Promise<Profile>;
   uploadMedia(params: { buffer: Buffer; filename: string; mime?: string }): Promise<UploadResult>;
   /**
    * Exchange an invite code for an agent token.
@@ -102,9 +102,14 @@ export function createOpenclawClawlingApiClient(opts: ApiClientOptions): Opencla
     // Unified envelope: `{ code: number, msg: string, data: T }`.
     // `code === 0` means success; any other value is a business error whose
     // `msg` is surfaced to callers and `code` is preserved on the error meta.
-    const env = parsed as { code?: unknown; msg?: unknown; data?: T };
+    const env = parsed as { code?: unknown; msg?: unknown; message?: unknown; data?: T };
     const code = typeof env.code === "number" ? env.code : Number.NaN;
-    const msg = typeof env.msg === "string" ? env.msg : "";
+    const msg =
+      typeof env.msg === "string"
+        ? env.msg
+        : typeof env.message === "string"
+          ? env.message
+          : "";
     if (!Number.isFinite(code)) {
       throw new ClawlingApiError("transport", "invalid envelope: missing numeric `code`", {
         status: res.status,

package/src/buffered-stream.test.ts

@@ -52,7 +52,8 @@ describe("openBufferedStreamingSession", () => {
       minChunkChars: 4,
       maxBufferChars: 1000,
     });
-    expect(typing).toEqual([[{ id: "u1", type: "direct" }, true]]);
+    expect(typing).toEqual([["u1", true]]);
+    expect((client.typing as ReturnType<typeof vi.fn>).mock.calls).toEqual([["u1", true]]);
     expect(sent.map((s) => s.event)).toEqual(["message.created"]);
   });
 
@@ -101,6 +102,7 @@ describe("openBufferedStreamingSession", () => {
       [{ kind: "text", text: "Hello ", delta: "Hello " }],
       [{ kind: "text", text: "Hello world", delta: "world" }],
     ]);
+    expect(adds.map((a) => a.payload.sequence)).toEqual([0, 1]);
     expect(session.currentText).toBe("Hello world");
   });
 
@@ -122,8 +124,12 @@ describe("openBufferedStreamingSession", () => {
     const events = sent.map((s) => s.event);
     expect(events).toEqual(["message.created", "message.add", "message.done"]);
     expect(typing).toEqual([
-      [{ id: "u1", type: "direct" }, true],
-      [{ id: "u1", type: "direct" }, false],
+      ["u1", true],
+      ["u1", false],
+    ]);
+    expect((client.typing as ReturnType<typeof vi.fn>).mock.calls).toEqual([
+      ["u1", true],
+      ["u1", false],
     ]);
   });
 
@@ -158,7 +164,11 @@ describe("openBufferedStreamingSession", () => {
     await session.fail("boom");
     const failed = sent.find((s) => s.event === "message.failed")!;
     expect(failed.payload.reason).toBe("boom");
-    expect(typing.at(-1)).toEqual([{ id: "u1", type: "direct" }, false]);
+    expect(failed.payload.sequence).toBe(0);
+    expect(failed.payload).toHaveProperty("completed_at");
+    expect(failed.payload).not.toHaveProperty("failed_at");
+    expect(typing.at(-1)).toEqual(["u1", false]);
+    expect((client.typing as ReturnType<typeof vi.fn>).mock.calls.at(-1)).toEqual(["u1", false]);
   });
 
   it("deduplicates a snapshot that is a substring of the buffered snapshot", async () => {

package/src/buffered-stream.ts

@@ -43,7 +43,8 @@ export function mergeStreamingText(
 
 export interface BufferedStreamOptions {
   client: ClawlingChatClient;
-  routing: EnvelopeRouting;
+  routing?: EnvelopeRouting;
+  to?: { id: string; type: "direct" | "group" };
   sender: StreamSender;
   messageId: string;
   flushIntervalMs: number;
@@ -53,6 +54,12 @@ export interface BufferedStreamOptions {
   emitTyping?: boolean;
 }
 
+function resolveRouting(options: BufferedStreamOptions): EnvelopeRouting {
+  if (options.routing) return options.routing;
+  if (options.to) return { chatId: options.to.id, chatType: options.to.type };
+  throw new Error("openclaw-clawchat buffered stream requires routing");
+}
+
 export interface BufferedStreamSession {
   /** The full accumulated text (even if not yet flushed to the wire). */
   readonly currentText: string;
@@ -83,17 +90,18 @@ export interface BufferedStreamSession {
 export function openBufferedStreamingSession(
   options: BufferedStreamOptions,
 ): BufferedStreamSession {
+  const routing = resolveRouting(options);
   const emitTyping = options.emitTyping !== false;
   if (emitTyping)
-    options.client.typing(options.routing.chatId, true, options.routing.chatType);
+    options.client.typing(routing.chatId, true);
   emitStreamCreated(options.client, {
     messageId: options.messageId,
-    routing: options.routing,
+    routing,
   });
 
   let bufferedSnapshot = "";
   let flushedSnapshot = "";
-  let sequence = 0;
+  let sequence = -1;
   let flushTimer: ReturnType<typeof setTimeout> | null = null;
   let pendingFlush: Promise<void> = Promise.resolve();
   let closed = false;
@@ -115,7 +123,7 @@ export function openBufferedStreamingSession(
     sequence += 1;
     emitStreamAdd(options.client, {
       messageId: options.messageId,
-      routing: options.routing,
+      routing,
       sequence,
       fullText: snapshot,
       textDelta: delta,
@@ -168,12 +176,12 @@ export function openBufferedStreamingSession(
     clearTimer();
     emitStreamDone(options.client, {
       messageId: options.messageId,
-      routing: options.routing,
-      finalSequence: sequence,
+      routing,
+      finalSequence: Math.max(sequence, 0),
       finalText: bufferedSnapshot,
     });
     if (emitTyping)
-      options.client.typing(options.routing.chatId, false, options.routing.chatType);
+      options.client.typing(routing.chatId, false);
   };
 
   const fail = async (reason?: string): Promise<void> => {
@@ -182,12 +190,12 @@ export function openBufferedStreamingSession(
     clearTimer();
     emitStreamFailed(options.client, {
       messageId: options.messageId,
-      routing: options.routing,
-      sequence: sequence + 1,
+      routing,
+      sequence: Math.max(sequence, 0),
       ...(reason !== undefined ? { reason } : {}),
     });
     if (emitTyping)
-      options.client.typing(options.routing.chatId, false, options.routing.chatType);
+      options.client.typing(routing.chatId, false);
   };
 
   return {

package/src/channel.outbound.test.ts

@@ -5,8 +5,6 @@ const getRuntimeMock = vi.hoisted(() => vi.fn());
 const waitForClientMock = vi.hoisted(() => vi.fn());
 const uploadOutboundMediaMock = vi.hoisted(() => vi.fn());
 const createApiClientMock = vi.hoisted(() => vi.fn());
-const sendTextMock = vi.hoisted(() => vi.fn());
-const sendMediaMock = vi.hoisted(() => vi.fn());
 
 vi.mock("./runtime.ts", () => ({
   getOpenclawClawlingClient: getClientMock,
@@ -23,11 +21,6 @@ vi.mock("./api-client.ts", () => ({
   createOpenclawClawlingApiClient: createApiClientMock,
 }));
 
-vi.mock("./outbound.ts", () => ({
-  sendOpenclawClawlingText: sendTextMock,
-  sendOpenclawClawlingMedia: sendMediaMock,
-}));
-
 describe("openclaw-clawchat channel outbound", () => {
   beforeEach(() => {
     vi.resetModules();
@@ -36,15 +29,17 @@ describe("openclaw-clawchat channel outbound", () => {
     waitForClientMock.mockReset();
     uploadOutboundMediaMock.mockReset();
     createApiClientMock.mockReset();
-    sendTextMock.mockReset();
-    sendMediaMock.mockReset();
   });
 
   it("sendText waits for client activation when no active client exists yet", async () => {
-    const client = { sendMessage: vi.fn() };
+    const client = {
+      sendMessage: vi.fn().mockResolvedValue({
+        payload: { message_id: "m-2", accepted_at: 456 },
+        trace_id: "trace-2",
+      }),
+    };
     getClientMock.mockReturnValue(undefined);
     waitForClientMock.mockResolvedValue(client);
-    sendTextMock.mockResolvedValue({ messageId: "m-2", acceptedAt: 456 });
 
     const { openclawClawlingOutbound } = await import("./outbound.ts");
     const result = await openclawClawlingOutbound.sendText!({
@@ -64,12 +59,13 @@ describe("openclaw-clawchat channel outbound", () => {
     });
 
     expect(waitForClientMock).toHaveBeenCalledWith("default");
-    expect(sendTextMock).toHaveBeenCalledWith({
-      client,
-      account: expect.objectContaining({ userId: "agent-1" }),
-      to: { chatId: "user-1", chatType: "direct" },
-      text: "hello",
-    });
+    expect(client.sendMessage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        chat_id: "user-1",
+        body: { fragments: [{ kind: "text", text: "hello" }] },
+      }),
+    );
+    expect(client.sendMessage.mock.calls[0][0]).not.toHaveProperty("chat_type");
     expect(result).toEqual({
       channel: "openclaw-clawchat",
       to: "cc:user-1",
@@ -78,7 +74,12 @@ describe("openclaw-clawchat channel outbound", () => {
   });
 
   it("sendMedia uploads mediaUrl and sends resulting fragments", async () => {
-    const client = { sendMessage: vi.fn() };
+    const client = {
+      sendMessage: vi.fn().mockResolvedValue({
+        payload: { message_id: "m-1", accepted_at: 123 },
+        trace_id: "trace-1",
+      }),
+    };
     const runtime = { media: { loadWebMedia: vi.fn() } };
     const apiClient = { uploadMedia: vi.fn() };
     getClientMock.mockReturnValue(client);
@@ -87,7 +88,6 @@ describe("openclaw-clawchat channel outbound", () => {
     uploadOutboundMediaMock.mockResolvedValue([
       { kind: "image", url: "https://cdn/uploaded.png", mime: "image/png" },
     ]);
-    sendMediaMock.mockResolvedValue({ messageId: "m-1", acceptedAt: 123 });
 
     const { openclawClawlingOutbound } = await import("./outbound.ts");
     const result = await openclawClawlingOutbound.sendMedia!({
@@ -118,13 +118,18 @@ describe("openclaw-clawchat channel outbound", () => {
       runtime,
       mediaLocalRoots: ["/tmp"],
     });
-    expect(sendMediaMock).toHaveBeenCalledWith({
-      client,
-      account: expect.objectContaining({ userId: "agent-1", baseUrl: "https://api.example.com" }),
-      to: { chatId: "room-1", chatType: "group" },
-      text: "caption",
-      mediaFragments: [{ kind: "image", url: "https://cdn/uploaded.png", mime: "image/png" }],
-    });
+    expect(client.sendMessage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        chat_id: "room-1",
+        body: {
+          fragments: [
+            { kind: "text", text: "caption" },
+            { kind: "image", url: "https://cdn/uploaded.png", mime: "image/png" },
+          ],
+        },
+      }),
+    );
+    expect(client.sendMessage.mock.calls[0][0]).not.toHaveProperty("chat_type");
     expect(result).toEqual({
       channel: "openclaw-clawchat",
       to: "cc:group:room-1",
@@ -155,7 +160,12 @@ describe("openclaw-clawchat channel outbound", () => {
   });
 
   it("sendMedia waits for client activation when no active client exists yet", async () => {
-    const client = { sendMessage: vi.fn() };
+    const client = {
+      sendMessage: vi.fn().mockResolvedValue({
+        payload: { message_id: "m-3", accepted_at: 789 },
+        trace_id: "trace-3",
+      }),
+    };
     const runtime = { media: { loadWebMedia: vi.fn() } };
     const apiClient = { uploadMedia: vi.fn() };
     getClientMock.mockReturnValue(undefined);
@@ -165,7 +175,6 @@ describe("openclaw-clawchat channel outbound", () => {
     uploadOutboundMediaMock.mockResolvedValue([
       { kind: "image", url: "https://cdn/uploaded.png", mime: "image/png" },
     ]);
-    sendMediaMock.mockResolvedValue({ messageId: "m-3", acceptedAt: 789 });
 
     const { openclawClawlingOutbound } = await import("./outbound.ts");
     const result = await openclawClawlingOutbound.sendMedia!({
@@ -187,13 +196,18 @@ describe("openclaw-clawchat channel outbound", () => {
     });
 
     expect(waitForClientMock).toHaveBeenCalledWith("default");
-    expect(sendMediaMock).toHaveBeenCalledWith({
-      client,
-      account: expect.objectContaining({ userId: "agent-1", baseUrl: "https://api.example.com" }),
-      to: { chatId: "room-1", chatType: "group" },
-      text: "caption",
-      mediaFragments: [{ kind: "image", url: "https://cdn/uploaded.png", mime: "image/png" }],
-    });
+    expect(client.sendMessage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        chat_id: "room-1",
+        body: {
+          fragments: [
+            { kind: "text", text: "caption" },
+            { kind: "image", url: "https://cdn/uploaded.png", mime: "image/png" },
+          ],
+        },
+      }),
+    );
+    expect(client.sendMessage.mock.calls[0][0]).not.toHaveProperty("chat_type");
     expect(result).toEqual({
       channel: "openclaw-clawchat",
       to: "cc:group:room-1",