@easynet/agent-tool 1.0.18 → 1.0.20

package/dist/{chunk-RKN4PT7P.js → chunk-IGMDLCV7.js}

@@ -1,4 +1,5 @@
-import { ToolRegistry, createTaggedError, withRetry } from './chunk-AE6FSNGY.js';
+import { ToolRegistry, createTaggedError, withRetry } from './chunk-IU35EFPK.js';
+import { normalizeToolName } from './chunk-GWBJEGS7.js';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
 import { bulkhead, circuitBreaker, handleAll, ConsecutiveBreaker } from 'cockatiel';
@@ -6,7 +7,7 @@ import { EventEmitter } from 'eventemitter3';
 import { v4 } from 'uuid';
 import pTimeout from 'p-timeout';
 import { readFileSync, existsSync, mkdirSync, readdirSync, rmSync, renameSync } from 'fs';
-import { join, resolve, dirname, isAbsolute } from 'path';
+import { join, resolve, dirname, isAbsolute, basename } from 'path';
 import { homedir } from 'os';
 import yaml from 'js-yaml';
 import { execSync } from 'child_process';
@@ -929,7 +930,8 @@ var Tracing = class {
   }
 };
 function resolveTool(toolName, registry) {
-  const spec = registry.get(toolName);
+  const key = normalizeToolName(toolName);
+  const spec = registry.get(key);
   if (!spec) {
     throw createTaggedError(
       "TOOL_NOT_FOUND",
@@ -1498,6 +1500,26 @@ function parseToolPath(descriptor) {
     toolName: m[5] ?? ""
   };
 }
+function npmDescriptorToRegistryPrefix(descriptor, resolvedVersion) {
+  const s = descriptor.trim();
+  if (typeof s !== "string" || !s.startsWith("npm:")) return "";
+  const rest = s.slice(4).trim();
+  const hashIdx = rest.indexOf("#");
+  const beforeHash = hashIdx < 0 ? rest : rest.slice(0, hashIdx);
+  const lastAt = beforeHash.lastIndexOf("@");
+  const scopeAndPackage = lastAt <= 0 ? beforeHash : beforeHash.slice(0, lastAt);
+  let version = lastAt <= 0 ? "latest" : beforeHash.slice(lastAt + 1).trim() || "latest";
+  if ((version === "latest" || !version) && resolvedVersion != null && resolvedVersion !== "") {
+    version = resolvedVersion;
+  }
+  const slashIdx = scopeAndPackage.indexOf("/");
+  const scope = slashIdx < 0 ? scopeAndPackage : scopeAndPackage.slice(0, slashIdx).replace(/^@/, "");
+  const pkg = slashIdx < 0 ? "" : scopeAndPackage.slice(slashIdx + 1);
+  const segment = [scope, pkg, version].filter(Boolean).join(".");
+  const normalized = normalizeToolName(segment);
+  if (!normalized) return "";
+  return "npm." + normalized + ".";
+}
 function isNpmToolDescriptor(descriptor) {
   return isToolPath(descriptor) && parseToolPath(descriptor)?.protocol === "npm";
 }
@@ -1510,7 +1532,7 @@ function parseNpmToolDescriptor(descriptor) {
   };
 }
 function getDisplayScope(registryName, _kind, _toolVersion) {
-  const i = registryName.indexOf("/");
+  const i = registryName.indexOf(".");
   return i < 0 ? registryName : registryName.slice(0, i);
 }
 function resolveNpmToolDescriptor(descriptor) {
@@ -1520,15 +1542,32 @@ function expandToolDescriptorsToRegistryNames(descriptors, registryNames) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   function add(name) {
-    if (registryNames.includes(name) && !seen.has(name)) {
-      seen.add(name);
-      out.push(name);
+    const key = normalizeToolName(name);
+    if (registryNames.includes(key) && !seen.has(key)) {
+      seen.add(key);
+      out.push(key);
+      return;
+    }
+    const matched = registryNames.filter((r) => r === key || r.endsWith("." + key));
+    for (const m of matched) {
+      if (!seen.has(m)) {
+        seen.add(m);
+        out.push(m);
+      }
     }
   }
   for (const d of descriptors) {
     const s = d.trim();
     if (!s) continue;
-    add(s);
+    if (isToolPath(s)) {
+      if (registryNames.includes(s) && !seen.has(s)) {
+        seen.add(s);
+        out.push(s);
+      }
+      continue;
+    }
+    const name = normalizeToolName(s);
+    add(name);
   }
   return out;
 }
@@ -1694,6 +1733,22 @@ var BUILTIN_PKG_NAMES = [
   "@easynet/agent-tool-builtin",
   "@easynet/agent-tool-buildin"
 ];
+function getInstalledPackageVersion(packageName) {
+  const projectRequire = getProjectRequire();
+  const requirers = [requireFromPackage];
+  if (projectRequire) requirers.push(projectRequire);
+  for (const req of requirers) {
+    try {
+      const pkgJsonPath = req.resolve(`${packageName}/package.json`);
+      const json = readFileSync(pkgJsonPath, "utf-8");
+      const pkg = JSON.parse(json);
+      return pkg.version ?? null;
+    } catch {
+      continue;
+    }
+  }
+  return null;
+}
 function loadBuiltinTools() {
   const projectRequire = getProjectRequire();
   const requirers = [requireFromPackage];
@@ -1702,7 +1757,7 @@ function loadBuiltinTools() {
     for (const pkg of BUILTIN_PKG_NAMES) {
       try {
         const mod = req(pkg);
-        if (mod && typeof mod.registerCoreTools === "function") return mod;
+        if (mod && typeof mod.registerCoreTools === "function") return { registerCoreTools: mod.registerCoreTools, packageName: pkg };
       } catch {
         continue;
       }
@@ -1710,6 +1765,40 @@ function loadBuiltinTools() {
   }
   return null;
 }
+function createPrefixingRegistry(registry, prefix) {
+  return {
+    register(spec) {
+      registry.register({ ...spec, name: prefix + normalizeToolName(spec.name) });
+    },
+    bulkRegister(specs) {
+      specs.forEach((s) => this.register(s));
+    },
+    unregister(name) {
+      return registry.unregister(name);
+    },
+    get(name) {
+      return registry.get(name);
+    },
+    has(name) {
+      return registry.has(name);
+    },
+    search(query) {
+      return registry.search(query);
+    },
+    list() {
+      return registry.list();
+    },
+    get size() {
+      return registry.size;
+    },
+    snapshot() {
+      return registry.snapshot();
+    },
+    clear() {
+      return registry.clear();
+    }
+  };
+}
 function parseNpmDescriptor(entry) {
   if (typeof entry !== "string" || !entry.startsWith("npm:")) return null;
   const rest = entry.slice(4).trim();
@@ -1729,7 +1818,8 @@ function loadBuiltinFromToolYamlCache(configFilePath, stepLog) {
   const cacheOpts = cacheBase ? { cacheBase } : {};
   if (stepLog) stepLog(`Loading builtin from tool.yaml cache (cacheBase: ${cacheBase ?? "~/.agent/cache"})`);
   for (const entry of tools) {
-    const parsed = parseNpmDescriptor(String(entry));
+    const entryStr = String(entry).trim();
+    const parsed = parseNpmDescriptor(entryStr);
     if (!parsed || !BUILTIN_PKG_NAMES.includes(parsed.packageName)) continue;
     for (const opts of [cacheOpts, {}]) {
       try {
@@ -1739,7 +1829,10 @@ function loadBuiltinFromToolYamlCache(configFilePath, stepLog) {
         const entryPath = getPackageEntryPath(cacheDir);
         const req = createRequire(join(cacheDir, "package.json"));
         const mod = req(entryPath);
-        if (mod && typeof mod.registerCoreTools === "function") return mod;
+        if (mod && typeof mod.registerCoreTools === "function") {
+          const resolvedVersion = basename(cacheDir);
+          return { registerCoreTools: mod.registerCoreTools, descriptor: entryStr, resolvedVersion };
+        }
         break;
       } catch {
         if (Object.keys(opts).length > 0) continue;
@@ -1759,7 +1852,8 @@ async function loadBuiltinFromToolYamlCacheAsync(configFilePath, stepLog) {
   const cacheOpts = cacheBase ? { cacheBase } : {};
   if (stepLog) stepLog("Loading builtin from tool.yaml cache (async)");
   for (const entry of tools) {
-    const parsed = parseNpmDescriptor(String(entry));
+    const entryStr = String(entry).trim();
+    const parsed = parseNpmDescriptor(entryStr);
     if (!parsed || !BUILTIN_PKG_NAMES.includes(parsed.packageName)) continue;
     for (const opts of [cacheOpts, {}]) {
       try {
@@ -1767,7 +1861,10 @@ async function loadBuiltinFromToolYamlCacheAsync(configFilePath, stepLog) {
         const cacheDir = ensurePackageInCache(parsed.packageName, parsed.version, opts);
         if (stepLog) stepLog(`Using cache: ${cacheDir}`);
         const mod = await importFromCache(cacheDir);
-        if (mod && typeof mod.registerCoreTools === "function") return mod;
+        if (mod && typeof mod.registerCoreTools === "function") {
+          const resolvedVersion = basename(cacheDir);
+          return { registerCoreTools: mod.registerCoreTools, descriptor: entryStr, resolvedVersion };
+        }
         break;
       } catch {
         if (Object.keys(opts).length > 0) continue;
@@ -1789,10 +1886,14 @@ function createRuntimeFromConfigSync(options = {}) {
   const stepLog = options.stepLog;
   if (options.coreTools !== void 0) {
     if (stepLog) stepLog("Trying builtin from node_modules");
-    let builtin = loadBuiltinTools();
-    if (builtin) {
+    let builtinNode = loadBuiltinTools();
+    if (builtinNode) {
       if (stepLog) stepLog("Registered builtin from node_modules");
-      const coreAdapter = builtin.registerCoreTools(registry, options.coreTools);
+      const descriptor = `npm:${builtinNode.packageName}`;
+      const resolvedVersion = getInstalledPackageVersion(builtinNode.packageName);
+      const prefix = npmDescriptorToRegistryPrefix(descriptor, resolvedVersion ?? void 0);
+      const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
+      const coreAdapter = builtinNode.registerCoreTools(reg, options.coreTools);
       const runtime3 = new PTCRuntime({ registry });
       runtime3.registerAdapter(coreAdapter);
       if (options.exampleTools !== void 0) {
@@ -1806,21 +1907,23 @@ function createRuntimeFromConfigSync(options = {}) {
     }
     if (options.configFilePath) {
       if (stepLog) stepLog("No builtin in node_modules, loading from tool.yaml cache");
-      builtin = loadBuiltinFromToolYamlCache(options.configFilePath, stepLog);
-    }
-    if (builtin) {
-      if (stepLog) stepLog("Registered builtin from cache");
-      const coreAdapter = builtin.registerCoreTools(registry, options.coreTools);
-      const runtime3 = new PTCRuntime({ registry });
-      runtime3.registerAdapter(coreAdapter);
-      if (options.exampleTools !== void 0) {
-        const example = loadExampleTools();
-        if (example) {
-          const exampleAdapter = example.registerExampleTools(registry, options.exampleTools);
-          runtime3.registerAdapter(exampleAdapter);
+      const builtinCache = loadBuiltinFromToolYamlCache(options.configFilePath, stepLog);
+      if (builtinCache) {
+        if (stepLog) stepLog("Registered builtin from cache");
+        const prefix = npmDescriptorToRegistryPrefix(builtinCache.descriptor, builtinCache.resolvedVersion);
+        const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
+        const coreAdapter = builtinCache.registerCoreTools(reg, options.coreTools);
+        const runtime3 = new PTCRuntime({ registry });
+        runtime3.registerAdapter(coreAdapter);
+        if (options.exampleTools !== void 0) {
+          const example = loadExampleTools();
+          if (example) {
+            const exampleAdapter = example.registerExampleTools(registry, options.exampleTools);
+            runtime3.registerAdapter(exampleAdapter);
+          }
         }
+        return { runtime: runtime3, registry };
       }
-      return { runtime: runtime3, registry };
     }
     const runtime2 = new PTCRuntime({ registry });
     return { runtime: runtime2, registry };
@@ -1845,7 +1948,9 @@ async function createRuntimeFromConfig(options = {}) {
     if (builtin) {
       if (options.stepLog) options.stepLog("Registered builtin from async cache");
       const registry = new ToolRegistry();
-      const coreAdapter = builtin.registerCoreTools(registry, options.coreTools);
+      const prefix = npmDescriptorToRegistryPrefix(builtin.descriptor, builtin.resolvedVersion);
+      const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
+      const coreAdapter = builtin.registerCoreTools(reg, options.coreTools);
       const runtime = new PTCRuntime({ registry });
       runtime.registerAdapter(coreAdapter);
       return { runtime, registry };
@@ -1861,6 +1966,6 @@ var MCP_KIND = "mcp";
 var LANGCHAIN_KIND = "langchain";
 var LANGCHAIN_DIR_NAME = "langchain";
 
-export { BUILTIN_PKG_NAMES, BudgetManager, EventLog, LANGCHAIN_DIR_NAME, LANGCHAIN_KIND, MCP_KIND, Metrics, PTCRuntime, PolicyDeniedError, PolicyEngine, SchemaValidationError, SchemaValidator, Tracing, buildEvidence, createLogger, createRuntimeFromConfig, createRuntimeFromConfigSync, ensurePackageInCache, expandToolDescriptorsToRegistryNames, findAndLoadToolConfig, getDisplayScope, getPackageEntryPath, importFromCache, isBarePackageDescriptor, isNpmToolDescriptor, loadToolConfig, normalizeToolList, parseNpmDescriptor, parseNpmToolDescriptor, resolveNpmToolDescriptor, resolveSandboxedPath, resolveToolDescriptor, sanitizeForLog, summarizeForLog };
-//# sourceMappingURL=chunk-RKN4PT7P.js.map
-//# sourceMappingURL=chunk-RKN4PT7P.js.map
+export { BUILTIN_PKG_NAMES, BudgetManager, EventLog, LANGCHAIN_DIR_NAME, LANGCHAIN_KIND, MCP_KIND, Metrics, PTCRuntime, PolicyDeniedError, PolicyEngine, SchemaValidationError, SchemaValidator, Tracing, buildEvidence, createLogger, createRuntimeFromConfig, createRuntimeFromConfigSync, ensurePackageInCache, expandToolDescriptorsToRegistryNames, findAndLoadToolConfig, getDisplayScope, getPackageEntryPath, importFromCache, isBarePackageDescriptor, isNpmToolDescriptor, loadToolConfig, normalizeToolList, npmDescriptorToRegistryPrefix, parseNpmDescriptor, parseNpmToolDescriptor, resolveNpmToolDescriptor, resolveSandboxedPath, resolveToolDescriptor, sanitizeForLog, summarizeForLog };
+//# sourceMappingURL=chunk-IGMDLCV7.js.map
+//# sourceMappingURL=chunk-IGMDLCV7.js.map