@easynet/agent-tool 1.0.47 → 1.0.49

package/dist/api/main.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkIAEVDXWS_cjs = require('../chunk-IAEVDXWS.cjs');
-var chunkA5B6Q6EG_cjs = require('../chunk-A5B6Q6EG.cjs');
+var chunk5GXFZ4GF_cjs = require('../chunk-5GXFZ4GF.cjs');
+var chunkXHFZEA7L_cjs = require('../chunk-XHFZEA7L.cjs');
 require('../chunk-TOSPHMYU.cjs');
 require('../chunk-DYDNPIV2.cjs');
 require('../chunk-UUNG3GL3.cjs');
@@ -10,47 +10,47 @@ require('../chunk-UUNG3GL3.cjs');
 
 Object.defineProperty(exports, "createAgentTools", {
   enumerable: true,
-  get: function () { return chunkIAEVDXWS_cjs.createAgentTools; }
+  get: function () { return chunk5GXFZ4GF_cjs.createAgentTools; }
 });
 Object.defineProperty(exports, "createLangChainToolsAsync", {
   enumerable: true,
-  get: function () { return chunkIAEVDXWS_cjs.createLangChainToolsAsync; }
+  get: function () { return chunk5GXFZ4GF_cjs.createLangChainToolsAsync; }
 });
 Object.defineProperty(exports, "PTCRuntime", {
   enumerable: true,
-  get: function () { return chunkA5B6Q6EG_cjs.PTCRuntime; }
+  get: function () { return chunkXHFZEA7L_cjs.PTCRuntime; }
 });
 Object.defineProperty(exports, "createHttpService", {
   enumerable: true,
-  get: function () { return chunkA5B6Q6EG_cjs.createHttpService; }
+  get: function () { return chunkXHFZEA7L_cjs.createHttpService; }
 });
 Object.defineProperty(exports, "createMCPServer", {
   enumerable: true,
-  get: function () { return chunkA5B6Q6EG_cjs.createMCPServer; }
+  get: function () { return chunkXHFZEA7L_cjs.createMCPServer; }
 });
 Object.defineProperty(exports, "createMCPServerStreamableHttp", {
   enumerable: true,
-  get: function () { return chunkA5B6Q6EG_cjs.createMCPServerStreamableHttp; }
+  get: function () { return chunkXHFZEA7L_cjs.createMCPServerStreamableHttp; }
 });
 Object.defineProperty(exports, "createMCPStreamableHttpHandler", {
   enumerable: true,
-  get: function () { return chunkA5B6Q6EG_cjs.createMCPStreamableHttpHandler; }
+  get: function () { return chunkXHFZEA7L_cjs.createMCPStreamableHttpHandler; }
 });
 Object.defineProperty(exports, "createOpenAPIServer", {
   enumerable: true,
-  get: function () { return chunkA5B6Q6EG_cjs.createHttpService; }
+  get: function () { return chunkXHFZEA7L_cjs.createHttpService; }
 });
 Object.defineProperty(exports, "createRuntimeFromConfig", {
   enumerable: true,
-  get: function () { return chunkA5B6Q6EG_cjs.createRuntimeFromConfig; }
+  get: function () { return chunkXHFZEA7L_cjs.createRuntimeFromConfig; }
 });
 Object.defineProperty(exports, "createRuntimeFromConfigSync", {
   enumerable: true,
-  get: function () { return chunkA5B6Q6EG_cjs.createRuntimeFromConfigSync; }
+  get: function () { return chunkXHFZEA7L_cjs.createRuntimeFromConfigSync; }
 });
 Object.defineProperty(exports, "runMCPServerOverStdio", {
   enumerable: true,
-  get: function () { return chunkA5B6Q6EG_cjs.runMCPServerOverStdio; }
+  get: function () { return chunkXHFZEA7L_cjs.runMCPServerOverStdio; }
 });
 //# sourceMappingURL=main.cjs.map
 //# sourceMappingURL=main.cjs.map

package/dist/api/main.js

@@ -1,5 +1,5 @@
-export { createAgentTools, createLangChainToolsAsync } from '../chunk-KYBIKD5R.js';
-export { PTCRuntime, createHttpService, createMCPServer, createMCPServerStreamableHttp, createMCPStreamableHttpHandler, createHttpService as createOpenAPIServer, createRuntimeFromConfig, createRuntimeFromConfigSync, runMCPServerOverStdio } from '../chunk-2ZPDD7ZO.js';
+export { createAgentTools, createLangChainToolsAsync } from '../chunk-C6IARXVY.js';
+export { PTCRuntime, createHttpService, createMCPServer, createMCPServerStreamableHttp, createMCPStreamableHttpHandler, createHttpService as createOpenAPIServer, createRuntimeFromConfig, createRuntimeFromConfigSync, runMCPServerOverStdio } from '../chunk-2S465X6Q.js';
 import '../chunk-ZRHPGW7W.js';
 import '../chunk-KDB3MY2H.js';
 import '../chunk-NTWOVFEY.js';

package/dist/api/runtimeFromConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtimeFromConfig.d.ts","sourceRoot":"","sources":["../../src/api/runtimeFromConfig.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAKH,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AA0B3D;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,EAAE,MAAM,EAAO,CAAC;AAEvD,gEAAgE;AAChE,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wFAAwF;IACxF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,+EAA+E;IAC/E,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,gEAAgE;IAChE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,8PAA8P;IAC9P,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACxD,qKAAqK;IACrK,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1D,mFAAmF;IACnF,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,uDAAuD;AACvD,MAAM,WAAW,sBAAsB;IACrC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,oBAAoB;IACnC,iFAAiF;IACjF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,oEAAoE;IACpE,YAAY,CAAC,EAAE,sBAAsB,CAAC;IACtC,yEAAyE;IACzE,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,YAAY,CAAC;CACxB;AAqFD,qKAAqK;AACrK,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAQjG;AAkMD;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,GAAE,oBAAyB,GAAG,mBAAmB,CA2CnG;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAoB9B"}
+{"version":3,"file":"runtimeFromConfig.d.ts","sourceRoot":"","sources":["../../src/api/runtimeFromConfig.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAqC3D;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,EAAE,MAAM,EAAO,CAAC;AAEvD,gEAAgE;AAChE,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wFAAwF;IACxF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,+EAA+E;IAC/E,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,gEAAgE;IAChE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,8PAA8P;IAC9P,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACxD,qKAAqK;IACrK,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1D,mFAAmF;IACnF,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,uDAAuD;AACvD,MAAM,WAAW,sBAAsB;IACrC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,oBAAoB;IACnC,iFAAiF;IACjF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,oEAAoE;IACpE,YAAY,CAAC,EAAE,sBAAsB,CAAC;IACtC,yEAAyE;IACzE,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,YAAY,CAAC;CACxB;AAqFD,qKAAqK;AACrK,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAQjG;AA+ND;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,GAAE,oBAAyB,GAAG,mBAAmB,CA2CnG;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAoB9B"}

package/dist/{chunk-2ZPDD7ZO.js → chunk-2S465X6Q.js}

@@ -12,6 +12,7 @@ import { v4 } from 'uuid';
 import pTimeout from 'p-timeout';
 import { realpath, access } from 'fs/promises';
 import { createRequire } from 'module';
+import { pathToFileURL } from 'url';
 import { resolveLatestVersionFromRegistry, ensurePackageInCache, getPackageEntryPath, importFromCache } from '@easynet/agent-common/npm';
 import { createServer } from 'http';
 
@@ -1753,6 +1754,16 @@ function getProjectRequire() {
   if (existsSync(join(cwd, "tool.yaml"))) return createRequire(join(cwd, "tool.yaml"));
   return null;
 }
+function findNearestPackageJson(startDir) {
+  let dir = resolve(startDir);
+  while (true) {
+    const pkg = join(dir, "package.json");
+    if (existsSync(pkg)) return pkg;
+    const parent = dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
 var DEFAULT_EXTENSION_PACKAGES = [];
 function getInstalledPackageVersion(packageName) {
   const projectRequire = getProjectRequire();
@@ -1861,9 +1872,9 @@ function loadExtensionForDescriptorSync(descriptor, configFilePath, stepLog) {
   if (!parsed) return null;
   const localPath = isAbsolute(configFilePath) ? configFilePath : resolve(process.cwd(), configFilePath);
   const configDir = dirname(localPath);
-  const packageJsonPath = join(configDir, "package.json");
-  const useNodeModules = existsSync(packageJsonPath);
-  const configRequire = useNodeModules ? createRequire(packageJsonPath) : null;
+  const packageJsonPath = findNearestPackageJson(configDir);
+  const configRequire = packageJsonPath ? createRequire(packageJsonPath) : null;
+  const npmCwd = packageJsonPath ? dirname(packageJsonPath) : configDir;
   if (configRequire) {
     try {
       const mod = configRequire(parsed.packageName);
@@ -1871,7 +1882,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 ? resolveLatestVersionFromRegistry(parsed.packageName) : requested;
+        const resolvedVersion = requested === null ? 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 };
@@ -1881,8 +1892,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 = ensurePackageInCache(parsed.packageName, parsed.version, opts);
       if (stepLog) stepLog(`Loaded ${parsed.packageName} from cache: ${cacheDir}`);
@@ -1896,7 +1907,7 @@ function loadExtensionForDescriptorSync(descriptor, configFilePath, stepLog) {
       }
       break;
     } catch {
-      if (Object.keys(opts).length > 0) continue;
+      if (cacheBase && "cacheBase" in opts) continue;
       break;
     }
   }
@@ -1939,9 +1950,32 @@ async function loadExtensionForDescriptorAsync(descriptor, configFilePath, stepL
   const parsed = parseNpmDescriptor(entryStr);
   if (!parsed) return null;
   const localPath = isAbsolute(configFilePath) ? configFilePath : resolve(process.cwd(), configFilePath);
+  const configDir = dirname(localPath);
+  const packageJsonPath = findNearestPackageJson(configDir);
+  const configRequire = packageJsonPath ? createRequire(packageJsonPath) : null;
+  const npmCwd = packageJsonPath ? 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 ? resolveLatestVersionFromRegistry(parsed.packageName, { cwd: npmCwd }) : requested;
+      if (installed === resolvedVersion) {
+        const pkgJsonResolved = configRequire.resolve(`${parsed.packageName}/package.json`);
+        const packageRoot = dirname(pkgJsonResolved);
+        const entryPath = getPackageEntryPath(packageRoot);
+        const mod = await import(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 = ensurePackageInCache(parsed.packageName, parsed.version, opts);
       if (stepLog) stepLog(`Loaded ${parsed.packageName} from cache (async): ${cacheDir}`);
@@ -1953,7 +1987,7 @@ async function loadExtensionForDescriptorAsync(descriptor, configFilePath, stepL
       }
       break;
     } catch {
-      if (Object.keys(opts).length > 0) continue;
+      if (cacheBase && "cacheBase" in opts) continue;
       break;
     }
   }
@@ -2511,5 +2545,5 @@ var LANGCHAIN_KIND = "langchain";
 var LANGCHAIN_DIR_NAME = "langchain";
 
 export { LANGCHAIN_DIR_NAME, LANGCHAIN_KIND, MCP_KIND, PTCRuntime, createHttpService, createMCPServer, createMCPServerStreamableHttp, createMCPStreamableHttpHandler, createRuntimeFromConfig, createRuntimeFromConfigSync, expandToolDescriptorsToRegistryNames, fileDescriptorToPackagePrefix, findAndLoadToolConfig, getDisplayScope, isBarePackageDescriptor, loadToolConfig, npmDescriptorToPackagePrefixWithVersion, resolveSandboxedPath, resolveSandboxedPath2, resolveToolDescriptor, runMCPServerOverStdio, setSandboxValidationEnabled };
-//# sourceMappingURL=chunk-2ZPDD7ZO.js.map
-//# sourceMappingURL=chunk-2ZPDD7ZO.js.map
+//# sourceMappingURL=chunk-2S465X6Q.js.map
+//# sourceMappingURL=chunk-2S465X6Q.js.map