@zhin.js/core 1.3.2 → 1.3.4

package/lib/built/component.js

@@ -2,9 +2,8 @@
  * ComponentFeature
  * 管理所有插件注册的组件，继承自 Feature 抽象类
  */
-import { Feature } from "@zhin.js/kernel";
+import { Feature } from '@zhin.js/kernel';
 import { renderComponents } from "../component.js";
-import { getPlugin } from "../plugin.js";
 /**
  * 组件服务 Feature
  */
@@ -87,7 +86,7 @@ export class ComponentFeature extends Feature {
         const feature = this;
         return {
             addComponent(component) {
-                const plugin = getPlugin();
+                const plugin = this;
                 const dispose = feature.add(component, plugin.name);
                 plugin.recordFeatureContribution(feature.name, component.name);
                 plugin.onDispose(dispose);
@@ -96,4 +95,3 @@ export class ComponentFeature extends Feature {
         };
     }
 }
-//# sourceMappingURL=component.js.map

package/lib/built/config.d.ts

@@ -10,6 +10,8 @@ export declare class ConfigLoader<T extends object> {
     get data(): T;
     get raw(): T;
     get extension(): string;
+    /** `load()` / `patchKey()` 使用的绝对路径 */
+    get resolvedPath(): string;
     constructor(filename: string, initial: T, schema?: Schema<T> | undefined);
     resolvePath(baseDir?: string): string;
     load(baseDir?: string): void;
@@ -20,6 +22,8 @@ export declare class ConfigLoader<T extends object> {
      */
     patchKey(key: string, value: any): void;
 }
+/** 解析 endpoint 配置中的 `${ENV}` 引用（运行时 add 后热连接用） */
+export declare function resolveEndpointConfigEnv(config: Record<string, unknown>): Record<string, unknown>;
 export declare function mergeConfigDefaults<T>(defaults: T, overrides: unknown): T;
 export declare namespace ConfigLoader {
     const supportedExtensions: string[];
@@ -96,4 +100,3 @@ export declare class ConfigFeature extends Feature<ConfigRecord> {
  * @deprecated Use ConfigFeature instead
  */
 export declare const ConfigService: typeof ConfigFeature;
-//# sourceMappingURL=config.d.ts.map

package/lib/built/config.js

@@ -8,7 +8,6 @@ import fs from "node:fs";
 import { stringify as stringifyYaml, parse as parseYaml, parseDocument } from "yaml";
 import { parse as parseToml, stringify as stringifyToml } from "smol-toml";
 import { Feature } from "@zhin.js/kernel";
-import { getPlugin } from "../plugin.js";
 /** Deno / Node 统一的工作目录（`Deno.chdir` 后应与 `process.cwd()` 一致） */
 export function runtimeCwd() {
     const g = globalThis;
@@ -37,6 +36,10 @@ export class ConfigLoader {
     get extension() {
         return path.extname(this.filename).toLowerCase();
     }
+    /** `load()` / `patchKey()` 使用的绝对路径 */
+    get resolvedPath() {
+        return this.#resolvedPath || this.resolvePath();
+    }
     constructor(filename, initial, schema) {
         this.filename = filename;
         this.initial = initial;
@@ -96,8 +99,10 @@ export class ConfigLoader {
             ? this.filename
             : path.resolve(baseDir, this.filename);
     }
-    load(baseDir = runtimeCwd()) {
-        const fullPath = this.resolvePath(baseDir);
+    load(baseDir) {
+        const fullPath = baseDir !== undefined
+            ? this.resolvePath(baseDir)
+            : (this.#resolvedPath || this.resolvePath());
         this.#resolvedPath = fullPath;
         if (!fs.existsSync(fullPath)) {
             try {
@@ -197,6 +202,23 @@ function isPlainObject(value) {
         && !Array.isArray(value)
         && Object.getPrototypeOf(value) === Object.prototype;
 }
+/** 解析 endpoint 配置中的 `${ENV}` 引用（运行时 add 后热连接用） */
+export function resolveEndpointConfigEnv(config) {
+    const out = { ...config };
+    for (const [key, value] of Object.entries(out)) {
+        if (typeof value !== 'string')
+            continue;
+        const match = value.match(/^\$\{([^}]+)\}$/);
+        if (!match)
+            continue;
+        const envKey = match[1];
+        const resolved = envLookup(envKey);
+        if (resolved != null && resolved !== '') {
+            out[key] = resolved;
+        }
+    }
+    return out;
+}
 export function mergeConfigDefaults(defaults, overrides) {
     if (Array.isArray(defaults)) {
         return (Array.isArray(overrides) ? overrides : defaults);
@@ -327,7 +349,7 @@ export class ConfigFeature extends Feature {
         const feature = this;
         return {
             addConfig(key, defaultValue) {
-                const plugin = getPlugin();
+                const plugin = this;
                 // 尝试写入主配置文件（如果 key 不存在）
                 if (feature.#primaryConfigFile) {
                     const config = feature.configs.get(feature.#primaryConfigFile);
@@ -352,4 +374,3 @@ export class ConfigFeature extends Feature {
  * @deprecated Use ConfigFeature instead
  */
 export const ConfigService = ConfigFeature;
-//# sourceMappingURL=config.js.map

package/lib/built/connect-endpoint-instance.d.ts

@@ -15,4 +15,3 @@ export declare function connectEndpointInstance(options: ConnectEndpointInstance
  * 按 Endpoint capabilities 断开单个实例。
  */
 export declare function disconnectEndpointInstance(plugin: Plugin, adapter: Adapter, endpoint: Endpoint): Promise<void>;
-//# sourceMappingURL=connect-endpoint-instance.d.ts.map

package/lib/built/connect-endpoint-instance.js

@@ -1,5 +1,6 @@
 import { assertInbound, getAdapterCapabilities, hasInbound, registerEndpointCapabilities, resolveEndpointCapabilities, } from '../endpoint-capabilities.js';
 import { emitEndpointLifecycle } from './endpoint-lifecycle.js';
+import { resolveEndpointConfigEnv } from './config.js';
 /**
  * 按 Endpoint capabilities 连接或注册单个实例（connectEndpoints 与 Adapter.start 共用）。
  */
@@ -7,7 +8,8 @@ export async function connectEndpointInstance(options) {
     const { plugin, adapter, config } = options;
     const adapterCaps = getAdapterCapabilities(adapter);
     const caps = resolveEndpointCapabilities(adapterCaps, config.capabilities);
-    const endpoint = adapter.createEndpoint(config);
+    const resolvedConfig = resolveEndpointConfigEnv(config);
+    const endpoint = adapter.createEndpoint(resolvedConfig);
     registerEndpointCapabilities(endpoint, caps);
     if (caps.includes('inbound')) {
         assertInbound(endpoint);
@@ -38,4 +40,3 @@ export async function disconnectEndpointInstance(plugin, adapter, endpoint) {
     await endpoint.$disconnect();
     await emitEndpointLifecycle(plugin, adapter, endpoint, 'disconnect');
 }
-//# sourceMappingURL=connect-endpoint-instance.js.map

package/lib/built/database.d.ts

@@ -4,8 +4,7 @@
  */
 import { Definition, Database } from "@zhin.js/database";
 import { DatabaseConfig, Models } from "../types.js";
-import { Feature, FeatureJSON } from "@zhin.js/kernel";
-import type { PluginLike } from '@zhin.js/kernel';
+import { Feature, FeatureJSON, type PluginLike } from '@zhin.js/kernel';
 /**
  * 模型定义记录
  */
@@ -67,4 +66,3 @@ export declare class DatabaseFeature extends Feature<ModelRecord> {
     };
 }
 export {};
-//# sourceMappingURL=database.d.ts.map

package/lib/built/database.js

@@ -4,8 +4,7 @@
  */
 import { Registry } from "@zhin.js/database";
 import { formatCompact } from '@zhin.js/logger';
-import { Feature } from "@zhin.js/kernel";
-import { getPlugin } from "../plugin.js";
+import { Feature } from '@zhin.js/kernel';
 import { SystemLogDefinition } from "../models/system-log.js";
 import { UserDefinition } from "../models/user.js";
 const databaseAfterStartHooks = [];
@@ -96,7 +95,7 @@ export class DatabaseFeature extends Feature {
         const feature = this;
         return {
             defineModel(name, definition) {
-                const plugin = getPlugin();
+                const plugin = this;
                 const record = { name: name, definition };
                 const dispose = feature.add(record, plugin.name);
                 plugin.recordFeatureContribution(feature.name, name);
@@ -105,4 +104,3 @@ export class DatabaseFeature extends Feature {
         };
     }
 }
-//# sourceMappingURL=database.js.map

package/lib/built/dispatcher.d.ts

@@ -27,12 +27,9 @@
  * 默认路由为 exclusive（命令与 AI 互斥）；需双轨时请显式 dualRoute.mode: 'dual'。
  */
 import { Message } from '../message.js';
-import type { MessageMiddleware, RegisteredAdapter, MaybePromise, SendContent, OutboundReplySource, OutboundPolishMiddleware } from '../types.js';
-import type { Context } from '../plugin.js';
-export declare function getOutboundReplyStore(): {
-    message: Message<any>;
-    source: OutboundReplySource;
-} | undefined;
+import { type Context } from '../plugin.js';
+import type { MessageMiddleware, RegisteredAdapter, MaybePromise, SendContent, OutboundReplySource, OutboundPolishMiddleware, OutboundReplyStore } from '../types.js';
+export declare function getOutboundReplyStore(): OutboundReplyStore | undefined;
 /**
  * 路由判定结果（互斥模式 legacy）
  */
@@ -110,6 +107,10 @@ export interface MessageDispatcherService {
      * 在 `before.sendMessage` 管道内调用 `message.$reply`（与 Adapter#sendMessage 同一出站链）
      */
     replyWithPolish(message: Message<any>, source: ReplySource, content: SendContent, options?: ReplyWithPolishOptions): Promise<unknown>;
+    /** Proactive 出站：在 ALS 内执行 send，触发 outbound polish / before.sendMessage */
+    runWithOutboundPolish<T>(store: Pick<OutboundReplyStore, 'message' | 'trigger' | 'proactiveSource'> & {
+        source?: OutboundReplySource;
+    }, fn: () => Promise<T>): Promise<T>;
     /**
      * 是否匹配为指令路径（与 dispatch 内判定一致）
      */
@@ -136,4 +137,3 @@ declare module '../plugin.js' {
     }
 }
 export declare function createMessageDispatcher(options?: CreateMessageDispatcherOptions): Context<'dispatcher', DispatcherContextExtensions>;
-//# sourceMappingURL=dispatcher.d.ts.map

package/lib/built/dispatcher.js

@@ -27,7 +27,7 @@
  * 默认路由为 exclusive（命令与 AI 互斥）；需双轨时请显式 dualRoute.mode: 'dual'。
  */
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { getPlugin } from '../plugin.js';
+import { isActionMessage } from './interactive-segments/action.js';
 /** Dispatcher 管理的「会话回复」异步上下文，供 `before.sendMessage` 内读取（与 Adapter.renderSendMessage 同链） */
 const outboundReplyAls = new AsyncLocalStorage();
 export function getOutboundReplyStore() {
@@ -206,10 +206,22 @@ export function createMessageDispatcher(options) {
         if (!rootPlugin) {
             return quote ? message.$reply(content, quote) : message.$reply(content);
         }
-        return outboundReplyAls.run({ message, source }, () => quote ? message.$reply(content, quote) : message.$reply(content));
+        return outboundReplyAls.run({
+            message,
+            source,
+            trigger: 'inbound',
+        }, () => quote ? message.$reply(content, quote) : message.$reply(content));
+    }
+    async function runWithOutboundPolish(store, fn) {
+        return outboundReplyAls.run({
+            message: store.message,
+            source: store.source ?? 'proactive',
+            trigger: store.trigger,
+            proactiveSource: store.proactiveSource,
+        }, fn);
     }
     async function maybeRecordGroupPassiveContext(message) {
-        if (!groupPassiveContextHandler)
+        if (!groupPassiveContextHandler || isActionMessage(message))
             return;
         const scope = message.$channel?.type;
         if (scope !== 'group' && scope !== 'channel')
@@ -336,6 +348,9 @@ export function createMessageDispatcher(options) {
         replyWithPolish(message, source, content, options) {
             return replyWithPolishInternal(message, source, content, options);
         },
+        runWithOutboundPolish(store, fn) {
+            return runWithOutboundPolish(store, fn);
+        },
         matchCommand(message) {
             return matchCommandInternal(message);
         },
@@ -354,18 +369,15 @@ export function createMessageDispatcher(options) {
         },
         extensions: {
             addGuardrail(guardrail) {
-                const plugin = getPlugin();
                 const dispose = service.addGuardrail(guardrail);
-                plugin.onDispose(dispose);
+                rootPlugin?.onDispose(dispose);
                 return dispose;
             },
             addOutboundPolish(handler) {
-                const plugin = getPlugin();
                 const dispose = service.addOutboundPolish(handler);
-                plugin.onDispose(dispose);
+                rootPlugin?.onDispose(dispose);
                 return dispose;
             },
         },
     };
 }
-//# sourceMappingURL=dispatcher.js.map

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

@@ -1,4 +1,3 @@
 import type { CommandFeature } from './command.js';
 import type { Plugin } from '../plugin.js';
 export declare function registerEndpointManagementCommands(plugin: Plugin, commandService: CommandFeature): () => void;
-//# sourceMappingURL=endpoint-commands.d.ts.map

package/lib/built/endpoint-commands.js

@@ -3,7 +3,7 @@
  */
 import { Adapter } from '../adapter.js';
 import { MessageCommand } from '../command.js';
-import { rejectUnlessManagementOperator } from './management-command-guard.js';
+import { MANAGEMENT_OPERATOR_PERMIT } from './management-command-guard.js';
 import { createEndpointLifecycleService } from './endpoint-lifecycle-service.js';
 import { endpointHelpText, formatEndpointsList } from './introspection-format.js';
 function collectRuntimeEndpoints(root) {
@@ -26,17 +26,11 @@ export function registerEndpointManagementCommands(plugin, commandService) {
     const root = plugin.root;
     const disposers = [];
     const service = () => createEndpointLifecycleService(root);
-    const guard = (message) => {
-        const ai = root.inject('ai');
-        return rejectUnlessManagementOperator(message, root, ai?.getTriggerConfig?.());
-    };
     const register = (pattern, desc, handler) => {
         const cmd = new MessageCommand(pattern)
             .desc(desc)
+            .permit(MANAGEMENT_OPERATOR_PERMIT)
             .action(async (message, match) => {
-            const denied = guard(message);
-            if (denied)
-                return denied;
             try {
                 return await handler(message, match);
             }
@@ -93,10 +87,13 @@ export function registerEndpointManagementCommands(plugin, commandService) {
         }
         return '已取消 Endpoint 绑定流程。';
     });
+    register('/endpoint sync', '将内存中的 endpoint 配置写回 zhin.config', async () => {
+        const result = await service().syncToDisk();
+        return result.message;
+    });
     register('/endpoints', '列出各适配器下的 Endpoint 及在线状态', () => formatEndpointsList(collectRuntimeEndpoints(root)));
     return () => {
         for (const d of disposers)
             d();
     };
 }
-//# sourceMappingURL=endpoint-commands.js.map

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

@@ -14,6 +14,8 @@ export declare class EndpointLifecycleService {
     resolveManager(adapterKey: string): EndpointManager;
     listProvisionableAdapters(): string[];
     persistEndpoints(endpoints: EndpointConfigRecord[]): Promise<void>;
+    /** 将内存中的 endpoints 写回 zhin.config（修复运行时与磁盘不一致） */
+    syncToDisk(): Promise<EndpointLifecycleResult>;
     connectConfig(adapter: Adapter, config: EndpointConfigRecord): Promise<Endpoint>;
     disconnectRuntime(adapter: Adapter, name: string): Promise<boolean>;
     add(adapterKey: string, message: Message, initialReply?: string): Promise<EndpointLifecycleResult>;
@@ -24,4 +26,3 @@ export declare class EndpointLifecycleService {
     cancelProvision(): boolean;
 }
 export declare function createEndpointLifecycleService(root: Plugin): EndpointLifecycleService;
-//# sourceMappingURL=endpoint-lifecycle-service.d.ts.map

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

@@ -1,3 +1,4 @@
+import { formatDisplayPath } from '@zhin.js/logger';
 import { Adapter } from '../adapter.js';
 import { segment } from '../utils.js';
 import { connectEndpointInstance, disconnectEndpointInstance } from './connect-endpoint-instance.js';
@@ -74,7 +75,18 @@ export class EndpointLifecycleService {
         const configService = getConfigService(this.root);
         const loader = configService.configs.get(configService.primaryFile);
         loader.patchKey('endpoints', endpoints);
-        loader.load();
+    }
+    /** 将内存中的 endpoints 写回 zhin.config（修复运行时与磁盘不一致） */
+    async syncToDisk() {
+        const configService = getConfigService(this.root);
+        const loader = configService.configs.get(configService.primaryFile);
+        const endpoints = readAllEndpoints(this.root);
+        await this.persistEndpoints(endpoints);
+        const configPath = formatDisplayPath(loader.resolvedPath);
+        const names = endpoints.map((e) => `${e.context}/${e.name}`).join(', ') || '（无）';
+        return {
+            message: `✅ 已将 ${endpoints.length} 个 endpoint 写入 \`${configPath}\`：${names}`,
+        };
     }
     async connectConfig(adapter, config) {
         const name = config.name;
@@ -110,7 +122,19 @@ export class EndpointLifecycleService {
             throw new Error('Endpoint 名称不能为空');
         }
         const endpoints = readAllEndpoints(this.root);
-        assertUniqueName(endpoints, config.context, config.name);
+        try {
+            assertUniqueName(endpoints, config.context, config.name);
+        }
+        catch (err) {
+            if (err instanceof Error && err.message.includes('已存在')) {
+                const online = adapter.endpoints.has(config.name);
+                const hint = online
+                    ? '该 Endpoint 已在运行时注册，无需重复扫码；可发 /endpoints 确认。若 zhin.config.yml 未更新，请 /endpoint sync。'
+                    : '可用 /endpoint start 重试连接，或 /endpoint remove 后重新添加。';
+                throw new Error(`${err.message}。${hint}`);
+            }
+            throw err;
+        }
         endpoints.push(config);
         await this.persistEndpoints(endpoints);
         try {
@@ -216,4 +240,3 @@ export class EndpointLifecycleService {
 export function createEndpointLifecycleService(root) {
     return new EndpointLifecycleService(root);
 }
-//# sourceMappingURL=endpoint-lifecycle-service.js.map

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

@@ -25,4 +25,3 @@ export declare function emitEndpointLifecycle(plugin: Plugin, adapter: Adapter,
     phase?: string;
     detail?: Record<string, unknown>;
 }): Promise<void>;
-//# sourceMappingURL=endpoint-lifecycle.d.ts.map

package/lib/built/endpoint-lifecycle.js

@@ -26,11 +26,11 @@ export async function emitEndpointLifecycle(plugin, adapter, endpoint, kind, det
         $id: `endpoint-lifecycle:${endpoint.$id}:${kind}:${Date.now()}`,
         $adapter: adapter.name,
         $endpoint: endpoint.$id,
-        $type: 'endpoint.lifecycle',
-        $subType: kind,
-        $channel: { id: endpoint.$id, type: 'private' },
+        $type: 'notice',
+        $scene_id: endpoint.$id,
+        $scene_type: 'endpoint',
+        $sub_type: kind,
         $timestamp: Date.now(),
     });
     adapter.emit('notice.receive', notice);
 }
-//# sourceMappingURL=endpoint-lifecycle.js.map

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

@@ -32,4 +32,3 @@ export interface EndpointManagerClass {
     /** 通用 schema 驱动 add/edit 时使用 */
     readonly endpointConfigSchema?: Schema;
 }
-//# sourceMappingURL=endpoint-manager.d.ts.map

package/lib/built/endpoint-manager.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=endpoint-manager.js.map

package/lib/built/generated-qrcode.d.ts

@@ -22,4 +22,3 @@ export declare class GeneratedQrCode {
 }
 /** 便捷别名 */
 export declare const generateQrCode: typeof GeneratedQrCode.generate;
-//# sourceMappingURL=generated-qrcode.d.ts.map

package/lib/built/generated-qrcode.js

@@ -43,4 +43,3 @@ export class GeneratedQrCode {
 }
 /** 便捷别名 */
 export const generateQrCode = GeneratedQrCode.generate.bind(GeneratedQrCode);
-//# sourceMappingURL=generated-qrcode.js.map

package/lib/built/generic-segment-mapper.d.ts

@@ -0,0 +1,6 @@
+import type { MessageElement, SendContent } from '../types.js';
+import type { Segment } from './segment-contract/types.js';
+/** 通用 IM adapter：legacy wire → canonical Segment[] */
+export declare function toCanonicalSegments(content: readonly MessageElement[] | readonly unknown[]): Segment[];
+/** canonical → wire（mention→at；image MediaRef→legacy 字段） */
+export declare function fromCanonicalSegments(content: SendContent): MessageElement[];