@easynet/agent-tool 1.0.97 → 1.0.98

package/dist/{chunk-WCMZLN3F.js → chunk-ODML7BYU.js}

@@ -36,6 +36,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 = resolve(toolYamlPath);
   const raw = readFileSync(abs, "utf8");
@@ -44,41 +58,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 = dirname(resolve(toolYamlPath));
   return resolveConfigPath(sandboxedPath, configDir, {
@@ -172,23 +166,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 = 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);
@@ -2168,7 +2145,7 @@ function loadAllExtensionsFromToolYamlSync(configFilePath, stepLog) {
   const localPath = isAbsolute(configFilePath) ? configFilePath : resolve(process.cwd(), configFilePath);
   if (!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 = [];
@@ -2271,7 +2248,7 @@ async function loadAllExtensionsFromToolYamlAsync(configFilePath, stepLog) {
   const localPath = isAbsolute(configFilePath) ? configFilePath : resolve(process.cwd(), configFilePath);
   if (!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 = [];
@@ -2931,6 +2908,6 @@ async function createHttpService(runtimeOrConfig, options = {}) {
   };
 }
 
-export { createHttpService, createMCPServerStreamableHttp, createRuntimeFromConfig, createRuntimeFromConfigSync, expandToolDescriptorsToRegistryNames, fileDescriptorToPackagePrefix, findAndLoadToolConfig, getDisplayScope, isBarePackageDescriptor, loadAllExtensionsFromToolYamlSync, loadToolConfig, npmDescriptorToPackagePrefixWithVersion, resolveSandboxedPath, resolveToolDescriptor, runMCPServerOverStdio, toToolObservationText };
-//# sourceMappingURL=chunk-WCMZLN3F.js.map
-//# sourceMappingURL=chunk-WCMZLN3F.js.map
+export { createHttpService, createMCPServerStreamableHttp, createRuntimeFromConfig, createRuntimeFromConfigSync, expandToolDescriptorsToRegistryNames, fileDescriptorToPackagePrefix, findAndLoadToolConfig, getDisplayScope, getToolSourceDescriptors, isBarePackageDescriptor, loadAllExtensionsFromToolYamlSync, loadToolConfig, npmDescriptorToPackagePrefix, resolveSandboxedPath, resolveToolDescriptor, runMCPServerOverStdio, toToolObservationText };
+//# sourceMappingURL=chunk-ODML7BYU.js.map
+//# sourceMappingURL=chunk-ODML7BYU.js.map