@zhin.js/adapter-napcat 6.0.2 → 6.0.5

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, formatInboundTarget, formatOutboundSegments, isMessageEvent, senderNickname, senderUserId, } from './protocol.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));
         }
@@ -70,15 +71,15 @@ export class NapCatWsEndpoint {
             this.#ws = undefined;
         }
     }
-    async send({ target, payload }) {
+    async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
-        const { action, params } = buildSendAction(target, message);
+        const { action, params } = buildSendAction(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,
-            target,
+            endpoint: this.#options.config.id,
+            target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
         return messageId;
@@ -237,31 +238,34 @@ export class NapCatWsEndpoint {
         if (Array.isArray(ev.message) || typeof ev.message === 'string') {
             ev = { ...ev, message: normalizeMessage(ev.message) };
         }
-        const target = formatInboundTarget(ev);
+        const conversation = napcatInboundConversation(String(this.#options.id), ev);
         const content = formatInboundContent(ev);
         const nickname = senderNickname(ev);
         const mentioned = isNapCatBotMentioned(ev);
         void this.#options.gateway.receive({
-            adapter: this.#options.id,
-            target,
+            conversation,
+            message: { conversation, id: msgId },
             content,
-            sender: senderUserId(ev),
-            id: msgId,
+            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,
+                target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
             }));
         });
@@ -287,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,
                 }));
@@ -313,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),
                 });
@@ -330,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,
@@ -346,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.d.ts

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

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, formatInboundTarget, formatOutboundSegments, isMessageEvent, senderNickname, senderUserId, } from './protocol.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,
         }));
@@ -70,9 +71,9 @@ export class NapCatWssEndpoint {
         }
         this.#started = false;
     }
-    async send({ target, payload }) {
+    async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
-        const { action, params } = buildSendAction(target, message);
+        const { action, params } = buildSendAction(napcatOutboundTarget(conversation), message);
         const data = await this.callApi(action, params);
         return data?.message_id != null ? String(data.message_id) : '';
     }
@@ -95,30 +96,33 @@ export class NapCatWssEndpoint {
         if (Array.isArray(ev.message) || typeof ev.message === 'string') {
             ev = { ...ev, message: normalizeMessage(ev.message) };
         }
-        const target = formatInboundTarget(ev);
+        const conversation = napcatInboundConversation(String(this.#options.id), ev);
         const nickname = senderNickname(ev);
         const mentioned = isNapCatBotMentioned(ev);
         void this.#options.gateway.receive({
-            adapter: this.#options.id,
-            target,
+            conversation,
+            message: { conversation, id: msgId },
             content: formatInboundContent(ev),
-            sender: senderUserId(ev),
-            id: msgId,
+            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,
+                target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
             }));
         });
@@ -141,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),
             });
@@ -155,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.2",
+  "version": "6.0.5",
   "description": "Zhin.js NapCat adapter for Plugin Runtime (WebSocket client, OneBot11 + NapCat extensions)",
   "type": "module",
   "main": "./lib/index.js",
@@ -43,12 +43,14 @@
   },
   "dependencies": {
     "ws": "^8.21.1",
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/command": "1.0.6",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/host-http": "1.0.5",
-    "@zhin.js/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.1.2"
+    "@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",
@@ -56,16 +58,16 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.2",
-    "@zhin.js/host-http": "1.0.5"
+    "@zhin.js/agent": "1.1.5",
+    "@zhin.js/host-http": "1.0.8"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/agent": "1.1.2",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/plugin-runtime": "1.1.2",
-    "zhin.js": "6.0.1"
+    "@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 { 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

@@ -2,10 +2,10 @@
  * NapCat HTTP endpoint — POST inbound events + HTTP API outbound.
  */
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
+import type { EndpointInstance, EndpointManagement, EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, 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';
@@ -19,9 +19,10 @@ import {
   buildSendAction,
   callNapCatHttpAction,
   formatInboundContent,
-  formatInboundTarget,
   formatOutboundSegments,
   isMessageEvent,
+  napcatInboundConversation,
+  napcatOutboundTarget,
   senderNickname,
   senderUserId,
   type NapCatEvent,
@@ -31,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;
@@ -42,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);
@@ -52,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;
   }
@@ -60,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,
     }));
@@ -87,12 +89,12 @@ 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({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const message = formatOutboundSegments(payload);
-    const { action, params } = buildSendAction(target, message);
+    const { action, params } = buildSendAction(napcatOutboundTarget(conversation), message);
     const resp = await this.#callHttpAction(
       {
         http_url: this.#options.config.http_url,
@@ -103,10 +105,10 @@ 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,
-      target,
+      endpoint: this.#options.config.id,
+      target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
     return messageId;
@@ -136,30 +138,33 @@ export class NapCatHttpEndpoint implements EndpointInstance {
     if (Array.isArray(ev.message) || typeof ev.message === 'string') {
       ev = { ...ev, message: normalizeMessage(ev.message) };
     }
-    const target = formatInboundTarget(ev);
+    const conversation = napcatInboundConversation(String(this.#options.id), ev);
     const nickname = senderNickname(ev);
     const mentioned = isNapCatBotMentioned(ev);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: msgId },
       content: formatInboundContent(ev),
-      sender: senderUserId(ev),
-      id: msgId,
+      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,
+        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/index.ts

@@ -3,12 +3,12 @@ export {
   buildWsConnectOptions,
   callNapCatHttpAction,
   formatInboundContent,
-  formatInboundTarget,
   formatOutboundSegments,
   getChannelId,
   isMessageEvent,
   mediaRefToOneBotFile,
-  parseSendTarget,
+  napcatInboundConversation,
+  napcatOutboundTarget,
   resolveNapCatConfig,
   senderNickname,
   senderUserId,

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