@newbase-clawchat/openclaw-clawchat 2026.4.24 → 2026.4.29

package/README.md

@@ -1,6 +1,6 @@
 # @newbase-clawchat/openclaw-clawchat
 
-OpenClaw channel plugin that connects an agent to ClawChat over the ClawChat Protocol v2, using [`@newbase-clawchat/sdk`](https://www.npmjs.com/package/@newbase-clawchat/sdk) for the WebSocket transport plus a small REST surface under `/v1/*` for profile / social / media operations.
+OpenClaw channel plugin that connects an agent to ClawChat over the ClawChat Protocol v2, using [`@newbase-clawchat/sdk`](https://www.npmjs.com/package/@newbase-clawchat/sdk) for the WebSocket transport plus a small REST surface for profile / social / media operations (`/v1/*` plus unversioned `/media/upload`).
 
 ## Features
 
@@ -10,31 +10,52 @@ OpenClaw channel plugin that connects an agent to ClawChat over the ClawChat Pro
 - Outbound text replies in `static` or `stream` mode, with a consolidated final `message.reply`
 - Typing indicators and filtered forwarding for thinking / tool-call content
 - Media fragments (image / file / audio / video) in either direction
-- `clawchat_*` agent tools for profile, friends, media upload, and self-activation
+- Channel-login onboarding plus `clawchat_*` agent tools for the configured ClawChat account profile, friends, and media upload
 
 ## Install
 
 ```bash
-# Via the OpenClaw CLI (recommended)
-openclaw channels setup --channel openclaw-clawchat --code INV-ABC123
-
-# Or add as a local extension
+# Add as an OpenClaw extension
 npm i @newbase-clawchat/openclaw-clawchat
 ```
 
 Requires `openclaw >= 2026.3.23` as a peer host.
 
+For the OpenClaw plugin install/update flow, see [`INSTALL.md`](./INSTALL.md).
+
+Example LLM prompt:
+
+```text
+Use https://raw.githubusercontent.com/clawling/openclaw-clawchat/refs/heads/main/INSTALL.md to install and activate the ClawChat plugin. The invite code is XXXXXX.
+```
+
 ## Quick start
 
+Send one of these in chat:
+
+```text
+activate ClawChat with invite code A1B2C3
+```
+
+The activation skill executes OpenClaw channel login:
+
 ```bash
-# One-shot: apply config + exchange invite code for an access token
-openclaw channels setup --channel openclaw-clawchat --code INV-ABC123
+openclaw channels login --channel openclaw-clawchat
+openclaw gateway restart
+```
+
+If you run the gateway manually instead of as a service, start it after login:
 
-# Run the gateway
+```bash
 openclaw gateway run
 ```
 
-Minimal `~/.openclaw/openclaw.json`:
+The invite code is not a token; token fields are written only after login. Before
+login, the plugin registers no ClawChat account tools; after activation/login,
+the channel is enabled and the `clawchat_*` account tools register on config
+reload.
+
+After activation/login, the channel section is enabled and has credentials:
 
 ```json5
 {
@@ -44,7 +65,9 @@ Minimal `~/.openclaw/openclaw.json`:
       replyMode: "stream",
       forwardThinking: true,
       forwardToolCalls: false
-      // token / userId / refreshToken are written by the login flow.
+      token: "...",
+      userId: "...",
+      refreshToken: "..."
     }
   }
 }
@@ -55,10 +78,11 @@ Minimal `~/.openclaw/openclaw.json`:
 A minimal browser test harness is bundled under `tools/`:
 
 ```bash
-npm run test-ui
+node tools/standalone-webchat-server.mjs
+# Options: --host (default 127.0.0.1), --port (default 4318), --default-ws-url
 ```
 
-Then open the printed URL — it mounts `tools/standalone-webchat.html` against a local relay so you can exercise the plugin end to end without a full ClawChat backend.
+Then open the printed URL (default `http://127.0.0.1:4318`) to exercise the plugin end to end against a WebSocket relay.
 
 ## Layout
 
@@ -103,6 +127,9 @@ See [`docs/openclaw-clawchat.md`](./docs/openclaw-clawchat.md) for:
 ```bash
 # Tests
 npx vitest run
+
+# Typecheck
+npm run typecheck
 ```
 
 Tests live next to the source they cover (`*.test.ts`). The plugin is pure TypeScript and is consumed via the OpenClaw host's extension loader — no bundling step is required.

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,14 @@
 {
   "id": "openclaw-clawchat",
   "channels": ["openclaw-clawchat"],
+  "skills": ["./skills"],
+  "activation": {
+    "onChannels": ["openclaw-clawchat"],
+    "onCommands": ["clawchat-login"]
+  },
+  "commandAliases": [
+    { "name": "clawchat-login", "kind": "runtime-slash" }
+  ],
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
@@ -9,8 +17,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 +38,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 +59,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,10 +1,11 @@
 {
   "name": "@newbase-clawchat/openclaw-clawchat",
-  "version": "2026.4.24",
+  "version": "2026.4.29",
   "description": "OpenClaw ClawChat channel plugin",
   "files": [
     "index.ts",
     "src",
+    "skills",
     "openclaw.plugin.json",
     "README.md"
   ],
@@ -24,7 +25,7 @@
     "typescript": "^5.4.0"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.3.23"
+    "openclaw": "^2026.3.23"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -38,15 +39,6 @@
     "extensions": [
       "./index.ts"
     ],
-    "channel": {
-      "id": "openclaw-clawchat",
-      "label": "openclaw-clawchat",
-      "selectionLabel": "openclaw-clawchat",
-      "docsPath": "/channels/openclaw-clawchat",
-      "docsLabel": "openclaw-clawchat",
-      "blurb":  "OpenClaw ClawChat channel plugin",
-      "order": 70
-    },
     "install": {
       "npmSpec": "@newbase-clawchat/openclaw-clawchat",
       "defaultChoice": "npm",

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,38 @@
+---
+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 must execute the OpenClaw channel login command. Do not edit config files manually, do not call tools for activation, 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. Execute the channel login command:
+
+```bash
+openclaw channels login --channel openclaw-clawchat
+```
+3. Do not append the invite code to the command; `openclaw channels login` has no code argument.
+4. 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.
+5. After channel login succeeds, execute the Gateway restart command:
+
+```bash
+openclaw gateway restart
+```
+6. Tell the user activation completes after channel login and Gateway restart both succeed.
+
+## 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, execute `openclaw channels login --channel openclaw-clawchat` yourself, then execute `openclaw gateway restart`.
+
+When the user asks to activate ClawChat without including a code, run channel login and ask for the invite 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,7 @@ describe("openBufferedStreamingSession", () => {
       minChunkChars: 4,
       maxBufferChars: 1000,
     });
-    expect(typing).toEqual([[{ id: "u1", type: "direct" }, true]]);
+    expect(typing).toEqual([["u1", true]]);
     expect(sent.map((s) => s.event)).toEqual(["message.created"]);
   });
 
@@ -122,8 +122,8 @@ 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],
     ]);
   });
 
@@ -158,7 +158,7 @@ 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(typing.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,12 +90,13 @@ 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, routing.chatType);
   emitStreamCreated(options.client, {
     messageId: options.messageId,
-    routing: options.routing,
+    routing,
   });
 
   let bufferedSnapshot = "";
@@ -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,
+      routing,
       finalSequence: sequence,
       finalText: bufferedSnapshot,
     });
     if (emitTyping)
-      options.client.typing(options.routing.chatId, false, options.routing.chatType);
+      options.client.typing(routing.chatId, false, routing.chatType);
   };
 
   const fail = async (reason?: string): Promise<void> => {
@@ -182,12 +190,12 @@ export function openBufferedStreamingSession(
     clearTimer();
     emitStreamFailed(options.client, {
       messageId: options.messageId,
-      routing: options.routing,
+      routing,
       sequence: sequence + 1,
       ...(reason !== undefined ? { reason } : {}),
     });
     if (emitTyping)
-      options.client.typing(options.routing.chatId, false, options.routing.chatType);
+      options.client.typing(routing.chatId, false, routing.chatType);
   };
 
   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",
+        chat_type: "direct",
+        body: { fragments: [{ kind: "text", text: "hello" }] },
+      }),
+    );
     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",
+        chat_type: "group",
+        body: {
+          fragments: [
+            { kind: "text", text: "caption" },
+            { kind: "image", url: "https://cdn/uploaded.png", mime: "image/png" },
+          ],
+        },
+      }),
+    );
     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",
+        chat_type: "group",
+        body: {
+          fragments: [
+            { kind: "text", text: "caption" },
+            { kind: "image", url: "https://cdn/uploaded.png", mime: "image/png" },
+          ],
+        },
+      }),
+    );
     expect(result).toEqual({
       channel: "openclaw-clawchat",
       to: "cc:group:room-1",