@zhin.js/core 1.5.2 → 1.5.4

package/lib/built/endpoint-lifecycle-service.js

@@ -20,7 +20,7 @@ function readAllEndpoints(root) {
     return [...(raw?.endpoints ?? [])];
 }
 function assertUniqueName(endpoints, context, name, replaceIndex) {
-    const conflict = endpoints.findIndex((e) => e.context === context && e.name === name);
+    const conflict = endpoints.findIndex((e) => e.context === context && e.id === name);
     if (conflict >= 0 && conflict !== replaceIndex) {
         throw new Error(`zhin.config 中已存在 ${context}/${name}`);
     }
@@ -83,13 +83,13 @@ export class EndpointLifecycleService {
         const endpoints = readAllEndpoints(this.root);
         await this.persistEndpoints(endpoints);
         const configPath = formatDisplayPath(loader.resolvedPath);
-        const names = endpoints.map((e) => `${e.context}/${e.name}`).join(', ') || '（无）';
+        const names = endpoints.map((e) => `${e.context}/${e.id}`).join(', ') || '（无）';
         return {
             message: `✅ 已将 ${endpoints.length} 个 endpoint 写入 \`${configPath}\`：${names}`,
         };
     }
     async connectConfig(adapter, config) {
-        const name = config.name;
+        const name = config.id;
         if (adapter.endpoints.has(name)) {
             throw new Error(`Endpoint ${name} 已在线，请先 /endpoint stop ${String(adapter.name)} ${name}`);
         }
@@ -118,16 +118,16 @@ export class EndpointLifecycleService {
         const config = await manager.addEndpoint(ctx);
         if (!config.context)
             config.context = adapterKey;
-        if (!config.name?.trim()) {
-            throw new Error('Endpoint 名称不能为空');
+        if (!config.id?.trim()) {
+            throw new Error('Endpoint id 不能为空');
         }
         const endpoints = readAllEndpoints(this.root);
         try {
-            assertUniqueName(endpoints, config.context, config.name);
+            assertUniqueName(endpoints, config.context, config.id);
         }
         catch (err) {
             if (err instanceof Error && err.message.includes('已存在')) {
-                const online = adapter.endpoints.has(config.name);
+                const online = adapter.endpoints.has(config.id);
                 const hint = online
                     ? '该 Endpoint 已在运行时注册，无需重复扫码；可发 /endpoints 确认。若 zhin.config.yml 未更新，请 /endpoint sync。'
                     : '可用 /endpoint start 重试连接，或 /endpoint remove 后重新添加。';
@@ -145,12 +145,12 @@ export class EndpointLifecycleService {
                 adapter.constructor.endpointNeedsRestart;
             const hint = needsRestart
                 ? '配置已写入，请重启进程后连接。'
-                : `配置已写入，可用 /endpoint start ${adapterKey} ${config.name} 重试。`;
+                : `配置已写入，可用 /endpoint start ${adapterKey} ${config.id} 重试。`;
             throw new Error(`${err instanceof Error ? err.message : String(err)}（${hint}）`);
         }
         const prefix = initialReply ? `${initialReply}\n` : '';
         return {
-            message: `${prefix}✅ 已添加并连接 endpoint \`${config.name}\`（${adapterKey}），已写入 zhin.config。`,
+            message: `${prefix}✅ 已添加并连接 endpoint \`${config.id}\`（${adapterKey}），已写入 zhin.config。`,
             config,
         };
     }
@@ -158,7 +158,7 @@ export class EndpointLifecycleService {
         const adapter = this.resolveAdapter(adapterKey);
         const manager = this.resolveManager(adapterKey);
         const endpoints = readAllEndpoints(this.root);
-        const index = endpoints.findIndex((e) => e.context === adapterKey && e.name === name);
+        const index = endpoints.findIndex((e) => e.context === adapterKey && e.id === name);
         if (index < 0) {
             throw new Error(`zhin.config 中不存在 ${adapterKey}/${name}`);
         }
@@ -168,7 +168,7 @@ export class EndpointLifecycleService {
         const ctx = buildProvisionContext(this.root, message);
         const updated = await manager.editEndpoint(name, ctx);
         updated.context = adapterKey;
-        updated.name = name;
+        updated.id = name;
         endpoints[index] = updated;
         await this.persistEndpoints(endpoints);
         try {
@@ -192,7 +192,7 @@ export class EndpointLifecycleService {
             throw new Error(`无法移除 ${adapterKey}/${name}`);
         }
         const endpoints = readAllEndpoints(this.root);
-        const next = endpoints.filter((e) => !(e.context === adapterKey && e.name === name));
+        const next = endpoints.filter((e) => !(e.context === adapterKey && e.id === name));
         if (next.length === endpoints.length) {
             throw new Error(`zhin.config 中不存在 ${adapterKey}/${name}`);
         }
@@ -203,7 +203,7 @@ export class EndpointLifecycleService {
         const adapter = this.resolveAdapter(adapterKey);
         const manager = this.resolveManager(adapterKey);
         const endpoints = readAllEndpoints(this.root);
-        const config = endpoints.find((e) => e.context === adapterKey && e.name === name);
+        const config = endpoints.find((e) => e.context === adapterKey && e.id === name);
         if (!config) {
             throw new Error(`zhin.config 中不存在 ${adapterKey}/${name}`);
         }

package/lib/built/endpoint-lifecycle.d.ts

@@ -4,7 +4,7 @@ import type { Plugin } from '../plugin.js';
 export type EndpointLifecycleKind = 'connect' | 'disconnect' | 'error';
 export interface EndpointLifecyclePayload {
     adapter: string;
-    endpointId: string;
+    endpointKey: string;
     endpoint: Endpoint;
     kind: EndpointLifecycleKind;
     error?: string;
@@ -12,9 +12,9 @@ export interface EndpointLifecyclePayload {
     detail?: Record<string, unknown>;
 }
 /** 可 JSON 序列化的生命周期载荷（不含 endpoint 实例引用） */
-export declare function serializeEndpointLifecyclePayload(payload: Pick<EndpointLifecyclePayload, 'adapter' | 'endpointId' | 'kind' | 'error' | 'phase' | 'detail'>): {
+export declare function serializeEndpointLifecyclePayload(payload: Pick<EndpointLifecyclePayload, 'adapter' | 'endpointKey' | 'kind' | 'error' | 'phase' | 'detail'>): {
     adapter: string;
-    endpointId: string;
+    endpointKey: string;
     kind: EndpointLifecycleKind;
     error: string | undefined;
     phase: string | undefined;

package/lib/built/endpoint-lifecycle.js

@@ -3,7 +3,7 @@ import { Notice } from '../notice.js';
 export function serializeEndpointLifecyclePayload(payload) {
     return {
         adapter: payload.adapter,
-        endpointId: payload.endpointId,
+        endpointKey: payload.endpointKey,
         kind: payload.kind,
         error: payload.error,
         phase: payload.phase,
@@ -13,7 +13,7 @@ export function serializeEndpointLifecyclePayload(payload) {
 export async function emitEndpointLifecycle(plugin, adapter, endpoint, kind, detail) {
     const payload = {
         adapter: String(adapter.name),
-        endpointId: endpoint.$id,
+        endpointKey: endpoint.$id,
         endpoint,
         kind,
         ...detail,

package/lib/built/endpoint-manager.d.ts

@@ -4,7 +4,7 @@ import type { Plugin } from '../plugin.js';
 /** zhin.config.endpoints[] 单条记录 */
 export type EndpointConfigRecord = Record<string, unknown> & {
     context: string;
-    name: string;
+    id: string;
 };
 export type EndpointStatusExtra = Record<string, unknown>;
 export interface ProvisionContext {

package/lib/built/interactive-segments/index.d.ts

@@ -4,5 +4,5 @@ export * from './action.js';
 export * from './resolve.js';
 export * from './handlers.js';
 export * from './fallback-store.js';
-export { KeyboardSegment, InteractiveSegment } from './keyboard-segment.js';
+export { KeyboardSegment } from './keyboard-segment.js';
 export * from './onebot-keyboard.js';

package/lib/built/interactive-segments/index.js

@@ -4,5 +4,5 @@ export * from './action.js';
 export * from './resolve.js';
 export * from './handlers.js';
 export * from './fallback-store.js';
-export { KeyboardSegment, InteractiveSegment } from './keyboard-segment.js';
+export { KeyboardSegment } from './keyboard-segment.js';
 export * from './onebot-keyboard.js';

package/lib/built/interactive-segments/keyboard-segment.d.ts

@@ -9,4 +9,3 @@ export declare class KeyboardSegment {
     };
 }
 /** @deprecated 使用 {@link KeyboardSegment} */
-export declare const InteractiveSegment: typeof KeyboardSegment;

package/lib/built/interactive-segments/keyboard-segment.js

@@ -10,4 +10,3 @@ export class KeyboardSegment {
     }
 }
 /** @deprecated 使用 {@link KeyboardSegment} */
-export const InteractiveSegment = KeyboardSegment;

package/lib/built/interactive-segments/onebot-keyboard.d.ts

@@ -2,9 +2,6 @@ import type { MessageSegment, SendContent } from '../../types.js';
 import { type KeyboardSegmentData } from './types.js';
 /** OneBot / QQ 系 keyboard 段（各 adapter 在 $sendMessage 中识别） */
 export declare function keyboardToOneBotSegment(data: KeyboardSegmentData): MessageSegment;
-/** @deprecated 使用 {@link keyboardToOneBotSegment} */
-export declare const interactiveToKeyboardSegment: typeof keyboardToOneBotSegment;
 /** 出站前将 core keyboard 段展开为 OneBot keyboard（保留前置 text 等段） */
 export declare function expandKeyboardSegmentsInContent(content: SendContent): SendContent;
 /** @deprecated 使用 {@link expandKeyboardSegmentsInContent} */
-export declare const expandInteractiveSegmentsInContent: typeof expandKeyboardSegmentsInContent;

package/lib/built/interactive-segments/onebot-keyboard.js

@@ -16,7 +16,6 @@ export function keyboardToOneBotSegment(data) {
     };
 }
 /** @deprecated 使用 {@link keyboardToOneBotSegment} */
-export const interactiveToKeyboardSegment = keyboardToOneBotSegment;
 function asKeyboardData(item) {
     if (item instanceof KeyboardSegment)
         return item.data;
@@ -50,4 +49,3 @@ export function expandKeyboardSegmentsInContent(content) {
     return out;
 }
 /** @deprecated 使用 {@link expandKeyboardSegmentsInContent} */
-export const expandInteractiveSegmentsInContent = expandKeyboardSegmentsInContent;

package/lib/built/interactive-segments/resolve.d.ts

@@ -11,8 +11,5 @@ export declare function collectKeyboardFallbackMaps(content: SendContent | undef
 export declare function renderKeyboardAsText(data: KeyboardSegmentData): string;
 export declare function hasKeyboardSegment(content: SendContent | undefined): boolean;
 /** @deprecated 使用 {@link hasKeyboardSegment} */
-export declare const hasInteractiveSegment: typeof hasKeyboardSegment;
 /** 按 Adapter interactivePolicy 将 keyboard 段转为 native 保留或文本降级 */
 export declare function resolveKeyboardSegments(content: SendContent, policy: InteractivePolicy): SendContent;
-/** @deprecated 使用 {@link resolveKeyboardSegments} */
-export declare const resolveInteractiveSegments: typeof resolveKeyboardSegments;

package/lib/built/interactive-segments/resolve.js

@@ -80,7 +80,6 @@ export function hasKeyboardSegment(content) {
     });
 }
 /** @deprecated 使用 {@link hasKeyboardSegment} */
-export const hasInteractiveSegment = hasKeyboardSegment;
 /** 按 Adapter interactivePolicy 将 keyboard 段转为 native 保留或文本降级 */
 export function resolveKeyboardSegments(content, policy) {
     if (!hasKeyboardSegment(content))
@@ -109,5 +108,3 @@ export function resolveKeyboardSegments(content, policy) {
     }
     return packSegments(out);
 }
-/** @deprecated 使用 {@link resolveKeyboardSegments} */
-export const resolveInteractiveSegments = resolveKeyboardSegments;

package/lib/built/interactive-segments/types.d.ts

@@ -1,11 +1,7 @@
 import type { MessageElement } from '../../types.js';
 export declare const KEYBOARD_SEGMENT_TYPE: "keyboard";
-/** @deprecated 使用 {@link KEYBOARD_SEGMENT_TYPE} */
-export declare const INTERACTIVE_SEGMENT_TYPE: "keyboard";
 export declare const ACTION_SEGMENT_TYPE: "action";
 export type ButtonStyle = 'primary' | 'danger' | 'secondary';
-/** @deprecated 使用 {@link ButtonStyle} */
-export type InteractiveButtonStyle = ButtonStyle;
 /** callback：平台回调 action 入站；command：QQ 指令预填后文本入站 */
 export type ButtonInteractionMode = 'callback' | 'command';
 export interface ButtonCommandOptions {
@@ -14,7 +10,7 @@ export interface ButtonCommandOptions {
     /** QQ action.reply — 预填时引用原消息 */
     reply?: boolean;
 }
-export interface ButtonData {
+export type ButtonData = {
     id: string;
     label: string;
     payload: string;
@@ -23,26 +19,20 @@ export interface ButtonData {
     /** 默认 callback */
     mode?: ButtonInteractionMode;
     command?: ButtonCommandOptions;
-}
-/** @deprecated 使用 {@link ButtonData} */
-export type InteractiveButton = ButtonData;
-export interface KeyboardFallback {
+};
+export type KeyboardFallback = {
     hint: string;
     map: Record<string, string>;
-}
-/** @deprecated 使用 {@link KeyboardFallback} */
-export type InteractiveFallback = KeyboardFallback;
-export interface KeyboardSegmentData {
+};
+export type KeyboardSegmentData = {
     rows: ButtonData[][];
     fallback?: KeyboardFallback;
-}
-/** @deprecated 使用 {@link KeyboardSegmentData} */
-export type InteractiveSegmentData = KeyboardSegmentData;
-export interface ActionSegmentData {
+};
+export type ActionSegmentData = {
     id: string;
     payload: string;
     sourceMessageId?: string;
-}
+};
 export type InteractivePolicy = 'native' | 'text';
 export declare const DEFAULT_INTERACTIVE_POLICY: InteractivePolicy;
 export type InteractiveHandler = (message: import('../../message.js').Message<any>) => Promise<boolean> | boolean;
@@ -54,8 +44,6 @@ export declare function isKeyboardSegment(item: MessageElement): item is Message
     type: typeof KEYBOARD_SEGMENT_TYPE;
     data: KeyboardSegmentData;
 };
-/** @deprecated 使用 {@link isKeyboardSegment} */
-export declare const isInteractiveSegment: typeof isKeyboardSegment;
 export declare function isActionSegment(item: MessageElement): item is MessageElement & {
     type: typeof ACTION_SEGMENT_TYPE;
     data: ActionSegmentData;

package/lib/built/interactive-segments/types.js

@@ -1,13 +1,9 @@
 export const KEYBOARD_SEGMENT_TYPE = 'keyboard';
-/** @deprecated 使用 {@link KEYBOARD_SEGMENT_TYPE} */
-export const INTERACTIVE_SEGMENT_TYPE = KEYBOARD_SEGMENT_TYPE;
 export const ACTION_SEGMENT_TYPE = 'action';
 export const DEFAULT_INTERACTIVE_POLICY = 'text';
 export function isKeyboardSegment(item) {
     return item != null && typeof item === 'object' && 'type' in item && item.type === KEYBOARD_SEGMENT_TYPE;
 }
-/** @deprecated 使用 {@link isKeyboardSegment} */
-export const isInteractiveSegment = isKeyboardSegment;
 export function isActionSegment(item) {
     return item != null && typeof item === 'object' && 'type' in item && item.type === ACTION_SEGMENT_TYPE;
 }

package/lib/built/login-assist.d.ts

@@ -26,7 +26,7 @@ export interface PendingLoginTaskPayload {
 export interface PendingLoginTask {
     id: string;
     adapter: string;
-    endpointId: string;
+    endpointKey: string;
     type: LoginAssistType;
     payload: PendingLoginTaskPayload;
     createdAt: number;
@@ -53,7 +53,7 @@ export declare class LoginAssist {
      * 生产者：等待用户输入后 resolve。会发出 endpoint.login.pending 事件，未消费前可被 listPending 拉取（刷新后可继续消费）。
      * 超时后 reject 并 emit `endpoint.login.expired`。
      */
-    waitForInput(adapter: string, endpointId: string, type: LoginAssistType, payload?: PendingLoginTaskPayload, options?: WaitForInputOptions): Promise<string | Record<string, unknown>>;
+    waitForInput(adapter: string, endpointKey: string, type: LoginAssistType, payload?: PendingLoginTaskPayload, options?: WaitForInputOptions): Promise<string | Record<string, unknown>>;
     /**
      * 消费者：提交结果，对应 waitForInput 的 Promise 会 resolve。
      */

package/lib/built/login-assist.js

@@ -28,14 +28,14 @@ export class LoginAssist {
      * 生产者：等待用户输入后 resolve。会发出 endpoint.login.pending 事件，未消费前可被 listPending 拉取（刷新后可继续消费）。
      * 超时后 reject 并 emit `endpoint.login.expired`。
      */
-    waitForInput(adapter, endpointId, type, payload = {}, options) {
+    waitForInput(adapter, endpointKey, type, payload = {}, options) {
         const id = `login-${Date.now()}-${++this.idSeq}`;
         const timeoutMs = resolveTimeoutMs(options?.timeoutMs, this.defaultTimeoutMs);
         const createdAt = Date.now();
         const task = {
             id,
             adapter,
-            endpointId,
+            endpointKey,
             type,
             payload: { message: payload.message ?? '', ...payload },
             createdAt,

package/lib/built/message-enrich.d.ts

@@ -35,5 +35,5 @@ export interface SyntheticMessageInput {
 export declare function createSyntheticMessage(input: SyntheticMessageInput): AgentTurnMessage;
 /** hook context 中的 commMessage 字段（AIHookEvent.context） */
 export declare function commMessageFromHookContext(context: Record<string, unknown>): Message<any> | undefined;
-/** 兼容 tool parameters 上的 contextKey（endpointId / sceneId / scope 等） */
+/** 兼容 tool parameters 上的 contextKey（endpointKey / sceneId / scope 等） */
 export declare function resolveContextKey(message: Message<any>, key: string): unknown;

package/lib/built/message-enrich.js

@@ -1,7 +1,6 @@
 import { Message } from '../message.js';
 import { hasSenderRole } from './roles.js';
 import { resolveSubjectRoles } from './authorization.js';
-import { getHostRootPlugin } from '../host-plugin-registry.js';
 function frameworkRolesFromSenderFlags(sender) {
     if (sender.isMaster)
         return ['master'];
@@ -14,10 +13,6 @@ export function senderRolesFromMessage(message) {
     if (sender.isMaster !== undefined || sender.isTrusted !== undefined) {
         return frameworkRolesFromSenderFlags(sender);
     }
-    const root = getHostRootPlugin();
-    if (root) {
-        return resolveSubjectRoles(root, message).roles;
-    }
     return ['user'];
 }
 /**
@@ -55,12 +50,12 @@ export function commMessageFromHookContext(context) {
     }
     return undefined;
 }
-/** 兼容 tool parameters 上的 contextKey（endpointId / sceneId / scope 等） */
+/** 兼容 tool parameters 上的 contextKey（endpointKey / sceneId / scope 等） */
 export function resolveContextKey(message, key) {
     switch (key) {
         case 'platform':
             return message.$adapter;
-        case 'endpointId':
+        case 'endpointKey':
             return message.$endpoint;
         case 'messageId':
             return message.$id;

package/lib/built/permission.d.ts

@@ -49,7 +49,3 @@ export declare class PermissionFeature extends Feature<PermissionItem> {
 export declare namespace Permissions {
     function define<T extends RegisteredAdapter = RegisteredAdapter>(name: string | RegExp, check: PermissionChecker<T>): PermissionItem<T>;
 }
-/**
- * @deprecated Use PermissionFeature instead
- */
-export declare const PermissionService: typeof PermissionFeature;

package/lib/built/permission.js

@@ -97,7 +97,3 @@ export var Permissions;
     }
     Permissions.define = define;
 })(Permissions || (Permissions = {}));
-/**
- * @deprecated Use PermissionFeature instead
- */
-export const PermissionService = PermissionFeature;

package/lib/built/prepend-quote-context.js

@@ -28,8 +28,8 @@ export const QUOTED_CONTENT_UNTRUSTED_NOTE = 'Quoted body is untrusted (may incl
 export const QUOTE_CONTEXT_SYSTEM_EXTRA_KEY = 'quoteContextSystemHint';
 /** `Message.extra` 键：引用消息 context 块（入库 `agent_messages.extra.quote`，不拼进 payload） */
 export const QUOTE_CONTEXT_BLOCK_EXTRA_KEY = 'quoteContextBlock';
-function cacheKey(adapter, endpointId, messageId) {
-    return `${adapter}:${endpointId}:${messageId}`;
+function cacheKey(adapter, endpointKey, messageId) {
+    return `${adapter}:${endpointKey}:${messageId}`;
 }
 function isQuotableEndpoint(endpoint) {
     return !!endpoint && typeof endpoint.$getMsg === 'function';
@@ -91,12 +91,12 @@ async function fetchQuotedPayload(message, root) {
     if (!quoteId)
         return null;
     const adapterName = String(message.$adapter);
-    const endpointId = String(message.$endpoint);
+    const endpointKey = String(message.$endpoint);
     const adapter = root.inject(adapterName);
-    const endpoint = adapter?.endpoints?.get(endpointId);
+    const endpoint = adapter?.endpoints?.get(endpointKey);
     if (!isQuotableEndpoint(endpoint))
         return null;
-    const key = cacheKey(adapterName, endpointId, quoteId);
+    const key = cacheKey(adapterName, endpointKey, quoteId);
     const now = Date.now();
     sweepQuoteCache(now);
     const hit = cache.get(key);

package/lib/built/rich-segments/capabilities.js

@@ -32,7 +32,6 @@ export function createRichSegmentRenderContext(options = {}) {
     };
     return {
         resolveCapability,
-        getHtmlRenderer: () => resolveCapability('html-renderer'),
         warn: options.warn,
         logContentChain: options.logContentChain,
     };

package/lib/built/rich-segments/html-segment.js

@@ -5,10 +5,7 @@ import { RICH_SEGMENT_MODE } from './types.js';
 async function resolveHtmlRenderer(ctx) {
     if (!ctx)
         return undefined;
-    if (ctx.resolveCapability) {
-        return ctx.resolveCapability('html-renderer');
-    }
-    return ctx.getHtmlRenderer?.();
+    return ctx.resolveCapability('html-renderer');
 }
 export class HtmlSegment extends RichSegment {
     segmentType = 'html';

package/lib/built/rich-segments/markdown-segment.js

@@ -5,10 +5,7 @@ import { RICH_SEGMENT_MODE } from './types.js';
 async function resolveHtmlRenderer(ctx) {
     if (!ctx)
         return undefined;
-    if (ctx.resolveCapability) {
-        return ctx.resolveCapability('html-renderer');
-    }
-    return ctx.getHtmlRenderer?.();
+    return ctx.resolveCapability('html-renderer');
 }
 export class MarkdownSegment extends RichSegment {
     segmentType = 'markdown';

package/lib/built/rich-segments/types.d.ts

@@ -21,9 +21,6 @@ export declare const RICH_SEGMENT_MODE: {
 export type RichSegmentMode = (typeof RICH_SEGMENT_MODE)[keyof typeof RICH_SEGMENT_MODE] | string;
 /** 任意已注册 kind → 渲染 mode */
 export type OutboundRichSegmentPolicy = Record<string, string>;
-/** @deprecated 使用 OutboundRichSegmentPolicy；保留别名便于迁移 */
-export type RichSegmentKind = string;
-export type RichRenderMode = string;
 /** html-renderer 可选包契约 */
 export interface HtmlRendererForRichSegment {
     render(html: string, options?: {
@@ -57,8 +54,6 @@ export type RichSegmentCapabilityId = 'html-renderer' | 'speech' | 'media-pipeli
 export interface RichSegmentRenderContext {
     /** 按 id 懒加载能力（core 或 optional 包 register loader） */
     resolveCapability: <T>(id: RichSegmentCapabilityId) => Promise<T | undefined>;
-    /** @deprecated 请用 resolveCapability('html-renderer') */
-    getHtmlRenderer?: () => Promise<HtmlRendererForRichSegment | undefined>;
     /** 可选：rich_segment stage 结构化日志 */
     logContentChain?: (fields: ContentChainLogFields) => void;
     warn?: (message: string) => void;

package/lib/built/schema-endpoint-manager.js

@@ -20,16 +20,16 @@ export class SchemaEndpointManager {
     async addEndpoint(ctx) {
         const prompt = new Prompt(this.adapter.plugin, ctx.message);
         await ctx.onStatusUpdate(`请按提示填写 ${String(this.adapter.name)} endpoint 配置：`);
-        const name = await prompt.text('Endpoint 名称（zhin.config endpoints[].name）：');
+        const name = await prompt.text('Endpoint id（zhin.config endpoints[].id）：');
         const fields = await prompt.getValueWithSchema(this.schema);
         return {
             context: String(this.adapter.name),
-            name: name.trim(),
+            id: name.trim(),
             ...fields,
         };
     }
     async editEndpoint(name, ctx) {
-        const existing = this.listEndpoints().find((e) => e.name === name);
+        const existing = this.listEndpoints().find((e) => e.id === name);
         if (!existing) {
             throw new Error(`配置中不存在 ${String(this.adapter.name)}/${name}`);
         }
@@ -40,14 +40,14 @@ export class SchemaEndpointManager {
             ...existing,
             ...fields,
             context: String(this.adapter.name),
-            name,
+            id: name,
         };
     }
     async removeEndpoint(name) {
-        return this.listEndpoints().some((e) => e.name === name);
+        return this.listEndpoints().some((e) => e.id === name);
     }
     async startEndpoint(name, ctx) {
-        const rec = this.listEndpoints().find((e) => e.name === name);
+        const rec = this.listEndpoints().find((e) => e.id === name);
         if (!rec)
             throw new Error(`配置中不存在 ${String(this.adapter.name)}/${name}`);
         await ctx.onStatusUpdate(`正在连接 ${String(this.adapter.name)}/${name}…`);

package/lib/built/tool.d.ts

@@ -5,10 +5,12 @@
 import { Feature, FeatureJSON } from "@zhin.js/kernel";
 import type { Tool, ToolJsonSchema, ToolParametersSchema, PropertySchema, MaybePromise, ToolScope } from "../types.js";
 import type { Message } from "../message.js";
+import { type PermissionHost } from '@zhin.js/permission';
 /**
- * 检查工具是否可被当前 Message 通讯上下文访问
+ * 检查工具是否可被当前 Message 通讯上下文访问。
+ * `host` 为 PermissionHost 实例；无 host 且有 permissions → deny。
  */
-export declare function canAccessTool(tool: Tool, message?: Message<any>): boolean;
+export declare function canAccessTool(tool: Tool, message?: Message<any>, host?: PermissionHost | null): Promise<boolean>;
 /**
  * 从参数定义中提取参数信息
  */
@@ -122,7 +124,7 @@ export declare class ToolFeature extends Feature<Tool> {
     /**
      * 根据 Message 通讯上下文过滤工具
      */
-    filterByContext(tools: Tool[], message?: Message<any>): Tool[];
+    filterByContext(tools: Tool[], message?: Message<any>, host?: PermissionHost | null): Promise<Tool[]>;
     /**
      * 按插件名获取工具
      */

package/lib/built/tool.js

@@ -3,14 +3,12 @@
  * 工具仅面向 AI（通过 MCP 注册），不再与 Command 互转
  */
 import { Feature } from "@zhin.js/kernel";
-import { isBuiltinPermit, isPlatformPermit } from './permit-parse.js';
-import { checkBuiltinPermit } from './permit-check.js';
-import { checkPlatformPermit } from './platform-permit.js';
-import { senderRolesFromMessage } from './message-enrich.js';
+import { toPermissionSubject } from '@zhin.js/permission';
 /**
- * 检查工具是否可被当前 Message 通讯上下文访问
+ * 检查工具是否可被当前 Message 通讯上下文访问。
+ * `host` 为 PermissionHost 实例；无 host 且有 permissions → deny。
  */
-export function canAccessTool(tool, message) {
+export async function canAccessTool(tool, message, host) {
     if (!message)
         return !tool.platforms?.length && !tool.scopes?.length && !tool.permissions?.length;
     const adapter = String(message.$adapter);
@@ -23,21 +21,10 @@ export function canAccessTool(tool, message) {
     }
     if (!tool.permissions?.length)
         return true;
-    const roles = senderRolesFromMessage(message);
-    for (const permit of tool.permissions) {
-        if (isBuiltinPermit(permit)) {
-            if (!checkBuiltinPermit(permit, message, roles))
-                return false;
-        }
-        else if (isPlatformPermit(permit)) {
-            if (!checkPlatformPermit(permit, message))
-                return false;
-        }
-        else {
-            return false;
-        }
-    }
-    return true;
+    if (!host)
+        return false;
+    const subject = toPermissionSubject(message);
+    return host.checkAll(tool.permissions, subject);
 }
 // ============================================================================
 // Tool 工具函数
@@ -330,8 +317,12 @@ export class ToolFeature extends Feature {
     /**
      * 根据 Message 通讯上下文过滤工具
      */
-    filterByContext(tools, message) {
-        return tools.filter(tool => canAccessTool(tool, message));
+    async filterByContext(tools, message, host) {
+        const results = await Promise.all(tools.map(async (tool) => ({
+            tool,
+            allowed: await canAccessTool(tool, message, host),
+        })));
+        return results.filter((r) => r.allowed).map((r) => r.tool);
     }
     /**
      * 按插件名获取工具

package/lib/command.d.ts

@@ -1,7 +1,7 @@
 import { MatchResult, SegmentMatcher } from 'segment-matcher';
 import { AdapterMessage, SendContent, RegisteredAdapter, MaybePromise } from './types.js';
 import type { Message } from './message.js';
-import { Plugin } from './plugin.js';
+import { type PermissionHost } from '@zhin.js/permission';
 type ConstructFirstParam<T extends new (...args: any[]) => any> = T extends new (...args: [infer U, ...any[]]) => any ? U : never;
 type ConstructSecondParam<T extends new (...args: any[]) => any> = T extends new (...args: [any, infer V, ...any[]]) => any ? V : never;
 /**
@@ -28,14 +28,14 @@ export declare class MessageCommand<T extends RegisteredAdapter = RegisteredAdap
     /** 命令要求的 permit 列表（空表示所有人可用） */
     get requiredPermits(): readonly string[];
     /** 与 handle 一致的 permit 校验，供帮助菜单等场景过滤不可见命令 */
-    checkPermits(message: Message<AdapterMessage<T>>, plugin: Plugin): Promise<boolean>;
+    checkPermits(message: Message<AdapterMessage<T>>, host: PermissionHost | null): Promise<boolean>;
     /**
      * 处理消息，自动匹配命令并执行回调
      * @param message 消息对象
-     * @param plugin 插件实例
+     * @param host PermissionHost（null 时有 permit 的命令 fail-closed）
      * @returns 命令返回内容或undefined
      */
-    handle(message: Message<AdapterMessage<T>>, plugin: Plugin): Promise<SendContent | undefined>;
+    handle(message: Message<AdapterMessage<T>>, host: PermissionHost | null): Promise<SendContent | undefined>;
 }
 export declare namespace MessageCommand {
     type Callback<T extends RegisteredAdapter> = (message: Message<AdapterMessage<T>>, result: MatchResult) => SendContent | undefined | Promise<SendContent | undefined>;