@zhin.js/agent 1.1.23 → 1.1.26

package/lib/discovery/agents.js

@@ -1,135 +1,136 @@
 /**
- * Agent 预设发现（分形 agents/<name>/ 目录）
+ * Canonical sub-agent discovery.
  *
- * 加载顺序：Workspace > ~/.zhin > data > 插件包 agent/subagents（由 register-agent-surface 处理）
- * 同名先发现者优先
+ * A main Agent reads the standard project AGENTS.md chain. Named sub-agents are
+ * self-contained packages under agents/<name>/ and are described by agent.json.
  */
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
-import { getLogger } from '@zhin.js/core';
+import { getLogger } from '@zhin.js/logger';
+import { rootPluginId } from '@zhin.js/plugin-runtime';
+import { agentFeatureId, parseAgentPackage, } from '@zhin.js/agent-feature';
 import { workspaceRoot } from './utils.js';
-import { discoverWorkspaceFractalAgent, resolvePluginPackageRoot, } from './agent-surface.js';
-import { isAuthoringDefinition } from '../authoring/types.js';
-import { normalizeToolDenylist } from '../authoring/disable-tool.js';
-const KNOWN_AGENT_ROLES = new Set([
-    'subtask', 'worker', 'researcher', 'evaluator', 'executor', 'reviewer', 'planner',
-]);
 const logger = getLogger('builtin-tools');
-async function importAgentDefinition(agentFile) {
+async function readResourceDirectory(agentDir, name) {
+    const directory = path.join(agentDir, name);
+    let entries;
     try {
-        const url = `file://${path.resolve(agentFile)}?t=${Date.now()}`;
-        const mod = await import(url);
-        const exported = mod.default ?? mod;
-        if (isAuthoringDefinition(exported, 'agent'))
-            return exported;
+        entries = await fs.promises.readdir(directory, { withFileTypes: true });
     }
-    catch (e) {
-        logger.debug(`Failed to import agent definition ${agentFile}: ${e}`);
+    catch {
+        return [];
     }
-    return undefined;
+    return Promise.all(entries
+        .filter((entry) => entry.isFile() && /^[a-zA-Z0-9][a-zA-Z0-9._-]*\.(?:md|txt|json|ya?ml|csv|sh)$/u.test(entry.name))
+        .sort((left, right) => left.name.localeCompare(right.name))
+        .map(async (entry) => Object.freeze({
+        path: `${name}/${entry.name}`,
+        content: await fs.promises.readFile(path.join(directory, entry.name), 'utf8'),
+    })));
 }
-function agentMetaFromFractal(name, agentDir, def, instructionsBody, ownerPlugin) {
-    const description = def?.description;
-    if (!description && !instructionsBody)
-        return null;
-    const agentFile = [path.join(agentDir, 'agent.ts'), path.join(agentDir, 'agent.js')]
-        .find((p) => fs.existsSync(p)) ?? path.join(agentDir, 'agent.ts');
-    const roleRaw = def?.role?.trim();
+async function loadAgentDefinition(agentDir) {
+    const manifestPath = path.join(agentDir, 'agent.json');
+    const manifest = JSON.parse(await fs.promises.readFile(manifestPath, 'utf8'));
+    const entries = await fs.promises.readdir(agentDir, { withFileTypes: true });
+    const files = Object.fromEntries(await Promise.all(entries
+        .filter((entry) => entry.isFile() && entry.name !== 'agent.json')
+        .map(async (entry) => [
+        entry.name,
+        await fs.promises.readFile(path.join(agentDir, entry.name), 'utf8'),
+    ])));
+    const source = {
+        manifest,
+        files,
+        workflows: await readResourceDirectory(agentDir, 'workflows'),
+        knowledge: await readResourceDirectory(agentDir, 'knowledge'),
+        privateToolNames: (await childDirectories(path.join(agentDir, 'tools')))
+            .map((name) => `agent__${path.basename(agentDir)}__${name}`),
+        privateSkillNames: (await childDirectories(path.join(agentDir, 'skills')))
+            .map((name) => `agent__${path.basename(agentDir)}__${name}`),
+    };
+    return parseAgentPackage(source, {
+        owner: rootPluginId(),
+        feature: agentFeatureId,
+        localName: path.basename(agentDir),
+        source: manifestPath,
+    });
+}
+function toAgentMeta(definition, agentDir) {
     return {
-        name,
-        description: description ?? name,
-        keywords: def?.keywords,
-        tags: def?.tags,
-        toolNames: def?.toolNames,
-        disallowedTools: normalizeToolDenylist(def?.disallowedTools),
-        filePath: agentFile,
-        maxIterations: def?.maxIterations,
-        ownerPlugin,
-        role: roleRaw && KNOWN_AGENT_ROLES.has(roleRaw) ? roleRaw : undefined,
-        contextMode: def?.contextMode,
+        name: definition.name,
+        displayName: definition.displayName,
+        version: definition.version,
+        description: definition.description,
+        keywords: [...definition.triggerRules.keywords],
+        filePatterns: [...definition.triggerRules.filePatterns],
+        tags: definition.tags ? [...definition.tags] : undefined,
+        toolNames: definition.toolNames ? [...definition.toolNames] : undefined,
+        disallowedTools: definition.disallowedTools ? [...definition.disallowedTools] : undefined,
+        filePath: path.join(agentDir, 'agent.json'),
+        systemPrompt: definition.instructions,
+        maxIterations: definition.maxIterations,
+        role: definition.role,
+        contextMode: definition.contextMode,
+        model: definition.model,
+        provider: definition.provider,
+        effort: definition.effort,
+        memory: definition.memory,
+        skillNames: definition.skillNames ? [...definition.skillNames] : undefined,
     };
 }
-async function discoverFractalAgentsInDir(agentsDir, ownerPlugin) {
-    const agents = [];
-    if (!fs.existsSync(agentsDir))
-        return agents;
+async function childDirectories(directory) {
+    try {
+        return (await fs.promises.readdir(directory, { withFileTypes: true }))
+            .filter((entry) => entry.isDirectory() && /^[a-z0-9][a-z0-9-]*$/u.test(entry.name))
+            .map((entry) => entry.name)
+            .sort();
+    }
+    catch {
+        return [];
+    }
+}
+async function discoverAgentPackages(agentsDir) {
     let entries;
     try {
         entries = await fs.promises.readdir(agentsDir, { withFileTypes: true });
     }
     catch {
-        return agents;
+        return [];
     }
-    for (const entry of entries) {
-        if (!entry.isDirectory())
+    const agents = [];
+    for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) {
+        if (!entry.isDirectory() || !/^[a-z0-9][a-z0-9-]*$/u.test(entry.name))
             continue;
         const agentDir = path.join(agentsDir, entry.name);
-        const fractal = await discoverWorkspaceFractalAgent(agentDir);
-        if (!fractal)
+        if (!fs.existsSync(path.join(agentDir, 'agent.json')))
             continue;
-        const def = fractal.agentDefinition ?? await importAgentDefinition(path.join(agentDir, 'agent.ts'));
-        const meta = agentMetaFromFractal(fractal.name, agentDir, def, fractal.instructionsBody, ownerPlugin);
-        if (meta)
-            agents.push(meta);
+        agents.push(toAgentMeta(await loadAgentDefinition(agentDir), agentDir));
     }
     return agents;
 }
 /**
- * 扫描 agents/ 分形目录，发现 workspace / plugin workspace agents
+ * Discover named sub-agents. Earlier roots take precedence.
  */
-export async function discoverWorkspaceAgents(root, projectRoot = workspaceRoot()) {
+export async function discoverWorkspaceAgents(projectRoot = workspaceRoot()) {
     const agents = [];
     const seenNames = new Set();
-    const agentDirs = [
+    const roots = [
         path.join(projectRoot, 'agents'),
         path.join(os.homedir(), '.zhin', 'agents'),
         path.join(projectRoot, 'data', 'agents'),
     ];
-    const dirToPlugin = new Map();
-    if (root) {
-        const addPluginDir = (p) => {
-            if (!p?.filePath)
-                return;
-            const packageRoot = resolvePluginPackageRoot(p.filePath);
-            const d = path.join(packageRoot, 'agents');
-            if (!agentDirs.includes(d))
-                agentDirs.push(d);
-            dirToPlugin.set(d, p.name);
-        };
-        addPluginDir(root);
-        for (const child of (root.children || [])) {
-            addPluginDir(child);
-        }
-    }
-    for (const agentsDir of agentDirs) {
-        const found = await discoverFractalAgentsInDir(agentsDir, dirToPlugin.get(agentsDir));
-        for (const meta of found) {
+    for (const root of roots) {
+        for (const meta of await discoverAgentPackages(root)) {
             if (seenNames.has(meta.name)) {
-                logger.debug(`Agent '${meta.name}' 已由先序目录加载，跳过: ${meta.filePath}`);
+                logger.debug(`Agent '${meta.name}' is already loaded; skipping ${meta.filePath}`);
                 continue;
             }
             seenNames.add(meta.name);
             agents.push(meta);
-            logger.debug(`Agent发现成功: ${meta.name}`);
+            logger.debug(`Agent discovered: ${meta.name}`);
         }
     }
     return agents;
 }
-/** 读取分形 agent instructions.md 正文 */
-export async function loadAgentInstructionsBody(agentDir) {
-    const instructionsPath = path.join(agentDir, 'instructions.md');
-    if (!fs.existsSync(instructionsPath))
-        return '';
-    const content = await fs.promises.readFile(instructionsPath, 'utf-8');
-    return content.trim();
-}
-/** @deprecated 使用 loadAgentInstructionsBody */
-export async function loadAgentMarkdownBody(filePath) {
-    if (filePath.endsWith('agent.ts') || filePath.endsWith('agent.js')) {
-        return loadAgentInstructionsBody(path.dirname(filePath));
-    }
-    const content = await fs.promises.readFile(filePath, 'utf-8');
-    return content.replace(/^---\s*\n[\s\S]*?\n---\s*(?:\n|$)/, '').trim();
-}
 //# sourceMappingURL=agents.js.map

package/lib/discovery/agents.js.map

@@ -1 +1 @@
-{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../src/discovery/agents.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAe,SAAS,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EACL,6BAA6B,EAC7B,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAiC,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAIrE,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC;IAChC,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS;CAClF,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;AAuB1C,KAAK,UAAU,qBAAqB,CAAC,SAAiB;IACpD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,UAAU,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAChE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC;QACpC,IAAI,qBAAqB,CAAC,QAAQ,EAAE,OAAO,CAAC;YAAE,OAAO,QAAoC,CAAC;IAC5F,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,qCAAqC,SAAS,KAAK,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAY,EACZ,QAAgB,EAChB,GAAyC,EACzC,gBAAoC,EACpC,WAAoB;IAEpB,MAAM,WAAW,GAAG,GAAG,EAAE,WAAW,CAAC;IACrC,IAAI,CAAC,WAAW,IAAI,CAAC,gBAAgB;QAAE,OAAO,IAAI,CAAC;IACnD,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;SACjF,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAClC,OAAO;QACL,IAAI;QACJ,WAAW,EAAE,WAAW,IAAI,IAAI;QAChC,QAAQ,EAAE,GAAG,EAAE,QAAQ;QACvB,IAAI,EAAE,GAAG,EAAE,IAAI;QACf,SAAS,EAAE,GAAG,EAAE,SAAS;QACzB,eAAe,EAAE,qBAAqB,CAAC,GAAG,EAAE,eAAe,CAAC;QAC5D,QAAQ,EAAE,SAAS;QACnB,aAAa,EAAE,GAAG,EAAE,aAAa;QACjC,WAAW;QACX,IAAI,EAAE,OAAO,IAAI,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QACrE,WAAW,EAAE,GAAG,EAAE,WAAW;KAC9B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,SAAiB,EACjB,WAAoB;IAEpB,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;QAAE,OAAO,MAAM,CAAC;IAE7C,IAAI,OAAoB,CAAC;IACzB,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAAE,SAAS;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,MAAM,6BAA6B,CAAC,QAAQ,CAAC,CAAC;QAC9D,IAAI,CAAC,OAAO;YAAE,SAAS;QACvB,MAAM,GAAG,GAAG,OAAO,CAAC,eAAe,IAAI,MAAM,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QACpG,MAAM,IAAI,GAAG,oBAAoB,CAC/B,OAAO,CAAC,IAAI,EACZ,QAAQ,EACR,GAAG,EACH,OAAO,CAAC,gBAAgB,EACxB,WAAW,CACZ,CAAC;QACF,IAAI,IAAI;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,IAAoB,EACpB,WAAW,GAAG,aAAa,EAAE;IAE7B,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,MAAM,SAAS,GAAa;QAC1B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC;KACzC,CAAC;IAEF,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC9C,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,EAAE;YACjC,IAAI,CAAC,CAAC,EAAE,QAAQ;gBAAE,OAAO;YACzB,MAAM,WAAW,GAAG,wBAAwB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACzD,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAC3C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC9C,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC;QACF,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,KAAK,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAa,EAAE,CAAC;YACtD,YAAY,CAAC,KAAe,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,SAAS,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,0BAA0B,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QACtF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7B,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,IAAI,kBAAkB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACnE,SAAS;YACX,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,MAAM,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,oCAAoC;AACpC,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,QAAgB;IAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAChE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;QAAE,OAAO,EAAE,CAAC;IAChD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACtE,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;AACxB,CAAC;AAED,+CAA+C;AAC/C,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,QAAgB;IAC1D,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACnE,OAAO,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,mCAAmC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACzE,CAAC"}
+{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../src/discovery/agents.ts"],"names":[],"mappings":"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"}

package/lib/discovery/utils.d.ts

@@ -1,10 +1,9 @@
 /**
  * 发现模块共用的工具函数
  *
- * 被 builtin-tools 与 discovery/tools、skills、agents 共同依赖，
+ * 被 builtin tools、Agent surface、Skill loader 与安全策略共同依赖，
  * 独立出来以避免循环导入。
  */
-import type { Plugin } from '@zhin.js/core';
 /** 将 unknown 错误转为字符串 */
 export declare function errMsg(e: unknown): string;
 /** 机器人项目根（`ZHIN_PROJECT_ROOT` 或 cwd） */
@@ -15,20 +14,8 @@ export declare function getDataDir(): string;
 export declare function expandHome(p: string): string;
 /** `.agents/skills` 从 cwd 向上遍历至 git root（ADR 0010） */
 export declare function collectAgentsSkillsDirs(start?: string): string[];
-/** Workspace / ~/.zhin / .agents/skills 根目录（与 activate_skill 扫描顺序一致的前缀） */
+/** Workspace / ~/.zhin / .agents/skills roots in canonical discovery order. */
 export declare function buildStandardSkillDirs(): string[];
-/**
- * 从根插件树收集：各插件包目录下的 `skills/`（其下为 `<name>/SKILL.md`）
- *
- * 递归整棵子树（不仅一层子插件），避免适配器套在目录/聚合插件下时技能目录被漏扫。
- */
-export declare function collectPluginSkillSearchRoots(root: Plugin | null | undefined): string[];
-/**
- * 技能发现与 activate_skill 查找共用：标准目录 + 已加载插件包 skills/
- */
-/** zhin-package 安装目录下的 skills 路径 */
-export declare function collectZhinPackageSkillRoots(): string[];
-export declare function getSkillSearchDirectories(root?: Plugin | null): string[];
 export declare function mergeSkillDirsWithResolver(resolver?: () => string[]): string[];
 /** 将 Node 文件错误转为 miniclawd 风格的结构化短句，便于模型区分并重试 */
 export declare function nodeErrToFileMessage(err: unknown, filePath: string, kind: 'read' | 'write' | 'edit' | 'list'): string;

package/lib/discovery/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/discovery/utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,wBAAwB;AACxB,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAEzC;AAED,wCAAwC;AACxC,wBAAgB,aAAa,IAAI,MAAM,CAGtC;AAED,yBAAyB;AACzB,wBAAgB,UAAU,IAAI,MAAM,CAInC;AAED,2BAA2B;AAC3B,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAI5C;AAYD,sDAAsD;AACtD,wBAAgB,uBAAuB,CAAC,KAAK,SAAgB,GAAG,MAAM,EAAE,CAYvE;AAED,2EAA2E;AAC3E,wBAAgB,sBAAsB,IAAI,MAAM,EAAE,CAOjD;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,EAAE,CAyBvF;AAED;;GAEG;AACH,oCAAoC;AACpC,wBAAgB,4BAA4B,IAAI,MAAM,EAAE,CAkBvD;AAED,wBAAgB,yBAAyB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,EAAE,CASxE;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,CAAC,EAAE,MAAM,MAAM,EAAE,GAAG,MAAM,EAAE,CAM9E;AAED,iDAAiD;AACjD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CASrH"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/discovery/utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,wBAAwB;AACxB,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAEzC;AAED,wCAAwC;AACxC,wBAAgB,aAAa,IAAI,MAAM,CAGtC;AAED,yBAAyB;AACzB,wBAAgB,UAAU,IAAI,MAAM,CAInC;AAED,2BAA2B;AAC3B,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAI5C;AAYD,sDAAsD;AACtD,wBAAgB,uBAAuB,CAAC,KAAK,SAAgB,GAAG,MAAM,EAAE,CAYvE;AAED,+EAA+E;AAC/E,wBAAgB,sBAAsB,IAAI,MAAM,EAAE,CAOjD;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,CAAC,EAAE,MAAM,MAAM,EAAE,GAAG,MAAM,EAAE,CAM9E;AAED,iDAAiD;AACjD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CASrH"}

package/lib/discovery/utils.js

@@ -1,7 +1,7 @@
 /**
  * 发现模块共用的工具函数
  *
- * 被 builtin-tools 与 discovery/tools、skills、agents 共同依赖，
+ * 被 builtin tools、Agent surface、Skill loader 与安全策略共同依赖，
  * 独立出来以避免循环导入。
  */
 import * as fs from 'node:fs';
@@ -57,7 +57,7 @@ export function collectAgentsSkillsDirs(start = process.cwd()) {
     }
     return dirs;
 }
-/** Workspace / ~/.zhin / .agents/skills 根目录（与 activate_skill 扫描顺序一致的前缀） */
+/** Workspace / ~/.zhin / .agents/skills roots in canonical discovery order. */
 export function buildStandardSkillDirs() {
     const list = [
         path.join(workspaceRoot(), 'skills'),
@@ -66,80 +66,6 @@ export function buildStandardSkillDirs() {
     ];
     return [...new Set(list)];
 }
-/**
- * 从根插件树收集：各插件包目录下的 `skills/`（其下为 `<name>/SKILL.md`）
- *
- * 递归整棵子树（不仅一层子插件），避免适配器套在目录/聚合插件下时技能目录被漏扫。
- */
-export function collectPluginSkillSearchRoots(root) {
-    if (!root)
-        return [];
-    const dirs = [];
-    const push = (d) => {
-        if (d && !dirs.includes(d))
-            dirs.push(d);
-    };
-    const fromPlugin = (p) => {
-        if (!p?.filePath)
-            return;
-        const dir = path.dirname(p.filePath);
-        push(path.join(dir, 'skills'));
-        // Also check package root when filePath is under src/ or lib/
-        const dirName = path.basename(dir);
-        if (dirName === 'src' || dirName === 'lib') {
-            push(path.join(path.dirname(dir), 'skills'));
-        }
-    };
-    const walk = (p) => {
-        if (!p)
-            return;
-        fromPlugin(p);
-        for (const child of (p.children || [])) {
-            walk(child);
-        }
-    };
-    walk(root);
-    return dirs;
-}
-/**
- * 技能发现与 activate_skill 查找共用：标准目录 + 已加载插件包 skills/
- */
-/** zhin-package 安装目录下的 skills 路径 */
-export function collectZhinPackageSkillRoots() {
-    const roots = [];
-    const bases = [
-        path.join(os.homedir(), '.zhin', 'packages'),
-        path.join(workspaceRoot(), '.zhin', 'packages'),
-    ];
-    for (const base of bases) {
-        if (!fs.existsSync(base))
-            continue;
-        for (const entry of fs.readdirSync(base, { withFileTypes: true })) {
-            if (!entry.isDirectory())
-                continue;
-            const dir = path.join(base, entry.name);
-            const skills = path.join(dir, 'skills');
-            const repoSkills = path.join(dir, 'repo', 'skills');
-            if (fs.existsSync(skills))
-                roots.push(skills);
-            if (fs.existsSync(repoSkills))
-                roots.push(repoSkills);
-        }
-    }
-    return roots;
-}
-export function getSkillSearchDirectories(root) {
-    const list = [...buildStandardSkillDirs()];
-    for (const d of collectZhinPackageSkillRoots()) {
-        if (!list.includes(d))
-            list.push(d);
-    }
-    for (const d of collectPluginSkillSearchRoots(root ?? undefined)) {
-        if (!list.includes(d))
-            list.push(d);
-    }
-    return list;
-}
 export function mergeSkillDirsWithResolver(resolver) {
     const list = [...buildStandardSkillDirs()];
     for (const d of resolver?.() ?? []) {

package/lib/discovery/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/discovery/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/discovery/utils.ts"],"names":[],"mappings":"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"}

package/lib/event/agent-stream-hooks.d.ts

@@ -3,8 +3,6 @@
  */
 import type { AIHookEvent } from '../resource-hub/types.js';
 import { type AgentStreamEvent, type AgentStreamEventTypeName } from '@zhin.js/ai/agent-stream';
-/** Legacy `type:action` hook keys → Eve-aligned stream event names. */
-export declare const LEGACY_HOOK_STREAM_ALIASES: Readonly<Record<string, AgentStreamEventTypeName>>;
 export declare function isAgentStreamHookEventName(event: string): event is AgentStreamEventTypeName;
 export declare function agentStreamEventToAIHookEvent(streamEvent: AgentStreamEvent, sessionId?: string): AIHookEvent;
 //# sourceMappingURL=agent-stream-hooks.d.ts.map

package/lib/event/agent-stream-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-stream-hooks.d.ts","sourceRoot":"","sources":["../../src/event/agent-stream-hooks.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAwB,KAAK,gBAAgB,EAAE,KAAK,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEtH,uEAAuE;AACvE,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAMzF,CAAC;AAEF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,wBAAwB,CAE3F;AAED,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,gBAAgB,EAC7B,SAAS,CAAC,EAAE,MAAM,GACjB,WAAW,CAeb"}
+{"version":3,"file":"agent-stream-hooks.d.ts","sourceRoot":"","sources":["../../src/event/agent-stream-hooks.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAwB,KAAK,gBAAgB,EAAE,KAAK,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEtH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,wBAAwB,CAE3F;AAED,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,gBAAgB,EAC7B,SAAS,CAAC,EAAE,MAAM,GACjB,WAAW,CAeb"}

package/lib/event/agent-stream-hooks.js

@@ -1,12 +1,4 @@
 import { AgentStreamEventType } from '@zhin.js/ai/agent-stream';
-/** Legacy `type:action` hook keys → Eve-aligned stream event names. */
-export const LEGACY_HOOK_STREAM_ALIASES = {
-    'message:received': AgentStreamEventType.MESSAGE_RECEIVED,
-    'message:sent': AgentStreamEventType.MESSAGE_COMPLETED,
-    'session:new': AgentStreamEventType.SESSION_STARTED,
-    'tool:call': AgentStreamEventType.ACTIONS_REQUESTED,
-    'tool:result': AgentStreamEventType.ACTION_RESULT,
-};
 export function isAgentStreamHookEventName(event) {
     return Object.values(AgentStreamEventType).includes(event);
 }

package/lib/event/agent-stream-hooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-stream-hooks.js","sourceRoot":"","sources":["../../src/event/agent-stream-hooks.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAwD,MAAM,0BAA0B,CAAC;AAEtH,uEAAuE;AACvE,MAAM,CAAC,MAAM,0BAA0B,GAAuD;IAC5F,kBAAkB,EAAE,oBAAoB,CAAC,gBAAgB;IACzD,cAAc,EAAE,oBAAoB,CAAC,iBAAiB;IACtD,aAAa,EAAE,oBAAoB,CAAC,eAAe;IACnD,WAAW,EAAE,oBAAoB,CAAC,iBAAiB;IACnD,aAAa,EAAE,oBAAoB,CAAC,aAAa;CAClD,CAAC;AAEF,MAAM,UAAU,0BAA0B,CAAC,KAAa;IACtD,OAAQ,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,WAA6B,EAC7B,SAAkB;IAElB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACtD,MAAM,iBAAiB,GACrB,OAAO,WAAW,CAAC,IAAI,EAAE,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,OAAO;QACL,IAAI,EAAE,IAAuB;QAC7B,MAAM,EAAE,MAAM,IAAI,WAAW,CAAC,IAAI;QAClC,SAAS,EAAE,iBAAiB;QAC5B,OAAO,EAAE;YACP,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC;YAC3B,UAAU,EAAE,WAAW,CAAC,IAAI;SAC7B;QACD,SAAS,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACxD,QAAQ,EAAE,EAAE;KACb,CAAC;AACJ,CAAC"}
+{"version":3,"file":"agent-stream-hooks.js","sourceRoot":"","sources":["../../src/event/agent-stream-hooks.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAwD,MAAM,0BAA0B,CAAC;AAEtH,MAAM,UAAU,0BAA0B,CAAC,KAAa;IACtD,OAAQ,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,WAA6B,EAC7B,SAAkB;IAElB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACtD,MAAM,iBAAiB,GACrB,OAAO,WAAW,CAAC,IAAI,EAAE,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,OAAO;QACL,IAAI,EAAE,IAAuB;QAC7B,MAAM,EAAE,MAAM,IAAI,WAAW,CAAC,IAAI;QAClC,SAAS,EAAE,iBAAiB;QAC5B,OAAO,EAAE;YACP,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC;YAC3B,UAAU,EAAE,WAAW,CAAC,IAAI;SAC7B;QACD,SAAS,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACxD,QAAQ,EAAE,EAAE;KACb,CAAC;AACJ,CAAC"}

package/lib/event/ai-event-bus.d.ts

@@ -0,0 +1,13 @@
+import type { AIEventPayload } from '../ai-event-contract.js';
+import type { AIEventTarget } from '../ai-event-subscriber.js';
+export type AIEventListener = (payload: AIEventPayload) => void | Promise<void>;
+/** Generation-owned publication boundary for Agent lifecycle events. */
+export declare class AgentEventBus implements AIEventTarget {
+    #private;
+    on(event: string, listener: AIEventListener): this;
+    off(event: string, listener: AIEventListener): this;
+    emit(event: string, payload: AIEventPayload): void;
+    dispatch(event: string, payload: AIEventPayload): Promise<void>;
+    clear(): void;
+}
+//# sourceMappingURL=ai-event-bus.d.ts.map

package/lib/event/ai-event-bus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ai-event-bus.d.ts","sourceRoot":"","sources":["../../src/event/ai-event-bus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAI/D,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhF,wEAAwE;AACxE,qBAAa,aAAc,YAAW,aAAa;;IAGjD,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,IAAI;IAUlD,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,IAAI;IAKnD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI;IAI5C,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBrE,KAAK,IAAI,IAAI;CAGd"}

package/lib/event/ai-event-bus.js

@@ -0,0 +1,45 @@
+import { formatCompact, getLogger } from '@zhin.js/logger';
+const logger = getLogger('AgentEventBus');
+/** Generation-owned publication boundary for Agent lifecycle events. */
+export class AgentEventBus {
+    #listeners = new Map();
+    on(event, listener) {
+        let set = this.#listeners.get(event);
+        if (!set) {
+            set = new Set();
+            this.#listeners.set(event, set);
+        }
+        set.add(listener);
+        return this;
+    }
+    off(event, listener) {
+        this.#listeners.get(event)?.delete(listener);
+        return this;
+    }
+    emit(event, payload) {
+        void this.dispatch(event, payload);
+    }
+    async dispatch(event, payload) {
+        const listeners = this.#listeners.get(event);
+        if (!listeners?.size) {
+            logger.debug(formatCompact({ op: 'agent_event_no_listener', event }));
+            return;
+        }
+        // Capture generation admission at publication time. A retiring listener and
+        // its replacement must never observe the same in-flight event.
+        const snapshot = [...listeners];
+        const pending = snapshot.map((listener) => {
+            try {
+                return Promise.resolve(listener(payload)).catch(() => undefined);
+            }
+            catch {
+                return Promise.resolve();
+            }
+        });
+        await Promise.all(pending);
+    }
+    clear() {
+        this.#listeners.clear();
+    }
+}
+//# sourceMappingURL=ai-event-bus.js.map

package/lib/event/ai-event-bus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ai-event-bus.js","sourceRoot":"","sources":["../../src/event/ai-event-bus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI3D,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;AAI1C,wEAAwE;AACxE,MAAM,OAAO,aAAa;IACf,UAAU,GAAG,IAAI,GAAG,EAAgC,CAAC;IAE9D,EAAE,CAAC,KAAa,EAAE,QAAyB;QACzC,IAAI,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;YAChB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAClC,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,KAAa,EAAE,QAAyB;QAC1C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,KAAa,EAAE,OAAuB;QACzC,KAAK,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAa,EAAE,OAAuB;QACnD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;YACrB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,yBAAyB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACtE,OAAO;QACT,CAAC;QACD,4EAA4E;QAC5E,+DAA+D;QAC/D,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;QAChC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACxC,IAAI,CAAC;gBACH,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACnE,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;YAC3B,CAAC;QACH,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;CACF"}

package/lib/event/event-emitter.d.ts

@@ -1,17 +1,11 @@
-import type { Message, Plugin } from '@zhin.js/core';
-import { EventSystem } from './event-system.js';
-import type { EventHandler } from './contracts.js';
+import type { Message } from '@zhin.js/core';
+import type { AIEventName, AIEventPayload } from '../ai-event-contract.js';
+import { AgentEventBus } from './ai-event-bus.js';
 export declare class ZhinAgentEventEmitter {
-    private hostPlugin;
-    private readonly eventSystem;
-    constructor(hostPlugin?: Plugin | null);
-    /** Agent turn 域事件订阅（EventSystem）；plugin lifecycle 仍走 dispatch/emit。 */
-    on(eventType: string, handler: EventHandler): () => void;
-    getEventSystem(): EventSystem;
-    setHostPlugin(plugin: Plugin): void;
-    getHostPlugin(): Plugin | null;
-    createPayload(sessionId: string, commMessage: Message, mode: Plugin.AIEventPayload['mode'], extra?: Partial<Plugin.AIEventPayload>): Plugin.AIEventPayload;
-    dispatch(name: keyof Plugin.Lifecycle, payload: Plugin.AIEventPayload): Promise<void>;
-    emit(name: keyof Plugin.Lifecycle, payload: Plugin.AIEventPayload): void;
+    readonly events: AgentEventBus;
+    constructor(events?: AgentEventBus);
+    createPayload(sessionId: string, commMessage: Message, mode: AIEventPayload['mode'], extra?: Partial<AIEventPayload>): AIEventPayload;
+    dispatch(name: AIEventName, payload: AIEventPayload): Promise<void>;
+    emit(name: AIEventName, payload: AIEventPayload): void;
 }
 //# sourceMappingURL=event-emitter.d.ts.map

package/lib/event/event-emitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-emitter.d.ts","sourceRoot":"","sources":["../../src/event/event-emitter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAMnD,qBAAa,qBAAqB;IAGpB,OAAO,CAAC,UAAU;IAF9B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;gBAEtB,UAAU,GAAE,MAAM,GAAG,IAAW;IAIpD,uEAAuE;IACvE,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,MAAM,IAAI;IAIxD,cAAc,IAAI,WAAW;IAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAInC,aAAa,IAAI,MAAM,GAAG,IAAI;IAI9B,aAAa,CACX,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,OAAO,EACpB,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,EACnC,KAAK,GAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAM,GACzC,MAAM,CAAC,cAAc;IAqBlB,QAAQ,CACZ,IAAI,EAAE,MAAM,MAAM,CAAC,SAAS,EAC5B,OAAO,EAAE,MAAM,CAAC,cAAc,GAC7B,OAAO,CAAC,IAAI,CAAC;IAShB,IAAI,CAAC,IAAI,EAAE,MAAM,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,cAAc,GAAG,IAAI;CAUzE"}
+{"version":3,"file":"event-emitter.d.ts","sourceRoot":"","sources":["../../src/event/event-emitter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,qBAAa,qBAAqB;IACpB,QAAQ,CAAC,MAAM,EAAE,aAAa;gBAArB,MAAM,GAAE,aAAmC;IAEhE,aAAa,CACX,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,OAAO,EACpB,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,EAC5B,KAAK,GAAE,OAAO,CAAC,cAAc,CAAM,GAClC,cAAc;IAqBX,QAAQ,CACZ,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC;IAKhB,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI;CAGvD"}