npm - @zhin.js/adapter-sandbox - Versions diffs - 7.0.1 → 7.0.4 - Mend

@zhin.js/adapter-sandbox 7.0.1 → 7.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,58 @@
 # @zhin.js/adapter-process
+## 7.0.4
+### Patch Changes
+- Updated dependencies [0de46a8]
+- Updated dependencies [c106ecc]
+- Updated dependencies [b0f37ae]
+- Updated dependencies [daffd4c]
+- Updated dependencies [36c7400]
+- Updated dependencies [162fa34]
+- Updated dependencies [e40b048]
+- Updated dependencies [f1708c3]
+- Updated dependencies [e53444f]
+- Updated dependencies [92b0dd7]
+- Updated dependencies [a7df753]
+  - @zhin.js/host-http@1.0.8
+  - @zhin.js/im-contract@1.0.3
+  - @zhin.js/adapter@1.1.7
+  - @zhin.js/plugin-runtime@1.1.5
+  - @zhin.js/core@1.5.4
+  - @zhin.js/page@1.0.8
+  - @zhin.js/client@2.1.6
+## 7.0.3
+### Patch Changes
+- f8c7a54: fix: im
+- Updated dependencies [f8c7a54]
+  - @zhin.js/logger@1.0.76
+  - @zhin.js/client@2.1.5
+  - @zhin.js/page@1.0.7
+  - @zhin.js/console-contract@1.0.1
+  - @zhin.js/host-http@1.0.7
+  - @zhin.js/adapter@1.1.6
+  - @zhin.js/core@1.5.3
+  - @zhin.js/im-contract@1.0.2
+  - @zhin.js/plugin-runtime@1.1.4
+## 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 CHANGED Viewed

@@ -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';
@@ -16,14 +16,11 @@ export interface SandboxEndpointOptions {
 export declare class SandboxWsEndpoint implements EndpointInstance {
     #private;
     constructor(options: SandboxEndpointOptions);
-    /** Live endpoint name (config `name`) — Console endpoint.list/resolve uses it. */
+    /** Live endpoint id (config `id`) — Console endpoint.list/resolve uses it. */
     get name(): string;
     start(): void;
     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 CHANGED Viewed

@@ -2,9 +2,8 @@
  * SandboxWsEndpoint — WebSocket lifecycle and MessageGateway bridge for /sandbox.
  */
 import { randomUUID } from 'node:crypto';
-import { formatCompact, getLogger } from '@zhin.js/logger';
-import { bindSandboxWsSocket, formatSandboxOutbound, parseSandboxWsPayload, whenWsOpen, } from './protocol.js';
-const logger = getLogger('sandbox');
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
+import { bindSandboxWsSocket, formatSandboxOutbound, parseSandboxWsPayload, sandboxInboundConversation, whenWsOpen, } from './protocol.js';
 /**
  * 多 sandbox endpoint 共用同一个 HttpHost 时，同 path 的所有 WS listener
  * 都会被回调（入站重复、出站互窜）。按 endpoint 名隔离挂载路径：
@@ -44,6 +43,7 @@ function claimSandboxWsPath(http, name) {
  * 不适用 EndpointManagement 语义端口；本 endpoint 不暴露该端口。
  */
 export class SandboxWsEndpoint {
+    #logger;
     #options;
     #connections = new Map();
     #wsHandleRelease;
@@ -52,18 +52,19 @@ export class SandboxWsEndpoint {
     #open = false;
     #started = false;
     constructor(options) {
+        this.#logger = getAdapterLogger('sandbox', options.defaults.id);
         this.#options = options;
     }
-    /** Live endpoint name (config `name`) — Console endpoint.list/resolve uses it. */
+    /** Live endpoint id (config `id`) — Console endpoint.list/resolve uses it. */
     get name() {
-        return this.#options.defaults.name;
+        return this.#options.defaults.id;
     }
     start() {
         if (this.#started)
             return;
         this.#started = true;
         // 多 endpoint 同 path 会被全部回调（入站重复、出站互窜），按名隔离。
-        const claim = claimSandboxWsPath(this.#options.http, this.#options.defaults.name);
+        const claim = claimSandboxWsPath(this.#options.http, this.#options.defaults.id);
         this.#wsPathRelease = claim.release;
         this.#wsPath = claim.path;
         const handle = this.#options.http.ws(claim.path);
@@ -71,13 +72,9 @@ export class SandboxWsEndpoint {
             this.#acceptConnection(connection);
         });
         if (!this.#options.defaults.randomNamePerConnection) {
-            this.#ensurePlaceholder(this.#options.defaults.name, this.#options.defaults.owner);
+            this.#ensurePlaceholder(this.#options.defaults.id, this.#options.defaults.owner);
         }
-        logger.info(formatCompact({
-            op: 'sandbox_ws_mounted',
-            path: claim.path,
-            endpoint: this.#options.defaults.name,
-        }));
+        this.#logger.info(`ws mounted ${claim.path}`);
     }
     open() {
         this.#open = true;
@@ -104,38 +101,41 @@ export class SandboxWsEndpoint {
         }
         this.#connections.clear();
         this.#started = false;
-        logger.debug(formatCompact({ op: 'sandbox_stopped' }));
+        this.#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.id)
             ?? this.#findLiveConnection();
         if (!connection) {
-            logger.debug(formatCompact({ op: 'sandbox_send_miss', target }));
+            this.#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 }));
+            this.#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,
-            bot: this.#options.defaults.name,
+            type: conversation.kind,
+            id: conversation.id,
+            bot: this.#options.defaults.id,
             endpoint: connection.target,
         }));
-        logger.debug(formatCompact({
+        this.#logger.debug(formatCompact({
             op: 'sandbox_send',
             target: connection.target,
-            channelType: channel.type,
-            channelId: channel.id,
+            channelType: conversation.kind,
+            channelId: conversation.id,
         }));
         return payload;
     }
@@ -150,7 +150,7 @@ export class SandboxWsEndpoint {
     #acceptConnection(connection) {
         const target = this.#options.defaults.randomNamePerConnection
             ? `sandbox-${randomUUID().slice(0, 8)}`
-            : this.#options.defaults.name;
+            : this.#options.defaults.id;
         const owner = this.#options.defaults.owner;
         const socket = connection.socket;
         // Fixed-name mode reuses `target`; dropping the prior entry without
@@ -172,39 +172,36 @@ 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,
-                    };
-                }
-                logger.debug(formatCompact({
+                const sender = parsed.id || owner;
+                const conversation = sandboxInboundConversation(String(this.#options.id), {
+                    type: parsed.type,
+                    id: sender,
+                });
+                this.#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: { id: sender },
+                    endpointId: target,
                     metadata: Object.freeze({
                         type: parsed.type,
                         channelType: parsed.type,
                         channelId: parsed.id || owner,
-                        endpoint: target,
                         elements: parsed.content,
                         timestamp: parsed.timestamp,
                         ...(parsed.action ? { action: parsed.action } : {}),
                     }),
                 }).catch((err) => {
-                    logger.warn(formatCompact({
+                    this.#logger.warn(formatCompact({
                         op: 'sandbox_gateway_receive_failed',
                         target,
                         error: err instanceof Error ? err.message : String(err),
@@ -217,11 +214,11 @@ export class SandboxWsEndpoint {
                 const current = this.#connections.get(target);
                 if (current && current.socket === socket) {
                     this.#connections.delete(target);
-                    logger.debug(formatCompact({ op: 'sandbox_ws_closed', target }));
+                    this.#logger.debug(formatCompact({ op: 'sandbox_ws_closed', target }));
                 }
             },
             onError: (err) => {
-                logger.warn(formatCompact({
+                this.#logger.warn(formatCompact({
                     op: 'sandbox_ws_error',
                     target,
                     error: err instanceof Error ? err.message : String(err),
@@ -229,7 +226,7 @@ export class SandboxWsEndpoint {
             },
         });
         this.#connections.set(target, { target, owner, socket, release });
-        logger.debug(formatCompact({ op: 'sandbox_ws_connected', target, owner }));
+        this.#logger.debug(formatCompact({ op: 'sandbox_ws_connected', target, owner }));
         if (!this.#options.defaults.randomNamePerConnection) {
             const readyPayload = JSON.stringify({
                 type: 'ready',

package/lib/index.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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;
@@ -14,19 +15,19 @@ export interface SandboxWsSocket {
 }
 export type ResolvedSandboxBot = {
     readonly context: 'sandbox';
-    readonly name: string;
+    readonly id: string;
     readonly owner: string;
     readonly randomNamePerConnection: boolean;
 };
 export interface SandboxAdapterConfig {
     /** Runtime expands `endpoints[i]` onto the top level — prefer these. */
     readonly context?: string;
-    readonly name?: string;
+    readonly id?: string;
     readonly owner?: string;
     /** Legacy shape: endpoint entries nested under `endpoints[]`. */
     readonly endpoints?: ReadonlyArray<{
         readonly context?: string;
-        readonly name?: string;
+        readonly id?: string;
         readonly owner?: 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(endpointKey: string, msg: {
+    readonly type: MessageType;
+    readonly id: string;
+}): ConversationRef;
 export type SandboxOutboundChannel = {
     readonly type?: string;
     readonly id?: string;

package/lib/protocol.js CHANGED Viewed

@@ -5,19 +5,19 @@ import { formatCompact, getLogger } from '@zhin.js/logger';
 const logger = getLogger('sandbox');
 export function resolveSandboxEndpoint(appConfig) {
     const entry = appConfig.endpoints?.find((item) => item.context === 'sandbox');
-    const fixedName = typeof appConfig.name === 'string' && appConfig.name
-        ? appConfig.name
-        : typeof entry?.name === 'string' && entry.name
-            ? entry.name
+    const fixedName = typeof appConfig.id === 'string' && appConfig.id
+        ? appConfig.id
+        : typeof entry?.id === 'string' && entry.id
+            ? entry.id
             : undefined;
-    const name = fixedName || process.env.SANDBOX_BOT_NAME || 'sandbox-bot';
+    const id = fixedName || process.env.SANDBOX_BOT_NAME || 'sandbox-bot';
     const owner = (typeof appConfig.owner === 'string' && appConfig.owner)
         || (typeof entry?.owner === 'string' && entry.owner)
         || process.env.SANDBOX_BOT_OWNER
         || 'sandbox-user';
     return {
         context: 'sandbox',
-        name,
+        id,
         owner,
         randomNamePerConnection: !fixedName,
     };
@@ -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(endpointKey, msg) {
+    const kind = msg.type === 'direct'
+        ? 'private'
+        : msg.type === 'guild'
+            ? 'channel'
+            : msg.type;
+    return {
+        endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
+        kind,
+        id: msg.id,
+    };
+}
 const MEDIA_SEGMENT_TYPES = new Set(['image', 'audio', 'video', 'file']);
 /**
  * base64 内联值：Console UI 的 resolveMediaSrc 只识别 data: / base64://

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-sandbox",
-  "version": "7.0.1",
+  "version": "7.0.4",
   "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/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/logger": "1.0.75",
-    "@zhin.js/page": "1.0.5",
-    "@zhin.js/plugin-runtime": "1.1.2"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/client": "2.1.6",
+    "@zhin.js/console-contract": "1.0.1",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/host-http": "1.0.8",
+    "@zhin.js/im-contract": "1.0.3",
+    "@zhin.js/logger": "1.0.76",
+    "@zhin.js/page": "1.0.8",
+    "@zhin.js/plugin-runtime": "1.1.5"
   },
   "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.14",
+    "@zhin.js/runtime": "1.0.9"
   },
   "peerDependencies": {
     "react": "^19.0.0",
-    "@zhin.js/adapter": "1.1.4",
-    "@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/adapter": "1.1.7",
+    "@zhin.js/client": "2.1.6",
+    "@zhin.js/console-contract": "1.0.1",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/host-http": "1.0.8",
+    "@zhin.js/page": "1.0.8",
+    "@zhin.js/plugin-runtime": "1.1.5"
   },
   "peerDependenciesMeta": {
     "react": {

package/pages/SandboxChat.js CHANGED Viewed

@@ -15,7 +15,7 @@ export default function Sandbox() {
     const [faceList, setFaceList] = useState([]);
     const [activeChannel, setActiveChannel] = useState(channels[0]);
     const [inputText, setInputText] = useState('');
-    const [endpointName, setBotName] = useState('ProcessEndpoint');
+    const [endpointId, setBotName] = useState('ProcessEndpoint');
     const [connected, setConnected] = useState(false);
     const [showFacePicker, setShowFacePicker] = useState(false);
     /** 输入区：插入图片 / 视频 / 音频 URL */
@@ -59,7 +59,7 @@ export default function Sandbox() {
             ? parseTextToSegments(data.content)
             : Array.isArray(data.content) ? data.content : parseTextToSegments(String(data.content ?? ''));
         const channelName = data.type === 'private'
-            ? `私聊-${data.bot || endpointName}`
+            ? `私聊-${data.bot || endpointId}`
             : data.type === 'group'
                 ? `群组-${data.id}`
                 : `频道-${data.id}`;
@@ -74,7 +74,7 @@ export default function Sandbox() {
         setMessages((prev) => [...prev, {
                 id: data.messageId ?? `bot_${data.timestamp}`, type: 'received', channelType,
                 channelId: data.id, channelName, senderId: 'endpoint',
-                senderName: data.bot || endpointName, content, timestamp: data.timestamp,
+                senderName: data.bot || endpointId, content, timestamp: data.timestamp,
             }]);
     };
     const sendInteractiveAction = (payload) => {
@@ -355,7 +355,7 @@ export default function Sandbox() {
                                 return (_jsxs("div", { className: cn("menu-item", isActive && "active"), onClick: () => switchChannel(channel), children: [_jsx("span", { className: "shrink-0", children: getChannelIcon(channel.type) }), _jsxs("div", { className: "flex-1 min-w-0", children: [_jsx("div", { className: "text-sm font-medium truncate", children: channel.name }), _jsx("div", { className: "text-xs text-muted-foreground", children: channel.type === 'private' ? '私聊' : channel.type === 'group' ? '群聊' : '频道' })] }), channel.unread > 0 && _jsx("span", { className: "inline-flex items-center justify-center h-5 min-w-5 rounded-full bg-destructive text-destructive-foreground text-[10px] font-medium px-1", children: channel.unread })] }, channel.id));
                             }), _jsxs("div", { className: "pt-2 mt-2 border-t space-y-1", children: [_jsxs("div", { className: cn("menu-item", viewMode === 'requests' && "active"), onClick: () => { setViewMode('requests'); if (window.innerWidth < 768)
                                             setShowChannelList(false); }, children: [_jsx(UserPlus, { size: 16, className: "shrink-0" }), _jsxs("div", { className: "flex-1 min-w-0", children: [_jsx("div", { className: "text-sm font-medium", children: "\u8BF7\u6C42" }), _jsx("div", { className: "text-xs text-muted-foreground", children: "\u597D\u53CB/\u7FA4\u9080\u8BF7\u7B49" })] })] }), _jsxs("div", { className: cn("menu-item", viewMode === 'notices' && "active"), onClick: () => { setViewMode('notices'); if (window.innerWidth < 768)
-                                            setShowChannelList(false); }, children: [_jsx(Bell, { size: 16, className: "shrink-0" }), _jsxs("div", { className: "flex-1 min-w-0", children: [_jsx("div", { className: "text-sm font-medium", children: "\u901A\u77E5" }), _jsx("div", { className: "text-xs text-muted-foreground", children: "\u7FA4\u7BA1/\u64A4\u56DE\u7B49" })] })] })] })] }), _jsx("div", { className: "p-2 border-t", children: _jsx("button", { className: "w-full py-2 px-3 rounded-md border border-dashed text-sm text-muted-foreground hover:bg-accent transition-colors", onClick: addChannel, children: "+ \u6DFB\u52A0\u9891\u9053" }) })] }), showChannelList && _jsx("div", { className: "channel-overlay md:hidden", onClick: () => setShowChannelList(false) }), _jsxs("div", { className: "chat-area", children: [viewMode === 'requests' && (_jsxs("div", { className: "rounded-lg border bg-card flex-1 flex flex-col min-h-0 overflow-hidden", children: [_jsx("div", { className: "p-3 border-b flex-shrink-0", children: _jsxs("h2", { className: "text-lg font-bold flex items-center gap-2", children: [_jsx(UserPlus, { size: 20 }), " \u8BF7\u6C42"] }) }), _jsxs("div", { className: "flex-1 overflow-y-auto p-4 flex flex-col items-center justify-center gap-3 text-muted-foreground text-center", children: [_jsx(UserPlus, { size: 48, className: "opacity-30" }), _jsx("span", { children: "\u6C99\u76D2\u4E3A\u6A21\u62DF\u73AF\u5883\uFF0C\u6682\u65E0\u8BF7\u6C42\u6570\u636E" }), _jsxs("span", { className: "text-sm", children: ["\u5B9E\u9645\u597D\u53CB/\u7FA4\u9080\u8BF7\u7B49\u8BF7\u6C42\u8BF7\u5230\u4FA7\u8FB9\u680F ", _jsx("strong", { children: "\u673A\u5668\u4EBA" }), " \u9875\u9762\u8FDB\u5165\u5BF9\u5E94\u673A\u5668\u4EBA\u7BA1\u7406\u67E5\u770B"] })] })] })), viewMode === 'notices' && (_jsxs("div", { className: "rounded-lg border bg-card flex-1 flex flex-col min-h-0 overflow-hidden", children: [_jsx("div", { className: "p-3 border-b flex-shrink-0", children: _jsxs("h2", { className: "text-lg font-bold flex items-center gap-2", children: [_jsx(Bell, { size: 20 }), " \u901A\u77E5"] }) }), _jsxs("div", { className: "flex-1 overflow-y-auto p-4 flex flex-col items-center justify-center gap-3 text-muted-foreground text-center", children: [_jsx(Bell, { size: 48, className: "opacity-30" }), _jsx("span", { children: "\u6C99\u76D2\u4E3A\u6A21\u62DF\u73AF\u5883\uFF0C\u6682\u65E0\u901A\u77E5\u6570\u636E" }), _jsxs("span", { className: "text-sm", children: ["\u5B9E\u9645\u7FA4\u7BA1\u3001\u64A4\u56DE\u7B49\u901A\u77E5\u8BF7\u5230\u4FA7\u8FB9\u680F ", _jsx("strong", { children: "\u673A\u5668\u4EBA" }), " \u9875\u9762\u8FDB\u5165\u5BF9\u5E94\u673A\u5668\u4EBA\u7BA1\u7406\u67E5\u770B"] })] })] })), viewMode === 'chat' && (_jsxs(_Fragment, { children: [_jsx("div", { className: "rounded-lg border bg-card p-3 flex-shrink-0", children: _jsxs("div", { className: "flex justify-between items-center flex-wrap gap-2", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "p-2 rounded-lg bg-secondary", children: getChannelIcon(activeChannel.type) }), _jsxs("div", { children: [_jsx("h2", { className: "text-lg font-bold", children: activeChannel.name }), _jsxs("div", { className: "flex items-center gap-2 text-xs text-muted-foreground", children: [_jsx("span", { children: activeChannel.id }), _jsx("span", { className: "inline-flex items-center px-1.5 py-0.5 rounded border text-[10px]", children: channelMessages.length }), _jsx("span", { children: "\u6761\u6D88\u606F" })] })] }), _jsx("span", { className: "inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-secondary text-secondary-foreground", children: activeChannel.type === 'private' ? '私聊' : activeChannel.type === 'group' ? '群聊' : '频道' })] }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsx("input", { value: endpointName, onChange: (e) => setBotName(e.target.value), placeholder: "\u673A\u5668\u4EBA\u540D\u79F0", className: "h-8 w-28 rounded-md border bg-transparent px-2 text-sm" }), _jsxs("button", { className: "inline-flex items-center gap-1 h-8 px-3 rounded-md bg-secondary text-secondary-foreground text-sm hover:bg-secondary/80", onClick: clearMessages, children: [_jsx(Trash2, { size: 14 }), " \u6E05\u7A7A"] })] })] }) }), _jsx("div", { className: "rounded-lg border bg-card flex-1 flex flex-col min-h-0", children: _jsx("div", { className: "flex-1 overflow-y-auto p-4", children: channelMessages.length === 0 ? (_jsxs("div", { className: "flex flex-col items-center justify-center h-full gap-3", children: [_jsx(MessageSquare, { size: 64, className: "text-muted-foreground/20" }), _jsx("span", { className: "text-muted-foreground", children: "\u6682\u65E0\u6D88\u606F\uFF0C\u5F00\u59CB\u5BF9\u8BDD\u5427\uFF01" })] })) : (_jsxs("div", { className: "space-y-2", children: [channelMessages.map((msg) => (_jsx("div", { className: cn("flex", msg.type === 'sent' ? "justify-end" : "justify-start"), children: _jsxs("div", { className: cn("max-w-[70%] p-3 rounded-2xl", msg.type === 'sent' ? "bg-primary text-primary-foreground" : "bg-muted"), children: [_jsxs("div", { className: "flex items-center gap-2 mb-1", children: [msg.type === 'received' && _jsx(Bot, { size: 14 }), msg.type === 'sent' && _jsx(User, { size: 14 }), _jsx("span", { className: "text-xs font-medium opacity-90", children: msg.senderName }), _jsx("span", { className: "text-xs opacity-70", children: new Date(msg.timestamp).toLocaleTimeString() })] }), _jsx("div", { className: "text-sm space-y-1", children: renderMessageSegments(msg.content, msg.type === 'sent') })] }) }, msg.id))), _jsx("div", { ref: messagesEndRef })] })) }) }), _jsxs("div", { className: "rounded-lg border bg-card p-3 flex-shrink-0 space-y-3", children: [_jsxs("div", { className: "flex gap-2 items-center flex-wrap", children: [_jsx("button", { type: "button", className: cn("h-8 w-8 rounded-md flex items-center justify-center border transition-colors", showFacePicker ? "bg-primary text-primary-foreground" : "hover:bg-accent"), onClick: () => { setShowFacePicker(!showFacePicker); setMediaPanel(null); }, title: "\u63D2\u5165\u8868\u60C5", children: _jsx(Smile, { size: 16 }) }), _jsx("button", { type: "button", className: cn("h-8 w-8 rounded-md flex items-center justify-center border transition-colors", mediaPanel === 'image' ? "bg-primary text-primary-foreground" : "hover:bg-accent"), onClick: () => { setMediaPanel((p) => (p === 'image' ? null : 'image')); setShowFacePicker(false); }, title: "\u63D2\u5165\u56FE\u7247 URL", children: _jsx(Image, { size: 16 }) }), _jsx("button", { type: "button", className: cn("h-8 w-8 rounded-md flex items-center justify-center border transition-colors", mediaPanel === 'video' ? "bg-primary text-primary-foreground" : "hover:bg-accent"), onClick: () => { setMediaPanel((p) => (p === 'video' ? null : 'video')); setShowFacePicker(false); }, title: "\u63D2\u5165\u89C6\u9891 URL", children: _jsx(Video, { size: 16 }) }), _jsx("button", { type: "button", className: cn("h-8 w-8 rounded-md flex items-center justify-center border transition-colors", mediaPanel === 'audio' ? "bg-primary text-primary-foreground" : "hover:bg-accent"), onClick: () => { setMediaPanel((p) => (p === 'audio' ? null : 'audio')); setShowFacePicker(false); }, title: "\u63D2\u5165\u97F3\u9891 URL", children: _jsx(Music, { size: 16 }) }), _jsx("div", { className: "flex-1 min-w-[1rem]" }), inputText && (_jsx("button", { className: "h-8 w-8 rounded-md flex items-center justify-center hover:bg-accent transition-colors", onClick: () => { setInputText(''); setPreviewSegments([]); }, children: _jsx(X, { size: 16 }) }))] }), showFacePicker && (_jsxs("div", { className: "p-3 rounded-md border bg-muted/30 max-h-64 overflow-y-auto space-y-2", children: [_jsx("input", { value: faceSearchQuery, onChange: (e) => setFaceSearchQuery(e.target.value), placeholder: "\u641C\u7D22\u8868\u60C5...", className: "w-full h-8 rounded-md border bg-transparent px-2 text-sm" }), _jsx("div", { className: "grid grid-cols-8 gap-1", children: filteredFaces.slice(0, 80).map((face) => (_jsx("button", { onClick: () => insertFace(face.id), title: face.name, className: "w-10 h-10 rounded-md border flex items-center justify-center hover:bg-accent transition-colors", children: _jsx("img", { src: `https://face.viki.moe/apng/${face.id}.png`, alt: face.name, className: "w-8 h-8" }) }, face.id))) }), filteredFaces.length === 0 && (_jsxs("div", { className: "flex flex-col items-center gap-2 py-4", children: [_jsx(Search, { size: 32, className: "text-muted-foreground/30" }), _jsx("span", { className: "text-sm text-muted-foreground", children: "\u672A\u627E\u5230\u5339\u914D\u7684\u8868\u60C5" })] }))] })), mediaPanel && (_jsxs("div", { className: "p-3 rounded-md border bg-muted/30 space-y-2", children: [_jsxs("p", { className: "text-xs text-muted-foreground", children: [mediaPanel === 'image' && '支持 http(s) 图片链接或 data URL', mediaPanel === 'video' && '支持浏览器可解码的视频直链（如 .mp4、.webm）', mediaPanel === 'audio' && '支持 .mp3、.ogg、.wav 等音频直链'] }), _jsx("input", { value: mediaUrl, onChange: (e) => setMediaUrl(e.target.value), placeholder: mediaPanel === 'image' ? '图片 URL…' : mediaPanel === 'video' ? '视频 URL…' : '音频 URL…', className: "w-full h-8 rounded-md border border-input bg-background px-2 text-sm", onKeyDown: (e) => { if (e.key === 'Enter') {
+                                            setShowChannelList(false); }, children: [_jsx(Bell, { size: 16, className: "shrink-0" }), _jsxs("div", { className: "flex-1 min-w-0", children: [_jsx("div", { className: "text-sm font-medium", children: "\u901A\u77E5" }), _jsx("div", { className: "text-xs text-muted-foreground", children: "\u7FA4\u7BA1/\u64A4\u56DE\u7B49" })] })] })] })] }), _jsx("div", { className: "p-2 border-t", children: _jsx("button", { className: "w-full py-2 px-3 rounded-md border border-dashed text-sm text-muted-foreground hover:bg-accent transition-colors", onClick: addChannel, children: "+ \u6DFB\u52A0\u9891\u9053" }) })] }), showChannelList && _jsx("div", { className: "channel-overlay md:hidden", onClick: () => setShowChannelList(false) }), _jsxs("div", { className: "chat-area", children: [viewMode === 'requests' && (_jsxs("div", { className: "rounded-lg border bg-card flex-1 flex flex-col min-h-0 overflow-hidden", children: [_jsx("div", { className: "p-3 border-b flex-shrink-0", children: _jsxs("h2", { className: "text-lg font-bold flex items-center gap-2", children: [_jsx(UserPlus, { size: 20 }), " \u8BF7\u6C42"] }) }), _jsxs("div", { className: "flex-1 overflow-y-auto p-4 flex flex-col items-center justify-center gap-3 text-muted-foreground text-center", children: [_jsx(UserPlus, { size: 48, className: "opacity-30" }), _jsx("span", { children: "\u6C99\u76D2\u4E3A\u6A21\u62DF\u73AF\u5883\uFF0C\u6682\u65E0\u8BF7\u6C42\u6570\u636E" }), _jsxs("span", { className: "text-sm", children: ["\u5B9E\u9645\u597D\u53CB/\u7FA4\u9080\u8BF7\u7B49\u8BF7\u6C42\u8BF7\u5230\u4FA7\u8FB9\u680F ", _jsx("strong", { children: "\u673A\u5668\u4EBA" }), " \u9875\u9762\u8FDB\u5165\u5BF9\u5E94\u673A\u5668\u4EBA\u7BA1\u7406\u67E5\u770B"] })] })] })), viewMode === 'notices' && (_jsxs("div", { className: "rounded-lg border bg-card flex-1 flex flex-col min-h-0 overflow-hidden", children: [_jsx("div", { className: "p-3 border-b flex-shrink-0", children: _jsxs("h2", { className: "text-lg font-bold flex items-center gap-2", children: [_jsx(Bell, { size: 20 }), " \u901A\u77E5"] }) }), _jsxs("div", { className: "flex-1 overflow-y-auto p-4 flex flex-col items-center justify-center gap-3 text-muted-foreground text-center", children: [_jsx(Bell, { size: 48, className: "opacity-30" }), _jsx("span", { children: "\u6C99\u76D2\u4E3A\u6A21\u62DF\u73AF\u5883\uFF0C\u6682\u65E0\u901A\u77E5\u6570\u636E" }), _jsxs("span", { className: "text-sm", children: ["\u5B9E\u9645\u7FA4\u7BA1\u3001\u64A4\u56DE\u7B49\u901A\u77E5\u8BF7\u5230\u4FA7\u8FB9\u680F ", _jsx("strong", { children: "\u673A\u5668\u4EBA" }), " \u9875\u9762\u8FDB\u5165\u5BF9\u5E94\u673A\u5668\u4EBA\u7BA1\u7406\u67E5\u770B"] })] })] })), viewMode === 'chat' && (_jsxs(_Fragment, { children: [_jsx("div", { className: "rounded-lg border bg-card p-3 flex-shrink-0", children: _jsxs("div", { className: "flex justify-between items-center flex-wrap gap-2", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "p-2 rounded-lg bg-secondary", children: getChannelIcon(activeChannel.type) }), _jsxs("div", { children: [_jsx("h2", { className: "text-lg font-bold", children: activeChannel.name }), _jsxs("div", { className: "flex items-center gap-2 text-xs text-muted-foreground", children: [_jsx("span", { children: activeChannel.id }), _jsx("span", { className: "inline-flex items-center px-1.5 py-0.5 rounded border text-[10px]", children: channelMessages.length }), _jsx("span", { children: "\u6761\u6D88\u606F" })] })] }), _jsx("span", { className: "inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-secondary text-secondary-foreground", children: activeChannel.type === 'private' ? '私聊' : activeChannel.type === 'group' ? '群聊' : '频道' })] }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsx("input", { value: endpointId, onChange: (e) => setBotName(e.target.value), placeholder: "\u673A\u5668\u4EBA\u540D\u79F0", className: "h-8 w-28 rounded-md border bg-transparent px-2 text-sm" }), _jsxs("button", { className: "inline-flex items-center gap-1 h-8 px-3 rounded-md bg-secondary text-secondary-foreground text-sm hover:bg-secondary/80", onClick: clearMessages, children: [_jsx(Trash2, { size: 14 }), " \u6E05\u7A7A"] })] })] }) }), _jsx("div", { className: "rounded-lg border bg-card flex-1 flex flex-col min-h-0", children: _jsx("div", { className: "flex-1 overflow-y-auto p-4", children: channelMessages.length === 0 ? (_jsxs("div", { className: "flex flex-col items-center justify-center h-full gap-3", children: [_jsx(MessageSquare, { size: 64, className: "text-muted-foreground/20" }), _jsx("span", { className: "text-muted-foreground", children: "\u6682\u65E0\u6D88\u606F\uFF0C\u5F00\u59CB\u5BF9\u8BDD\u5427\uFF01" })] })) : (_jsxs("div", { className: "space-y-2", children: [channelMessages.map((msg) => (_jsx("div", { className: cn("flex", msg.type === 'sent' ? "justify-end" : "justify-start"), children: _jsxs("div", { className: cn("max-w-[70%] p-3 rounded-2xl", msg.type === 'sent' ? "bg-primary text-primary-foreground" : "bg-muted"), children: [_jsxs("div", { className: "flex items-center gap-2 mb-1", children: [msg.type === 'received' && _jsx(Bot, { size: 14 }), msg.type === 'sent' && _jsx(User, { size: 14 }), _jsx("span", { className: "text-xs font-medium opacity-90", children: msg.senderName }), _jsx("span", { className: "text-xs opacity-70", children: new Date(msg.timestamp).toLocaleTimeString() })] }), _jsx("div", { className: "text-sm space-y-1", children: renderMessageSegments(msg.content, msg.type === 'sent') })] }) }, msg.id))), _jsx("div", { ref: messagesEndRef })] })) }) }), _jsxs("div", { className: "rounded-lg border bg-card p-3 flex-shrink-0 space-y-3", children: [_jsxs("div", { className: "flex gap-2 items-center flex-wrap", children: [_jsx("button", { type: "button", className: cn("h-8 w-8 rounded-md flex items-center justify-center border transition-colors", showFacePicker ? "bg-primary text-primary-foreground" : "hover:bg-accent"), onClick: () => { setShowFacePicker(!showFacePicker); setMediaPanel(null); }, title: "\u63D2\u5165\u8868\u60C5", children: _jsx(Smile, { size: 16 }) }), _jsx("button", { type: "button", className: cn("h-8 w-8 rounded-md flex items-center justify-center border transition-colors", mediaPanel === 'image' ? "bg-primary text-primary-foreground" : "hover:bg-accent"), onClick: () => { setMediaPanel((p) => (p === 'image' ? null : 'image')); setShowFacePicker(false); }, title: "\u63D2\u5165\u56FE\u7247 URL", children: _jsx(Image, { size: 16 }) }), _jsx("button", { type: "button", className: cn("h-8 w-8 rounded-md flex items-center justify-center border transition-colors", mediaPanel === 'video' ? "bg-primary text-primary-foreground" : "hover:bg-accent"), onClick: () => { setMediaPanel((p) => (p === 'video' ? null : 'video')); setShowFacePicker(false); }, title: "\u63D2\u5165\u89C6\u9891 URL", children: _jsx(Video, { size: 16 }) }), _jsx("button", { type: "button", className: cn("h-8 w-8 rounded-md flex items-center justify-center border transition-colors", mediaPanel === 'audio' ? "bg-primary text-primary-foreground" : "hover:bg-accent"), onClick: () => { setMediaPanel((p) => (p === 'audio' ? null : 'audio')); setShowFacePicker(false); }, title: "\u63D2\u5165\u97F3\u9891 URL", children: _jsx(Music, { size: 16 }) }), _jsx("div", { className: "flex-1 min-w-[1rem]" }), inputText && (_jsx("button", { className: "h-8 w-8 rounded-md flex items-center justify-center hover:bg-accent transition-colors", onClick: () => { setInputText(''); setPreviewSegments([]); }, children: _jsx(X, { size: 16 }) }))] }), showFacePicker && (_jsxs("div", { className: "p-3 rounded-md border bg-muted/30 max-h-64 overflow-y-auto space-y-2", children: [_jsx("input", { value: faceSearchQuery, onChange: (e) => setFaceSearchQuery(e.target.value), placeholder: "\u641C\u7D22\u8868\u60C5...", className: "w-full h-8 rounded-md border bg-transparent px-2 text-sm" }), _jsx("div", { className: "grid grid-cols-8 gap-1", children: filteredFaces.slice(0, 80).map((face) => (_jsx("button", { onClick: () => insertFace(face.id), title: face.name, className: "w-10 h-10 rounded-md border flex items-center justify-center hover:bg-accent transition-colors", children: _jsx("img", { src: `https://face.viki.moe/apng/${face.id}.png`, alt: face.name, className: "w-8 h-8" }) }, face.id))) }), filteredFaces.length === 0 && (_jsxs("div", { className: "flex flex-col items-center gap-2 py-4", children: [_jsx(Search, { size: 32, className: "text-muted-foreground/30" }), _jsx("span", { className: "text-sm text-muted-foreground", children: "\u672A\u627E\u5230\u5339\u914D\u7684\u8868\u60C5" })] }))] })), mediaPanel && (_jsxs("div", { className: "p-3 rounded-md border bg-muted/30 space-y-2", children: [_jsxs("p", { className: "text-xs text-muted-foreground", children: [mediaPanel === 'image' && '支持 http(s) 图片链接或 data URL', mediaPanel === 'video' && '支持浏览器可解码的视频直链（如 .mp4、.webm）', mediaPanel === 'audio' && '支持 .mp3、.ogg、.wav 等音频直链'] }), _jsx("input", { value: mediaUrl, onChange: (e) => setMediaUrl(e.target.value), placeholder: mediaPanel === 'image' ? '图片 URL…' : mediaPanel === 'video' ? '视频 URL…' : '音频 URL…', className: "w-full h-8 rounded-md border border-input bg-background px-2 text-sm", onKeyDown: (e) => { if (e.key === 'Enter') {
                                                     e.preventDefault();
                                                     commitMediaUrl();
                                                 } } }), _jsxs("button", { type: "button", className: "inline-flex items-center gap-1 h-8 px-3 rounded-md bg-primary text-primary-foreground text-sm disabled:opacity-50", onClick: commitMediaUrl, disabled: !mediaUrl.trim(), children: [_jsx(Check, { size: 14 }), " \u63D2\u5165\u5230\u8F93\u5165\u6846"] })] })), _jsxs("div", { className: "flex gap-2 items-start", children: [_jsxs("div", { className: "flex-1 relative", children: [_jsx(RichTextEditor, { ref: editorRef, placeholder: `向 ${activeChannel.name} 发送消息...`, onSend: handleSendMessage, onChange: handleEditorChange, onAtTrigger: handleAtTrigger, minHeight: "44px", maxHeight: "200px" }), atPopoverPosition && (_jsx("div", { className: "absolute z-50 rounded-lg border bg-popover shadow-md min-w-60 max-h-72 overflow-y-auto p-1", style: { top: `${atPopoverPosition.top}px`, left: `${atPopoverPosition.left}px` }, children: filteredAtSuggestions.length > 0 ? filteredAtSuggestions.map((user) => (_jsxs("div", { className: "flex items-center gap-2 p-2 rounded-md cursor-pointer hover:bg-accent transition-colors", onClick: () => selectAtUser(user), children: [_jsx(User, { size: 16, className: "text-muted-foreground" }), _jsxs("div", { className: "flex-1", children: [_jsx("div", { className: "text-sm font-medium", children: user.name }), _jsxs("div", { className: "text-xs text-muted-foreground", children: ["ID: ", user.id] })] })] }, user.id))) : (_jsxs("div", { className: "flex flex-col items-center gap-2 p-4", children: [_jsx(Search, { size: 20, className: "text-muted-foreground/50" }), _jsx("span", { className: "text-xs text-muted-foreground", children: "\u672A\u627E\u5230\u5339\u914D\u7684\u7528\u6237" })] })) }))] }), _jsxs("button", { className: "inline-flex items-center gap-1.5 h-10 px-4 rounded-md bg-primary text-primary-foreground text-sm font-medium disabled:opacity-50 transition-colors hover:bg-primary/90", onClick: () => { const c = editorRef.current?.getContent(); if (c)

package/pages/SandboxChat.tsx CHANGED Viewed

@@ -32,7 +32,7 @@ export default function Sandbox() {
     const [faceList, setFaceList] = useState<Face[]>([])
     const [activeChannel, setActiveChannel] = useState<Channel>(channels[0])
     const [inputText, setInputText] = useState('')
-    const [endpointName, setBotName] = useState('ProcessEndpoint')
+    const [endpointId, setBotName] = useState('ProcessEndpoint')
     const [connected, setConnected] = useState(false)
     const [showFacePicker, setShowFacePicker] = useState(false)
     /** 输入区：插入图片 / 视频 / 音频 URL */
@@ -79,7 +79,7 @@ export default function Sandbox() {
             : Array.isArray(data.content) ? data.content as MessageSegment[] : parseTextToSegments(String(data.content ?? ''))
         const channelName = data.type === 'private'
-            ? `私聊-${data.bot || endpointName}`
+            ? `私聊-${data.bot || endpointId}`
             : data.type === 'group'
             ? `群组-${data.id}`
             : `频道-${data.id}`
@@ -95,7 +95,7 @@ export default function Sandbox() {
         setMessages((prev) => [...prev, {
             id: data.messageId ?? `bot_${data.timestamp}`, type: 'received', channelType,
             channelId: data.id, channelName, senderId: 'endpoint',
-            senderName: data.bot || endpointName, content, timestamp: data.timestamp,
+            senderName: data.bot || endpointId, content, timestamp: data.timestamp,
         }])
     }
@@ -509,7 +509,7 @@ export default function Sandbox() {
                             </span>
                         </div>
                         <div className="flex items-center gap-2">
-                            <input value={endpointName} onChange={(e) => setBotName(e.target.value)} placeholder="机器人名称"
+                            <input value={endpointId} onChange={(e) => setBotName(e.target.value)} placeholder="机器人名称"
                                 className="h-8 w-28 rounded-md border bg-transparent px-2 text-sm" />
                             <button className="inline-flex items-center gap-1 h-8 px-3 rounded-md bg-secondary text-secondary-foreground text-sm hover:bg-secondary/80" onClick={clearMessages}>
                                 <Trash2 size={14} /> 清空

package/schema.json CHANGED Viewed

@@ -3,16 +3,48 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
+    "master": {
+      "type": [
+        "string",
+        "number"
+      ],
+      "description": "框架 master（sandbox client id (distinct from endpoints[].owner)；AI/工具权限、endpoint 管理）。endpoints[i].master 可逐项覆盖"
+    },
+    "trusted": {
+      "type": "array",
+      "items": {
+        "type": [
+          "string",
+          "number"
+        ],
+        "description": "Trusted sandbox client id (distinct from endpoints[].owner)"
+      },
+      "description": "框架 trusted 用户列表（弱于 master）。endpoints[i].trusted 可逐项追加"
+    },
     "endpoints": {
       "type": "array",
-      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（name 必填，其余覆盖顶层）",
+      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（id 必填，其余覆盖顶层）",
       "items": {
         "type": "object",
         "additionalProperties": true,
         "properties": {
-          "name": {
-            "type": "string",
-            "description": "Sandbox bot name"
+          "master": {
+            "type": [
+              "string",
+              "number"
+            ],
+            "description": "本 endpoint 的框架 master（sandbox client id (distinct from endpoints[].owner)）；覆盖顶层 master"
+          },
+          "trusted": {
+            "type": "array",
+            "items": {
+              "type": [
+                "string",
+                "number"
+              ],
+              "description": "Trusted sandbox client id (distinct from endpoints[].owner)"
+            },
+            "description": "本 endpoint 的 trusted 列表"
           },
           "context": {
             "type": "string",
@@ -21,10 +53,14 @@
           "owner": {
             "type": "string",
             "description": "Sandbox owner user ID"
+          },
+          "id": {
+            "type": "string",
+            "description": "Sandbox bot name"
           }
         },
         "required": [
-          "name"
+          "id"
         ]
       }
     },

package/src/endpoint.ts CHANGED Viewed

@@ -2,22 +2,21 @@
  * 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';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import {
   bindSandboxWsSocket,
   formatSandboxOutbound,
   parseSandboxWsPayload,
+  sandboxInboundConversation,
   whenWsOpen,
   type ResolvedSandboxBot,
   type SandboxWsSocket,
 } from './protocol.js';
-const logger = getLogger('sandbox');
 /**
  * 多 sandbox endpoint 共用同一个 HttpHost 时，同 path 的所有 WS listener
  * 都会被回调（入站重复、出站互窜）。按 endpoint 名隔离挂载路径：
@@ -58,11 +57,6 @@ function claimSandboxWsPath(
   };
 }
-interface SandboxChannel {
-  readonly type: string;
-  readonly id: string;
-}
 interface SandboxConnection {
   readonly target: string;
   readonly owner: string;
@@ -70,11 +64,6 @@ interface SandboxConnection {
   readonly release: () => void;
   /** true = 占位连接（尚无真实 WS 客户端），send 命中时按 miss 处理。 */
   readonly placeholder?: boolean;
-  /**
-   * 最近一条入站频道（Console UI 按 type+id 过滤气泡）。
-   * 出站必须带回，否则回复石沉大海。
-   */
-  lastChannel?: SandboxChannel;
 }
 export interface SandboxEndpointOptions {
@@ -89,6 +78,8 @@ export interface SandboxEndpointOptions {
  * 不适用 EndpointManagement 语义端口；本 endpoint 不暴露该端口。
  */
 export class SandboxWsEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
   readonly #options: SandboxEndpointOptions;
   readonly #connections = new Map<string, SandboxConnection>();
   #wsHandleRelease?: () => void;
@@ -98,19 +89,20 @@ export class SandboxWsEndpoint implements EndpointInstance {
   #started = false;
   constructor(options: SandboxEndpointOptions) {
+    this.#logger = getAdapterLogger('sandbox', options.defaults.id);
     this.#options = options;
   }
-  /** Live endpoint name (config `name`) — Console endpoint.list/resolve uses it. */
+  /** Live endpoint id (config `id`) — Console endpoint.list/resolve uses it. */
   get name(): string {
-    return this.#options.defaults.name;
+    return this.#options.defaults.id;
   }
   start(): void {
     if (this.#started) return;
     this.#started = true;
     // 多 endpoint 同 path 会被全部回调（入站重复、出站互窜），按名隔离。
-    const claim = claimSandboxWsPath(this.#options.http, this.#options.defaults.name);
+    const claim = claimSandboxWsPath(this.#options.http, this.#options.defaults.id);
     this.#wsPathRelease = claim.release;
     this.#wsPath = claim.path;
     const handle = this.#options.http.ws(claim.path);
@@ -118,13 +110,9 @@ export class SandboxWsEndpoint implements EndpointInstance {
       this.#acceptConnection(connection);
     });
     if (!this.#options.defaults.randomNamePerConnection) {
-      this.#ensurePlaceholder(this.#options.defaults.name, this.#options.defaults.owner);
+      this.#ensurePlaceholder(this.#options.defaults.id, this.#options.defaults.owner);
     }
-    logger.info(formatCompact({
-      op: 'sandbox_ws_mounted',
-      path: claim.path,
-      endpoint: this.#options.defaults.name,
-    }));
+    this.#logger.info(`ws mounted ${claim.path}`);
   }
   open(): void {
@@ -153,38 +141,41 @@ export class SandboxWsEndpoint implements EndpointInstance {
     }
     this.#connections.clear();
     this.#started = false;
-    logger.debug(formatCompact({ op: 'sandbox_stopped' }));
+    this.#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.id)
       ?? this.#findLiveConnection();
     if (!connection) {
-      logger.debug(formatCompact({ op: 'sandbox_send_miss', target }));
+      this.#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 }));
+      this.#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,
-      bot: this.#options.defaults.name,
+      type: conversation.kind,
+      id: conversation.id,
+      bot: this.#options.defaults.id,
       endpoint: connection.target,
     }));
-    logger.debug(formatCompact({
+    this.#logger.debug(formatCompact({
       op: 'sandbox_send',
       target: connection.target,
-      channelType: channel.type,
-      channelId: channel.id,
+      channelType: conversation.kind,
+      channelId: conversation.id,
     }));
     return payload;
   }
@@ -200,7 +191,7 @@ export class SandboxWsEndpoint implements EndpointInstance {
   #acceptConnection(connection: WsConnection): void {
     const target = this.#options.defaults.randomNamePerConnection
       ? `sandbox-${randomUUID().slice(0, 8)}`
-      : this.#options.defaults.name;
+      : this.#options.defaults.id;
     const owner = this.#options.defaults.owner;
     const socket = connection.socket as SandboxWsSocket;
     // Fixed-name mode reuses `target`; dropping the prior entry without
@@ -221,39 +212,36 @@ 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,
-          };
-        }
-        logger.debug(formatCompact({
+        const sender = parsed.id || owner;
+        const conversation = sandboxInboundConversation(String(this.#options.id), {
+          type: parsed.type,
+          id: sender,
+        });
+        this.#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: { id: sender },
+          endpointId: target,
           metadata: Object.freeze({
             type: parsed.type,
             channelType: parsed.type,
             channelId: parsed.id || owner,
-            endpoint: target,
             elements: parsed.content,
             timestamp: parsed.timestamp,
             ...(parsed.action ? { action: parsed.action } : {}),
           }),
         }).catch((err) => {
-          logger.warn(formatCompact({
+          this.#logger.warn(formatCompact({
             op: 'sandbox_gateway_receive_failed',
             target,
             error: err instanceof Error ? err.message : String(err),
@@ -266,11 +254,11 @@ export class SandboxWsEndpoint implements EndpointInstance {
         const current = this.#connections.get(target);
         if (current && current.socket === socket) {
           this.#connections.delete(target);
-          logger.debug(formatCompact({ op: 'sandbox_ws_closed', target }));
+          this.#logger.debug(formatCompact({ op: 'sandbox_ws_closed', target }));
         }
       },
       onError: (err) => {
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'sandbox_ws_error',
           target,
           error: err instanceof Error ? err.message : String(err),
@@ -278,7 +266,7 @@ export class SandboxWsEndpoint implements EndpointInstance {
       },
     });
     this.#connections.set(target, { target, owner, socket, release });
-    logger.debug(formatCompact({ op: 'sandbox_ws_connected', target, owner }));
+    this.#logger.debug(formatCompact({ op: 'sandbox_ws_connected', target, owner }));
     if (!this.#options.defaults.randomNamePerConnection) {
       const readyPayload = JSON.stringify({
         type: 'ready',

package/src/index.ts CHANGED Viewed

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

package/src/protocol.ts CHANGED Viewed

@@ -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');
@@ -33,7 +34,7 @@ export interface SandboxWsSocket {
 export type ResolvedSandboxBot = {
   readonly context: 'sandbox';
-  readonly name: string;
+  readonly id: string;
   readonly owner: string;
   readonly randomNamePerConnection: boolean;
 };
@@ -41,12 +42,12 @@ export type ResolvedSandboxBot = {
 export interface SandboxAdapterConfig {
   /** Runtime expands `endpoints[i]` onto the top level — prefer these. */
   readonly context?: string;
-  readonly name?: string;
+  readonly id?: string;
   readonly owner?: string;
   /** Legacy shape: endpoint entries nested under `endpoints[]`. */
   readonly endpoints?: ReadonlyArray<{
     readonly context?: string;
-    readonly name?: string;
+    readonly id?: string;
     readonly owner?: string;
   }>;
 }
@@ -55,19 +56,19 @@ export function resolveSandboxEndpoint(
   appConfig: SandboxAdapterConfig,
 ): ResolvedSandboxBot {
   const entry = appConfig.endpoints?.find((item) => item.context === 'sandbox');
-  const fixedName = typeof appConfig.name === 'string' && appConfig.name
-    ? appConfig.name
-    : typeof entry?.name === 'string' && entry.name
-      ? entry.name
+  const fixedName = typeof appConfig.id === 'string' && appConfig.id
+    ? appConfig.id
+    : typeof entry?.id === 'string' && entry.id
+      ? entry.id
       : undefined;
-  const name = fixedName || process.env.SANDBOX_BOT_NAME || 'sandbox-bot';
+  const id = fixedName || process.env.SANDBOX_BOT_NAME || 'sandbox-bot';
   const owner = (typeof appConfig.owner === 'string' && appConfig.owner)
     || (typeof entry?.owner === 'string' && entry.owner)
     || process.env.SANDBOX_BOT_OWNER
     || 'sandbox-user';
   return {
     context: 'sandbox',
-    name,
+    id,
     owner,
     randomNamePerConnection: !fixedName,
   };
@@ -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(
+  endpointKey: 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: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
+    kind,
+    id: msg.id,
+  };
+}
 export type SandboxOutboundChannel = {
   readonly type?: string;
   readonly id?: string;