@zhin.js/adapter-milky 6.0.2 → 6.0.5

package/src/protocol.ts

@@ -6,6 +6,7 @@
 
 import { isMediaRef } from '@zhin.js/core';
 import type { Segment } from '@zhin.js/core/runtime';
+import type { ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
 const logger = getLogger('milky');
@@ -14,7 +15,7 @@ const logger = getLogger('milky');
 export interface MilkyLegacyEndpointRow {
   readonly context?: string;
   readonly connection?: 'ws' | 'sse' | 'webhook' | 'wss';
-  readonly name?: string;
+  readonly id?: string;
   readonly baseUrl?: string;
   readonly access_token?: string;
   readonly path?: string;
@@ -25,7 +26,7 @@ export interface MilkyLegacyEndpointRow {
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface MilkyAdapterConfig {
   readonly connection?: 'ws' | 'sse' | 'webhook' | 'wss';
-  readonly name?: string;
+  readonly id?: string;
   readonly baseUrl?: string;
   readonly access_token?: string;
   readonly path?: string;
@@ -37,7 +38,7 @@ export interface MilkyAdapterConfig {
 
 export interface MilkyConfigBase {
   readonly context: 'milky';
-  readonly name: string;
+  readonly id: string;
   readonly baseUrl: string;
   readonly access_token?: string;
 }
@@ -116,11 +117,6 @@ export interface MilkyOutgoingSegment {
   data: Record<string, unknown>;
 }
 
-export interface ParsedSendTarget {
-  readonly message_type: 'private' | 'group';
-  readonly id: string;
-}
-
 export interface MilkyApiClientOptions {
   readonly baseUrl: string;
   readonly access_token?: string;
@@ -134,8 +130,8 @@ function normalizeConnection(connection: string | undefined): 'ws' | 'sse' | 'we
 export function resolveMilkyConfig(config: MilkyAdapterConfig = {}): ResolvedMilkyConfig {
   const entry = config.endpoints?.find((item) => item.context === 'milky');
   const connection = normalizeConnection(config.connection ?? entry?.connection);
-  const name = (typeof config.name === 'string' && config.name)
-    || (typeof entry?.name === 'string' && entry.name)
+  const id = (typeof config.id === 'string' && config.id)
+    || (typeof entry?.id === 'string' && entry.id)
     || process.env.MILKY_BOT_NAME
     || 'milky-bot';
   const baseUrl = config.baseUrl ?? entry?.baseUrl;
@@ -147,7 +143,7 @@ export function resolveMilkyConfig(config: MilkyAdapterConfig = {}): ResolvedMil
   const access_token = config.access_token ?? entry?.access_token;
   const base = {
     context: 'milky' as const,
-    name,
+    id,
     baseUrl,
     access_token,
   };
@@ -261,10 +257,22 @@ export function isMessageReceiveEvent(
   return parseMessageReceiveData(event) != null;
 }
 
-/** Gateway reply target：`private:uid` / `group:gid` */
-export function formatInboundTarget(data: MilkyIncomingMessage): string {
-  const isGroup = data.message_scene === 'group';
-  return `${isGroup ? 'group' : 'private'}:${data.peer_id}`;
+/**
+ * 入站归一化 → ConversationRef：`friend`（私聊）→ `private`；`group` → `group`；
+ * `temp`（群临时会话）→ 群容器内的 `private` 会话（parent = 来源群）。
+ */
+export function milkyInboundConversation(
+  endpointKey: string,
+  data: MilkyIncomingMessage,
+): ConversationRef {
+  return {
+    endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
+    kind: data.message_scene === 'group' ? 'group' : 'private',
+    id: String(data.peer_id),
+    ...(data.message_scene === 'temp' && data.group
+      ? { parent: { kind: 'group' as const, id: String(data.group.group_id) } }
+      : {}),
+  };
 }
 
 export function formatInboundContent(data: MilkyIncomingMessage): string {
@@ -427,18 +435,6 @@ export function formatInboundMessageId(data: MilkyIncomingMessage): string {
   return `${data.message_scene}:${data.peer_id}:${data.message_seq}`;
 }
 
-export function parseSendTarget(target: string): ParsedSendTarget {
-  const sep = target.indexOf(':');
-  if (sep <= 0) {
-    return { message_type: 'private', id: target };
-  }
-  const head = target.slice(0, sep);
-  const rest = target.slice(sep + 1);
-  if (head === 'group') return { message_type: 'group', id: rest };
-  if (head === 'private') return { message_type: 'private', id: rest };
-  return { message_type: 'private', id: target };
-}
-
 /**
  * 解析 image/audio/video 段的投递 uri（canonical MediaRef 唯一来源）：
  * - kind=url → http(s):// 直发；
@@ -570,15 +566,14 @@ export function formatOutboundSegments(payload: unknown): MilkyOutgoingSegment[]
 }
 
 export function buildSendAction(
-  target: string,
+  conversation: ConversationRef,
   message: MilkyOutgoingSegment[],
 ): { action: string; params: Record<string, unknown> } {
-  const parsed = parseSendTarget(target);
-  if (parsed.message_type === 'group') {
+  if (conversation.kind === 'group') {
     return {
       action: 'send_group_message',
       params: {
-        group_id: parseInt(parsed.id, 10),
+        group_id: parseInt(conversation.id, 10),
         message,
       },
     };
@@ -586,21 +581,23 @@ export function buildSendAction(
   return {
     action: 'send_private_message',
     params: {
-      user_id: parseInt(parsed.id, 10),
+      user_id: parseInt(conversation.id, 10),
       message,
     },
   };
 }
 
-/** message_seq result → gateway message id */
+/**
+ * message_seq result → gateway message id（`scene:peer:seq` 复合格式，
+ * 与 formatInboundMessageId 同源，仅供 recall 链在本端点边界内解析）。
+ */
 export function formatOutboundMessageId(
-  target: string,
+  conversation: ConversationRef,
   messageSeq: number | undefined,
 ): string {
   if (messageSeq == null) return '';
-  const parsed = parseSendTarget(target);
-  const scene = parsed.message_type === 'group' ? 'group' : 'friend';
-  return `${scene}:${parsed.id}:${messageSeq}`;
+  const scene = conversation.kind === 'group' ? 'group' : 'friend';
+  return `${scene}:${conversation.id}:${messageSeq}`;
 }
 
 export function parseMilkyMessageId(

package/src/sse-endpoint.ts

@@ -7,9 +7,10 @@ import {
   type EndpointInstance,
   type EndpointLifecycle,
   type EndpointManagement,
+  type EndpointSendRequest,
 } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { createMilkyEndpointManagement } from './endpoint-management.js';
 import { registerMilkyAgentEndpoint } from './milky-agent-deps.js';
@@ -21,10 +22,10 @@ import {
   formatInboundContent,
   formatInboundMessageId,
   formatInboundSegments,
-  formatInboundTarget,
   formatOutboundMessageId,
   formatOutboundSegments,
   isMentioned,
+  milkyInboundConversation,
   parseMessageReceiveData,
   parseMilkyMessageId,
   senderNickname,
@@ -34,8 +35,6 @@ import {
 } from './protocol.js';
 import { openSseStream, type SseClientHandle } from './sse-client.js';
 
-const logger = getLogger('milky');
-
 export type CreateMilkySseStream = (options: {
   readonly url: string;
   readonly headers: Record<string, string>;
@@ -53,6 +52,8 @@ export interface MilkySseEndpointOptions {
 }
 
 export class MilkySseEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: MilkySseEndpointOptions;
   readonly #callApi: typeof callApi;
   readonly management: EndpointManagement = createMilkyEndpointManagement(this);
@@ -62,10 +63,11 @@ export class MilkySseEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: MilkySseEndpointOptions) {
+    this.#logger = getAdapterLogger('milky', options.config.id);
     this.#options = options;
     this.#callApi = options.callApi ?? callApi;
     this.#lifecycle = createEndpointLifecycle({
-      name: options.config.name,
+      name: options.config.id,
       // reconnect_interval 旧语义为固定间隔：multiplier 1 + 无 jitter + 不封顶
       reconnect: {
         initialIntervalMs: options.config.reconnect_interval,
@@ -78,7 +80,7 @@ export class MilkySseEndpoint implements EndpointInstance {
 
   async start(): Promise<void> {
     if (this.#lifecycle.started) return;
-    this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.name, this);
+    this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.id, this);
     try {
       await this.#lifecycle.start((handle) => this.#connect(handle));
     } catch (err) {
@@ -106,15 +108,15 @@ export class MilkySseEndpoint implements EndpointInstance {
     this.#stream = undefined;
   }
 
-  async send({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const message = formatOutboundSegments(payload);
-    const { action, params } = buildSendAction(target, message);
+    const { action, params } = buildSendAction(conversation, message);
     const data = await this.callApi(action, params) as { message_seq?: number } | undefined;
-    const messageId = formatOutboundMessageId(target, data?.message_seq);
-    logger.debug(formatCompact({
+    const messageId = formatOutboundMessageId(conversation, data?.message_seq);
+    this.#logger.debug(formatCompact({
       op: 'milky_send',
-      endpoint: this.#options.config.name,
-      target,
+      endpoint: this.#options.config.id,
+      target: `${conversation.kind}:${conversation.id}`,
       messageId,
       mode: 'sse',
     }));
@@ -218,33 +220,32 @@ export class MilkySseEndpoint implements EndpointInstance {
   }
 
   #admitMessage(data: MilkyIncomingMessage, event: MilkyEvent): void {
-    const target = formatInboundTarget(data);
+    const conversation = milkyInboundConversation(String(this.#options.id), data);
+    const target = `${conversation.kind}:${conversation.id}`;
     const content = formatInboundContent(data);
     const segments = formatInboundSegments(data);
     const audioUrl = extractInboundAudioUrl(data);
     const nickname = senderNickname(data);
     const mentioned = isMentioned(data, event.self_id);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: formatInboundMessageId(data) },
       content,
       segments,
-      sender: String(data.sender_id),
-      id: formatInboundMessageId(data),
+      sender: { id: String(data.sender_id), name: nickname },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       metadata: Object.freeze({
         message_scene: data.message_scene,
         peer_id: String(data.peer_id),
         sender_id: String(data.sender_id),
         message_seq: data.message_seq,
-        endpoint: this.#options.config.name,
         time: data.time ?? event.time,
         self_id: event.self_id != null ? String(event.self_id) : undefined,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
-        ...(audioUrl ? { audio_url: audioUrl } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'milky_gateway_receive_failed',
         target,
         error: err instanceof Error ? err.message : String(err),
@@ -264,8 +265,8 @@ export class MilkySseEndpoint implements EndpointInstance {
         onOpen: () => {
           if (settled) return;
           settled = true;
-          logger.debug(formatCompact({
-            endpoint: this.#options.config.name,
+          this.#logger.debug(formatCompact({
+            endpoint: this.#options.config.id,
             mode: 'sse',
             url: safeUrl,
           }));
@@ -273,9 +274,9 @@ export class MilkySseEndpoint implements EndpointInstance {
         },
         onMessage: (data) => this.#onMessage(data),
         onError: (error) => {
-          logger.warn(formatCompact({
+          this.#logger.warn(formatCompact({
             op: 'sse_error',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             ok: false,
             error: error.message,
           }));
@@ -296,9 +297,8 @@ export class MilkySseEndpoint implements EndpointInstance {
       void stream.closed.then(() => {
         // stop-during-connect 竞态由基座静默 settle（主动停止不算失败），此处仅对运行期断开告警
         if (this.#lifecycle.state !== 'stopped') {
-          logger.warn(formatCompact({
-            op: 'disconnect',
-            endpoint: this.#options.config.name,
+          this.#logger.warn(formatCompact({
+          op: 'disconnect',
             mode: 'sse',
             reconnect_ms: this.#options.config.reconnect_interval,
           }));
@@ -318,9 +318,9 @@ export class MilkySseEndpoint implements EndpointInstance {
       const event = JSON.parse(data) as MilkyEvent;
       this.admit(event);
     } catch (error) {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'milky_parse_failed',
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         mode: 'sse',
         error: error instanceof Error ? error.message : String(error),
       }));

package/src/webhook-endpoint.ts

@@ -2,10 +2,14 @@
  * Milky webhook endpoint — httpHostToken POST inbound + baseUrl HTTP API outbound.
  */
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
+import type {
+  EndpointInstance,
+  EndpointManagement,
+  EndpointSendRequest,
+} from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, HttpRouteRegistration } 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 { readRequestBody, verifyMilkyAccessToken } from './milky-auth.js';
 import { createMilkyEndpointManagement } from './endpoint-management.js';
@@ -17,10 +21,10 @@ import {
   formatInboundContent,
   formatInboundMessageId,
   formatInboundSegments,
-  formatInboundTarget,
   formatOutboundMessageId,
   formatOutboundSegments,
   isMentioned,
+  milkyInboundConversation,
   parseMessageReceiveData,
   parseMilkyMessageId,
   senderNickname,
@@ -29,8 +33,6 @@ import {
   type MilkyWebhookConfig,
 } from './protocol.js';
 
-const logger = getLogger('milky');
-
 export interface MilkyWebhookEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -40,6 +42,8 @@ export interface MilkyWebhookEndpointOptions {
 }
 
 export class MilkyWebhookEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: MilkyWebhookEndpointOptions;
   readonly #callApi: typeof callApi;
   readonly management: EndpointManagement = createMilkyEndpointManagement(this);
@@ -49,6 +53,7 @@ export class MilkyWebhookEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: MilkyWebhookEndpointOptions) {
+    this.#logger = getAdapterLogger('milky', options.config.id);
     this.#options = options;
     this.#callApi = options.callApi ?? callApi;
   }
@@ -56,11 +61,11 @@ export class MilkyWebhookEndpoint implements EndpointInstance {
   async start(): Promise<void> {
     if (this.#started) return;
     this.#started = true;
-    this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.name, this);
+    this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.id, this);
     this.#setupRoutes();
-    logger.info(formatCompact({
+    this.#logger.info(formatCompact({
       op: 'listen',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       mode: 'webhook',
       path: this.#options.config.path,
     }));
@@ -80,18 +85,18 @@ export class MilkyWebhookEndpoint implements EndpointInstance {
     this.#unregisterAgent?.();
     this.#unregisterAgent = undefined;
     this.#started = false;
-    logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
+    this.#logger.debug(formatCompact({ op: 'disconnect' }));
   }
 
-  async send({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const message = formatOutboundSegments(payload);
-    const { action, params } = buildSendAction(target, message);
+    const { action, params } = buildSendAction(conversation, message);
     const data = await this.callApi(action, params) as { message_seq?: number } | undefined;
-    const messageId = formatOutboundMessageId(target, data?.message_seq);
-    logger.debug(formatCompact({
+    const messageId = formatOutboundMessageId(conversation, data?.message_seq);
+    this.#logger.debug(formatCompact({
       op: 'milky_send',
-      endpoint: this.#options.config.name,
-      target,
+      endpoint: this.#options.config.id,
+      target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
     return messageId;
@@ -194,33 +199,32 @@ export class MilkyWebhookEndpoint implements EndpointInstance {
   }
 
   #admitMessage(data: MilkyIncomingMessage, event: MilkyEvent): void {
-    const target = formatInboundTarget(data);
+    const conversation = milkyInboundConversation(String(this.#options.id), data);
+    const target = `${conversation.kind}:${conversation.id}`;
     const content = formatInboundContent(data);
     const segments = formatInboundSegments(data);
     const audioUrl = extractInboundAudioUrl(data);
     const nickname = senderNickname(data);
     const mentioned = isMentioned(data, event.self_id);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: formatInboundMessageId(data) },
       content,
       segments,
-      sender: String(data.sender_id),
-      id: formatInboundMessageId(data),
+      sender: { id: String(data.sender_id), name: nickname },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       metadata: Object.freeze({
         message_scene: data.message_scene,
         peer_id: String(data.peer_id),
         sender_id: String(data.sender_id),
         message_seq: data.message_seq,
-        endpoint: this.#options.config.name,
         time: data.time ?? event.time,
         self_id: event.self_id != null ? String(event.self_id) : undefined,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
-        ...(audioUrl ? { audio_url: audioUrl } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'milky_gateway_receive_failed',
         target,
         error: err instanceof Error ? err.message : String(err),
@@ -257,7 +261,7 @@ export class MilkyWebhookEndpoint implements EndpointInstance {
       response.writeHead(200, { 'Content-Type': 'application/json' });
       response.end(JSON.stringify({ status: 'ok' }));
     } catch (error) {
-      logger.error('Milky webhook error:', error);
+      this.#logger.error('Milky webhook error:', error);
       if (!response.headersSent) {
         response.writeHead(500, { 'Content-Type': 'application/json' });
         response.end(JSON.stringify({ message: 'Internal Server Error' }));

package/src/ws-endpoint.ts

@@ -8,9 +8,10 @@ import {
   type EndpointInstance,
   type EndpointLifecycle,
   type EndpointManagement,
+  type EndpointSendRequest,
 } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { createMilkyEndpointManagement } from './endpoint-management.js';
 import { registerMilkyAgentEndpoint } from './milky-agent-deps.js';
@@ -22,10 +23,10 @@ import {
   formatInboundContent,
   formatInboundMessageId,
   formatInboundSegments,
-  formatInboundTarget,
   formatOutboundMessageId,
   formatOutboundSegments,
   isMentioned,
+  milkyInboundConversation,
   parseMessageReceiveData,
   parseMilkyMessageId,
   senderNickname,
@@ -35,7 +36,6 @@ import {
 } from './protocol.js';
 import type { MilkyWsCreateOptions, MilkyWsSocket } from './ws-types.js';
 
-const logger = getLogger('milky');
 const WS_OPEN = 1;
 
 export interface MilkyWsEndpointOptions {
@@ -50,6 +50,8 @@ export interface MilkyWsEndpointOptions {
 }
 
 export class MilkyWsEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: MilkyWsEndpointOptions;
   readonly #callApi: typeof callApi;
   readonly management: EndpointManagement = createMilkyEndpointManagement(this);
@@ -59,10 +61,11 @@ export class MilkyWsEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: MilkyWsEndpointOptions) {
+    this.#logger = getAdapterLogger('milky', options.config.id);
     this.#options = options;
     this.#callApi = options.callApi ?? callApi;
     this.#lifecycle = createEndpointLifecycle({
-      name: options.config.name,
+      name: options.config.id,
       // reconnect_interval 旧语义为固定间隔：multiplier 1 + 无 jitter + 不封顶
       reconnect: {
         initialIntervalMs: options.config.reconnect_interval,
@@ -75,7 +78,7 @@ export class MilkyWsEndpoint implements EndpointInstance {
 
   async start(): Promise<void> {
     if (this.#lifecycle.started) return;
-    this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.name, this);
+    this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.id, this);
     try {
       await this.#lifecycle.start((handle) => this.#connect(handle));
     } catch (err) {
@@ -109,15 +112,15 @@ export class MilkyWsEndpoint implements EndpointInstance {
     }
   }
 
-  async send({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const message = formatOutboundSegments(payload);
-    const { action, params } = buildSendAction(target, message);
+    const { action, params } = buildSendAction(conversation, message);
     const data = await this.callApi(action, params) as { message_seq?: number } | undefined;
-    const messageId = formatOutboundMessageId(target, data?.message_seq);
-    logger.debug(formatCompact({
+    const messageId = formatOutboundMessageId(conversation, data?.message_seq);
+    this.#logger.debug(formatCompact({
       op: 'milky_send',
-      endpoint: this.#options.config.name,
-      target,
+      endpoint: this.#options.config.id,
+      target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
     return messageId;
@@ -222,33 +225,32 @@ export class MilkyWsEndpoint implements EndpointInstance {
   }
 
   #admitMessage(data: MilkyIncomingMessage, event: MilkyEvent): void {
-    const target = formatInboundTarget(data);
+    const conversation = milkyInboundConversation(String(this.#options.id), data);
+    const target = `${conversation.kind}:${conversation.id}`;
     const content = formatInboundContent(data);
     const segments = formatInboundSegments(data);
     const audioUrl = extractInboundAudioUrl(data);
     const nickname = senderNickname(data);
     const mentioned = isMentioned(data, event.self_id);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: formatInboundMessageId(data) },
       content,
       segments,
-      sender: String(data.sender_id),
-      id: formatInboundMessageId(data),
+      sender: { id: String(data.sender_id), name: nickname },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       metadata: Object.freeze({
         message_scene: data.message_scene,
         peer_id: String(data.peer_id),
         sender_id: String(data.sender_id),
         message_seq: data.message_seq,
-        endpoint: this.#options.config.name,
         time: data.time ?? event.time,
         self_id: event.self_id != null ? String(event.self_id) : undefined,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
-        ...(audioUrl ? { audio_url: audioUrl } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'milky_gateway_receive_failed',
         target,
         error: err instanceof Error ? err.message : String(err),
@@ -278,14 +280,14 @@ export class MilkyWsEndpoint implements EndpointInstance {
         if (settled) return;
         settled = true;
         if (!this.#options.config.access_token) {
-          logger.warn(formatCompact({
-            endpoint: this.#options.config.name,
+          this.#logger.warn(formatCompact({
+            endpoint: this.#options.config.id,
             ok: false,
             error: 'missing access_token',
           }));
         }
-        logger.debug(formatCompact({
-          endpoint: this.#options.config.name,
+        this.#logger.debug(formatCompact({
+          endpoint: this.#options.config.id,
           mode: 'ws',
           url: safeUrl,
         }));
@@ -318,9 +320,8 @@ export class MilkyWsEndpoint implements EndpointInstance {
           : codeNum === 1006
             ? ' [异常关闭]'
             : '';
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'disconnect',
-          endpoint: this.#options.config.name,
           code: codeNum,
           error: `${reasonStr || 'closed'}${codeHint}`,
           reconnect_ms: this.#options.config.reconnect_interval,
@@ -335,9 +336,9 @@ export class MilkyWsEndpoint implements EndpointInstance {
 
       ws.on('error', (err) => {
         const error = err instanceof Error ? err : new Error(String(err));
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'ws_error',
-          endpoint: this.#options.config.name,
+          endpoint: this.#options.config.id,
           ok: false,
           error: error.message,
         }));
@@ -361,9 +362,9 @@ export class MilkyWsEndpoint implements EndpointInstance {
       const event = JSON.parse(raw) as MilkyEvent;
       this.admit(event);
     } catch (error) {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'milky_parse_failed',
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         error: error instanceof Error ? error.message : String(error),
       }));
     }