@zhin.js/adapter-napcat 6.0.3 → 6.0.6

package/CHANGELOG.md

@@ -1,5 +1,95 @@
 # @zhin.js/adapter-napcat
 
+## 6.0.6
+
+### Patch Changes
+
+- Updated dependencies [2d0a622]
+  - @zhin.js/command@1.0.10
+  - @zhin.js/adapter@1.1.7
+  - @zhin.js/core@1.5.5
+  - @zhin.js/agent@1.1.6
+  - zhin.js@6.0.5
+
+## 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/README.md

@@ -8,7 +8,7 @@ Zhin.js [NapCatQQ](https://github.com/NapNeko/NapCatQQ) 适配器（Plugin Runti
 - 约定式 `defineAdapter` / `definePlugin`（无需 `usePlugin`）
 - **正向 WebSocket**（`connection: ws`）：应用连 NapCat WS
 - `access_token` 鉴权（Bearer + query）
-- 入站经 `messageGatewayToken`（去重 + 自发过滤）；出站 `send({ target, payload })`
+- 入站经 `messageGatewayToken`（去重 + 自发过滤）；出站 `send({ conversation, payload })`
 - 41 个 AI 工具（`agent/tools/`）
 
 ## 安装

package/adapters/napcat.js

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

package/adapters/napcat.ts

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

package/lib/http-endpoint.js

@@ -1,12 +1,12 @@
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createNapCatEndpointManagement } from './endpoint-management.js';
 import { registerNapcatAgentEndpoint } from './napcat-agent-deps.js';
 import { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
 import { buildSendAction, callNapCatHttpAction, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
 import { readRequestBody } from './webhook.js';
 import { verifyNapCatAccessToken } from './wss-auth.js';
-const logger = getLogger('napcat');
 export class NapCatHttpEndpoint {
+    #logger;
     #options;
     #inboundDeduper = new InboundMessageDeduper();
     management = createNapCatEndpointManagement(this);
@@ -16,6 +16,7 @@ export class NapCatHttpEndpoint {
     #started = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('napcat', options.config.id);
         this.#options = options;
         this.#callHttpAction = options.callHttpAction ?? callNapCatHttpAction;
     }
@@ -23,11 +24,11 @@ export class NapCatHttpEndpoint {
         if (this.#started)
             return;
         this.#started = true;
-        this.#unregisterAgent = registerNapcatAgentEndpoint(this.#options.config.name, this);
+        this.#unregisterAgent = registerNapcatAgentEndpoint(this.#options.config.id, this);
         this.#setupRoutes();
-        logger.info(formatCompact({
+        this.#logger.info(formatCompact({
             op: 'listen',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             mode: 'http',
             path: this.#options.config.post_path,
         }));
@@ -46,7 +47,7 @@ export class NapCatHttpEndpoint {
         this.#unregisterAgent = undefined;
         this.#inboundDeduper.clear();
         this.#started = false;
-        logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
+        this.#logger.debug(formatCompact({ op: 'disconnect' }));
     }
     async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
@@ -57,9 +58,9 @@ export class NapCatHttpEndpoint {
         }, action, params);
         const data = resp.data;
         const messageId = data?.message_id != null ? String(data.message_id) : '';
-        logger.debug(formatCompact({
+        this.#logger.debug(formatCompact({
             op: 'napcat_send',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
@@ -94,20 +95,24 @@ export class NapCatHttpEndpoint {
             conversation,
             message: { conversation, id: msgId },
             content: formatInboundContent(ev),
-            sender: senderUserId(ev),
+            sender: {
+                id: senderUserId(ev),
+                name: nickname,
+                ...(ev.sender?.role ? { roles: [ev.sender.role] } : {}),
+            },
+            endpointId: this.#options.config.id,
+            ...(mentioned ? { mentioned: true } : {}),
             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,
-                endpoint: this.#options.config.name,
                 time: ev.time,
                 self_id: ev.self_id != null ? String(ev.self_id) : undefined,
                 role: ev.sender?.role,
                 ...(nickname ? { nickname } : {}),
-                ...(mentioned ? { mentioned: true } : {}),
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'napcat_gateway_receive_failed',
                 target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
@@ -143,7 +148,7 @@ export class NapCatHttpEndpoint {
             response.end(JSON.stringify({ status: 'ok' }));
         }
         catch (error) {
-            logger.error('NapCat HTTP webhook error:', error);
+            this.#logger.error('NapCat HTTP webhook error:', error);
             if (!response.headersSent) {
                 response.writeHead(500, { 'Content-Type': 'application/json' });
                 response.end(JSON.stringify({ message: 'Internal Server Error' }));

package/lib/napcat-agent-deps.d.ts

@@ -41,11 +41,11 @@ export interface NapcatAgentEndpoint {
     sendGroupAiRecord(groupId: number, characterId: string, text: string): Promise<unknown>;
 }
 export interface NapcatAgentDeps {
-    getEndpoint: (endpointId: string) => NapcatAgentEndpoint;
+    getEndpoint: (endpointKey: string) => NapcatAgentEndpoint;
 }
-export declare function registerNapcatAgentEndpoint(endpointId: string, endpoint: NapcatAgentEndpoint): () => void;
+export declare function registerNapcatAgentEndpoint(endpointKey: string, endpoint: NapcatAgentEndpoint): () => void;
 /** Optional override used by tests / transitional callers. Pass `null` to clear. */
 export declare function setNapcatAgentDeps(deps: NapcatAgentDeps | null): void;
 export declare function getNapcatAgentDeps(): NapcatAgentDeps;
 /** Convenience for agent/tools (unchanged call sites). */
-export declare function getEndpoint(endpointId: string): NapcatAgentEndpoint;
+export declare function getEndpoint(endpointKey: string): NapcatAgentEndpoint;

package/lib/napcat-agent-deps.js

@@ -4,11 +4,11 @@
  */
 const endpoints = new Map();
 let override = null;
-export function registerNapcatAgentEndpoint(endpointId, endpoint) {
-    endpoints.set(endpointId, endpoint);
+export function registerNapcatAgentEndpoint(endpointKey, endpoint) {
+    endpoints.set(endpointKey, endpoint);
     return () => {
-        if (endpoints.get(endpointId) === endpoint) {
-            endpoints.delete(endpointId);
+        if (endpoints.get(endpointKey) === endpoint) {
+            endpoints.delete(endpointKey);
         }
     };
 }
@@ -16,10 +16,10 @@ export function registerNapcatAgentEndpoint(endpointId, endpoint) {
 export function setNapcatAgentDeps(deps) {
     override = deps;
 }
-function lookup(endpointId) {
-    const registered = endpoints.get(endpointId);
+function lookup(endpointKey) {
+    const registered = endpoints.get(endpointKey);
     if (!registered)
-        throw new Error(`Endpoint ${endpointId} not found`);
+        throw new Error(`Endpoint ${endpointKey} not found`);
     return registered;
 }
 export function getNapcatAgentDeps() {
@@ -28,6 +28,6 @@ export function getNapcatAgentDeps() {
     return { getEndpoint: lookup };
 }
 /** Convenience for agent/tools (unchanged call sites). */
-export function getEndpoint(endpointId) {
-    return getNapcatAgentDeps().getEndpoint(endpointId);
+export function getEndpoint(endpointKey) {
+    return getNapcatAgentDeps().getEndpoint(endpointKey);
 }

package/lib/protocol.d.ts

@@ -9,7 +9,7 @@ import type { ConversationRef } from '@zhin.js/im-contract';
 export interface NapCatLegacyEndpointRow {
     readonly context?: string;
     readonly connection?: 'ws' | 'wss' | 'http';
-    readonly name?: string;
+    readonly id?: string;
     readonly access_token?: string;
     readonly url?: string;
     readonly path?: string;
@@ -22,7 +22,7 @@ export interface NapCatLegacyEndpointRow {
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface NapCatAdapterConfig {
     readonly connection?: 'ws' | 'wss' | 'http';
-    readonly name?: string;
+    readonly id?: string;
     readonly access_token?: string;
     readonly url?: string;
     readonly path?: string;
@@ -36,7 +36,7 @@ export interface NapCatAdapterConfig {
 }
 export interface NapCatConfigBase {
     readonly context: 'napcat';
-    readonly name: string;
+    readonly id: string;
     readonly access_token?: string;
 }
 /** 正向 WebSocket：应用连 NapCat WS */
@@ -121,7 +121,7 @@ export declare function getChannelId(ev: NapCatEvent): string;
  * 入站归一化 → ConversationRef：群消息 → kind 'group'；私聊临时会话
  * （sub_type 'group'）→ kind 'private' + 群容器进 `parent`；其余私聊 → 'private'。
  */
-export declare function napcatInboundConversation(endpointId: string, ev: NapCatEvent): ConversationRef;
+export declare function napcatInboundConversation(endpointKey: string, ev: NapCatEvent): ConversationRef;
 /** 出站：ConversationRef → OneBot 私聊/群聊目标。 */
 export declare function napcatOutboundTarget(conversation: ConversationRef): ParsedSendTarget;
 export declare function formatInboundContent(ev: NapCatEvent): string;

package/lib/protocol.js

@@ -14,8 +14,8 @@ function normalizeConnection(connection) {
 export function resolveNapCatConfig(config = {}) {
     const entry = config.endpoints?.find((item) => item.context === 'napcat');
     const connection = normalizeConnection(config.connection ?? entry?.connection);
-    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.NAPCAT_BOT_NAME
         || 'napcat-bot';
     const access_token = config.access_token ?? entry?.access_token;
@@ -27,7 +27,7 @@ export function resolveNapCatConfig(config = {}) {
         return {
             context: 'napcat',
             connection: 'ws',
-            name,
+            id,
             access_token,
             url,
             reconnect_interval: config.reconnect_interval ?? entry?.reconnect_interval ?? 5000,
@@ -41,7 +41,7 @@ export function resolveNapCatConfig(config = {}) {
         return {
             context: 'napcat',
             connection: 'wss',
-            name,
+            id,
             access_token,
             path,
             heartbeat_interval: config.heartbeat_interval ?? entry?.heartbeat_interval ?? 30_000,
@@ -56,7 +56,7 @@ export function resolveNapCatConfig(config = {}) {
         return {
             context: 'napcat',
             connection: 'http',
-            name,
+            id,
             access_token,
             http_url,
             post_path,
@@ -82,8 +82,8 @@ export function getChannelId(ev) {
  * 入站归一化 → ConversationRef：群消息 → kind 'group'；私聊临时会话
  * （sub_type 'group'）→ kind 'private' + 群容器进 `parent`；其余私聊 → 'private'。
  */
-export function napcatInboundConversation(endpointId, ev) {
-    const endpoint = { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId };
+export function napcatInboundConversation(endpointKey, ev) {
+    const endpoint = { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey };
     const isGroup = ev.message_type === 'group' || (ev.group_id != null && ev.message_type !== 'private');
     if (isGroup && ev.group_id != null) {
         return { endpoint, kind: 'group', id: String(ev.group_id) };

package/lib/ws-endpoint.js

@@ -3,14 +3,14 @@
  */
 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 { createNapCatEndpointManagement } from './endpoint-management.js';
 import { registerNapcatAgentEndpoint } from './napcat-agent-deps.js';
 import { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
 import { buildSendAction, buildWsConnectOptions, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
 import { callNapCatWsAction, handleNapCatWsMessage, rejectAllPending, } from './ws-transport.js';
-const logger = getLogger('napcat');
 export class NapCatWsEndpoint {
+    #logger;
     #options;
     #inboundDeduper = new InboundMessageDeduper();
     management = createNapCatEndpointManagement(this);
@@ -21,9 +21,10 @@ export class NapCatWsEndpoint {
     #open = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('napcat', options.config.id);
         this.#options = options;
         this.#lifecycle = createEndpointLifecycle({
-            name: options.config.name,
+            name: options.config.id,
             // reconnect_interval 旧语义为固定间隔：multiplier 1 + 无 jitter + 不封顶
             reconnect: {
                 initialIntervalMs: options.config.reconnect_interval,
@@ -36,7 +37,7 @@ export class NapCatWsEndpoint {
     async start() {
         if (this.#lifecycle.started)
             return;
-        this.#unregisterAgent = registerNapcatAgentEndpoint(this.#options.config.name, this);
+        this.#unregisterAgent = registerNapcatAgentEndpoint(this.#options.config.id, this);
         try {
             await this.#lifecycle.start((handle) => this.#connect(handle));
         }
@@ -75,9 +76,9 @@ export class NapCatWsEndpoint {
         const { action, params } = buildSendAction(napcatOutboundTarget(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: 'napcat_send',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
@@ -245,20 +246,24 @@ export class NapCatWsEndpoint {
             conversation,
             message: { conversation, id: msgId },
             content,
-            sender: senderUserId(ev),
+            sender: {
+                id: senderUserId(ev),
+                name: nickname,
+                ...(ev.sender?.role ? { roles: [ev.sender.role] } : {}),
+            },
+            endpointId: this.#options.config.id,
+            ...(mentioned ? { mentioned: true } : {}),
             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,
-                endpoint: this.#options.config.name,
                 time: ev.time,
                 self_id: ev.self_id != null ? String(ev.self_id) : undefined,
                 role: ev.sender?.role,
                 ...(nickname ? { nickname } : {}),
-                ...(mentioned ? { mentioned: true } : {}),
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'napcat_gateway_receive_failed',
                 target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
@@ -286,14 +291,14 @@ export class NapCatWsEndpoint {
                     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,
                 }));
@@ -312,7 +317,7 @@ export class NapCatWsEndpoint {
             });
             ws.on('message', (data) => {
                 handleNapCatWsMessage(data, {
-                    endpointName: this.#options.config.name,
+                    endpointId: this.#options.config.id,
                     pending: this.#pending,
                     admit: (event) => this.admit(event),
                 });
@@ -329,9 +334,8 @@ export class NapCatWsEndpoint {
                     : codeNum === 1006
                         ? ' [abnormal]'
                         : '';
-                logger.warn(formatCompact({
+                this.#logger.warn(formatCompact({
                     op: 'disconnect',
-                    endpoint: this.#options.config.name,
                     code: codeNum,
                     error: `${reasonStr || 'closed'}${codeHint}`,
                     reconnect_ms: this.#options.config.reconnect_interval,
@@ -345,9 +349,9 @@ export class NapCatWsEndpoint {
             });
             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 NapCatEvent } from './protocol.js';
 import { type NapCatPendingAction, type NapCatWsSocket } from './ws-types.js';
 export declare function decodeWsPayload(data: unknown): string;
 export declare function handleNapCatWsMessage(data: unknown, options: {
-    readonly endpointName: string;
+    readonly endpointId: string;
     readonly pending: Map<string, NapCatPendingAction>;
     readonly admit: (ev: NapCatEvent) => void;
 }): void;

package/lib/ws-transport.js

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

package/lib/wss-endpoint.js

@@ -2,15 +2,15 @@
  * NapCat reverse WSS endpoint — accepts inbound WebSocket from NapCat.
  */
 import { clearInterval } from 'node:timers';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createNapCatEndpointManagement } from './endpoint-management.js';
 import { registerNapcatAgentEndpoint } from './napcat-agent-deps.js';
 import { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
 import { buildSendAction, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
 import { callNapCatWsAction, handleNapCatWsMessage, rejectAllPending, startNapCatHeartbeat, } from './ws-transport.js';
 import { verifyNapCatAccessToken } from './wss-auth.js';
-const logger = getLogger('napcat');
 export class NapCatWssEndpoint {
+    #logger;
     #options;
     #inboundDeduper = new InboundMessageDeduper();
     management = createNapCatEndpointManagement(this);
@@ -23,20 +23,21 @@ export class NapCatWssEndpoint {
     #started = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('napcat', options.config.id);
         this.#options = options;
     }
     async start() {
         if (this.#started)
             return;
         this.#started = true;
-        this.#unregisterAgent = registerNapcatAgentEndpoint(this.#options.config.name, this);
+        this.#unregisterAgent = registerNapcatAgentEndpoint(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,
         }));
@@ -102,20 +103,24 @@ export class NapCatWssEndpoint {
             conversation,
             message: { conversation, id: msgId },
             content: formatInboundContent(ev),
-            sender: senderUserId(ev),
+            sender: {
+                id: senderUserId(ev),
+                name: nickname,
+                ...(ev.sender?.role ? { roles: [ev.sender.role] } : {}),
+            },
+            endpointId: this.#options.config.id,
+            ...(mentioned ? { mentioned: true } : {}),
             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,
-                endpoint: this.#options.config.name,
                 time: ev.time,
                 self_id: ev.self_id != null ? String(ev.self_id) : undefined,
                 role: ev.sender?.role,
                 ...(nickname ? { nickname } : {}),
-                ...(mentioned ? { mentioned: true } : {}),
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'napcat_gateway_receive_failed',
                 target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
@@ -140,7 +145,7 @@ export class NapCatWssEndpoint {
         this.#heartbeatTimer = startNapCatHeartbeat(this.#ws, this.#options.config.heartbeat_interval, this.#heartbeatTimer);
         socket.on('message', (data) => {
             handleNapCatWsMessage(data, {
-                endpointName: this.#options.config.name,
+                endpointId: this.#options.config.id,
                 pending: this.#pending,
                 admit: (event) => this.admit(event),
             });
@@ -154,8 +159,8 @@ export class NapCatWssEndpoint {
                 }
             }
         });
-        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-napcat",
-  "version": "6.0.3",
+  "version": "6.0.6",
   "description": "Zhin.js NapCat adapter for Plugin Runtime (WebSocket client, OneBot11 + NapCat extensions)",
   "type": "module",
   "main": "./lib/index.js",
@@ -43,13 +43,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.10",
+    "@zhin.js/core": "1.5.5",
+    "@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",
@@ -57,16 +58,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.6",
+    "@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.6",
+    "@zhin.js/core": "1.5.5",
+    "@zhin.js/plugin-runtime": "1.1.5",
+    "zhin.js": "6.0.5"
   },
   "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 { napcatRuntimeStateToken } from "./lib/napcat-runtime-state.js";
 export default definePlugin({
     name: 'napcat',
@@ -9,9 +9,10 @@ export default definePlugin({
         displayName: 'NapCat Adapter',
     },
     setup(context) {
-        // 运行中 endpoint 注册表（napcat.endpoint list 的"运行中"数据源）
         context.resources.provide(napcatRuntimeStateToken, createEndpointRuntimeState());
-        // 平台权限门禁：scene_admin / scene_owner 由 sender role 判定（见各 endpoint admit metadata）
-        return registerDefaultScenePlatformPermitChecker('napcat');
+        if (context.resources.has(permissionHostToken)) {
+            const host = context.resources.use(permissionHostToken);
+            return host.registerPlatform('napcat', createSceneRolePlatformChecker());
+        }
     },
 });

package/schema.json

@@ -25,16 +25,48 @@
       "type": "number",
       "default": 30000
     },
+    "master": {
+      "type": [
+        "string",
+        "number"
+      ],
+      "description": "框架 master（QQ uin；AI/工具权限、endpoint 管理）。endpoints[i].master 可逐项覆盖"
+    },
+    "trusted": {
+      "type": "array",
+      "items": {
+        "type": [
+          "string",
+          "number"
+        ],
+        "description": "Trusted QQ uin"
+      },
+      "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": "NapCat bot name"
+          "master": {
+            "type": [
+              "string",
+              "number"
+            ],
+            "description": "本 endpoint 的框架 master（QQ uin）；覆盖顶层 master"
+          },
+          "trusted": {
+            "type": "array",
+            "items": {
+              "type": [
+                "string",
+                "number"
+              ],
+              "description": "Trusted QQ uin"
+            },
+            "description": "本 endpoint 的 trusted 列表"
           },
           "url": {
             "type": "string",
@@ -55,10 +87,14 @@
           "access_token": {
             "type": "string",
             "description": "NapCat access token"
+          },
+          "id": {
+            "type": "string",
+            "description": "NapCat bot name"
           }
         },
         "required": [
-          "name"
+          "id"
         ]
       }
     },

package/src/http-endpoint.ts

@@ -5,7 +5,7 @@ import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { EndpointInstance, EndpointManagement, EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, HttpRouteRegistration } 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 { createNapCatEndpointManagement } from './endpoint-management.js';
 import { registerNapcatAgentEndpoint } from './napcat-agent-deps.js';
@@ -32,8 +32,6 @@ import { readRequestBody } from './webhook.js';
 import { NapCatWsEndpoint } from './ws-endpoint.js';
 import { verifyNapCatAccessToken } from './wss-auth.js';
 
-const logger = getLogger('napcat');
-
 export interface NapCatHttpEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -43,6 +41,8 @@ export interface NapCatHttpEndpointOptions {
 }
 
 export class NapCatHttpEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: NapCatHttpEndpointOptions;
   readonly #inboundDeduper = new InboundMessageDeduper();
   readonly management: EndpointManagement = createNapCatEndpointManagement(this);
@@ -53,6 +53,7 @@ export class NapCatHttpEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: NapCatHttpEndpointOptions) {
+    this.#logger = getAdapterLogger('napcat', options.config.id);
     this.#options = options;
     this.#callHttpAction = options.callHttpAction ?? callNapCatHttpAction;
   }
@@ -61,13 +62,13 @@ export class NapCatHttpEndpoint implements EndpointInstance {
     if (this.#started) return;
     this.#started = true;
     this.#unregisterAgent = registerNapcatAgentEndpoint(
-      this.#options.config.name,
+      this.#options.config.id,
       this as unknown as NapCatWsEndpoint,
     );
     this.#setupRoutes();
-    logger.info(formatCompact({
+    this.#logger.info(formatCompact({
       op: 'listen',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       mode: 'http',
       path: this.#options.config.post_path,
     }));
@@ -88,7 +89,7 @@ export class NapCatHttpEndpoint implements EndpointInstance {
     this.#unregisterAgent = undefined;
     this.#inboundDeduper.clear();
     this.#started = false;
-    logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
+    this.#logger.debug(formatCompact({ op: 'disconnect' }));
   }
 
   async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
@@ -104,9 +105,9 @@ export class NapCatHttpEndpoint implements EndpointInstance {
     );
     const data = resp.data as { message_id?: number | string } | undefined;
     const messageId = data?.message_id != null ? String(data.message_id) : '';
-    logger.debug(formatCompact({
+    this.#logger.debug(formatCompact({
       op: 'napcat_send',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
@@ -144,20 +145,24 @@ export class NapCatHttpEndpoint implements EndpointInstance {
       conversation,
       message: { conversation, id: msgId },
       content: formatInboundContent(ev),
-      sender: senderUserId(ev),
+      sender: {
+        id: senderUserId(ev),
+        name: nickname,
+        ...(ev.sender?.role ? { roles: [ev.sender.role] } : {}),
+      },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       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,
-        endpoint: this.#options.config.name,
         time: ev.time,
         self_id: ev.self_id != null ? String(ev.self_id) : undefined,
         role: ev.sender?.role,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'napcat_gateway_receive_failed',
         target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
@@ -194,7 +199,7 @@ export class NapCatHttpEndpoint implements EndpointInstance {
       response.writeHead(200, { 'Content-Type': 'application/json' });
       response.end(JSON.stringify({ status: 'ok' }));
     } catch (error) {
-      logger.error('NapCat HTTP webhook error:', error);
+      this.#logger.error('NapCat HTTP webhook error:', error);
       if (!response.headersSent) {
         response.writeHead(500, { 'Content-Type': 'application/json' });
         response.end(JSON.stringify({ message: 'Internal Server Error' }));

package/src/napcat-agent-deps.ts

@@ -55,20 +55,20 @@ export interface NapcatAgentEndpoint {
 }
 
 export interface NapcatAgentDeps {
-  getEndpoint: (endpointId: string) => NapcatAgentEndpoint;
+  getEndpoint: (endpointKey: string) => NapcatAgentEndpoint;
 }
 
 const endpoints = new Map<string, NapcatAgentEndpoint>();
 let override: NapcatAgentDeps | null = null;
 
 export function registerNapcatAgentEndpoint(
-  endpointId: string,
+  endpointKey: string,
   endpoint: NapcatAgentEndpoint,
 ): () => 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);
     }
   };
 }
@@ -78,9 +78,9 @@ export function setNapcatAgentDeps(deps: NapcatAgentDeps | null): void {
   override = deps;
 }
 
-function lookup(endpointId: string): NapcatAgentEndpoint {
-  const registered = endpoints.get(endpointId);
-  if (!registered) throw new Error(`Endpoint ${endpointId} not found`);
+function lookup(endpointKey: string): NapcatAgentEndpoint {
+  const registered = endpoints.get(endpointKey);
+  if (!registered) throw new Error(`Endpoint ${endpointKey} not found`);
   return registered;
 }
 
@@ -90,6 +90,6 @@ export function getNapcatAgentDeps(): NapcatAgentDeps {
 }
 
 /** Convenience for agent/tools (unchanged call sites). */
-export function getEndpoint(endpointId: string): NapcatAgentEndpoint {
-  return getNapcatAgentDeps().getEndpoint(endpointId);
+export function getEndpoint(endpointKey: string): NapcatAgentEndpoint {
+  return getNapcatAgentDeps().getEndpoint(endpointKey);
 }

package/src/protocol.ts

@@ -13,7 +13,7 @@ const logger = getLogger('napcat');
 export interface NapCatLegacyEndpointRow {
   readonly context?: string;
   readonly connection?: 'ws' | 'wss' | 'http';
-  readonly name?: string;
+  readonly id?: string;
   readonly access_token?: string;
   readonly url?: string;
   readonly path?: string;
@@ -27,7 +27,7 @@ export interface NapCatLegacyEndpointRow {
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface NapCatAdapterConfig {
   readonly connection?: 'ws' | 'wss' | 'http';
-  readonly name?: string;
+  readonly id?: string;
   readonly access_token?: string;
   readonly url?: string;
   readonly path?: string;
@@ -42,7 +42,7 @@ export interface NapCatAdapterConfig {
 
 export interface NapCatConfigBase {
   readonly context: 'napcat';
-  readonly name: string;
+  readonly id: string;
   readonly access_token?: string;
 }
 
@@ -143,8 +143,8 @@ function normalizeConnection(
 export function resolveNapCatConfig(config: NapCatAdapterConfig = {}): ResolvedNapCatConfig {
   const entry = config.endpoints?.find((item) => item.context === 'napcat');
   const connection = normalizeConnection(config.connection ?? entry?.connection);
-  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.NAPCAT_BOT_NAME
     || 'napcat-bot';
   const access_token = config.access_token ?? entry?.access_token;
@@ -159,7 +159,7 @@ export function resolveNapCatConfig(config: NapCatAdapterConfig = {}): ResolvedN
     return {
       context: 'napcat',
       connection: 'ws',
-      name,
+      id,
       access_token,
       url,
       reconnect_interval: config.reconnect_interval ?? entry?.reconnect_interval ?? 5000,
@@ -173,7 +173,7 @@ export function resolveNapCatConfig(config: NapCatAdapterConfig = {}): ResolvedN
     return {
       context: 'napcat',
       connection: 'wss',
-      name,
+      id,
       access_token,
       path,
       heartbeat_interval: config.heartbeat_interval ?? entry?.heartbeat_interval ?? 30_000,
@@ -189,7 +189,7 @@ export function resolveNapCatConfig(config: NapCatAdapterConfig = {}): ResolvedN
     return {
       context: 'napcat',
       connection: 'http',
-      name,
+      id,
       access_token,
       http_url,
       post_path,
@@ -218,8 +218,8 @@ export function getChannelId(ev: NapCatEvent): string {
  * 入站归一化 → ConversationRef：群消息 → kind 'group'；私聊临时会话
  * （sub_type 'group'）→ kind 'private' + 群容器进 `parent`；其余私聊 → 'private'。
  */
-export function napcatInboundConversation(endpointId: string, ev: NapCatEvent): ConversationRef {
-  const endpoint = { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId };
+export function napcatInboundConversation(endpointKey: string, ev: NapCatEvent): ConversationRef {
+  const endpoint = { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey };
   const isGroup = ev.message_type === 'group' || (ev.group_id != null && ev.message_type !== 'private');
   if (isGroup && ev.group_id != null) {
     return { endpoint, kind: 'group', id: String(ev.group_id) };

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 { createNapCatEndpointManagement } from './endpoint-management.js';
 import { registerNapcatAgentEndpoint } from './napcat-agent-deps.js';
@@ -45,8 +45,6 @@ import {
   type NapCatWsSocket,
 } from './ws-types.js';
 
-const logger = getLogger('napcat');
-
 export interface NapCatWsEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -58,6 +56,8 @@ export interface NapCatWsEndpointOptions {
 }
 
 export class NapCatWsEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: NapCatWsEndpointOptions;
   readonly #inboundDeduper = new InboundMessageDeduper();
   readonly management: EndpointManagement = createNapCatEndpointManagement(this);
@@ -69,9 +69,10 @@ export class NapCatWsEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: NapCatWsEndpointOptions) {
+    this.#logger = getAdapterLogger('napcat', options.config.id);
     this.#options = options;
     this.#lifecycle = createEndpointLifecycle({
-      name: options.config.name,
+      name: options.config.id,
       // reconnect_interval 旧语义为固定间隔：multiplier 1 + 无 jitter + 不封顶
       reconnect: {
         initialIntervalMs: options.config.reconnect_interval,
@@ -84,7 +85,7 @@ export class NapCatWsEndpoint implements EndpointInstance {
 
   async start(): Promise<void> {
     if (this.#lifecycle.started) return;
-    this.#unregisterAgent = registerNapcatAgentEndpoint(this.#options.config.name, this);
+    this.#unregisterAgent = registerNapcatAgentEndpoint(this.#options.config.id, this);
     try {
       await this.#lifecycle.start((handle) => this.#connect(handle));
     } catch (err) {
@@ -125,9 +126,9 @@ export class NapCatWsEndpoint implements EndpointInstance {
     const { action, params } = buildSendAction(napcatOutboundTarget(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: 'napcat_send',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
@@ -336,20 +337,24 @@ export class NapCatWsEndpoint implements EndpointInstance {
       conversation,
       message: { conversation, id: msgId },
       content,
-      sender: senderUserId(ev),
+      sender: {
+        id: senderUserId(ev),
+        name: nickname,
+        ...(ev.sender?.role ? { roles: [ev.sender.role] } : {}),
+      },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       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,
-        endpoint: this.#options.config.name,
         time: ev.time,
         self_id: ev.self_id != null ? String(ev.self_id) : undefined,
         role: ev.sender?.role,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'napcat_gateway_receive_failed',
         target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
@@ -379,14 +384,14 @@ export class NapCatWsEndpoint 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,
         }));
@@ -405,7 +410,7 @@ export class NapCatWsEndpoint implements EndpointInstance {
 
       ws.on('message', (data) => {
         handleNapCatWsMessage(data, {
-          endpointName: this.#options.config.name,
+          endpointId: this.#options.config.id,
           pending: this.#pending,
           admit: (event) => this.admit(event),
         });
@@ -423,9 +428,8 @@ export class NapCatWsEndpoint implements EndpointInstance {
           : codeNum === 1006
             ? ' [abnormal]'
             : '';
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'disconnect',
-          endpoint: this.#options.config.name,
           code: codeNum,
           error: `${reasonStr || 'closed'}${codeHint}`,
           reconnect_ms: this.#options.config.reconnect_interval,
@@ -440,9 +444,9 @@ export class NapCatWsEndpoint 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 handleNapCatWsMessage(
   data: unknown,
   options: {
-    readonly endpointName: string;
+    readonly endpointId: string;
     readonly pending: Map<string, NapCatPendingAction>;
     readonly admit: (ev: NapCatEvent) => void;
   },
@@ -50,7 +50,7 @@ export function handleNapCatWsMessage(
   } catch (error) {
     logger.warn(formatCompact({
       op: 'napcat_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 { createNapCatEndpointManagement } from './endpoint-management.js';
 import { registerNapcatAgentEndpoint } from './napcat-agent-deps.js';
@@ -40,8 +40,6 @@ import {
 } from './ws-types.js';
 import { verifyNapCatAccessToken } from './wss-auth.js';
 
-const logger = getLogger('napcat');
-
 export interface NapCatWssEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -50,6 +48,8 @@ export interface NapCatWssEndpointOptions {
 }
 
 export class NapCatWssEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: NapCatWssEndpointOptions;
   readonly #inboundDeduper = new InboundMessageDeduper();
   readonly management: EndpointManagement = createNapCatEndpointManagement(this);
@@ -63,6 +63,7 @@ export class NapCatWssEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: NapCatWssEndpointOptions) {
+    this.#logger = getAdapterLogger('napcat', options.config.id);
     this.#options = options;
   }
 
@@ -70,16 +71,16 @@ export class NapCatWssEndpoint implements EndpointInstance {
     if (this.#started) return;
     this.#started = true;
     this.#unregisterAgent = registerNapcatAgentEndpoint(
-      this.#options.config.name,
+      this.#options.config.id,
       this as unknown as NapCatWsEndpoint,
     );
     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,
     }));
@@ -147,20 +148,24 @@ export class NapCatWssEndpoint implements EndpointInstance {
       conversation,
       message: { conversation, id: msgId },
       content: formatInboundContent(ev),
-      sender: senderUserId(ev),
+      sender: {
+        id: senderUserId(ev),
+        name: nickname,
+        ...(ev.sender?.role ? { roles: [ev.sender.role] } : {}),
+      },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       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,
-        endpoint: this.#options.config.name,
         time: ev.time,
         self_id: ev.self_id != null ? String(ev.self_id) : undefined,
         role: ev.sender?.role,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'napcat_gateway_receive_failed',
         target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
@@ -189,7 +194,7 @@ export class NapCatWssEndpoint implements EndpointInstance {
     );
     socket.on('message', (data) => {
       handleNapCatWsMessage(data, {
-        endpointName: this.#options.config.name,
+        endpointId: this.#options.config.id,
         pending: this.#pending,
         admit: (event) => this.admit(event),
       });
@@ -203,8 +208,8 @@ export class NapCatWssEndpoint 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,
     }));