@zhin.js/adapter-lark 6.0.2 → 6.0.5

package/CHANGELOG.md

@@ -1,5 +1,100 @@
 # @zhin.js/adapter-lark
 
+## 6.0.5
+
+### Patch Changes
+
+- 51015d6: refactor(adapters): migrate platform-permit to PermissionSubject
+
+  All adapter platform-permit checkers now accept PermissionSubject
+  (duck-typed from Message/CommandSession) instead of Message directly.
+  registerPlatformPermitChecker is replaced by host.registerPlatform in
+  the adapter plugin setup. activity-feedback service updated for new
+  PermissionHost integration.
+
+- 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/permission@1.0.1
+  - @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

@@ -24,8 +24,8 @@ pnpm add @zhin.js/adapter-lark
 - `@zhin.js/plugin-runtime` — `plugin.ts`（`definePlugin`）
 - 配置经插件 `schema.json` 落到 `plugins.<instanceKey>`
 
-入站：`gateway.receive({ adapter, target: chat_id, content: text, sender, metadata })`  
-出站：`send({ target, payload })` → `im/v1/messages`
+入站：`gateway.receive({ conversation, message: { conversation, id }, content: text, sender, metadata })`  
+出站：`send({ conversation, payload })` → `im/v1/messages`
 
 入站 `metadata.mentioned`：**未接线**。消息事件的 `mentions[]` 元素含 `id.open_id`，但本适配器拿不到 bot 自身的 open_id——配置（`appId` / `appSecret` / `name` 等）不含 bot open_id，代码也未调用 `bot/v3/info` 获取应用信息，故无可靠判据比对 mentions。
 

package/adapters/lark.js

@@ -21,8 +21,8 @@ export default defineAdapter({
     create(context) {
         const config = resolveLarkConfig(context.config);
         // 注册到插件运行时状态（lark.endpoint list 的"运行中"数据源）
-        context.use(larkRuntimeStateToken).endpoints.set(config.name, {
-            name: config.name,
+        context.use(larkRuntimeStateToken).endpoints.set(config.id, {
+            id: config.id,
             mode: 'webhook',
         });
         return new LarkEndpoint({

package/adapters/lark.ts

@@ -26,8 +26,8 @@ export default defineAdapter<LarkAdapterConfig>({
   create(context) {
     const config = resolveLarkConfig(context.config);
     // 注册到插件运行时状态（lark.endpoint list 的"运行中"数据源）
-    context.use(larkRuntimeStateToken).endpoints.set(config.name, {
-      name: config.name,
+    context.use(larkRuntimeStateToken).endpoints.set(config.id, {
+      id: config.id,
       mode: 'webhook',
     });
     return new LarkEndpoint({

package/lib/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';
@@ -40,10 +40,7 @@ export declare class LarkEndpoint 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>;
     recallMessage(messageId: string): Promise<void>;
     /** POST /im/v1/images（image_type=message），返回 image_key；失败返回 null。 */
     uploadImage(media: Parameters<typeof resolveMediaBinary>[0]): Promise<string | null>;

package/lib/endpoint.js

@@ -3,15 +3,15 @@
  */
 import { readFile } from 'node:fs/promises';
 import { basename } from 'node:path';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { registerLarkAgentEndpoint } from './lark-agent-deps.js';
 import { buildImageUploadForm, readOutboundImageMedia, resolveMediaBinary, } from './media-upload.js';
-import { formatInboundContent, formatOutboundBody, generateMessageId, resolveChatType, resolveSender, resolveTarget, } from './protocol.js';
+import { formatInboundContent, formatOutboundBody, generateMessageId, larkInboundConversation, resolveChatType, resolveSender, } from './protocol.js';
 import { registerLarkWebhookRoutes } from './webhook.js';
-const logger = getLogger('lark');
 /** 出站 HTTP 调用统一 30s 超时。 */
 const OUTBOUND_TIMEOUT_MS = 30_000;
 export class LarkEndpoint {
+    #logger;
     #options;
     #fetch;
     /**
@@ -45,6 +45,7 @@ export class LarkEndpoint {
     #started = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('lark', options.config.id);
         this.#options = options;
         this.#fetch = options.fetch ?? globalThis.fetch;
     }
@@ -62,25 +63,25 @@ export class LarkEndpoint {
         try {
             if (!this.#options.config.encryptKey && !this.#options.config.verificationToken) {
                 // encryptKey / verificationToken 都未配置时 webhook 完全无鉴权，任何人可伪造事件
-                logger.warn(formatCompact({
-                    endpoint: this.#options.config.name,
+                this.#logger.warn(formatCompact({
+                    endpoint: this.#options.config.id,
                     op: 'webhook',
                     ok: false,
                     error: 'neither encryptKey nor verificationToken configured; webhook is unauthenticated',
                 }));
             }
             await this.#refreshAccessToken();
-            this.#unregisterAgent = registerLarkAgentEndpoint(this.#options.config.name, this);
+            this.#unregisterAgent = registerLarkAgentEndpoint(this.#options.config.id, this);
             this.#routeReleases.push(...registerLarkWebhookRoutes(this.#options.http, this));
-            logger.debug(formatCompact({
-                endpoint: this.#options.config.name,
+            this.#logger.debug(formatCompact({
+                endpoint: this.#options.config.id,
                 op: 'webhook',
                 path: this.#options.config.webhookPath,
             }));
         }
         catch (error) {
             await this.stop();
-            logger.error('Failed to connect Lark endpoint:', error);
+            this.#logger.error('Failed to connect Lark endpoint:', error);
             throw error;
         }
     }
@@ -97,16 +98,16 @@ export class LarkEndpoint {
         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 }) {
+    async send({ conversation, payload }) {
         const materialized = await this.#materializeOutboundMedia(payload);
         const content = formatOutboundBody(materialized);
         const data = await this.#request('/im/v1/messages', {
             method: 'POST',
             params: { receive_id_type: 'chat_id' },
             body: {
-                receive_id: target,
+                receive_id: conversation.id,
                 msg_type: content.msg_type,
                 content: content.content,
             },
@@ -115,10 +116,7 @@ export class LarkEndpoint {
             throw new Error(`Failed to send message: ${data.msg}`);
         }
         const messageId = data.data?.message_id || `${Date.now()}`;
-        logger.debug(formatCompact({
-            op: 'send',
-            endpoint: this.#options.config.name,
-            to: target,
+        this.#logger.debug(formatCompact({ op: 'send', to: conversation.id,
             id: messageId,
         }));
         return messageId;
@@ -177,7 +175,7 @@ export class LarkEndpoint {
             throw new Error(`Image upload failed: ${data.msg}`);
         }
         catch (error) {
-            logger.error('Failed to upload image:', error);
+            this.#logger.error('Failed to upload image:', error);
             return null;
         }
     }
@@ -185,22 +183,21 @@ export class LarkEndpoint {
     admit(msg) {
         if (!this.#open)
             return;
-        const target = resolveTarget(msg);
+        const conversation = larkInboundConversation(String(this.#options.id), msg);
         void this.#options.gateway.receive({
-            adapter: this.#options.id,
-            target,
+            conversation,
+            message: { conversation, id: generateMessageId(msg) },
             content: formatInboundContent(msg),
-            sender: resolveSender(msg),
-            id: generateMessageId(msg),
+            sender: { id: resolveSender(msg) },
+            endpointId: this.#options.config.id,
             metadata: Object.freeze({
                 messageType: msg.message_type,
                 chatType: resolveChatType(msg.chat_id, msg.chat_type),
-                endpoint: this.#options.config.name,
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'lark_gateway_receive_failed',
-                target,
+                conversation: conversation.id,
                 error: err instanceof Error ? err.message : String(err),
             }));
         });
@@ -214,7 +211,7 @@ export class LarkEndpoint {
             return data.data?.user ?? null;
         }
         catch (error) {
-            logger.error('Failed to get user info:', error);
+            this.#logger.error('Failed to get user info:', error);
             return null;
         }
     }
@@ -224,7 +221,7 @@ export class LarkEndpoint {
             return data.data ?? null;
         }
         catch (error) {
-            logger.error('Failed to get chat info:', error);
+            this.#logger.error('Failed to get chat info:', error);
             return null;
         }
     }
@@ -248,7 +245,7 @@ export class LarkEndpoint {
             throw new Error(`Upload failed: ${data.msg}`);
         }
         catch (error) {
-            logger.error('Failed to upload file:', error);
+            this.#logger.error('Failed to upload file:', error);
             return null;
         }
     }
@@ -267,7 +264,7 @@ export class LarkEndpoint {
             throw new Error(`Failed to create chat: ${data.msg}`);
         }
         catch (error) {
-            logger.error('Failed to create chat:', error);
+            this.#logger.error('Failed to create chat:', error);
             return null;
         }
     }
@@ -282,7 +279,7 @@ export class LarkEndpoint {
             throw new Error(`Failed to update chat: ${data.msg}`);
         }
         catch (error) {
-            logger.error('Failed to update chat:', error);
+            this.#logger.error('Failed to update chat:', error);
             return false;
         }
     }
@@ -297,7 +294,7 @@ export class LarkEndpoint {
             throw new Error(`Failed to add members: ${data.msg}`);
         }
         catch (error) {
-            logger.error('Failed to add chat members:', error);
+            this.#logger.error('Failed to add chat members:', error);
             return false;
         }
     }
@@ -312,7 +309,7 @@ export class LarkEndpoint {
             throw new Error(`Failed to remove members: ${data.msg}`);
         }
         catch (error) {
-            logger.error('Failed to remove chat members:', error);
+            this.#logger.error('Failed to remove chat members:', error);
             return false;
         }
     }
@@ -324,7 +321,7 @@ export class LarkEndpoint {
             throw new Error(`Failed to get members: ${data.msg}`);
         }
         catch (error) {
-            logger.error('Failed to get chat members:', error);
+            this.#logger.error('Failed to get chat members:', error);
             return [];
         }
     }
@@ -336,7 +333,7 @@ export class LarkEndpoint {
             throw new Error(`Failed to dissolve chat: ${data.msg}`);
         }
         catch (error) {
-            logger.error('Failed to dissolve chat:', error);
+            this.#logger.error('Failed to dissolve chat:', error);
             return false;
         }
     }
@@ -351,7 +348,7 @@ export class LarkEndpoint {
             throw new Error(`Failed to set managers: ${data.msg}`);
         }
         catch (error) {
-            logger.error('Failed to set chat managers:', error);
+            this.#logger.error('Failed to set chat managers:', error);
             return false;
         }
     }
@@ -366,7 +363,7 @@ export class LarkEndpoint {
             throw new Error(`Failed to remove managers: ${data.msg}`);
         }
         catch (error) {
-            logger.error('Failed to remove chat managers:', error);
+            this.#logger.error('Failed to remove chat managers:', error);
             return false;
         }
     }
@@ -451,7 +448,7 @@ export class LarkEndpoint {
                 expires_in: data.expire ?? 7200,
                 timestamp: Date.now(),
             };
-            logger.debug('Access token refreshed successfully');
+            this.#logger.debug('Access token refreshed successfully');
             return;
         }
         throw new Error(`Failed to get access token: ${data.msg} (${data.code})`);

package/lib/index.d.ts

@@ -1,6 +1,6 @@
-export { formatInboundContent, formatOutboundBody, generateMessageId, headerValue, normalizeWebhookPath, readTextBody, resolveChatType, resolveLarkConfig, resolveSender, resolveTarget, verifySignature, type AccessToken, type LarkAdapterConfig, type LarkApiResponse, type LarkEventBody, type LarkMessage, type LarkSendBody, type LarkWireSegment, type ResolvedLarkConfig, } from './protocol.js';
+export { formatInboundContent, formatOutboundBody, generateMessageId, headerValue, larkInboundConversation, normalizeWebhookPath, readTextBody, resolveChatType, resolveLarkConfig, resolveSender, verifySignature, type AccessToken, type LarkAdapterConfig, type LarkApiResponse, type LarkEventBody, type LarkMessage, type LarkSendBody, type LarkWireSegment, type ResolvedLarkConfig, } from './protocol.js';
 export { getLarkAgentDeps, registerLarkAgentEndpoint, setLarkAgentDeps, type LarkAgentDeps, type LarkAgentEndpoint, } from './lark-agent-deps.js';
-export { checkLarkPlatformPermit, larkGroupPermitResolver, normalizeLarkSenderForPermit, platformPermit, registerLarkPlatformPermitChecker, } from './platform-permit.js';
+export { checkLarkPlatformPermit, larkGroupPermitResolver, normalizeLarkSenderForPermit, platformPermit, } from './platform-permit.js';
 export { LarkEndpoint, type LarkEndpointOptions, type LarkFetch, } from './endpoint.js';
 export { buildImageUploadForm, readOutboundImageMedia, resolveMediaBinary, type MediaBinary, } from './media-upload.js';
 export { registerLarkWebhookRoutes, handleLarkWebhookRequest, type LarkWebhookHandler, } from './webhook.js';

package/lib/index.js

@@ -1,6 +1,6 @@
-export { formatInboundContent, formatOutboundBody, generateMessageId, headerValue, normalizeWebhookPath, readTextBody, resolveChatType, resolveLarkConfig, resolveSender, resolveTarget, verifySignature, } from './protocol.js';
+export { formatInboundContent, formatOutboundBody, generateMessageId, headerValue, larkInboundConversation, normalizeWebhookPath, readTextBody, resolveChatType, resolveLarkConfig, resolveSender, verifySignature, } from './protocol.js';
 export { getLarkAgentDeps, registerLarkAgentEndpoint, setLarkAgentDeps, } from './lark-agent-deps.js';
-export { checkLarkPlatformPermit, larkGroupPermitResolver, normalizeLarkSenderForPermit, platformPermit, registerLarkPlatformPermitChecker, } from './platform-permit.js';
+export { checkLarkPlatformPermit, larkGroupPermitResolver, normalizeLarkSenderForPermit, platformPermit, } from './platform-permit.js';
 export { LarkEndpoint, } from './endpoint.js';
 export { buildImageUploadForm, readOutboundImageMedia, resolveMediaBinary, } from './media-upload.js';
 export { registerLarkWebhookRoutes, handleLarkWebhookRequest, } from './webhook.js';

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

@@ -19,9 +19,9 @@ export interface LarkAgentEndpoint {
     removeChatManagers(chatId: string, userIds: string[]): Promise<boolean>;
 }
 export interface LarkAgentDeps {
-    getEndpoint: (endpointId: string) => LarkAgentEndpoint;
+    getEndpoint: (endpointKey: string) => LarkAgentEndpoint;
 }
-export declare function registerLarkAgentEndpoint(endpointId: string, endpoint: LarkAgentEndpoint): () => void;
+export declare function registerLarkAgentEndpoint(endpointKey: string, endpoint: LarkAgentEndpoint): () => void;
 /** Optional override used by tests / transitional callers. Pass `null` to clear. */
 export declare function setLarkAgentDeps(deps: LarkAgentDeps | null): void;
 export declare function getLarkAgentDeps(): LarkAgentDeps;

package/lib/lark-agent-deps.js

@@ -4,11 +4,11 @@
  */
 const endpoints = new Map();
 let override = null;
-export function registerLarkAgentEndpoint(endpointId, endpoint) {
-    endpoints.set(endpointId, endpoint);
+export function registerLarkAgentEndpoint(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 getLarkAgentDeps() {
     if (override)
         return override;
     return {
-        getEndpoint(endpointId) {
-            const endpoint = endpoints.get(endpointId);
+        getEndpoint(endpointKey) {
+            const endpoint = endpoints.get(endpointKey);
             if (!endpoint)
-                throw new Error(`Endpoint ${endpointId} 不存在`);
+                throw new Error(`Endpoint ${endpointKey} 不存在`);
             return endpoint;
         },
     };

package/lib/platform-permit.d.ts

@@ -1,7 +1,7 @@
 /**
  * 飞书 Lark platform permit
  */
-import { type Message } from '@zhin.js/core';
+import type { PermissionSubject } from '@zhin.js/permission';
 export declare function platformPermit(perm: string): string;
 export declare function larkGroupPermitResolver(logicalPerm: string): string;
 export declare function normalizeLarkSenderForPermit(input: {
@@ -11,5 +11,4 @@ export declare function normalizeLarkSenderForPermit(input: {
     role?: string;
     permissions?: string[];
 };
-export declare function checkLarkPlatformPermit(perm: string, message: Message<any>): boolean;
-export declare function registerLarkPlatformPermitChecker(): () => void;
+export declare function checkLarkPlatformPermit(perm: string, subject: PermissionSubject): boolean;

package/lib/platform-permit.js

@@ -1,7 +1,3 @@
-/**
- * 飞书 Lark platform permit
- */
-import { registerPlatformPermitChecker } from '@zhin.js/core';
 const ADAPTER = 'lark';
 export function platformPermit(perm) {
     return `platform(${ADAPTER},${perm})`;
@@ -22,10 +18,9 @@ export function normalizeLarkSenderForPermit(input) {
     }
     return { role: 'member', permissions: [] };
 }
-export function checkLarkPlatformPermit(perm, message) {
-    const sender = message.$sender;
-    const permissions = sender.permissions ?? [];
-    const role = sender.role;
+export function checkLarkPlatformPermit(perm, subject) {
+    const role = subject.sender?.role?.[0];
+    const permissions = subject.sender?.permissions ?? [];
     const has = (t) => permissions.includes(t);
     switch (perm) {
         case 'chat_owner':
@@ -38,6 +33,3 @@ export function checkLarkPlatformPermit(perm, message) {
             return false;
     }
 }
-export function registerLarkPlatformPermitChecker() {
-    return registerPlatformPermitChecker(ADAPTER, checkLarkPlatformPermit);
-}

package/lib/protocol.d.ts

@@ -3,9 +3,10 @@
  * Canonicalization is owned by gateway/core before endpoint.send.
  */
 import type { IncomingMessage } from 'node:http';
+import type { ConversationRef } from '@zhin.js/im-contract';
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface LarkAdapterConfig {
-    readonly name?: string;
+    readonly id?: string;
     readonly appId?: string;
     readonly appSecret?: string;
     readonly encryptKey?: string;
@@ -20,7 +21,7 @@ export interface LarkAdapterConfig {
 }
 export interface ResolvedLarkConfig {
     readonly context: 'lark';
-    readonly name: string;
+    readonly id: string;
     readonly appId: string;
     readonly appSecret: string;
     readonly encryptKey?: string;
@@ -96,7 +97,12 @@ export interface LarkSendBody {
 export declare function resolveLarkConfig(config?: LarkAdapterConfig): ResolvedLarkConfig;
 export declare function normalizeWebhookPath(path: string): string;
 export declare function resolveChatType(chatId?: string, chatType?: string): 'group' | 'private';
-export declare function resolveTarget(msg: LarkMessage): string;
+/**
+ * 入站归一化 → ConversationRef：`chat_type` 为 'group' 的会话映射为 group，
+ * p2p 单聊映射为 private；id 一律为平台 chat_id。Lark 无 guild/频道容器，
+ * 不产生 `parent`。
+ */
+export declare function larkInboundConversation(endpointKey: string, msg: LarkMessage): ConversationRef;
 export declare function resolveSender(msg: LarkMessage): string;
 export declare function generateMessageId(msg: LarkMessage): string;
 /** Build inbound text for MessageGateway.receive. */

package/lib/protocol.js

@@ -14,8 +14,8 @@ export function resolveLarkConfig(config = {}) {
         throw new TypeError('Lark adapter requires appId + appSecret (plugins.<key> or endpoints with context: lark)');
     }
     const isFeishu = config.isFeishu ?? entry?.isFeishu ?? true;
-    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.LARK_BOT_NAME
         || 'lark-bot';
     const webhookPath = normalizeWebhookPath(config.webhookPath ?? entry?.webhookPath ?? '/lark/webhook');
@@ -27,7 +27,7 @@ export function resolveLarkConfig(config = {}) {
     const verificationToken = config.verificationToken ?? entry?.verificationToken;
     return {
         context: 'lark',
-        name,
+        id,
         appId,
         appSecret,
         ...(encryptKey ? { encryptKey } : {}),
@@ -49,8 +49,17 @@ export function resolveChatType(chatId, chatType) {
         return 'private';
     return chatId?.startsWith('oc_') ? 'group' : 'private';
 }
-export function resolveTarget(msg) {
-    return msg.chat_id || 'unknown';
+/**
+ * 入站归一化 → ConversationRef：`chat_type` 为 'group' 的会话映射为 group，
+ * p2p 单聊映射为 private；id 一律为平台 chat_id。Lark 无 guild/频道容器，
+ * 不产生 `parent`。
+ */
+export function larkInboundConversation(endpointKey, msg) {
+    return {
+        endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
+        kind: resolveChatType(msg.chat_id, msg.chat_type),
+        id: msg.chat_id || 'unknown',
+    };
 }
 export function resolveSender(msg) {
     return msg.sender?.sender_id?.open_id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-lark",
-  "version": "6.0.2",
+  "version": "6.0.5",
   "description": "Zhin.js Lark/Feishu (飞书) adapter for Plugin Runtime (HTTP webhook)",
   "type": "module",
   "main": "./lib/index.js",
@@ -34,21 +34,23 @@
     "directory": "plugins/adapters/lark"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/command": "1.0.6",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/host-http": "1.0.5",
-    "@zhin.js/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.1.2"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/command": "1.0.9",
+    "@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/plugin-runtime": "1.1.5"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/agent": "1.1.2",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/host-http": "1.0.5",
-    "@zhin.js/plugin-runtime": "1.1.2",
-    "zhin.js": "6.0.1"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/agent": "1.1.5",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/host-http": "1.0.8",
+    "@zhin.js/permission": "1.0.1",
+    "@zhin.js/plugin-runtime": "1.1.5",
+    "zhin.js": "6.0.4"
   },
   "peerDependenciesMeta": {
     "zhin.js": {
@@ -66,8 +68,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.2",
-    "zhin.js": "6.0.1"
+    "@zhin.js/agent": "1.1.5",
+    "zhin.js": "6.0.4"
   },
   "files": [
     "adapters",

package/plugin.js

@@ -1,7 +1,8 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
 import { createEndpointRuntimeState } from '@zhin.js/adapter';
 import { definePlugin } from '@zhin.js/plugin-runtime';
-import { registerLarkPlatformPermitChecker } from "./lib/platform-permit.js";
+import { permissionHostToken } from '@zhin.js/permission';
+import { checkLarkPlatformPermit } from "./lib/platform-permit.js";
 import { larkRuntimeStateToken } from "./lib/lark-runtime-state.js";
 export default definePlugin({
     name: 'lark',
@@ -9,8 +10,10 @@ export default definePlugin({
         displayName: 'Lark/Feishu (飞书) Adapter',
     },
     setup(context) {
-        // 运行中 endpoint 注册表（lark.endpoint list 的"运行中"数据源）
         context.resources.provide(larkRuntimeStateToken, createEndpointRuntimeState());
-        return registerLarkPlatformPermitChecker();
+        if (context.resources.has(permissionHostToken)) {
+            const host = context.resources.use(permissionHostToken);
+            return host.registerPlatform('lark', checkLarkPlatformPermit);
+        }
     },
 });

package/schema.json

@@ -14,16 +14,48 @@
       "type": "boolean",
       "default": true
     },
+    "master": {
+      "type": [
+        "string",
+        "number"
+      ],
+      "description": "框架 master（Lark/Feishu open_id or user_id；AI/工具权限、endpoint 管理）。endpoints[i].master 可逐项覆盖"
+    },
+    "trusted": {
+      "type": "array",
+      "items": {
+        "type": [
+          "string",
+          "number"
+        ],
+        "description": "Trusted Lark/Feishu open_id or user_id"
+      },
+      "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": "Lark bot name"
+          "master": {
+            "type": [
+              "string",
+              "number"
+            ],
+            "description": "本 endpoint 的框架 master（Lark/Feishu open_id or user_id）；覆盖顶层 master"
+          },
+          "trusted": {
+            "type": "array",
+            "items": {
+              "type": [
+                "string",
+                "number"
+              ],
+              "description": "Trusted Lark/Feishu open_id or user_id"
+            },
+            "description": "本 endpoint 的 trusted 列表"
           },
           "appId": {
             "type": "string",
@@ -40,10 +72,14 @@
           "verificationToken": {
             "type": "string",
             "description": "Lark verification token"
+          },
+          "id": {
+            "type": "string",
+            "description": "Lark bot name"
           }
         },
         "required": [
-          "name",
+          "id",
           "appId",
           "appSecret"
         ]

package/src/endpoint.ts

@@ -3,10 +3,10 @@
  */
 import { readFile } from 'node:fs/promises';
 import { basename } from 'node:path';
-import type { EndpointGroup, EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
+import type { EndpointGroup, 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 { registerLarkAgentEndpoint } from './lark-agent-deps.js';
 import {
@@ -18,9 +18,9 @@ import {
   formatInboundContent,
   formatOutboundBody,
   generateMessageId,
+  larkInboundConversation,
   resolveChatType,
   resolveSender,
-  resolveTarget,
   type AccessToken,
   type LarkApiResponse,
   type LarkMessage,
@@ -28,8 +28,6 @@ import {
 } from './protocol.js';
 import { registerLarkWebhookRoutes } from './webhook.js';
 
-const logger = getLogger('lark');
-
 /** 出站 HTTP 调用统一 30s 超时。 */
 const OUTBOUND_TIMEOUT_MS = 30_000;
 
@@ -57,6 +55,8 @@ export interface LarkEndpointOptions {
 }
 
 export class LarkEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: LarkEndpointOptions;
   readonly #fetch: LarkFetch;
   /**
@@ -93,6 +93,7 @@ export class LarkEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: LarkEndpointOptions) {
+    this.#logger = getAdapterLogger('lark', options.config.id);
     this.#options = options;
     this.#fetch = options.fetch ?? globalThis.fetch;
   }
@@ -112,24 +113,24 @@ export class LarkEndpoint implements EndpointInstance {
     try {
       if (!this.#options.config.encryptKey && !this.#options.config.verificationToken) {
         // encryptKey / verificationToken 都未配置时 webhook 完全无鉴权，任何人可伪造事件
-        logger.warn(formatCompact({
-          endpoint: this.#options.config.name,
+        this.#logger.warn(formatCompact({
+          endpoint: this.#options.config.id,
           op: 'webhook',
           ok: false,
           error: 'neither encryptKey nor verificationToken configured; webhook is unauthenticated',
         }));
       }
       await this.#refreshAccessToken();
-      this.#unregisterAgent = registerLarkAgentEndpoint(this.#options.config.name, this);
+      this.#unregisterAgent = registerLarkAgentEndpoint(this.#options.config.id, this);
       this.#routeReleases.push(...registerLarkWebhookRoutes(this.#options.http, this));
-      logger.debug(formatCompact({
-        endpoint: this.#options.config.name,
+      this.#logger.debug(formatCompact({
+        endpoint: this.#options.config.id,
         op: 'webhook',
         path: this.#options.config.webhookPath,
       }));
     } catch (error) {
       await this.stop();
-      logger.error('Failed to connect Lark endpoint:', error);
+      this.#logger.error('Failed to connect Lark endpoint:', error);
       throw error;
     }
   }
@@ -148,17 +149,17 @@ export class LarkEndpoint 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 materialized = await this.#materializeOutboundMedia(payload);
     const content = formatOutboundBody(materialized);
     const data = await this.#request('/im/v1/messages', {
       method: 'POST',
       params: { receive_id_type: 'chat_id' },
       body: {
-        receive_id: target,
+        receive_id: conversation.id,
         msg_type: content.msg_type,
         content: content.content,
       },
@@ -167,10 +168,7 @@ export class LarkEndpoint implements EndpointInstance {
       throw new Error(`Failed to send message: ${data.msg}`);
     }
     const messageId = (data.data?.message_id as string) || `${Date.now()}`;
-    logger.debug(formatCompact({
-      op: 'send',
-      endpoint: this.#options.config.name,
-      to: target,
+    this.#logger.debug(formatCompact({ op: 'send', to: conversation.id,
       id: messageId,
     }));
     return messageId;
@@ -226,7 +224,7 @@ export class LarkEndpoint implements EndpointInstance {
       }
       throw new Error(`Image upload failed: ${data.msg}`);
     } catch (error) {
-      logger.error('Failed to upload image:', error);
+      this.#logger.error('Failed to upload image:', error);
       return null;
     }
   }
@@ -234,22 +232,21 @@ export class LarkEndpoint implements EndpointInstance {
   /** Test / internal: admit a parsed message when open (non-webhook path). */
   admit(msg: LarkMessage): void {
     if (!this.#open) return;
-    const target = resolveTarget(msg);
+    const conversation = larkInboundConversation(String(this.#options.id), msg);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: generateMessageId(msg) },
       content: formatInboundContent(msg),
-      sender: resolveSender(msg),
-      id: generateMessageId(msg),
+      sender: { id: resolveSender(msg) },
+      endpointId: this.#options.config.id,
       metadata: Object.freeze({
         messageType: msg.message_type,
         chatType: resolveChatType(msg.chat_id, msg.chat_type),
-        endpoint: this.#options.config.name,
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'lark_gateway_receive_failed',
-        target,
+        conversation: conversation.id,
         error: err instanceof Error ? err.message : String(err),
       }));
     });
@@ -266,7 +263,7 @@ export class LarkEndpoint implements EndpointInstance {
       });
       return data.data?.user ?? null;
     } catch (error) {
-      logger.error('Failed to get user info:', error);
+      this.#logger.error('Failed to get user info:', error);
       return null;
     }
   }
@@ -276,7 +273,7 @@ export class LarkEndpoint implements EndpointInstance {
       const data = await this.#request(`/im/v1/chats/${chatId}`, { method: 'GET' });
       return data.data ?? null;
     } catch (error) {
-      logger.error('Failed to get chat info:', error);
+      this.#logger.error('Failed to get chat info:', error);
       return null;
     }
   }
@@ -303,7 +300,7 @@ export class LarkEndpoint implements EndpointInstance {
       }
       throw new Error(`Upload failed: ${data.msg}`);
     } catch (error) {
-      logger.error('Failed to upload file:', error);
+      this.#logger.error('Failed to upload file:', error);
       return null;
     }
   }
@@ -325,7 +322,7 @@ export class LarkEndpoint implements EndpointInstance {
       if (data.code === 0) return (data.data?.chat_id as string) || null;
       throw new Error(`Failed to create chat: ${data.msg}`);
     } catch (error) {
-      logger.error('Failed to create chat:', error);
+      this.#logger.error('Failed to create chat:', error);
       return null;
     }
   }
@@ -342,7 +339,7 @@ export class LarkEndpoint implements EndpointInstance {
       if (data.code === 0) return true;
       throw new Error(`Failed to update chat: ${data.msg}`);
     } catch (error) {
-      logger.error('Failed to update chat:', error);
+      this.#logger.error('Failed to update chat:', error);
       return false;
     }
   }
@@ -356,7 +353,7 @@ export class LarkEndpoint implements EndpointInstance {
       if (data.code === 0) return true;
       throw new Error(`Failed to add members: ${data.msg}`);
     } catch (error) {
-      logger.error('Failed to add chat members:', error);
+      this.#logger.error('Failed to add chat members:', error);
       return false;
     }
   }
@@ -370,7 +367,7 @@ export class LarkEndpoint implements EndpointInstance {
       if (data.code === 0) return true;
       throw new Error(`Failed to remove members: ${data.msg}`);
     } catch (error) {
-      logger.error('Failed to remove chat members:', error);
+      this.#logger.error('Failed to remove chat members:', error);
       return false;
     }
   }
@@ -381,7 +378,7 @@ export class LarkEndpoint implements EndpointInstance {
       if (data.code === 0) return (data.data?.items as unknown[]) || [];
       throw new Error(`Failed to get members: ${data.msg}`);
     } catch (error) {
-      logger.error('Failed to get chat members:', error);
+      this.#logger.error('Failed to get chat members:', error);
       return [];
     }
   }
@@ -392,7 +389,7 @@ export class LarkEndpoint implements EndpointInstance {
       if (data.code === 0) return true;
       throw new Error(`Failed to dissolve chat: ${data.msg}`);
     } catch (error) {
-      logger.error('Failed to dissolve chat:', error);
+      this.#logger.error('Failed to dissolve chat:', error);
       return false;
     }
   }
@@ -406,7 +403,7 @@ export class LarkEndpoint implements EndpointInstance {
       if (data.code === 0) return true;
       throw new Error(`Failed to set managers: ${data.msg}`);
     } catch (error) {
-      logger.error('Failed to set chat managers:', error);
+      this.#logger.error('Failed to set chat managers:', error);
       return false;
     }
   }
@@ -420,7 +417,7 @@ export class LarkEndpoint implements EndpointInstance {
       if (data.code === 0) return true;
       throw new Error(`Failed to remove managers: ${data.msg}`);
     } catch (error) {
-      logger.error('Failed to remove chat managers:', error);
+      this.#logger.error('Failed to remove chat managers:', error);
       return false;
     }
   }
@@ -525,7 +522,7 @@ export class LarkEndpoint implements EndpointInstance {
         expires_in: data.expire ?? 7200,
         timestamp: Date.now(),
       };
-      logger.debug('Access token refreshed successfully');
+      this.#logger.debug('Access token refreshed successfully');
       return;
     }
     throw new Error(`Failed to get access token: ${data.msg} (${data.code})`);

package/src/index.ts

@@ -3,12 +3,12 @@ export {
   formatOutboundBody,
   generateMessageId,
   headerValue,
+  larkInboundConversation,
   normalizeWebhookPath,
   readTextBody,
   resolveChatType,
   resolveLarkConfig,
   resolveSender,
-  resolveTarget,
   verifySignature,
   type AccessToken,
   type LarkAdapterConfig,
@@ -33,7 +33,6 @@ export {
   larkGroupPermitResolver,
   normalizeLarkSenderForPermit,
   platformPermit,
-  registerLarkPlatformPermitChecker,
 } from './platform-permit.js';
 
 export {

package/src/lark-agent-deps.ts

@@ -27,20 +27,20 @@ export interface LarkAgentEndpoint {
 }
 
 export interface LarkAgentDeps {
-  getEndpoint: (endpointId: string) => LarkAgentEndpoint;
+  getEndpoint: (endpointKey: string) => LarkAgentEndpoint;
 }
 
 const endpoints = new Map<string, LarkAgentEndpoint>();
 let override: LarkAgentDeps | null = null;
 
 export function registerLarkAgentEndpoint(
-  endpointId: string,
+  endpointKey: string,
   endpoint: LarkAgentEndpoint,
 ): () => void {
-  endpoints.set(endpointId, endpoint);
+  endpoints.set(endpointKey, endpoint);
   return () => {
-    if (endpoints.get(endpointId) === endpoint) {
-      endpoints.delete(endpointId);
+    if (endpoints.get(endpointKey) === endpoint) {
+      endpoints.delete(endpointKey);
     }
   };
 }
@@ -53,9 +53,9 @@ export function setLarkAgentDeps(deps: LarkAgentDeps | null): void {
 export function getLarkAgentDeps(): LarkAgentDeps {
   if (override) return override;
   return {
-    getEndpoint(endpointId) {
-      const endpoint = endpoints.get(endpointId);
-      if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
+    getEndpoint(endpointKey) {
+      const endpoint = endpoints.get(endpointKey);
+      if (!endpoint) throw new Error(`Endpoint ${endpointKey} 不存在`);
       return endpoint;
     },
   };

package/src/platform-permit.ts

@@ -1,7 +1,7 @@
 /**
  * 飞书 Lark platform permit
  */
-import { registerPlatformPermitChecker, type Message } from '@zhin.js/core';
+import type { PermissionSubject } from '@zhin.js/permission';
 
 const ADAPTER = 'lark';
 
@@ -31,10 +31,9 @@ export function normalizeLarkSenderForPermit(input: {
   return { role: 'member', permissions: [] };
 }
 
-export function checkLarkPlatformPermit(perm: string, message: Message<any>): boolean {
-  const sender = message.$sender as { role?: string; permissions?: string[] };
-  const permissions = sender.permissions ?? [];
-  const role = sender.role;
+export function checkLarkPlatformPermit(perm: string, subject: PermissionSubject): boolean {
+  const role = subject.sender?.role?.[0];
+  const permissions = subject.sender?.permissions ?? [];
   const has = (t: string) => permissions.includes(t);
 
   switch (perm) {
@@ -49,6 +48,3 @@ export function checkLarkPlatformPermit(perm: string, message: Message<any>): bo
   }
 }
 
-export function registerLarkPlatformPermitChecker(): () => void {
-  return registerPlatformPermitChecker(ADAPTER, checkLarkPlatformPermit);
-}

package/src/protocol.ts

@@ -6,13 +6,14 @@
 import { createHash, timingSafeEqual } from 'node:crypto';
 import type { IncomingMessage } from 'node:http';
 import { isMediaRef } from '@zhin.js/core';
+import type { ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
 const logger = getLogger('lark');
 
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface LarkAdapterConfig {
-  readonly name?: string;
+  readonly id?: string;
   readonly appId?: string;
   readonly appSecret?: string;
   readonly encryptKey?: string;
@@ -28,7 +29,7 @@ export interface LarkAdapterConfig {
 
 export interface ResolvedLarkConfig {
   readonly context: 'lark';
-  readonly name: string;
+  readonly id: string;
   readonly appId: string;
   readonly appSecret: string;
   readonly encryptKey?: string;
@@ -118,8 +119,8 @@ export function resolveLarkConfig(config: LarkAdapterConfig = {}): ResolvedLarkC
     );
   }
   const isFeishu = config.isFeishu ?? entry?.isFeishu ?? true;
-  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.LARK_BOT_NAME
     || 'lark-bot';
   const webhookPath = normalizeWebhookPath(
@@ -135,7 +136,7 @@ export function resolveLarkConfig(config: LarkAdapterConfig = {}): ResolvedLarkC
   const verificationToken = config.verificationToken ?? entry?.verificationToken;
   return {
     context: 'lark',
-    name,
+    id,
     appId,
     appSecret,
     ...(encryptKey ? { encryptKey } : {}),
@@ -158,8 +159,17 @@ export function resolveChatType(chatId?: string, chatType?: string): 'group' | '
   return chatId?.startsWith('oc_') ? 'group' : 'private';
 }
 
-export function resolveTarget(msg: LarkMessage): string {
-  return msg.chat_id || 'unknown';
+/**
+ * 入站归一化 → ConversationRef：`chat_type` 为 'group' 的会话映射为 group，
+ * p2p 单聊映射为 private；id 一律为平台 chat_id。Lark 无 guild/频道容器，
+ * 不产生 `parent`。
+ */
+export function larkInboundConversation(endpointKey: string, msg: LarkMessage): ConversationRef {
+  return {
+    endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
+    kind: resolveChatType(msg.chat_id, msg.chat_type),
+    id: msg.chat_id || 'unknown',
+  };
 }
 
 export function resolveSender(msg: LarkMessage): string {