@easynet/agent-tool 1.0.34 → 1.0.36

package/dist/{chunk-PKUSCCS6.cjs → chunk-LP7KHBA3.cjs}

@@ -1519,8 +1519,20 @@ function npmDescriptorToRegistryPrefix(descriptor, resolvedVersion) {
   const lastAt = beforeHash.lastIndexOf("@");
   const scopeAndPackage = lastAt <= 0 ? beforeHash : beforeHash.slice(0, lastAt);
   let version = lastAt <= 0 ? "latest" : beforeHash.slice(lastAt + 1).trim() || "latest";
-  if ((version === "latest" || !version) && resolvedVersion != null && resolvedVersion !== "") {
-    version = resolvedVersion;
+  if (version === "latest" || !version) {
+    const resolved = (resolvedVersion ?? "").trim();
+    if (resolved !== "" && resolved.toLowerCase() !== "latest") {
+      version = resolved;
+    } else {
+      throw new Error(
+        `Registry prefix requires a concrete version when descriptor uses latest (${descriptor}). Resolve version from registry (e.g. resolveLatestVersionFromRegistry) and pass as resolvedVersion.`
+      );
+    }
+  }
+  if (!version || version.toLowerCase() === "latest") {
+    throw new Error(
+      `Registry never uses "latest"; pass resolved concrete version for npm descriptor: ${descriptor}`
+    );
   }
   const slashIdx = scopeAndPackage.indexOf("/");
   const scope = slashIdx < 0 ? scopeAndPackage : scopeAndPackage.slice(0, slashIdx).replace(/^@/, "");
@@ -1530,6 +1542,39 @@ function npmDescriptorToRegistryPrefix(descriptor, resolvedVersion) {
   if (!normalized) return "";
   return "npm." + normalized + ".";
 }
+function npmDescriptorToPackagePrefix(descriptor) {
+  const s = descriptor.trim();
+  if (typeof s !== "string" || !s.startsWith("npm:")) return "";
+  const rest = s.slice(4).trim();
+  const hashIdx = rest.indexOf("#");
+  const beforeHash = hashIdx < 0 ? rest : rest.slice(0, hashIdx);
+  const lastAt = beforeHash.lastIndexOf("@");
+  const scopeAndPackage = lastAt <= 0 ? beforeHash : beforeHash.slice(0, lastAt);
+  const slashIdx = scopeAndPackage.indexOf("/");
+  const scope = slashIdx < 0 ? scopeAndPackage : scopeAndPackage.slice(0, slashIdx).replace(/^@/, "");
+  const pkg = slashIdx < 0 ? "" : scopeAndPackage.slice(slashIdx + 1);
+  const segment = [scope, pkg].filter(Boolean).join(".");
+  const normalized = chunkDYDNPIV2_cjs.normalizeToolName(segment);
+  if (!normalized) return "";
+  return "npm." + normalized;
+}
+function npmDescriptorToPackagePrefixWithVersion(descriptor) {
+  const s = descriptor.trim();
+  if (typeof s !== "string" || !s.startsWith("npm:")) return "";
+  const rest = s.slice(4).trim();
+  const hashIdx = rest.indexOf("#");
+  const beforeHash = hashIdx < 0 ? rest : rest.slice(0, hashIdx);
+  const lastAt = beforeHash.lastIndexOf("@");
+  const scopeAndPackage = lastAt <= 0 ? beforeHash : beforeHash.slice(0, lastAt);
+  const version = lastAt <= 0 ? "" : beforeHash.slice(lastAt + 1).trim();
+  const slashIdx = scopeAndPackage.indexOf("/");
+  const scope = slashIdx < 0 ? scopeAndPackage : scopeAndPackage.slice(0, slashIdx).replace(/^@/, "");
+  const pkg = slashIdx < 0 ? "" : scopeAndPackage.slice(slashIdx + 1);
+  const segment = [scope, pkg, version].filter(Boolean).join(".");
+  const normalized = chunkDYDNPIV2_cjs.normalizeToolName(segment);
+  if (!normalized) return "";
+  return "npm." + normalized;
+}
 function isNpmToolDescriptor(descriptor) {
   return isToolPath(descriptor) && parseToolPath(descriptor)?.protocol === "npm";
 }
@@ -1573,6 +1618,30 @@ function expandToolDescriptorsToRegistryNames(descriptors, registryNames) {
       if (registryNames.includes(s) && !seen.has(s)) {
         seen.add(s);
         out.push(s);
+        continue;
+      }
+      const path = parseToolPath(s);
+      if (path) {
+        const packagePrefix = path.protocol === "npm" ? npmDescriptorToPackagePrefix(s) : path.protocol === "file" ? fileDescriptorToPackagePrefix(s) : "";
+        const prefixWithDot = packagePrefix ? packagePrefix + "." : "";
+        if (prefixWithDot) {
+          if (path.toolName) {
+            const suffix = "." + path.toolName;
+            for (const r of registryNames) {
+              if (r.startsWith(prefixWithDot) && r.endsWith(suffix) && !seen.has(r)) {
+                seen.add(r);
+                out.push(r);
+              }
+            }
+          } else {
+            for (const r of registryNames) {
+              if (r.startsWith(prefixWithDot) && !seen.has(r)) {
+                seen.add(r);
+                out.push(r);
+              }
+            }
+          }
+        }
       }
       continue;
     }
@@ -1598,6 +1667,18 @@ function normalizeToolList(descriptors) {
   }
   return out;
 }
+function fileDescriptorToPackagePrefix(descriptor) {
+  const path = parseToolPath(descriptor.trim());
+  if (!path || path.protocol !== "file") return "";
+  const pathPart = `${path.scope}/${path.packageWithVersion}`;
+  const normalized = chunkDYDNPIV2_cjs.normalizeToolName(pathPart);
+  if (!normalized) return "";
+  return "file." + normalized;
+}
+function fileDescriptorToRegistryPrefix(descriptor) {
+  const prefix = fileDescriptorToPackagePrefix(descriptor);
+  return prefix ? prefix + "." : "";
+}
 function loadToolConfig(toolYamlPath) {
   const abs = path.resolve(toolYamlPath);
   const raw = fs.readFileSync(abs, "utf8");
@@ -1605,20 +1686,29 @@ function loadToolConfig(toolYamlPath) {
   if (!parsed || typeof parsed !== "object") return {};
   const toolsBlock = parsed.tools;
   if (toolsBlock != null && typeof toolsBlock === "object" && !Array.isArray(toolsBlock)) {
+    const toolDefaults = toolsBlock.defaults != null && typeof toolsBlock.defaults === "object" && !Array.isArray(toolsBlock.defaults) ? toolsBlock.defaults : void 0;
+    const packageToolDefaults2 = toolsBlock.packages != null && typeof toolsBlock.packages === "object" && !Array.isArray(toolsBlock.packages) ? toolsBlock.packages : void 0;
+    const list2 = Array.isArray(toolsBlock.list) && toolsBlock.list.length > 0 ? toolsBlock.list : void 0;
     return {
-      tools: Array.isArray(toolsBlock.list) ? toolsBlock.list : void 0,
+      tools: list2 ?? (packageToolDefaults2 ? Object.keys(packageToolDefaults2) : void 0),
       sandboxedPath: typeof toolsBlock.sandboxedPath === "string" ? toolsBlock.sandboxedPath : parsed.sandboxedPath,
       allowedHosts: Array.isArray(toolsBlock.allowedHosts) ? toolsBlock.allowedHosts : parsed.allowedHosts,
       blockedHosts: Array.isArray(toolsBlock.blockedHosts) ? toolsBlock.blockedHosts : parsed.blockedHosts,
-      blockedCidrs: Array.isArray(toolsBlock.blockedCidrs) ? toolsBlock.blockedCidrs : parsed.blockedCidrs
+      blockedCidrs: Array.isArray(toolsBlock.blockedCidrs) ? toolsBlock.blockedCidrs : parsed.blockedCidrs,
+      toolDefaults,
+      packageToolDefaults: packageToolDefaults2
     };
   }
+  const packageToolDefaults = typeof parsed.packageToolDefaults === "object" && !Array.isArray(parsed.packageToolDefaults) ? parsed.packageToolDefaults : void 0;
+  const list = Array.isArray(parsed.tools) && parsed.tools.length > 0 ? parsed.tools : void 0;
   return {
-    tools: Array.isArray(parsed.tools) ? parsed.tools : void 0,
+    tools: list ?? (packageToolDefaults ? Object.keys(packageToolDefaults) : void 0),
     sandboxedPath: parsed.sandboxedPath,
     allowedHosts: Array.isArray(parsed.allowedHosts) ? parsed.allowedHosts : void 0,
     blockedHosts: Array.isArray(parsed.blockedHosts) ? parsed.blockedHosts : void 0,
-    blockedCidrs: Array.isArray(parsed.blockedCidrs) ? parsed.blockedCidrs : void 0
+    blockedCidrs: Array.isArray(parsed.blockedCidrs) ? parsed.blockedCidrs : void 0,
+    toolDefaults: typeof parsed.toolDefaults === "object" && !Array.isArray(parsed.toolDefaults) ? parsed.toolDefaults : void 0,
+    packageToolDefaults
   };
 }
 function resolveSandboxedPath(toolYamlPath, sandboxedPath) {
@@ -1645,6 +1735,37 @@ function findAndLoadToolConfig(dir) {
   return {};
 }
 var DEFAULT_CACHE_BASE = path.join(os.homedir(), ".agent", "cache");
+function isLatestRequest(version) {
+  const v = (version ?? "").trim().toLowerCase();
+  return v === "" || v === "latest";
+}
+function resolveLatestVersionFromRegistry(packageName) {
+  const quoted = packageName.includes(" ") ? `"${packageName}"` : packageName;
+  try {
+    const out = child_process.execSync(`npm view ${quoted} version`, {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    const version = (out ?? "").trim();
+    if (!version) {
+      throw new Error(`npm view ${packageName} version returned empty`);
+    }
+    return version;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new Error(`Failed to resolve latest version for ${packageName}: ${msg}`);
+  }
+}
+function getCachedPackageVersion(cacheDir) {
+  const pkgPath = path.join(cacheDir, "package.json");
+  if (!fs.existsSync(pkgPath)) return void 0;
+  try {
+    const pkg = JSON.parse(fs.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);
@@ -1653,17 +1774,29 @@ function resolveCacheDir(cacheBase, packageName, version) {
   const segments = packagePathSegments(packageName);
   return path.join(cacheBase, ...segments, version);
 }
-function getVersionFromTarball(tgzName) {
-  const base = tgzName.replace(/\.tgz$/i, "");
-  const match = base.match(/-(\d+\.\d+\.\d+(-[a-zA-Z0-9.-]+)?)$/);
-  return match ? match[1] : base;
-}
 function ensurePackageInCache(packageName, version = "latest", options = {}) {
   const cacheBase = options.cacheBase ?? DEFAULT_CACHE_BASE;
+  let resolvedVersion;
+  if (isLatestRequest(version)) {
+    resolvedVersion = resolveLatestVersionFromRegistry(packageName);
+  } else {
+    resolvedVersion = version;
+  }
+  const cacheDir = resolveCacheDir(cacheBase, packageName, resolvedVersion);
+  const packageJsonPath = path.join(cacheDir, "package.json");
+  const nodeModulesPath = path.join(cacheDir, "node_modules");
+  if (fs.existsSync(packageJsonPath) && fs.existsSync(nodeModulesPath)) {
+    const cachedVersion = getCachedPackageVersion(cacheDir);
+    if (cachedVersion === resolvedVersion) {
+      options.afterInstall?.(cacheDir, packageName);
+      return cacheDir;
+    }
+    fs.rmSync(cacheDir, { recursive: true, force: true });
+  }
   const packDest = path.join(cacheBase, ".pack-tmp", packageName.replace(/@/g, "").replace(/\//g, "_"));
   fs.mkdirSync(packDest, { recursive: true });
   try {
-    child_process.execSync(`npm pack ${packageName}@${version} --pack-destination "${packDest}"`, {
+    child_process.execSync(`npm pack ${packageName}@${resolvedVersion} --pack-destination "${packDest}"`, {
       cwd: process.cwd(),
       stdio: "pipe",
       encoding: "utf-8"
@@ -1673,15 +1806,6 @@ function ensurePackageInCache(packageName, version = "latest", options = {}) {
     if (!tgz) {
       throw new Error(`npm pack did not produce a .tgz in ${packDest}`);
     }
-    const resolvedVersion = getVersionFromTarball(tgz);
-    const cacheDir = resolveCacheDir(cacheBase, packageName, resolvedVersion);
-    const packageJsonPath = path.join(cacheDir, "package.json");
-    const nodeModulesPath = path.join(cacheDir, "node_modules");
-    if (fs.existsSync(packageJsonPath) && fs.existsSync(nodeModulesPath)) {
-      options.afterInstall?.(cacheDir, packageName);
-      fs.rmSync(packDest, { recursive: true, force: true });
-      return cacheDir;
-    }
     const extractDir = path.join(packDest, "extract");
     fs.mkdirSync(extractDir, { recursive: true });
     child_process.execSync(`tar -xzf "${path.join(packDest, tgz)}" -C "${extractDir}"`, {
@@ -1697,11 +1821,33 @@ function ensurePackageInCache(packageName, version = "latest", options = {}) {
       fs.rmSync(cacheDir, { recursive: true, force: true });
     }
     fs.renameSync(extractedPackage, cacheDir);
-    child_process.execSync("npm install", {
-      cwd: cacheDir,
-      stdio: "pipe",
-      encoding: "utf-8"
-    });
+    const npmInstallTimeout = 12e4;
+    const maxAttempts = 3;
+    let lastErr;
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      try {
+        child_process.execSync("npm install --prefer-offline --no-audit --no-fund", {
+          cwd: cacheDir,
+          stdio: "pipe",
+          encoding: "utf-8",
+          timeout: npmInstallTimeout
+        });
+        lastErr = void 0;
+        break;
+      } catch (err) {
+        lastErr = err instanceof Error ? err : new Error(String(err));
+        if (attempt < maxAttempts) {
+          const delayMs = 5e3 * attempt;
+          const deadline = Date.now() + delayMs;
+          while (Date.now() < deadline) {
+          }
+        } else {
+          throw new Error(
+            `npm install in cache failed after ${maxAttempts} attempts: ${lastErr.message}`
+          );
+        }
+      }
+    }
     options.afterInstall?.(cacheDir, packageName);
     return cacheDir;
   } finally {
@@ -1731,7 +1877,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-PKUSCCS6.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-LP7KHBA3.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"));
@@ -1818,34 +1964,95 @@ function parseNpmDescriptor(entry) {
   const version = rest.slice(at + 1).split("#")[0]?.trim() || "latest";
   return { packageName, version };
 }
-function loadExtensionFromToolYamlNodeModules(configFilePath, stepLog) {
+function loadExtensionFromFileDescriptorSync(descriptor, configFilePath, stepLog) {
+  const entryStr = descriptor.trim();
+  const path$1 = parseToolPath(entryStr);
+  if (!path$1 || path$1.protocol !== "file") return null;
+  const localPath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process.cwd(), configFilePath);
+  const configDir = path.dirname(localPath);
+  const pathPart = `${path$1.scope}/${path$1.packageWithVersion}`;
+  const resolvedPath = path.resolve(configDir, pathPart);
+  if (!fs.existsSync(resolvedPath) || !fs.statSync(resolvedPath).isDirectory()) return null;
+  try {
+    const entryPath = getPackageEntryPath(resolvedPath);
+    const req = module$1.createRequire(path.join(resolvedPath, "package.json"));
+    const mod = req(entryPath);
+    const fn = getRegisterFn(mod);
+    if (typeof fn === "function") {
+      if (stepLog) stepLog(`Loaded local extension from ${resolvedPath}`);
+      return { register: fn, descriptor: entryStr, resolvedVersion: "local" };
+    }
+  } catch {
+  }
+  return null;
+}
+function loadExtensionForDescriptorSync(descriptor, configFilePath, stepLog) {
+  const entryStr = descriptor.trim();
+  const parsed = parseNpmDescriptor(entryStr);
+  if (!parsed) return null;
   const localPath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process.cwd(), configFilePath);
-  if (!fs.existsSync(localPath)) return null;
-  const config = loadToolConfig(localPath);
-  const tools = config.tools;
-  if (!Array.isArray(tools) || tools.length === 0) return null;
   const configDir = path.dirname(localPath);
   const packageJsonPath = path.join(configDir, "package.json");
-  if (!fs.existsSync(packageJsonPath)) return null;
-  const configRequire = module$1.createRequire(packageJsonPath);
-  if (stepLog) stepLog("Trying tool.yaml npm entries from node_modules");
-  for (const entry of tools) {
-    const entryStr = String(entry).trim();
-    const parsed = parseNpmDescriptor(entryStr);
-    if (!parsed) continue;
+  const useNodeModules = fs.existsSync(packageJsonPath);
+  const configRequire = useNodeModules ? module$1.createRequire(packageJsonPath) : null;
+  if (configRequire) {
     try {
       const mod = configRequire(parsed.packageName);
       const fn = getRegisterFn(mod);
       if (typeof fn === "function") {
-        const resolvedVersion = getInstalledPackageVersionFromRequire(parsed.packageName, configRequire) ?? "latest";
+        const installed = getInstalledPackageVersionFromRequire(parsed.packageName, configRequire);
+        const requested = parsed.version === "latest" || !parsed.version?.trim() ? null : parsed.version;
+        const resolvedVersion = installed ?? (requested === null ? resolveLatestVersionFromRegistry(parsed.packageName) : requested);
+        if (requested === null || installed === requested) {
+          if (stepLog) stepLog(`Loaded ${parsed.packageName}@${resolvedVersion} from node_modules`);
+          return { register: fn, descriptor: entryStr, resolvedVersion };
+        }
+      }
+    } catch {
+    }
+  }
+  const cacheBase = getCacheBaseFromToolConfig(localPath);
+  const cacheOpts = cacheBase ? { cacheBase } : {};
+  for (const opts of [cacheOpts, {}]) {
+    try {
+      const cacheDir = ensurePackageInCache(parsed.packageName, parsed.version, opts);
+      if (stepLog) stepLog(`Loaded ${parsed.packageName} from cache: ${cacheDir}`);
+      const entryPath = getPackageEntryPath(cacheDir);
+      const req = module$1.createRequire(path.join(cacheDir, "package.json"));
+      const mod = req(entryPath);
+      const fn = getRegisterFn(mod);
+      if (typeof fn === "function") {
+        const resolvedVersion = path.basename(cacheDir);
         return { register: fn, descriptor: entryStr, resolvedVersion };
       }
+      break;
     } catch {
-      continue;
+      if (Object.keys(opts).length > 0) continue;
+      break;
     }
   }
   return null;
 }
+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 = config.tools;
+  if (!Array.isArray(tools) || tools.length === 0) return [];
+  if (stepLog) stepLog("Loading extensions from tool.yaml (npm + file)");
+  const loaded = [];
+  for (const entry of tools) {
+    const entryStr = String(entry).trim();
+    if (entryStr.startsWith("npm:")) {
+      const result = loadExtensionForDescriptorSync(entryStr, configFilePath, stepLog);
+      if (result) loaded.push(result);
+    } else if (entryStr.startsWith("file:")) {
+      const result = loadExtensionFromFileDescriptorSync(entryStr, configFilePath, stepLog);
+      if (result) loaded.push(result);
+    }
+  }
+  return loaded;
+}
 function getInstalledPackageVersionFromRequire(packageName, req) {
   try {
     const pkgJsonPath = req.resolve(`${packageName}/package.json`);
@@ -1856,114 +2063,84 @@ function getInstalledPackageVersionFromRequire(packageName, req) {
     return null;
   }
 }
-function loadExtensionFromToolYamlCache(configFilePath, stepLog) {
+async function loadExtensionForDescriptorAsync(descriptor, configFilePath, stepLog) {
+  const syncResult = loadExtensionForDescriptorSync(descriptor, configFilePath, stepLog);
+  if (syncResult) return syncResult;
+  const entryStr = descriptor.trim();
+  const parsed = parseNpmDescriptor(entryStr);
+  if (!parsed) return null;
   const localPath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process.cwd(), configFilePath);
-  if (!fs.existsSync(localPath)) return null;
-  const config = loadToolConfig(localPath);
-  const tools = config.tools;
-  if (!Array.isArray(tools)) return null;
   const cacheBase = getCacheBaseFromToolConfig(localPath);
   const cacheOpts = cacheBase ? { cacheBase } : {};
-  if (stepLog) stepLog(`Loading extension from tool.yaml cache (cacheBase: ${cacheBase ?? "~/.agent/cache"})`);
-  for (const entry of tools) {
-    const entryStr = String(entry).trim();
-    const parsed = parseNpmDescriptor(entryStr);
-    if (!parsed) continue;
-    for (const opts of [cacheOpts, {}]) {
-      try {
-        if (stepLog && Object.keys(opts).length === 0 && cacheBase) stepLog("Falling back to default cache ~/.agent/cache");
-        const cacheDir = ensurePackageInCache(parsed.packageName, parsed.version, opts);
-        if (stepLog) stepLog(`Using cache: ${cacheDir}`);
-        const entryPath = getPackageEntryPath(cacheDir);
-        const req = module$1.createRequire(path.join(cacheDir, "package.json"));
-        const mod = req(entryPath);
-        const fn = getRegisterFn(mod);
-        if (typeof fn === "function") {
-          const resolvedVersion = path.basename(cacheDir);
-          return { register: fn, descriptor: entryStr, resolvedVersion };
-        }
-        break;
-      } catch {
-        if (Object.keys(opts).length > 0) continue;
-        break;
+  for (const opts of [cacheOpts, {}]) {
+    try {
+      const cacheDir = ensurePackageInCache(parsed.packageName, parsed.version, opts);
+      if (stepLog) stepLog(`Loaded ${parsed.packageName} from cache (async): ${cacheDir}`);
+      const mod = await importFromCache(cacheDir);
+      const fn = getRegisterFn(mod);
+      if (typeof fn === "function") {
+        const resolvedVersion = path.basename(cacheDir);
+        return { register: fn, descriptor: entryStr, resolvedVersion };
       }
+      break;
+    } catch {
+      if (Object.keys(opts).length > 0) continue;
+      break;
     }
   }
   return null;
 }
-async function loadExtensionFromToolYamlCacheAsync(configFilePath, stepLog) {
+async function loadAllExtensionsFromToolYamlAsync(configFilePath, stepLog) {
   const localPath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process.cwd(), configFilePath);
-  if (!fs.existsSync(localPath)) return null;
+  if (!fs.existsSync(localPath)) return [];
   const config = loadToolConfig(localPath);
   const tools = config.tools;
-  if (!Array.isArray(tools)) return null;
-  const cacheBase = getCacheBaseFromToolConfig(localPath);
-  const cacheOpts = cacheBase ? { cacheBase } : {};
-  if (stepLog) stepLog("Loading extension from tool.yaml cache (async)");
+  if (!Array.isArray(tools) || tools.length === 0) return [];
+  if (stepLog) stepLog("Loading extensions from tool.yaml (async)");
+  const loaded = [];
   for (const entry of tools) {
     const entryStr = String(entry).trim();
-    const parsed = parseNpmDescriptor(entryStr);
-    if (!parsed) continue;
-    for (const opts of [cacheOpts, {}]) {
-      try {
-        if (stepLog && Object.keys(opts).length === 0 && cacheBase) stepLog("Falling back to default cache ~/.agent/cache");
-        const cacheDir = ensurePackageInCache(parsed.packageName, parsed.version, opts);
-        if (stepLog) stepLog(`Using cache: ${cacheDir}`);
-        const mod = await importFromCache(cacheDir);
-        const fn = getRegisterFn(mod);
-        if (typeof fn === "function") {
-          const resolvedVersion = path.basename(cacheDir);
-          return { register: fn, descriptor: entryStr, resolvedVersion };
-        }
-        break;
-      } catch {
-        if (Object.keys(opts).length > 0) continue;
-        break;
-      }
+    if (entryStr.startsWith("npm:")) {
+      const result = await loadExtensionForDescriptorAsync(entryStr, configFilePath, stepLog);
+      if (result) loaded.push(result);
+    } else if (entryStr.startsWith("file:")) {
+      const result = loadExtensionFromFileDescriptorSync(entryStr, configFilePath, stepLog);
+      if (result) loaded.push(result);
     }
   }
-  return null;
+  return loaded;
 }
 function createRuntimeFromConfigSync(options = {}) {
   const registry = new chunkTOSPHMYU_cjs.ToolRegistry();
   const stepLog = options.stepLog;
   if (options.coreTools !== void 0) {
+    if (options.configFilePath) {
+      const all = loadAllExtensionsFromToolYamlSync(options.configFilePath, stepLog);
+      if (all.length > 0) {
+        if (stepLog) stepLog(`Registered ${all.length} extension(s) from tool.yaml`);
+        const runtime3 = new PTCRuntime({ registry });
+        for (const ext of all) {
+          const prefix = ext.descriptor.startsWith("file:") ? fileDescriptorToRegistryPrefix(ext.descriptor) : npmDescriptorToRegistryPrefix(ext.descriptor, ext.resolvedVersion);
+          const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
+          const adapter = ext.register(reg, options.coreTools);
+          runtime3.registerAdapter(adapter);
+        }
+        return { runtime: runtime3, registry };
+      }
+    }
     if (stepLog) stepLog("Trying extension from node_modules");
-    let extensionNode = loadExtensionFromNodeModules();
+    const extensionNode = loadExtensionFromNodeModules();
     if (extensionNode) {
       if (stepLog) stepLog("Registered extension from node_modules");
       const descriptor = `npm:${extensionNode.packageName}`;
-      const resolvedVersion = getInstalledPackageVersion(extensionNode.packageName);
-      const prefix = npmDescriptorToRegistryPrefix(descriptor, resolvedVersion ?? void 0);
+      const resolvedVersion = getInstalledPackageVersion(extensionNode.packageName) ?? resolveLatestVersionFromRegistry(extensionNode.packageName);
+      const prefix = npmDescriptorToRegistryPrefix(descriptor, resolvedVersion);
       const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
       const coreAdapter = extensionNode.register(reg, options.coreTools);
       const runtime3 = new PTCRuntime({ registry });
       runtime3.registerAdapter(coreAdapter);
       return { runtime: runtime3, registry };
     }
-    if (options.configFilePath) {
-      const extensionFromNodeModules = loadExtensionFromToolYamlNodeModules(options.configFilePath, stepLog);
-      if (extensionFromNodeModules) {
-        if (stepLog) stepLog("Registered extension from tool.yaml list (node_modules)");
-        const prefix = npmDescriptorToRegistryPrefix(extensionFromNodeModules.descriptor, extensionFromNodeModules.resolvedVersion);
-        const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
-        const coreAdapter = extensionFromNodeModules.register(reg, options.coreTools);
-        const runtime3 = new PTCRuntime({ registry });
-        runtime3.registerAdapter(coreAdapter);
-        return { runtime: runtime3, registry };
-      }
-      if (stepLog) stepLog("No extension in node_modules, loading from tool.yaml cache");
-      const extensionCache = loadExtensionFromToolYamlCache(options.configFilePath, stepLog);
-      if (extensionCache) {
-        if (stepLog) stepLog("Registered extension from cache");
-        const prefix = npmDescriptorToRegistryPrefix(extensionCache.descriptor, extensionCache.resolvedVersion);
-        const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
-        const coreAdapter = extensionCache.register(reg, options.coreTools);
-        const runtime3 = new PTCRuntime({ registry });
-        runtime3.registerAdapter(coreAdapter);
-        return { runtime: runtime3, registry };
-      }
-    }
     const runtime2 = new PTCRuntime({ registry });
     return { runtime: runtime2, registry };
   }
@@ -1972,27 +2149,17 @@ function createRuntimeFromConfigSync(options = {}) {
 }
 async function createRuntimeFromConfig(options = {}) {
   if (options.coreTools !== void 0 && options.configFilePath) {
-    const fromNodeModules = loadExtensionFromToolYamlNodeModules(options.configFilePath, options.stepLog);
-    if (fromNodeModules) {
-      if (options.stepLog) options.stepLog("Registered extension from tool.yaml list (node_modules)");
+    const all = await loadAllExtensionsFromToolYamlAsync(options.configFilePath, options.stepLog);
+    if (all.length > 0) {
+      if (options.stepLog) options.stepLog(`Registered ${all.length} extension(s) from tool.yaml`);
       const registry = new chunkTOSPHMYU_cjs.ToolRegistry();
-      const prefix = npmDescriptorToRegistryPrefix(fromNodeModules.descriptor, fromNodeModules.resolvedVersion);
-      const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
-      const coreAdapter = fromNodeModules.register(reg, options.coreTools);
       const runtime = new PTCRuntime({ registry });
-      runtime.registerAdapter(coreAdapter);
-      return { runtime, registry };
-    }
-    if (options.stepLog) options.stepLog("Loading extension from tool.yaml cache (dynamic: npm pack + import)");
-    const fromCache = await loadExtensionFromToolYamlCacheAsync(options.configFilePath, options.stepLog);
-    if (fromCache) {
-      if (options.stepLog) options.stepLog("Registered extension from cache");
-      const registry = new chunkTOSPHMYU_cjs.ToolRegistry();
-      const prefix = npmDescriptorToRegistryPrefix(fromCache.descriptor, fromCache.resolvedVersion);
-      const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
-      const coreAdapter = fromCache.register(reg, options.coreTools);
-      const runtime = new PTCRuntime({ registry });
-      runtime.registerAdapter(coreAdapter);
+      for (const ext of all) {
+        const prefix = ext.descriptor.startsWith("file:") ? fileDescriptorToRegistryPrefix(ext.descriptor) : npmDescriptorToRegistryPrefix(ext.descriptor, ext.resolvedVersion);
+        const reg = prefix ? createPrefixingRegistry(registry, prefix) : registry;
+        const adapter = ext.register(reg, options.coreTools);
+        runtime.registerAdapter(adapter);
+      }
       return { runtime, registry };
     }
   }
@@ -2024,6 +2191,7 @@ exports.createRuntimeFromConfig = createRuntimeFromConfig;
 exports.createRuntimeFromConfigSync = createRuntimeFromConfigSync;
 exports.ensurePackageInCache = ensurePackageInCache;
 exports.expandToolDescriptorsToRegistryNames = expandToolDescriptorsToRegistryNames;
+exports.fileDescriptorToPackagePrefix = fileDescriptorToPackagePrefix;
 exports.findAndLoadToolConfig = findAndLoadToolConfig;
 exports.getDisplayScope = getDisplayScope;
 exports.getPackageEntryPath = getPackageEntryPath;
@@ -2032,12 +2200,14 @@ exports.isBarePackageDescriptor = isBarePackageDescriptor;
 exports.isNpmToolDescriptor = isNpmToolDescriptor;
 exports.loadToolConfig = loadToolConfig;
 exports.normalizeToolList = normalizeToolList;
+exports.npmDescriptorToPackagePrefixWithVersion = npmDescriptorToPackagePrefixWithVersion;
 exports.npmDescriptorToRegistryPrefix = npmDescriptorToRegistryPrefix;
 exports.parseNpmToolDescriptor = parseNpmToolDescriptor;
+exports.resolveLatestVersionFromRegistry = resolveLatestVersionFromRegistry;
 exports.resolveNpmToolDescriptor = resolveNpmToolDescriptor;
 exports.resolveSandboxedPath = resolveSandboxedPath;
 exports.resolveToolDescriptor = resolveToolDescriptor;
 exports.sanitizeForLog = sanitizeForLog;
 exports.summarizeForLog = summarizeForLog;
-//# sourceMappingURL=chunk-PKUSCCS6.cjs.map
-//# sourceMappingURL=chunk-PKUSCCS6.cjs.map
+//# sourceMappingURL=chunk-LP7KHBA3.cjs.map
+//# sourceMappingURL=chunk-LP7KHBA3.cjs.map