@zhin.js/adapter-onebot11 6.0.1 → 6.0.3

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @zhin.js/adapter-onebot11
 
+## 6.0.3
+
+### Patch Changes
+
+- Updated dependencies [afc0e66]
+- Updated dependencies [2e41ad5]
+- Updated dependencies [9f57124]
+  - @zhin.js/core@1.5.2
+  - @zhin.js/adapter@1.1.5
+  - @zhin.js/im-contract@1.0.1
+  - @zhin.js/plugin-runtime@1.1.3
+  - @zhin.js/command@1.0.7
+  - @zhin.js/host-http@1.0.6
+  - @zhin.js/agent@1.1.3
+  - zhin.js@6.0.2
+
+## 6.0.2
+
+### Patch Changes
+
+- Updated dependencies [696ab1b]
+  - @zhin.js/agent@1.1.2
+  - zhin.js@6.0.1
+
 ## 6.0.1
 
 ### Patch Changes

package/README.md

@@ -8,7 +8,7 @@ Zhin.js [OneBot 11](https://github.com/botuniverse/onebot-11) 适配器（Plugin
 - 约定式 `defineAdapter` / `definePlugin`（无需 `usePlugin`）
 - **正向 WebSocket**（`connection: ws`）：应用连 OneBot 实现的 WS 服务器
 - `access_token` 鉴权（Bearer + query）
-- 入站经 `messageGatewayToken`；出站 `send({ target, payload })`
+- 入站经 `messageGatewayToken`；出站 `send({ conversation, payload })`
 
 ## 安装
 
@@ -23,8 +23,8 @@ pnpm add @zhin.js/adapter-onebot11
 - `@zhin.js/plugin-runtime` — `plugin.ts`（`definePlugin`）
 - 配置经插件 `schema.json` 落到 `plugins.<instanceKey>`
 
-入站：`gateway.receive({ adapter, target: "private:uid"|"group:gid", content, sender, metadata })`  
-出站：`send({ target, payload })` → WS `send_private_msg` / `send_group_msg`（payload 已由 gateway/core 渲染；无 segment-mapper）
+入站：`gateway.receive({ conversation, message, content, sender, metadata })`（`conversation.kind` 为 `private`/`group`，`id` 为 uid/gid）  
+出站：`send({ conversation, payload })` → WS `send_private_msg` / `send_group_msg`（payload 已由 gateway/core 渲染；无 segment-mapper）
 
 ## 最小配置
 

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { buildSendAction, buildWsConnectOptions, extractQuoteId, formatInboundContent, formatInboundMetadata, formatInboundTarget, formatOutboundSegments, getChannelId, isMessageEvent, isOneBot11BotMentioned, mediaRefToOneBotFile, parseSendTarget, resolveOneBot11Config, senderDisplayName, senderNickname, senderUserId, type OneBot11ActionRequest, type OneBot11ActionResponse, type OneBot11AdapterConfig, type OneBot11ConfigBase, type OneBot11EndpointConfig, type OneBot11Event, type OneBot11Segment, type OneBot11Sender, type OneBot11WireSegment, type OneBot11WsConfig, type OneBot11WssConfig, type ParsedSendTarget, type ResolvedOneBot11Config, } from './protocol.js';
+export { buildSendAction, buildWsConnectOptions, extractQuoteId, formatInboundContent, formatInboundMetadata, formatOutboundSegments, getChannelId, isMessageEvent, isOneBot11BotMentioned, mediaRefToOneBotFile, onebot11InboundConversation, resolveOneBot11Config, senderDisplayName, senderNickname, senderUserId, type OneBot11ActionRequest, type OneBot11ActionResponse, type OneBot11AdapterConfig, type OneBot11ConfigBase, type OneBot11EndpointConfig, type OneBot11Event, type OneBot11Segment, type OneBot11Sender, type OneBot11WireSegment, type OneBot11WsConfig, type OneBot11WssConfig, type ResolvedOneBot11Config, } from './protocol.js';
 export { OneBot11WsEndpoint, type OneBot11WsEndpointOptions, } from './ws-endpoint.js';
 export { OneBot11WssEndpoint, type OneBot11WssEndpointOptions, } from './wss-endpoint.js';
 export type { OneBot11WsSocket, OneBot11WsCreateOptions } from './ws-types.js';

package/lib/index.js

@@ -1,4 +1,4 @@
-export { buildSendAction, buildWsConnectOptions, extractQuoteId, formatInboundContent, formatInboundMetadata, formatInboundTarget, formatOutboundSegments, getChannelId, isMessageEvent, isOneBot11BotMentioned, mediaRefToOneBotFile, parseSendTarget, resolveOneBot11Config, senderDisplayName, senderNickname, senderUserId, } from './protocol.js';
+export { buildSendAction, buildWsConnectOptions, extractQuoteId, formatInboundContent, formatInboundMetadata, formatOutboundSegments, getChannelId, isMessageEvent, isOneBot11BotMentioned, mediaRefToOneBotFile, onebot11InboundConversation, resolveOneBot11Config, senderDisplayName, senderNickname, senderUserId, } from './protocol.js';
 export { OneBot11WsEndpoint, } from './ws-endpoint.js';
 export { OneBot11WssEndpoint, } from './wss-endpoint.js';
 export { callOneBot11WsAction, decodeWsPayload, handleOneBot11WsMessage, rejectAllPending, startOneBot11Heartbeat, } from './ws-transport.js';

package/lib/protocol.d.ts

@@ -4,6 +4,7 @@
  * Spec: https://github.com/botuniverse/onebot-11
  */
 import { type MediaRef } from '@zhin.js/core';
+import type { ConversationRef } from '@zhin.js/im-contract';
 /** Transitional legacy endpoint row (`endpoints[]` with `context: onebot11`). */
 export interface OneBot11LegacyEndpointRow {
     readonly context?: string;
@@ -90,10 +91,6 @@ export interface OneBot11WireSegment {
     readonly type: string;
     readonly data?: Record<string, unknown>;
 }
-export interface ParsedSendTarget {
-    readonly message_type: 'private' | 'group';
-    readonly id: string;
-}
 export declare function resolveOneBot11Config(config?: OneBot11AdapterConfig): ResolvedOneBot11Config;
 /** 判断是否为消息事件（post_type=message） */
 export declare function isMessageEvent(ev: OneBot11Event): ev is OneBot11Event & {
@@ -102,10 +99,11 @@ export declare function isMessageEvent(ev: OneBot11Event): ev is OneBot11Event &
 /** 从事件得到场景 id：私聊 user_id，群 group_id */
 export declare function getChannelId(ev: OneBot11Event): string;
 /**
- * Gateway reply target：`private:uid` / `group:gid`，便于 send() 还原动作参数。
+ * 入站归一化 → ConversationRef：OneBot 11 `group` 消息 → kind 'group'，
+ * 其余（private 及带 group_id 的非 private 事件按群处理）→ kind 'private'。
+ * OneBot 11 无 guild/temp 容器概念，不填 parent。
  */
-export declare function formatInboundTarget(ev: OneBot11Event): string;
-export declare function parseSendTarget(target: string): ParsedSendTarget;
+export declare function onebot11InboundConversation(endpointId: string, ev: OneBot11Event): ConversationRef;
 /** Build inbound text for MessageGateway.receive */
 export declare function formatInboundContent(ev: OneBot11Event): string;
 export declare function senderDisplayName(ev: OneBot11Event): string;
@@ -140,7 +138,7 @@ export declare function mediaRefToOneBotFile(media: MediaRef): string;
  * 其余 wire 形状段（at / 平台扩展段）原样透传。
  */
 export declare function formatOutboundSegments(payload: unknown): OneBot11Segment[];
-export declare function buildSendAction(target: string, message: OneBot11Segment[]): {
+export declare function buildSendAction(conversation: ConversationRef, message: OneBot11Segment[]): {
     action: string;
     params: Record<string, unknown>;
 };

package/lib/protocol.js

@@ -69,28 +69,19 @@ export function getChannelId(ev) {
     return '';
 }
 /**
- * Gateway reply target：`private:uid` / `group:gid`，便于 send() 还原动作参数。
+ * 入站归一化 → ConversationRef：OneBot 11 `group` 消息 → kind 'group'，
+ * 其余（private 及带 group_id 的非 private 事件按群处理）→ kind 'private'。
+ * OneBot 11 无 guild/temp 容器概念，不填 parent。
  */
-export function formatInboundTarget(ev) {
-    const messageType = ev.message_type === 'group' || (ev.group_id != null && ev.message_type !== 'private')
+export function onebot11InboundConversation(endpointId, ev) {
+    const kind = ev.message_type === 'group' || (ev.group_id != null && ev.message_type !== 'private')
         ? 'group'
         : 'private';
-    return `${messageType}:${getChannelId(ev)}`;
-}
-export function parseSendTarget(target) {
-    const sep = target.indexOf(':');
-    if (sep <= 0) {
-        return { message_type: 'private', id: target };
-    }
-    const head = target.slice(0, sep);
-    const rest = target.slice(sep + 1);
-    if (head === 'group') {
-        return { message_type: 'group', id: rest };
-    }
-    if (head === 'private') {
-        return { message_type: 'private', id: rest };
-    }
-    return { message_type: 'private', id: target };
+    return {
+        endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+        kind,
+        id: getChannelId(ev),
+    };
 }
 /** Build inbound text for MessageGateway.receive */
 export function formatInboundContent(ev) {
@@ -289,13 +280,12 @@ export function formatOutboundSegments(payload) {
     }
     return segs.length ? segs : [{ type: 'text', data: { text: '' } }];
 }
-export function buildSendAction(target, message) {
-    const parsed = parseSendTarget(target);
-    if (parsed.message_type === 'group') {
+export function buildSendAction(conversation, message) {
+    if (conversation.kind === 'group') {
         return {
             action: 'send_group_msg',
             params: {
-                group_id: Number(parsed.id) || parsed.id,
+                group_id: Number(conversation.id) || conversation.id,
                 message,
             },
         };
@@ -303,7 +293,7 @@ export function buildSendAction(target, message) {
     return {
         action: 'send_private_msg',
         params: {
-            user_id: Number(parsed.id) || parsed.id,
+            user_id: Number(conversation.id) || conversation.id,
             message,
         },
     };

package/lib/ws-endpoint.d.ts

@@ -1,4 +1,4 @@
-import { type EndpointInstance, type EndpointManagement } from '@zhin.js/adapter';
+import { type EndpointInstance, type EndpointManagement, type EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { type OneBot11Event, type OneBot11WsConfig } from './protocol.js';
@@ -17,10 +17,7 @@ export declare class OneBot11WsEndpoint implements EndpointInstance {
     open(): void;
     close(): void;
     stop(): Promise<void>;
-    send({ target, payload }: {
-        readonly target: string;
-        readonly payload: unknown;
-    }): Promise<string>;
+    send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     recallMessage(messageId: string): Promise<void>;
     /** Public API for agent tools / callers. */
     callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;

package/lib/ws-endpoint.js

@@ -6,7 +6,7 @@ import { createEndpointLifecycle, } from '@zhin.js/adapter';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { createOneBot11EndpointManagement } from './endpoint-management.js';
 import { registerOnebot11AgentEndpoint } from './onebot11-agent-deps.js';
-import { buildSendAction, buildWsConnectOptions, formatInboundContent, formatInboundMetadata, formatInboundTarget, formatOutboundSegments, isMessageEvent, senderUserId, } from './protocol.js';
+import { buildSendAction, buildWsConnectOptions, formatInboundContent, formatInboundMetadata, formatOutboundSegments, isMessageEvent, onebot11InboundConversation, senderUserId, } from './protocol.js';
 import { callOneBot11WsAction, handleOneBot11WsMessage, rejectAllPending, } from './ws-transport.js';
 const logger = getLogger('onebot11');
 export class OneBot11WsEndpoint {
@@ -72,15 +72,15 @@ export class OneBot11WsEndpoint {
         rejectAllPending(this.#pending);
         this.#ws = undefined;
     }
-    async send({ target, payload }) {
+    async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
-        const { action, params } = buildSendAction(target, message);
+        const { action, params } = buildSendAction(conversation, message);
         const data = await this.callApi(action, params);
         const messageId = data?.message_id != null ? String(data.message_id) : '';
         logger.debug(formatCompact({
             op: 'onebot11_send',
             endpoint: this.#options.config.name,
-            target,
+            target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
         return messageId;
@@ -107,19 +107,18 @@ export class OneBot11WsEndpoint {
     admit(ev) {
         if (!this.#open || !isMessageEvent(ev))
             return;
-        const target = formatInboundTarget(ev);
+        const conversation = onebot11InboundConversation(String(this.#options.id), ev);
         const content = formatInboundContent(ev);
         void this.#options.gateway.receive({
-            adapter: this.#options.id,
-            target,
+            conversation,
+            message: { conversation, id: String(ev.message_id) },
             content,
             sender: senderUserId(ev),
-            id: String(ev.message_id),
             metadata: formatInboundMetadata(ev, this.#options.config.name),
         }).catch((err) => {
             logger.warn(formatCompact({
                 op: 'onebot11_gateway_receive_failed',
-                target,
+                target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
             }));
         });

package/lib/wss-endpoint.d.ts

@@ -1,4 +1,4 @@
-import type { EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
+import type { EndpointInstance, EndpointManagement, EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost } from '@zhin.js/host-http';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
@@ -17,10 +17,7 @@ export declare class OneBot11WssEndpoint implements EndpointInstance {
     open(): void;
     close(): void;
     stop(): Promise<void>;
-    send({ target, payload }: {
-        readonly target: string;
-        readonly payload: unknown;
-    }): Promise<string>;
+    send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     recallMessage(messageId: string): Promise<void>;
     callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
     setTitle(groupId: number, userId: number, title: string, duration?: number): Promise<boolean>;

package/lib/wss-endpoint.js

@@ -5,7 +5,7 @@ import { clearInterval } from 'node:timers';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { createOneBot11EndpointManagement } from './endpoint-management.js';
 import { registerOnebot11AgentEndpoint } from './onebot11-agent-deps.js';
-import { buildSendAction, formatInboundContent, formatInboundMetadata, formatInboundTarget, formatOutboundSegments, isMessageEvent, senderUserId, } from './protocol.js';
+import { buildSendAction, formatInboundContent, formatInboundMetadata, formatOutboundSegments, isMessageEvent, onebot11InboundConversation, senderUserId, } from './protocol.js';
 import { verifyOneBotAccessToken } from './wss-auth.js';
 import { callOneBot11WsAction, handleOneBot11WsMessage, rejectAllPending, startOneBot11Heartbeat, } from './ws-transport.js';
 const logger = getLogger('onebot11');
@@ -76,9 +76,9 @@ export class OneBot11WssEndpoint {
         }
         this.#started = false;
     }
-    async send({ target, payload }) {
+    async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
-        const { action, params } = buildSendAction(target, message);
+        const { action, params } = buildSendAction(conversation, message);
         const data = await this.callApi(action, params);
         return data?.message_id != null ? String(data.message_id) : '';
     }
@@ -102,18 +102,17 @@ export class OneBot11WssEndpoint {
     admit(ev) {
         if (!this.#open || !isMessageEvent(ev))
             return;
-        const target = formatInboundTarget(ev);
+        const conversation = onebot11InboundConversation(String(this.#options.id), ev);
         void this.#options.gateway.receive({
-            adapter: this.#options.id,
-            target,
+            conversation,
+            message: { conversation, id: String(ev.message_id) },
             content: formatInboundContent(ev),
             sender: senderUserId(ev),
-            id: String(ev.message_id),
             metadata: formatInboundMetadata(ev, this.#options.config.name),
         }).catch((err) => {
             logger.warn(formatCompact({
                 op: 'onebot11_gateway_receive_failed',
-                target,
+                target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
             }));
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-onebot11",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "description": "Zhin.js OneBot 11 adapter for Plugin Runtime (WebSocket client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -41,12 +41,13 @@
   },
   "dependencies": {
     "ws": "^8.21.1",
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/command": "1.0.6",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/host-http": "1.0.5",
+    "@zhin.js/adapter": "1.1.5",
+    "@zhin.js/command": "1.0.7",
+    "@zhin.js/core": "1.5.2",
+    "@zhin.js/host-http": "1.0.6",
+    "@zhin.js/im-contract": "1.0.1",
     "@zhin.js/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.1.2"
+    "@zhin.js/plugin-runtime": "1.1.3"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
@@ -54,16 +55,16 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.1",
-    "@zhin.js/host-http": "1.0.5"
+    "@zhin.js/agent": "1.1.3",
+    "@zhin.js/host-http": "1.0.6"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/agent": "1.1.1",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/plugin-runtime": "1.1.2",
-    "zhin.js": "6.0.1"
+    "@zhin.js/adapter": "1.1.5",
+    "@zhin.js/agent": "1.1.3",
+    "@zhin.js/core": "1.5.2",
+    "@zhin.js/plugin-runtime": "1.1.3",
+    "zhin.js": "6.0.2"
   },
   "peerDependenciesMeta": {
     "zhin.js": {

package/src/index.ts

@@ -4,13 +4,12 @@ export {
   extractQuoteId,
   formatInboundContent,
   formatInboundMetadata,
-  formatInboundTarget,
   formatOutboundSegments,
   getChannelId,
   isMessageEvent,
   isOneBot11BotMentioned,
   mediaRefToOneBotFile,
-  parseSendTarget,
+  onebot11InboundConversation,
   resolveOneBot11Config,
   senderDisplayName,
   senderNickname,
@@ -26,7 +25,6 @@ export {
   type OneBot11WireSegment,
   type OneBot11WsConfig,
   type OneBot11WssConfig,
-  type ParsedSendTarget,
   type ResolvedOneBot11Config,
 } from './protocol.js';
 

package/src/protocol.ts

@@ -4,6 +4,7 @@
  * Spec: https://github.com/botuniverse/onebot-11
  */
 import { isMediaRef, type MediaRef } from '@zhin.js/core';
+import type { ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
 const logger = getLogger('onebot11');
@@ -106,11 +107,6 @@ export interface OneBot11WireSegment {
   readonly data?: Record<string, unknown>;
 }
 
-export interface ParsedSendTarget {
-  readonly message_type: 'private' | 'group';
-  readonly id: string;
-}
-
 function normalizeConnection(
   connection: string | undefined,
   legacyType: string | undefined,
@@ -185,29 +181,19 @@ export function getChannelId(ev: OneBot11Event): string {
 }
 
 /**
- * Gateway reply target：`private:uid` / `group:gid`，便于 send() 还原动作参数。
+ * 入站归一化 → ConversationRef：OneBot 11 `group` 消息 → kind 'group'，
+ * 其余（private 及带 group_id 的非 private 事件按群处理）→ kind 'private'。
+ * OneBot 11 无 guild/temp 容器概念，不填 parent。
  */
-export function formatInboundTarget(ev: OneBot11Event): string {
-  const messageType = ev.message_type === 'group' || (ev.group_id != null && ev.message_type !== 'private')
-    ? 'group'
-    : 'private';
-  return `${messageType}:${getChannelId(ev)}`;
-}
-
-export function parseSendTarget(target: string): ParsedSendTarget {
-  const sep = target.indexOf(':');
-  if (sep <= 0) {
-    return { message_type: 'private', id: target };
-  }
-  const head = target.slice(0, sep);
-  const rest = target.slice(sep + 1);
-  if (head === 'group') {
-    return { message_type: 'group', id: rest };
-  }
-  if (head === 'private') {
-    return { message_type: 'private', id: rest };
-  }
-  return { message_type: 'private', id: target };
+export function onebot11InboundConversation(endpointId: string, ev: OneBot11Event): ConversationRef {
+  const kind = ev.message_type === 'group' || (ev.group_id != null && ev.message_type !== 'private')
+    ? 'group' as const
+    : 'private' as const;
+  return {
+    endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+    kind,
+    id: getChannelId(ev),
+  };
 }
 
 /** Build inbound text for MessageGateway.receive */
@@ -420,15 +406,14 @@ export function formatOutboundSegments(payload: unknown): OneBot11Segment[] {
 }
 
 export function buildSendAction(
-  target: string,
+  conversation: ConversationRef,
   message: OneBot11Segment[],
 ): { action: string; params: Record<string, unknown> } {
-  const parsed = parseSendTarget(target);
-  if (parsed.message_type === 'group') {
+  if (conversation.kind === 'group') {
     return {
       action: 'send_group_msg',
       params: {
-        group_id: Number(parsed.id) || parsed.id,
+        group_id: Number(conversation.id) || conversation.id,
         message,
       },
     };
@@ -436,7 +421,7 @@ export function buildSendAction(
   return {
     action: 'send_private_msg',
     params: {
-      user_id: Number(parsed.id) || parsed.id,
+      user_id: Number(conversation.id) || conversation.id,
       message,
     },
   };

package/src/ws-endpoint.ts

@@ -8,6 +8,7 @@ import {
   type EndpointInstance,
   type EndpointLifecycle,
   type EndpointManagement,
+  type EndpointSendRequest,
 } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import { formatCompact, getLogger } from '@zhin.js/logger';
@@ -19,9 +20,9 @@ import {
   buildWsConnectOptions,
   formatInboundContent,
   formatInboundMetadata,
-  formatInboundTarget,
   formatOutboundSegments,
   isMessageEvent,
+  onebot11InboundConversation,
   senderUserId,
   type OneBot11Event,
   type OneBot11WsConfig,
@@ -115,15 +116,15 @@ export class OneBot11WsEndpoint implements EndpointInstance {
     this.#ws = undefined;
   }
 
-  async send({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const message = formatOutboundSegments(payload);
-    const { action, params } = buildSendAction(target, message);
+    const { action, params } = buildSendAction(conversation, message);
     const data = await this.callApi(action, params) as { message_id?: number | string } | undefined;
     const messageId = data?.message_id != null ? String(data.message_id) : '';
     logger.debug(formatCompact({
       op: 'onebot11_send',
       endpoint: this.#options.config.name,
-      target,
+      target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
     return messageId;
@@ -157,19 +158,18 @@ export class OneBot11WsEndpoint implements EndpointInstance {
   /** Test / internal: admit a parsed event when the endpoint is open. */
   admit(ev: OneBot11Event): void {
     if (!this.#open || !isMessageEvent(ev)) return;
-    const target = formatInboundTarget(ev);
+    const conversation = onebot11InboundConversation(String(this.#options.id), ev);
     const content = formatInboundContent(ev);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: String(ev.message_id) },
       content,
       sender: senderUserId(ev),
-      id: String(ev.message_id),
       metadata: formatInboundMetadata(ev, this.#options.config.name),
     }).catch((err) => {
       logger.warn(formatCompact({
         op: 'onebot11_gateway_receive_failed',
-        target,
+        target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
       }));
     });

package/src/wss-endpoint.ts

@@ -2,7 +2,7 @@
  * OneBot11 reverse WSS endpoint — accepts inbound WebSocket from OneBot implementation.
  */
 import { clearInterval } from 'node:timers';
-import type { EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
+import type { EndpointInstance, EndpointManagement, EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, WsConnection } from '@zhin.js/host-http';
 import { formatCompact, getLogger } from '@zhin.js/logger';
@@ -13,9 +13,9 @@ import {
   buildSendAction,
   formatInboundContent,
   formatInboundMetadata,
-  formatInboundTarget,
   formatOutboundSegments,
   isMessageEvent,
+  onebot11InboundConversation,
   senderUserId,
   type OneBot11Event,
   type OneBot11WssConfig,
@@ -116,9 +116,9 @@ export class OneBot11WssEndpoint implements EndpointInstance {
     this.#started = false;
   }
 
-  async send({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const message = formatOutboundSegments(payload);
-    const { action, params } = buildSendAction(target, message);
+    const { action, params } = buildSendAction(conversation, message);
     const data = await this.callApi(action, params) as { message_id?: number | string } | undefined;
     return data?.message_id != null ? String(data.message_id) : '';
   }
@@ -144,18 +144,17 @@ export class OneBot11WssEndpoint implements EndpointInstance {
 
   admit(ev: OneBot11Event): void {
     if (!this.#open || !isMessageEvent(ev)) return;
-    const target = formatInboundTarget(ev);
+    const conversation = onebot11InboundConversation(String(this.#options.id), ev);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: String(ev.message_id) },
       content: formatInboundContent(ev),
       sender: senderUserId(ev),
-      id: String(ev.message_id),
       metadata: formatInboundMetadata(ev, this.#options.config.name),
     }).catch((err) => {
       logger.warn(formatCompact({
         op: 'onebot11_gateway_receive_failed',
-        target,
+        target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
       }));
     });