@zhin.js/adapter-napcat 6.0.2 → 6.0.5

package/CHANGELOG.md

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

package/README.md

@@ -8,7 +8,7 @@ Zhin.js [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/`）
 
 ## 安装
@@ -24,8 +24,8 @@ pnpm add @zhin.js/adapter-napcat
 - `@zhin.js/plugin-runtime` — `plugin.ts`（`definePlugin`）
 - 配置经插件 `schema.json` 落到 `plugins.<instanceKey>`
 
-入站：`gateway.receive({ adapter, target: "private:uid"|"group:gid", content, sender, metadata })`  
-出站：`send({ target, payload })` → WS `send_private_msg` / `send_group_msg`
+入站：`gateway.receive({ conversation, message: { conversation, id }, content, sender, metadata })`（`conversation` 为 ConversationRef：私聊 `kind: 'private'`、群聊 `kind: 'group'`，临时会话群容器进 `parent`）  
+出站：`send({ conversation, payload })` → WS `send_private_msg` / `send_group_msg`
 
 ## 最小配置
 

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.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';
@@ -18,10 +18,7 @@ export declare class NapCatHttpEndpoint 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/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, formatInboundTarget, formatOutboundSegments, isMessageEvent, senderNickname, senderUserId, } from './protocol.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,21 +47,21 @@ 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({ target, payload }) {
+    async send({ conversation, payload }) {
         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,
             access_token: this.#options.config.access_token,
         }, 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,
-            target,
+            endpoint: this.#options.config.id,
+            target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
         return messageId;
@@ -87,30 +88,33 @@ export class NapCatHttpEndpoint {
         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),
             }));
         });
@@ -144,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/index.d.ts

@@ -1,4 +1,4 @@
-export { buildSendAction, buildWsConnectOptions, callNapCatHttpAction, formatInboundContent, formatInboundTarget, formatOutboundSegments, getChannelId, isMessageEvent, mediaRefToOneBotFile, parseSendTarget, resolveNapCatConfig, senderNickname, senderUserId, type MessageSegment, type NapCatActionRequest, type NapCatActionResponse, type NapCatAdapterConfig, type NapCatConfigBase, type NapCatEndpointConfig, type NapCatEvent, type NapCatHttpConfig, type NapCatMessageEvent, type NapCatSender, type NapCatWireSegment, type NapCatWsConfig, type NapCatWssConfig, type ParsedSendTarget, type ResolvedNapCatConfig, } from './protocol.js';
+export { buildSendAction, buildWsConnectOptions, callNapCatHttpAction, formatInboundContent, formatOutboundSegments, getChannelId, isMessageEvent, mediaRefToOneBotFile, napcatInboundConversation, napcatOutboundTarget, resolveNapCatConfig, senderNickname, senderUserId, type MessageSegment, type NapCatActionRequest, type NapCatActionResponse, type NapCatAdapterConfig, type NapCatConfigBase, type NapCatEndpointConfig, type NapCatEvent, type NapCatHttpConfig, type NapCatMessageEvent, type NapCatSender, type NapCatWireSegment, type NapCatWsConfig, type NapCatWssConfig, type ParsedSendTarget, type ResolvedNapCatConfig, } from './protocol.js';
 export { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
 export { getEndpoint, getNapcatAgentDeps, registerNapcatAgentEndpoint, setNapcatAgentDeps, type NapcatAgentDeps, type NapcatAgentEndpoint, } from './napcat-agent-deps.js';
 export { parseOneBotGetMsgResponse } from './onebot-get-msg.js';

package/lib/index.js

@@ -1,4 +1,4 @@
-export { buildSendAction, buildWsConnectOptions, callNapCatHttpAction, formatInboundContent, formatInboundTarget, formatOutboundSegments, getChannelId, isMessageEvent, mediaRefToOneBotFile, parseSendTarget, resolveNapCatConfig, senderNickname, senderUserId, } from './protocol.js';
+export { buildSendAction, buildWsConnectOptions, callNapCatHttpAction, formatInboundContent, formatOutboundSegments, getChannelId, isMessageEvent, mediaRefToOneBotFile, napcatInboundConversation, napcatOutboundTarget, resolveNapCatConfig, senderNickname, senderUserId, } from './protocol.js';
 export { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
 export { getEndpoint, getNapcatAgentDeps, registerNapcatAgentEndpoint, setNapcatAgentDeps, } from './napcat-agent-deps.js';
 export { parseOneBotGetMsgResponse } from './onebot-get-msg.js';

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

@@ -4,11 +4,12 @@
  * Canonicalization is owned by gateway/core before endpoint.send.
  */
 import { type MediaRef } from '@zhin.js/core';
+import type { ConversationRef } from '@zhin.js/im-contract';
 /** Transitional legacy endpoint row (`endpoints[]` with `context: 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;
@@ -21,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;
@@ -35,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 */
@@ -116,8 +117,13 @@ export interface ParsedSendTarget {
 export declare function resolveNapCatConfig(config?: NapCatAdapterConfig): ResolvedNapCatConfig;
 export declare function isMessageEvent(ev: NapCatEvent): ev is NapCatMessageEvent;
 export declare function getChannelId(ev: NapCatEvent): string;
-export declare function formatInboundTarget(ev: NapCatEvent): string;
-export declare function parseSendTarget(target: string): ParsedSendTarget;
+/**
+ * 入站归一化 → ConversationRef：群消息 → kind 'group'；私聊临时会话
+ * （sub_type 'group'）→ kind 'private' + 群容器进 `parent`；其余私聊 → 'private'。
+ */
+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;
 /**
  * 入站 sender 语义：必须是用户 ID（Runtime Message contract）。
@@ -138,7 +144,7 @@ export declare function mediaRefToOneBotFile(media: MediaRef): string;
  * 非媒体的 wire 段（at 等）原样透传。
  */
 export declare function formatOutboundSegments(payload: unknown): MessageSegment[];
-export declare function buildSendAction(target: string, message: MessageSegment[]): {
+export declare function buildSendAction(target: ParsedSendTarget, message: MessageSegment[]): {
     action: string;
     params: Record<string, unknown>;
 };

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,
@@ -78,24 +78,32 @@ export function getChannelId(ev) {
         return String(ev.user_id);
     return '';
 }
-export function formatInboundTarget(ev) {
-    const messageType = ev.message_type === 'group' || (ev.group_id != null && ev.message_type !== 'private')
-        ? 'group'
-        : 'private';
-    return `${messageType}:${getChannelId(ev)}`;
-}
-export function parseSendTarget(target) {
-    const sep = target.indexOf(':');
-    if (sep <= 0) {
-        return { message_type: 'private', id: target };
+/**
+ * 入站归一化 → ConversationRef：群消息 → kind 'group'；私聊临时会话
+ * （sub_type 'group'）→ kind 'private' + 群容器进 `parent`；其余私聊 → 'private'。
+ */
+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) };
     }
-    const head = target.slice(0, sep);
-    const rest = target.slice(sep + 1);
-    if (head === 'group')
-        return { message_type: 'group', id: rest };
-    if (head === 'private')
-        return { message_type: 'private', id: rest };
-    return { message_type: 'private', id: target };
+    if (ev.sub_type === 'group' && ev.group_id != null) {
+        return {
+            endpoint,
+            kind: 'private',
+            id: ev.user_id != null ? String(ev.user_id) : '',
+            parent: { kind: 'group', id: String(ev.group_id) },
+        };
+    }
+    return { endpoint, kind: 'private', id: ev.user_id != null ? String(ev.user_id) : '' };
+}
+/** 出站：ConversationRef → OneBot 私聊/群聊目标。 */
+export function napcatOutboundTarget(conversation) {
+    return {
+        message_type: conversation.kind === 'group' ? 'group' : 'private',
+        id: conversation.id,
+    };
 }
 export function formatInboundContent(ev) {
     if (typeof ev.raw_message === 'string' && ev.raw_message)
@@ -231,12 +239,11 @@ export function formatOutboundSegments(payload) {
     return segs.length ? segs : [{ type: 'text', data: { text: '' } }];
 }
 export function buildSendAction(target, message) {
-    const parsed = parseSendTarget(target);
-    if (parsed.message_type === 'group') {
+    if (target.message_type === 'group') {
         return {
             action: 'send_group_msg',
             params: {
-                group_id: Number(parsed.id) || parsed.id,
+                group_id: Number(target.id) || target.id,
                 message,
             },
         };
@@ -244,7 +251,7 @@ export function buildSendAction(target, message) {
     return {
         action: 'send_private_msg',
         params: {
-            user_id: Number(parsed.id) || parsed.id,
+            user_id: Number(target.id) || target.id,
             message,
         },
     };

package/lib/ws-endpoint.d.ts

@@ -1,4 +1,4 @@
-import { type EndpointInstance, type EndpointManagement } from '@zhin.js/adapter';
+import { type EndpointInstance, type EndpointManagement, type EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { type NapCatEvent, type NapCatWsConfig } from './protocol.js';
@@ -17,10 +17,7 @@ export declare class NapCatWsEndpoint implements EndpointInstance {
     open(): void;
     close(): void;
     stop(): Promise<void>;
-    send({ target, payload }: {
-        readonly target: string;
-        readonly payload: unknown;
-    }): Promise<string>;
+    send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     recallMessage(messageId: string): Promise<void>;
     callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
     setTitle(groupId: number, userId: number, title: string, duration?: number): Promise<boolean>;