@easynet/agent-tool 1.0.103 → 1.0.105

package/dist/{chunk-KTPQDVP6.cjs → chunk-MQXOFUSU.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkVLV5F6HX_cjs = require('./chunk-VLV5F6HX.cjs');
+var chunk45MCEW2Y_cjs = require('./chunk-45MCEW2Y.cjs');
 var chunkAGLGFQUW_cjs = require('./chunk-AGLGFQUW.cjs');
 var chunkJW4EMVTE_cjs = require('./chunk-JW4EMVTE.cjs');
 var chunkUUNG3GL3_cjs = require('./chunk-UUNG3GL3.cjs');
@@ -52,14 +52,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)) {
@@ -74,6 +85,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 = path.resolve(toolYamlPath);
   const raw = fs.readFileSync(abs, "utf8");
@@ -84,6 +108,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,
@@ -97,15 +125,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 = path.dirname(path.resolve(toolYamlPath));
   return config.resolveConfigPath(sandboxedPath, configDir, {
     expandHome: true
   });
 }
+function resolveCacheDir(toolYamlPath, cacheDir) {
+  const configDir = path.dirname(path.resolve(toolYamlPath));
+  return config.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 path.join(sandboxRoot, CACHE_SUBDIR);
@@ -1180,14 +1222,19 @@ var Tracing = class {
 function resolveTool(toolName, registry) {
   const key = chunkJW4EMVTE_cjs.normalizeToolName(toolName);
   const spec = registry.get(key);
-  if (!spec) {
-    throw chunkAGLGFQUW_cjs.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 chunkAGLGFQUW_cjs.createTaggedError(
+    "TOOL_NOT_FOUND",
+    `Tool not found: ${toolName}`,
+    { availableTools: registry.snapshot().slice(0, 20).map((s) => s.name) }
+  );
 }
 var INPUT_ALIASES = {
   q: "query"
@@ -1812,7 +1859,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 path.join(cacheBase, ...segments, version);
 }
@@ -1820,7 +1867,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 = path.join(cacheDir, "package.json");
   const nodeModulesPath = path.join(cacheDir, "node_modules");
   if (fs.existsSync(packageJsonPath) && fs.existsSync(nodeModulesPath)) {
@@ -1900,7 +1947,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-KTPQDVP6.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-MQXOFUSU.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"));
@@ -2065,9 +2112,11 @@ function parseNpmDescriptor(entry) {
   return { packageName, version };
 }
 
-// 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-KTPQDVP6.cjs', document.baseURI).href)));
+// src/api/runtimeFromConfig.types.ts
 var DEFAULT_EXTENSION_PACKAGES = [];
+
+// 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-MQXOFUSU.cjs', document.baseURI).href)));
 function resolveEffectiveCoreTools(options) {
   if (options.coreTools) return options.coreTools;
   if (options.configFilePath) return {};
@@ -2201,7 +2250,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 = 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 = [];
@@ -2282,7 +2331,7 @@ async function loadLocalDirectoryForFileDescriptor(descriptor, configFilePath, s
   if (!resolvedPath || !fs.existsSync(resolvedPath) || !fs.statSync(resolvedPath).isDirectory()) return null;
   if (fs.existsSync(path.join(resolvedPath, "package.json"))) return null;
   const scanErrors = [];
-  const scanner = new chunkVLV5F6HX_cjs.DirectoryScanner({
+  const scanner = new chunk45MCEW2Y_cjs.DirectoryScanner({
     roots: [{ path: resolvedPath, namespace: "local" }],
     onError: (toolDir, error) => scanErrors.push(`${toolDir}: ${error.message}`)
   });
@@ -2304,7 +2353,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 = 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 = [];
@@ -2490,7 +2539,7 @@ async function createMcpServerWithTools(runtime, options) {
       async (args) => {
         const ctx = ctxFactory();
         const result = await runtime.invoke(
-          { tool: spec.name, args: args ?? {}, purpose: chunkVLV5F6HX_cjs.MCP_KIND },
+          { tool: spec.name, args: args ?? {}, purpose: chunk45MCEW2Y_cjs.MCP_KIND },
           ctx
         );
         if (result.ok) {
@@ -2826,42 +2875,27 @@ async function invokeAndSend(runtime, ctx, res, tool, args) {
     details: result.error?.details
   });
 }
-function createOpenAPIHttpServer(runtime, options = {}) {
-  const app = express__default.default();
-  const router = express__default.default.Router();
-  const basePath = (options.basePath ?? "").replace(/\/$/, "");
-  const ctxFactory = options.execContextFactory ?? (() => ({ ...DEFAULT_CTX2 }));
-  app.use(express__default.default.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-TY7NCWCC.cjs');
@@ -2901,11 +2935,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 ?? "/" });
   });
@@ -2913,6 +2951,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;
@@ -2925,6 +2965,18 @@ function createOpenAPIHttpServer(runtime, options = {}) {
     }
     return originalListen(...args);
   });
+}
+function createOpenAPIHttpServer(runtime, options = {}) {
+  const app = express__default.default();
+  const router = express__default.default.Router();
+  const basePath = (options.basePath ?? "").replace(/\/$/, "");
+  const ctxFactory = options.execContextFactory ?? (() => ({ ...DEFAULT_CTX2 }));
+  app.use(express__default.default.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 = {}) {
@@ -2969,17 +3021,23 @@ async function createHttpService(runtimeOrConfig, options = {}) {
 exports.createHttpService = createHttpService;
 exports.createMCPServerStreamableHttp = createMCPServerStreamableHttp;
 exports.createRuntimeFromConfig = createRuntimeFromConfig;
+exports.ensurePackageInCache = ensurePackageInCache;
 exports.expandToolDescriptorsToRegistryNames = expandToolDescriptorsToRegistryNames;
 exports.fileDescriptorToPackagePrefix = fileDescriptorToPackagePrefix;
 exports.findAndLoadToolConfig = findAndLoadToolConfig;
+exports.getCacheBaseFromToolConfig = getCacheBaseFromToolConfig;
 exports.getDisplayScope = getDisplayScope;
+exports.getPathSourceDescriptors = getPathSourceDescriptors;
 exports.getToolSourceDescriptors = getToolSourceDescriptors;
 exports.isBarePackageDescriptor = isBarePackageDescriptor;
 exports.loadToolConfig = loadToolConfig;
 exports.npmDescriptorToPackagePrefix = npmDescriptorToPackagePrefix;
+exports.parseNpmDescriptor = parseNpmDescriptor;
+exports.parseToolPath = parseToolPath;
+exports.resolveLatestVersionFromRegistry = resolveLatestVersionFromRegistry;
 exports.resolveSandboxedPath = resolveSandboxedPath;
 exports.resolveToolDescriptor = resolveToolDescriptor;
 exports.runMCPServerOverStdio = runMCPServerOverStdio;
 exports.toToolObservationText = toToolObservationText;
-//# sourceMappingURL=chunk-KTPQDVP6.cjs.map
-//# sourceMappingURL=chunk-KTPQDVP6.cjs.map
+//# sourceMappingURL=chunk-MQXOFUSU.cjs.map
+//# sourceMappingURL=chunk-MQXOFUSU.cjs.map