@zhin.js/adapter-wecom 4.0.3 → 4.0.5

package/CHANGELOG.md

@@ -1,5 +1,84 @@
 # @zhin.js/adapter-wecom
 
+## 4.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
+
+## 4.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
+
 ## 4.0.3
 
 ### Patch Changes

package/adapters/wecom.js

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

package/adapters/wecom.ts

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

package/lib/endpoint.js

@@ -1,15 +1,15 @@
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { registerWecomAgentEndpoint } from './wecom-agent-deps.js';
 import { buildMediaUploadForm, readOutboundImageMedia, resolveMediaBinary, } from './media-upload.js';
 import { buildSendRequestBody, formatInboundContent, formatOutboundBody, resolveChatType, wecomInboundConversation, } from './protocol.js';
 import { registerWecomWebhookRoutes } from './webhook.js';
-const logger = getLogger('wecom');
 /**
  * 企业微信服务端 API 无 bot 群列表/群成员列表接口（客户群接口属「客户联系」
  * 独立授权域，非 bot 社交面），好友/频道概念亦不存在；
  * 因此本 endpoint 不暴露 EndpointManagement（Console 社交面 RPC 对该平台保持未接线）。
  */
 export class WecomEndpoint {
+    #logger;
     #options;
     #fetch;
     #routeReleases = [];
@@ -19,6 +19,7 @@ export class WecomEndpoint {
     #started = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('wecom', options.config.id);
         this.#options = options;
         this.#fetch = options.fetch ?? globalThis.fetch;
     }
@@ -35,17 +36,17 @@ export class WecomEndpoint {
         this.#started = true;
         try {
             await this.#refreshAccessToken();
-            this.#unregisterAgent = registerWecomAgentEndpoint(this.#options.config.name, this);
+            this.#unregisterAgent = registerWecomAgentEndpoint(this.#options.config.id, this);
             this.#routeReleases.push(...registerWecomWebhookRoutes(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 WeCom endpoint:', error);
+            this.#logger.error('Failed to connect WeCom endpoint:', error);
             throw error;
         }
     }
@@ -62,7 +63,7 @@ export class WecomEndpoint {
         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 materialized = await this.#materializeOutboundMedia(payload);
@@ -77,10 +78,7 @@ export class WecomEndpoint {
         if (data.errcode !== 0) {
             throw new Error(`Failed to send message: ${data.errmsg} (${data.errcode})`);
         }
-        logger.debug(formatCompact({
-            op: 'send',
-            endpoint: this.#options.config.name,
-            to: `${conversation.kind}:${conversation.id}`,
+        this.#logger.debug(formatCompact({ op: 'send', to: `${conversation.kind}:${conversation.id}`,
         }));
         return data.msgid || `${Date.now()}`;
     }
@@ -110,9 +108,9 @@ export class WecomEndpoint {
             const data = seg.data ?? {};
             const media = readOutboundImageMedia(data);
             if (!media) {
-                logger.warn(formatCompact({
+                this.#logger.warn(formatCompact({
                     op: 'wecom_outbound_media_dropped',
-                    endpoint: this.#options.config.name,
+                    endpoint: this.#options.config.id,
                     type: 'image',
                     reason: 'missing_media_ref',
                 }));
@@ -126,9 +124,9 @@ export class WecomEndpoint {
                 return { type: 'image', data: { media_id: mediaId } };
             }
             catch (error) {
-                logger.warn(formatCompact({
+                this.#logger.warn(formatCompact({
                     op: 'wecom_media_upload_failed',
-                    endpoint: this.#options.config.name,
+                    endpoint: this.#options.config.id,
                     error: error instanceof Error ? error.message : String(error),
                 }));
                 const alt = typeof data.alt === 'string' && data.alt ? data.alt : '[image]';
@@ -159,17 +157,17 @@ export class WecomEndpoint {
             conversation,
             message: { conversation, id: msg.MsgId || `${msg.CreateTime}` },
             content: formatInboundContent(msg),
-            sender: msg.FromUserName,
+            sender: { id: msg.FromUserName },
+            endpointId: this.#options.config.id,
             metadata: Object.freeze({
                 msgType: msg.MsgType,
                 event: msg.Event,
                 chatType,
-                endpoint: this.#options.config.name,
                 toUserName: msg.ToUserName,
                 agentId: msg.AgentID,
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'wecom_gateway_receive_failed',
                 target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
@@ -186,7 +184,7 @@ export class WecomEndpoint {
             throw new Error(`Failed to get user info: ${data.errmsg}`);
         }
         catch (error) {
-            logger.error('Failed to get user info:', error);
+            this.#logger.error('Failed to get user info:', error);
             return null;
         }
     }
@@ -200,7 +198,7 @@ export class WecomEndpoint {
             throw new Error(`Failed to get department users: ${data.errmsg}`);
         }
         catch (error) {
-            logger.error('Failed to get department users:', error);
+            this.#logger.error('Failed to get department users:', error);
             return [];
         }
     }
@@ -214,16 +212,16 @@ export class WecomEndpoint {
             throw new Error(`Failed to get department list: ${data.errmsg}`);
         }
         catch (error) {
-            logger.error('Failed to get department list:', error);
+            this.#logger.error('Failed to get department list:', error);
             return [];
         }
     }
     async sendTextMessage(userId, content) {
         try {
-            const endpointId = String(this.#options.id);
+            const endpointKey = String(this.#options.id);
             await this.send({
                 conversation: {
-                    endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+                    endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
                     kind: resolveChatType(userId),
                     id: userId,
                 },
@@ -232,7 +230,7 @@ export class WecomEndpoint {
             return true;
         }
         catch (error) {
-            logger.error('Failed to send text message:', error);
+            this.#logger.error('Failed to send text message:', error);
             return false;
         }
     }
@@ -281,7 +279,7 @@ export class WecomEndpoint {
                 expires_in: data.expires_in ?? 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.errmsg} (${data.errcode})`);

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 export { buildSendRequestBody, decryptMessage, extractEncryptFromXml, formatInboundContent, formatOutboundBody, getAesKey, normalizeEchostrParam, normalizeWebhookPath, parseXmlMessage, queryParam, readTextBody, resolveChatType, resolveWecomConfig, verifySignature, type AccessToken, type ResolvedWecomConfig, type WecomAdapterConfig, type WecomApiResponse, type WecomMessage, type WecomSendBody, type WecomWireSegment, } from './protocol.js';
 export { getWecomAgentDeps, registerWecomAgentEndpoint, setWecomAgentDeps, type WecomAgentDeps, type WecomAgentEndpoint, } from './wecom-agent-deps.js';
-export { checkWecomPlatformPermit, normalizeWecomSenderForPermit, platformPermit, registerWecomPlatformPermitChecker, wecomGroupPermitResolver, } from './platform-permit.js';
+export { checkWecomPlatformPermit, normalizeWecomSenderForPermit, platformPermit, wecomGroupPermitResolver, } from './platform-permit.js';
 export { WecomEndpoint, type WecomEndpointOptions, type WecomFetch, } from './endpoint.js';
 export { buildMediaUploadForm, readOutboundImageMedia, resolveMediaBinary, type MediaBinary, type WecomMediaUploadResult, } from './media-upload.js';
 export { registerWecomWebhookRoutes, handleWecomVerificationRequest, handleWecomWebhookRequest, type WecomWebhookHandler, } from './webhook.js';

package/lib/index.js

@@ -1,6 +1,6 @@
 export { buildSendRequestBody, decryptMessage, extractEncryptFromXml, formatInboundContent, formatOutboundBody, getAesKey, normalizeEchostrParam, normalizeWebhookPath, parseXmlMessage, queryParam, readTextBody, resolveChatType, resolveWecomConfig, verifySignature, } from './protocol.js';
 export { getWecomAgentDeps, registerWecomAgentEndpoint, setWecomAgentDeps, } from './wecom-agent-deps.js';
-export { checkWecomPlatformPermit, normalizeWecomSenderForPermit, platformPermit, registerWecomPlatformPermitChecker, wecomGroupPermitResolver, } from './platform-permit.js';
+export { checkWecomPlatformPermit, normalizeWecomSenderForPermit, platformPermit, wecomGroupPermitResolver, } from './platform-permit.js';
 export { WecomEndpoint, } from './endpoint.js';
 export { buildMediaUploadForm, readOutboundImageMedia, resolveMediaBinary, } from './media-upload.js';
 export { registerWecomWebhookRoutes, handleWecomVerificationRequest, handleWecomWebhookRequest, } from './webhook.js';

package/lib/platform-permit.d.ts

@@ -1,7 +1,7 @@
 /**
  * 企业微信 WeCom 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 wecomGroupPermitResolver(logicalPerm: string): string;
 export declare function normalizeWecomSenderForPermit(input: {
@@ -11,5 +11,4 @@ export declare function normalizeWecomSenderForPermit(input: {
     role?: string;
     permissions?: string[];
 };
-export declare function checkWecomPlatformPermit(perm: string, message: Message<any>): boolean;
-export declare function registerWecomPlatformPermitChecker(): () => void;
+export declare function checkWecomPlatformPermit(perm: string, subject: PermissionSubject): boolean;

package/lib/platform-permit.js

@@ -1,7 +1,3 @@
-/**
- * 企业微信 WeCom platform permit
- */
-import { registerPlatformPermitChecker } from '@zhin.js/core';
 const ADAPTER = 'wecom';
 export function platformPermit(perm) {
     return `platform(${ADAPTER},${perm})`;
@@ -22,10 +18,9 @@ export function normalizeWecomSenderForPermit(input) {
     }
     return { role: 'member', permissions: [] };
 }
-export function checkWecomPlatformPermit(perm, message) {
-    const sender = message.$sender;
-    const permissions = sender.permissions ?? [];
-    const role = sender.role;
+export function checkWecomPlatformPermit(perm, subject) {
+    const role = subject.sender?.role?.[0];
+    const permissions = subject.sender?.permissions ?? [];
     const has = (t) => permissions.includes(t);
     switch (perm) {
         case 'chat_owner':
@@ -36,6 +31,3 @@ export function checkWecomPlatformPermit(perm, message) {
             return false;
     }
 }
-export function registerWecomPlatformPermitChecker() {
-    return registerPlatformPermitChecker(ADAPTER, checkWecomPlatformPermit);
-}

package/lib/protocol.d.ts

@@ -6,7 +6,7 @@ import type { IncomingMessage } from 'node:http';
 import type { ConversationRef } from '@zhin.js/im-contract';
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface WecomAdapterConfig {
-    readonly name?: string;
+    readonly id?: string;
     readonly corpId?: string;
     readonly agentSecret?: string;
     readonly token?: string;
@@ -20,7 +20,7 @@ export interface WecomAdapterConfig {
 }
 export interface ResolvedWecomConfig {
     readonly context: 'wecom';
-    readonly name: string;
+    readonly id: string;
     readonly corpId: string;
     readonly agentSecret: string;
     readonly token: string;
@@ -91,7 +91,7 @@ export declare function resolveChatType(fromUserName: string): 'group' | 'privat
  * 入站归一化 → ConversationRef：WeCom 无 guild/channel 容器概念，
  * `@chatroom` 群会话 → kind 'group'，其余（应用消息/单聊）→ kind 'private'。
  */
-export declare function wecomInboundConversation(endpointId: string, msg: WecomMessage): ConversationRef;
+export declare function wecomInboundConversation(endpointKey: string, msg: WecomMessage): ConversationRef;
 /**
  * Wire-encode an already-rendered outbound payload into WeCom message/send body parts.
  */

package/lib/protocol.js

@@ -14,13 +14,13 @@ export function resolveWecomConfig(config = {}) {
     if (!corpId || !agentSecret || !token || !encodingAESKey) {
         throw new TypeError('WeCom adapter requires corpId + agentSecret + token + encodingAESKey (plugins.<key> or endpoints with context: wecom)');
     }
-    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.WECOM_BOT_NAME
         || 'wecom-bot';
     return {
         context: 'wecom',
-        name,
+        id,
         corpId,
         agentSecret,
         token,
@@ -159,9 +159,9 @@ export function resolveChatType(fromUserName) {
  * 入站归一化 → ConversationRef：WeCom 无 guild/channel 容器概念，
  * `@chatroom` 群会话 → kind 'group'，其余（应用消息/单聊）→ kind 'private'。
  */
-export function wecomInboundConversation(endpointId, msg) {
+export function wecomInboundConversation(endpointKey, msg) {
     return {
-        endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+        endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
         kind: resolveChatType(msg.FromUserName),
         id: msg.FromUserName,
     };

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

@@ -9,9 +9,9 @@ export interface WecomAgentEndpoint {
     sendTextMessage(userId: string, content: string): Promise<boolean>;
 }
 export interface WecomAgentDeps {
-    getEndpoint: (endpointId: string) => WecomAgentEndpoint;
+    getEndpoint: (endpointKey: string) => WecomAgentEndpoint;
 }
-export declare function registerWecomAgentEndpoint(endpointId: string, endpoint: WecomAgentEndpoint): () => void;
+export declare function registerWecomAgentEndpoint(endpointKey: string, endpoint: WecomAgentEndpoint): () => void;
 /** Optional override used by tests / transitional callers. Pass `null` to clear. */
 export declare function setWecomAgentDeps(deps: WecomAgentDeps | null): void;
 export declare function getWecomAgentDeps(): WecomAgentDeps;

package/lib/wecom-agent-deps.js

@@ -4,11 +4,11 @@
  */
 const endpoints = new Map();
 let override = null;
-export function registerWecomAgentEndpoint(endpointId, endpoint) {
-    endpoints.set(endpointId, endpoint);
+export function registerWecomAgentEndpoint(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 getWecomAgentDeps() {
     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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-wecom",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "Zhin.js WeCom (企业微信) adapter for Plugin Runtime (HTTP webhook)",
   "type": "module",
   "main": "./lib/index.js",
@@ -34,22 +34,23 @@
     "directory": "plugins/adapters/wecom"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.5",
-    "@zhin.js/command": "1.0.7",
-    "@zhin.js/core": "1.5.2",
-    "@zhin.js/host-http": "1.0.6",
-    "@zhin.js/im-contract": "1.0.1",
-    "@zhin.js/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.1.3"
+    "@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.5",
-    "@zhin.js/agent": "1.1.3",
-    "@zhin.js/core": "1.5.2",
-    "@zhin.js/host-http": "1.0.6",
-    "@zhin.js/plugin-runtime": "1.1.3",
-    "zhin.js": "6.0.2"
+    "@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": {
@@ -67,8 +68,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.3",
-    "zhin.js": "6.0.2"
+    "@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 { registerWecomPlatformPermitChecker } from "./lib/platform-permit.js";
+import { permissionHostToken } from '@zhin.js/permission';
+import { checkWecomPlatformPermit } from "./lib/platform-permit.js";
 import { wecomRuntimeStateToken } from "./lib/wecom-runtime-state.js";
 export default definePlugin({
     name: 'wecom',
@@ -9,8 +10,10 @@ export default definePlugin({
         displayName: 'WeCom (企业微信) Adapter',
     },
     setup(context) {
-        // 运行中 endpoint 注册表（wecom.endpoint list 的"运行中"数据源）
         context.resources.provide(wecomRuntimeStateToken, createEndpointRuntimeState());
-        return registerWecomPlatformPermitChecker();
+        if (context.resources.has(permissionHostToken)) {
+            const host = context.resources.use(permissionHostToken);
+            return host.registerPlatform('wecom', checkWecomPlatformPermit);
+        }
     },
 });

package/schema.json

@@ -11,16 +11,48 @@
       "type": "string",
       "default": "https://qyapi.weixin.qq.com"
     },
+    "master": {
+      "type": [
+        "string",
+        "number"
+      ],
+      "description": "框架 master（WeCom userid；AI/工具权限、endpoint 管理）。endpoints[i].master 可逐项覆盖"
+    },
+    "trusted": {
+      "type": "array",
+      "items": {
+        "type": [
+          "string",
+          "number"
+        ],
+        "description": "Trusted WeCom userid"
+      },
+      "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": "WeCom bot name"
+          "master": {
+            "type": [
+              "string",
+              "number"
+            ],
+            "description": "本 endpoint 的框架 master（WeCom userid）；覆盖顶层 master"
+          },
+          "trusted": {
+            "type": "array",
+            "items": {
+              "type": [
+                "string",
+                "number"
+              ],
+              "description": "Trusted WeCom userid"
+            },
+            "description": "本 endpoint 的 trusted 列表"
           },
           "corpId": {
             "type": "string",
@@ -37,10 +69,14 @@
           "encodingAESKey": {
             "type": "string",
             "description": "WeCom encoding AES key"
+          },
+          "id": {
+            "type": "string",
+            "description": "WeCom bot name"
           }
         },
         "required": [
-          "name",
+          "id",
           "corpId",
           "agentSecret",
           "token",

package/src/endpoint.ts

@@ -4,7 +4,7 @@
 import type { EndpointInstance, 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 { registerWecomAgentEndpoint } from './wecom-agent-deps.js';
 import {
@@ -26,8 +26,6 @@ import {
 } from './protocol.js';
 import { registerWecomWebhookRoutes } from './webhook.js';
 
-const logger = getLogger('wecom');
-
 export type WecomFetch = (
   url: string,
   init?: {
@@ -56,6 +54,8 @@ export interface WecomEndpointOptions {
  * 因此本 endpoint 不暴露 EndpointManagement（Console 社交面 RPC 对该平台保持未接线）。
  */
 export class WecomEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: WecomEndpointOptions;
   readonly #fetch: WecomFetch;
   #routeReleases: HttpRouteRegistration[] = [];
@@ -66,6 +66,7 @@ export class WecomEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: WecomEndpointOptions) {
+    this.#logger = getAdapterLogger('wecom', options.config.id);
     this.#options = options;
     this.#fetch = options.fetch ?? globalThis.fetch;
   }
@@ -84,16 +85,16 @@ export class WecomEndpoint implements EndpointInstance {
     this.#started = true;
     try {
       await this.#refreshAccessToken();
-      this.#unregisterAgent = registerWecomAgentEndpoint(this.#options.config.name, this);
+      this.#unregisterAgent = registerWecomAgentEndpoint(this.#options.config.id, this);
       this.#routeReleases.push(...registerWecomWebhookRoutes(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 WeCom endpoint:', error);
+      this.#logger.error('Failed to connect WeCom endpoint:', error);
       throw error;
     }
   }
@@ -112,7 +113,7 @@ export class WecomEndpoint 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({ conversation, payload }: EndpointSendRequest): Promise<string> {
@@ -131,10 +132,7 @@ export class WecomEndpoint implements EndpointInstance {
     if (data.errcode !== 0) {
       throw new Error(`Failed to send message: ${data.errmsg} (${data.errcode})`);
     }
-    logger.debug(formatCompact({
-      op: 'send',
-      endpoint: this.#options.config.name,
-      to: `${conversation.kind}:${conversation.id}`,
+    this.#logger.debug(formatCompact({ op: 'send', to: `${conversation.kind}:${conversation.id}`,
     }));
     return (data.msgid as string) || `${Date.now()}`;
   }
@@ -162,9 +160,9 @@ export class WecomEndpoint implements EndpointInstance {
       const data = seg.data ?? {};
       const media = readOutboundImageMedia(data);
       if (!media) {
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'wecom_outbound_media_dropped',
-          endpoint: this.#options.config.name,
+          endpoint: this.#options.config.id,
           type: 'image',
           reason: 'missing_media_ref',
         }));
@@ -177,9 +175,9 @@ export class WecomEndpoint implements EndpointInstance {
         const mediaId = await this.#uploadMedia('image', media);
         return { type: 'image', data: { media_id: mediaId } };
       } catch (error) {
-        logger.warn(formatCompact({
+        this.#logger.warn(formatCompact({
           op: 'wecom_media_upload_failed',
-          endpoint: this.#options.config.name,
+          endpoint: this.#options.config.id,
           error: error instanceof Error ? error.message : String(error),
         }));
         const alt = typeof data.alt === 'string' && data.alt ? data.alt : '[image]';
@@ -210,17 +208,17 @@ export class WecomEndpoint implements EndpointInstance {
       conversation,
       message: { conversation, id: msg.MsgId || `${msg.CreateTime}` },
       content: formatInboundContent(msg),
-      sender: msg.FromUserName,
+      sender: { id: msg.FromUserName },
+      endpointId: this.#options.config.id,
       metadata: Object.freeze({
         msgType: msg.MsgType,
         event: msg.Event,
         chatType,
-        endpoint: this.#options.config.name,
         toUserName: msg.ToUserName,
         agentId: msg.AgentID,
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'wecom_gateway_receive_failed',
         target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
@@ -236,7 +234,7 @@ export class WecomEndpoint implements EndpointInstance {
       if (data.errcode === 0) return data;
       throw new Error(`Failed to get user info: ${data.errmsg}`);
     } catch (error) {
-      logger.error('Failed to get user info:', error);
+      this.#logger.error('Failed to get user info:', error);
       return null;
     }
   }
@@ -249,7 +247,7 @@ export class WecomEndpoint implements EndpointInstance {
       if (data.errcode === 0) return (data.userlist as unknown[]) || [];
       throw new Error(`Failed to get department users: ${data.errmsg}`);
     } catch (error) {
-      logger.error('Failed to get department users:', error);
+      this.#logger.error('Failed to get department users:', error);
       return [];
     }
   }
@@ -262,17 +260,17 @@ export class WecomEndpoint implements EndpointInstance {
       if (data.errcode === 0) return (data.department as unknown[]) || [];
       throw new Error(`Failed to get department list: ${data.errmsg}`);
     } catch (error) {
-      logger.error('Failed to get department list:', error);
+      this.#logger.error('Failed to get department list:', error);
       return [];
     }
   }
 
   async sendTextMessage(userId: string, content: string): Promise<boolean> {
     try {
-      const endpointId = String(this.#options.id);
+      const endpointKey = String(this.#options.id);
       await this.send({
         conversation: {
-          endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+          endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
           kind: resolveChatType(userId),
           id: userId,
         },
@@ -280,7 +278,7 @@ export class WecomEndpoint implements EndpointInstance {
       });
       return true;
     } catch (error) {
-      logger.error('Failed to send text message:', error);
+      this.#logger.error('Failed to send text message:', error);
       return false;
     }
   }
@@ -343,7 +341,7 @@ export class WecomEndpoint implements EndpointInstance {
         expires_in: data.expires_in ?? 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.errmsg} (${data.errcode})`);

package/src/index.ts

@@ -34,7 +34,6 @@ export {
   checkWecomPlatformPermit,
   normalizeWecomSenderForPermit,
   platformPermit,
-  registerWecomPlatformPermitChecker,
   wecomGroupPermitResolver,
 } from './platform-permit.js';
 

package/src/platform-permit.ts

@@ -1,7 +1,7 @@
 /**
  * 企业微信 WeCom platform permit
  */
-import { registerPlatformPermitChecker, type Message } from '@zhin.js/core';
+import type { PermissionSubject } from '@zhin.js/permission';
 
 const ADAPTER = 'wecom';
 
@@ -31,10 +31,9 @@ export function normalizeWecomSenderForPermit(input: {
   return { role: 'member', permissions: [] };
 }
 
-export function checkWecomPlatformPermit(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 checkWecomPlatformPermit(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) {
@@ -47,6 +46,3 @@ export function checkWecomPlatformPermit(perm: string, message: Message<any>): b
   }
 }
 
-export function registerWecomPlatformPermitChecker(): () => void {
-  return registerPlatformPermitChecker(ADAPTER, checkWecomPlatformPermit);
-}

package/src/protocol.ts

@@ -9,7 +9,7 @@ import type { ConversationRef } from '@zhin.js/im-contract';
 
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface WecomAdapterConfig {
-  readonly name?: string;
+  readonly id?: string;
   readonly corpId?: string;
   readonly agentSecret?: string;
   readonly token?: string;
@@ -24,7 +24,7 @@ export interface WecomAdapterConfig {
 
 export interface ResolvedWecomConfig {
   readonly context: 'wecom';
-  readonly name: string;
+  readonly id: string;
   readonly corpId: string;
   readonly agentSecret: string;
   readonly token: string;
@@ -97,13 +97,13 @@ export function resolveWecomConfig(config: WecomAdapterConfig = {}): ResolvedWec
       'WeCom adapter requires corpId + agentSecret + token + encodingAESKey (plugins.<key> or endpoints with context: wecom)',
     );
   }
-  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.WECOM_BOT_NAME
     || 'wecom-bot';
   return {
     context: 'wecom',
-    name,
+    id,
     corpId,
     agentSecret,
     token,
@@ -260,9 +260,9 @@ export function resolveChatType(fromUserName: string): 'group' | 'private' {
  * 入站归一化 → ConversationRef：WeCom 无 guild/channel 容器概念，
  * `@chatroom` 群会话 → kind 'group'，其余（应用消息/单聊）→ kind 'private'。
  */
-export function wecomInboundConversation(endpointId: string, msg: WecomMessage): ConversationRef {
+export function wecomInboundConversation(endpointKey: string, msg: WecomMessage): ConversationRef {
   return {
-    endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+    endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
     kind: resolveChatType(msg.FromUserName),
     id: msg.FromUserName,
   };

package/src/wecom-agent-deps.ts

@@ -11,20 +11,20 @@ export interface WecomAgentEndpoint {
 }
 
 export interface WecomAgentDeps {
-  getEndpoint: (endpointId: string) => WecomAgentEndpoint;
+  getEndpoint: (endpointKey: string) => WecomAgentEndpoint;
 }
 
 const endpoints = new Map<string, WecomAgentEndpoint>();
 let override: WecomAgentDeps | null = null;
 
 export function registerWecomAgentEndpoint(
-  endpointId: string,
+  endpointKey: string,
   endpoint: WecomAgentEndpoint,
 ): () => 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);
     }
   };
 }
@@ -37,9 +37,9 @@ export function setWecomAgentDeps(deps: WecomAgentDeps | null): void {
 export function getWecomAgentDeps(): WecomAgentDeps {
   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;
     },
   };