@easynet/agent-tool 1.0.103 → 1.0.105

package/dist/{chunk-3C4VJ4DI.js → chunk-OZUNZILF.js}

@@ -1,8 +1,8 @@
-import { DirectoryScanner, MCP_KIND } from './chunk-POUTZDWB.js';
+import { DirectoryScanner, MCP_KIND } from './chunk-2Y6T67HJ.js';
 import { setSandboxValidationEnabled, ToolRegistry, createTaggedError, withRetry } from './chunk-IVL4TBFB.js';
 import { normalizeToolName } from './chunk-BDUSB6GT.js';
 import { enrichSpecWithCanonicalSchema } from './chunk-NTWOVFEY.js';
-import { readFileSync, existsSync, statSync, rmSync, mkdirSync, readdirSync, renameSync } from 'fs';
+import { readFileSync, existsSync, rmSync, mkdirSync, readdirSync, renameSync, statSync } from 'fs';
 import { join, resolve, dirname, isAbsolute, basename } from 'path';
 import { parseYamlContent, resolveConfigPath } from '@easynet/agent-common/config';
 import { createRequire } from 'module';
@@ -42,14 +42,25 @@ function normalizeToolSources(raw) {
   const out = {};
   const customized = source.customized;
   if (customized && typeof customized === "object" && !Array.isArray(customized)) {
-    for (const [sourceKey, sourceValue] of Object.entries(customized)) {
-      if (!sourceValue || typeof sourceValue !== "object" || Array.isArray(sourceValue)) continue;
+    const customizedSource = customized;
+    const descriptorGrouped = Object.keys(customizedSource).some((key) => /^(npm|file):/.test(key));
+    if (descriptorGrouped) {
+      for (const [sourceKey, sourceValue] of Object.entries(customizedSource)) {
+        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;
+      }
+    } else {
       const toolMap = {};
-      for (const [toolName, toolValue] of Object.entries(sourceValue)) {
+      for (const [toolName, toolValue] of Object.entries(customizedSource)) {
         if (!toolValue || typeof toolValue !== "object" || Array.isArray(toolValue)) continue;
         toolMap[toolName] = toolValue;
       }
-      out[sourceKey] = toolMap;
+      if (Object.keys(toolMap).length > 0) out.self = toolMap;
     }
   }
   for (const [sourceKey, sourceValue] of Object.entries(source)) {
@@ -64,6 +75,19 @@ function normalizeToolSources(raw) {
   }
   return Object.keys(out).length > 0 ? out : void 0;
 }
+function normalizePathSources(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const source = raw;
+  const out = {};
+  for (const [descriptor, value] of Object.entries(source)) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+      out[descriptor] = {};
+      continue;
+    }
+    out[descriptor] = value;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function loadToolConfig(toolYamlPath) {
   const abs = resolve(toolYamlPath);
   const raw = readFileSync(abs, "utf8");
@@ -74,6 +98,10 @@ function loadToolConfig(toolYamlPath) {
   const source = parsed.spec && typeof parsed.spec === "object" && !Array.isArray(parsed.spec) ? parsed.spec : parsed;
   return {
     sandboxedPath: typeof source.sandboxedPath === "string" ? source.sandboxedPath : void 0,
+    cacheDir: typeof source.cacheDir === "string" ? source.cacheDir : void 0,
+    toolPath: typeof source.toolPath === "string" ? source.toolPath : void 0,
+    skillPath: typeof source.skillPath === "string" ? source.skillPath : void 0,
+    paths: normalizePathSources(source.paths),
     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,
@@ -87,15 +115,29 @@ function getToolSourceDescriptors(config, options) {
   const includeSelf = options?.includeSelf ?? false;
   return Object.keys(config.tools ?? {}).filter((key) => includeSelf || key !== "self");
 }
+function getPathSourceDescriptors(config) {
+  const fromPaths = Object.keys(config.paths ?? {});
+  if (fromPaths.length > 0) return fromPaths;
+  return getToolSourceDescriptors(config);
+}
 function resolveSandboxedPath(toolYamlPath, sandboxedPath) {
   const configDir = dirname(resolve(toolYamlPath));
   return resolveConfigPath(sandboxedPath, configDir, {
     expandHome: true
   });
 }
+function resolveCacheDir(toolYamlPath, cacheDir) {
+  const configDir = dirname(resolve(toolYamlPath));
+  return resolveConfigPath(cacheDir, configDir, {
+    expandHome: true
+  });
+}
 var CACHE_SUBDIR = ".agent/cache";
 function getCacheBaseFromToolConfig(toolYamlPath) {
   const config = loadToolConfig(toolYamlPath);
+  if (config.cacheDir && typeof config.cacheDir === "string") {
+    return resolveCacheDir(toolYamlPath, config.cacheDir);
+  }
   if (!config.sandboxedPath || typeof config.sandboxedPath !== "string") return void 0;
   const sandboxRoot = resolveSandboxedPath(toolYamlPath, config.sandboxedPath);
   return join(sandboxRoot, CACHE_SUBDIR);
@@ -1170,14 +1212,19 @@ var Tracing = class {
 function resolveTool(toolName, registry) {
   const key = normalizeToolName(toolName);
   const spec = registry.get(key);
-  if (!spec) {
-    throw createTaggedError(
-      "TOOL_NOT_FOUND",
-      `Tool not found: ${toolName}`,
-      { availableTools: registry.snapshot().slice(0, 20).map((s) => s.name) }
-    );
-  }
-  return spec;
+  if (spec) {
+    return spec;
+  }
+  const suffixMatches = registry.snapshot().filter((candidate) => candidate.name.endsWith(`.${key}`));
+  const uniqueSuffixMatch = suffixMatches[0];
+  if (suffixMatches.length === 1 && uniqueSuffixMatch !== void 0) {
+    return uniqueSuffixMatch;
+  }
+  throw createTaggedError(
+    "TOOL_NOT_FOUND",
+    `Tool not found: ${toolName}`,
+    { availableTools: registry.snapshot().slice(0, 20).map((s) => s.name) }
+  );
 }
 var INPUT_ALIASES = {
   q: "query"
@@ -1802,7 +1849,7 @@ function packagePathSegments(name) {
   const withoutScope = name.replace(/^@/, "");
   return withoutScope.split("/").filter(Boolean);
 }
-function resolveCacheDir(cacheBase, packageName, version) {
+function resolveCacheDir2(cacheBase, packageName, version) {
   const segments = packagePathSegments(packageName);
   return join(cacheBase, ...segments, version);
 }
@@ -1810,7 +1857,7 @@ function ensurePackageInCache(packageName, version = "latest", options = {}) {
   const cacheBase = options.cacheBase ?? DEFAULT_CACHE_BASE;
   const cwd = options.cwd ?? process.cwd();
   const resolvedVersion = isLatestRequest(version) ? resolveLatestVersionFromRegistry(packageName, { cwd }) : version;
-  const cacheDir = resolveCacheDir(cacheBase, packageName, resolvedVersion);
+  const cacheDir = resolveCacheDir2(cacheBase, packageName, resolvedVersion);
   const packageJsonPath = join(cacheDir, "package.json");
   const nodeModulesPath = join(cacheDir, "node_modules");
   if (existsSync(packageJsonPath) && existsSync(nodeModulesPath)) {
@@ -2055,9 +2102,11 @@ function parseNpmDescriptor(entry) {
   return { packageName, version };
 }
 
+// src/api/runtimeFromConfig.types.ts
+var DEFAULT_EXTENSION_PACKAGES = [];
+
 // src/api/runtimeFromConfig.ts
 var requireFromPackage2 = createRequire(import.meta.url);
-var DEFAULT_EXTENSION_PACKAGES = [];
 function resolveEffectiveCoreTools(options) {
   if (options.coreTools) return options.coreTools;
   if (options.configFilePath) return {};
@@ -2191,7 +2240,7 @@ function loadAllExtensionsFromToolYamlSync(configFilePath, stepLog) {
   const localPath = isAbsolute(configFilePath) ? configFilePath : resolve(process.cwd(), configFilePath);
   if (!existsSync(localPath)) return [];
   const config = loadToolConfig(localPath);
-  const tools = getToolSourceDescriptors(config);
+  const tools = getPathSourceDescriptors(config);
   if (!Array.isArray(tools) || tools.length === 0) return [];
   if (stepLog) stepLog("Loading extensions from tool.yaml (npm + file)");
   const loaded = [];
@@ -2294,7 +2343,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 = getToolSourceDescriptors(config);
+  const tools = getPathSourceDescriptors(config);
   if (!Array.isArray(tools) || tools.length === 0) return [];
   if (stepLog) stepLog("Loading extensions from tool.yaml (async)");
   const loaded = [];
@@ -2816,42 +2865,27 @@ async function invokeAndSend(runtime, ctx, res, tool, args) {
     details: result.error?.details
   });
 }
-function createOpenAPIHttpServer(runtime, options = {}) {
-  const app = express();
-  const router = express.Router();
-  const basePath = (options.basePath ?? "").replace(/\/$/, "");
-  const ctxFactory = options.execContextFactory ?? (() => ({ ...DEFAULT_CTX2 }));
-  app.use(express.text({ type: "*/*" }));
-  router.get("/", (_req, res) => {
-    const specPath = basePath ? `${basePath}/openapi.json` : "/openapi.json";
-    res.type("text/html; charset=utf-8").send(swaggerUiHtml(specPath));
+function buildSpec(runtime, basePath) {
+  return toolsToOpenAPISpec(runtime.getRegistry(), {
+    title: "Tool API",
+    version: "1.0.0",
+    basePath: basePath || void 0
   });
-  router.get("/swagger", (_req, res) => {
+}
+function registerSpecRoutes(router, runtime, basePath) {
+  const sendSpec = (_req, res) => {
+    sendJson(res, 200, buildSpec(runtime, basePath));
+  };
+  const sendSwagger = (_req, res) => {
     const specPath = basePath ? `${basePath}/openapi.json` : "/openapi.json";
     res.type("text/html; charset=utf-8").send(swaggerUiHtml(specPath));
-  });
-  router.get("/openapi.json", (_req, res) => {
-    sendJson(
-      res,
-      200,
-      toolsToOpenAPISpec(runtime.getRegistry(), {
-        title: "Tool API",
-        version: "1.0.0",
-        basePath: basePath || void 0
-      })
-    );
-  });
-  router.get("/spec", (_req, res) => {
-    sendJson(
-      res,
-      200,
-      toolsToOpenAPISpec(runtime.getRegistry(), {
-        title: "Tool API",
-        version: "1.0.0",
-        basePath: basePath || void 0
-      })
-    );
-  });
+  };
+  router.get("/", sendSwagger);
+  router.get("/swagger", sendSwagger);
+  router.get("/openapi.json", sendSpec);
+  router.get("/spec", sendSpec);
+}
+function registerToolRoutes(router, runtime, ctxFactory) {
   router.get("/tools", async (_req, res, next) => {
     try {
       const { enrichSpecWithCanonicalSchema: enrichSpecWithCanonicalSchema2 } = await import('./canonicalCoreSchemas-PHGTNPN5.js');
@@ -2891,11 +2925,15 @@ function createOpenAPIHttpServer(runtime, options = {}) {
     }
     await invokeAndSend(runtime, ctxFactory(req), res, slugToToolName(req.params?.slug ?? ""), args);
   });
+}
+function mountRouter(app, router, basePath) {
   if (basePath) {
     app.use(basePath, router);
-  } else {
-    app.use(router);
+    return;
   }
+  app.use(router);
+}
+function registerErrorHandlers(app) {
   app.use((req, res) => {
     sendJson(res, 404, { error: "Not found", path: req.url ?? "/" });
   });
@@ -2903,6 +2941,8 @@ function createOpenAPIHttpServer(runtime, options = {}) {
     const message = err instanceof Error ? err.message : String(err);
     sendJson(res, 500, { error: message, kind: "INTERNAL_ERROR" });
   });
+}
+function patchListenDefaults(app, options) {
   const originalListen = app.listen.bind(app);
   const defaultPort = options.port;
   const defaultHost = options.host;
@@ -2915,6 +2955,18 @@ function createOpenAPIHttpServer(runtime, options = {}) {
     }
     return originalListen(...args);
   });
+}
+function createOpenAPIHttpServer(runtime, options = {}) {
+  const app = express();
+  const router = express.Router();
+  const basePath = (options.basePath ?? "").replace(/\/$/, "");
+  const ctxFactory = options.execContextFactory ?? (() => ({ ...DEFAULT_CTX2 }));
+  app.use(express.text({ type: "*/*" }));
+  registerSpecRoutes(router, runtime, basePath);
+  registerToolRoutes(router, runtime, ctxFactory);
+  mountRouter(app, router, basePath);
+  registerErrorHandlers(app);
+  patchListenDefaults(app, options);
   return app;
 }
 function listenOpenAPIHttpServer(app, options = {}) {
@@ -2956,6 +3008,6 @@ async function createHttpService(runtimeOrConfig, options = {}) {
   };
 }
 
-export { createHttpService, createMCPServerStreamableHttp, createRuntimeFromConfig, expandToolDescriptorsToRegistryNames, fileDescriptorToPackagePrefix, findAndLoadToolConfig, getDisplayScope, getToolSourceDescriptors, isBarePackageDescriptor, loadToolConfig, npmDescriptorToPackagePrefix, resolveSandboxedPath, resolveToolDescriptor, runMCPServerOverStdio, toToolObservationText };
-//# sourceMappingURL=chunk-3C4VJ4DI.js.map
-//# sourceMappingURL=chunk-3C4VJ4DI.js.map
+export { createHttpService, createMCPServerStreamableHttp, createRuntimeFromConfig, ensurePackageInCache, expandToolDescriptorsToRegistryNames, fileDescriptorToPackagePrefix, findAndLoadToolConfig, getCacheBaseFromToolConfig, getDisplayScope, getPathSourceDescriptors, getToolSourceDescriptors, isBarePackageDescriptor, loadToolConfig, npmDescriptorToPackagePrefix, parseNpmDescriptor, parseToolPath, resolveLatestVersionFromRegistry, resolveSandboxedPath, resolveToolDescriptor, runMCPServerOverStdio, toToolObservationText };
+//# sourceMappingURL=chunk-OZUNZILF.js.map
+//# sourceMappingURL=chunk-OZUNZILF.js.map