@zhin.js/adapter-onebot12 1.1.22 → 1.1.24

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @zhin.js/adapter-onebot12
 
+## 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/feature-kit@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 [6163abc]
+- Updated dependencies [fed2c27]
+- Updated dependencies [bc6ccb1]
+- Updated dependencies [72b5a12]
+- Updated dependencies [aa41889]
+- Updated dependencies [4427e72]
+- Updated dependencies [22bd14a]
+  - @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/adapter-onebot-events@0.0.2
+  - @zhin.js/skill@1.1.14
+
 ## 1.1.22
 
 ### Patch Changes

package/lib/protocol.d.ts

@@ -121,6 +121,8 @@ export declare function senderNickname(ev: OneBot12Event): string | undefined;
  * 新 Plugin Runtime 的 Message.content 为纯文本，mention 信息只能经 metadata.mentioned 传递。
  */
 export declare function isBotMentioned(ev: OneBot12Event): boolean;
+/** 提取入站消息中的回复引用 message_id。 */
+export declare function extractQuoteId(ev: OneBot12Event): string | undefined;
 /**
  * canonical MediaRef → OneBot 12 媒体字段（扩展字段降级形状）。
  * spec 正式投递形状是 `file_id`（先 upload_file 物化，见

package/lib/protocol.js

@@ -159,6 +159,19 @@ export function isBotMentioned(ev) {
         return false;
     return ev.message.some((seg) => seg.type === 'mention' && String(seg.data?.['user_id'] ?? '') === selfId);
 }
+/** 提取入站消息中的回复引用 message_id。 */
+export function extractQuoteId(ev) {
+    if (!Array.isArray(ev.message))
+        return undefined;
+    for (const seg of ev.message) {
+        if (seg?.type === 'reply') {
+            const id = seg.data?.['message_id'] ?? seg.data?.['id'];
+            if (id != null && String(id).trim() !== '')
+                return String(id);
+        }
+    }
+    return undefined;
+}
 /** OneBot 12 携带媒体的段类型。 */
 const ONEBOT12_MEDIA_TYPES = new Set(['image', 'voice', 'audio', 'video', 'file']);
 /** 媒体段 data 里的 canonical 字段，归一后不重复进 wire。 */

package/lib/webhook.js

@@ -1,9 +1,10 @@
 import { createOnebot12SelfProfile } from './self-profile.js';
+import { toCanonicalSegments } from '@zhin.js/core';
 import { acceptHttpIngress } from 'imhelper';
 import { createEndpointSpecification, endpointSpec, createRecallEndpointControl, } from 'zhin.js/adapter';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
-import { buildSendMessageParams, matchesOneBot12Self, callOneBot12Action, formatInboundContent, formatOutboundSegments, isBotMentioned, isMessageEvent, onebot12InboundConversation, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
+import { buildSendMessageParams, matchesOneBot12Self, callOneBot12Action, extractQuoteId, formatInboundContent, formatOutboundSegments, isBotMentioned, isMessageEvent, onebot12InboundConversation, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
 import { receiveOneBot12SideEvent } from './side-event-dispatch.js';
 import { createOneBot12ContentPort } from './content-port.js';
 import { callOnebot12Client, readOnebot12Response, onebot12ClientOptions, forwardOnebot12ClientEvents, Onebot12Client } from './client.js';
@@ -125,15 +126,19 @@ export class OneBot12WebhookEndpoint extends Onebot12Client {
         const content = formatInboundContent(ev);
         const nickname = senderNickname(ev);
         const mentioned = isBotMentioned(ev);
+        const quoteId = extractQuoteId(ev);
+        const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
         void this[endpointSpec].events.message({
             event: ev,
             ...(typeof ev.time === 'number' ? { platformSentAt: ev.time * 1000 } : {}),
             conversation,
             message: { conversation, id: ev.message_id },
             content,
+            ...(segments?.length ? { segments } : {}),
             sender: { id: senderUserId(ev), ...(nickname ? { name: nickname } : {}) },
             endpointId: this.#options.config.id,
             ...(mentioned ? { mentioned: true } : {}),
+            ...(quoteId ? { replyTo: { id: quoteId } } : {}),
             metadata: Object.freeze({
                 detail_type: ev.detail_type,
                 user_id: ev.user_id,

package/lib/ws-endpoint.js

@@ -1,4 +1,5 @@
 import { createOnebot12SelfProfile } from './self-profile.js';
+import { toCanonicalSegments } from '@zhin.js/core';
 /**
  * OneBot12 WS client endpoint — outbound connect to OneBot implementation.
  */
@@ -6,7 +7,7 @@ import WebSocket from 'ws';
 import { createEndpointSpecification, endpointSpec, createRecallEndpointControl, createEndpointLifecycle, } from 'zhin.js/adapter';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
-import { buildSendMessageParams, matchesOneBot12Self, buildWsConnectOptions, formatInboundContent, formatOutboundSegments, isBotMentioned, isMessageEvent, onebot12InboundConversation, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
+import { buildSendMessageParams, matchesOneBot12Self, buildWsConnectOptions, extractQuoteId, formatInboundContent, formatOutboundSegments, isBotMentioned, isMessageEvent, onebot12InboundConversation, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
 import { receiveOneBot12SideEvent } from './side-event-dispatch.js';
 import { createOneBot12ContentPort } from './content-port.js';
 import { callOnebot12Client, readOnebot12Response, onebot12ClientOptions, forwardOnebot12ClientEvents, Onebot12Client } from './client.js';
@@ -143,15 +144,19 @@ export class OneBot12WsEndpoint extends Onebot12Client {
         const content = formatInboundContent(ev);
         const nickname = senderNickname(ev);
         const mentioned = isBotMentioned(ev);
+        const quoteId = extractQuoteId(ev);
+        const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
         void this[endpointSpec].events.message({
             event: ev,
             ...(typeof ev.time === 'number' ? { platformSentAt: ev.time * 1000 } : {}),
             conversation,
             message: { conversation, id: ev.message_id },
             content,
+            ...(segments?.length ? { segments } : {}),
             sender: { id: senderUserId(ev), name: senderNickname(ev) },
             endpointId: this.#options.config.id,
             ...(mentioned ? { mentioned: true } : {}),
+            ...(quoteId ? { replyTo: { id: quoteId } } : {}),
             metadata: Object.freeze({
                 detail_type: ev.detail_type,
                 user_id: ev.user_id,
@@ -185,8 +190,12 @@ export class OneBot12WsEndpoint extends Onebot12Client {
             const ws = create(url, { headers });
             this.#ws = ws;
             handle.onForceClose(() => {
+                if (this.#ws === ws) {
+                    this.#rpc.disconnect();
+                }
                 try {
                     ws.close();
+                    ws.terminate?.();
                 }
                 catch {
                     /* ignore */

package/lib/ws-types.d.ts

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

package/lib/wss-endpoint.js

@@ -1,11 +1,12 @@
 import { createOnebot12SelfProfile } from './self-profile.js';
+import { toCanonicalSegments } from '@zhin.js/core';
 /**
  * OneBot12 reverse WSS endpoint — accepts inbound WebSocket from OneBot implementation.
  */
 import { createEndpointSpecification, endpointSpec, createEndpointLifecycle, createRecallEndpointControl, } from 'zhin.js/adapter';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createOneBot12EndpointManagement } from './endpoint-management.js';
-import { buildSendMessageParams, matchesOneBot12Self, formatInboundContent, formatOutboundSegments, isBotMentioned, isMessageEvent, onebot12InboundConversation, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
+import { buildSendMessageParams, matchesOneBot12Self, extractQuoteId, formatInboundContent, formatOutboundSegments, isBotMentioned, isMessageEvent, onebot12InboundConversation, senderNickname, senderUserId, uploadOneBot12MediaSegments, } from './protocol.js';
 import { receiveOneBot12SideEvent } from './side-event-dispatch.js';
 import { createOneBot12ContentPort } from './content-port.js';
 import { callOnebot12Client, readOnebot12Response, onebot12ClientOptions, forwardOnebot12ClientEvents, Onebot12Client } from './client.js';
@@ -144,15 +145,19 @@ export class OneBot12WssEndpoint extends Onebot12Client {
         const conversation = { ...onebot12InboundConversation(String(this.#options.id), ev), endpoint: this[endpointSpec].identity };
         const nickname = senderNickname(ev);
         const mentioned = isBotMentioned(ev);
+        const quoteId = extractQuoteId(ev);
+        const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
         void this[endpointSpec].events.message({
             event: ev,
             ...(typeof ev.time === 'number' ? { platformSentAt: ev.time * 1000 } : {}),
             conversation,
             message: { conversation, id: ev.message_id },
             content: formatInboundContent(ev),
+            ...(segments?.length ? { segments } : {}),
             sender: { id: senderUserId(ev), name: senderNickname(ev) },
             endpointId: this.#options.config.id,
             ...(mentioned ? { mentioned: true } : {}),
+            ...(quoteId ? { replyTo: { id: quoteId } } : {}),
             metadata: Object.freeze({
                 detail_type: ev.detail_type,
                 user_id: ev.user_id,
@@ -188,8 +193,12 @@ export class OneBot12WssEndpoint extends Onebot12Client {
         await this.#connectionLifecycle.start(async (lifecycleHandle) => {
             this.#ws = socket;
             lifecycleHandle.onForceClose(() => {
+                if (this.#ws === socket) {
+                    this.#rpc.disconnect();
+                }
                 try {
                     socket.close();
+                    socket.terminate?.();
                 }
                 catch {
                     /* ignore */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-onebot12",
-  "version": "1.1.22",
+  "version": "1.1.24",
   "description": "Zhin.js OneBot 12 adapter for Plugin Runtime (WebSocket client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -42,31 +42,30 @@
     "@imhelper/onebot-v12": "1.0.7",
     "imhelper": "1.0.7",
     "ws": "^8.21.1",
-    "@zhin.js/adapter-onebot-events": "0.0.1",
-    "@zhin.js/adapter": "1.1.28",
-    "@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/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/skill": "1.1.13"
+    "@zhin.js/page": "1.1.16",
+    "@zhin.js/skill": "1.1.15"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
     "@types/ws": "^8.18.1",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "@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": {
-    "@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: 'OneBot 12',
     titleI18n: { en: 'OneBot 12' },

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: 'OneBot 12',

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 { createOnebot12ConsoleRpc } from "./lib/console.js";
 export default definePlugin({
     name: 'onebot12',
@@ -8,6 +8,8 @@ export default definePlugin({
         displayName: 'OneBot 12 Adapter',
     },
     setup(context) {
-        context.resources.provide(pluginConsoleRpcToken, createOnebot12ConsoleRpc(context.resources, () => context.config.get()));
+        return {
+            consoleRpc: createOnebot12ConsoleRpc(context.resources, () => context.config.get()),
+        };
     },
 });

package/src/protocol.ts

@@ -278,6 +278,18 @@ export function isBotMentioned(ev: OneBot12Event): boolean {
   );
 }
 
+/** 提取入站消息中的回复引用 message_id。 */
+export function extractQuoteId(ev: OneBot12Event): string | undefined {
+  if (!Array.isArray(ev.message)) return undefined;
+  for (const seg of ev.message) {
+    if (seg?.type === 'reply') {
+      const id = seg.data?.['message_id'] ?? seg.data?.['id'];
+      if (id != null && String(id).trim() !== '') return String(id);
+    }
+  }
+  return undefined;
+}
+
 /** OneBot 12 携带媒体的段类型。 */
 const ONEBOT12_MEDIA_TYPES = new Set(['image', 'voice', 'audio', 'video', 'file']);
 

package/src/webhook.ts

@@ -1,4 +1,5 @@
 import { createOnebot12SelfProfile } from './self-profile.js';
+import { toCanonicalSegments } from '@zhin.js/core';
 import { acceptHttpIngress } from 'imhelper';
 /**
  * OneBot12 HTTP webhook endpoint — POST inbound + api_url outbound.
@@ -21,6 +22,7 @@ import {
   buildSendMessageParams,
   matchesOneBot12Self,
   callOneBot12Action,
+  extractQuoteId,
   formatInboundContent,
   formatOutboundSegments,
   isBotMentioned,
@@ -164,15 +166,19 @@ export class OneBot12WebhookEndpoint extends Onebot12Client implements Endpoint
     const content = formatInboundContent(ev);
     const nickname = senderNickname(ev);
     const mentioned = isBotMentioned(ev);
+    const quoteId = extractQuoteId(ev);
+    const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
     void this[endpointSpec].events.message({
       event: ev,
       ...(typeof ev.time === 'number' ? { platformSentAt: ev.time * 1000 } : {}),
       conversation,
       message: { conversation, id: ev.message_id },
       content,
+      ...(segments?.length ? { segments } : {}),
       sender: { id: senderUserId(ev), ...(nickname ? { name: nickname } : {}) },
       endpointId: this.#options.config.id,
       ...(mentioned ? { mentioned: true } : {}),
+      ...(quoteId ? { replyTo: { id: quoteId } } : {}),
       metadata: Object.freeze({
         detail_type: ev.detail_type,
         user_id: ev.user_id,

package/src/ws-endpoint.ts

@@ -1,4 +1,5 @@
 import { createOnebot12SelfProfile } from './self-profile.js';
+import { toCanonicalSegments } from '@zhin.js/core';
 /**
  * OneBot12 WS client endpoint — outbound connect to OneBot implementation.
  */
@@ -22,6 +23,7 @@ import {
   buildSendMessageParams,
   matchesOneBot12Self,
   buildWsConnectOptions,
+  extractQuoteId,
   formatInboundContent,
   formatOutboundSegments,
   isBotMentioned,
@@ -182,15 +184,19 @@ export class OneBot12WsEndpoint extends Onebot12Client implements Endpoint {
     const content = formatInboundContent(ev);
     const nickname = senderNickname(ev);
     const mentioned = isBotMentioned(ev);
+    const quoteId = extractQuoteId(ev);
+    const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
     void this[endpointSpec].events.message({
       event: ev,
       ...(typeof ev.time === 'number' ? { platformSentAt: ev.time * 1000 } : {}),
       conversation,
       message: { conversation, id: ev.message_id },
       content,
+      ...(segments?.length ? { segments } : {}),
       sender: { id: senderUserId(ev), name: senderNickname(ev) },
       endpointId: this.#options.config.id,
       ...(mentioned ? { mentioned: true } : {}),
+      ...(quoteId ? { replyTo: { id: quoteId } } : {}),
       metadata: Object.freeze({
         detail_type: ev.detail_type,
         user_id: ev.user_id,
@@ -228,8 +234,12 @@ export class OneBot12WsEndpoint extends Onebot12Client implements Endpoint {
       const ws = create(url, { headers });
       this.#ws = ws;
       handle.onForceClose(() => {
+        if (this.#ws === ws) {
+          this.#rpc.disconnect();
+        }
         try {
           ws.close();
+          ws.terminate?.();
         } catch {
           /* ignore */
         }

package/src/ws-types.ts

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

package/src/wss-endpoint.ts

@@ -1,4 +1,5 @@
 import { createOnebot12SelfProfile } from './self-profile.js';
+import { toCanonicalSegments } from '@zhin.js/core';
 /**
  * OneBot12 reverse WSS endpoint — accepts inbound WebSocket from OneBot implementation.
  */
@@ -20,6 +21,7 @@ import { createOneBot12EndpointManagement } from './endpoint-management.js';
 import {
   buildSendMessageParams,
   matchesOneBot12Self,
+  extractQuoteId,
   formatInboundContent,
   formatOutboundSegments,
   isBotMentioned,
@@ -179,15 +181,19 @@ export class OneBot12WssEndpoint extends Onebot12Client implements Endpoint {
     const conversation = { ...onebot12InboundConversation(String(this.#options.id), ev), endpoint: this[endpointSpec].identity };
     const nickname = senderNickname(ev);
     const mentioned = isBotMentioned(ev);
+    const quoteId = extractQuoteId(ev);
+    const segments = Array.isArray(ev.message) ? toCanonicalSegments(ev.message) : undefined;
     void this[endpointSpec].events.message({
       event: ev,
       ...(typeof ev.time === 'number' ? { platformSentAt: ev.time * 1000 } : {}),
       conversation,
       message: { conversation, id: ev.message_id },
       content: formatInboundContent(ev),
+      ...(segments?.length ? { segments } : {}),
       sender: { id: senderUserId(ev), name: senderNickname(ev) },
       endpointId: this.#options.config.id,
       ...(mentioned ? { mentioned: true } : {}),
+      ...(quoteId ? { replyTo: { id: quoteId } } : {}),
       metadata: Object.freeze({
         detail_type: ev.detail_type,
         user_id: ev.user_id,
@@ -225,8 +231,12 @@ export class OneBot12WssEndpoint extends Onebot12Client implements Endpoint {
     await this.#connectionLifecycle.start(async (lifecycleHandle) => {
       this.#ws = socket;
       lifecycleHandle.onForceClose(() => {
+        if (this.#ws === socket) {
+          this.#rpc.disconnect();
+        }
         try {
           socket.close();
+          socket.terminate?.();
         } catch {
           /* ignore */
         }