@zhin.js/adapter-kook 7.0.3 → 7.0.6

package/CHANGELOG.md

@@ -1,5 +1,95 @@
 # @zhin.js/adapter-kook
 
+## 7.0.6
+
+### Patch Changes
+
+- Updated dependencies [2d0a622]
+  - @zhin.js/command@1.0.10
+  - @zhin.js/adapter@1.1.7
+  - @zhin.js/core@1.5.5
+  - @zhin.js/agent@1.1.6
+  - zhin.js@6.0.5
+
+## 7.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
+
+## 7.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
+
 ## 7.0.3
 
 ### Patch Changes

package/adapters/kook.js

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

package/adapters/kook.ts

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

package/lib/endpoint.js

@@ -1,10 +1,10 @@
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { registerKookAgentEndpoint } from './kook-agent-deps.js';
 import { formatInboundContent, formatOutboundKmarkdown, isKookBotMentioned, kookInboundConversation, senderDisplayName, } from './protocol.js';
 import { registerKookWebhookRoutes } from './webhook.js';
 import { defaultCreateClient, defaultCreateWebhookClient, normalizeKookMessage, } from './ws.js';
-const logger = getLogger('kook');
 export class KookWebsocketEndpoint {
+    #logger;
     #options;
     #createClient;
     #client = null;
@@ -13,6 +13,7 @@ export class KookWebsocketEndpoint {
     #unregisterAgent;
     management = createKookEndpointManagement(() => this.#requireClient());
     constructor(options) {
+        this.#logger = getAdapterLogger('kook', options.config.id);
         this.#options = options;
         this.#createClient = options.createClient ?? defaultCreateClient;
     }
@@ -21,20 +22,20 @@ export class KookWebsocketEndpoint {
             return;
         this.#started = true;
         try {
-            this.#unregisterAgent = registerKookAgentEndpoint(this.#options.config.name, this);
+            this.#unregisterAgent = registerKookAgentEndpoint(this.#options.config.id, this);
             this.#client = this.#createClient(this.#options.config);
             this.#bindClient(this.#client);
             await this.#client.connect();
-            logger.info(formatCompact({
+            this.#logger.info(formatCompact({
                 op: 'connect',
-                endpoint: this.#options.config.name,
+                endpoint: this.#options.config.id,
                 mode: 'websocket',
                 self_id: this.#client.self_id != null ? String(this.#client.self_id) : undefined,
             }));
         }
         catch (error) {
             await this.stop();
-            logger.error('Failed to connect KOOK websocket:', error);
+            this.#logger.error('Failed to connect KOOK websocket:', error);
             throw error;
         }
     }
@@ -59,7 +60,7 @@ export class KookWebsocketEndpoint {
             this.#client = null;
         }
         this.#started = false;
-        logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
+        this.#logger.debug(formatCompact({ op: 'disconnect' }));
     }
     async send({ conversation, payload }) {
         const body = formatOutboundKmarkdown(payload);
@@ -68,9 +69,9 @@ export class KookWebsocketEndpoint {
             ? await client.sendPrivateMsg(conversation.id, body)
             : await client.sendChannelMsg(conversation.id, body);
         const messageId = result?.msg_id != null ? String(result.msg_id) : '';
-        logger.debug(formatCompact({
+        this.#logger.debug(formatCompact({
             op: 'kook_send',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
@@ -88,17 +89,21 @@ export class KookWebsocketEndpoint {
             conversation,
             message: { conversation, id: msg.id },
             content: formatInboundContent(msg),
-            sender: senderDisplayName(msg),
+            sender: {
+                id: msg.authorId,
+                name: senderDisplayName(msg) || undefined,
+                ...(msg.authorRoles?.length ? { roles: msg.authorRoles.map(String) } : {}),
+            },
+            endpointId: this.#options.config.id,
+            ...(isKookBotMentioned(msg, selfId) ? { mentioned: true } : {}),
             metadata: Object.freeze({
-                endpoint: this.#options.config.name,
                 channelKind: msg.channelKind,
                 userId: msg.authorId,
                 guildId: msg.guildId,
                 roles: msg.authorRoles,
-                ...(isKookBotMentioned(msg, selfId) ? { mentioned: true } : {}),
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'kook_gateway_receive_failed',
                 target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
@@ -146,6 +151,7 @@ export class KookWebsocketEndpoint {
     }
 }
 export class KookWebhookEndpoint {
+    #logger;
     #options;
     #createClient;
     #client = null;
@@ -156,6 +162,7 @@ export class KookWebhookEndpoint {
     #unregisterAgent;
     management = createKookEndpointManagement(() => this.#requireClient());
     constructor(options) {
+        this.#logger = getAdapterLogger('kook', options.config.id);
         this.#options = options;
         this.#createClient = options.createClient ?? defaultCreateWebhookClient;
     }
@@ -174,13 +181,13 @@ export class KookWebhookEndpoint {
             return;
         this.#started = true;
         try {
-            this.#unregisterAgent = registerKookAgentEndpoint(this.#options.config.name, this);
+            this.#unregisterAgent = registerKookAgentEndpoint(this.#options.config.id, this);
             this.#client = this.#createClient(this.#options.config);
             await this.#client.init();
             this.#routeReleases.push(...registerKookWebhookRoutes(this.#options.http, this));
-            logger.info(formatCompact({
+            this.#logger.info(formatCompact({
                 op: 'connect',
-                endpoint: this.#options.config.name,
+                endpoint: this.#options.config.id,
                 mode: 'webhook',
                 path: this.#options.config.webhookPath,
                 self_id: this.#client.self_id != null ? String(this.#client.self_id) : undefined,
@@ -188,7 +195,7 @@ export class KookWebhookEndpoint {
         }
         catch (error) {
             await this.stop();
-            logger.error('Failed to connect KOOK webhook:', error);
+            this.#logger.error('Failed to connect KOOK webhook:', error);
             throw error;
         }
     }
@@ -216,7 +223,7 @@ export class KookWebhookEndpoint {
             this.#client = null;
         }
         this.#started = false;
-        logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
+        this.#logger.debug(formatCompact({ op: 'disconnect' }));
     }
     async send({ conversation, payload }) {
         const body = formatOutboundKmarkdown(payload);
@@ -225,9 +232,9 @@ export class KookWebhookEndpoint {
             ? await client.sendPrivateMsg(conversation.id, body)
             : await client.sendChannelMsg(conversation.id, body);
         const messageId = result?.msg_id != null ? String(result.msg_id) : '';
-        logger.debug(formatCompact({
+        this.#logger.debug(formatCompact({
             op: 'kook_send',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             target: `${conversation.kind}:${conversation.id}`,
             messageId,
         }));
@@ -245,17 +252,21 @@ export class KookWebhookEndpoint {
             conversation,
             message: { conversation, id: msg.id },
             content: formatInboundContent(msg),
-            sender: senderDisplayName(msg),
+            sender: {
+                id: msg.authorId,
+                name: senderDisplayName(msg) || undefined,
+                ...(msg.authorRoles?.length ? { roles: msg.authorRoles.map(String) } : {}),
+            },
+            endpointId: this.#options.config.id,
+            ...(isKookBotMentioned(msg, selfId) ? { mentioned: true } : {}),
             metadata: Object.freeze({
-                endpoint: this.#options.config.name,
                 channelKind: msg.channelKind,
                 userId: msg.authorId,
                 guildId: msg.guildId,
                 roles: msg.authorRoles,
-                ...(isKookBotMentioned(msg, selfId) ? { mentioned: true } : {}),
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'kook_gateway_receive_failed',
                 target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),

package/lib/index.d.ts

@@ -3,4 +3,4 @@ export { KookWebhookEndpoint, KookWebsocketEndpoint, type KookEndpointOptions, t
 export { registerKookWebhookRoutes, handleKookWebhookRequest, type KookWebhookHandler, } from './webhook.js';
 export { defaultCreateClient, defaultCreateWebhookClient, normalizeKookMessage, type CreateKookClient, type KookClientTransport, } from './ws.js';
 export { getKookAgentDeps, registerKookAgentEndpoint, setKookAgentDeps, type KookAgentDeps, type KookAgentEndpoint, } from './kook-agent-deps.js';
-export { checkKookPlatformPermit, kookGroupPermitResolver, normalizeKookSenderForPermit, platformPermit, registerKookPlatformPermitChecker, type KookSenderInfo, } from './platform-permit.js';
+export { checkKookPlatformPermit, kookGroupPermitResolver, normalizeKookSenderForPermit, platformPermit, type KookSenderInfo, } from './platform-permit.js';

package/lib/index.js

@@ -3,4 +3,4 @@ export { KookWebhookEndpoint, KookWebsocketEndpoint, } from './endpoint.js';
 export { registerKookWebhookRoutes, handleKookWebhookRequest, } from './webhook.js';
 export { defaultCreateClient, defaultCreateWebhookClient, normalizeKookMessage, } from './ws.js';
 export { getKookAgentDeps, registerKookAgentEndpoint, setKookAgentDeps, } from './kook-agent-deps.js';
-export { checkKookPlatformPermit, kookGroupPermitResolver, normalizeKookSenderForPermit, platformPermit, registerKookPlatformPermitChecker, } from './platform-permit.js';
+export { checkKookPlatformPermit, kookGroupPermitResolver, normalizeKookSenderForPermit, platformPermit, } from './platform-permit.js';

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

@@ -21,9 +21,9 @@ export interface KookAgentEndpoint {
     removeFromBlacklist(guildId: string, userId: string): Promise<boolean>;
 }
 export interface KookAgentDeps {
-    getEndpoint: (endpointId: string) => KookAgentEndpoint;
+    getEndpoint: (endpointKey: string) => KookAgentEndpoint;
 }
-export declare function registerKookAgentEndpoint(endpointId: string, endpoint: KookAgentEndpoint): () => void;
+export declare function registerKookAgentEndpoint(endpointKey: string, endpoint: KookAgentEndpoint): () => void;
 /** Optional override used by tests / transitional callers. Pass `null` to clear. */
 export declare function setKookAgentDeps(deps: KookAgentDeps | null): void;
 export declare function getKookAgentDeps(): KookAgentDeps;

package/lib/kook-agent-deps.js

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

package/lib/platform-permit.d.ts

@@ -1,7 +1,7 @@
 /**
  * KOOK platform permit — guild / channel 差异化门禁
  */
-import { type Message } from '@zhin.js/core';
+import type { PermissionSubject } from '@zhin.js/permission';
 import { KookPermission } from './protocol.js';
 export declare function platformPermit(perm: string): string;
 export declare function kookGroupPermitResolver(logicalPerm: string): string;
@@ -19,5 +19,4 @@ export declare function normalizeKookSenderForPermit(info: KookSenderInfo, isCha
     role?: string;
     permissions?: string[];
 };
-export declare function checkKookPlatformPermit(perm: string, message: Message<any>): boolean;
-export declare function registerKookPlatformPermitChecker(): () => void;
+export declare function checkKookPlatformPermit(perm: string, subject: PermissionSubject): boolean;

package/lib/platform-permit.js

@@ -1,7 +1,3 @@
-/**
- * KOOK platform permit — guild / channel 差异化门禁
- */
-import { registerPlatformPermitChecker } from '@zhin.js/core';
 import { KookPermission } from './protocol.js';
 const ADAPTER = 'kook';
 export function platformPermit(perm) {
@@ -33,19 +29,9 @@ export function normalizeKookSenderForPermit(info, isChannel) {
     }
     return { role: 'member', permissions };
 }
-function senderPermits(message) {
-    const sender = message.$sender;
-    const permissions = [...(sender.permissions ?? [])];
-    if (sender.isGuildOwner)
-        permissions.push('guild_owner');
-    if (sender.isAdmin)
-        permissions.push('guild_admin');
-    if (sender.permission === KookPermission.ChannelAdmin)
-        permissions.push('channel_admin');
-    return { role: sender.role, permissions };
-}
-export function checkKookPlatformPermit(perm, message) {
-    const { role, permissions } = senderPermits(message);
+export function checkKookPlatformPermit(perm, subject) {
+    const role = subject.sender?.role?.[0];
+    const permissions = subject.sender?.permissions ?? [];
     const has = (t) => permissions.includes(t);
     switch (perm) {
         case 'guild_owner':
@@ -60,6 +46,3 @@ export function checkKookPlatformPermit(perm, message) {
             return false;
     }
 }
-export function registerKookPlatformPermitChecker() {
-    return registerPlatformPermitChecker(ADAPTER, checkKookPlatformPermit);
-}

package/lib/protocol.d.ts

@@ -13,7 +13,7 @@ export declare enum KookPermission {
 }
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface KookAdapterConfig {
-    readonly name?: string;
+    readonly id?: string;
     readonly token?: string;
     /** Default `websocket`. `webhook` requires httpHostToken + verify_token. */
     readonly connection?: 'websocket' | 'webhook';
@@ -28,7 +28,7 @@ export interface KookAdapterConfig {
     /** Transitional: legacy root `endpoints[]` with `context: kook`. */
     readonly endpoints?: ReadonlyArray<{
         readonly context?: string;
-        readonly name?: string;
+        readonly id?: string;
         readonly token?: string;
         readonly connection?: 'websocket' | 'webhook';
         readonly webhookPath?: string;
@@ -44,7 +44,7 @@ export interface KookAdapterConfig {
 export interface ResolvedKookWebsocketConfig {
     readonly context: 'kook';
     readonly connection: 'websocket';
-    readonly name: string;
+    readonly id: string;
     readonly token: string;
     readonly data_dir?: string;
     readonly timeout: number;
@@ -55,7 +55,7 @@ export interface ResolvedKookWebsocketConfig {
 export interface ResolvedKookWebhookConfig {
     readonly context: 'kook';
     readonly connection: 'webhook';
-    readonly name: string;
+    readonly id: string;
     readonly token: string;
     readonly webhookPath: string;
     readonly verifyToken: string;
@@ -112,7 +112,7 @@ export declare function resolveKookConfig(config?: KookAdapterConfig): ResolvedK
  * 入站归一化 → ConversationRef：频道消息的所属 guild 进 `parent`（guild 容器
  * 映射为 channel 容器）；私聊（PERSON）无容器，直接 kind 'private'。
  */
-export declare function kookInboundConversation(endpointId: string, msg: KookInboundMessage): ConversationRef;
+export declare function kookInboundConversation(endpointKey: string, msg: KookInboundMessage): ConversationRef;
 export declare function senderDisplayName(msg: KookInboundMessage): string;
 /** Build inbound text for MessageGateway.receive */
 export declare function formatInboundContent(msg: KookInboundMessage): string;

package/lib/protocol.js

@@ -21,8 +21,8 @@ export function resolveKookConfig(config = {}) {
     if (!token) {
         throw new TypeError('KOOK adapter requires token (plugins.<key>.token or endpoints with context: kook)');
     }
-    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.KOOK_BOT_NAME
         || 'kook-bot';
     const connection = config.connection
@@ -40,7 +40,7 @@ export function resolveKookConfig(config = {}) {
         return {
             context: 'kook',
             connection: 'webhook',
-            name,
+            id,
             token,
             webhookPath: normalizeWebhookPath(config.webhookPath ?? entry?.webhookPath ?? process.env.KOOK_WEBHOOK_PATH ?? '/kook/webhook'),
             verifyToken,
@@ -52,7 +52,7 @@ export function resolveKookConfig(config = {}) {
     return {
         context: 'kook',
         connection: 'websocket',
-        name,
+        id,
         token,
         data_dir: config.data_dir ?? entry?.data_dir,
         timeout: config.timeout ?? entry?.timeout ?? 10_000,
@@ -65,9 +65,9 @@ export function resolveKookConfig(config = {}) {
  * 入站归一化 → ConversationRef：频道消息的所属 guild 进 `parent`（guild 容器
  * 映射为 channel 容器）；私聊（PERSON）无容器，直接 kind 'private'。
  */
-export function kookInboundConversation(endpointId, msg) {
+export function kookInboundConversation(endpointKey, msg) {
     return {
-        endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+        endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
         kind: msg.channelKind,
         id: msg.channelId,
         ...(msg.guildId && msg.channelKind === 'channel'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-kook",
-  "version": "7.0.3",
+  "version": "7.0.6",
   "description": "Zhin.js KOOK adapter for Plugin Runtime (WebSocket gateway or Webhook)",
   "type": "module",
   "main": "./lib/index.js",
@@ -34,21 +34,22 @@
   },
   "dependencies": {
     "kook-client": "^1.0.4",
-    "@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.10",
+    "@zhin.js/core": "1.5.5",
+    "@zhin.js/host-http": "1.0.8",
+    "@zhin.js/im-contract": "1.0.3",
+    "@zhin.js/logger": "1.0.76",
+    "@zhin.js/permission": "1.0.1",
+    "@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/plugin-runtime": "1.1.3",
-    "zhin.js": "6.0.2"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/agent": "1.1.6",
+    "@zhin.js/core": "1.5.5",
+    "@zhin.js/plugin-runtime": "1.1.5",
+    "zhin.js": "6.0.5"
   },
   "peerDependenciesMeta": {
     "zhin.js": {
@@ -66,9 +67,9 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.3",
-    "@zhin.js/host-http": "1.0.6",
-    "zhin.js": "6.0.2"
+    "@zhin.js/agent": "1.1.6",
+    "@zhin.js/host-http": "1.0.8",
+    "zhin.js": "6.0.5"
   },
   "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 { registerKookPlatformPermitChecker } from "./lib/platform-permit.js";
+import { permissionHostToken } from '@zhin.js/permission';
+import { checkKookPlatformPermit } from "./lib/platform-permit.js";
 import { kookRuntimeStateToken } from "./lib/kook-runtime-state.js";
 export default definePlugin({
     name: 'kook',
@@ -9,9 +10,10 @@ export default definePlugin({
         displayName: 'KOOK WebSocket Adapter',
     },
     setup(context) {
-        // 运行中 endpoint 注册表（kook.endpoint list 的"运行中"数据源）
         context.resources.provide(kookRuntimeStateToken, createEndpointRuntimeState());
-        // 平台权限门禁：guild_owner / guild_admin / channel_admin 等（agent 工具 platformPermit）
-        return registerKookPlatformPermitChecker();
+        if (context.resources.has(permissionHostToken)) {
+            const host = context.resources.use(permissionHostToken);
+            return host.registerPlatform('kook', checkKookPlatformPermit);
+        }
     },
 });

package/schema.json

@@ -50,16 +50,48 @@
       ],
       "default": "info"
     },
+    "master": {
+      "type": [
+        "string",
+        "number"
+      ],
+      "description": "框架 master（KOOK user id；AI/工具权限、endpoint 管理）。endpoints[i].master 可逐项覆盖"
+    },
+    "trusted": {
+      "type": "array",
+      "items": {
+        "type": [
+          "string",
+          "number"
+        ],
+        "description": "Trusted KOOK 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": "KOOK bot name"
+          "master": {
+            "type": [
+              "string",
+              "number"
+            ],
+            "description": "本 endpoint 的框架 master（KOOK user id）；覆盖顶层 master"
+          },
+          "trusted": {
+            "type": "array",
+            "items": {
+              "type": [
+                "string",
+                "number"
+              ],
+              "description": "Trusted KOOK user id"
+            },
+            "description": "本 endpoint 的 trusted 列表"
           },
           "token": {
             "type": "string",
@@ -72,10 +104,14 @@
           "encrypt_key": {
             "type": "string",
             "description": "Optional Encrypt Key when message encryption is enabled in KOOK console."
+          },
+          "id": {
+            "type": "string",
+            "description": "KOOK bot name"
           }
         },
         "required": [
-          "name",
+          "id",
           "token"
         ]
       }

package/src/endpoint.ts

@@ -11,7 +11,7 @@ import type {
 } 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 { registerKookAgentEndpoint } from './kook-agent-deps.js';
 import {
@@ -33,8 +33,6 @@ import {
   type KookClientTransport,
 } from './ws.js';
 
-const logger = getLogger('kook');
-
 export interface KookEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
@@ -43,6 +41,8 @@ export interface KookEndpointOptions {
 }
 
 export class KookWebsocketEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: KookEndpointOptions;
   readonly #createClient: CreateKookClient;
   #client: KookClientTransport | null = null;
@@ -52,6 +52,7 @@ export class KookWebsocketEndpoint implements EndpointInstance {
   readonly management: EndpointManagement = createKookEndpointManagement(() => this.#requireClient());
 
   constructor(options: KookEndpointOptions) {
+    this.#logger = getAdapterLogger('kook', options.config.id);
     this.#options = options;
     this.#createClient = options.createClient ?? (defaultCreateClient as CreateKookClient);
   }
@@ -60,19 +61,19 @@ export class KookWebsocketEndpoint implements EndpointInstance {
     if (this.#started) return;
     this.#started = true;
     try {
-      this.#unregisterAgent = registerKookAgentEndpoint(this.#options.config.name, this);
+      this.#unregisterAgent = registerKookAgentEndpoint(this.#options.config.id, this);
       this.#client = this.#createClient(this.#options.config);
       this.#bindClient(this.#client);
       await this.#client.connect();
-      logger.info(formatCompact({
+      this.#logger.info(formatCompact({
         op: 'connect',
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         mode: 'websocket',
         self_id: this.#client.self_id != null ? String(this.#client.self_id) : undefined,
       }));
     } catch (error) {
       await this.stop();
-      logger.error('Failed to connect KOOK websocket:', error);
+      this.#logger.error('Failed to connect KOOK websocket:', error);
       throw error;
     }
   }
@@ -99,7 +100,7 @@ export class KookWebsocketEndpoint implements EndpointInstance {
       this.#client = null;
     }
     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> {
@@ -109,9 +110,9 @@ export class KookWebsocketEndpoint implements EndpointInstance {
       ? await client.sendPrivateMsg(conversation.id, body)
       : await client.sendChannelMsg(conversation.id, body);
     const messageId = result?.msg_id != null ? String(result.msg_id) : '';
-    logger.debug(formatCompact({
+    this.#logger.debug(formatCompact({
       op: 'kook_send',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
@@ -128,17 +129,21 @@ export class KookWebsocketEndpoint implements EndpointInstance {
       conversation,
       message: { conversation, id: msg.id },
       content: formatInboundContent(msg),
-      sender: senderDisplayName(msg),
+      sender: {
+        id: msg.authorId,
+        name: senderDisplayName(msg) || undefined,
+        ...(msg.authorRoles?.length ? { roles: msg.authorRoles.map(String) } : {}),
+      },
+      endpointId: this.#options.config.id,
+      ...(isKookBotMentioned(msg, selfId) ? { mentioned: true } : {}),
       metadata: Object.freeze({
-        endpoint: this.#options.config.name,
         channelKind: msg.channelKind,
         userId: msg.authorId,
         guildId: msg.guildId,
         roles: msg.authorRoles,
-        ...(isKookBotMentioned(msg, selfId) ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'kook_gateway_receive_failed',
         target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
@@ -203,6 +208,8 @@ export interface KookWebhookEndpointOptions {
 }
 
 export class KookWebhookEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: KookWebhookEndpointOptions;
   readonly #createClient: CreateKookClient;
   #client: KookClientTransport | null = null;
@@ -214,6 +221,7 @@ export class KookWebhookEndpoint implements EndpointInstance {
   readonly management: EndpointManagement = createKookEndpointManagement(() => this.#requireClient());
 
   constructor(options: KookWebhookEndpointOptions) {
+    this.#logger = getAdapterLogger('kook', options.config.id);
     this.#options = options;
     this.#createClient = options.createClient ?? (defaultCreateWebhookClient as CreateKookClient);
   }
@@ -235,20 +243,20 @@ export class KookWebhookEndpoint implements EndpointInstance {
     if (this.#started) return;
     this.#started = true;
     try {
-      this.#unregisterAgent = registerKookAgentEndpoint(this.#options.config.name, this);
+      this.#unregisterAgent = registerKookAgentEndpoint(this.#options.config.id, this);
       this.#client = this.#createClient(this.#options.config);
       await (this.#client as Client).init();
       this.#routeReleases.push(...registerKookWebhookRoutes(this.#options.http, this));
-      logger.info(formatCompact({
+      this.#logger.info(formatCompact({
         op: 'connect',
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         mode: 'webhook',
         path: this.#options.config.webhookPath,
         self_id: this.#client.self_id != null ? String(this.#client.self_id) : undefined,
       }));
     } catch (error) {
       await this.stop();
-      logger.error('Failed to connect KOOK webhook:', error);
+      this.#logger.error('Failed to connect KOOK webhook:', error);
       throw error;
     }
   }
@@ -277,7 +285,7 @@ export class KookWebhookEndpoint implements EndpointInstance {
       this.#client = null;
     }
     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> {
@@ -287,9 +295,9 @@ export class KookWebhookEndpoint implements EndpointInstance {
       ? await client.sendPrivateMsg(conversation.id, body)
       : await client.sendChannelMsg(conversation.id, body);
     const messageId = result?.msg_id != null ? String(result.msg_id) : '';
-    logger.debug(formatCompact({
+    this.#logger.debug(formatCompact({
       op: 'kook_send',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
@@ -306,17 +314,21 @@ export class KookWebhookEndpoint implements EndpointInstance {
       conversation,
       message: { conversation, id: msg.id },
       content: formatInboundContent(msg),
-      sender: senderDisplayName(msg),
+      sender: {
+        id: msg.authorId,
+        name: senderDisplayName(msg) || undefined,
+        ...(msg.authorRoles?.length ? { roles: msg.authorRoles.map(String) } : {}),
+      },
+      endpointId: this.#options.config.id,
+      ...(isKookBotMentioned(msg, selfId) ? { mentioned: true } : {}),
       metadata: Object.freeze({
-        endpoint: this.#options.config.name,
         channelKind: msg.channelKind,
         userId: msg.authorId,
         guildId: msg.guildId,
         roles: msg.authorRoles,
-        ...(isKookBotMentioned(msg, selfId) ? { mentioned: true } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'kook_gateway_receive_failed',
         target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),

package/src/index.ts

@@ -47,6 +47,5 @@ export {
   kookGroupPermitResolver,
   normalizeKookSenderForPermit,
   platformPermit,
-  registerKookPlatformPermitChecker,
   type KookSenderInfo,
 } from './platform-permit.js';

package/src/kook-agent-deps.ts

@@ -20,20 +20,20 @@ export interface KookAgentEndpoint {
 }
 
 export interface KookAgentDeps {
-  getEndpoint: (endpointId: string) => KookAgentEndpoint;
+  getEndpoint: (endpointKey: string) => KookAgentEndpoint;
 }
 
 const endpoints = new Map<string, KookAgentEndpoint>();
 let override: KookAgentDeps | null = null;
 
 export function registerKookAgentEndpoint(
-  endpointId: string,
+  endpointKey: string,
   endpoint: KookAgentEndpoint,
 ): () => 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);
     }
   };
 }
@@ -46,9 +46,9 @@ export function setKookAgentDeps(deps: KookAgentDeps | null): void {
 export function getKookAgentDeps(): KookAgentDeps {
   if (override) return override;
   return {
-    getEndpoint(endpointId: string): KookAgentEndpoint {
-      const registered = endpoints.get(endpointId);
-      if (!registered) throw new Error(`Endpoint ${endpointId} 不存在`);
+    getEndpoint(endpointKey: string): KookAgentEndpoint {
+      const registered = endpoints.get(endpointKey);
+      if (!registered) throw new Error(`Endpoint ${endpointKey} 不存在`);
       return registered;
     },
   };

package/src/platform-permit.ts

@@ -1,7 +1,7 @@
 /**
  * KOOK platform permit — guild / channel 差异化门禁
  */
-import { registerPlatformPermitChecker, type Message } from '@zhin.js/core';
+import type { PermissionSubject } from '@zhin.js/permission';
 import { KookPermission } from './protocol.js';
 
 const ADAPTER = 'kook';
@@ -54,17 +54,9 @@ export function normalizeKookSenderForPermit(
   return { role: 'member', permissions };
 }
 
-function senderPermits(message: Message<any>): { role?: string; permissions: string[] } {
-  const sender = message.$sender as KookSenderInfo & { role?: string; permissions?: string[] };
-  const permissions = [...(sender.permissions ?? [])];
-  if (sender.isGuildOwner) permissions.push('guild_owner');
-  if (sender.isAdmin) permissions.push('guild_admin');
-  if (sender.permission === KookPermission.ChannelAdmin) permissions.push('channel_admin');
-  return { role: sender.role, permissions };
-}
-
-export function checkKookPlatformPermit(perm: string, message: Message<any>): boolean {
-  const { role, permissions } = senderPermits(message);
+export function checkKookPlatformPermit(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) {
@@ -81,6 +73,3 @@ export function checkKookPlatformPermit(perm: string, message: Message<any>): bo
   }
 }
 
-export function registerKookPlatformPermitChecker(): () => void {
-  return registerPlatformPermitChecker(ADAPTER, checkKookPlatformPermit);
-}

package/src/protocol.ts

@@ -32,7 +32,7 @@ export enum KookPermission {
 
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface KookAdapterConfig {
-  readonly name?: string;
+  readonly id?: string;
   readonly token?: string;
   /** Default `websocket`. `webhook` requires httpHostToken + verify_token. */
   readonly connection?: 'websocket' | 'webhook';
@@ -47,7 +47,7 @@ export interface KookAdapterConfig {
   /** Transitional: legacy root `endpoints[]` with `context: kook`. */
   readonly endpoints?: ReadonlyArray<{
     readonly context?: string;
-    readonly name?: string;
+    readonly id?: string;
     readonly token?: string;
     readonly connection?: 'websocket' | 'webhook';
     readonly webhookPath?: string;
@@ -64,7 +64,7 @@ export interface KookAdapterConfig {
 export interface ResolvedKookWebsocketConfig {
   readonly context: 'kook';
   readonly connection: 'websocket';
-  readonly name: string;
+  readonly id: string;
   readonly token: string;
   readonly data_dir?: string;
   readonly timeout: number;
@@ -76,7 +76,7 @@ export interface ResolvedKookWebsocketConfig {
 export interface ResolvedKookWebhookConfig {
   readonly context: 'kook';
   readonly connection: 'webhook';
-  readonly name: string;
+  readonly id: string;
   readonly token: string;
   readonly webhookPath: string;
   readonly verifyToken: string;
@@ -142,8 +142,8 @@ export function resolveKookConfig(config: KookAdapterConfig = {}): ResolvedKookC
       'KOOK adapter requires token (plugins.<key>.token or endpoints with context: kook)',
     );
   }
-  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.KOOK_BOT_NAME
     || 'kook-bot';
   const connection = config.connection
@@ -164,7 +164,7 @@ export function resolveKookConfig(config: KookAdapterConfig = {}): ResolvedKookC
     return {
       context: 'kook',
       connection: 'webhook',
-      name,
+      id,
       token,
       webhookPath: normalizeWebhookPath(
         config.webhookPath ?? entry?.webhookPath ?? process.env.KOOK_WEBHOOK_PATH ?? '/kook/webhook',
@@ -179,7 +179,7 @@ export function resolveKookConfig(config: KookAdapterConfig = {}): ResolvedKookC
   return {
     context: 'kook',
     connection: 'websocket',
-    name,
+    id,
     token,
     data_dir: config.data_dir ?? entry?.data_dir,
     timeout: config.timeout ?? entry?.timeout ?? 10_000,
@@ -193,9 +193,9 @@ export function resolveKookConfig(config: KookAdapterConfig = {}): ResolvedKookC
  * 入站归一化 → ConversationRef：频道消息的所属 guild 进 `parent`（guild 容器
  * 映射为 channel 容器）；私聊（PERSON）无容器，直接 kind 'private'。
  */
-export function kookInboundConversation(endpointId: string, msg: KookInboundMessage): ConversationRef {
+export function kookInboundConversation(endpointKey: string, msg: KookInboundMessage): ConversationRef {
   return {
-    endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+    endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
     kind: msg.channelKind,
     id: msg.channelId,
     ...(msg.guildId && msg.channelKind === 'channel'