@zhin.js/adapter-napcat 1.1.22 → 1.1.24

package/CHANGELOG.md

@@ -1,5 +1,60 @@
 # @zhin.js/adapter-napcat
 
+## 1.1.24
+
+### Patch Changes
+
+- cbf1fb1: Unify Console page blueprints (`definePageBlueprint`, `defineAdapterPage`, `defineCommentReviewPage`, `projectBlueprintToImCard`, `projectBlueprintToCliPanel`) into `@zhin.js/console-contract` and `@zhin.js/page`, add zero-esbuild pure Blueprint synthesis + static client bundle mounting to `@zhin.js/pagemanager`, remove `@zhin.js/client` (React 19) and `.tsx` from all 30 server-side plugins and adapters (including `bilibili` and `juejin`), and remove legacy Era-1 Koa `PageManager` code.
+- Updated dependencies [cbf1fb1]
+- Updated dependencies [008ccad]
+- Updated dependencies [a1f1028]
+  - @zhin.js/console-contract@1.1.4
+  - @zhin.js/page@1.1.16
+  - @zhin.js/core@1.1.58
+  - @zhin.js/im-contract@1.1.13
+  - @zhin.js/host-http@1.1.16
+  - @zhin.js/adapter@1.1.30
+  - @zhin.js/adapter-onebot-events@0.0.3
+  - @zhin.js/tool@1.1.17
+  - @zhin.js/agent-feature@1.1.15
+  - @zhin.js/feature-kit@1.1.14
+  - @zhin.js/permission@1.1.14
+  - @zhin.js/skill@1.1.15
+
+## 1.1.23
+
+### Patch Changes
+
+- bc6ccb1: Deep audit bug fixes and 7 architectural improvements:
+  - Sink Agent Turn ingress pipeline from `@zhin.js/cli` into `@zhin.js/agent/runtime` (`plugin-runtime/ingress/`) and decompose `ingress-route.ts` into modular pipeline stages.
+  - Bind Session State Plane (`JsxButtonRegistry`, `InteractionRuntime`, `RuntimeInteractiveRouter`) to `PluginIncarnationRef` so active buttons and interactions survive unrelated-plugin HMR while expiring when the owning plugin reloads, and support per-conversation fallback numbering (`numberingScope: 'conversation'`).
+  - Establish `conversation_events` as the canonical message SSOT and reference `conversation_event_id`, `conversation_key`, `platform_message_id`, and `message_key` in `agent_messages` (`AGENT_MESSAGE_QUERY_VERSION = 2`), threading `conversationSequence` across inbound and outbound delivery receipts.
+  - Push down `DatabaseContextRepository` and `DatabaseScheduleJobStorage` full-session/full-table memory scans to indexed SQL queries.
+  - Add kernel-level inbound `replyTo` and `mentioned` auto-promotion (`promoteInboundMessagePayload`) plus reusable `InboundDeduper` and `TtlLookupCache` primitives in `@zhin.js/adapter`.
+  - Add `MiddlewareContext.dispatch` (`InboundDispatchSummary`) and `onAfterDispatch` hooks for `after-dispatch` middlewares, and support incremental rendering of in-place `envelope.payload` array mutations in `OutboundDeliveryRuntime`.
+  - Unify `HistoryWindowTracker` and `AgentCompactionRuntime` token/message budgets (`resolveUnifiedHistoryAndCompactionBudget`).
+  - Fix schema validation, database transaction connection cleanup and SQLite WAL mode, schedule timer wheel head-of-line blocking, security policy bash read paths and subagent guard propagation, group merge window permission carrier handoff, micro-compact namespaced tool matching, and WebSocket force-close / inbound segment mapping across adapters.
+- Updated dependencies [3a8504b]
+- Updated dependencies [6163abc]
+- Updated dependencies [fed2c27]
+- Updated dependencies [bc6ccb1]
+- Updated dependencies [72b5a12]
+- Updated dependencies [aa41889]
+- Updated dependencies [4427e72]
+- Updated dependencies [22bd14a]
+  - @zhin.js/agent-feature@1.1.14
+  - @zhin.js/core@1.1.57
+  - @zhin.js/client@1.1.25
+  - @zhin.js/page@1.1.15
+  - @zhin.js/im-contract@1.1.12
+  - @zhin.js/adapter@1.1.29
+  - @zhin.js/host-http@1.1.15
+  - @zhin.js/feature-kit@1.1.13
+  - @zhin.js/tool@1.1.16
+  - @zhin.js/adapter-onebot-events@0.0.2
+  - @zhin.js/permission@1.1.13
+  - @zhin.js/skill@1.1.14
+
 ## 1.1.22
 
 ### Patch Changes

package/lib/http-endpoint.js

@@ -1,10 +1,11 @@
 import { EndpointDeliveryError } from '@zhin.js/im-contract';
+import { toCanonicalSegments } from '@zhin.js/core';
 import { createEndpointSpecification, endpointSpec, createRecallEndpointControl, } from 'zhin.js/adapter';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createNapCatEndpointManagement } from './endpoint-management.js';
 import { createNapcatSelfProfile } from './self-profile.js';
 import { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
-import { buildSendAction, callNapCatHttpAction, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
+import { buildSendAction, callNapCatHttpAction, extractQuoteId, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
 import { receiveNapCatSideEvent } from './side-event-dispatch.js';
 import { createNapCatContentPort } from './onebot-get-msg.js';
 import { NapcatClient } from './client.js';
@@ -120,12 +121,15 @@ export class NapCatHttpEndpoint extends NapcatClient {
         const conversation = { ...napcatInboundConversation(String(this.#options.id), ev), endpoint: this[endpointSpec].identity };
         const nickname = senderNickname(ev);
         const mentioned = isNapCatBotMentioned(ev);
+        const quoteId = extractQuoteId(ev);
+        const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
         void this[endpointSpec].events.message({
             event: nativeEvent,
             ...(typeof nativeEvent.time === 'number' ? { platformSentAt: nativeEvent.time * 1000 } : {}),
             conversation,
             message: { conversation, id: msgId },
             content: formatInboundContent(ev),
+            ...(segments?.length ? { segments } : {}),
             sender: {
                 id: senderUserId(ev),
                 name: nickname,
@@ -133,6 +137,7 @@ export class NapCatHttpEndpoint extends NapcatClient {
             },
             endpointId: this.#options.config.id,
             ...(mentioned ? { mentioned: true } : {}),
+            ...(quoteId ? { replyTo: { id: quoteId } } : {}),
             metadata: Object.freeze({
                 message_type: ev.message_type,
                 user_id: ev.user_id != null ? String(ev.user_id) : undefined,

package/lib/napcat-inbound.d.ts

@@ -1,12 +1,9 @@
 /**
  * NapCat 入站消息治理：去重、自发过滤、消息归一化
  */
+import { InboundMessageDeduper } from 'zhin.js/adapter';
 import type { NapCatMessageEvent, MessageSegment } from './protocol.js';
-export declare class InboundMessageDeduper {
-    private readonly seen;
-    shouldProcess(messageId: string): boolean;
-    clear(): void;
-}
+export { InboundMessageDeduper };
 /** 判断是否为 bot 自身发出的消息 */
 export declare function isSelfMessage(event: NapCatMessageEvent | {
     post_type?: string;

package/lib/napcat-inbound.js

@@ -1,21 +1,8 @@
-const DEDUPE_TTL_MS = 120_000;
-export class InboundMessageDeduper {
-    seen = new Map();
-    shouldProcess(messageId) {
-        const now = Date.now();
-        for (const [id, t] of this.seen) {
-            if (now - t > DEDUPE_TTL_MS)
-                this.seen.delete(id);
-        }
-        if (this.seen.has(messageId))
-            return false;
-        this.seen.set(messageId, now);
-        return true;
-    }
-    clear() {
-        this.seen.clear();
-    }
-}
+/**
+ * NapCat 入站消息治理：去重、自发过滤、消息归一化
+ */
+import { InboundMessageDeduper, promoteInboundMessagePayload } from 'zhin.js/adapter';
+export { InboundMessageDeduper };
 /** 判断是否为 bot 自身发出的消息 */
 export function isSelfMessage(event) {
     if (event.post_type === 'message_sent')
@@ -53,9 +40,8 @@ export function isNapCatBotMentioned(ev) {
     if (!uin)
         return false;
     const segments = normalizeMessage(ev.message ?? []);
-    for (const seg of segments) {
-        if (seg.type === 'at' && atTargetMatchesUin(seg.data?.qq, uin))
-            return true;
+    if (promoteInboundMessagePayload({ segments }, uin).mentioned === true) {
+        return true;
     }
     const text = segments
         .map((seg) => (seg.type === 'text' ? String(seg.data?.text ?? '') : ''))

package/lib/onebot-get-msg.js

@@ -67,9 +67,10 @@ export function createNapCatContentPort(callApi) {
         },
     });
 }
+import { toCanonicalSegments } from '@zhin.js/core';
 function canonicalSegments(content) {
-    return Object.freeze(content.map((segment) => Object.freeze({
-        type: segment.type,
+    return Object.freeze(toCanonicalSegments(content).map((segment) => Object.freeze({
+        ...segment,
         data: Object.freeze(segment.data ?? {}),
     })));
 }

package/lib/protocol.d.ts

@@ -119,6 +119,11 @@ export declare function formatInboundContent(ev: NapCatEvent): string;
 export declare function senderUserId(ev: NapCatEvent): string;
 /** 显示名（群名片 card 优先于 nickname），没有则 undefined。 */
 export declare function senderNickname(ev: NapCatEvent): string | undefined;
+/**
+ * 回复引用 id：优先取 message 数组中的 {type:'reply', data:{id}} 段；
+ * 兼容部分实现把 reply 放在事件顶层（标量或带 message_id 的对象）。
+ */
+export declare function extractQuoteId(ev: NapCatEvent): string | undefined;
 /**
  * canonical MediaRef → OneBot `file` 参数：url 直传、base64 → `base64://`、
  * 本地路径 → `file://`（路径在 OneBot 实现侧解析）、kind=file 不透明引用原样透传。

package/lib/protocol.js

@@ -157,6 +157,27 @@ export function senderNickname(ev) {
     const name = ev.sender?.card || ev.sender?.nickname;
     return typeof name === 'string' && name ? name : undefined;
 }
+/**
+ * 回复引用 id：优先取 message 数组中的 {type:'reply', data:{id}} 段；
+ * 兼容部分实现把 reply 放在事件顶层（标量或带 message_id 的对象）。
+ */
+export function extractQuoteId(ev) {
+    if (Array.isArray(ev.message)) {
+        for (const seg of ev.message) {
+            if (seg?.type === 'reply' && seg.data?.id != null)
+                return String(seg.data.id);
+        }
+    }
+    const reply = ev.reply;
+    if (typeof reply === 'number' || typeof reply === 'string')
+        return String(reply);
+    if (reply && typeof reply === 'object' && 'message_id' in reply) {
+        const id = reply.message_id;
+        if (id != null)
+            return String(id);
+    }
+    return undefined;
+}
 /**
  * canonical MediaRef → OneBot `file` 参数：url 直传、base64 → `base64://`、
  * 本地路径 → `file://`（路径在 OneBot 实现侧解析）、kind=file 不透明引用原样透传。

package/lib/ws-endpoint.js

@@ -1,4 +1,5 @@
 import { EndpointDeliveryError } from '@zhin.js/im-contract';
+import { toCanonicalSegments } from '@zhin.js/core';
 /**
  * NapCat WS client endpoint — outbound connect to NapCat.
  */
@@ -8,7 +9,7 @@ import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createNapCatEndpointManagement } from './endpoint-management.js';
 import { createNapcatSelfProfile } from './self-profile.js';
 import { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
-import { buildSendAction, buildWsConnectOptions, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
+import { buildSendAction, buildWsConnectOptions, extractQuoteId, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
 import { receiveNapCatSideEvent } from './side-event-dispatch.js';
 import { createNapCatContentPort } from './onebot-get-msg.js';
 import { NapcatClient } from './client.js';
@@ -134,12 +135,15 @@ export class NapCatWsEndpoint extends NapcatClient {
         const content = formatInboundContent(ev);
         const nickname = senderNickname(ev);
         const mentioned = isNapCatBotMentioned(ev);
+        const quoteId = extractQuoteId(ev);
+        const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
         void this[endpointSpec].events.message({
             event: nativeEvent,
             ...(typeof nativeEvent.time === 'number' ? { platformSentAt: nativeEvent.time * 1000 } : {}),
             conversation,
             message: { conversation, id: msgId },
             content,
+            ...(segments?.length ? { segments } : {}),
             sender: {
                 id: senderUserId(ev),
                 name: nickname,
@@ -147,6 +151,7 @@ export class NapCatWsEndpoint extends NapcatClient {
             },
             endpointId: this.#options.config.id,
             ...(mentioned ? { mentioned: true } : {}),
+            ...(quoteId ? { replyTo: { id: quoteId } } : {}),
             metadata: Object.freeze({
                 message_type: ev.message_type,
                 user_id: ev.user_id != null ? String(ev.user_id) : undefined,
@@ -178,6 +183,7 @@ export class NapCatWsEndpoint extends NapcatClient {
                 }
                 try {
                     ws.close();
+                    ws.terminate?.();
                 }
                 catch {
                     /* ignore */

package/lib/ws-types.d.ts

@@ -3,6 +3,7 @@ export interface NapCatWsSocket {
     readonly readyState: number;
     send(data: string): void;
     close(code?: number, reason?: string): void;
+    terminate?(): void;
     ping?(): void;
     on(event: 'open' | 'message' | 'close' | 'error' | 'pong', listener: (...args: unknown[]) => void): void;
 }

package/lib/wss-endpoint.js

@@ -1,4 +1,5 @@
 import { EndpointDeliveryError } from '@zhin.js/im-contract';
+import { toCanonicalSegments } from '@zhin.js/core';
 /**
  * NapCat reverse WSS endpoint — accepts inbound WebSocket from NapCat.
  */
@@ -7,7 +8,7 @@ import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createNapCatEndpointManagement } from './endpoint-management.js';
 import { createNapcatSelfProfile } from './self-profile.js';
 import { InboundMessageDeduper, isNapCatBotMentioned, isSelfMessage, normalizeMessage, } from './napcat-inbound.js';
-import { buildSendAction, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
+import { buildSendAction, extractQuoteId, formatInboundContent, formatOutboundSegments, isMessageEvent, napcatInboundConversation, napcatOutboundTarget, senderNickname, senderUserId, } from './protocol.js';
 import { receiveNapCatSideEvent } from './side-event-dispatch.js';
 import { createNapCatContentPort } from './onebot-get-msg.js';
 import { NapcatClient } from './client.js';
@@ -147,12 +148,15 @@ export class NapCatWssEndpoint extends NapcatClient {
         const conversation = { ...napcatInboundConversation(String(this.#options.id), ev), endpoint: this[endpointSpec].identity };
         const nickname = senderNickname(ev);
         const mentioned = isNapCatBotMentioned(ev);
+        const quoteId = extractQuoteId(ev);
+        const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
         void this[endpointSpec].events.message({
             event: nativeEvent,
             ...(typeof nativeEvent.time === 'number' ? { platformSentAt: nativeEvent.time * 1000 } : {}),
             conversation,
             message: { conversation, id: msgId },
             content: formatInboundContent(ev),
+            ...(segments?.length ? { segments } : {}),
             sender: {
                 id: senderUserId(ev),
                 name: nickname,
@@ -160,6 +164,7 @@ export class NapCatWssEndpoint extends NapcatClient {
             },
             endpointId: this.#options.config.id,
             ...(mentioned ? { mentioned: true } : {}),
+            ...(quoteId ? { replyTo: { id: quoteId } } : {}),
             metadata: Object.freeze({
                 message_type: ev.message_type,
                 user_id: ev.user_id != null ? String(ev.user_id) : undefined,
@@ -197,6 +202,7 @@ export class NapCatWssEndpoint extends NapcatClient {
                 }
                 try {
                     socket.close();
+                    socket.terminate?.();
                 }
                 catch {
                     /* ignore */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-napcat",
-  "version": "1.1.22",
+  "version": "1.1.24",
   "description": "Zhin.js NapCat adapter for Plugin Runtime (WebSocket client, OneBot11 + NapCat extensions)",
   "type": "module",
   "main": "./lib/index.js",
@@ -45,20 +45,19 @@
   },
   "dependencies": {
     "ws": "^8.21.1",
-    "@zhin.js/adapter-onebot-events": "0.0.1",
-    "@zhin.js/adapter": "1.1.28",
-    "@zhin.js/agent-feature": "1.1.13",
-    "@zhin.js/client": "1.1.24",
-    "@zhin.js/console-contract": "1.1.3",
-    "@zhin.js/core": "1.1.56",
-    "@zhin.js/feature-kit": "1.1.12",
-    "@zhin.js/host-http": "1.1.14",
-    "@zhin.js/im-contract": "1.1.11",
+    "@zhin.js/adapter-onebot-events": "0.0.3",
+    "@zhin.js/adapter": "1.1.30",
+    "@zhin.js/agent-feature": "1.1.15",
+    "@zhin.js/console-contract": "1.1.4",
+    "@zhin.js/core": "1.1.58",
+    "@zhin.js/feature-kit": "1.1.14",
+    "@zhin.js/host-http": "1.1.16",
+    "@zhin.js/im-contract": "1.1.13",
     "@zhin.js/logger": "1.1.2",
-    "@zhin.js/page": "1.1.14",
-    "@zhin.js/permission": "1.1.12",
-    "@zhin.js/skill": "1.1.13",
-    "@zhin.js/tool": "1.1.15"
+    "@zhin.js/page": "1.1.16",
+    "@zhin.js/permission": "1.1.14",
+    "@zhin.js/skill": "1.1.15",
+    "@zhin.js/tool": "1.1.17"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
@@ -66,15 +65,15 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/host-http": "1.1.14",
-    "zhin.js": "1.1.21"
+    "@zhin.js/host-http": "1.1.16",
+    "zhin.js": "1.1.23"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "^1.1.28",
-    "@zhin.js/command": "^1.1.14",
-    "@zhin.js/core": "^1.1.56",
-    "zhin.js": "^1.1.21"
+    "@zhin.js/adapter": "^1.1.30",
+    "@zhin.js/command": "^1.1.16",
+    "@zhin.js/core": "^1.1.58",
+    "zhin.js": "^1.1.23"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {

package/pages/index/index.js

@@ -1,6 +1,5 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { definePage } from '@zhin.js/console-contract';
-import { createAdapterConsolePage } from '@zhin.js/client';
+import { definePage, createAdapterConsolePage } from '@zhin.js/console-contract';
 export const meta = definePage({
     title: 'NapCat',
     titleI18n: { en: 'NapCat' },

package/pages/index/index.ts

@@ -1,5 +1,4 @@
-import { definePage } from '@zhin.js/console-contract';
-import { createAdapterConsolePage } from '@zhin.js/client';
+import { definePage, createAdapterConsolePage } from '@zhin.js/console-contract';
 
 export const meta = definePage({
   title: 'NapCat',

package/plugin.js

@@ -1,5 +1,5 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { definePlugin, pluginConsoleRpcToken } from 'zhin.js';
+import { definePlugin } from 'zhin.js';
 import { permissionHostToken, createSceneRolePlatformChecker } from '@zhin.js/permission';
 import { createNapcatConsoleRpc } from "./lib/console.js";
 export default definePlugin({
@@ -9,10 +9,12 @@ export default definePlugin({
         displayName: 'NapCat Adapter',
     },
     setup(context) {
-        context.resources.provide(pluginConsoleRpcToken, createNapcatConsoleRpc(context.resources, () => context.config.get()));
-        if (context.resources.has(permissionHostToken)) {
-            const host = context.resources.use(permissionHostToken);
-            return host.registerPlatform('napcat', createSceneRolePlatformChecker());
-        }
+        const dispose = context.resources.has(permissionHostToken)
+            ? context.resources.use(permissionHostToken).registerPlatform('napcat', createSceneRolePlatformChecker())
+            : undefined;
+        return {
+            consoleRpc: createNapcatConsoleRpc(context.resources, () => context.config.get()),
+            ...(dispose ? { dispose } : {}),
+        };
     },
 });

package/src/http-endpoint.ts

@@ -1,4 +1,5 @@
 import { EndpointDeliveryError } from '@zhin.js/im-contract';
+import { toCanonicalSegments } from '@zhin.js/core';
 /**
  * NapCat HTTP endpoint — POST inbound events + HTTP API outbound.
  */
@@ -25,6 +26,7 @@ import {
 import {
   buildSendAction,
   callNapCatHttpAction,
+  extractQuoteId,
   formatInboundContent,
   formatOutboundSegments,
   isMessageEvent,
@@ -171,12 +173,15 @@ export class NapCatHttpEndpoint extends NapcatClient implements Endpoint {
     const conversation = { ...napcatInboundConversation(String(this.#options.id), ev), endpoint: this[endpointSpec].identity };
     const nickname = senderNickname(ev);
     const mentioned = isNapCatBotMentioned(ev);
+    const quoteId = extractQuoteId(ev);
+    const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
     void this[endpointSpec].events.message({
       event: nativeEvent,
       ...(typeof nativeEvent.time === 'number' ? { platformSentAt: nativeEvent.time * 1000 } : {}),
       conversation,
       message: { conversation, id: msgId },
       content: formatInboundContent(ev),
+      ...(segments?.length ? { segments } : {}),
       sender: {
         id: senderUserId(ev),
         name: nickname,
@@ -184,6 +189,7 @@ export class NapCatHttpEndpoint extends NapcatClient implements Endpoint {
       },
       endpointId: this.#options.config.id,
       ...(mentioned ? { mentioned: true } : {}),
+      ...(quoteId ? { replyTo: { id: quoteId } } : {}),
       metadata: Object.freeze({
         message_type: ev.message_type,
         user_id: ev.user_id != null ? String(ev.user_id) : undefined,

package/src/napcat-inbound.ts

@@ -1,27 +1,10 @@
 /**
  * NapCat 入站消息治理：去重、自发过滤、消息归一化
  */
+import { InboundMessageDeduper, promoteInboundMessagePayload } from 'zhin.js/adapter';
 import type { NapCatMessageEvent, MessageSegment } from './protocol.js';
 
-const DEDUPE_TTL_MS = 120_000;
-
-export class InboundMessageDeduper {
-  private readonly seen = new Map<string, number>();
-
-  shouldProcess(messageId: string): boolean {
-    const now = Date.now();
-    for (const [id, t] of this.seen) {
-      if (now - t > DEDUPE_TTL_MS) this.seen.delete(id);
-    }
-    if (this.seen.has(messageId)) return false;
-    this.seen.set(messageId, now);
-    return true;
-  }
-
-  clear(): void {
-    this.seen.clear();
-  }
-}
+export { InboundMessageDeduper };
 
 /** 判断是否为 bot 自身发出的消息 */
 export function isSelfMessage(event: NapCatMessageEvent | {
@@ -67,8 +50,8 @@ export function isNapCatBotMentioned(ev: {
   const uin = String(ev.self_id).trim();
   if (!uin) return false;
   const segments = normalizeMessage(ev.message ?? []);
-  for (const seg of segments) {
-    if (seg.type === 'at' && atTargetMatchesUin(seg.data?.qq, uin)) return true;
+  if (promoteInboundMessagePayload<{ segments: MessageSegment[]; mentioned?: boolean }>({ segments }, uin).mentioned === true) {
+    return true;
   }
   const text = segments
     .map((seg) => (seg.type === 'text' ? String(seg.data?.text ?? '') : ''))

package/src/onebot-get-msg.ts

@@ -82,9 +82,13 @@ export function createNapCatContentPort(
   });
 }
 
+import { toCanonicalSegments } from '@zhin.js/core';
+import type { PendingRpcRequest, EndpointContentPort, EndpointContentResolveContext } from 'zhin.js/adapter';
+import type { ConversationMessage, ConversationReference, ForwardEntry } from '@zhin.js/im-contract';
+
 function canonicalSegments(content: Array<{ type: string; data?: Record<string, unknown> }>) {
-  return Object.freeze(content.map((segment) => Object.freeze({
-    type: segment.type,
+  return Object.freeze(toCanonicalSegments(content).map((segment) => Object.freeze({
+    ...segment,
     data: Object.freeze(segment.data ?? {}),
   })));
 }
@@ -93,5 +97,3 @@ function toMillis(value: unknown): number {
   const time = Number(value);
   return Number.isFinite(time) ? (time < 10_000_000_000 ? time * 1000 : time) : Date.now();
 }
-import type { PendingRpcRequest, EndpointContentPort, EndpointContentResolveContext } from 'zhin.js/adapter';
-import type { ConversationMessage, ConversationReference, ForwardEntry } from '@zhin.js/im-contract';

package/src/protocol.ts

@@ -283,6 +283,25 @@ export function senderNickname(ev: NapCatEvent): string | undefined {
   return typeof name === 'string' && name ? name : undefined;
 }
 
+/**
+ * 回复引用 id：优先取 message 数组中的 {type:'reply', data:{id}} 段；
+ * 兼容部分实现把 reply 放在事件顶层（标量或带 message_id 的对象）。
+ */
+export function extractQuoteId(ev: NapCatEvent): string | undefined {
+  if (Array.isArray(ev.message)) {
+    for (const seg of ev.message) {
+      if (seg?.type === 'reply' && seg.data?.id != null) return String(seg.data.id);
+    }
+  }
+  const reply = ev.reply;
+  if (typeof reply === 'number' || typeof reply === 'string') return String(reply);
+  if (reply && typeof reply === 'object' && 'message_id' in reply) {
+    const id = (reply as { message_id?: unknown }).message_id;
+    if (id != null) return String(id);
+  }
+  return undefined;
+}
+
 /**
  * canonical MediaRef → OneBot `file` 参数：url 直传、base64 → `base64://`、
  * 本地路径 → `file://`（路径在 OneBot 实现侧解析）、kind=file 不透明引用原样透传。

package/src/ws-endpoint.ts

@@ -1,4 +1,5 @@
 import { EndpointDeliveryError } from '@zhin.js/im-contract';
+import { toCanonicalSegments } from '@zhin.js/core';
 /**
  * NapCat WS client endpoint — outbound connect to NapCat.
  */
@@ -27,6 +28,7 @@ import {
 import {
   buildSendAction,
   buildWsConnectOptions,
+  extractQuoteId,
   formatInboundContent,
   formatOutboundSegments,
   isMessageEvent,
@@ -190,12 +192,15 @@ export class NapCatWsEndpoint extends NapcatClient implements Endpoint {
     const content = formatInboundContent(ev);
     const nickname = senderNickname(ev);
     const mentioned = isNapCatBotMentioned(ev);
+    const quoteId = extractQuoteId(ev);
+    const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
     void this[endpointSpec].events.message({
       event: nativeEvent,
       ...(typeof nativeEvent.time === 'number' ? { platformSentAt: nativeEvent.time * 1000 } : {}),
       conversation,
       message: { conversation, id: msgId },
       content,
+      ...(segments?.length ? { segments } : {}),
       sender: {
         id: senderUserId(ev),
         name: nickname,
@@ -203,6 +208,7 @@ export class NapCatWsEndpoint extends NapcatClient implements Endpoint {
       },
       endpointId: this.#options.config.id,
       ...(mentioned ? { mentioned: true } : {}),
+      ...(quoteId ? { replyTo: { id: quoteId } } : {}),
       metadata: Object.freeze({
         message_type: ev.message_type,
         user_id: ev.user_id != null ? String(ev.user_id) : undefined,
@@ -237,6 +243,7 @@ export class NapCatWsEndpoint extends NapcatClient implements Endpoint {
         }
         try {
           ws.close();
+          ws.terminate?.();
         } catch {
           /* ignore */
         }

package/src/ws-types.ts

@@ -3,6 +3,7 @@ export interface NapCatWsSocket {
   readonly readyState: number;
   send(data: string): void;
   close(code?: number, reason?: string): void;
+  terminate?(): void;
   ping?(): void;
   on(event: 'open' | 'message' | 'close' | 'error' | 'pong', listener: (...args: unknown[]) => void): void;
 }

package/src/wss-endpoint.ts

@@ -1,4 +1,5 @@
 import { EndpointDeliveryError } from '@zhin.js/im-contract';
+import { toCanonicalSegments } from '@zhin.js/core';
 /**
  * NapCat reverse WSS endpoint — accepts inbound WebSocket from NapCat.
  */
@@ -25,6 +26,7 @@ import {
 } from './napcat-inbound.js';
 import {
   buildSendAction,
+  extractQuoteId,
   formatInboundContent,
   formatOutboundSegments,
   isMessageEvent,
@@ -195,12 +197,15 @@ export class NapCatWssEndpoint extends NapcatClient implements Endpoint {
     const conversation = { ...napcatInboundConversation(String(this.#options.id), ev), endpoint: this[endpointSpec].identity };
     const nickname = senderNickname(ev);
     const mentioned = isNapCatBotMentioned(ev);
+    const quoteId = extractQuoteId(ev);
+    const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
     void this[endpointSpec].events.message({
       event: nativeEvent,
       ...(typeof nativeEvent.time === 'number' ? { platformSentAt: nativeEvent.time * 1000 } : {}),
       conversation,
       message: { conversation, id: msgId },
       content: formatInboundContent(ev),
+      ...(segments?.length ? { segments } : {}),
       sender: {
         id: senderUserId(ev),
         name: nickname,
@@ -208,6 +213,7 @@ export class NapCatWssEndpoint extends NapcatClient implements Endpoint {
       },
       endpointId: this.#options.config.id,
       ...(mentioned ? { mentioned: true } : {}),
+      ...(quoteId ? { replyTo: { id: quoteId } } : {}),
       metadata: Object.freeze({
         message_type: ev.message_type,
         user_id: ev.user_id != null ? String(ev.user_id) : undefined,
@@ -246,6 +252,7 @@ export class NapCatWssEndpoint extends NapcatClient implements Endpoint {
         }
         try {
           socket.close();
+          socket.terminate?.();
         } catch {
           /* ignore */
         }