@zhin.js/adapter-dingtalk 6.0.2 → 6.0.5

package/CHANGELOG.md

@@ -1,5 +1,100 @@
 # @zhin.js/adapter-dingtalk
 
+## 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-dingtalk
 - `@zhin.js/plugin-runtime` — `plugin.ts`（`definePlugin`）
 - 配置经插件 `schema.json` 落到 `plugins.<instanceKey>`
 
-入站：`gateway.receive({ adapter, target: conversationId, content: text, sender, metadata })`  
-出站：`send({ target, payload })` → sessionWebhook 或 `/robot/send`
+入站：`gateway.receive({ conversation: ConversationRef, message: { conversation, id }, content: text, sender, metadata })`  
+出站：`send({ conversation, payload })` → sessionWebhook 或 `/robot/send`
 
 ## 前置条件
 

package/adapters/dingtalk.js

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

package/adapters/dingtalk.ts

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

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

@@ -18,9 +18,9 @@ export interface DingtalkAgentEndpoint {
     }): Promise<boolean>;
 }
 export interface DingtalkAgentDeps {
-    getEndpoint: (endpointId: string) => DingtalkAgentEndpoint;
+    getEndpoint: (endpointKey: string) => DingtalkAgentEndpoint;
 }
-export declare function registerDingtalkAgentEndpoint(endpointId: string, endpoint: DingtalkAgentEndpoint): () => void;
+export declare function registerDingtalkAgentEndpoint(endpointKey: string, endpoint: DingtalkAgentEndpoint): () => void;
 /** Optional override used by tests / transitional callers. Pass `null` to clear. */
 export declare function setDingtalkAgentDeps(deps: DingtalkAgentDeps | null): void;
 export declare function getDingtalkAgentDeps(): DingtalkAgentDeps;

package/lib/dingtalk-agent-deps.js

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

@@ -1,7 +1,7 @@
 /**
  * DingTalkEndpoint — lifecycle, outbound, admit, OpenAPI helpers for agent tools.
  */
-import type { EndpointInstance } from '@zhin.js/adapter';
+import type { EndpointInstance, 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';
@@ -38,10 +38,7 @@ export declare class DingTalkEndpoint 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>;
     /** Test / internal: admit a parsed event when open (non-webhook path). */
     admit(event: DingTalkEvent | DingTalkMessage): void;
     getUserInfo(userId: string): Promise<unknown>;

package/lib/endpoint.js

@@ -1,15 +1,15 @@
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { registerDingtalkAgentEndpoint } from './dingtalk-agent-deps.js';
 import { normalizeDingtalkSenderForPermit } from './platform-permit.js';
-import { formatInboundContent, formatOutboundBody, generateMessageId, isDingtalkBotMentioned, resolveChatType, resolveSender, resolveTarget, } from './protocol.js';
+import { dingtalkInboundConversation, formatInboundContent, formatOutboundBody, generateMessageId, isDingtalkBotMentioned, resolveChatType, resolveSender, } from './protocol.js';
 import { registerDingTalkWebhookRoutes } from './webhook.js';
-const logger = getLogger('dingtalk');
 /**
  * 钉钉机器人（webhook/stream 模式）无常规群列表 API——机器人不持有
  * 「我所在的群」枚举面，仅能收发消息；
  * 因此本 endpoint 不暴露 EndpointManagement（Console 社交面 RPC 对该平台保持未接线）。
  */
 export class DingTalkEndpoint {
+    #logger;
     #options;
     #fetch;
     #routeReleases = [];
@@ -20,6 +20,7 @@ export class DingTalkEndpoint {
     #started = false;
     #unregisterAgent;
     constructor(options) {
+        this.#logger = getAdapterLogger('dingtalk', options.config.id);
         this.#options = options;
         this.#fetch = options.fetch ?? globalThis.fetch;
     }
@@ -36,17 +37,17 @@ export class DingTalkEndpoint {
         this.#started = true;
         try {
             await this.#refreshAccessToken();
-            this.#unregisterAgent = registerDingtalkAgentEndpoint(this.#options.config.name, this);
+            this.#unregisterAgent = registerDingtalkAgentEndpoint(this.#options.config.id, this);
             this.#routeReleases.push(...registerDingTalkWebhookRoutes(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 DingTalk endpoint:', error);
+            this.#logger.error('Failed to connect DingTalk endpoint:', error);
             throw error;
         }
     }
@@ -64,11 +65,11 @@ export class DingTalkEndpoint {
         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 content = formatOutboundBody(payload);
-        const sessionWebhook = this.#sessionWebhooks.get(target);
+        const sessionWebhook = this.#sessionWebhooks.get(conversation.id);
         if (sessionWebhook) {
             const response = await this.#fetch(sessionWebhook, {
                 method: 'POST',
@@ -79,11 +80,11 @@ export class DingTalkEndpoint {
             if (data.errcode !== 0) {
                 throw new Error(`Failed to send message via session webhook: ${data.errmsg}`);
             }
-            logger.debug(formatCompact({
+            this.#logger.debug(formatCompact({
                 op: 'send',
-                endpoint: this.#options.config.name,
+                endpoint: this.#options.config.id,
                 via: 'sessionWebhook',
-                to: target,
+                to: conversation.id,
             }));
             return data.msgId || `${Date.now()}`;
         }
@@ -100,7 +101,7 @@ export class DingTalkEndpoint {
         if (data.errcode !== 0) {
             throw new Error(`Failed to send message: ${data.errmsg}`);
         }
-        logger.debug(formatCompact({ op: 'send', endpoint: this.#options.config.name, to: target }));
+        this.#logger.debug(formatCompact({ op: 'send', to: conversation.id }));
         return data.msgId || `${Date.now()}`;
     }
     /** Test / internal: admit a parsed event when open (non-webhook path). */
@@ -110,29 +111,32 @@ export class DingTalkEndpoint {
         if (event.sessionWebhook && event.conversationId) {
             this.#sessionWebhooks.set(event.conversationId, event.sessionWebhook);
         }
-        const target = resolveTarget(event);
+        const conversation = dingtalkInboundConversation(String(this.#options.id), event);
         const chatType = resolveChatType(event.conversationType);
         const permit = normalizeDingtalkSenderForPermit({ isAdmin: event.isAdmin === true });
         void this.#options.gateway.receive({
-            adapter: this.#options.id,
-            target,
+            conversation,
+            message: { conversation, id: generateMessageId(event) },
             content: formatInboundContent(event),
-            sender: resolveSender(event),
-            id: generateMessageId(event),
+            sender: {
+                id: resolveSender(event),
+                name: event.senderNick || undefined,
+                ...(permit.role ? { roles: [permit.role] } : {}),
+            },
+            endpointId: this.#options.config.id,
+            ...(isDingtalkBotMentioned(event, this.#options.config.robotCode) ? { mentioned: true } : {}),
             metadata: Object.freeze({
                 msgtype: event.msgtype,
                 chatType,
-                endpoint: this.#options.config.name,
                 senderNick: event.senderNick,
                 role: permit.role,
                 permissions: permit.permissions,
                 conversationType: event.conversationType,
-                ...(isDingtalkBotMentioned(event, this.#options.config.robotCode) ? { mentioned: true } : {}),
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'dingtalk_gateway_receive_failed',
-                target,
+                conversationId: conversation.id,
                 error: err instanceof Error ? err.message : String(err),
             }));
         });
@@ -148,7 +152,7 @@ export class DingTalkEndpoint {
             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;
         }
     }
@@ -165,7 +169,7 @@ export class DingTalkEndpoint {
             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 [];
         }
     }
@@ -184,7 +188,7 @@ export class DingTalkEndpoint {
             throw new Error(`Failed to send work notice: ${data.errmsg}`);
         }
         catch (error) {
-            logger.error('Failed to send work notice:', error);
+            this.#logger.error('Failed to send work notice:', error);
             return false;
         }
     }
@@ -199,7 +203,7 @@ export class DingTalkEndpoint {
             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 [];
         }
     }
@@ -214,7 +218,7 @@ export class DingTalkEndpoint {
             throw new Error(`Failed to get department info: ${data.errmsg}`);
         }
         catch (error) {
-            logger.error('Failed to get department info:', error);
+            this.#logger.error('Failed to get department info:', error);
             return null;
         }
     }
@@ -229,7 +233,7 @@ export class DingTalkEndpoint {
             throw new Error(`Failed to create chat: ${data.errmsg}`);
         }
         catch (error) {
-            logger.error('Failed to create chat:', error);
+            this.#logger.error('Failed to create chat:', error);
             return null;
         }
     }
@@ -244,7 +248,7 @@ export class DingTalkEndpoint {
             throw new Error(`Failed to get chat info: ${data.errmsg}`);
         }
         catch (error) {
-            logger.error('Failed to get chat info:', error);
+            this.#logger.error('Failed to get chat info:', error);
             return null;
         }
     }
@@ -259,7 +263,7 @@ export class DingTalkEndpoint {
             throw new Error(`Failed to update chat: ${data.errmsg}`);
         }
         catch (error) {
-            logger.error('Failed to update chat:', error);
+            this.#logger.error('Failed to update chat:', error);
             return false;
         }
     }
@@ -309,7 +313,7 @@ export class DingTalkEndpoint {
                 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,5 +1,5 @@
-export { formatInboundContent, formatOutboundBody, generateMessageId, headerValue, normalizeWebhookPath, readTextBody, resolveChatType, resolveDingTalkConfig, resolveSender, resolveTarget, verifySignature, type AccessToken, type DingTalkAdapterConfig, type DingTalkApiResponse, type DingTalkEvent, type DingTalkMessage, type DingTalkSendBody, type DingTalkWireSegment, type ResolvedDingTalkConfig, } from './protocol.js';
+export { dingtalkInboundConversation, formatInboundContent, formatOutboundBody, generateMessageId, headerValue, normalizeWebhookPath, readTextBody, resolveChatType, resolveDingTalkConfig, resolveSender, verifySignature, type AccessToken, type DingTalkAdapterConfig, type DingTalkApiResponse, type DingTalkEvent, type DingTalkMessage, type DingTalkSendBody, type DingTalkWireSegment, type ResolvedDingTalkConfig, } from './protocol.js';
 export { DingTalkEndpoint, type DingTalkEndpointOptions, type DingTalkFetch, } from './endpoint.js';
 export { registerDingTalkWebhookRoutes, handleDingTalkWebhookRequest, type DingTalkWebhookHandler, } from './webhook.js';
 export { getDingtalkAgentDeps, registerDingtalkAgentEndpoint, setDingtalkAgentDeps, type DingtalkAgentDeps, type DingtalkAgentEndpoint, } from './dingtalk-agent-deps.js';
-export { checkDingtalkPlatformPermit, dingtalkGroupPermitResolver, normalizeDingtalkSenderForPermit, platformPermit, registerDingtalkPlatformPermitChecker, } from './platform-permit.js';
+export { checkDingtalkPlatformPermit, dingtalkGroupPermitResolver, normalizeDingtalkSenderForPermit, platformPermit, } from './platform-permit.js';

package/lib/index.js

@@ -1,5 +1,5 @@
-export { formatInboundContent, formatOutboundBody, generateMessageId, headerValue, normalizeWebhookPath, readTextBody, resolveChatType, resolveDingTalkConfig, resolveSender, resolveTarget, verifySignature, } from './protocol.js';
+export { dingtalkInboundConversation, formatInboundContent, formatOutboundBody, generateMessageId, headerValue, normalizeWebhookPath, readTextBody, resolveChatType, resolveDingTalkConfig, resolveSender, verifySignature, } from './protocol.js';
 export { DingTalkEndpoint, } from './endpoint.js';
 export { registerDingTalkWebhookRoutes, handleDingTalkWebhookRequest, } from './webhook.js';
 export { getDingtalkAgentDeps, registerDingtalkAgentEndpoint, setDingtalkAgentDeps, } from './dingtalk-agent-deps.js';
-export { checkDingtalkPlatformPermit, dingtalkGroupPermitResolver, normalizeDingtalkSenderForPermit, platformPermit, registerDingtalkPlatformPermitChecker, } from './platform-permit.js';
+export { checkDingtalkPlatformPermit, dingtalkGroupPermitResolver, normalizeDingtalkSenderForPermit, platformPermit, } from './platform-permit.js';

package/lib/platform-permit.d.ts

@@ -1,7 +1,7 @@
 /**
  * 钉钉 DingTalk 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 dingtalkGroupPermitResolver(logicalPerm: string): string;
 export declare function normalizeDingtalkSenderForPermit(input: {
@@ -11,5 +11,4 @@ export declare function normalizeDingtalkSenderForPermit(input: {
     role?: string;
     permissions?: string[];
 };
-export declare function checkDingtalkPlatformPermit(perm: string, message: Message<any>): boolean;
-export declare function registerDingtalkPlatformPermitChecker(): () => void;
+export declare function checkDingtalkPlatformPermit(perm: string, subject: PermissionSubject): boolean;

package/lib/platform-permit.js

@@ -1,7 +1,3 @@
-/**
- * 钉钉 DingTalk platform permit
- */
-import { registerPlatformPermitChecker } from '@zhin.js/core';
 const ADAPTER = 'dingtalk';
 export function platformPermit(perm) {
     return `platform(${ADAPTER},${perm})`;
@@ -22,10 +18,9 @@ export function normalizeDingtalkSenderForPermit(input) {
     }
     return { role: 'member', permissions: [] };
 }
-export function checkDingtalkPlatformPermit(perm, message) {
-    const sender = message.$sender;
-    const permissions = sender.permissions ?? [];
-    const role = sender.role;
+export function checkDingtalkPlatformPermit(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 checkDingtalkPlatformPermit(perm, message) {
             return false;
     }
 }
-export function registerDingtalkPlatformPermitChecker() {
-    return registerPlatformPermitChecker(ADAPTER, checkDingtalkPlatformPermit);
-}

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 DingTalkAdapterConfig {
-    readonly name?: string;
+    readonly id?: string;
     readonly appKey?: string;
     readonly appSecret?: string;
     readonly webhookPath?: string;
@@ -18,7 +19,7 @@ export interface DingTalkAdapterConfig {
 }
 export interface ResolvedDingTalkConfig {
     readonly context: 'dingtalk';
-    readonly name: string;
+    readonly id: string;
     readonly appKey: string;
     readonly appSecret: string;
     readonly webhookPath: string;
@@ -104,7 +105,12 @@ export interface DingTalkSendBody {
 export declare function resolveDingTalkConfig(config?: DingTalkAdapterConfig): ResolvedDingTalkConfig;
 export declare function normalizeWebhookPath(path: string): string;
 export declare function resolveChatType(conversationType?: string): 'group' | 'private';
-export declare function resolveTarget(msg: DingTalkMessage): string;
+/**
+ * 入站归一化 → ConversationRef：`conversationType: '2'` 为群会话（kind 'group'），
+ * 其余为单聊（kind 'private'）；会话原生 id 取 conversationId，缺省回退 senderId。
+ * 钉钉无 guild/频道容器概念，不产生 parent。
+ */
+export declare function dingtalkInboundConversation(endpointKey: string, msg: DingTalkMessage): ConversationRef;
 export declare function resolveSender(msg: DingTalkMessage): string;
 export declare function generateMessageId(msg: DingTalkMessage): string;
 /** Build inbound text for MessageGateway.receive. */

package/lib/protocol.js

@@ -29,8 +29,8 @@ export function resolveDingTalkConfig(config = {}) {
     if (!appKey || !appSecret) {
         throw new TypeError('DingTalk adapter requires appKey + appSecret (plugins.<key> or endpoints with context: dingtalk)');
     }
-    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.DINGTALK_BOT_NAME
         || 'dingtalk-bot';
     const webhookPath = normalizeWebhookPath(config.webhookPath ?? entry?.webhookPath ?? '/dingtalk/webhook');
@@ -38,7 +38,7 @@ export function resolveDingTalkConfig(config = {}) {
     const robotCode = config.robotCode ?? entry?.robotCode;
     return {
         context: 'dingtalk',
-        name,
+        id,
         appKey,
         appSecret,
         webhookPath,
@@ -53,8 +53,17 @@ export function normalizeWebhookPath(path) {
 export function resolveChatType(conversationType) {
     return conversationType === '2' ? 'group' : 'private';
 }
-export function resolveTarget(msg) {
-    return msg.conversationId || msg.senderId || 'unknown';
+/**
+ * 入站归一化 → ConversationRef：`conversationType: '2'` 为群会话（kind 'group'），
+ * 其余为单聊（kind 'private'）；会话原生 id 取 conversationId，缺省回退 senderId。
+ * 钉钉无 guild/频道容器概念，不产生 parent。
+ */
+export function dingtalkInboundConversation(endpointKey, msg) {
+    return {
+        endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
+        kind: resolveChatType(msg.conversationType),
+        id: msg.conversationId || msg.senderId || 'unknown',
+    };
 }
 export function resolveSender(msg) {
     return msg.senderId || msg.senderStaffId || 'unknown';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-dingtalk",
-  "version": "6.0.2",
+  "version": "6.0.5",
   "description": "Zhin.js DingTalk (钉钉) adapter for Plugin Runtime (HTTP webhook)",
   "type": "module",
   "main": "./lib/index.js",
@@ -33,21 +33,23 @@
     "directory": "plugins/adapters/dingtalk"
   },
   "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": {
@@ -65,8 +67,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 { registerDingtalkPlatformPermitChecker } from "./lib/platform-permit.js";
+import { permissionHostToken } from '@zhin.js/permission';
+import { checkDingtalkPlatformPermit } from "./lib/platform-permit.js";
 import { dingtalkRuntimeStateToken } from "./lib/dingtalk-runtime-state.js";
 export default definePlugin({
     name: 'dingtalk',
@@ -9,8 +10,10 @@ export default definePlugin({
         displayName: 'DingTalk (钉钉) Adapter',
     },
     setup(context) {
-        // 运行中 endpoint 注册表（dingtalk.endpoint list 的"运行中"数据源）
         context.resources.provide(dingtalkRuntimeStateToken, createEndpointRuntimeState());
-        return registerDingtalkPlatformPermitChecker();
+        if (context.resources.has(permissionHostToken)) {
+            const host = context.resources.use(permissionHostToken);
+            return host.registerPlatform('dingtalk', checkDingtalkPlatformPermit);
+        }
     },
 });

package/schema.json

@@ -7,16 +7,48 @@
       "type": "string",
       "default": "https://oapi.dingtalk.com"
     },
+    "master": {
+      "type": [
+        "string",
+        "number"
+      ],
+      "description": "框架 master（DingTalk userid；AI/工具权限、endpoint 管理）。endpoints[i].master 可逐项覆盖"
+    },
+    "trusted": {
+      "type": "array",
+      "items": {
+        "type": [
+          "string",
+          "number"
+        ],
+        "description": "Trusted DingTalk 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": "Dingtalk bot name"
+          "master": {
+            "type": [
+              "string",
+              "number"
+            ],
+            "description": "本 endpoint 的框架 master（DingTalk userid）；覆盖顶层 master"
+          },
+          "trusted": {
+            "type": "array",
+            "items": {
+              "type": [
+                "string",
+                "number"
+              ],
+              "description": "Trusted DingTalk userid"
+            },
+            "description": "本 endpoint 的 trusted 列表"
           },
           "appKey": {
             "type": "string",
@@ -33,10 +65,14 @@
           "robotCode": {
             "type": "string",
             "description": "Dingtalk robot code"
+          },
+          "id": {
+            "type": "string",
+            "description": "Dingtalk bot name"
           }
         },
         "required": [
-          "name",
+          "id",
           "appKey",
           "appSecret",
           "webhookPath",

package/src/dingtalk-agent-deps.ts

@@ -23,20 +23,20 @@ export interface DingtalkAgentEndpoint {
 }
 
 export interface DingtalkAgentDeps {
-  getEndpoint: (endpointId: string) => DingtalkAgentEndpoint;
+  getEndpoint: (endpointKey: string) => DingtalkAgentEndpoint;
 }
 
 const endpoints = new Map<string, DingtalkAgentEndpoint>();
 let override: DingtalkAgentDeps | null = null;
 
 export function registerDingtalkAgentEndpoint(
-  endpointId: string,
+  endpointKey: string,
   endpoint: DingtalkAgentEndpoint,
 ): () => 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);
     }
   };
 }
@@ -49,9 +49,9 @@ export function setDingtalkAgentDeps(deps: DingtalkAgentDeps | null): void {
 export function getDingtalkAgentDeps(): DingtalkAgentDeps {
   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/endpoint.ts

@@ -1,21 +1,21 @@
 /**
  * DingTalkEndpoint — lifecycle, outbound, admit, OpenAPI helpers for agent tools.
  */
-import type { EndpointInstance } from '@zhin.js/adapter';
+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 { registerDingtalkAgentEndpoint } from './dingtalk-agent-deps.js';
 import { normalizeDingtalkSenderForPermit } from './platform-permit.js';
 import {
+  dingtalkInboundConversation,
   formatInboundContent,
   formatOutboundBody,
   generateMessageId,
   isDingtalkBotMentioned,
   resolveChatType,
   resolveSender,
-  resolveTarget,
   type AccessToken,
   type DingTalkApiResponse,
   type DingTalkEvent,
@@ -25,8 +25,6 @@ import {
 } from './protocol.js';
 import { registerDingTalkWebhookRoutes } from './webhook.js';
 
-const logger = getLogger('dingtalk');
-
 export type DingTalkFetch = (
   url: string,
   init?: {
@@ -55,6 +53,8 @@ export interface DingTalkEndpointOptions {
  * 因此本 endpoint 不暴露 EndpointManagement（Console 社交面 RPC 对该平台保持未接线）。
  */
 export class DingTalkEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: DingTalkEndpointOptions;
   readonly #fetch: DingTalkFetch;
   #routeReleases: HttpRouteRegistration[] = [];
@@ -66,6 +66,7 @@ export class DingTalkEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: DingTalkEndpointOptions) {
+    this.#logger = getAdapterLogger('dingtalk', options.config.id);
     this.#options = options;
     this.#fetch = options.fetch ?? globalThis.fetch;
   }
@@ -84,16 +85,16 @@ export class DingTalkEndpoint implements EndpointInstance {
     this.#started = true;
     try {
       await this.#refreshAccessToken();
-      this.#unregisterAgent = registerDingtalkAgentEndpoint(this.#options.config.name, this);
+      this.#unregisterAgent = registerDingtalkAgentEndpoint(this.#options.config.id, this);
       this.#routeReleases.push(...registerDingTalkWebhookRoutes(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 DingTalk endpoint:', error);
+      this.#logger.error('Failed to connect DingTalk endpoint:', error);
       throw error;
     }
   }
@@ -113,12 +114,12 @@ export class DingTalkEndpoint 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 content = formatOutboundBody(payload);
-    const sessionWebhook = this.#sessionWebhooks.get(target);
+    const sessionWebhook = this.#sessionWebhooks.get(conversation.id);
     if (sessionWebhook) {
       const response = await this.#fetch(sessionWebhook, {
         method: 'POST',
@@ -129,11 +130,11 @@ export class DingTalkEndpoint implements EndpointInstance {
       if (data.errcode !== 0) {
         throw new Error(`Failed to send message via session webhook: ${data.errmsg}`);
       }
-      logger.debug(formatCompact({
+      this.#logger.debug(formatCompact({
         op: 'send',
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         via: 'sessionWebhook',
-        to: target,
+        to: conversation.id,
       }));
       return (data.msgId as string) || `${Date.now()}`;
     }
@@ -151,7 +152,7 @@ export class DingTalkEndpoint implements EndpointInstance {
     if (data.errcode !== 0) {
       throw new Error(`Failed to send message: ${data.errmsg}`);
     }
-    logger.debug(formatCompact({ op: 'send', endpoint: this.#options.config.name, to: target }));
+    this.#logger.debug(formatCompact({ op: 'send', to: conversation.id }));
     return (data.msgId as string) || `${Date.now()}`;
   }
 
@@ -161,29 +162,32 @@ export class DingTalkEndpoint implements EndpointInstance {
     if (event.sessionWebhook && event.conversationId) {
       this.#sessionWebhooks.set(event.conversationId, event.sessionWebhook);
     }
-    const target = resolveTarget(event);
+    const conversation = dingtalkInboundConversation(String(this.#options.id), event);
     const chatType = resolveChatType(event.conversationType);
     const permit = normalizeDingtalkSenderForPermit({ isAdmin: event.isAdmin === true });
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: generateMessageId(event) },
       content: formatInboundContent(event),
-      sender: resolveSender(event),
-      id: generateMessageId(event),
+      sender: {
+        id: resolveSender(event),
+        name: event.senderNick || undefined,
+        ...(permit.role ? { roles: [permit.role] } : {}),
+      },
+      endpointId: this.#options.config.id,
+      ...(isDingtalkBotMentioned(event, this.#options.config.robotCode) ? { mentioned: true } : {}),
       metadata: Object.freeze({
         msgtype: event.msgtype,
         chatType,
-        endpoint: this.#options.config.name,
         senderNick: event.senderNick,
         role: permit.role,
         permissions: permit.permissions,
         conversationType: event.conversationType,
-        ...(isDingtalkBotMentioned(event, this.#options.config.robotCode) ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'dingtalk_gateway_receive_failed',
-        target,
+        conversationId: conversation.id,
         error: err instanceof Error ? err.message : String(err),
       }));
     });
@@ -198,7 +202,7 @@ export class DingTalkEndpoint implements EndpointInstance {
       if (data.errcode === 0) return data.result;
       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;
     }
   }
@@ -215,7 +219,7 @@ export class DingTalkEndpoint implements EndpointInstance {
       }
       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 [];
     }
   }
@@ -233,7 +237,7 @@ export class DingTalkEndpoint implements EndpointInstance {
       if (data.errcode === 0) return true;
       throw new Error(`Failed to send work notice: ${data.errmsg}`);
     } catch (error) {
-      logger.error('Failed to send work notice:', error);
+      this.#logger.error('Failed to send work notice:', error);
       return false;
     }
   }
@@ -247,7 +251,7 @@ export class DingTalkEndpoint implements EndpointInstance {
       if (data.errcode === 0) return (data.result 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 [];
     }
   }
@@ -261,7 +265,7 @@ export class DingTalkEndpoint implements EndpointInstance {
       if (data.errcode === 0) return data.result;
       throw new Error(`Failed to get department info: ${data.errmsg}`);
     } catch (error) {
-      logger.error('Failed to get department info:', error);
+      this.#logger.error('Failed to get department info:', error);
       return null;
     }
   }
@@ -279,7 +283,7 @@ export class DingTalkEndpoint implements EndpointInstance {
       if (data.errcode === 0) return (data.chatid as string) || null;
       throw new Error(`Failed to create chat: ${data.errmsg}`);
     } catch (error) {
-      logger.error('Failed to create chat:', error);
+      this.#logger.error('Failed to create chat:', error);
       return null;
     }
   }
@@ -293,7 +297,7 @@ export class DingTalkEndpoint implements EndpointInstance {
       if (data.errcode === 0) return data.chat_info;
       throw new Error(`Failed to get chat info: ${data.errmsg}`);
     } catch (error) {
-      logger.error('Failed to get chat info:', error);
+      this.#logger.error('Failed to get chat info:', error);
       return null;
     }
   }
@@ -315,7 +319,7 @@ export class DingTalkEndpoint implements EndpointInstance {
       if (data.errcode === 0) return true;
       throw new Error(`Failed to update chat: ${data.errmsg}`);
     } catch (error) {
-      logger.error('Failed to update chat:', error);
+      this.#logger.error('Failed to update chat:', error);
       return false;
     }
   }
@@ -379,7 +383,7 @@ export class DingTalkEndpoint 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

@@ -1,4 +1,5 @@
 export {
+  dingtalkInboundConversation,
   formatInboundContent,
   formatOutboundBody,
   generateMessageId,
@@ -8,7 +9,6 @@ export {
   resolveChatType,
   resolveDingTalkConfig,
   resolveSender,
-  resolveTarget,
   verifySignature,
   type AccessToken,
   type DingTalkAdapterConfig,
@@ -45,5 +45,4 @@ export {
   dingtalkGroupPermitResolver,
   normalizeDingtalkSenderForPermit,
   platformPermit,
-  registerDingtalkPlatformPermitChecker,
 } from './platform-permit.js';

package/src/platform-permit.ts

@@ -1,7 +1,7 @@
 /**
  * 钉钉 DingTalk platform permit
  */
-import { registerPlatformPermitChecker, type Message } from '@zhin.js/core';
+import type { PermissionSubject } from '@zhin.js/permission';
 
 const ADAPTER = 'dingtalk';
 
@@ -31,10 +31,9 @@ export function normalizeDingtalkSenderForPermit(input: {
   return { role: 'member', permissions: [] };
 }
 
-export function checkDingtalkPlatformPermit(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 checkDingtalkPlatformPermit(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 checkDingtalkPlatformPermit(perm: string, message: Message<any>)
   }
 }
 
-export function registerDingtalkPlatformPermitChecker(): () => void {
-  return registerPlatformPermitChecker(ADAPTER, checkDingtalkPlatformPermit);
-}

package/src/protocol.ts

@@ -7,13 +7,14 @@ import { createHmac, 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('dingtalk');
 
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface DingTalkAdapterConfig {
-  readonly name?: string;
+  readonly id?: string;
   readonly appKey?: string;
   readonly appSecret?: string;
   readonly webhookPath?: string;
@@ -27,7 +28,7 @@ export interface DingTalkAdapterConfig {
 
 export interface ResolvedDingTalkConfig {
   readonly context: 'dingtalk';
-  readonly name: string;
+  readonly id: string;
   readonly appKey: string;
   readonly appSecret: string;
   readonly webhookPath: string;
@@ -123,8 +124,8 @@ export function resolveDingTalkConfig(config: DingTalkAdapterConfig = {}): Resol
       'DingTalk adapter requires appKey + appSecret (plugins.<key> or endpoints with context: dingtalk)',
     );
   }
-  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.DINGTALK_BOT_NAME
     || 'dingtalk-bot';
   const webhookPath = normalizeWebhookPath(
@@ -136,7 +137,7 @@ export function resolveDingTalkConfig(config: DingTalkAdapterConfig = {}): Resol
   const robotCode = config.robotCode ?? entry?.robotCode;
   return {
     context: 'dingtalk',
-    name,
+    id,
     appKey,
     appSecret,
     webhookPath,
@@ -154,8 +155,17 @@ export function resolveChatType(conversationType?: string): 'group' | 'private'
   return conversationType === '2' ? 'group' : 'private';
 }
 
-export function resolveTarget(msg: DingTalkMessage): string {
-  return msg.conversationId || msg.senderId || 'unknown';
+/**
+ * 入站归一化 → ConversationRef：`conversationType: '2'` 为群会话（kind 'group'），
+ * 其余为单聊（kind 'private'）；会话原生 id 取 conversationId，缺省回退 senderId。
+ * 钉钉无 guild/频道容器概念，不产生 parent。
+ */
+export function dingtalkInboundConversation(endpointKey: string, msg: DingTalkMessage): ConversationRef {
+  return {
+    endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
+    kind: resolveChatType(msg.conversationType),
+    id: msg.conversationId || msg.senderId || 'unknown',
+  };
 }
 
 export function resolveSender(msg: DingTalkMessage): string {