@easynet/agent-tool 1.0.91 → 1.0.92

package/dist/{chunk-GAC3N3KH.js → chunk-Z6FD2GKB.js}

@@ -2,9 +2,9 @@ import { DirectoryScanner, MCP_KIND } from './chunk-SNN4QJ5Z.js';
 import { ToolRegistry, setSandboxValidationEnabled, createTaggedError, withRetry } from './chunk-IVL4TBFB.js';
 import { normalizeToolName } from './chunk-BDUSB6GT.js';
 import { enrichSpecWithCanonicalSchema } from './chunk-NTWOVFEY.js';
-import { readFileSync, existsSync, statSync } from 'fs';
-import { resolve, dirname, join, isAbsolute, basename } from 'path';
-import { parseYamlContent, resolveConfigPath, summarizeForLog } from '@easynet/agent-common';
+import { readFileSync, existsSync, statSync, rmSync, mkdirSync, readdirSync, renameSync } from 'fs';
+import { join, resolve, dirname, isAbsolute, basename } from 'path';
+import { parseYamlContent, resolveConfigPath } from '@easynet/agent-common';
 import { createRequire } from 'module';
 import { pathToFileURL } from 'url';
 import Ajv from 'ajv';
@@ -13,7 +13,8 @@ import { bulkhead, circuitBreaker, handleAll, ConsecutiveBreaker } from 'cockati
 import { EventEmitter } from 'eventemitter3';
 import { v4 } from 'uuid';
 import pTimeout from 'p-timeout';
-import { resolveLatestVersionFromRegistry, ensurePackageInCache, getPackageEntryPath, importFromCache } from '@easynet/agent-common/npm';
+import { execSync, execFileSync } from 'child_process';
+import { homedir } from 'os';
 import express from 'express';
 
 function normalizeMcpConfig(raw) {
@@ -219,13 +220,13 @@ function expandToolDescriptorsToRegistryNames(descriptors, registryNames) {
         out.push(s);
         continue;
       }
-      const path = parseToolPath(s);
-      if (path) {
-        const packagePrefix = path.protocol === "npm" ? npmDescriptorToPackagePrefix(s) : path.protocol === "file" ? fileDescriptorToPackagePrefix(s) : "";
+      const path2 = parseToolPath(s);
+      if (path2) {
+        const packagePrefix = path2.protocol === "npm" ? npmDescriptorToPackagePrefix(s) : path2.protocol === "file" ? fileDescriptorToPackagePrefix(s) : "";
         const prefixWithDot = packagePrefix ? packagePrefix + "." : "";
         if (prefixWithDot) {
-          if (path.toolName) {
-            const suffix = "." + path.toolName;
+          if (path2.toolName) {
+            const suffix = "." + path2.toolName;
             for (const r of registryNames) {
               if (r.startsWith(prefixWithDot) && r.endsWith(suffix) && !seen.has(r)) {
                 seen.add(r);
@@ -254,9 +255,9 @@ function resolveToolDescriptor(descriptor) {
   return s;
 }
 function fileDescriptorToPackagePrefix(descriptor) {
-  const path = parseToolPath(descriptor.trim());
-  if (!path || path.protocol !== "file") return "";
-  const pathPart = `${path.scope}/${path.packageWithVersion}`;
+  const path2 = parseToolPath(descriptor.trim());
+  if (!path2 || path2.protocol !== "file") return "";
+  const pathPart = `${path2.scope}/${path2.packageWithVersion}`;
   const normalized = normalizeToolName(pathPart);
   if (!normalized) return "";
   return normalizeToolName("file." + normalized);
@@ -854,6 +855,22 @@ var EventLog = class {
     this.seq = 0;
   }
 };
+
+// src/utils/log.ts
+function summarizeForLog(value, maxLen = 220) {
+  const raw = typeof value === "string" ? value : value == null ? "" : (() => {
+    try {
+      return JSON.stringify(value);
+    } catch {
+      return String(value);
+    }
+  })();
+  const compact = raw.replace(/\s+/g, " ").trim();
+  if (!compact) return "(empty)";
+  return compact.length > maxLen ? `${compact.slice(0, maxLen)}...` : compact;
+}
+
+// src/observability/Logger.ts
 var LEVEL_ORDER = {
   silent: 0,
   error: 1,
@@ -1741,6 +1758,147 @@ function buildInputSchemaHint(inputSchema) {
   if (names.length === 0) return null;
   return `This tool expects input property ${names.length === 1 ? `'${names[0]}'` : `one of [${names.map((n) => `'${n}'`).join(", ")}]`}. Use the exact property names from the tool schema.`;
 }
+var versionCache = /* @__PURE__ */ new Map();
+var CACHE_TTL = 5 * 60 * 1e3;
+function resolveNpmPackageVersion(packageName, tag, options = {}) {
+  const cacheKey = packageName;
+  const cached = versionCache.get(cacheKey);
+  if (cached && Date.now() - cached.timestamp < CACHE_TTL) {
+    return cached.version;
+  }
+  try {
+    const spec = tag ? `${packageName}@${tag}` : packageName;
+    const out = execFileSync("npm", ["view", spec, "version"], {
+      cwd: options.cwd ?? process.cwd(),
+      encoding: "utf-8",
+      timeout: options.timeoutMs ?? 8e3,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const version = out?.trim() ?? null;
+    if (version) {
+      versionCache.set(cacheKey, { version, timestamp: Date.now() });
+    }
+    return version;
+  } catch {
+    return null;
+  }
+}
+function resolveLatestVersionFromRegistry(packageName, options = {}) {
+  const version = resolveNpmPackageVersion(packageName, void 0, options);
+  if (!version) {
+    throw new Error(`Failed to resolve latest version for ${packageName}`);
+  }
+  return version;
+}
+
+// src/utils/npmCache.ts
+var DEFAULT_CACHE_BASE = join(homedir(), ".agent", "cache");
+function isLatestRequest(version) {
+  const normalized = (version ?? "").trim().toLowerCase();
+  return normalized === "" || normalized === "latest";
+}
+function getCachedPackageVersion(cacheDir) {
+  const pkgPath = join(cacheDir, "package.json");
+  if (!existsSync(pkgPath)) return void 0;
+  try {
+    const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+    return typeof pkg.version === "string" ? pkg.version : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function packagePathSegments(name) {
+  const withoutScope = name.replace(/^@/, "");
+  return withoutScope.split("/").filter(Boolean);
+}
+function resolveCacheDir(cacheBase, packageName, version) {
+  const segments = packagePathSegments(packageName);
+  return join(cacheBase, ...segments, version);
+}
+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 packageJsonPath = join(cacheDir, "package.json");
+  const nodeModulesPath = join(cacheDir, "node_modules");
+  if (existsSync(packageJsonPath) && existsSync(nodeModulesPath)) {
+    const cachedVersion = getCachedPackageVersion(cacheDir);
+    if (cachedVersion === resolvedVersion) {
+      options.afterInstall?.(cacheDir, packageName);
+      return cacheDir;
+    }
+    rmSync(cacheDir, { recursive: true, force: true });
+  }
+  const packDest = join(cacheBase, ".pack-tmp", packageName.replace(/@/g, "").replace(/\//g, "_"));
+  mkdirSync(packDest, { recursive: true });
+  try {
+    execSync(`npm pack ${packageName}@${resolvedVersion} --pack-destination "${packDest}"`, {
+      cwd,
+      stdio: "pipe",
+      encoding: "utf-8"
+    });
+    const files = readdirSync(packDest);
+    const tgz = files.find((file) => file.endsWith(".tgz"));
+    if (!tgz) throw new Error(`npm pack did not produce a .tgz in ${packDest}`);
+    const extractDir = join(packDest, "extract");
+    mkdirSync(extractDir, { recursive: true });
+    execSync(`tar -xzf "${join(packDest, tgz)}" -C "${extractDir}"`, {
+      stdio: "pipe",
+      encoding: "utf-8"
+    });
+    const extractedPackage = join(extractDir, "package");
+    if (!existsSync(extractedPackage)) {
+      throw new Error(`Extracted tarball did not contain "package" dir in ${extractDir}`);
+    }
+    mkdirSync(join(cacheDir, ".."), { recursive: true });
+    if (existsSync(cacheDir)) rmSync(cacheDir, { recursive: true, force: true });
+    renameSync(extractedPackage, cacheDir);
+    const npmInstallTimeout = 12e4;
+    const maxAttempts = 3;
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      try {
+        execSync("npm install --prefer-offline --no-audit --no-fund", {
+          cwd: cacheDir,
+          stdio: "pipe",
+          encoding: "utf-8",
+          timeout: npmInstallTimeout
+        });
+        break;
+      } catch (error) {
+        if (attempt >= maxAttempts) {
+          const lastError = error instanceof Error ? error : new Error(String(error));
+          throw new Error(`npm install in cache failed after ${maxAttempts} attempts: ${lastError.message}`);
+        }
+        const delayMs = 5e3 * attempt;
+        const deadline = Date.now() + delayMs;
+        while (Date.now() < deadline) {
+        }
+      }
+    }
+    options.afterInstall?.(cacheDir, packageName);
+    return cacheDir;
+  } finally {
+    if (existsSync(packDest)) rmSync(packDest, { recursive: true, force: true });
+  }
+}
+function getPackageEntryPath(packageRoot) {
+  const pkgPath = join(packageRoot, "package.json");
+  if (!existsSync(pkgPath)) throw new Error(`No package.json in ${packageRoot}`);
+  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+  const main = pkg.main ?? "dist/index.js";
+  const entryPath = join(packageRoot, main);
+  if (!existsSync(entryPath)) throw new Error(`Entry not found: ${entryPath}`);
+  return entryPath;
+}
+async function importFromCache(packageRoot) {
+  const entryPath = getPackageEntryPath(packageRoot);
+  const fileUrl = pathToFileURL(entryPath).href;
+  return import(
+    /* @vite-ignore */
+    fileUrl
+  );
+}
 var requireFromPackage = createRequire(import.meta.url);
 function getProjectRequire() {
   const cwd = process.cwd();
@@ -1938,11 +2096,11 @@ function loadExtensionFromNodeModules() {
 }
 function loadExtensionFromFileDescriptorSync(descriptor, configFilePath, stepLog) {
   const entryStr = descriptor.trim();
-  const path = parseToolPath(entryStr);
-  if (!path || path.protocol !== "file") return null;
+  const path2 = parseToolPath(entryStr);
+  if (!path2 || path2.protocol !== "file") return null;
   const localPath = isAbsolute(configFilePath) ? configFilePath : resolve(process.cwd(), configFilePath);
   const configDir = dirname(localPath);
-  const pathPart = `${path.scope}/${path.packageWithVersion}`;
+  const pathPart = `${path2.scope}/${path2.packageWithVersion}`;
   const resolvedPath = resolve(configDir, pathPart);
   if (!existsSync(resolvedPath) || !statSync(resolvedPath).isDirectory()) return null;
   try {
@@ -2360,16 +2518,16 @@ function createMCPStreamableHttpHandler(runtimeOrConfig, options = {}) {
   })();
 }
 async function createMCPServerStreamableHttp(runtimeOrConfig, options = {}) {
-  const path = options.path ?? "/mcp";
+  const path2 = options.path ?? "/mcp";
   const host = options.host ?? "127.0.0.1";
   const port = options.port ?? 3e3;
   const { createMcpExpressApp } = await import('@modelcontextprotocol/sdk/server/express.js');
   const handler = "invoke" in runtimeOrConfig && typeof runtimeOrConfig.invoke === "function" ? createMCPStreamableHttpHandler(runtimeOrConfig, options) : await createMCPStreamableHttpHandler(runtimeOrConfig, options);
   const app = createMcpExpressApp({ host });
-  app.post(path, handler);
+  app.post(path2, handler);
   return {
     app,
-    path,
+    path: path2,
     async listen(listenPort, listenHost) {
       const p = listenPort ?? port;
       const h = listenHost ?? host;
@@ -2377,7 +2535,7 @@ async function createMCPServerStreamableHttp(runtimeOrConfig, options = {}) {
         const server = app.listen(p, h, () => {
           const addr = server.address();
           const actualPort = typeof addr === "object" && addr !== null && "port" in addr ? addr.port : p;
-          resolve4({ url: `http://${h}:${actualPort}${path}`, port: actualPort });
+          resolve4({ url: `http://${h}:${actualPort}${path2}`, port: actualPort });
         });
       });
     }
@@ -2774,5 +2932,5 @@ async function createHttpService(runtimeOrConfig, options = {}) {
 }
 
 export { createHttpService, createMCPServerStreamableHttp, createRuntimeFromConfig, createRuntimeFromConfigSync, expandToolDescriptorsToRegistryNames, fileDescriptorToPackagePrefix, findAndLoadToolConfig, getDisplayScope, isBarePackageDescriptor, loadAllExtensionsFromToolYamlSync, loadToolConfig, npmDescriptorToPackagePrefixWithVersion, resolveSandboxedPath, resolveToolDescriptor, runMCPServerOverStdio, toToolObservationText };
-//# sourceMappingURL=chunk-GAC3N3KH.js.map
-//# sourceMappingURL=chunk-GAC3N3KH.js.map
+//# sourceMappingURL=chunk-Z6FD2GKB.js.map
+//# sourceMappingURL=chunk-Z6FD2GKB.js.map