@gt-fe/eap-runtime 0.0.8 → 0.0.11

package/dist/registry/deployment-snapshot.js

@@ -7,12 +7,14 @@
  *   {root}/agents/<agentCode>/<version>/users/<userId>/skills/<skillCode>/
  *
  * 命名：agentCode / toolsetCode / skillCode / toolName 均为语义化小写标识；
- * Skill 目录无版本层（维护形态为 ZIP 上传整包替换，包内必含 skill.md）。
+ * Skill 目录无版本层：包内必含 SKILL.md（Agent Skills）。
  */
 import { readdir, readFile, access } from 'node:fs/promises';
 import { createHash } from 'node:crypto';
 import path from 'node:path';
 import { constants as fsConstants } from 'node:fs';
+import { parseSkillMd } from '@eap/contracts';
+import { findSkillEntryFile } from './skill-tree.js';
 import { preloadMissing, preloadPackageCorrupt, } from './preload-errors.js';
 import { isRequireChecksum, resolvePreloadBehaviorFlags, } from './preload-flags.js';
 async function pathExists(p) {
@@ -138,29 +140,51 @@ async function pickLatestVersionDir(parent) {
     dirs.sort();
     return path.join(parent, dirs[dirs.length - 1]);
 }
-function skillRefsFromManifest(manifest) {
-    const raw = manifest.skillRefs ?? manifest.skills;
-    if (!Array.isArray(raw))
-        return [];
+function asArray(value) {
+    return Array.isArray(value) ? value : [];
+}
+/**
+ * Agent 清单装配读取：现行 `skills`，兼容 CLI `skillRefs`。
+ * 项身份：`code` / `skill` / `skillId`。两边都有时现行字段先写入；同名只补 version/name 等空位。
+ */
+export function skillRefsFromManifest(manifest) {
     const out = [];
-    for (const item of raw) {
+    const byId = new Map();
+    const upsert = (ref) => {
+        const prev = byId.get(ref.skillId);
+        if (!prev) {
+            byId.set(ref.skillId, ref);
+            out.push(ref);
+            return;
+        }
+        if (!prev.version && ref.version)
+            prev.version = ref.version;
+        if (!prev.name && ref.name)
+            prev.name = ref.name;
+        if (!prev.description && ref.description)
+            prev.description = ref.description;
+        if (!prev.sha256 && ref.sha256)
+            prev.sha256 = ref.sha256;
+    };
+    for (const item of [...asArray(manifest.skills), ...asArray(manifest.skillRefs)]) {
         if (typeof item === 'string') {
-            out.push({ skillId: item });
+            if (item)
+                upsert({ skillId: item });
             continue;
         }
-        if (item && typeof item === 'object') {
-            const o = item;
-            const skillId = String(o.skill ?? o.skillId ?? o.skillCode ?? o.id ?? '');
-            if (!skillId)
-                continue;
-            out.push({
-                skillId,
-                name: o.name != null ? String(o.name) : undefined,
-                version: o.version != null ? String(o.version) : undefined,
-                description: o.description != null ? String(o.description) : undefined,
-                sha256: typeof o.sha256 === 'string' ? o.sha256 : undefined,
-            });
-        }
+        if (!item || typeof item !== 'object')
+            continue;
+        const o = item;
+        const skillId = String(o.code ?? o.skill ?? o.skillId ?? '');
+        if (!skillId)
+            continue;
+        upsert({
+            skillId,
+            name: o.name != null ? String(o.name) : undefined,
+            version: o.version != null ? String(o.version) : undefined,
+            description: o.description != null ? String(o.description) : undefined,
+            sha256: typeof o.sha256 === 'string' ? o.sha256 : undefined,
+        });
     }
     return out;
 }
@@ -171,8 +195,8 @@ function parseStringList(value) {
     return out.length > 0 ? out : undefined;
 }
 /**
- * 装配引用（toolRefs / 简写 tools[]）vs 内联完整 ToolManifest。
- * 含 type/execution 的视为内联定义；仅 toolset/name/version/enabledTools 等视为引用。
+ * 装配引用 vs 内联完整 ToolManifest。
+ * 含 type/execution 的视为内联定义；仅 code/toolset/version/enabled 等视为引用。
  */
 export function isInlineToolDeclaration(item) {
     if (!item || typeof item !== 'object' || Array.isArray(item))
@@ -189,7 +213,7 @@ function parseToolAssemblyRef(item) {
     if (isInlineToolDeclaration(item))
         return null;
     const o = item;
-    const name = String(o.toolset ?? o.name ?? o.toolId ?? o.id ?? '');
+    const name = String(o.code ?? o.toolset ?? '');
     if (!name)
         return null;
     return {
@@ -197,14 +221,17 @@ function parseToolAssemblyRef(item) {
         toolId: o.toolId != null ? String(o.toolId) : undefined,
         version: o.version != null ? String(o.version) : undefined,
         sha256: typeof o.sha256 === 'string' ? o.sha256 : undefined,
-        enabledTools: parseStringList(o.enabledTools),
+        enabledTools: parseStringList(o.enabled) ?? parseStringList(o.enabledTools),
         autoApprove: parseStringList(o.autoApprove),
     };
 }
 /**
- * 从 agent.manifest 收集工具集装配引用：优先 toolRefs[]，再合并简写 tools[]（非内联项）。
+ * 从 Agent 清单收集工具集装配引用。
+ * 现行 `toolsets`；兼容 CLI `toolRefs` 与更旧的 `tools`（内联完整 manifest 会跳过）。
+ * 项身份：`code` / `toolset`（字符串项即 code）。不用展示名 `name`。白名单：`enabled` / `enabledTools`。
+ * 两边都有时现行字段先写入；同名条目的 enabled/autoApprove 以先写入为准。
  */
-function toolRefsFromManifest(manifest) {
+export function toolsetsFromManifest(manifest) {
     const out = [];
     const byName = new Map();
     const upsert = (ref) => {
@@ -214,11 +241,6 @@ function toolRefsFromManifest(manifest) {
             out.push(ref);
             return;
         }
-        // 后写补全白名单等字段，不覆盖已有显式值
-        if (!prev.enabledTools && ref.enabledTools)
-            prev.enabledTools = ref.enabledTools;
-        if (!prev.autoApprove && ref.autoApprove)
-            prev.autoApprove = ref.autoApprove;
         if (!prev.version && ref.version)
             prev.version = ref.version;
         if (!prev.sha256 && ref.sha256)
@@ -226,12 +248,11 @@ function toolRefsFromManifest(manifest) {
         if (!prev.toolId && ref.toolId)
             prev.toolId = ref.toolId;
     };
-    for (const item of Array.isArray(manifest.toolRefs) ? manifest.toolRefs : []) {
-        const ref = parseToolAssemblyRef(item);
-        if (ref)
-            upsert(ref);
-    }
-    for (const item of Array.isArray(manifest.tools) ? manifest.tools : []) {
+    for (const item of [
+        ...asArray(manifest.toolsets),
+        ...asArray(manifest.toolRefs),
+        ...asArray(manifest.tools),
+    ]) {
         const ref = parseToolAssemblyRef(item);
         if (ref)
             upsert(ref);
@@ -239,12 +260,12 @@ function toolRefsFromManifest(manifest) {
     return out;
 }
 /**
- * 将 agent.manifest.toolRefs 上的 enabledTools/autoApprove 叠到 snapshot.tools[]（snapshot 未带时）。
+ * 将 agent.manifest 装配项上的 enabled/autoApprove 叠到 snapshot.tools[]（snapshot 未带时）。
  */
 export function overlayToolRefPolicies(snapTools, manifest) {
     if (!manifest)
         return snapTools;
-    const fromManifest = toolRefsFromManifest(manifest);
+    const fromManifest = toolsetsFromManifest(manifest);
     if (fromManifest.length === 0)
         return snapTools;
     const byName = new Map(fromManifest.map((r) => [r.name, r]));
@@ -259,6 +280,12 @@ export function overlayToolRefPolicies(snapTools, manifest) {
         };
     });
 }
+function nonemptyRefs(refs) {
+    return refs && refs.length > 0 ? refs : undefined;
+}
+function nonemptySkillRefs(refs) {
+    return refs && refs.length > 0 ? refs : undefined;
+}
 function normalizeSnapshotToolRefs(raw) {
     if (!Array.isArray(raw))
         return undefined;
@@ -281,7 +308,7 @@ function normalizeSnapshotSkillRefs(raw) {
         }
         if (item && typeof item === 'object') {
             const o = item;
-            const skillId = String(o.skill ?? o.skillId ?? o.code ?? o.skillCode ?? o.id ?? '');
+            const skillId = String(o.code ?? o.skillId ?? '');
             if (!skillId)
                 continue;
             out.push({
@@ -417,8 +444,8 @@ export class FileSystemDeploymentSnapshot {
             return {
                 agentCode,
                 version: String(snap.version ?? resolvedVersion),
-                tools: normalizeSnapshotToolRefs(snap.tools) ?? toolRefsFromManifest(manifest ?? {}),
-                skills: normalizeSnapshotSkillRefs(snap.skills) ?? skillRefsFromManifest(manifest ?? {}),
+                tools: nonemptyRefs(normalizeSnapshotToolRefs(snap.tools)) ?? toolsetsFromManifest(manifest ?? {}),
+                skills: nonemptySkillRefs(normalizeSnapshotSkillRefs(snap.skills)) ?? skillRefsFromManifest(manifest ?? {}),
                 graph,
                 agentDir,
                 manifest: manifest ?? undefined,
@@ -428,7 +455,7 @@ export class FileSystemDeploymentSnapshot {
         return {
             agentCode,
             version: resolvedVersion,
-            tools: toolRefsFromManifest(manifest ?? {}),
+            tools: toolsetsFromManifest(manifest ?? {}),
             skills: skillRefsFromManifest(manifest ?? {}),
             graph,
             agentDir,
@@ -497,10 +524,9 @@ export class FileSystemDeploymentSnapshot {
             if (!(await pathExists(bundlePath)))
                 continue;
             await this.assertReadyIfRequired(bundlePath, `skill ${ref.skillId}`);
+            const entryFile = await findSkillEntryFile(bundlePath);
             const manifestPathCandidates = [
                 path.join(bundlePath, 'skill.manifest.json'),
-                path.join(bundlePath, 'skill.definition.json'),
-                path.join(bundlePath, 'manifest.json'),
             ];
             let manifest = null;
             let manifestPath = null;
@@ -512,22 +538,44 @@ export class FileSystemDeploymentSnapshot {
                     break;
                 }
             }
+            if (!manifest && entryFile) {
+                const parsed = parseSkillMd(await readFile(entryFile, 'utf8'));
+                if (!parsed)
+                    continue;
+                manifest = {
+                    code: parsed.frontmatter.name,
+                    name: parsed.frontmatter.name,
+                    description: parsed.frontmatter.description,
+                    ...(parsed.frontmatter.license ? { license: parsed.frontmatter.license } : {}),
+                };
+                manifestPath = entryFile;
+            }
             if (!manifest || !manifestPath)
                 continue;
-            // 用户装配层跳过 sha256 校验（用户覆盖版本与预装快照散列不同是正常行为）
+            if (!manifest.description && entryFile) {
+                const parsed = parseSkillMd(await readFile(entryFile, 'utf8'));
+                if (parsed?.frontmatter.description) {
+                    manifest = { ...manifest, description: parsed.frontmatter.description };
+                    if (!manifest.name)
+                        manifest.name = parsed.frontmatter.name;
+                }
+            }
             const isUserOverridePath = bundlePath.includes('/users/') || bundlePath.includes('\\users\\');
             const isAuthorOverlay = extraRoots.some((root) => root && isPathInside(root, bundlePath));
-            if (ref.sha256 && !isUserOverridePath && !isAuthorOverlay) {
+            if (ref.sha256 && !isUserOverridePath && !isAuthorOverlay && manifestPath.endsWith('.json')) {
                 const actual = await sha256OfFile(manifestPath);
                 await assertDigestMatch(ref.sha256, actual, `skill ${ref.skillId}`, { path: manifestPath });
             }
-            const skillId = String(manifest.code ?? manifest.skillId ?? manifest.skillCode ?? manifest.id ?? ref.skillId);
+            const skillId = String(manifest.code ?? ref.skillId);
             return {
                 skillId,
                 name: String(manifest.name ?? ref.name ?? skillId),
                 version: String(manifest.version ?? ref.version ?? path.basename(bundlePath)),
                 description: manifest.description ?? ref.description,
-                manifest,
+                manifest: {
+                    ...manifest,
+                    ...(entryFile ? { skillEntryFile: entryFile } : {}),
+                },
                 bundlePath,
             };
         }

package/dist/registry/graph-loader.d.ts

@@ -7,7 +7,7 @@
 import type { GraphDSL } from '../graph/contracts/executable-graph.js';
 import type { AgentRegistryClient } from './agent-registry-client.js';
 import type { DeploymentContext } from '../tool/tool-execution-router.js';
-import type { ILocalToolInstallStore } from '@gt-fe/eap-contracts';
+import type { ILocalToolInstallStore } from '@eap/contracts';
 import { type LoadedToolDefinition } from '../tool/loaded-tool-definition.js';
 import type { LoadedSkillInfo } from '../tool/system-prompt-builder.js';
 import { type IDeploymentSnapshot } from './deployment-snapshot.js';
@@ -111,7 +111,7 @@ export declare class GraphLoader {
     loadToolDefinitions(agentCode: string, options?: LoadToolDefinitionsOptions): Promise<LoadedToolDefinition[]>;
     private loadToolDefinitionsFromSource;
     /**
-     * 从预装快照加载已装配 Skill 完整定义（workflow / prompt / toolRefs）
+     * 加载已装配 Skill：SKILL.md 目录（Agent Skills）或可选 skill.manifest.json。
      * @param options.userId 用于解析 users/<userId>/skills（优先于 preinstall/skills）
      * @param options.allowMissingSkills 缺失时跳过而非抛错（warm 预热用）
      */

package/dist/registry/graph-loader.js

@@ -6,13 +6,14 @@
  */
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
-import { resolveAgentModelAllowlist, resolveAgentPrimaryModel } from './agent-models.js';
+import { resolveAgentModelAllowlist, resolveAgentDefaultModel } from './agent-models.js';
+import { DEFAULT_HTTP_TOOL_TIMEOUT_SEC, DEFAULT_TOOL_TIMEOUT_SEC } from '../tool/timeout.js';
 import { createDeploymentSnapshotFromEnv, isInlineToolDeclaration, overlayToolRefPolicies, } from './deployment-snapshot.js';
 import { preloadGraphNotFound, preloadManifestNotFound, preloadSkillNotFound, preloadToolNotFound, } from './preload-errors.js';
 import { PreinstallDefinitionCache, resolveDefinitionCacheEnabled, } from './definition-cache.js';
-import { inspectAgentSkillTree, readSkillAssembly, resolveSkillHotReload, skillAssemblyStamp, } from './skill-tree.js';
-function applyPrimaryModelToGraph(graph, primary) {
-    if (!primary)
+import { inspectAgentSkillTree, listSkillDirs, readSkillAssembly, resolveSkillHotReload, skillAssemblyStamp, } from './skill-tree.js';
+function applyDefaultModelToGraph(graph, defaultModel) {
+    if (!defaultModel)
         return graph;
     let changed = false;
     const nodes = graph.nodes.map((node) => {
@@ -22,7 +23,7 @@ function applyPrimaryModelToGraph(graph, primary) {
         if (current && current.toLowerCase() !== 'default')
             return node;
         changed = true;
-        return { ...node, config: { ...node.config, model: primary } };
+        return { ...node, config: { ...node.config, model: defaultModel } };
     });
     return changed ? { ...graph, nodes } : graph;
 }
@@ -41,7 +42,7 @@ function assertGraphModelsAllowed(graph, manifest) {
     return graph;
 }
 function finalizeLoadedGraph(graph, manifest) {
-    return assertGraphModelsAllowed(applyPrimaryModelToGraph(graph, resolveAgentPrimaryModel((manifest ?? {}))), manifest);
+    return assertGraphModelsAllowed(applyDefaultModelToGraph(graph, resolveAgentDefaultModel((manifest ?? {}))), manifest);
 }
 function asGraphDsl(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value))
@@ -94,57 +95,8 @@ async function resolveSkillPrompt(manifest, bundlePath) {
     }
     return raw;
 }
-/**
- * 解析 Skill scripts[] 为虚拟 Tool 定义。
- * scripts 为可选/非标字段：Skill 包仅强制要求 skill.md，其余文件结构不限；
- * 存在 scripts 声明时才物化为可调用的本地 Tool。
- */
-function resolveSkillScripts(manifest, bundlePath) {
-    const scripts = manifest.scripts;
-    if (!Array.isArray(scripts))
-        return [];
-    const tools = [];
-    for (const script of scripts) {
-        if (!script || typeof script !== 'object')
-            continue;
-        const s = script;
-        const name = s.name;
-        const command = s.command;
-        if (!name || !command)
-            continue;
-        const args = Array.isArray(s.args) ? s.args.map(String) : [];
-        tools.push({
-            toolId: `script:${name}`,
-            name,
-            manifest: {
-                id: `script:${name}`,
-                name,
-                version: '0.0.0',
-                type: 'code',
-                status: 'active',
-                description: s.description ?? `Skill script: ${name}`,
-                execution: {
-                    runtime: command === 'python3' || command === 'python' ? 'python'
-                        : command === 'node' ? 'node'
-                            : 'executable',
-                    handler: args[0] ?? command,
-                    args: args.slice(1),
-                    timeout: 30000,
-                    sandbox: false,
-                    bundlePath,
-                    command,
-                    /** 标记为 Skill 虚拟脚本：Router 优先本机执行，不经 Gateway */
-                    localPreferred: true,
-                    source: 'skill-script',
-                },
-            },
-            inputSchema: { type: 'object', properties: {}, additionalProperties: true },
-        });
-    }
-    return tools;
-}
-function extractSkillToolRefs(manifest) {
-    const refs = manifest.toolRefs ?? manifest.tools;
+function extractSkillToolsets(manifest) {
+    const refs = manifest.toolsets;
     if (!Array.isArray(refs))
         return undefined;
     const out = [];
@@ -156,14 +108,15 @@ function extractSkillToolRefs(manifest) {
         if (!item || typeof item !== 'object')
             continue;
         const o = item;
+        const code = o.code != null ? String(o.code) : undefined;
+        const enabled = Array.isArray(o.enabled)
+            ? o.enabled.filter((x) => typeof x === 'string')
+            : undefined;
         out.push({
-            toolId: o.toolId != null ? String(o.toolId) : undefined,
-            name: o.name != null ? String(o.name) : o.toolset != null ? String(o.toolset) : undefined,
+            name: o.name != null ? String(o.name) : code,
             version: o.version != null ? String(o.version) : undefined,
-            toolset: o.toolset != null ? String(o.toolset) : undefined,
-            enabledTools: Array.isArray(o.enabledTools)
-                ? o.enabledTools.filter((x) => typeof x === 'string')
-                : undefined,
+            code,
+            enabled,
             autoApprove: Array.isArray(o.autoApprove)
                 ? o.autoApprove.filter((x) => typeof x === 'string')
                 : undefined,
@@ -305,7 +258,7 @@ function fromPreinstallTool(pre) {
  * 以工具集为管理单元：单个 MCP 服务 / 单个代码包 = 一个工具集，可含多个子工具；
  * 子工具继承集级 server/package 配置，合成各自的 execution。
  * 无 tools[] 时回退为单工具 manifest（tool.manifest.json 结构）。
- * enabledTools 为可选白名单（agent.manifest toolRefs）；缺省启用全部子工具。
+ * enabled 为可选白名单（agent.manifest toolsets[].enabled）；缺省启用全部子工具。
  */
 function expandPreinstallToolset(pre, options) {
     const m = pre.manifest;
@@ -348,7 +301,7 @@ function expandPreinstallToolset(pre, options) {
                 baseUrl: st.baseUrl ?? gateway.baseUrl,
                 pathTemplate: st.pathTemplate,
                 allowedHosts: gateway.allowedHosts,
-                timeout: st.timeout ?? gateway.timeout ?? 10000,
+                timeout: st.timeout ?? gateway.timeout ?? DEFAULT_HTTP_TOOL_TIMEOUT_SEC,
             };
         }
         else if (setType === 'mcp') {
@@ -358,7 +311,7 @@ function expandPreinstallToolset(pre, options) {
                 transport: server?.transport ?? (server?.url ? 'streamable_http' : 'stdio'),
                 server,
                 toolName: name,
-                timeout: st.timeout ?? server?.timeout ?? 30000,
+                timeout: st.timeout ?? server?.timeout ?? DEFAULT_TOOL_TIMEOUT_SEC,
             };
         }
         else {
@@ -367,7 +320,7 @@ function expandPreinstallToolset(pre, options) {
                 runtime: st.runtime ?? 'node',
                 handler: st.handler,
                 args: st.args,
-                timeout: st.timeout ?? 30000,
+                timeout: st.timeout ?? DEFAULT_TOOL_TIMEOUT_SEC,
                 sandbox: st.sandbox ?? pkg?.sandbox ?? false,
                 bundlePath: pre.bundlePath,
             };
@@ -659,7 +612,7 @@ export class GraphLoader {
         if (graphFromManifest && typeof graphFromManifest === 'object') {
             return finalizeLoadedGraph(yamlGraphToDsl(agentCode, graphFromManifest), manifest);
         }
-        const model = resolveAgentPrimaryModel(manifest) ?? 'default';
+        const model = resolveAgentDefaultModel(manifest) ?? 'default';
         return {
             ...DEFAULT_GRAPH_DSL,
             name: agentCode,
@@ -851,7 +804,7 @@ export class GraphLoader {
         return definitions;
     }
     /**
-     * 从预装快照加载已装配 Skill 完整定义（workflow / prompt / toolRefs）
+     * 加载已装配 Skill：SKILL.md 目录（Agent Skills）或可选 skill.manifest.json。
      * @param options.userId 用于解析 users/<userId>/skills（优先于 preinstall/skills）
      * @param options.allowMissingSkills 缺失时跳过而非抛错（warm 预热用）
      */
@@ -887,10 +840,8 @@ export class GraphLoader {
                 const workflow = asGraphDsl(pre.manifest.workflow) ??
                     asGraphDsl(pre.manifest.graph) ??
                     asGraphDsl(pre.manifest.definitionSnapshot);
-                // 解析 prompt：支持文件路径引用（./ 开头）
                 const prompt = await resolveSkillPrompt(pre.manifest, pre.bundlePath);
-                // 解析 scripts[] 为虚拟 Tool
-                const scriptTools = resolveSkillScripts(pre.manifest, pre.bundlePath);
+                const entryFile = typeof pre.manifest.skillEntryFile === 'string' ? pre.manifest.skillEntryFile : undefined;
                 skills.push({
                     skillId: pre.skillId,
                     name: pre.name,
@@ -898,10 +849,11 @@ export class GraphLoader {
                     version: pre.version,
                     workflow,
                     prompt,
-                    toolRefs: extractSkillToolRefs(pre.manifest),
+                    bundlePath: pre.bundlePath,
+                    entryFile,
+                    toolsets: extractSkillToolsets(pre.manifest),
                     inputDef: pre.manifest.inputDef,
                     outputDef: pre.manifest.outputDef,
-                    scriptTools: scriptTools.length > 0 ? scriptTools : undefined,
                 });
             }
             else if (!this.strictPreinstall) {
@@ -940,16 +892,25 @@ export class GraphLoader {
      * 磁盘多出来的未声明目录不进选择清单；正文热加载仍看已装配目录的 mtime。
      */
     async resolveSkillRefs(snap, agentDir, userId) {
+        const byId = new Map();
+        const add = (ref) => {
+            if (ref.skillId && !byId.has(ref.skillId))
+                byId.set(ref.skillId, ref);
+        };
         if (agentDir) {
             const assembly = await readSkillAssembly(agentDir, userId);
             if (assembly && assembly.skills.length > 0) {
-                return assembly.skills.map((skillId) => ({ skillId }));
+                for (const skillId of assembly.skills)
+                    add({ skillId });
             }
         }
-        const byId = new Map();
-        for (const ref of snap?.skills ?? []) {
-            if (ref.skillId)
-                byId.set(ref.skillId, ref);
+        if (byId.size === 0) {
+            for (const ref of snap?.skills ?? [])
+                add(ref);
+        }
+        for (const root of this.localSkillRoots()) {
+            for (const skillId of await listSkillDirs(root))
+                add({ skillId });
         }
         return [...byId.values()];
     }
@@ -981,5 +942,7 @@ export class GraphLoader {
 }
 function resolveLocalSkillsDir(explicit) {
     const candidate = explicit?.trim() || process.env.EAP_LOCAL_SKILLS_DIR?.trim();
-    return candidate || undefined;
+    if (candidate)
+        return path.resolve(candidate);
+    return path.resolve(process.cwd(), 'skills');
 }

package/dist/registry/index.d.ts

@@ -1,9 +1,9 @@
-export { resolveAgentPrimaryModel, resolveAgentModelAllowlist, resolveDeclaredModels } from './agent-models.js';
+export { resolveAgentDefaultModel, resolveAgentModelAllowlist, resolveDeclaredModels } from './agent-models.js';
 export { createAgentRegistryClient, type AgentRegistryClient, type AgentRegistryRecord, type AgentManifest } from './agent-registry-client.js';
 export { GraphLoader, type GraphLoaderConfig, type LoadToolDefinitionsOptions, type LoadAgentOptions } from './graph-loader.js';
 export { PreinstallDefinitionCache, resolveDefinitionCacheEnabled, type CachedAgentDefinitions, } from './definition-cache.js';
 export { inspectAgentSkillTree, readSkillAssembly, resolveSkillHotReload, skillAssemblyStamp, watchAgentSkillDirs, watchPreinstallSkillRoot, watchSkillRoots, } from './skill-tree.js';
-export { FileSystemDeploymentSnapshot, createDeploymentSnapshotFromEnv, normalizeDigest, isInlineToolDeclaration, overlayToolRefPolicies, type IDeploymentSnapshot, type AgentSnapshotMeta, type SnapshotToolRef, type SnapshotSkillRef, type PreinstallToolManifest, type PreinstallSkillManifest, type DeploymentSnapshotOptions, } from './deployment-snapshot.js';
+export { FileSystemDeploymentSnapshot, createDeploymentSnapshotFromEnv, normalizeDigest, isInlineToolDeclaration, overlayToolRefPolicies, toolsetsFromManifest, skillRefsFromManifest, type IDeploymentSnapshot, type AgentSnapshotMeta, type SnapshotToolRef, type SnapshotSkillRef, type PreinstallToolManifest, type PreinstallSkillManifest, type DeploymentSnapshotOptions, } from './deployment-snapshot.js';
 export { preloadError, preloadMissing, preloadManifestNotFound, preloadGraphNotFound, preloadToolNotFound, preloadSkillNotFound, preloadPackageCorrupt, isRequireReady, } from './preload-errors.js';
 export { resolvePreloadBehaviorFlags, isValidateSkillIo, isRequireChecksum, type PreloadBehaviorFlags, } from './preload-flags.js';
 export { assertSkillIoIfEnabled, coerceSkillInputFromMessages, resolveSkillInputFromInvokeInput, } from './skill-io-guard.js';

package/dist/registry/index.js

@@ -1,9 +1,9 @@
-export { resolveAgentPrimaryModel, resolveAgentModelAllowlist, resolveDeclaredModels } from './agent-models.js';
+export { resolveAgentDefaultModel, resolveAgentModelAllowlist, resolveDeclaredModels } from './agent-models.js';
 export { createAgentRegistryClient } from './agent-registry-client.js';
 export { GraphLoader } from './graph-loader.js';
 export { PreinstallDefinitionCache, resolveDefinitionCacheEnabled, } from './definition-cache.js';
 export { inspectAgentSkillTree, readSkillAssembly, resolveSkillHotReload, skillAssemblyStamp, watchAgentSkillDirs, watchPreinstallSkillRoot, watchSkillRoots, } from './skill-tree.js';
-export { FileSystemDeploymentSnapshot, createDeploymentSnapshotFromEnv, normalizeDigest, isInlineToolDeclaration, overlayToolRefPolicies, } from './deployment-snapshot.js';
+export { FileSystemDeploymentSnapshot, createDeploymentSnapshotFromEnv, normalizeDigest, isInlineToolDeclaration, overlayToolRefPolicies, toolsetsFromManifest, skillRefsFromManifest, } from './deployment-snapshot.js';
 export { preloadError, preloadMissing, preloadManifestNotFound, preloadGraphNotFound, preloadToolNotFound, preloadSkillNotFound, preloadPackageCorrupt, isRequireReady, } from './preload-errors.js';
 export { resolvePreloadBehaviorFlags, isValidateSkillIo, isRequireChecksum, } from './preload-flags.js';
 export { assertSkillIoIfEnabled, coerceSkillInputFromMessages, resolveSkillInputFromInvokeInput, } from './skill-io-guard.js';

package/dist/registry/preload-errors.d.ts

@@ -1,7 +1,7 @@
 /**
  * 预装加载错误 — 对齐 runtime.preload.* / 联调契约
  */
-import { AppError, type ErrorCode } from '@gt-fe/eap-contracts';
+import { AppError, type ErrorCode } from '@eap/contracts';
 export declare function preloadError(code: ErrorCode, message: string, details?: unknown): AppError;
 export declare function preloadMissing(message: string, details?: unknown): AppError;
 export declare function preloadManifestNotFound(message: string, details?: unknown): AppError;

package/dist/registry/preload-errors.js

@@ -1,7 +1,7 @@
 /**
  * 预装加载错误 — 对齐 runtime.preload.* / 联调契约
  */
-import { AppError, ErrorCodes } from '@gt-fe/eap-contracts';
+import { AppError, ErrorCodes } from '@eap/contracts';
 export function preloadError(code, message, details) {
     return new AppError(code, message, {
         exposeMessage: true,

package/dist/registry/skill-io-guard.js

@@ -1,7 +1,7 @@
 /**
  * Skill inputDef / outputDef 轻量校验（默认开启；EAP_PRELOAD_VALIDATE_SKILL_IO=0 关闭）
  */
-import { AppError, ErrorCodes } from '@gt-fe/eap-contracts';
+import { AppError, ErrorCodes } from '@eap/contracts';
 import { isValidateSkillIo } from './preload-flags.js';
 function asRecord(value) {
     if (value && typeof value === 'object' && !Array.isArray(value)) {

package/dist/registry/skill-tree.d.ts

@@ -3,6 +3,9 @@ export interface AgentSkillTree {
     /** `${count}:${maxMtimeMs}`；增删改任一 skill 文件都会变 */
     stamp: string;
 }
+/** Agent Skills 入口：目录内的 SKILL.md（规范名优先）。 */
+export declare function findSkillEntryFile(bundlePath: string): Promise<string | null>;
+export declare function listSkillDirs(root: string): Promise<string[]>;
 export interface SkillAssembly {
     skills: string[];
     source: string;

package/dist/registry/skill-tree.js

@@ -10,6 +10,7 @@ import { readdir, stat, access, readFile } from 'node:fs/promises';
 import { watch } from 'node:fs';
 import { constants as fsConstants } from 'node:fs';
 import path from 'node:path';
+import { SKILL_ENTRY_CANDIDATES } from '@eap/contracts';
 const SKILL_CODE = /^[a-z0-9][a-z0-9-]*$/;
 async function exists(p) {
     try {
@@ -20,6 +21,43 @@ async function exists(p) {
         return false;
     }
 }
+/** Agent Skills 入口：目录内的 SKILL.md（规范名优先）。 */
+export async function findSkillEntryFile(bundlePath) {
+    for (const name of SKILL_ENTRY_CANDIDATES) {
+        const candidate = path.join(bundlePath, name);
+        if (await exists(candidate))
+            return candidate;
+    }
+    try {
+        const files = await readdir(bundlePath);
+        const hit = files.find((file) => file.toLowerCase() === 'skill.md');
+        return hit ? path.join(bundlePath, hit) : null;
+    }
+    catch {
+        return null;
+    }
+}
+export async function listSkillDirs(root) {
+    let names = [];
+    try {
+        names = await readdir(root);
+    }
+    catch {
+        return [];
+    }
+    const codes = [];
+    for (const name of names) {
+        if (!SKILL_CODE.test(name))
+            continue;
+        const bundle = path.join(root, name);
+        const info = await stat(bundle).catch(() => undefined);
+        if (!info?.isDirectory())
+            continue;
+        if (await findSkillEntryFile(bundle))
+            codes.push(name);
+    }
+    return codes.sort();
+}
 async function maxMtime(filePath, fallback = 0) {
     try {
         const info = await stat(filePath);
@@ -101,9 +139,9 @@ export async function inspectAgentSkillTree(agentDir, userId, extraRoots = []) {
             const bundleStat = await stat(bundle).catch(() => undefined);
             if (!bundleStat?.isDirectory())
                 continue;
-            const hasMain = (await exists(path.join(bundle, 'skill.md'))) ||
-                (await exists(path.join(bundle, 'skill.manifest.json')));
-            if (!hasMain)
+            const hasEntry = await findSkillEntryFile(bundle);
+            const hasOverlay = await exists(path.join(bundle, 'skill.manifest.json'));
+            if (!hasEntry && !hasOverlay)
                 continue;
             codes.add(name);
             latest = Math.max(latest, bundleStat.mtimeMs);