@zhin.js/adapter-onebot11 6.0.2 → 6.0.5

package/CHANGELOG.md

@@ -1,5 +1,100 @@
 # @zhin.js/adapter-onebot11
 
+## 6.0.5
+
+### Patch Changes
+
+- 51015d6: refactor(adapters): migrate platform-permit to PermissionSubject
+
+  All adapter platform-permit checkers now accept PermissionSubject
+  (duck-typed from Message/CommandSession) instead of Message directly.
+  registerPlatformPermitChecker is replaced by host.registerPlatform in
+  the adapter plugin setup. activity-feedback service updated for new
+  PermissionHost integration.
+
+- Updated dependencies [6f9c366]
+- Updated dependencies [373a56b]
+- Updated dependencies [0de46a8]
+- Updated dependencies [c106ecc]
+- Updated dependencies [ca92e03]
+- Updated dependencies [b0f37ae]
+- Updated dependencies [ba08a2f]
+- Updated dependencies [b08f7fe]
+- Updated dependencies [daffd4c]
+- Updated dependencies [36c7400]
+- Updated dependencies [a9fa72e]
+- Updated dependencies [c8de3ef]
+- Updated dependencies [60f0fc8]
+- Updated dependencies [574c990]
+- Updated dependencies [d096f16]
+- Updated dependencies [3f29623]
+- Updated dependencies [2916852]
+- Updated dependencies [d047869]
+- Updated dependencies [162fa34]
+- Updated dependencies [e62561e]
+- Updated dependencies [3eeeb46]
+- Updated dependencies [85d0f82]
+- Updated dependencies [61bfc1c]
+- Updated dependencies [04bad47]
+- Updated dependencies [e40b048]
+- Updated dependencies [5a5b1bb]
+- Updated dependencies [f1708c3]
+- Updated dependencies [d254a81]
+- Updated dependencies [7123c47]
+- Updated dependencies [05befc1]
+- Updated dependencies [0663b6a]
+- Updated dependencies [f28f9b3]
+- Updated dependencies [9f340f7]
+- Updated dependencies [e53444f]
+- Updated dependencies [5eedd26]
+- Updated dependencies [92b0dd7]
+- Updated dependencies [f919b6f]
+- Updated dependencies [098e411]
+- Updated dependencies [e1b7c01]
+- Updated dependencies [9b94f87]
+- Updated dependencies [a7df753]
+  - @zhin.js/agent@1.1.5
+  - @zhin.js/host-http@1.0.8
+  - @zhin.js/permission@1.0.1
+  - @zhin.js/im-contract@1.0.3
+  - @zhin.js/adapter@1.1.7
+  - @zhin.js/plugin-runtime@1.1.5
+  - @zhin.js/command@1.0.9
+  - @zhin.js/core@1.5.4
+  - zhin.js@6.0.4
+
+## 6.0.4
+
+### Patch Changes
+
+- f8c7a54: fix: im
+- Updated dependencies [f8c7a54]
+  - @zhin.js/logger@1.0.76
+  - @zhin.js/host-http@1.0.7
+  - @zhin.js/adapter@1.1.6
+  - @zhin.js/agent@1.1.4
+  - @zhin.js/command@1.0.8
+  - @zhin.js/core@1.5.3
+  - @zhin.js/im-contract@1.0.2
+  - @zhin.js/plugin-runtime@1.1.4
+  - zhin.js@6.0.3
+
+## 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

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/adapters/onebot11.js

@@ -22,8 +22,8 @@ export default defineAdapter({
         const config = resolveOneBot11Config(context.config);
         const gateway = context.use(messageGatewayToken);
         // 注册到插件运行时状态（onebot11.endpoint list 的"运行中"数据源）
-        context.use(onebot11RuntimeStateToken).endpoints.set(config.name, {
-            name: config.name,
+        context.use(onebot11RuntimeStateToken).endpoints.set(config.id, {
+            id: config.id,
             mode: config.connection,
         });
         if (config.connection === 'wss') {

package/adapters/onebot11.ts

@@ -29,8 +29,8 @@ export default defineAdapter<OneBot11AdapterConfig>({
     const config = resolveOneBot11Config(context.config);
     const gateway = context.use(messageGatewayToken);
     // 注册到插件运行时状态（onebot11.endpoint list 的"运行中"数据源）
-    context.use(onebot11RuntimeStateToken).endpoints.set(config.name, {
-      name: config.name,
+    context.use(onebot11RuntimeStateToken).endpoints.set(config.id, {
+      id: config.id,
       mode: config.connection,
     });
     if (config.connection === 'wss') {

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/onebot11-agent-deps.d.ts

@@ -7,9 +7,9 @@ export interface Onebot11AgentEndpoint {
     callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
 }
 export interface Onebot11AgentDeps {
-    getEndpoint: (endpointId: string) => Onebot11AgentEndpoint;
+    getEndpoint: (endpointKey: string) => Onebot11AgentEndpoint;
 }
-export declare function registerOnebot11AgentEndpoint(endpointId: string, endpoint: Onebot11AgentEndpoint): () => void;
+export declare function registerOnebot11AgentEndpoint(endpointKey: string, endpoint: Onebot11AgentEndpoint): () => void;
 /** Optional override used by tests / transitional callers. */
 export declare function setOnebot11AgentDeps(deps: Onebot11AgentDeps): void;
 export declare function getOnebot11AgentDeps(): Onebot11AgentDeps;

package/lib/onebot11-agent-deps.js

@@ -4,11 +4,11 @@
  */
 const endpoints = new Map();
 let override = null;
-export function registerOnebot11AgentEndpoint(endpointId, endpoint) {
-    endpoints.set(endpointId, endpoint);
+export function registerOnebot11AgentEndpoint(endpointKey, endpoint) {
+    endpoints.set(endpointKey, endpoint);
     return () => {
-        if (endpoints.get(endpointId) === endpoint) {
-            endpoints.delete(endpointId);
+        if (endpoints.get(endpointKey) === endpoint) {
+            endpoints.delete(endpointKey);
         }
     };
 }
@@ -20,10 +20,10 @@ export function getOnebot11AgentDeps() {
     if (override)
         return override;
     return {
-        getEndpoint(endpointId) {
-            const registered = endpoints.get(endpointId);
+        getEndpoint(endpointKey) {
+            const registered = endpoints.get(endpointKey);
             if (!registered)
-                throw new Error(`Endpoint ${endpointId} 不存在`);
+                throw new Error(`Endpoint ${endpointKey} 不存在`);
             return registered;
         },
     };

package/lib/protocol.d.ts

@@ -4,13 +4,14 @@
  * 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;
     readonly connection?: 'ws' | 'wss';
     /** Legacy alias: `type: 'ws' | 'ws_reverse'` */
     readonly type?: string;
-    readonly name?: string;
+    readonly id?: string;
     readonly access_token?: string;
     readonly url?: string;
     readonly path?: string;
@@ -20,7 +21,7 @@ export interface OneBot11LegacyEndpointRow {
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface OneBot11AdapterConfig {
     readonly connection?: 'ws' | 'wss';
-    readonly name?: string;
+    readonly id?: string;
     readonly access_token?: string;
     readonly url?: string;
     readonly path?: string;
@@ -31,7 +32,7 @@ export interface OneBot11AdapterConfig {
 }
 export interface OneBot11ConfigBase {
     readonly context: 'onebot11';
-    readonly name: string;
+    readonly id: string;
     readonly access_token?: string;
 }
 /** 正向 WebSocket：应用连 OneBot 实现的 WS 服务器 */
@@ -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(endpointKey: string, ev: OneBot11Event): ConversationRef;
 /** Build inbound text for MessageGateway.receive */
 export declare function formatInboundContent(ev: OneBot11Event): string;
 export declare function senderDisplayName(ev: OneBot11Event): string;
@@ -126,8 +124,17 @@ export declare function isOneBot11BotMentioned(input: {
     readonly selfId: string | undefined;
     readonly message?: readonly OneBot11Segment[];
 }): boolean;
-/** 构造 gateway.receive 的 metadata（ws / wss 两个 endpoint 共用）。 */
-export declare function formatInboundMetadata(ev: OneBot11Event, endpoint: string): Readonly<Record<string, unknown>>;
+/** Inbound fields extracted from an event for gateway.receive (ws / wss 两个 endpoint 共用). */
+export interface OneBot11InboundFields {
+    readonly metadata: Readonly<Record<string, unknown>>;
+    readonly endpointId: string;
+    readonly mentioned: boolean;
+    readonly replyTo: {
+        readonly id: string;
+    } | undefined;
+}
+/** 构造 gateway.receive 的 metadata 与提升字段（ws / wss 两个 endpoint 共用）。 */
+export declare function formatInboundMetadata(ev: OneBot11Event, endpoint: string): OneBot11InboundFields;
 /**
  * canonical MediaRef → OneBot `file` 参数：url 直传、base64 → `base64://`、
  * 本地路径 → `file://`（路径在 OneBot 实现侧解析）、kind=file 不透明引用原样透传。
@@ -140,7 +147,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

@@ -18,8 +18,8 @@ function normalizeConnection(connection, legacyType) {
 export function resolveOneBot11Config(config = {}) {
     const entry = config.endpoints?.find((item) => item.context === 'onebot11');
     const connection = normalizeConnection(config.connection ?? entry?.connection, entry?.type);
-    const name = (typeof config.name === 'string' && config.name)
-        || (typeof entry?.name === 'string' && entry.name)
+    const id = (typeof config.id === 'string' && config.id)
+        || (typeof entry?.id === 'string' && entry.id)
         || process.env.ONEBOT11_BOT_NAME
         || 'onebot11-bot';
     const access_token = config.access_token ?? entry?.access_token;
@@ -31,7 +31,7 @@ export function resolveOneBot11Config(config = {}) {
         return {
             context: 'onebot11',
             connection: 'ws',
-            name,
+            id,
             access_token,
             url,
             reconnect_interval: config.reconnect_interval ?? entry?.reconnect_interval ?? 5000,
@@ -46,7 +46,7 @@ export function resolveOneBot11Config(config = {}) {
         return {
             context: 'onebot11',
             connection: 'wss',
-            name,
+            id,
             access_token,
             path,
             heartbeat_interval: config.heartbeat_interval ?? entry?.heartbeat_interval ?? 30_000,
@@ -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(endpointKey, 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: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
+        kind,
+        id: getChannelId(ev),
+    };
 }
 /** Build inbound text for MessageGateway.receive */
 export function formatInboundContent(ev) {
@@ -153,24 +144,26 @@ export function isOneBot11BotMentioned(input) {
         return qq !== 'all' && qq === input.selfId;
     });
 }
-/** 构造 gateway.receive 的 metadata（ws / wss 两个 endpoint 共用）。 */
+/** 构造 gateway.receive 的 metadata 与提升字段（ws / wss 两个 endpoint 共用）。 */
 export function formatInboundMetadata(ev, endpoint) {
     const selfId = ev.self_id != null ? String(ev.self_id) : undefined;
     const nickname = senderNickname(ev);
     const quoteId = extractQuoteId(ev);
     const mentioned = isOneBot11BotMentioned({ selfId, message: ev.message });
-    return Object.freeze({
-        message_type: ev.message_type,
-        user_id: ev.user_id != null ? String(ev.user_id) : undefined,
-        group_id: ev.group_id != null ? String(ev.group_id) : undefined,
-        endpoint,
-        time: ev.time,
-        self_id: selfId,
-        role: ev.sender?.role,
-        ...(nickname ? { nickname } : {}),
-        ...(quoteId ? { quote_id: quoteId } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
-    });
+    return {
+        metadata: Object.freeze({
+            message_type: ev.message_type,
+            user_id: ev.user_id != null ? String(ev.user_id) : undefined,
+            group_id: ev.group_id != null ? String(ev.group_id) : undefined,
+            time: ev.time,
+            self_id: selfId,
+            role: ev.sender?.role,
+            ...(nickname ? { nickname } : {}),
+        }),
+        endpointId: endpoint,
+        mentioned,
+        replyTo: quoteId ? { id: quoteId } : undefined,
+    };
 }
 /**
  * canonical MediaRef → OneBot `file` 参数：url 直传、base64 → `base64://`、
@@ -289,13 +282,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 +295,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

@@ -3,13 +3,13 @@
  */
 import WebSocket from 'ws';
 import { createEndpointLifecycle, } from '@zhin.js/adapter';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } 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, senderDisplayName, senderUserId, } from './protocol.js';
 import { callOneBot11WsAction, handleOneBot11WsMessage, rejectAllPending, } from './ws-transport.js';
-const logger = getLogger('onebot11');
 export class OneBot11WsEndpoint {
+    #logger;
     #options;
     management = createOneBot11EndpointManagement(this);
     #lifecycle;
@@ -19,10 +19,11 @@ export class OneBot11WsEndpoint {
     #open = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('onebot11', options.config.id);
         this.#options = options;
         const { config } = options;
         this.#lifecycle = createEndpointLifecycle({
-            name: config.name,
+            name: config.id,
             reconnect: {
                 initialIntervalMs: config.reconnect_interval,
                 // 固定间隔（multiplier 1、无抖动），对齐旧 reconnect_interval 语义
@@ -37,7 +38,7 @@ export class OneBot11WsEndpoint {
         if (this.#lifecycle.started)
             return;
         // agent 注册/反注册是适配器专有依赖，留在适配器侧（见 endpoint-lifecycle 迁移指引）
-        this.#unregisterAgent = registerOnebot11AgentEndpoint(this.#options.config.name, this);
+        this.#unregisterAgent = registerOnebot11AgentEndpoint(this.#options.config.id, this);
         try {
             await this.#lifecycle.start((handle) => this.#connect(handle));
         }
@@ -72,15 +73,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({
+        this.#logger.debug(formatCompact({
             op: 'onebot11_send',
-            endpoint: this.#options.config.name,
-            target,
+            endpoint: this.#options.config.id,
+            target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
         return messageId;
@@ -107,19 +108,26 @@ 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);
+        const inbound = formatInboundMetadata(ev, this.#options.config.id);
         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),
+            sender: {
+                id: senderUserId(ev),
+                name: senderDisplayName(ev) || undefined,
+                ...(ev.sender?.role ? { roles: [ev.sender.role] } : {}),
+            },
+            endpointId: inbound.endpointId,
+            ...(inbound.mentioned ? { mentioned: true } : {}),
+            ...(inbound.replyTo ? { replyTo: inbound.replyTo } : {}),
+            metadata: inbound.metadata,
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'onebot11_gateway_receive_failed',
-                target,
+                target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
             }));
         });
@@ -145,14 +153,14 @@ export class OneBot11WsEndpoint {
                     return;
                 settled = true;
                 if (!this.#options.config.access_token) {
-                    logger.warn(formatCompact({
-                        endpoint: this.#options.config.name,
+                    this.#logger.warn(formatCompact({
+                        endpoint: this.#options.config.id,
                         ok: false,
                         error: 'missing access_token',
                     }));
                 }
-                logger.debug(formatCompact({
-                    endpoint: this.#options.config.name,
+                this.#logger.debug(formatCompact({
+                    endpoint: this.#options.config.id,
                     mode: 'ws',
                     url: safeUrl,
                 }));
@@ -161,7 +169,7 @@ export class OneBot11WsEndpoint {
             });
             ws.on('message', (data) => {
                 handleOneBot11WsMessage(data, {
-                    endpointName: this.#options.config.name,
+                    endpointId: this.#options.config.id,
                     pending: this.#pending,
                     admit: (ev) => this.admit(ev),
                 });
@@ -188,9 +196,9 @@ export class OneBot11WsEndpoint {
             });
             ws.on('error', (err) => {
                 const error = err instanceof Error ? err : new Error(String(err));
-                logger.warn(formatCompact({
+                this.#logger.warn(formatCompact({
                     op: 'ws_error',
-                    endpoint: this.#options.config.name,
+                    endpoint: this.#options.config.id,
                     ok: false,
                     error: error.message,
                 }));

package/lib/ws-transport.d.ts

@@ -2,7 +2,7 @@ import { type OneBot11Event } from './protocol.js';
 import { type OneBot11PendingAction, type OneBot11WsSocket } from './ws-types.js';
 export declare function decodeWsPayload(data: unknown): string;
 export declare function handleOneBot11WsMessage(data: unknown, options: {
-    readonly endpointName: string;
+    readonly endpointId: string;
     readonly pending: Map<string, OneBot11PendingAction>;
     readonly admit: (ev: OneBot11Event) => void;
 }): void;

package/lib/ws-transport.js

@@ -33,7 +33,7 @@ export function handleOneBot11WsMessage(data, options) {
     catch (error) {
         logger.warn(formatCompact({
             op: 'onebot11_parse_failed',
-            endpoint: options.endpointName,
+            endpoint: options.endpointId,
             error: error instanceof Error ? error.message : String(error),
         }));
     }

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>;