@zhin.js/adapter-milky 6.0.2 → 6.0.5

package/CHANGELOG.md

@@ -1,5 +1,91 @@
 # @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
+
+- 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/command@1.0.7
+  - @zhin.js/host-http@1.0.6
+  - @zhin.js/agent@1.1.3
+  - zhin.js@6.0.2
+
 ## 6.0.2
 
 ### Patch Changes

package/README.md

@@ -8,7 +8,7 @@ Zhin.js [Milky](https://milky.ntqqrev.org/) 协议适配器（Plugin Runtime）
 - 约定式 `defineAdapter` / `definePlugin`（无需 `usePlugin`）
 - **正向 WebSocket**（`connection: ws`）：应用连协议端 `ws(s)://baseUrl/event`
 - `access_token` 鉴权（Bearer + query）
-- 入站经 `messageGatewayToken`；出站 `send({ target, payload })` → HTTP `send_*_message`
+- 入站经 `messageGatewayToken`；出站 `send({ conversation, payload })` → HTTP `send_*_message`
 
 ## 安装
 
@@ -23,8 +23,8 @@ pnpm add @zhin.js/adapter-milky
 - `@zhin.js/plugin-runtime` — `plugin.ts`（`definePlugin`）
 - 配置经插件 `schema.json` 落到 `plugins.<instanceKey>`
 
-入站：`gateway.receive({ adapter, target: "private:uid"|"group:gid", content, sender, metadata })`  
-出站：`send({ target, payload })` → HTTP `send_private_message` / `send_group_message`（payload 已由 gateway/core 渲染；无 segment-mapper）
+入站：`gateway.receive({ conversation: ConversationRef(kind: "private"|"group", id), message, content, sender, metadata })`  
+出站：`send({ conversation, payload })` → HTTP `send_private_message` / `send_group_message`（payload 已由 gateway/core 渲染；无 segment-mapper）
 
 ## 最小配置
 

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/index.d.ts

@@ -1,3 +1,3 @@
-export { buildSendAction, buildSseConnectOptions, buildWsConnectOptions, callApi, extractInboundAudioUrl, formatInboundContent, formatInboundMessageId, formatInboundTarget, formatOutboundMessageId, formatOutboundSegments, isMentioned, isMessageReceiveEvent, parseMessageReceiveData, parseMilkyMessageId, parseSendTarget, resolveMilkyConfig, senderNickname, type MilkyAdapterConfig, type MilkyApiClientOptions, type MilkyApiResponse, type MilkyConfigBase, type MilkyEndpointConfig, type MilkyEvent, type MilkyIncomingMessage, type MilkyIncomingSegment, type MilkyOutgoingSegment, type MilkySseConfig, type MilkyWebhookConfig, type MilkyWireSegment, type MilkyWsConfig, type MilkyWssConfig, type ParsedSendTarget, type ResolvedMilkyConfig, } from './protocol.js';
+export { buildSendAction, buildSseConnectOptions, buildWsConnectOptions, callApi, extractInboundAudioUrl, formatInboundContent, formatOutboundSegments, isMentioned, isMessageReceiveEvent, milkyInboundConversation, parseMessageReceiveData, resolveMilkyConfig, senderNickname, type MilkyAdapterConfig, type MilkyApiClientOptions, type MilkyApiResponse, type MilkyConfigBase, type MilkyEndpointConfig, type MilkyEvent, type MilkyIncomingMessage, type MilkyIncomingSegment, type MilkyOutgoingSegment, type MilkySseConfig, type MilkyWebhookConfig, type MilkyWireSegment, type MilkyWsConfig, type MilkyWssConfig, type ResolvedMilkyConfig, } from './protocol.js';
 export { MilkySseEndpoint, MilkyWebhookEndpoint, MilkyWssEndpoint, MilkyWsEndpoint, consumeSseBuffer, openSseStream, readRequestBody, verifyMilkyAccessToken, type CreateMilkySseStream, type MilkySseEndpointOptions, type MilkyWebhookEndpointOptions, type MilkyWssEndpointOptions, type MilkyWsCreateOptions, type MilkyWsEndpointOptions, type MilkyWsSocket, } from './endpoint.js';
 export { getMilkyAgentDeps, registerMilkyAgentEndpoint, setMilkyAgentDeps, type MilkyAgentDeps, type MilkyAgentEndpoint, } from './milky-agent-deps.js';

package/lib/index.js

@@ -1,3 +1,3 @@
-export { buildSendAction, buildSseConnectOptions, buildWsConnectOptions, callApi, extractInboundAudioUrl, formatInboundContent, formatInboundMessageId, formatInboundTarget, formatOutboundMessageId, formatOutboundSegments, isMentioned, isMessageReceiveEvent, parseMessageReceiveData, parseMilkyMessageId, parseSendTarget, resolveMilkyConfig, senderNickname, } from './protocol.js';
+export { buildSendAction, buildSseConnectOptions, buildWsConnectOptions, callApi, extractInboundAudioUrl, formatInboundContent, formatOutboundSegments, isMentioned, isMessageReceiveEvent, milkyInboundConversation, parseMessageReceiveData, resolveMilkyConfig, senderNickname, } from './protocol.js';
 export { MilkySseEndpoint, MilkyWebhookEndpoint, MilkyWssEndpoint, MilkyWsEndpoint, consumeSseBuffer, openSseStream, readRequestBody, verifyMilkyAccessToken, } from './endpoint.js';
 export { getMilkyAgentDeps, registerMilkyAgentEndpoint, setMilkyAgentDeps, } from './milky-agent-deps.js';

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

@@ -4,11 +4,12 @@
  * Spec: https://milky.ntqqrev.org/
  */
 import type { Segment } from '@zhin.js/core/runtime';
+import type { ConversationRef } from '@zhin.js/im-contract';
 /** Transitional legacy endpoint row (`endpoints[]` with `context: 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;
@@ -18,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;
@@ -29,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;
 }
@@ -103,10 +104,6 @@ export interface MilkyOutgoingSegment {
     type: string;
     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;
@@ -122,8 +119,11 @@ export declare function parseMessageReceiveData(event: MilkyEvent): MilkyIncomin
 export declare function isMessageReceiveEvent(event: MilkyEvent): event is MilkyEvent & {
     data: MilkyIncomingMessage;
 };
-/** Gateway reply target：`private:uid` / `group:gid` */
-export declare function formatInboundTarget(data: MilkyIncomingMessage): string;
+/**
+ * 入站归一化 → ConversationRef：`friend`（私聊）→ `private`；`group` → `group`；
+ * `temp`（群临时会话）→ 群容器内的 `private` 会话（parent = 来源群）。
+ */
+export declare function milkyInboundConversation(endpointKey: string, data: MilkyIncomingMessage): ConversationRef;
 export declare function formatInboundContent(data: MilkyIncomingMessage): string;
 /**
  * 入站消息段 → canonical Segment[]（与 formatInboundContent 纯文本视图同源双轨）。
@@ -139,7 +139,6 @@ export declare function senderNickname(data: MilkyIncomingMessage): string | und
 /** 消息段中含 @ 本机（mention 段 user_id 等于协议端上报的 self_id）。 */
 export declare function isMentioned(data: MilkyIncomingMessage, selfId: number | undefined): boolean;
 export declare function formatInboundMessageId(data: MilkyIncomingMessage): string;
-export declare function parseSendTarget(target: string): ParsedSendTarget;
 /**
  * Wire-encode an already-rendered outbound payload into Milky outgoing segments.
  * Segment canonicalization is intentionally not done here.
@@ -147,12 +146,15 @@ export declare function parseSendTarget(target: string): ParsedSendTarget;
  * file 段 Milky 消息 API 无对应 wire 段（文件走 upload_* API），warn + 丢弃。
  */
 export declare function formatOutboundSegments(payload: unknown): MilkyOutgoingSegment[];
-export declare function buildSendAction(target: string, message: MilkyOutgoingSegment[]): {
+export declare function buildSendAction(conversation: ConversationRef, message: MilkyOutgoingSegment[]): {
     action: string;
     params: Record<string, unknown>;
 };
-/** message_seq result → gateway message id */
-export declare function formatOutboundMessageId(target: string, messageSeq: number | undefined): string;
+/**
+ * message_seq result → gateway message id（`scene:peer:seq` 复合格式，
+ * 与 formatInboundMessageId 同源，仅供 recall 链在本端点边界内解析）。
+ */
+export declare function formatOutboundMessageId(conversation: ConversationRef, messageSeq: number | undefined): string;
 export declare function parseMilkyMessageId(msgId: string): {
     message_scene: 'friend' | 'group' | 'temp';
     peer_id: number;

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,
     };
@@ -125,10 +125,19 @@ export function parseMessageReceiveData(event) {
 export function isMessageReceiveEvent(event) {
     return parseMessageReceiveData(event) != null;
 }
-/** Gateway reply target：`private:uid` / `group:gid` */
-export function formatInboundTarget(data) {
-    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, data) {
+    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', id: String(data.group.group_id) } }
+            : {}),
+    };
 }
 export function formatInboundContent(data) {
     return data.segments.map((seg) => {
@@ -290,19 +299,6 @@ export function isMentioned(data, selfId) {
 export function formatInboundMessageId(data) {
     return `${data.message_scene}:${data.peer_id}:${data.message_seq}`;
 }
-export function parseSendTarget(target) {
-    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):// 直发；
@@ -432,13 +428,12 @@ export function formatOutboundSegments(payload) {
     }
     return out.length ? out : [{ type: 'text', data: { text: '' } }];
 }
-export function buildSendAction(target, message) {
-    const parsed = parseSendTarget(target);
-    if (parsed.message_type === 'group') {
+export function buildSendAction(conversation, message) {
+    if (conversation.kind === 'group') {
         return {
             action: 'send_group_message',
             params: {
-                group_id: parseInt(parsed.id, 10),
+                group_id: parseInt(conversation.id, 10),
                 message,
             },
         };
@@ -446,18 +441,20 @@ export function buildSendAction(target, message) {
     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 */
-export function formatOutboundMessageId(target, messageSeq) {
+/**
+ * message_seq result → gateway message id（`scene:peer:seq` 复合格式，
+ * 与 formatInboundMessageId 同源，仅供 recall 链在本端点边界内解析）。
+ */
+export function formatOutboundMessageId(conversation, messageSeq) {
     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(msgId) {
     const parts = msgId.split(':');

package/lib/sse-endpoint.d.ts

@@ -1,7 +1,7 @@
 /**
  * Milky SSE client endpoint — GET text/event-stream on /event.
  */
-import { type EndpointInstance, type EndpointManagement } from '@zhin.js/adapter';
+import { type EndpointInstance, type EndpointManagement, type EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { callApi, type MilkyEvent, type MilkySseConfig } from './protocol.js';
@@ -28,10 +28,7 @@ export declare class MilkySseEndpoint implements EndpointInstance {
     open(): void;
     close(): void;
     stop(): Promise<void>;
-    send({ target, payload }: {
-        readonly target: string;
-        readonly payload: unknown;
-    }): Promise<string>;
+    send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
     recallMessage(id: string): Promise<void>;
     kickMember(groupId: number, userId: number, rejectAddRequest?: boolean): Promise<boolean>;

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, formatInboundTarget, formatOutboundMessageId, formatOutboundSegments, isMentioned, parseMessageReceiveData, parseMilkyMessageId, senderNickname, } from './protocol.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));
         }
@@ -58,15 +59,15 @@ export class MilkySseEndpoint {
         this.#stream?.close();
         this.#stream = undefined;
     }
-    async send({ target, payload }) {
+    async send({ conversation, payload }) {
         const message = formatOutboundSegments(payload);
-        const { action, params } = buildSendAction(target, message);
+        const { action, params } = buildSendAction(conversation, message);
         const data = await this.callApi(action, params);
-        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',
         }));
@@ -159,33 +160,32 @@ export class MilkySseEndpoint {
         };
     }
     #admitMessage(data, event) {
-        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),
@@ -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.d.ts

@@ -1,4 +1,4 @@
-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 } from '@zhin.js/host-http';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
@@ -18,10 +18,7 @@ export declare class MilkyWebhookEndpoint implements EndpointInstance {
     open(): void;
     close(): void;
     stop(): Promise<void>;
-    send({ target, payload }: {
-        readonly target: string;
-        readonly payload: unknown;
-    }): Promise<string>;
+    send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     callApi(action: string, params?: Record<string, unknown>): Promise<unknown>;
     recallMessage(id: string): Promise<void>;
     kickMember(groupId: number, userId: number, rejectAddRequest?: boolean): Promise<boolean>;