@easynet/agent-tool 1.0.97 → 1.0.99

package/dist/{chunk-2TFGOUXN.cjs → chunk-TJUWCIYZ.cjs}

@@ -46,6 +46,20 @@ function normalizeOpenApiConfig(raw) {
   if (typeof source.port === "number" && Number.isFinite(source.port)) out.port = source.port;
   return Object.keys(out).length > 0 ? out : void 0;
 }
+function normalizeToolSources(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const out = {};
+  for (const [sourceKey, sourceValue] of Object.entries(raw)) {
+    if (!sourceValue || typeof sourceValue !== "object" || Array.isArray(sourceValue)) continue;
+    const toolMap = {};
+    for (const [toolName, toolValue] of Object.entries(sourceValue)) {
+      if (!toolValue || typeof toolValue !== "object" || Array.isArray(toolValue)) continue;
+      toolMap[toolName] = toolValue;
+    }
+    out[sourceKey] = toolMap;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function loadToolConfig(toolYamlPath) {
   const abs = path.resolve(toolYamlPath);
   const raw = fs.readFileSync(abs, "utf8");
@@ -54,41 +68,21 @@ function loadToolConfig(toolYamlPath) {
   });
   if (!parsed || typeof parsed !== "object") return {};
   const source = parsed.spec && typeof parsed.spec === "object" && !Array.isArray(parsed.spec) ? parsed.spec : parsed;
-  const mcpConfig = normalizeMcpConfig(source.expose?.mcp ?? source.mcp);
-  const openApiConfig = normalizeOpenApiConfig(source.expose?.openapi ?? source.openapi);
-  const toolsBlock = source.tools;
-  if (toolsBlock != null && typeof toolsBlock === "object" && !Array.isArray(toolsBlock)) {
-    const toolDefaults = toolsBlock.defaults != null && typeof toolsBlock.defaults === "object" && !Array.isArray(toolsBlock.defaults) ? toolsBlock.defaults : void 0;
-    const packageToolDefaults2 = toolsBlock.packages != null && typeof toolsBlock.packages === "object" && !Array.isArray(toolsBlock.packages) ? toolsBlock.packages : void 0;
-    const list2 = Array.isArray(toolsBlock.list) && toolsBlock.list.length > 0 ? toolsBlock.list : void 0;
-    return {
-      tools: list2 ?? (packageToolDefaults2 ? Object.keys(packageToolDefaults2) : void 0),
-      sandboxedPath: typeof toolsBlock.sandboxedPath === "string" ? toolsBlock.sandboxedPath : source.sandboxedPath,
-      enableSandboxValidation: typeof toolsBlock.enableSandboxValidation === "boolean" ? toolsBlock.enableSandboxValidation : source.enableSandboxValidation,
-      allowedHosts: Array.isArray(toolsBlock.allowedHosts) ? toolsBlock.allowedHosts : source.allowedHosts,
-      blockedHosts: Array.isArray(toolsBlock.blockedHosts) ? toolsBlock.blockedHosts : source.blockedHosts,
-      blockedCidrs: Array.isArray(toolsBlock.blockedCidrs) ? toolsBlock.blockedCidrs : source.blockedCidrs,
-      toolDefaults,
-      packageToolDefaults: packageToolDefaults2,
-      mcp: mcpConfig,
-      openapi: openApiConfig
-    };
-  }
-  const packageToolDefaults = typeof source.packageToolDefaults === "object" && !Array.isArray(source.packageToolDefaults) ? source.packageToolDefaults : void 0;
-  const list = Array.isArray(source.tools) && source.tools.length > 0 ? source.tools : void 0;
   return {
-    tools: list ?? (packageToolDefaults ? Object.keys(packageToolDefaults) : void 0),
-    sandboxedPath: source.sandboxedPath,
+    sandboxedPath: typeof source.sandboxedPath === "string" ? source.sandboxedPath : void 0,
     enableSandboxValidation: typeof source.enableSandboxValidation === "boolean" ? source.enableSandboxValidation : void 0,
     allowedHosts: Array.isArray(source.allowedHosts) ? source.allowedHosts : void 0,
     blockedHosts: Array.isArray(source.blockedHosts) ? source.blockedHosts : void 0,
     blockedCidrs: Array.isArray(source.blockedCidrs) ? source.blockedCidrs : void 0,
-    toolDefaults: typeof source.toolDefaults === "object" && !Array.isArray(source.toolDefaults) ? source.toolDefaults : void 0,
-    packageToolDefaults,
-    mcp: mcpConfig,
-    openapi: openApiConfig
+    tools: normalizeToolSources(source.tools),
+    mcp: normalizeMcpConfig(source.expose?.mcp ?? source.mcp),
+    openapi: normalizeOpenApiConfig(source.expose?.openapi ?? source.openapi)
   };
 }
+function getToolSourceDescriptors(config, options) {
+  const includeSelf = options?.includeSelf ?? false;
+  return Object.keys(config.tools ?? {}).filter((key) => includeSelf || key !== "self");
+}
 function resolveSandboxedPath(toolYamlPath, sandboxedPath) {
   const configDir = path.dirname(path.resolve(toolYamlPath));
   return config.resolveConfigPath(sandboxedPath, configDir, {
@@ -182,23 +176,6 @@ function npmDescriptorToPackagePrefix(descriptor) {
   if (!normalized) return "";
   return "npm." + normalized;
 }
-function npmDescriptorToPackagePrefixWithVersion(descriptor) {
-  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);
-  const version = lastAt <= 0 ? "" : beforeHash.slice(lastAt + 1).trim();
-  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 = chunkJW4EMVTE_cjs.normalizeToolName(segment);
-  if (!normalized) return "";
-  return "npm." + normalized;
-}
 function getDisplayScope(registryName, _kind, _toolVersion) {
   const i = registryName.indexOf(".");
   return i < 0 ? registryName : registryName.slice(0, i);
@@ -1909,7 +1886,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-2TFGOUXN.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-TJUWCIYZ.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"));
@@ -2075,7 +2052,7 @@ function parseNpmDescriptor(entry) {
 }
 
 // src/api/runtimeFromConfig.ts
-var requireFromPackage2 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-2TFGOUXN.cjs', document.baseURI).href)));
+var requireFromPackage2 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-TJUWCIYZ.cjs', document.baseURI).href)));
 var DEFAULT_EXTENSION_PACKAGES = [];
 function resolveFileDescriptorPath(descriptor, configFilePath) {
   const parsed = parseToolPath(descriptor.trim());
@@ -2122,7 +2099,34 @@ function loadExtensionFromFileDescriptorSync(descriptor, configFilePath, stepLog
       if (stepLog) stepLog(`Loaded local extension from ${resolvedPath}`);
       return { register: fn, descriptor: entryStr, resolvedVersion: "local", packageRoot: resolvedPath };
     }
-  } catch {
+  } catch (error) {
+    if (stepLog) {
+      stepLog(`Failed to load local extension from ${resolvedPath}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  return null;
+}
+async function loadExtensionFromFileDescriptorAsync(descriptor, configFilePath, stepLog) {
+  const entryStr = descriptor.trim();
+  const path2 = parseToolPath(entryStr);
+  if (!path2 || path2.protocol !== "file") return null;
+  const localPath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process.cwd(), configFilePath);
+  const configDir = path.dirname(localPath);
+  const pathPart = `${path2.scope}/${path2.packageWithVersion}`;
+  const resolvedPath = path.resolve(configDir, pathPart);
+  if (!fs.existsSync(resolvedPath) || !fs.statSync(resolvedPath).isDirectory()) return null;
+  try {
+    const entryPath = getPackageEntryPath(resolvedPath);
+    const mod = await import(url.pathToFileURL(entryPath).href);
+    const fn = getRegisterFn(mod);
+    if (typeof fn === "function") {
+      if (stepLog) stepLog(`Loaded local extension from ${resolvedPath} (async import)`);
+      return { register: fn, descriptor: entryStr, resolvedVersion: "local", packageRoot: resolvedPath };
+    }
+  } catch (error) {
+    if (stepLog) {
+      stepLog(`Failed to load local extension from ${resolvedPath}: ${error instanceof Error ? error.message : String(error)}`);
+    }
   }
   return null;
 }
@@ -2178,7 +2182,7 @@ function loadAllExtensionsFromToolYamlSync(configFilePath, stepLog) {
   const localPath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process.cwd(), configFilePath);
   if (!fs.existsSync(localPath)) return [];
   const config = loadToolConfig(localPath);
-  const tools = config.tools;
+  const tools = getToolSourceDescriptors(config);
   if (!Array.isArray(tools) || tools.length === 0) return [];
   if (stepLog) stepLog("Loading extensions from tool.yaml (npm + file)");
   const loaded = [];
@@ -2281,7 +2285,7 @@ async function loadAllExtensionsFromToolYamlAsync(configFilePath, stepLog) {
   const localPath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process.cwd(), configFilePath);
   if (!fs.existsSync(localPath)) return [];
   const config = loadToolConfig(localPath);
-  const tools = config.tools;
+  const tools = getToolSourceDescriptors(config);
   if (!Array.isArray(tools) || tools.length === 0) return [];
   if (stepLog) stepLog("Loading extensions from tool.yaml (async)");
   const loaded = [];
@@ -2291,7 +2295,7 @@ async function loadAllExtensionsFromToolYamlAsync(configFilePath, stepLog) {
       const result = await loadExtensionForDescriptorAsync(entryStr, configFilePath, stepLog);
       if (result) loaded.push(result);
     } else if (entryStr.startsWith("file:")) {
-      const result = loadExtensionFromFileDescriptorSync(entryStr, configFilePath, stepLog);
+      const result = await loadExtensionFromFileDescriptorAsync(entryStr, configFilePath, stepLog);
       if (result) {
         loaded.push(result);
       } else {
@@ -2949,13 +2953,14 @@ exports.expandToolDescriptorsToRegistryNames = expandToolDescriptorsToRegistryNa
 exports.fileDescriptorToPackagePrefix = fileDescriptorToPackagePrefix;
 exports.findAndLoadToolConfig = findAndLoadToolConfig;
 exports.getDisplayScope = getDisplayScope;
+exports.getToolSourceDescriptors = getToolSourceDescriptors;
 exports.isBarePackageDescriptor = isBarePackageDescriptor;
 exports.loadAllExtensionsFromToolYamlSync = loadAllExtensionsFromToolYamlSync;
 exports.loadToolConfig = loadToolConfig;
-exports.npmDescriptorToPackagePrefixWithVersion = npmDescriptorToPackagePrefixWithVersion;
+exports.npmDescriptorToPackagePrefix = npmDescriptorToPackagePrefix;
 exports.resolveSandboxedPath = resolveSandboxedPath;
 exports.resolveToolDescriptor = resolveToolDescriptor;
 exports.runMCPServerOverStdio = runMCPServerOverStdio;
 exports.toToolObservationText = toToolObservationText;
-//# sourceMappingURL=chunk-2TFGOUXN.cjs.map
-//# sourceMappingURL=chunk-2TFGOUXN.cjs.map
+//# sourceMappingURL=chunk-TJUWCIYZ.cjs.map
+//# sourceMappingURL=chunk-TJUWCIYZ.cjs.map