@easynet/agent-tool 1.0.48 → 1.0.49

package/dist/{chunk-A5B6Q6EG.cjs → chunk-XHFZEA7L.cjs}

@@ -14,6 +14,7 @@ var uuid = require('uuid');
 var pTimeout = require('p-timeout');
 var promises = require('fs/promises');
 var module$1 = require('module');
+var url = require('url');
 var npm = require('@easynet/agent-common/npm');
 var http = require('http');
 
@@ -1755,13 +1756,23 @@ function isWithinRoot(path$1, root) {
 }
 
 // src/api/runtimeFromConfig.ts
-var requireFromPackage = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-A5B6Q6EG.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-XHFZEA7L.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"));
   if (fs.existsSync(path.join(cwd, "tool.yaml"))) return module$1.createRequire(path.join(cwd, "tool.yaml"));
   return null;
 }
+function findNearestPackageJson(startDir) {
+  let dir = path.resolve(startDir);
+  while (true) {
+    const pkg = path.join(dir, "package.json");
+    if (fs.existsSync(pkg)) return pkg;
+    const parent = path.dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
 var DEFAULT_EXTENSION_PACKAGES = [];
 function getInstalledPackageVersion(packageName) {
   const projectRequire = getProjectRequire();
@@ -1870,9 +1881,9 @@ function loadExtensionForDescriptorSync(descriptor, configFilePath, stepLog) {
   if (!parsed) return null;
   const localPath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process.cwd(), configFilePath);
   const configDir = path.dirname(localPath);
-  const packageJsonPath = path.join(configDir, "package.json");
-  const useNodeModules = fs.existsSync(packageJsonPath);
-  const configRequire = useNodeModules ? module$1.createRequire(packageJsonPath) : null;
+  const packageJsonPath = findNearestPackageJson(configDir);
+  const configRequire = packageJsonPath ? module$1.createRequire(packageJsonPath) : null;
+  const npmCwd = packageJsonPath ? path.dirname(packageJsonPath) : configDir;
   if (configRequire) {
     try {
       const mod = configRequire(parsed.packageName);
@@ -1880,7 +1891,7 @@ function loadExtensionForDescriptorSync(descriptor, configFilePath, stepLog) {
       if (typeof fn === "function") {
         const installed = getInstalledPackageVersionFromRequire(parsed.packageName, configRequire);
         const requested = parsed.version === "latest" || !parsed.version?.trim() ? null : parsed.version;
-        const resolvedVersion = requested === null ? npm.resolveLatestVersionFromRegistry(parsed.packageName) : requested;
+        const resolvedVersion = requested === null ? npm.resolveLatestVersionFromRegistry(parsed.packageName, { cwd: npmCwd }) : requested;
         if (installed === resolvedVersion) {
           if (stepLog) stepLog(`Loaded ${parsed.packageName}@${resolvedVersion} from node_modules`);
           return { register: fn, descriptor: entryStr, resolvedVersion };
@@ -1890,8 +1901,8 @@ function loadExtensionForDescriptorSync(descriptor, configFilePath, stepLog) {
     }
   }
   const cacheBase = getCacheBaseFromToolConfig(localPath);
-  const cacheOpts = cacheBase ? { cacheBase } : {};
-  for (const opts of [cacheOpts, {}]) {
+  const cacheOptions = cacheBase ? [{ cacheBase, cwd: npmCwd }, { cwd: npmCwd }] : [{ cwd: npmCwd }];
+  for (const opts of cacheOptions) {
     try {
       const cacheDir = npm.ensurePackageInCache(parsed.packageName, parsed.version, opts);
       if (stepLog) stepLog(`Loaded ${parsed.packageName} from cache: ${cacheDir}`);
@@ -1905,7 +1916,7 @@ function loadExtensionForDescriptorSync(descriptor, configFilePath, stepLog) {
       }
       break;
     } catch {
-      if (Object.keys(opts).length > 0) continue;
+      if (cacheBase && "cacheBase" in opts) continue;
       break;
     }
   }
@@ -1948,9 +1959,32 @@ async function loadExtensionForDescriptorAsync(descriptor, configFilePath, stepL
   const parsed = parseNpmDescriptor(entryStr);
   if (!parsed) return null;
   const localPath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process.cwd(), configFilePath);
+  const configDir = path.dirname(localPath);
+  const packageJsonPath = findNearestPackageJson(configDir);
+  const configRequire = packageJsonPath ? module$1.createRequire(packageJsonPath) : null;
+  const npmCwd = packageJsonPath ? path.dirname(packageJsonPath) : configDir;
+  if (configRequire) {
+    try {
+      const installed = getInstalledPackageVersionFromRequire(parsed.packageName, configRequire);
+      const requested = parsed.version === "latest" || !parsed.version?.trim() ? null : parsed.version;
+      const resolvedVersion = requested === null ? npm.resolveLatestVersionFromRegistry(parsed.packageName, { cwd: npmCwd }) : requested;
+      if (installed === resolvedVersion) {
+        const pkgJsonResolved = configRequire.resolve(`${parsed.packageName}/package.json`);
+        const packageRoot = path.dirname(pkgJsonResolved);
+        const entryPath = npm.getPackageEntryPath(packageRoot);
+        const mod = await import(url.pathToFileURL(entryPath).href);
+        const fn = getRegisterFn(mod);
+        if (typeof fn === "function") {
+          if (stepLog) stepLog(`Loaded ${parsed.packageName}@${resolvedVersion} from node_modules (async import)`);
+          return { register: fn, descriptor: entryStr, resolvedVersion };
+        }
+      }
+    } catch {
+    }
+  }
   const cacheBase = getCacheBaseFromToolConfig(localPath);
-  const cacheOpts = cacheBase ? { cacheBase } : {};
-  for (const opts of [cacheOpts, {}]) {
+  const cacheOptions = cacheBase ? [{ cacheBase, cwd: npmCwd }, { cwd: npmCwd }] : [{ cwd: npmCwd }];
+  for (const opts of cacheOptions) {
     try {
       const cacheDir = npm.ensurePackageInCache(parsed.packageName, parsed.version, opts);
       if (stepLog) stepLog(`Loaded ${parsed.packageName} from cache (async): ${cacheDir}`);
@@ -1962,7 +1996,7 @@ async function loadExtensionForDescriptorAsync(descriptor, configFilePath, stepL
       }
       break;
     } catch {
-      if (Object.keys(opts).length > 0) continue;
+      if (cacheBase && "cacheBase" in opts) continue;
       break;
     }
   }
@@ -2541,5 +2575,5 @@ exports.resolveSandboxedPath2 = resolveSandboxedPath2;
 exports.resolveToolDescriptor = resolveToolDescriptor;
 exports.runMCPServerOverStdio = runMCPServerOverStdio;
 exports.setSandboxValidationEnabled = setSandboxValidationEnabled;
-//# sourceMappingURL=chunk-A5B6Q6EG.cjs.map
-//# sourceMappingURL=chunk-A5B6Q6EG.cjs.map
+//# sourceMappingURL=chunk-XHFZEA7L.cjs.map
+//# sourceMappingURL=chunk-XHFZEA7L.cjs.map