@gt-fe/eap-runtime 0.0.39 → 0.0.40

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

@@ -128,8 +128,8 @@ export declare class GraphLoader {
     resolveAgentDisplayName(agentCode: string, version?: string): Promise<string | undefined>;
     private fromAgentManifest;
     /**
-     * 解析 agent tools[] + graph tool 节点 union；
-     * server+预装：以预装 manifest 为准；desktop 合并 ILocalToolInstallStore。
+     * 装工具只认登记的工具集（snapshot.tools / 清单 toolsets、toolRefs、tools）和内联 manifest。
+     * 图上 config.tool、节点 id 不参与。server 预装优先；dev 再读 ./tools 下与登记 code 同名的目录；desktop 合并本机安装。
      */
     loadToolDefinitions(agentCode: string, options?: LoadToolDefinitionsOptions): Promise<LoadedToolDefinition[]>;
     private loadToolDefinitionsFromSource;

package/dist/registry/graph-loader.js

@@ -5,11 +5,10 @@
  * 开发态：Registry + 可选 ./tools 本地 manifest。
  */
 import { DEFAULT_GRAPH_TIMEOUT_MS } from '../common/types.js';
-import { readdir, readFile } from 'node:fs/promises';
+import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { resolveAgentModelAllowlist, resolveAgentDefaultModel } from './agent-models.js';
 import { DEFAULT_HTTP_TOOL_TIMEOUT_SEC, DEFAULT_TOOL_TIMEOUT_SEC } from '../tool/timeout.js';
-import { isMcpDiscoverStub } from '../tool/mcp-list.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';
@@ -195,14 +194,39 @@ function yamlGraphToDsl(agentCode, graph) {
         config: configFromGraphDocument(graph),
     };
 }
-function collectToolNames(agent, graphDsl) {
-    const rawTools = agent?.manifest?.tools ?? [];
-    // 支持 string[] (ID 引用) 和 object[] (完整 ToolManifest 内联声明)
-    const fromAgent = rawTools.map((t) => typeof t === 'string' ? t : t?.name ?? t?.id);
-    const fromGraph = graphDsl.nodes
-        .filter((n) => n.type === 'tool')
-        .map((n) => n.config?.['tool'] ?? n.id);
-    return [...new Set([...fromAgent, ...fromGraph].filter(Boolean))];
+/** Registry `manifest.tools` 里的字符串 code。内联对象已在前面转成定义，这里不重复取。 */
+function manifestStringToolIds(raw) {
+    if (!Array.isArray(raw))
+        return [];
+    const out = [];
+    for (const item of raw) {
+        if (typeof item !== 'string')
+            continue;
+        const name = item.trim();
+        if (name)
+            out.push(name);
+    }
+    return out;
+}
+/**
+ * 还要向 Registry / 开发态目录补的登记项。
+ * 图上 `config.tool` 与节点 id 不是登记项。
+ */
+function pendingToolRefs(snapToolRefs, loadedRefNames, loadedNames, registryTools) {
+    const out = [];
+    const seen = new Set();
+    const push = (ref) => {
+        if (!ref.name || seen.has(ref.name) || loadedRefNames.has(ref.name) || loadedNames.has(ref.name)) {
+            return;
+        }
+        seen.add(ref.name);
+        out.push(ref);
+    };
+    for (const ref of snapToolRefs)
+        push(ref);
+    for (const id of manifestStringToolIds(registryTools))
+        push({ name: id });
+    return out;
 }
 function normalizeDataScope(raw) {
     if (raw === 'user-bound' || raw === 'department-bound' || raw === 'global')
@@ -437,27 +461,6 @@ function expandPreinstallToolset(pre, options) {
     }
     return out;
 }
-function fromLocalManifestFile(toolName, manifest) {
-    const permissions = manifest.permissions;
-    const metadata = manifest.metadata;
-    const manifestRef = {
-        id: String(manifest.id ?? toolName),
-        name: String(manifest.name ?? toolName),
-        version: String(manifest.version ?? '0.0.0'),
-        type: manifest.type ?? 'code',
-        status: 'active',
-        toolRuntime: (manifest.toolRuntime ?? manifest.runtime),
-        dataScope: normalizeDataScope(permissions?.dataScope),
-        requireConfirmation: Boolean(metadata?.require_confirmation),
-        execution: manifest.execution,
-    };
-    return {
-        toolId: String(manifest.id ?? toolName),
-        name: String(manifest.name ?? toolName),
-        manifest: manifestRef,
-        inputSchema: manifest.input,
-    };
-}
 /**
  * 从内联 Tool 声明（manifest.tools 中的完整 ToolManifest 对象）
  * 转为 LoadedToolDefinition。
@@ -505,52 +508,24 @@ async function readJsonObject(filePath) {
         return null;
     }
 }
-function loadedToolFromDevDir(dir, toolName, doc, toolsetOnly) {
-    const tools = doc.tools;
-    if (Array.isArray(tools) && tools.length > 0 && typeof tools[0] === 'object') {
+/**
+ * 开发态只读 `./tools/<code>`，展开整个工具集。不按子工具名扫相邻目录。
+ * 找到清单时返回展开结果，白名单把子工具都排除时为空数组。没有清单时返回 null。
+ */
+async function loadDevLocalToolset(toolsetCode, toolsDir, options) {
+    const dir = path.join(toolsDir, toolsetCode);
+    for (const file of DEV_LOCAL_MANIFEST_FILES) {
+        const doc = await readJsonObject(path.join(dir, file));
+        if (!doc)
+            continue;
         const pre = {
-            toolId: String(doc.code ?? path.basename(dir)),
-            name: String(doc.name ?? path.basename(dir)),
+            toolId: String(doc.id ?? doc.code ?? toolsetCode),
+            name: String(doc.code ?? doc.name ?? toolsetCode),
             version: String(doc.version ?? '0.0.0'),
             manifest: doc,
             bundlePath: dir,
         };
-        const expanded = expandPreinstallToolset(pre);
-        return expanded.find((d) => d.name === toolName) ?? null;
-    }
-    if (toolsetOnly)
-        return null;
-    return fromLocalManifestFile(toolName, doc);
-}
-async function loadDevLocalManifestFromDir(dir, toolName, toolsetOnly) {
-    const files = toolsetOnly ? ['toolset.manifest.json'] : DEV_LOCAL_MANIFEST_FILES;
-    for (const file of files) {
-        const doc = await readJsonObject(path.join(dir, file));
-        if (!doc)
-            continue;
-        const hit = loadedToolFromDevDir(dir, toolName, doc, toolsetOnly);
-        if (hit)
-            return hit;
-    }
-    return null;
-}
-async function loadDevLocalManifest(toolName, toolsDir) {
-    const direct = await loadDevLocalManifestFromDir(path.join(toolsDir, toolName), toolName, false);
-    if (direct)
-        return direct;
-    let entries;
-    try {
-        entries = await readdir(toolsDir, { withFileTypes: true });
-    }
-    catch {
-        return null;
-    }
-    for (const ent of entries) {
-        if (!ent.isDirectory() || ent.name === toolName)
-            continue;
-        const hit = await loadDevLocalManifestFromDir(path.join(toolsDir, ent.name), toolName, true);
-        if (hit)
-            return hit;
+        return expandPreinstallToolset(pre, options);
     }
     return null;
 }
@@ -816,8 +791,8 @@ export class GraphLoader {
         return extract(record?.manifest);
     }
     /**
-     * 解析 agent tools[] + graph tool 节点 union；
-     * server+预装：以预装 manifest 为准；desktop 合并 ILocalToolInstallStore。
+     * 装工具只认登记的工具集（snapshot.tools / 清单 toolsets、toolRefs、tools）和内联 manifest。
+     * 图上 config.tool、节点 id 不参与。server 预装优先；dev 再读 ./tools 下与登记 code 同名的目录；desktop 合并本机安装。
      */
     async loadToolDefinitions(agentCode, options = {}) {
         const requested = this.resolveVersion(options);
@@ -836,7 +811,8 @@ export class GraphLoader {
     }
     async loadToolDefinitionsFromSource(agentCode, options, version) {
         const activeOnly = options.activeOnly !== false;
-        const graphDsl = await this.loadGraph(agentCode, {
+        // 缺图时与原先一样失败。图上的 tool 名不加入下面的登记列表。
+        await this.loadGraph(agentCode, {
             agentVersion: version,
             bypassCache: options.bypassCache,
         });
@@ -889,27 +865,16 @@ export class GraphLoader {
             }, null, 2));
         }
         const snapToolRefs = overlayToolRefPolicies(snap?.tools ?? [], snap?.manifest);
-        const toolNamesFromSnap = snapToolRefs.map((t) => t.name).filter(Boolean);
-        const collectedFromGraph = collectToolNames(agent, graphDsl);
-        const toolNames = [...new Set([...collectedFromGraph, ...toolNamesFromSnap])];
-        // [DEBUG] 最终 toolNames 决策
-        if (process.env.EAP_LLM_DEBUG === '1') {
-            console.log('[LLM-DEBUG] toolNames:', JSON.stringify({
-                fromGraph: collectedFromGraph,
-                fromSnap: toolNamesFromSnap,
-                final: toolNames,
-            }));
-        }
-        if (this.deploymentSnapshot && (snapToolRefs.length > 0 || toolNames.length > 0)) {
+        const loadedRefNames = new Set();
+        if (this.deploymentSnapshot && snapToolRefs.length > 0) {
             const missing = [];
-            const processedToolsetNames = new Set(snapToolRefs.map((r) => r.name));
-            // 1) snapshot 引用的工具集全部加载并展开（enabledTools 白名单过滤）
             for (const ref of snapToolRefs) {
                 const pre = await this.deploymentSnapshot.loadToolManifest(ref, agentDir);
                 if (!pre) {
                     missing.push(ref.name);
                     continue;
                 }
+                loadedRefNames.add(ref.name);
                 for (const def of expandPreinstallToolset(pre, {
                     enabledTools: ref.enabledTools,
                     autoApprove: ref.autoApprove,
@@ -917,34 +882,37 @@ export class GraphLoader {
                     tryAddLoadedTool(definitions, byName, def);
                 }
             }
-            // 2) Graph 声明但尚未命中的工具名：按名直查。
-            //    已在步骤 1 处理过的工具集名不再二次展开（避免丢掉 enabledTools 白名单）。
-            for (const toolName of toolNames) {
-                if (byName.has(toolName))
-                    continue;
-                if (processedToolsetNames.has(toolName))
-                    continue;
-                const pre = await this.deploymentSnapshot.loadToolManifest({ name: toolName }, agentDir);
-                if (!pre) {
-                    // MCP 子工具名在 tools/list 后才出现，图内 type:tool 节点不必对应预装目录
-                    if (definitions.some(isMcpDiscoverStub))
-                        continue;
-                    missing.push(toolName);
+            if (this.strictPreinstall && missing.length > 0) {
+                throw preloadToolNotFound(`预装快照缺失 Tool: ${missing.join(', ')}（agent=${agentCode}）`, { missing, agentCode });
+            }
+        }
+        const pendingRefs = pendingToolRefs(snapToolRefs, loadedRefNames, new Set(byName.keys()), agent?.manifest?.tools);
+        if (process.env.EAP_LLM_DEBUG === '1') {
+            console.log('[LLM-DEBUG] toolRefs:', JSON.stringify({
+                fromSnap: snapToolRefs.map((t) => t.name),
+                pending: pendingRefs.map((t) => t.name),
+            }));
+        }
+        if (this.deploymentContext === 'dev') {
+            const toolsDir = this.localToolsDir ?? process.env.EAP_LOCAL_TOOLS_DIR ?? './tools';
+            for (const ref of pendingRefs) {
+                const localDefs = await loadDevLocalToolset(ref.name, toolsDir, {
+                    enabledTools: ref.enabledTools,
+                    autoApprove: ref.autoApprove,
+                });
+                if (!localDefs)
                     continue;
-                }
-                for (const def of expandPreinstallToolset(pre)) {
+                loadedRefNames.add(ref.name);
+                for (const def of localDefs) {
                     tryAddLoadedTool(definitions, byName, def);
                 }
             }
-            if (this.strictPreinstall && missing.length > 0) {
-                throw preloadToolNotFound(`预装快照缺失 Tool: ${missing.join(', ')}（agent=${agentCode}）`, { missing, agentCode });
-            }
         }
         if (this.registryClient && !this.blockRegistryDefinitions) {
-            for (const toolName of toolNames) {
-                if (byName.has(toolName))
+            for (const ref of pendingRefs) {
+                if (loadedRefNames.has(ref.name) || byName.has(ref.name))
                     continue;
-                const record = await this.registryClient.getToolByName(toolName);
+                const record = await this.registryClient.getToolByName(ref.name);
                 if (!record)
                     continue;
                 if (activeOnly && record.status !== 'active')
@@ -952,17 +920,6 @@ export class GraphLoader {
                 tryAddLoadedTool(definitions, byName, toLoadedToolDefinition(record));
             }
         }
-        if (this.deploymentContext === 'dev') {
-            const toolsDir = this.localToolsDir ?? process.env.EAP_LOCAL_TOOLS_DIR ?? './tools';
-            for (const toolName of toolNames) {
-                if (byName.has(toolName))
-                    continue;
-                const localDef = await loadDevLocalManifest(toolName, toolsDir);
-                if (localDef) {
-                    tryAddLoadedTool(definitions, byName, localDef);
-                }
-            }
-        }
         if (this.deploymentContext === 'desktop' && this.localInstallStore) {
             const localRecords = this.localInstallStore.listReady();
             for (const install of localRecords) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gt-fe/eap-runtime",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "description": "Enterprise Agent Platform — Runtime核心：Graph执行引擎、Task生命周期、Session管理、Checkpoint持久化",
   "type": "module",
   "main": "dist/index.js",