@zhin.js/adapter-milky 6.0.3 → 6.0.5

package/CHANGELOG.md

@@ -1,5 +1,75 @@
 # @zhin.js/adapter-milky
 
+## 6.0.5
+
+### Patch Changes
+
+- Updated dependencies [6f9c366]
+- Updated dependencies [373a56b]
+- Updated dependencies [0de46a8]
+- Updated dependencies [c106ecc]
+- Updated dependencies [ca92e03]
+- Updated dependencies [b0f37ae]
+- Updated dependencies [ba08a2f]
+- Updated dependencies [b08f7fe]
+- Updated dependencies [daffd4c]
+- Updated dependencies [36c7400]
+- Updated dependencies [a9fa72e]
+- Updated dependencies [c8de3ef]
+- Updated dependencies [60f0fc8]
+- Updated dependencies [574c990]
+- Updated dependencies [d096f16]
+- Updated dependencies [3f29623]
+- Updated dependencies [2916852]
+- Updated dependencies [d047869]
+- Updated dependencies [162fa34]
+- Updated dependencies [e62561e]
+- Updated dependencies [3eeeb46]
+- Updated dependencies [85d0f82]
+- Updated dependencies [61bfc1c]
+- Updated dependencies [04bad47]
+- Updated dependencies [e40b048]
+- Updated dependencies [5a5b1bb]
+- Updated dependencies [f1708c3]
+- Updated dependencies [d254a81]
+- Updated dependencies [7123c47]
+- Updated dependencies [05befc1]
+- Updated dependencies [0663b6a]
+- Updated dependencies [f28f9b3]
+- Updated dependencies [9f340f7]
+- Updated dependencies [e53444f]
+- Updated dependencies [5eedd26]
+- Updated dependencies [92b0dd7]
+- Updated dependencies [f919b6f]
+- Updated dependencies [098e411]
+- Updated dependencies [e1b7c01]
+- Updated dependencies [9b94f87]
+- Updated dependencies [a7df753]
+  - @zhin.js/agent@1.1.5
+  - @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/command@1.0.9
+  - @zhin.js/core@1.5.4
+  - zhin.js@6.0.4
+
+## 6.0.4
+
+### Patch Changes
+
+- f8c7a54: fix: im
+- Updated dependencies [f8c7a54]
+  - @zhin.js/logger@1.0.76
+  - @zhin.js/host-http@1.0.7
+  - @zhin.js/adapter@1.1.6
+  - @zhin.js/agent@1.1.4
+  - @zhin.js/command@1.0.8
+  - @zhin.js/core@1.5.3
+  - @zhin.js/im-contract@1.0.2
+  - @zhin.js/plugin-runtime@1.1.4
+  - zhin.js@6.0.3
+
 ## 6.0.3
 
 ### Patch Changes

package/adapters/milky.js

@@ -20,8 +20,8 @@ export default defineAdapter({
         const config = resolveMilkyConfig(context.config);
         const gateway = context.use(messageGatewayToken);
         // 注册到插件运行时状态（milky.endpoint list 的"运行中"数据源）
-        context.use(milkyRuntimeStateToken).endpoints.set(config.name, {
-            name: config.name,
+        context.use(milkyRuntimeStateToken).endpoints.set(config.id, {
+            id: config.id,
             mode: config.connection,
         });
         if (config.connection === 'webhook') {

package/adapters/milky.ts

@@ -43,8 +43,8 @@ export default defineAdapter<MilkyAdapterConfig>({
     const config = resolveMilkyConfig(context.config);
     const gateway = context.use(messageGatewayToken);
     // 注册到插件运行时状态（milky.endpoint list 的"运行中"数据源）
-    context.use(milkyRuntimeStateToken).endpoints.set(config.name, {
-      name: config.name,
+    context.use(milkyRuntimeStateToken).endpoints.set(config.id, {
+      id: config.id,
       mode: config.connection,
     });
     if (config.connection === 'webhook') {

package/lib/milky-agent-deps.d.ts

@@ -16,9 +16,9 @@ export interface MilkyAgentEndpoint {
     recallMessage?(id: string): Promise<void>;
 }
 export interface MilkyAgentDeps {
-    getEndpoint: (endpointId: string) => MilkyAgentEndpoint;
+    getEndpoint: (endpointKey: string) => MilkyAgentEndpoint;
 }
-export declare function registerMilkyAgentEndpoint(endpointId: string, endpoint: MilkyAgentEndpoint): () => void;
+export declare function registerMilkyAgentEndpoint(endpointKey: string, endpoint: MilkyAgentEndpoint): () => void;
 /** Optional override used by tests / transitional callers. Pass `null` to clear. */
 export declare function setMilkyAgentDeps(deps: MilkyAgentDeps | null): void;
 export declare function getMilkyAgentDeps(): MilkyAgentDeps;

package/lib/milky-agent-deps.js

@@ -4,11 +4,11 @@
  */
 const endpoints = new Map();
 let override = null;
-export function registerMilkyAgentEndpoint(endpointId, endpoint) {
-    endpoints.set(endpointId, endpoint);
+export function registerMilkyAgentEndpoint(endpointKey, endpoint) {
+    endpoints.set(endpointKey, endpoint);
     return () => {
-        if (endpoints.get(endpointId) === endpoint) {
-            endpoints.delete(endpointId);
+        if (endpoints.get(endpointKey) === endpoint) {
+            endpoints.delete(endpointKey);
         }
     };
 }
@@ -20,10 +20,10 @@ export function getMilkyAgentDeps() {
     if (override)
         return override;
     return {
-        getEndpoint(endpointId) {
-            const registered = endpoints.get(endpointId);
+        getEndpoint(endpointKey) {
+            const registered = endpoints.get(endpointKey);
             if (!registered)
-                throw new Error(`Endpoint ${endpointId} 不存在`);
+                throw new Error(`Endpoint ${endpointKey} 不存在`);
             return registered;
         },
     };

package/lib/protocol.d.ts

@@ -9,7 +9,7 @@ import type { ConversationRef } from '@zhin.js/im-contract';
 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;
@@ -19,7 +19,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;
@@ -30,7 +30,7 @@ export interface MilkyAdapterConfig {
 }
 export interface MilkyConfigBase {
     readonly context: 'milky';
-    readonly name: string;
+    readonly id: string;
     readonly baseUrl: string;
     readonly access_token?: string;
 }
@@ -123,7 +123,7 @@ export declare function isMessageReceiveEvent(event: MilkyEvent): event is Milky
  * 入站归一化 → ConversationRef：`friend`（私聊）→ `private`；`group` → `group`；
  * `temp`（群临时会话）→ 群容器内的 `private` 会话（parent = 来源群）。
  */
-export declare function milkyInboundConversation(endpointId: string, data: MilkyIncomingMessage): ConversationRef;
+export declare function milkyInboundConversation(endpointKey: string, data: MilkyIncomingMessage): ConversationRef;
 export declare function formatInboundContent(data: MilkyIncomingMessage): string;
 /**
  * 入站消息段 → canonical Segment[]（与 formatInboundContent 纯文本视图同源双轨）。

package/lib/protocol.js

@@ -14,8 +14,8 @@ function normalizeConnection(connection) {
 export function resolveMilkyConfig(config = {}) {
     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;
@@ -25,7 +25,7 @@ export function resolveMilkyConfig(config = {}) {
     const access_token = config.access_token ?? entry?.access_token;
     const base = {
         context: 'milky',
-        name,
+        id,
         baseUrl,
         access_token,
     };
@@ -129,9 +129,9 @@ export function isMessageReceiveEvent(event) {
  * 入站归一化 → ConversationRef：`friend`（私聊）→ `private`；`group` → `group`；
  * `temp`（群临时会话）→ 群容器内的 `private` 会话（parent = 来源群）。
  */
-export function milkyInboundConversation(endpointId, data) {
+export function milkyInboundConversation(endpointKey, data) {
     return {
-        endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+        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

package/lib/sse-endpoint.js

@@ -2,13 +2,13 @@
  * Milky SSE client endpoint — GET text/event-stream on /event.
  */
 import { createEndpointLifecycle, } from '@zhin.js/adapter';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createMilkyEndpointManagement } from './endpoint-management.js';
 import { registerMilkyAgentEndpoint } from './milky-agent-deps.js';
 import { buildSendAction, buildSseConnectOptions, callApi, extractInboundAudioUrl, formatInboundContent, formatInboundMessageId, formatInboundSegments, formatOutboundMessageId, formatOutboundSegments, isMentioned, milkyInboundConversation, parseMessageReceiveData, parseMilkyMessageId, senderNickname, } from './protocol.js';
 import { openSseStream } from './sse-client.js';
-const logger = getLogger('milky');
 export class MilkySseEndpoint {
+    #logger;
     #options;
     #callApi;
     management = createMilkyEndpointManagement(this);
@@ -17,10 +17,11 @@ export class MilkySseEndpoint {
     #open = false;
     #unregisterAgent;
     constructor(options) {
+        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,
@@ -33,7 +34,7 @@ export class MilkySseEndpoint {
     async start() {
         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));
         }
@@ -63,9 +64,9 @@ export class MilkySseEndpoint {
         const { action, params } = buildSendAction(conversation, message);
         const data = await this.callApi(action, params);
         const messageId = formatOutboundMessageId(conversation, data?.message_seq);
-        logger.debug(formatCompact({
+        this.#logger.debug(formatCompact({
             op: 'milky_send',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             target: `${conversation.kind}:${conversation.id}`,
             messageId,
             mode: 'sse',
@@ -171,21 +172,20 @@ export class MilkySseEndpoint {
             message: { conversation, id: formatInboundMessageId(data) },
             content,
             segments,
-            sender: String(data.sender_id),
+            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),
@@ -204,8 +204,8 @@ export class MilkySseEndpoint {
                     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,
                     }));
@@ -213,9 +213,9 @@ export class MilkySseEndpoint {
                 },
                 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,
                     }));
@@ -237,9 +237,8 @@ export class MilkySseEndpoint {
             void stream.closed.then(() => {
                 // stop-during-connect 竞态由基座静默 settle（主动停止不算失败），此处仅对运行期断开告警
                 if (this.#lifecycle.state !== 'stopped') {
-                    logger.warn(formatCompact({
+                    this.#logger.warn(formatCompact({
                         op: 'disconnect',
-                        endpoint: this.#options.config.name,
                         mode: 'sse',
                         reconnect_ms: this.#options.config.reconnect_interval,
                     }));
@@ -259,9 +258,9 @@ export class MilkySseEndpoint {
             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/lib/webhook-endpoint.js

@@ -1,10 +1,10 @@
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { readRequestBody, verifyMilkyAccessToken } from './milky-auth.js';
 import { createMilkyEndpointManagement } from './endpoint-management.js';
 import { registerMilkyAgentEndpoint } from './milky-agent-deps.js';
 import { buildSendAction, callApi, extractInboundAudioUrl, formatInboundContent, formatInboundMessageId, formatInboundSegments, formatOutboundMessageId, formatOutboundSegments, isMentioned, milkyInboundConversation, parseMessageReceiveData, parseMilkyMessageId, senderNickname, } from './protocol.js';
-const logger = getLogger('milky');
 export class MilkyWebhookEndpoint {
+    #logger;
     #options;
     #callApi;
     management = createMilkyEndpointManagement(this);
@@ -13,6 +13,7 @@ export class MilkyWebhookEndpoint {
     #started = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('milky', options.config.id);
         this.#options = options;
         this.#callApi = options.callApi ?? callApi;
     }
@@ -20,11 +21,11 @@ export class MilkyWebhookEndpoint {
         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,
         }));
@@ -42,16 +43,16 @@ export class MilkyWebhookEndpoint {
         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({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
         const { action, params } = buildSendAction(conversation, message);
         const data = await this.callApi(action, params);
         const messageId = formatOutboundMessageId(conversation, data?.message_seq);
-        logger.debug(formatCompact({
+        this.#logger.debug(formatCompact({
             op: 'milky_send',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
@@ -156,21 +157,20 @@ export class MilkyWebhookEndpoint {
             message: { conversation, id: formatInboundMessageId(data) },
             content,
             segments,
-            sender: String(data.sender_id),
+            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),
@@ -206,7 +206,7 @@ export class MilkyWebhookEndpoint {
             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/lib/ws-endpoint.js

@@ -3,13 +3,13 @@
  */
 import WebSocket from 'ws';
 import { createEndpointLifecycle, } from '@zhin.js/adapter';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { createMilkyEndpointManagement } from './endpoint-management.js';
 import { registerMilkyAgentEndpoint } from './milky-agent-deps.js';
 import { buildSendAction, buildWsConnectOptions, callApi, extractInboundAudioUrl, formatInboundContent, formatInboundMessageId, formatInboundSegments, formatOutboundMessageId, formatOutboundSegments, isMentioned, milkyInboundConversation, parseMessageReceiveData, parseMilkyMessageId, senderNickname, } from './protocol.js';
-const logger = getLogger('milky');
 const WS_OPEN = 1;
 export class MilkyWsEndpoint {
+    #logger;
     #options;
     #callApi;
     management = createMilkyEndpointManagement(this);
@@ -18,10 +18,11 @@ export class MilkyWsEndpoint {
     #open = false;
     #unregisterAgent;
     constructor(options) {
+        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,
@@ -34,7 +35,7 @@ export class MilkyWsEndpoint {
     async start() {
         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));
         }
@@ -71,9 +72,9 @@ export class MilkyWsEndpoint {
         const { action, params } = buildSendAction(conversation, message);
         const data = await this.callApi(action, params);
         const messageId = formatOutboundMessageId(conversation, data?.message_seq);
-        logger.debug(formatCompact({
+        this.#logger.debug(formatCompact({
             op: 'milky_send',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
@@ -180,21 +181,20 @@ export class MilkyWsEndpoint {
             message: { conversation, id: formatInboundMessageId(data) },
             content,
             segments,
-            sender: String(data.sender_id),
+            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),
@@ -222,14 +222,14 @@ export class MilkyWsEndpoint {
                     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,
                 }));
@@ -262,9 +262,8 @@ export class MilkyWsEndpoint {
                     : 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,
@@ -278,9 +277,9 @@ export class MilkyWsEndpoint {
             });
             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,
                 }));
@@ -304,9 +303,9 @@ export class MilkyWsEndpoint {
             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),
             }));
         }

package/lib/wss-endpoint.js

@@ -2,14 +2,14 @@
  * Milky reverse WSS endpoint — httpHostToken WS upgrade inbound + baseUrl HTTP API outbound.
  */
 import { clearInterval } from 'node:timers';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { verifyMilkyAccessToken } from './milky-auth.js';
 import { createMilkyEndpointManagement } from './endpoint-management.js';
 import { registerMilkyAgentEndpoint } from './milky-agent-deps.js';
 import { buildSendAction, callApi, extractInboundAudioUrl, formatInboundContent, formatInboundMessageId, formatInboundSegments, formatOutboundMessageId, formatOutboundSegments, isMentioned, milkyInboundConversation, parseMessageReceiveData, parseMilkyMessageId, senderNickname, } from './protocol.js';
-const logger = getLogger('milky');
 const WS_OPEN = 1;
 export class MilkyWssEndpoint {
+    #logger;
     #options;
     #callApi;
     management = createMilkyEndpointManagement(this);
@@ -20,6 +20,7 @@ export class MilkyWssEndpoint {
     #started = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('milky', options.config.id);
         this.#options = options;
         this.#callApi = options.callApi ?? callApi;
     }
@@ -27,14 +28,14 @@ export class MilkyWssEndpoint {
         if (this.#started)
             return;
         this.#started = true;
-        this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.name, this);
+        this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.id, this);
         const handle = this.#options.http.ws(this.#options.config.path);
         this.#wsRelease = handle.onConnection((connection) => {
             this.#acceptConnection(connection);
         });
-        logger.info(formatCompact({
+        this.#logger.info(formatCompact({
             op: 'listen',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             mode: 'wss',
             path: this.#options.config.path,
         }));
@@ -71,9 +72,9 @@ export class MilkyWssEndpoint {
         const { action, params } = buildSendAction(conversation, message);
         const data = await this.callApi(action, params);
         const messageId = formatOutboundMessageId(conversation, data?.message_seq);
-        logger.debug(formatCompact({
+        this.#logger.debug(formatCompact({
             op: 'milky_send',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
@@ -178,21 +179,20 @@ export class MilkyWssEndpoint {
             message: { conversation, id: formatInboundMessageId(data) },
             content,
             segments,
-            sender: String(data.sender_id),
+            sender: { id: String(data.sender_id) },
+            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),
@@ -222,8 +222,8 @@ export class MilkyWssEndpoint {
             if (this.#ws === socket)
                 this.#ws = undefined;
         });
-        logger.debug(formatCompact({
-            endpoint: this.#options.config.name,
+        this.#logger.debug(formatCompact({
+            endpoint: this.#options.config.id,
             mode: 'wss',
             peer: connection.request.socket.remoteAddress,
         }));
@@ -241,9 +241,9 @@ export class MilkyWssEndpoint {
             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),
             }));
         }