@easynet/agent-tool 1.0.18 → 1.0.20

package/dist/{chunk-EMI67SPN.cjs → chunk-6WQYJLVU.cjs}

@@ -1,6 +1,7 @@
 'use strict';
 
-var chunkZNJBRLKN_cjs = require('./chunk-ZNJBRLKN.cjs');
+var chunkONIBCU2Y_cjs = require('./chunk-ONIBCU2Y.cjs');
+var chunkFGGTT32N_cjs = require('./chunk-FGGTT32N.cjs');
 var Ajv = require('ajv');
 var addFormats = require('ajv-formats');
 var cockatiel = require('cockatiel');
@@ -939,9 +940,10 @@ var Tracing = class {
   }
 };
 function resolveTool(toolName, registry) {
-  const spec = registry.get(toolName);
+  const key = chunkFGGTT32N_cjs.normalizeToolName(toolName);
+  const spec = registry.get(key);
   if (!spec) {
-    throw chunkZNJBRLKN_cjs.createTaggedError(
+    throw chunkONIBCU2Y_cjs.createTaggedError(
       "TOOL_NOT_FOUND",
       `Tool not found: ${toolName}`,
       { availableTools: registry.snapshot().slice(0, 20).map((s) => s.name) }
@@ -980,7 +982,7 @@ function validateInput(spec, args, validator) {
     if (error instanceof SchemaValidationError) {
       const requiredKeys = getRequiredKeys(spec.inputSchema);
       const passedKeys = args != null && typeof args === "object" && !Array.isArray(args) ? Object.keys(args) : [];
-      throw chunkZNJBRLKN_cjs.createTaggedError("INPUT_SCHEMA_INVALID", error.message, {
+      throw chunkONIBCU2Y_cjs.createTaggedError("INPUT_SCHEMA_INVALID", error.message, {
         errors: error.errors,
         schema: spec.inputSchema,
         requiredKeys: requiredKeys.length ? requiredKeys : void 0,
@@ -1053,7 +1055,7 @@ async function requireHumanApproval(spec, args, ctx, deps) {
       sideEffect,
       reason: err instanceof Error ? err.message : String(err)
     });
-    throw chunkZNJBRLKN_cjs.createTaggedError(
+    throw chunkONIBCU2Y_cjs.createTaggedError(
       "HITL_DENIED",
       `Human denied approval for ${spec.name} (${sideEffect})`,
       { reason: err instanceof Error ? err.message : String(err) }
@@ -1066,7 +1068,7 @@ async function requireHumanApproval(spec, args, ctx, deps) {
       sideEffect,
       reason: "User rejected"
     });
-    throw chunkZNJBRLKN_cjs.createTaggedError("HITL_DENIED", `Human denied approval for ${spec.name} (${sideEffect})`);
+    throw chunkONIBCU2Y_cjs.createTaggedError("HITL_DENIED", `Human denied approval for ${spec.name} (${sideEffect})`);
   }
   deps.eventLog.append({
     ...baseEvent,
@@ -1078,7 +1080,7 @@ async function requireHumanApproval(spec, args, ctx, deps) {
 async function executeWithBudget(spec, args, ctx, spanId, deps) {
   const adapter = deps.adapters.get(spec.kind);
   if (!adapter) {
-    throw chunkZNJBRLKN_cjs.createTaggedError(
+    throw chunkONIBCU2Y_cjs.createTaggedError(
       "TOOL_NOT_FOUND",
       `No adapter registered for kind: ${spec.kind}`
     );
@@ -1106,7 +1108,7 @@ async function executeWithBudget(spec, args, ctx, spanId, deps) {
       return result;
     });
   };
-  const retryFn = () => chunkZNJBRLKN_cjs.withRetry(executeFn, {
+  const retryFn = () => chunkONIBCU2Y_cjs.withRetry(executeFn, {
     maxRetries,
     onRetry: (error, attempt) => {
       deps.metrics.recordRetry(spec.name);
@@ -1133,7 +1135,7 @@ async function executeWithBudget(spec, args, ctx, spanId, deps) {
     });
   } catch (error) {
     if (error instanceof Error && error.message.includes("timed out")) {
-      throw chunkZNJBRLKN_cjs.createTaggedError("TIMEOUT", error.message);
+      throw chunkONIBCU2Y_cjs.createTaggedError("TIMEOUT", error.message);
     }
     throw error;
   }
@@ -1147,7 +1149,7 @@ function validateOutput(spec, result, validator) {
     );
   } catch (error) {
     if (error instanceof SchemaValidationError) {
-      throw chunkZNJBRLKN_cjs.createTaggedError("OUTPUT_SCHEMA_INVALID", error.message, {
+      throw chunkONIBCU2Y_cjs.createTaggedError("OUTPUT_SCHEMA_INVALID", error.message, {
         errors: error.errors
       });
     }
@@ -1240,7 +1242,7 @@ var PTCRuntime = class {
   logger;
   constructor(options = {}) {
     this.config = options.config ?? {};
-    this.registry = options.registry ?? new chunkZNJBRLKN_cjs.ToolRegistry();
+    this.registry = options.registry ?? new chunkONIBCU2Y_cjs.ToolRegistry();
     this.validator = options.validator ?? new SchemaValidator();
     this.policy = options.policy ?? new PolicyEngine(this.config.policy);
     this.budget = options.budget ?? new BudgetManager(this.config.budget);
@@ -1341,7 +1343,7 @@ var PTCRuntime = class {
         tracing: this.tracing
       });
       if (!this.budget.checkRateLimit(spec.name)) {
-        throw chunkZNJBRLKN_cjs.createTaggedError(
+        throw chunkONIBCU2Y_cjs.createTaggedError(
           "BUDGET_EXCEEDED",
           `Rate limit exceeded for tool: ${spec.name}`
         );
@@ -1364,7 +1366,7 @@ var PTCRuntime = class {
       const toolError = asToolReturnedError(result);
       if (toolError) {
         const hint = buildInputSchemaHint(spec.inputSchema);
-        throw chunkZNJBRLKN_cjs.createTaggedError("UPSTREAM_ERROR", toolError.message, {
+        throw chunkONIBCU2Y_cjs.createTaggedError("UPSTREAM_ERROR", toolError.message, {
           ...toolError.details && typeof toolError.details === "object" && !Array.isArray(toolError.details) ? toolError.details : {},
           hint: hint ?? "Check the tool's input schema for required property names."
         });
@@ -1508,6 +1510,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 = chunkFGGTT32N_cjs.normalizeToolName(segment);
+  if (!normalized) return "";
+  return "npm." + normalized + ".";
+}
 function isNpmToolDescriptor(descriptor) {
   return isToolPath(descriptor) && parseToolPath(descriptor)?.protocol === "npm";
 }
@@ -1520,7 +1542,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) {
@@ -1530,15 +1552,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 = chunkFGGTT32N_cjs.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 = chunkFGGTT32N_cjs.normalizeToolName(s);
+    add(name);
   }
   return out;
 }
@@ -1692,7 +1731,7 @@ async function importFromCache(packageRoot) {
     fileUrl
   );
 }
-var requireFromPackage = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-EMI67SPN.cjs', document.baseURI).href)));
+var requireFromPackage = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-6WQYJLVU.cjs', document.baseURI).href)));
 function getProjectRequire() {
   const cwd = process.cwd();
   if (fs.existsSync(path.join(cwd, "package.json"))) return module$1.createRequire(path.join(cwd, "package.json"));
@@ -1704,6 +1743,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 = fs.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];
@@ -1712,7 +1767,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;
       }
@@ -1720,6 +1775,40 @@ function loadBuiltinTools() {
   }
   return null;
 }
+function createPrefixingRegistry(registry, prefix) {
+  return {
+    register(spec) {
+      registry.register({ ...spec, name: prefix + chunkFGGTT32N_cjs.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();
@@ -1739,7 +1828,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 {
@@ -1749,7 +1839,10 @@ function loadBuiltinFromToolYamlCache(configFilePath, stepLog) {
         const entryPath = getPackageEntryPath(cacheDir);
         const req = module$1.createRequire(path.join(cacheDir, "package.json"));
         const mod = req(entryPath);
-        if (mod && typeof mod.registerCoreTools === "function") return mod;
+        if (mod && typeof mod.registerCoreTools === "function") {
+          const resolvedVersion = path.basename(cacheDir);
+          return { registerCoreTools: mod.registerCoreTools, descriptor: entryStr, resolvedVersion };
+        }
         break;
       } catch {
         if (Object.keys(opts).length > 0) continue;
@@ -1769,7 +1862,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 {
@@ -1777,7 +1871,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 = path.basename(cacheDir);
+          return { registerCoreTools: mod.registerCoreTools, descriptor: entryStr, resolvedVersion };
+        }
         break;
       } catch {
         if (Object.keys(opts).length > 0) continue;
@@ -1795,14 +1892,18 @@ function loadExampleTools() {
   }
 }
 function createRuntimeFromConfigSync(options = {}) {
-  const registry = new chunkZNJBRLKN_cjs.ToolRegistry();
+  const registry = new chunkONIBCU2Y_cjs.ToolRegistry();
   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) {
@@ -1816,21 +1917,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 };
@@ -1854,8 +1957,10 @@ async function createRuntimeFromConfig(options = {}) {
     const builtin = await loadBuiltinFromToolYamlCacheAsync(options.configFilePath, options.stepLog);
     if (builtin) {
       if (options.stepLog) options.stepLog("Registered builtin from async cache");
-      const registry = new chunkZNJBRLKN_cjs.ToolRegistry();
-      const coreAdapter = builtin.registerCoreTools(registry, options.coreTools);
+      const registry = new chunkONIBCU2Y_cjs.ToolRegistry();
+      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 };
@@ -1898,6 +2003,7 @@ exports.isBarePackageDescriptor = isBarePackageDescriptor;
 exports.isNpmToolDescriptor = isNpmToolDescriptor;
 exports.loadToolConfig = loadToolConfig;
 exports.normalizeToolList = normalizeToolList;
+exports.npmDescriptorToRegistryPrefix = npmDescriptorToRegistryPrefix;
 exports.parseNpmDescriptor = parseNpmDescriptor;
 exports.parseNpmToolDescriptor = parseNpmToolDescriptor;
 exports.resolveNpmToolDescriptor = resolveNpmToolDescriptor;
@@ -1905,5 +2011,5 @@ exports.resolveSandboxedPath = resolveSandboxedPath;
 exports.resolveToolDescriptor = resolveToolDescriptor;
 exports.sanitizeForLog = sanitizeForLog;
 exports.summarizeForLog = summarizeForLog;
-//# sourceMappingURL=chunk-EMI67SPN.cjs.map
-//# sourceMappingURL=chunk-EMI67SPN.cjs.map
+//# sourceMappingURL=chunk-6WQYJLVU.cjs.map
+//# sourceMappingURL=chunk-6WQYJLVU.cjs.map