@easynet/agent-tool 1.0.19 → 1.0.21

package/dist/{chunk-TTYAOTOR.js → chunk-XYJRKFWR.js}

@@ -7,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';
@@ -1500,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";
 }
@@ -1522,15 +1542,31 @@ 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;
-    const name = isToolPath(s) ? s : normalizeToolName(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;
@@ -1692,20 +1728,36 @@ function getProjectRequire() {
   if (existsSync(join(cwd, "tool.yaml"))) return createRequire(join(cwd, "tool.yaml"));
   return null;
 }
-var BUILTIN_PKG_NAMES = [
+var DEFAULT_EXTENSION_PACKAGES = [
   "@easynet/agent-tool-builtin-tools",
   "@easynet/agent-tool-builtin",
   "@easynet/agent-tool-buildin"
 ];
-function loadBuiltinTools() {
+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 loadExtensionFromNodeModules() {
   const projectRequire = getProjectRequire();
   const requirers = [requireFromPackage];
   if (projectRequire) requirers.push(projectRequire);
   for (const req of requirers) {
-    for (const pkg of BUILTIN_PKG_NAMES) {
+    for (const pkg of DEFAULT_EXTENSION_PACKAGES) {
       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;
       }
@@ -1713,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();
@@ -1722,7 +1808,7 @@ function parseNpmDescriptor(entry) {
   const version = rest.slice(at + 1).split("#")[0]?.trim() || "latest";
   return { packageName, version };
 }
-function loadBuiltinFromToolYamlCache(configFilePath, stepLog) {
+function loadExtensionFromToolYamlCache(configFilePath, stepLog) {
   const localPath = isAbsolute(configFilePath) ? configFilePath : resolve(process.cwd(), configFilePath);
   if (!existsSync(localPath)) return null;
   const config = loadToolConfig(localPath);
@@ -1730,10 +1816,11 @@ function loadBuiltinFromToolYamlCache(configFilePath, stepLog) {
   if (!Array.isArray(tools)) return null;
   const cacheBase = getCacheBaseFromToolConfig(localPath);
   const cacheOpts = cacheBase ? { cacheBase } : {};
-  if (stepLog) stepLog(`Loading builtin from tool.yaml cache (cacheBase: ${cacheBase ?? "~/.agent/cache"})`);
+  if (stepLog) stepLog(`Loading extension from tool.yaml cache (cacheBase: ${cacheBase ?? "~/.agent/cache"})`);
   for (const entry of tools) {
-    const parsed = parseNpmDescriptor(String(entry));
-    if (!parsed || !BUILTIN_PKG_NAMES.includes(parsed.packageName)) continue;
+    const entryStr = String(entry).trim();
+    const parsed = parseNpmDescriptor(entryStr);
+    if (!parsed) continue;
     for (const opts of [cacheOpts, {}]) {
       try {
         if (stepLog && Object.keys(opts).length === 0 && cacheBase) stepLog("Falling back to default cache ~/.agent/cache");
@@ -1742,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;
@@ -1752,7 +1842,7 @@ function loadBuiltinFromToolYamlCache(configFilePath, stepLog) {
   }
   return null;
 }
-async function loadBuiltinFromToolYamlCacheAsync(configFilePath, stepLog) {
+async function loadExtensionFromToolYamlCacheAsync(configFilePath, stepLog) {
   const localPath = isAbsolute(configFilePath) ? configFilePath : resolve(process.cwd(), configFilePath);
   if (!existsSync(localPath)) return null;
   const config = loadToolConfig(localPath);
@@ -1760,17 +1850,21 @@ async function loadBuiltinFromToolYamlCacheAsync(configFilePath, stepLog) {
   if (!Array.isArray(tools)) return null;
   const cacheBase = getCacheBaseFromToolConfig(localPath);
   const cacheOpts = cacheBase ? { cacheBase } : {};
-  if (stepLog) stepLog("Loading builtin from tool.yaml cache (async)");
+  if (stepLog) stepLog("Loading extension from tool.yaml cache (async)");
   for (const entry of tools) {
-    const parsed = parseNpmDescriptor(String(entry));
-    if (!parsed || !BUILTIN_PKG_NAMES.includes(parsed.packageName)) continue;
+    const entryStr = String(entry).trim();
+    const parsed = parseNpmDescriptor(entryStr);
+    if (!parsed) continue;
     for (const opts of [cacheOpts, {}]) {
       try {
         if (stepLog && Object.keys(opts).length === 0 && cacheBase) stepLog("Falling back to default cache ~/.agent/cache");
         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;
@@ -1791,11 +1885,16 @@ function createRuntimeFromConfigSync(options = {}) {
   const registry = new ToolRegistry();
   const stepLog = options.stepLog;
   if (options.coreTools !== void 0) {
-    if (stepLog) stepLog("Trying builtin from node_modules");
-    let builtin = loadBuiltinTools();
-    if (builtin) {
-      if (stepLog) stepLog("Registered builtin from node_modules");
-      const coreAdapter = builtin.registerCoreTools(registry, options.coreTools);
+    if (stepLog) stepLog("Trying extension from node_modules");
+    let extensionNode = loadExtensionFromNodeModules();
+    if (extensionNode) {
+      if (stepLog) stepLog("Registered extension from node_modules");
+      const descriptor = `npm:${extensionNode.packageName}`;
+      const resolvedVersion = getInstalledPackageVersion(extensionNode.packageName);
+      const prefix = npmDescriptorToRegistryPrefix(descriptor, resolvedVersion ?? void 0);
+      const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
+      const coreOptions = prefix ? { registryPrefix: prefix } : void 0;
+      const coreAdapter = extensionNode.registerCoreTools(reg, options.coreTools, coreOptions);
       const runtime3 = new PTCRuntime({ registry });
       runtime3.registerAdapter(coreAdapter);
       if (options.exampleTools !== void 0) {
@@ -1808,22 +1907,25 @@ function createRuntimeFromConfigSync(options = {}) {
       return { runtime: runtime3, registry };
     }
     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);
+      if (stepLog) stepLog("No extension in node_modules, loading from tool.yaml cache");
+      const extensionCache = loadExtensionFromToolYamlCache(options.configFilePath, stepLog);
+      if (extensionCache) {
+        if (stepLog) stepLog("Registered extension from cache");
+        const prefix = npmDescriptorToRegistryPrefix(extensionCache.descriptor, extensionCache.resolvedVersion);
+        const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
+        const coreOptions = prefix ? { registryPrefix: prefix } : void 0;
+        const coreAdapter = extensionCache.registerCoreTools(reg, options.coreTools, coreOptions);
+        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 };
@@ -1843,12 +1945,15 @@ function createRuntimeFromConfigSync(options = {}) {
 async function createRuntimeFromConfig(options = {}) {
   const syncResult = createRuntimeFromConfigSync(options);
   if (options.coreTools !== void 0 && options.configFilePath && syncResult.registry.snapshot().length === 0) {
-    if (options.stepLog) options.stepLog("No builtin from sync, trying async cache load");
-    const builtin = await loadBuiltinFromToolYamlCacheAsync(options.configFilePath, options.stepLog);
-    if (builtin) {
-      if (options.stepLog) options.stepLog("Registered builtin from async cache");
+    if (options.stepLog) options.stepLog("No extension from sync, trying async cache load");
+    const extension = await loadExtensionFromToolYamlCacheAsync(options.configFilePath, options.stepLog);
+    if (extension) {
+      if (options.stepLog) options.stepLog("Registered extension from async cache");
       const registry = new ToolRegistry();
-      const coreAdapter = builtin.registerCoreTools(registry, options.coreTools);
+      const prefix = npmDescriptorToRegistryPrefix(extension.descriptor, extension.resolvedVersion);
+      const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
+      const coreOptions = prefix ? { registryPrefix: prefix } : void 0;
+      const coreAdapter = extension.registerCoreTools(reg, options.coreTools, coreOptions);
       const runtime = new PTCRuntime({ registry });
       runtime.registerAdapter(coreAdapter);
       return { runtime, registry };
@@ -1864,6 +1969,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-TTYAOTOR.js.map
-//# sourceMappingURL=chunk-TTYAOTOR.js.map
+export { 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, parseNpmToolDescriptor, resolveNpmToolDescriptor, resolveSandboxedPath, resolveToolDescriptor, sanitizeForLog, summarizeForLog };
+//# sourceMappingURL=chunk-XYJRKFWR.js.map
+//# sourceMappingURL=chunk-XYJRKFWR.js.map