@zhin.js/adapter-sandbox 7.0.1 → 7.0.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @zhin.js/adapter-process
 
+## 7.0.2
+
+### 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/host-http@1.0.6
+  - @zhin.js/page@1.0.6
+
 ## 7.0.1
 
 ### Patch Changes

package/lib/endpoint.d.ts

@@ -1,4 +1,4 @@
-import type { EndpointInstance } from '@zhin.js/adapter';
+import type { EndpointInstance, 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';
@@ -22,8 +22,5 @@ export declare class SandboxWsEndpoint implements EndpointInstance {
     open(): void;
     close(): void;
     stop(): void;
-    send({ target, payload }: {
-        readonly target: string;
-        readonly payload: unknown;
-    }): unknown;
+    send({ conversation, payload }: EndpointSendRequest): unknown;
 }

package/lib/endpoint.js

@@ -3,7 +3,7 @@
  */
 import { randomUUID } from 'node:crypto';
 import { formatCompact, getLogger } from '@zhin.js/logger';
-import { bindSandboxWsSocket, formatSandboxOutbound, parseSandboxWsPayload, whenWsOpen, } from './protocol.js';
+import { bindSandboxWsSocket, formatSandboxOutbound, parseSandboxWsPayload, sandboxInboundConversation, whenWsOpen, } from './protocol.js';
 const logger = getLogger('sandbox');
 /**
  * 多 sandbox endpoint 共用同一个 HttpHost 时，同 path 的所有 WS listener
@@ -106,36 +106,39 @@ export class SandboxWsEndpoint {
         this.#started = false;
         logger.debug(formatCompact({ op: 'sandbox_stopped' }));
     }
-    send({ target, payload }) {
+    send({ conversation, payload }) {
         if (!this.#open)
             return undefined;
-        // Reply target is the connection key (bot name / sandbox-uuid), not private:channelId.
-        const connection = this.#connections.get(target)
+        // Reply targets this endpoint's own live socket (fixed bot name, or the
+        // only live random-name connection); conversation carries kind/id stamp.
+        const connection = this.#connections.get(this.#options.defaults.name)
             ?? this.#findLiveConnection();
         if (!connection) {
-            logger.debug(formatCompact({ op: 'sandbox_send_miss', target }));
+            logger.debug(formatCompact({
+                op: 'sandbox_send_miss',
+                target: `${conversation.kind}:${conversation.id}`,
+            }));
             return undefined;
         }
         if (connection.placeholder) {
-            logger.debug(formatCompact({ op: 'sandbox_send_placeholder', target }));
+            logger.debug(formatCompact({
+                op: 'sandbox_send_placeholder',
+                target: `${conversation.kind}:${conversation.id}`,
+            }));
             return undefined;
         }
-        // Console UI filters by type+id; stamp last inbound channel onto outbound wire.
-        const channel = connection.lastChannel ?? {
-            type: 'private',
-            id: connection.owner,
-        };
+        // Console UI filters by type+id; stamp the conversation onto outbound wire.
         connection.socket.send(formatSandboxOutbound(payload, {
-            type: channel.type,
-            id: channel.id,
+            type: conversation.kind,
+            id: conversation.id,
             bot: this.#options.defaults.name,
             endpoint: connection.target,
         }));
         logger.debug(formatCompact({
             op: 'sandbox_send',
             target: connection.target,
-            channelType: channel.type,
-            channelId: channel.id,
+            channelType: conversation.kind,
+            channelId: conversation.id,
         }));
         return payload;
     }
@@ -172,28 +175,25 @@ export class SandboxWsEndpoint {
         const release = bindSandboxWsSocket(socket, {
             onMessage: (raw) => {
                 const parsed = parseSandboxWsPayload(raw);
-                const conn = this.#connections.get(target);
-                if (conn && !conn.placeholder) {
-                    conn.lastChannel = {
-                        type: parsed.type,
-                        id: parsed.id || owner,
-                    };
-                }
+                const sender = parsed.id || owner;
+                const conversation = sandboxInboundConversation(String(this.#options.id), {
+                    type: parsed.type,
+                    id: sender,
+                });
                 logger.debug(formatCompact({
                     op: 'sandbox_recv',
                     target,
-                    sender: parsed.id || owner,
+                    sender,
                     channelType: parsed.type,
-                    channelId: parsed.id || owner,
+                    channelId: sender,
                     text: parsed.text.slice(0, 80),
                 }));
                 // Don't gate on #open — inbound must always reach the gateway so
                 // Command/AI dispatch and outbound replies work.
                 void this.#options.gateway.receive({
-                    adapter: this.#options.id,
-                    target,
+                    conversation,
                     content: parsed.text,
-                    sender: parsed.id || owner,
+                    sender,
                     metadata: Object.freeze({
                         type: parsed.type,
                         channelType: parsed.type,

package/lib/index.d.ts

@@ -1,2 +1,2 @@
-export { bindSandboxWsSocket, formatSandboxOutbound, normalizeSandboxOutboundSegments, parseSandboxWsPayload, resolveSandboxEndpoint, whenWsOpen, type MessageElement, type MessageType, type ResolvedSandboxBot, type SandboxAdapterConfig, type SandboxWsSocket, } from './protocol.js';
+export { bindSandboxWsSocket, formatSandboxOutbound, normalizeSandboxOutboundSegments, parseSandboxWsPayload, resolveSandboxEndpoint, sandboxInboundConversation, whenWsOpen, type MessageElement, type MessageType, type ResolvedSandboxBot, type SandboxAdapterConfig, type SandboxWsSocket, } from './protocol.js';
 export { SandboxWsEndpoint, type SandboxEndpointOptions, } from './endpoint.js';

package/lib/index.js

@@ -1,2 +1,2 @@
-export { bindSandboxWsSocket, formatSandboxOutbound, normalizeSandboxOutboundSegments, parseSandboxWsPayload, resolveSandboxEndpoint, whenWsOpen, } from './protocol.js';
+export { bindSandboxWsSocket, formatSandboxOutbound, normalizeSandboxOutboundSegments, parseSandboxWsPayload, resolveSandboxEndpoint, sandboxInboundConversation, whenWsOpen, } from './protocol.js';
 export { SandboxWsEndpoint, } from './endpoint.js';

package/lib/protocol.d.ts

@@ -1,4 +1,5 @@
 /** Sandbox WebSocket wire protocol helpers (no legacy Adapter/Endpoint). */
+import type { ConversationRef } from '@zhin.js/im-contract';
 export type MessageType = 'private' | 'group' | 'guild' | 'direct' | 'channel';
 export interface MessageElement {
     readonly type: string;
@@ -47,6 +48,15 @@ export declare function parseSandboxWsPayload(raw: string): {
         payload: string;
     };
 };
+/**
+ * 入站归一化 → ConversationRef。sandbox 无平台社交图谱：
+ * `private`/`group`/`channel` 直映射；`direct`（私聊）归 'private'；
+ * `guild`（频道容器语义）归 'channel'。无 guild/temp 容器信息，不产生 parent。
+ */
+export declare function sandboxInboundConversation(endpointId: string, msg: {
+    readonly type: MessageType;
+    readonly id: string;
+}): ConversationRef;
 export type SandboxOutboundChannel = {
     readonly type?: string;
     readonly id?: string;

package/lib/protocol.js

@@ -107,6 +107,23 @@ export function parseSandboxWsPayload(raw) {
     }
     return { type, id, content, timestamp: payload.timestamp ?? Date.now(), text, action };
 }
+/**
+ * 入站归一化 → ConversationRef。sandbox 无平台社交图谱：
+ * `private`/`group`/`channel` 直映射；`direct`（私聊）归 'private'；
+ * `guild`（频道容器语义）归 'channel'。无 guild/temp 容器信息，不产生 parent。
+ */
+export function sandboxInboundConversation(endpointId, msg) {
+    const kind = msg.type === 'direct'
+        ? 'private'
+        : msg.type === 'guild'
+            ? 'channel'
+            : msg.type;
+    return {
+        endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+        kind,
+        id: msg.id,
+    };
+}
 const MEDIA_SEGMENT_TYPES = new Set(['image', 'audio', 'video', 'file']);
 /**
  * base64 内联值：Console UI 的 resolveMediaSrc 只识别 data: / base64://

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-sandbox",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "Zhin.js Sandbox adapter for Plugin Runtime (WebSocket /sandbox)",
   "type": "module",
   "main": "./lib/index.js",
@@ -48,14 +48,15 @@
   "dependencies": {
     "lucide-react": "^0.525.0",
     "react": "^19.2.8",
-    "@zhin.js/adapter": "1.1.4",
+    "@zhin.js/adapter": "1.1.5",
     "@zhin.js/client": "2.1.4",
     "@zhin.js/console-contract": "1.0.0",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/host-http": "1.0.5",
+    "@zhin.js/core": "1.5.2",
+    "@zhin.js/host-http": "1.0.6",
+    "@zhin.js/im-contract": "1.0.1",
     "@zhin.js/logger": "1.0.75",
-    "@zhin.js/page": "1.0.5",
-    "@zhin.js/plugin-runtime": "1.1.2"
+    "@zhin.js/page": "1.0.6",
+    "@zhin.js/plugin-runtime": "1.1.3"
   },
   "devDependencies": {
     "@types/react": "^19.2.18",
@@ -63,18 +64,18 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "ws": "^8.21.1",
-    "@zhin.js/pagemanager": "2.0.11",
-    "@zhin.js/runtime": "1.0.6"
+    "@zhin.js/pagemanager": "2.0.12",
+    "@zhin.js/runtime": "1.0.7"
   },
   "peerDependencies": {
     "react": "^19.0.0",
-    "@zhin.js/adapter": "1.1.4",
+    "@zhin.js/adapter": "1.1.5",
     "@zhin.js/client": "2.1.4",
     "@zhin.js/console-contract": "1.0.0",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/host-http": "1.0.5",
-    "@zhin.js/page": "1.0.5",
-    "@zhin.js/plugin-runtime": "1.1.2"
+    "@zhin.js/core": "1.5.2",
+    "@zhin.js/host-http": "1.0.6",
+    "@zhin.js/page": "1.0.6",
+    "@zhin.js/plugin-runtime": "1.1.3"
   },
   "peerDependenciesMeta": {
     "react": {

package/src/endpoint.ts

@@ -2,7 +2,7 @@
  * SandboxWsEndpoint — WebSocket lifecycle and MessageGateway bridge for /sandbox.
  */
 import { randomUUID } from 'node:crypto';
-import type { EndpointInstance } from '@zhin.js/adapter';
+import type { EndpointInstance, EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, WsConnection } from '@zhin.js/host-http';
 import { formatCompact, getLogger } from '@zhin.js/logger';
@@ -11,6 +11,7 @@ import {
   bindSandboxWsSocket,
   formatSandboxOutbound,
   parseSandboxWsPayload,
+  sandboxInboundConversation,
   whenWsOpen,
   type ResolvedSandboxBot,
   type SandboxWsSocket,
@@ -58,11 +59,6 @@ function claimSandboxWsPath(
   };
 }
 
-interface SandboxChannel {
-  readonly type: string;
-  readonly id: string;
-}
-
 interface SandboxConnection {
   readonly target: string;
   readonly owner: string;
@@ -70,11 +66,6 @@ interface SandboxConnection {
   readonly release: () => void;
   /** true = 占位连接（尚无真实 WS 客户端），send 命中时按 miss 处理。 */
   readonly placeholder?: boolean;
-  /**
-   * 最近一条入站频道（Console UI 按 type+id 过滤气泡）。
-   * 出站必须带回，否则回复石沉大海。
-   */
-  lastChannel?: SandboxChannel;
 }
 
 export interface SandboxEndpointOptions {
@@ -156,35 +147,38 @@ export class SandboxWsEndpoint implements EndpointInstance {
     logger.debug(formatCompact({ op: 'sandbox_stopped' }));
   }
 
-  send({ target, payload }: { readonly target: string; readonly payload: unknown }): unknown {
+  send({ conversation, payload }: EndpointSendRequest): unknown {
     if (!this.#open) return undefined;
-    // Reply target is the connection key (bot name / sandbox-uuid), not private:channelId.
-    const connection = this.#connections.get(target)
+    // Reply targets this endpoint's own live socket (fixed bot name, or the
+    // only live random-name connection); conversation carries kind/id stamp.
+    const connection = this.#connections.get(this.#options.defaults.name)
       ?? this.#findLiveConnection();
     if (!connection) {
-      logger.debug(formatCompact({ op: 'sandbox_send_miss', target }));
+      logger.debug(formatCompact({
+        op: 'sandbox_send_miss',
+        target: `${conversation.kind}:${conversation.id}`,
+      }));
       return undefined;
     }
     if (connection.placeholder) {
-      logger.debug(formatCompact({ op: 'sandbox_send_placeholder', target }));
+      logger.debug(formatCompact({
+        op: 'sandbox_send_placeholder',
+        target: `${conversation.kind}:${conversation.id}`,
+      }));
       return undefined;
     }
-    // Console UI filters by type+id; stamp last inbound channel onto outbound wire.
-    const channel = connection.lastChannel ?? {
-      type: 'private',
-      id: connection.owner,
-    };
+    // Console UI filters by type+id; stamp the conversation onto outbound wire.
     connection.socket.send(formatSandboxOutbound(payload, {
-      type: channel.type,
-      id: channel.id,
+      type: conversation.kind,
+      id: conversation.id,
       bot: this.#options.defaults.name,
       endpoint: connection.target,
     }));
     logger.debug(formatCompact({
       op: 'sandbox_send',
       target: connection.target,
-      channelType: channel.type,
-      channelId: channel.id,
+      channelType: conversation.kind,
+      channelId: conversation.id,
     }));
     return payload;
   }
@@ -221,28 +215,25 @@ export class SandboxWsEndpoint implements EndpointInstance {
     const release = bindSandboxWsSocket(socket, {
       onMessage: (raw) => {
         const parsed = parseSandboxWsPayload(raw);
-        const conn = this.#connections.get(target);
-        if (conn && !conn.placeholder) {
-          conn.lastChannel = {
-            type: parsed.type,
-            id: parsed.id || owner,
-          };
-        }
+        const sender = parsed.id || owner;
+        const conversation = sandboxInboundConversation(String(this.#options.id), {
+          type: parsed.type,
+          id: sender,
+        });
         logger.debug(formatCompact({
           op: 'sandbox_recv',
           target,
-          sender: parsed.id || owner,
+          sender,
           channelType: parsed.type,
-          channelId: parsed.id || owner,
+          channelId: sender,
           text: parsed.text.slice(0, 80),
         }));
         // Don't gate on #open — inbound must always reach the gateway so
         // Command/AI dispatch and outbound replies work.
         void this.#options.gateway.receive({
-          adapter: this.#options.id,
-          target,
+          conversation,
           content: parsed.text,
-          sender: parsed.id || owner,
+          sender,
           metadata: Object.freeze({
             type: parsed.type,
             channelType: parsed.type,

package/src/index.ts

@@ -4,6 +4,7 @@ export {
   normalizeSandboxOutboundSegments,
   parseSandboxWsPayload,
   resolveSandboxEndpoint,
+  sandboxInboundConversation,
   whenWsOpen,
   type MessageElement,
   type MessageType,

package/src/protocol.ts

@@ -2,6 +2,7 @@
 
 import { readFileSync } from 'node:fs';
 import { isMediaRef } from '@zhin.js/core';
+import type { ConversationKind, ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
 const logger = getLogger('sandbox');
@@ -177,6 +178,27 @@ export function parseSandboxWsPayload(raw: string): {
   return { type, id, content, timestamp: payload.timestamp ?? Date.now(), text, action };
 }
 
+/**
+ * 入站归一化 → ConversationRef。sandbox 无平台社交图谱：
+ * `private`/`group`/`channel` 直映射；`direct`（私聊）归 'private'；
+ * `guild`（频道容器语义）归 'channel'。无 guild/temp 容器信息，不产生 parent。
+ */
+export function sandboxInboundConversation(
+  endpointId: string,
+  msg: { readonly type: MessageType; readonly id: string },
+): ConversationRef {
+  const kind: ConversationKind = msg.type === 'direct'
+    ? 'private'
+    : msg.type === 'guild'
+      ? 'channel'
+      : msg.type;
+  return {
+    endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+    kind,
+    id: msg.id,
+  };
+}
+
 export type SandboxOutboundChannel = {
   readonly type?: string;
   readonly id?: string;