@zhin.js/adapter-onebot12 5.0.2 → 5.0.4

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @zhin.js/adapter-onebot12
 
+## 5.0.4
+
+### Patch Changes
+
+- Updated dependencies [0de46a8]
+- Updated dependencies [c106ecc]
+- Updated dependencies [ca92e03]
+- Updated dependencies [b0f37ae]
+- Updated dependencies [ba08a2f]
+- Updated dependencies [daffd4c]
+- Updated dependencies [36c7400]
+- Updated dependencies [162fa34]
+- Updated dependencies [e40b048]
+- Updated dependencies [f1708c3]
+- Updated dependencies [e53444f]
+- Updated dependencies [92b0dd7]
+- Updated dependencies [a7df753]
+  - @zhin.js/host-http@1.0.8
+  - @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
+
+## 5.0.3
+
+### 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/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
+
 ## 5.0.2
 
 ### Patch Changes

package/adapters/onebot12.js

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

package/adapters/onebot12.ts

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

package/lib/protocol.d.ts

@@ -9,7 +9,7 @@ import type { ConversationRef } from '@zhin.js/im-contract';
 export interface OneBot12LegacyEndpointRow {
     readonly context?: string;
     readonly connection?: 'ws' | 'webhook' | 'wss';
-    readonly name?: string;
+    readonly id?: string;
     readonly access_token?: string;
     readonly url?: string;
     readonly path?: string;
@@ -20,7 +20,7 @@ export interface OneBot12LegacyEndpointRow {
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface OneBot12AdapterConfig {
     readonly connection?: 'ws' | 'webhook' | 'wss';
-    readonly name?: string;
+    readonly id?: string;
     readonly access_token?: string;
     readonly url?: string;
     readonly path?: string;
@@ -32,7 +32,7 @@ export interface OneBot12AdapterConfig {
 }
 export interface OneBot12ConfigBase {
     readonly context: 'onebot12';
-    readonly name: string;
+    readonly id: string;
     readonly access_token?: string;
 }
 /** 正向 WebSocket：应用连 OneBot 实现的 WS 服务器 */
@@ -114,7 +114,7 @@ export declare function getChannelId(ev: OneBot12Event): string;
  * 进 `parent`（kind 'channel'）；私聊临时会话（private 事件携带 group_id）映射为
  * group 容器内的 private 会话。
  */
-export declare function onebot12InboundConversation(endpointId: string, ev: OneBot12Event): ConversationRef;
+export declare function onebot12InboundConversation(endpointKey: string, ev: OneBot12Event): ConversationRef;
 /** Build inbound text for MessageGateway.receive */
 export declare function formatInboundContent(ev: OneBot12Event): string;
 /**

package/lib/protocol.js

@@ -11,8 +11,8 @@ export function resolveOneBot12Config(config = {}) {
     const connection = config.connection
         ?? entry?.connection
         ?? 'ws';
-    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.ONEBOT12_BOT_NAME
         || 'onebot12-bot';
     const access_token = config.access_token ?? entry?.access_token;
@@ -24,7 +24,7 @@ export function resolveOneBot12Config(config = {}) {
         return {
             context: 'onebot12',
             connection: 'ws',
-            name,
+            id,
             access_token,
             url,
             reconnect_interval: config.reconnect_interval ?? entry?.reconnect_interval ?? 5000,
@@ -39,7 +39,7 @@ export function resolveOneBot12Config(config = {}) {
         return {
             context: 'onebot12',
             connection: 'webhook',
-            name,
+            id,
             access_token,
             path,
             api_url: config.api_url ?? entry?.api_url,
@@ -53,7 +53,7 @@ export function resolveOneBot12Config(config = {}) {
         return {
             context: 'onebot12',
             connection: 'wss',
-            name,
+            id,
             access_token,
             path,
             heartbeat_interval: config.heartbeat_interval ?? entry?.heartbeat_interval ?? 30_000,
@@ -81,8 +81,8 @@ export function getChannelId(ev) {
  * 进 `parent`（kind 'channel'）；私聊临时会话（private 事件携带 group_id）映射为
  * group 容器内的 private 会话。
  */
-export function onebot12InboundConversation(endpointId, ev) {
-    const endpoint = { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId };
+export function onebot12InboundConversation(endpointKey, ev) {
+    const endpoint = { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey };
     if (ev.detail_type === 'group' && ev.group_id) {
         return { endpoint, kind: 'group', id: ev.group_id };
     }

package/lib/webhook.js

@@ -21,7 +21,7 @@ export class OneBot12WebhookEndpoint {
         if (!this.#options.config.access_token) {
             // webhook 模式未配 access_token 时任何 POST 都会被放行（verifyOneBotAccessToken 直接 return true）
             logger.warn(formatCompact({
-                endpoint: this.#options.config.name,
+                endpoint: this.#options.config.id,
                 mode: 'webhook',
                 ok: false,
                 error: 'missing access_token',
@@ -30,7 +30,7 @@ export class OneBot12WebhookEndpoint {
         this.#setupRoutes();
         logger.info(formatCompact({
             op: 'listen',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             mode: 'webhook',
             path: this.#options.config.path,
         }));
@@ -46,13 +46,13 @@ export class OneBot12WebhookEndpoint {
         for (const release of this.#routeReleases.splice(0))
             release();
         this.#started = false;
-        logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
+        logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.id }));
     }
     async send({ conversation, payload }) {
         const materialized = await uploadOneBot12MediaSegments(payload, (action, params) => this.callApi(action, params), (error) => {
             logger.warn(formatCompact({
                 op: 'onebot12_upload_failed',
-                endpoint: this.#options.config.name,
+                endpoint: this.#options.config.id,
                 error: error instanceof Error ? error.message : String(error),
             }));
         });
@@ -62,7 +62,7 @@ export class OneBot12WebhookEndpoint {
         const messageId = data?.message_id ?? '';
         logger.debug(formatCompact({
             op: 'onebot12_send',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             kind: conversation.kind,
             conversationId: conversation.id,
             messageId,
@@ -89,17 +89,17 @@ export class OneBot12WebhookEndpoint {
             conversation,
             message: { conversation, id: ev.message_id },
             content,
-            sender: senderUserId(ev),
+            sender: { id: senderUserId(ev), ...(nickname ? { name: nickname } : {}) },
+            endpointId: this.#options.config.id,
+            ...(mentioned ? { mentioned: true } : {}),
             metadata: Object.freeze({
                 detail_type: ev.detail_type,
                 user_id: ev.user_id,
                 group_id: ev.group_id,
                 channel_id: ev.channel_id,
                 guild_id: ev.guild_id,
-                endpoint: this.#options.config.name,
                 time: ev.time,
                 ...(nickname ? { nickname } : {}),
-                ...(mentioned ? { mentioned: true } : {}),
             }),
         }).catch((err) => {
             logger.warn(formatCompact({

package/lib/ws-endpoint.js

@@ -4,12 +4,12 @@
 import WebSocket from 'ws';
 import { clearTimeout } from 'node:timers';
 import { createEndpointLifecycle, } from '@zhin.js/adapter';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
 import { buildSendMessageParams, buildWsConnectOptions, formatInboundContent, formatOutboundSegments, isBotMentioned, isMessageEvent, onebot12InboundConversation, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
 import { WS_OPEN, } from './ws-types.js';
-const logger = getLogger('onebot12');
 export class OneBot12WsEndpoint {
+    #logger;
     #options;
     management = createOneBot12EndpointManagement(this);
     #lifecycle;
@@ -18,10 +18,11 @@ export class OneBot12WsEndpoint {
     #pending = new Map();
     #open = false;
     constructor(options) {
+        this.#logger = getAdapterLogger('onebot12', 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 语义
@@ -71,9 +72,9 @@ export class OneBot12WsEndpoint {
     }
     async send({ conversation, payload }) {
         const materialized = await uploadOneBot12MediaSegments(payload, (action, params) => this.callApi(action, params), (error) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'onebot12_upload_failed',
-                endpoint: this.#options.config.name,
+                endpoint: this.#options.config.id,
                 error: error instanceof Error ? error.message : String(error),
             }));
         });
@@ -81,9 +82,9 @@ export class OneBot12WsEndpoint {
         const params = buildSendMessageParams(conversation, message);
         const data = await this.#callAction('send_message', params);
         const messageId = data?.message_id ?? '';
-        logger.debug(formatCompact({
+        this.#logger.debug(formatCompact({
             op: 'onebot12_send',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             kind: conversation.kind,
             conversationId: conversation.id,
             messageId,
@@ -111,20 +112,20 @@ export class OneBot12WsEndpoint {
             conversation,
             message: { conversation, id: ev.message_id },
             content,
-            sender: senderUserId(ev),
+            sender: { id: senderUserId(ev), name: senderNickname(ev) },
+            endpointId: this.#options.config.id,
+            ...(mentioned ? { mentioned: true } : {}),
             metadata: Object.freeze({
                 detail_type: ev.detail_type,
                 user_id: ev.user_id,
                 group_id: ev.group_id,
                 channel_id: ev.channel_id,
                 guild_id: ev.guild_id,
-                endpoint: this.#options.config.name,
                 time: ev.time,
                 ...(nickname ? { nickname } : {}),
-                ...(mentioned ? { mentioned: true } : {}),
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'onebot12_gateway_receive_failed',
                 kind: conversation.kind,
                 conversationId: conversation.id,
@@ -152,8 +153,8 @@ export class OneBot12WsEndpoint {
                 if (settled)
                     return;
                 settled = true;
-                logger.debug(formatCompact({
-                    endpoint: this.#options.config.name,
+                this.#logger.debug(formatCompact({
+                    endpoint: this.#options.config.id,
                     mode: 'ws',
                     url: safeUrl,
                 }));
@@ -182,9 +183,9 @@ export class OneBot12WsEndpoint {
             });
             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,
                 }));
@@ -221,9 +222,9 @@ export class OneBot12WsEndpoint {
             this.admit(msg);
         }
         catch (error) {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'onebot12_parse_failed',
-                endpoint: this.#options.config.name,
+                endpoint: this.#options.config.id,
                 error: error instanceof Error ? error.message : String(error),
             }));
         }

package/lib/wss-endpoint.js

@@ -2,13 +2,13 @@
  * OneBot12 reverse WSS endpoint — accepts inbound WebSocket from OneBot implementation.
  */
 import { clearInterval } from 'node:timers';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
 import { buildSendMessageParams, formatInboundContent, formatOutboundSegments, isBotMentioned, isMessageEvent, onebot12InboundConversation, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
 import { verifyOneBotAccessToken } from './wss-auth.js';
 import { WS_OPEN } from './ws-types.js';
-const logger = getLogger('onebot12');
 export class OneBot12WssEndpoint {
+    #logger;
     #options;
     management = createOneBot12EndpointManagement(this);
     #ws;
@@ -19,6 +19,7 @@ export class OneBot12WssEndpoint {
     #open = false;
     #started = false;
     constructor(options) {
+        this.#logger = getAdapterLogger('onebot12', options.config.id);
         this.#options = options;
     }
     async start() {
@@ -27,8 +28,8 @@ export class OneBot12WssEndpoint {
         this.#started = true;
         if (!this.#options.config.access_token) {
             // wss 模式未配 access_token 时任何连接都会被放行（verifyOneBotAccessToken 直接 return true）
-            logger.warn(formatCompact({
-                endpoint: this.#options.config.name,
+            this.#logger.warn(formatCompact({
+                endpoint: this.#options.config.id,
                 mode: 'wss',
                 ok: false,
                 error: 'missing access_token',
@@ -38,9 +39,9 @@ export class OneBot12WssEndpoint {
         this.#wsRelease = handle.onConnection((connection) => {
             this.#acceptConnection(connection);
         });
-        logger.info(formatCompact({
+        this.#logger.info(formatCompact({
             op: 'listen',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             mode: 'wss',
             path: this.#options.config.path,
         }));
@@ -77,9 +78,9 @@ export class OneBot12WssEndpoint {
     }
     async send({ conversation, payload }) {
         const materialized = await uploadOneBot12MediaSegments(payload, (action, params) => this.callApi(action, params), (error) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'onebot12_upload_failed',
-                endpoint: this.#options.config.name,
+                endpoint: this.#options.config.id,
                 error: error instanceof Error ? error.message : String(error),
             }));
         });
@@ -107,20 +108,20 @@ export class OneBot12WssEndpoint {
             conversation,
             message: { conversation, id: ev.message_id },
             content: formatInboundContent(ev),
-            sender: senderUserId(ev),
+            sender: { id: senderUserId(ev), name: senderNickname(ev) },
+            endpointId: this.#options.config.id,
+            ...(mentioned ? { mentioned: true } : {}),
             metadata: Object.freeze({
                 detail_type: ev.detail_type,
                 user_id: ev.user_id,
                 group_id: ev.group_id,
                 channel_id: ev.channel_id,
                 guild_id: ev.guild_id,
-                endpoint: this.#options.config.name,
                 time: ev.time,
                 ...(nickname ? { nickname } : {}),
-                ...(mentioned ? { mentioned: true } : {}),
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'onebot12_gateway_receive_failed',
                 kind: conversation.kind,
                 conversationId: conversation.id,
@@ -156,8 +157,8 @@ export class OneBot12WssEndpoint {
                 }
             }
         });
-        logger.debug(formatCompact({
-            endpoint: this.#options.config.name,
+        this.#logger.debug(formatCompact({
+            endpoint: this.#options.config.id,
             mode: 'wss',
             peer: connection.request.socket.remoteAddress,
         }));
@@ -188,9 +189,9 @@ export class OneBot12WssEndpoint {
             this.admit(msg);
         }
         catch (error) {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'onebot12_parse_failed',
-                endpoint: this.#options.config.name,
+                endpoint: this.#options.config.id,
                 error: error instanceof Error ? error.message : String(error),
             }));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-onebot12",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "Zhin.js OneBot 12 adapter for Plugin Runtime (WebSocket client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -40,26 +40,26 @@
   },
   "dependencies": {
     "ws": "^8.21.1",
-    "@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/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.1.3",
-    "@zhin.js/im-contract": "1.0.1"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/command": "1.0.9",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/host-http": "1.0.8",
+    "@zhin.js/im-contract": "1.0.3",
+    "@zhin.js/logger": "1.0.76",
+    "@zhin.js/plugin-runtime": "1.1.5"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
     "@types/ws": "^8.18.1",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "@zhin.js/host-http": "1.0.6"
+    "@zhin.js/host-http": "1.0.8"
   },
   "peerDependencies": {
-    "@zhin.js/adapter": "1.1.5",
-    "@zhin.js/core": "1.5.2",
-    "@zhin.js/plugin-runtime": "1.1.3",
-    "zhin.js": "6.0.2"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/plugin-runtime": "1.1.5",
+    "zhin.js": "6.0.4"
   },
   "peerDependenciesMeta": {
     "zhin.js": {

package/schema.json

@@ -21,16 +21,48 @@
       "type": "number",
       "default": 30000
     },
+    "master": {
+      "type": [
+        "string",
+        "number"
+      ],
+      "description": "框架 master（platform user id；AI/工具权限、endpoint 管理）。endpoints[i].master 可逐项覆盖"
+    },
+    "trusted": {
+      "type": "array",
+      "items": {
+        "type": [
+          "string",
+          "number"
+        ],
+        "description": "Trusted platform user id"
+      },
+      "description": "框架 trusted 用户列表（弱于 master）。endpoints[i].trusted 可逐项追加"
+    },
     "endpoints": {
       "type": "array",
-      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（name 必填，其余覆盖顶层）",
+      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（id 必填，其余覆盖顶层）",
       "items": {
         "type": "object",
         "additionalProperties": true,
         "properties": {
-          "name": {
-            "type": "string",
-            "description": "OneBot12 bot name"
+          "master": {
+            "type": [
+              "string",
+              "number"
+            ],
+            "description": "本 endpoint 的框架 master（platform user id）；覆盖顶层 master"
+          },
+          "trusted": {
+            "type": "array",
+            "items": {
+              "type": [
+                "string",
+                "number"
+              ],
+              "description": "Trusted platform user id"
+            },
+            "description": "本 endpoint 的 trusted 列表"
           },
           "url": {
             "type": "string",
@@ -47,10 +79,14 @@
           "access_token": {
             "type": "string",
             "description": "OneBot access token"
+          },
+          "id": {
+            "type": "string",
+            "description": "OneBot12 bot name"
           }
         },
         "required": [
-          "name"
+          "id"
         ]
       }
     },

package/src/protocol.ts

@@ -13,7 +13,7 @@ const logger = getLogger('onebot12');
 export interface OneBot12LegacyEndpointRow {
   readonly context?: string;
   readonly connection?: 'ws' | 'webhook' | 'wss';
-  readonly name?: string;
+  readonly id?: string;
   readonly access_token?: string;
   readonly url?: string;
   readonly path?: string;
@@ -25,7 +25,7 @@ export interface OneBot12LegacyEndpointRow {
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface OneBot12AdapterConfig {
   readonly connection?: 'ws' | 'webhook' | 'wss';
-  readonly name?: string;
+  readonly id?: string;
   readonly access_token?: string;
   readonly url?: string;
   readonly path?: string;
@@ -38,7 +38,7 @@ export interface OneBot12AdapterConfig {
 
 export interface OneBot12ConfigBase {
   readonly context: 'onebot12';
-  readonly name: string;
+  readonly id: string;
   readonly access_token?: string;
 }
 
@@ -124,8 +124,8 @@ export function resolveOneBot12Config(config: OneBot12AdapterConfig = {}): Resol
   const connection = config.connection
     ?? entry?.connection
     ?? 'ws';
-  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.ONEBOT12_BOT_NAME
     || 'onebot12-bot';
   const access_token = config.access_token ?? entry?.access_token;
@@ -140,7 +140,7 @@ export function resolveOneBot12Config(config: OneBot12AdapterConfig = {}): Resol
     return {
       context: 'onebot12',
       connection: 'ws',
-      name,
+      id,
       access_token,
       url,
       reconnect_interval: config.reconnect_interval ?? entry?.reconnect_interval ?? 5000,
@@ -156,7 +156,7 @@ export function resolveOneBot12Config(config: OneBot12AdapterConfig = {}): Resol
     return {
       context: 'onebot12',
       connection: 'webhook',
-      name,
+      id,
       access_token,
       path,
       api_url: config.api_url ?? entry?.api_url,
@@ -171,7 +171,7 @@ export function resolveOneBot12Config(config: OneBot12AdapterConfig = {}): Resol
     return {
       context: 'onebot12',
       connection: 'wss',
-      name,
+      id,
       access_token,
       path,
       heartbeat_interval: config.heartbeat_interval ?? entry?.heartbeat_interval ?? 30_000,
@@ -203,8 +203,8 @@ export function getChannelId(ev: OneBot12Event): string {
  * 进 `parent`（kind 'channel'）；私聊临时会话（private 事件携带 group_id）映射为
  * group 容器内的 private 会话。
  */
-export function onebot12InboundConversation(endpointId: string, ev: OneBot12Event): ConversationRef {
-  const endpoint = { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId };
+export function onebot12InboundConversation(endpointKey: string, ev: OneBot12Event): ConversationRef {
+  const endpoint = { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey };
   if (ev.detail_type === 'group' && ev.group_id) {
     return { endpoint, kind: 'group', id: ev.group_id };
   }

package/src/webhook.ts

@@ -53,7 +53,7 @@ export class OneBot12WebhookEndpoint implements EndpointInstance {
     if (!this.#options.config.access_token) {
       // webhook 模式未配 access_token 时任何 POST 都会被放行（verifyOneBotAccessToken 直接 return true）
       logger.warn(formatCompact({
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         mode: 'webhook',
         ok: false,
         error: 'missing access_token',
@@ -62,7 +62,7 @@ export class OneBot12WebhookEndpoint implements EndpointInstance {
     this.#setupRoutes();
     logger.info(formatCompact({
       op: 'listen',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       mode: 'webhook',
       path: this.#options.config.path,
     }));
@@ -80,7 +80,7 @@ export class OneBot12WebhookEndpoint implements EndpointInstance {
     this.#open = false;
     for (const release of this.#routeReleases.splice(0)) release();
     this.#started = false;
-    logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
+    logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.id }));
   }
 
   async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
@@ -90,7 +90,7 @@ export class OneBot12WebhookEndpoint implements EndpointInstance {
       (error) => {
         logger.warn(formatCompact({
           op: 'onebot12_upload_failed',
-          endpoint: this.#options.config.name,
+          endpoint: this.#options.config.id,
           error: error instanceof Error ? error.message : String(error),
         }));
       },
@@ -101,7 +101,7 @@ export class OneBot12WebhookEndpoint implements EndpointInstance {
     const messageId = data?.message_id ?? '';
     logger.debug(formatCompact({
       op: 'onebot12_send',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       kind: conversation.kind,
       conversationId: conversation.id,
       messageId,
@@ -133,17 +133,17 @@ export class OneBot12WebhookEndpoint implements EndpointInstance {
       conversation,
       message: { conversation, id: ev.message_id },
       content,
-      sender: senderUserId(ev),
+      sender: { id: senderUserId(ev), ...(nickname ? { name: nickname } : {}) },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       metadata: Object.freeze({
         detail_type: ev.detail_type,
         user_id: ev.user_id,
         group_id: ev.group_id,
         channel_id: ev.channel_id,
         guild_id: ev.guild_id,
-        endpoint: this.#options.config.name,
         time: ev.time,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
       logger.warn(formatCompact({

package/src/ws-endpoint.ts

@@ -12,7 +12,7 @@ import {
   type EndpointSendRequest,
 } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
 import {
@@ -37,8 +37,6 @@ import {
   WS_OPEN,
 } from './ws-types.js';
 
-const logger = getLogger('onebot12');
-
 export interface OneBot12WsEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -50,6 +48,8 @@ export interface OneBot12WsEndpointOptions {
 }
 
 export class OneBot12WsEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: OneBot12WsEndpointOptions;
   readonly management: EndpointManagement = createOneBot12EndpointManagement(this);
   readonly #lifecycle: EndpointLifecycle;
@@ -63,10 +63,11 @@ export class OneBot12WsEndpoint implements EndpointInstance {
   #open = false;
 
   constructor(options: OneBot12WsEndpointOptions) {
+    this.#logger = getAdapterLogger('onebot12', 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 语义
@@ -121,9 +122,9 @@ export class OneBot12WsEndpoint implements EndpointInstance {
       payload,
       (action, params) => this.callApi(action, params),
       (error) => {
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'onebot12_upload_failed',
-          endpoint: this.#options.config.name,
+          endpoint: this.#options.config.id,
           error: error instanceof Error ? error.message : String(error),
         }));
       },
@@ -132,9 +133,9 @@ export class OneBot12WsEndpoint implements EndpointInstance {
     const params = buildSendMessageParams(conversation, message);
     const data = await this.#callAction('send_message', params) as { message_id?: string } | undefined;
     const messageId = data?.message_id ?? '';
-    logger.debug(formatCompact({
+    this.#logger.debug(formatCompact({
       op: 'onebot12_send',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       kind: conversation.kind,
       conversationId: conversation.id,
       messageId,
@@ -163,20 +164,20 @@ export class OneBot12WsEndpoint implements EndpointInstance {
       conversation,
       message: { conversation, id: ev.message_id },
       content,
-      sender: senderUserId(ev),
+      sender: { id: senderUserId(ev), name: senderNickname(ev) },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       metadata: Object.freeze({
         detail_type: ev.detail_type,
         user_id: ev.user_id,
         group_id: ev.group_id,
         channel_id: ev.channel_id,
         guild_id: ev.guild_id,
-        endpoint: this.#options.config.name,
         time: ev.time,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'onebot12_gateway_receive_failed',
         kind: conversation.kind,
         conversationId: conversation.id,
@@ -206,8 +207,8 @@ export class OneBot12WsEndpoint implements EndpointInstance {
       ws.on('open', () => {
         if (settled) return;
         settled = true;
-        logger.debug(formatCompact({
-          endpoint: this.#options.config.name,
+        this.#logger.debug(formatCompact({
+          endpoint: this.#options.config.id,
           mode: 'ws',
           url: safeUrl,
         }));
@@ -239,9 +240,9 @@ export class OneBot12WsEndpoint implements EndpointInstance {
 
       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,
         }));
@@ -276,9 +277,9 @@ export class OneBot12WsEndpoint implements EndpointInstance {
       }
       this.admit(msg as OneBot12Event);
     } catch (error) {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'onebot12_parse_failed',
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         error: error instanceof Error ? error.message : String(error),
       }));
     }

package/src/wss-endpoint.ts

@@ -5,7 +5,7 @@ import { clearInterval } from 'node:timers';
 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';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
 import {
@@ -26,8 +26,6 @@ import {
 import { verifyOneBotAccessToken } from './wss-auth.js';
 import { type OneBot12WsSocket, WS_OPEN } from './ws-types.js';
 
-const logger = getLogger('onebot12');
-
 export interface OneBot12WssEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -36,6 +34,8 @@ export interface OneBot12WssEndpointOptions {
 }
 
 export class OneBot12WssEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: OneBot12WssEndpointOptions;
   readonly management: EndpointManagement = createOneBot12EndpointManagement(this);
   #ws?: OneBot12WsSocket;
@@ -51,6 +51,7 @@ export class OneBot12WssEndpoint implements EndpointInstance {
   #started = false;
 
   constructor(options: OneBot12WssEndpointOptions) {
+    this.#logger = getAdapterLogger('onebot12', options.config.id);
     this.#options = options;
   }
 
@@ -59,8 +60,8 @@ export class OneBot12WssEndpoint implements EndpointInstance {
     this.#started = true;
     if (!this.#options.config.access_token) {
       // wss 模式未配 access_token 时任何连接都会被放行（verifyOneBotAccessToken 直接 return true）
-      logger.warn(formatCompact({
-        endpoint: this.#options.config.name,
+      this.#logger.warn(formatCompact({
+        endpoint: this.#options.config.id,
         mode: 'wss',
         ok: false,
         error: 'missing access_token',
@@ -70,9 +71,9 @@ export class OneBot12WssEndpoint implements EndpointInstance {
     this.#wsRelease = handle.onConnection((connection) => {
       this.#acceptConnection(connection);
     });
-    logger.info(formatCompact({
+    this.#logger.info(formatCompact({
       op: 'listen',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       mode: 'wss',
       path: this.#options.config.path,
     }));
@@ -115,9 +116,9 @@ export class OneBot12WssEndpoint implements EndpointInstance {
       payload,
       (action, params) => this.callApi(action, params),
       (error) => {
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'onebot12_upload_failed',
-          endpoint: this.#options.config.name,
+          endpoint: this.#options.config.id,
           error: error instanceof Error ? error.message : String(error),
         }));
       },
@@ -147,20 +148,20 @@ export class OneBot12WssEndpoint implements EndpointInstance {
       conversation,
       message: { conversation, id: ev.message_id },
       content: formatInboundContent(ev),
-      sender: senderUserId(ev),
+      sender: { id: senderUserId(ev), name: senderNickname(ev) },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       metadata: Object.freeze({
         detail_type: ev.detail_type,
         user_id: ev.user_id,
         group_id: ev.group_id,
         channel_id: ev.channel_id,
         guild_id: ev.guild_id,
-        endpoint: this.#options.config.name,
         time: ev.time,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'onebot12_gateway_receive_failed',
         kind: conversation.kind,
         conversationId: conversation.id,
@@ -196,8 +197,8 @@ export class OneBot12WssEndpoint implements EndpointInstance {
         }
       }
     });
-    logger.debug(formatCompact({
-      endpoint: this.#options.config.name,
+    this.#logger.debug(formatCompact({
+      endpoint: this.#options.config.id,
       mode: 'wss',
       peer: connection.request.socket.remoteAddress,
     }));
@@ -226,9 +227,9 @@ export class OneBot12WssEndpoint implements EndpointInstance {
       }
       this.admit(msg as OneBot12Event);
     } catch (error) {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'onebot12_parse_failed',
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         error: error instanceof Error ? error.message : String(error),
       }));
     }