@zhin.js/adapter-onebot11 6.0.3 → 6.0.5

package/CHANGELOG.md

@@ -1,5 +1,84 @@
 # @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

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

@@ -11,7 +11,7 @@ export interface OneBot11LegacyEndpointRow {
     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;
@@ -21,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;
@@ -32,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 服务器 */
@@ -103,7 +103,7 @@ export declare function getChannelId(ev: OneBot11Event): string;
  * 其余（private 及带 group_id 的非 private 事件按群处理）→ kind 'private'。
  * OneBot 11 无 guild/temp 容器概念，不填 parent。
  */
-export declare function onebot11InboundConversation(endpointId: string, ev: OneBot11Event): ConversationRef;
+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;
@@ -124,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 不透明引用原样透传。

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,
@@ -73,12 +73,12 @@ export function getChannelId(ev) {
  * 其余（private 及带 group_id 的非 private 事件按群处理）→ kind 'private'。
  * OneBot 11 无 guild/temp 容器概念，不填 parent。
  */
-export function onebot11InboundConversation(endpointId, ev) {
+export function onebot11InboundConversation(endpointKey, ev) {
     const kind = ev.message_type === 'group' || (ev.group_id != null && ev.message_type !== 'private')
         ? 'group'
         : 'private';
     return {
-        endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+        endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
         kind,
         id: getChannelId(ev),
     };
@@ -144,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://`、

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, formatOutboundSegments, isMessageEvent, onebot11InboundConversation, 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));
         }
@@ -77,9 +78,9 @@ export class OneBot11WsEndpoint {
         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,
+            endpoint: this.#options.config.id,
             target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
@@ -109,14 +110,22 @@ export class OneBot11WsEndpoint {
             return;
         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({
             conversation,
             message: { conversation, id: String(ev.message_id) },
             content,
-            sender: senderUserId(ev),
-            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: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
@@ -144,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,
                 }));
@@ -160,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),
                 });
@@ -187,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.js

@@ -2,14 +2,14 @@
  * OneBot11 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 { createOneBot11EndpointManagement } from './endpoint-management.js';
 import { registerOnebot11AgentEndpoint } from './onebot11-agent-deps.js';
-import { buildSendAction, formatInboundContent, formatInboundMetadata, formatOutboundSegments, isMessageEvent, onebot11InboundConversation, senderUserId, } from './protocol.js';
+import { buildSendAction, formatInboundContent, formatInboundMetadata, formatOutboundSegments, isMessageEvent, onebot11InboundConversation, senderDisplayName, senderUserId, } from './protocol.js';
 import { verifyOneBotAccessToken } from './wss-auth.js';
 import { callOneBot11WsAction, handleOneBot11WsMessage, rejectAllPending, startOneBot11Heartbeat, } from './ws-transport.js';
-const logger = getLogger('onebot11');
 export class OneBot11WssEndpoint {
+    #logger;
     #options;
     management = createOneBot11EndpointManagement(this);
     #ws;
@@ -21,6 +21,7 @@ export class OneBot11WssEndpoint {
     #started = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('onebot11', options.config.id);
         this.#options = options;
     }
     async start() {
@@ -29,21 +30,21 @@ export class OneBot11WssEndpoint {
         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',
             }));
         }
-        this.#unregisterAgent = registerOnebot11AgentEndpoint(this.#options.config.name, this);
+        this.#unregisterAgent = registerOnebot11AgentEndpoint(this.#options.config.id, this);
         const handle = this.#options.http.ws(this.#options.config.path);
         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,
         }));
@@ -103,14 +104,22 @@ export class OneBot11WssEndpoint {
         if (!this.#open || !isMessageEvent(ev))
             return;
         const conversation = onebot11InboundConversation(String(this.#options.id), ev);
+        const inbound = formatInboundMetadata(ev, this.#options.config.id);
         void this.#options.gateway.receive({
             conversation,
             message: { conversation, id: String(ev.message_id) },
             content: formatInboundContent(ev),
-            sender: senderUserId(ev),
-            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: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
@@ -135,7 +144,7 @@ export class OneBot11WssEndpoint {
         this.#heartbeatTimer = startOneBot11Heartbeat(this.#ws, this.#options.config.heartbeat_interval, this.#heartbeatTimer);
         socket.on('message', (data) => {
             handleOneBot11WsMessage(data, {
-                endpointName: this.#options.config.name,
+                endpointId: this.#options.config.id,
                 pending: this.#pending,
                 admit: (ev) => this.admit(ev),
             });
@@ -149,8 +158,8 @@ export class OneBot11WssEndpoint {
                 }
             }
         });
-        logger.debug(formatCompact({
-            endpoint: this.#options.config.name,
+        this.#logger.debug(formatCompact({
+            endpoint: this.#options.config.id,
             mode: 'wss',
             peer: connection.request.socket.remoteAddress,
         }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-onebot11",
-  "version": "6.0.3",
+  "version": "6.0.5",
   "description": "Zhin.js OneBot 11 adapter for Plugin Runtime (WebSocket client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -41,13 +41,14 @@
   },
   "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/im-contract": "1.0.1",
-    "@zhin.js/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.1.3"
+    "@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/permission": "1.0.1",
+    "@zhin.js/plugin-runtime": "1.1.5"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
@@ -55,16 +56,16 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.3",
-    "@zhin.js/host-http": "1.0.6"
+    "@zhin.js/agent": "1.1.5",
+    "@zhin.js/host-http": "1.0.8"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@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"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/agent": "1.1.5",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/plugin-runtime": "1.1.5",
+    "zhin.js": "6.0.4"
   },
   "peerDependenciesMeta": {
     "zhin.js": {

package/plugin.js

@@ -1,7 +1,7 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
 import { createEndpointRuntimeState } from '@zhin.js/adapter';
 import { definePlugin } from '@zhin.js/plugin-runtime';
-import { registerDefaultScenePlatformPermitChecker } from '@zhin.js/core';
+import { permissionHostToken, createSceneRolePlatformChecker } from '@zhin.js/permission';
 import { onebot11RuntimeStateToken } from "./lib/onebot11-runtime-state.js";
 export default definePlugin({
     name: 'onebot11',
@@ -9,9 +9,10 @@ export default definePlugin({
         displayName: 'OneBot 11 Adapter',
     },
     setup(context) {
-        // 运行中 endpoint 注册表（onebot11.endpoint list 的"运行中"数据源）
         context.resources.provide(onebot11RuntimeStateToken, createEndpointRuntimeState());
-        // 平台权限门禁：scene_admin / scene_owner 由 sender role 判定（见 ws/wss-endpoint admit metadata）
-        return registerDefaultScenePlatformPermitChecker('onebot11');
+        if (context.resources.has(permissionHostToken)) {
+            const host = context.resources.use(permissionHostToken);
+            return host.registerPlatform('onebot11', createSceneRolePlatformChecker());
+        }
     },
 });

package/schema.json

@@ -20,16 +20,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": "OneBot11 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",
@@ -42,10 +74,14 @@
           "access_token": {
             "type": "string",
             "description": "OneBot access token"
+          },
+          "id": {
+            "type": "string",
+            "description": "OneBot11 bot name"
           }
         },
         "required": [
-          "name"
+          "id"
         ]
       }
     },

package/src/onebot11-agent-deps.ts

@@ -14,20 +14,20 @@ export interface Onebot11AgentEndpoint {
 }
 
 export interface Onebot11AgentDeps {
-  getEndpoint: (endpointId: string) => Onebot11AgentEndpoint;
+  getEndpoint: (endpointKey: string) => Onebot11AgentEndpoint;
 }
 
 const endpoints = new Map<string, Onebot11AgentEndpoint>();
 let override: Onebot11AgentDeps | null = null;
 
 export function registerOnebot11AgentEndpoint(
-  endpointId: string,
+  endpointKey: string,
   endpoint: Onebot11AgentEndpoint,
 ): () => void {
-  endpoints.set(endpointId, endpoint);
+  endpoints.set(endpointKey, endpoint);
   return () => {
-    if (endpoints.get(endpointId) === endpoint) {
-      endpoints.delete(endpointId);
+    if (endpoints.get(endpointKey) === endpoint) {
+      endpoints.delete(endpointKey);
     }
   };
 }
@@ -40,9 +40,9 @@ export function setOnebot11AgentDeps(deps: Onebot11AgentDeps): void {
 export function getOnebot11AgentDeps(): Onebot11AgentDeps {
   if (override) return override;
   return {
-    getEndpoint(endpointId: string): Onebot11AgentEndpoint {
-      const registered = endpoints.get(endpointId);
-      if (!registered) throw new Error(`Endpoint ${endpointId} 不存在`);
+    getEndpoint(endpointKey: string): Onebot11AgentEndpoint {
+      const registered = endpoints.get(endpointKey);
+      if (!registered) throw new Error(`Endpoint ${endpointKey} 不存在`);
       return registered;
     },
   };

package/src/protocol.ts

@@ -15,7 +15,7 @@ export interface OneBot11LegacyEndpointRow {
   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;
@@ -26,7 +26,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;
@@ -38,7 +38,7 @@ export interface OneBot11AdapterConfig {
 
 export interface OneBot11ConfigBase {
   readonly context: 'onebot11';
-  readonly name: string;
+  readonly id: string;
   readonly access_token?: string;
 }
 
@@ -123,8 +123,8 @@ export function resolveOneBot11Config(config: OneBot11AdapterConfig = {}): Resol
     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;
@@ -139,7 +139,7 @@ export function resolveOneBot11Config(config: OneBot11AdapterConfig = {}): Resol
     return {
       context: 'onebot11',
       connection: 'ws',
-      name,
+      id,
       access_token,
       url,
       reconnect_interval: config.reconnect_interval ?? entry?.reconnect_interval ?? 5000,
@@ -155,7 +155,7 @@ export function resolveOneBot11Config(config: OneBot11AdapterConfig = {}): Resol
     return {
       context: 'onebot11',
       connection: 'wss',
-      name,
+      id,
       access_token,
       path,
       heartbeat_interval: config.heartbeat_interval ?? entry?.heartbeat_interval ?? 30_000,
@@ -185,12 +185,12 @@ export function getChannelId(ev: OneBot11Event): string {
  * 其余（private 及带 group_id 的非 private 事件按群处理）→ kind 'private'。
  * OneBot 11 无 guild/temp 容器概念，不填 parent。
  */
-export function onebot11InboundConversation(endpointId: string, ev: OneBot11Event): ConversationRef {
+export function onebot11InboundConversation(endpointKey: 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 },
+    endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
     kind,
     id: getChannelId(ev),
   };
@@ -259,27 +259,37 @@ export function isOneBot11BotMentioned(input: {
   });
 }
 
-/** 构造 gateway.receive 的 metadata（ws / wss 两个 endpoint 共用）。 */
+/** 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 function formatInboundMetadata(
   ev: OneBot11Event,
   endpoint: string,
-): Readonly<Record<string, unknown>> {
+): OneBot11InboundFields {
   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,
+  };
 }
 
 /**

package/src/ws-endpoint.ts

@@ -11,7 +11,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 { createOneBot11EndpointManagement } from './endpoint-management.js';
 import { registerOnebot11AgentEndpoint } from './onebot11-agent-deps.js';
@@ -23,6 +23,7 @@ import {
   formatOutboundSegments,
   isMessageEvent,
   onebot11InboundConversation,
+  senderDisplayName,
   senderUserId,
   type OneBot11Event,
   type OneBot11WsConfig,
@@ -38,8 +39,6 @@ import {
   type OneBot11WsSocket,
 } from './ws-types.js';
 
-const logger = getLogger('onebot11');
-
 export interface OneBot11WsEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -51,6 +50,8 @@ export interface OneBot11WsEndpointOptions {
 }
 
 export class OneBot11WsEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: OneBot11WsEndpointOptions;
   readonly management: EndpointManagement = createOneBot11EndpointManagement(this);
   readonly #lifecycle: EndpointLifecycle;
@@ -61,10 +62,11 @@ export class OneBot11WsEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: OneBot11WsEndpointOptions) {
+    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 语义
@@ -79,7 +81,7 @@ export class OneBot11WsEndpoint implements EndpointInstance {
   async start(): Promise<void> {
     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));
     } catch (err) {
@@ -121,9 +123,9 @@ export class OneBot11WsEndpoint implements EndpointInstance {
     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({
+    this.#logger.debug(formatCompact({
       op: 'onebot11_send',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
@@ -160,14 +162,22 @@ export class OneBot11WsEndpoint implements EndpointInstance {
     if (!this.#open || !isMessageEvent(ev)) return;
     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({
       conversation,
       message: { conversation, id: String(ev.message_id) },
       content,
-      sender: senderUserId(ev),
-      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: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
@@ -197,14 +207,14 @@ export class OneBot11WsEndpoint implements EndpointInstance {
         if (settled) 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,
         }));
@@ -214,7 +224,7 @@ export class OneBot11WsEndpoint implements EndpointInstance {
 
       ws.on('message', (data) => {
         handleOneBot11WsMessage(data, {
-          endpointName: this.#options.config.name,
+          endpointId: this.#options.config.id,
           pending: this.#pending,
           admit: (ev) => this.admit(ev),
         });
@@ -243,9 +253,9 @@ export class OneBot11WsEndpoint 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,
         }));

package/src/ws-transport.ts

@@ -23,7 +23,7 @@ export function decodeWsPayload(data: unknown): string {
 export function handleOneBot11WsMessage(
   data: unknown,
   options: {
-    readonly endpointName: string;
+    readonly endpointId: string;
     readonly pending: Map<string, OneBot11PendingAction>;
     readonly admit: (ev: OneBot11Event) => void;
   },
@@ -46,7 +46,7 @@ export function handleOneBot11WsMessage(
   } catch (error) {
     logger.warn(formatCompact({
       op: 'onebot11_parse_failed',
-      endpoint: options.endpointName,
+      endpoint: options.endpointId,
       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 { createOneBot11EndpointManagement } from './endpoint-management.js';
 import { registerOnebot11AgentEndpoint } from './onebot11-agent-deps.js';
@@ -16,6 +16,7 @@ import {
   formatOutboundSegments,
   isMessageEvent,
   onebot11InboundConversation,
+  senderDisplayName,
   senderUserId,
   type OneBot11Event,
   type OneBot11WssConfig,
@@ -33,8 +34,6 @@ import {
   type OneBot11WsSocket,
 } from './ws-types.js';
 
-const logger = getLogger('onebot11');
-
 export interface OneBot11WssEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -43,6 +42,8 @@ export interface OneBot11WssEndpointOptions {
 }
 
 export class OneBot11WssEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: OneBot11WssEndpointOptions;
   readonly management: EndpointManagement = createOneBot11EndpointManagement(this);
   #ws?: OneBot11WsSocket;
@@ -55,6 +56,7 @@ export class OneBot11WssEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: OneBot11WssEndpointOptions) {
+    this.#logger = getAdapterLogger('onebot11', options.config.id);
     this.#options = options;
   }
 
@@ -63,24 +65,24 @@ export class OneBot11WssEndpoint 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',
       }));
     }
     this.#unregisterAgent = registerOnebot11AgentEndpoint(
-      this.#options.config.name,
+      this.#options.config.id,
       this as unknown as OneBot11WsEndpoint,
     );
     const handle = this.#options.http.ws(this.#options.config.path);
     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,
     }));
@@ -145,14 +147,22 @@ export class OneBot11WssEndpoint implements EndpointInstance {
   admit(ev: OneBot11Event): void {
     if (!this.#open || !isMessageEvent(ev)) return;
     const conversation = onebot11InboundConversation(String(this.#options.id), ev);
+    const inbound = formatInboundMetadata(ev, this.#options.config.id);
     void this.#options.gateway.receive({
       conversation,
       message: { conversation, id: String(ev.message_id) },
       content: formatInboundContent(ev),
-      sender: senderUserId(ev),
-      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: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
@@ -181,7 +191,7 @@ export class OneBot11WssEndpoint implements EndpointInstance {
     );
     socket.on('message', (data) => {
       handleOneBot11WsMessage(data, {
-        endpointName: this.#options.config.name,
+        endpointId: this.#options.config.id,
         pending: this.#pending,
         admit: (ev) => this.admit(ev),
       });
@@ -195,8 +205,8 @@ export class OneBot11WssEndpoint 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,
     }));