@llmist/cli 9.2.0 → 9.3.1

package/dist/cli.js

@@ -79,7 +79,7 @@ import { Command, InvalidArgumentError as InvalidArgumentError2 } from "commande
 // package.json
 var package_default = {
   name: "@llmist/cli",
-  version: "9.2.0",
+  version: "9.3.1",
   description: "CLI for llmist - run LLM agents from the command line",
   type: "module",
   main: "dist/cli.js",
@@ -94,6 +94,7 @@ var package_default = {
     clean: "rimraf dist",
     postinstall: "node scripts/postinstall.js"
   },
+  homepage: "https://llmist.dev",
   repository: {
     type: "git",
     url: "https://github.com/zbigniewsobiecki/llmist.git",
@@ -917,7 +918,9 @@ import os from "os";
 import { pathToFileURL } from "url";
 var CACHE_DIR = path4.join(os.homedir(), ".llmist", "gadget-cache");
 function isExternalPackageSpecifier(specifier) {
-  if (/^@?[a-z0-9][\w.-]*(?:@[\w.-]+)?(?::[a-z]+)?(?:\/\w+)?$/i.test(specifier)) {
+  if (/^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*(?:@[\w.-]+)?(?::[a-z]+)?(?:\/[A-Z]\w*)?$/i.test(
+    specifier
+  )) {
     return true;
   }
   if (specifier.startsWith("git+")) {
@@ -931,49 +934,71 @@ function parseGadgetSpecifier(specifier) {
     let baseUrl;
     let ref;
     let preset;
+    let gadgetName;
+    const extractGadgetName = (str) => {
+      const match = str.match(/^(.*)\/([A-Z][a-zA-Z0-9]*)$/);
+      if (match) {
+        return { rest: match[1], gadgetName: match[2] };
+      }
+      return { rest: str };
+    };
     if (url.includes("#")) {
       const hashIndex = url.indexOf("#");
       baseUrl = url.slice(0, hashIndex);
-      const refAndPreset = url.slice(hashIndex + 1);
-      if (refAndPreset.includes(":")) {
-        const colonIndex = refAndPreset.indexOf(":");
-        ref = refAndPreset.slice(0, colonIndex);
-        preset = refAndPreset.slice(colonIndex + 1);
+      let refAndRest = url.slice(hashIndex + 1);
+      const gadgetResult = extractGadgetName(refAndRest);
+      refAndRest = gadgetResult.rest;
+      gadgetName = gadgetResult.gadgetName;
+      if (refAndRest.includes(":")) {
+        const colonIndex = refAndRest.indexOf(":");
+        ref = refAndRest.slice(0, colonIndex);
+        preset = refAndRest.slice(colonIndex + 1);
       } else {
-        ref = refAndPreset;
+        ref = refAndRest;
       }
     } else {
       const gitExtIndex = url.indexOf(".git");
       if (gitExtIndex !== -1) {
-        const afterGit = url.slice(gitExtIndex + 4);
+        let afterGit = url.slice(gitExtIndex + 4);
+        baseUrl = url.slice(0, gitExtIndex + 4);
+        const gadgetResult = extractGadgetName(afterGit);
+        afterGit = gadgetResult.rest;
+        gadgetName = gadgetResult.gadgetName;
         if (afterGit.startsWith(":")) {
-          baseUrl = url.slice(0, gitExtIndex + 4);
           preset = afterGit.slice(1);
-        } else {
-          baseUrl = url;
         }
       } else {
-        baseUrl = url;
+        const gadgetResult = extractGadgetName(url);
+        baseUrl = gadgetResult.rest;
+        gadgetName = gadgetResult.gadgetName;
       }
     }
     return {
       type: "git",
       package: baseUrl,
       version: ref,
-      preset
+      preset,
+      gadgetName
     };
   }
-  const npmMatch = specifier.match(
-    /^(@?[a-z0-9][\w.-]*)(?:@([\w.-]+))?(?::([a-z]+))?(?:\/(\w+))?$/i
+  let npmSpecifier = specifier;
+  let npmGadgetName;
+  const gadgetMatch = specifier.match(/^(.+)\/([A-Z][a-zA-Z0-9]*)$/);
+  if (gadgetMatch) {
+    npmSpecifier = gadgetMatch[1];
+    npmGadgetName = gadgetMatch[2];
+  }
+  const npmMatch = npmSpecifier.match(
+    /^(@[a-z0-9][\w.-]*\/[a-z0-9][\w.-]*|[a-z0-9][\w.-]*)(?:@([\w.-]+))?(?::([a-z]+))?$/i
   );
   if (npmMatch) {
-    const [, pkg, version, preset, gadgetName] = npmMatch;
+    const [, pkg, version, preset] = npmMatch;
     return {
       type: "npm",
       package: pkg,
       version,
       preset,
-      gadgetName
+      gadgetName: npmGadgetName
     };
   }
   return null;
@@ -1101,10 +1126,13 @@ async function loadExternalGadgets(specifier, forceInstall = false) {
   const manifest = readManifest(packagePath);
   let entryPoint;
   let gadgetNames = null;
+  let isSubagent = false;
   if (spec.gadgetName) {
     gadgetNames = [spec.gadgetName];
-    if (manifest?.subagents?.[spec.gadgetName]) {
-      entryPoint = manifest.subagents[spec.gadgetName].entryPoint;
+    const subagentInfo = manifest?.subagents?.[spec.gadgetName];
+    if (subagentInfo) {
+      entryPoint = subagentInfo.entryPoint;
+      isSubagent = true;
     } else {
       entryPoint = manifest?.gadgets || "./dist/index.js";
     }
@@ -1137,7 +1165,7 @@ async function loadExternalGadgets(specifier, forceInstall = false) {
     throw new Error(`Failed to import '${specifier}': ${message}`);
   }
   let gadgets = [];
-  if (manifest?.factory) {
+  if (manifest?.factory && !isSubagent) {
     const exportsObj = exports;
     if (spec.preset && typeof exportsObj.createGadgetsByPreset === "function") {
       const result = await exportsObj.createGadgetsByPreset(
@@ -1227,6 +1255,14 @@ function expandHomePath(input) {
   }
   return path5.join(home, input.slice(1));
 }
+function parseLocalSpecifier(specifier) {
+  const match = specifier.match(/^(.+):([A-Z][a-zA-Z0-9]*)$/);
+  if (match) {
+    const [, basePath, gadgetName] = match;
+    return { path: basePath, gadgetName };
+  }
+  return { path: specifier };
+}
 function isFileLikeSpecifier(specifier) {
   return PATH_PREFIXES.some((prefix) => specifier.startsWith(prefix)) || specifier.includes(path5.sep);
 }
@@ -1310,7 +1346,10 @@ async function loadGadgets(specifiers, cwd, importer = (specifier) => import(spe
         throw new Error(`Failed to load external package '${specifier}': ${message}`);
       }
     }
-    const resolved = resolveGadgetSpecifier(specifier, cwd);
+    const localSpec = isFileLikeSpecifier(specifier) ? parseLocalSpecifier(specifier) : null;
+    const pathToResolve = localSpec?.path ?? specifier;
+    const gadgetNameFilter = localSpec?.gadgetName;
+    const resolved = resolveGadgetSpecifier(pathToResolve, cwd);
     let exports;
     try {
       exports = await importer(resolved);
@@ -1325,6 +1364,17 @@ async function loadGadgets(specifiers, cwd, importer = (specifier) => import(spe
       const message = error instanceof Error ? error.message : String(error);
       throw new Error(`Failed to initialize gadgets from module '${specifier}': ${message}`);
     }
+    if (gadgetNameFilter) {
+      const filtered = extracted.filter(
+        (g) => g.name?.toLowerCase() === gadgetNameFilter.toLowerCase()
+      );
+      if (filtered.length === 0) {
+        throw new Error(
+          `Gadget '${gadgetNameFilter}' not found in module '${pathToResolve}'. Available gadgets: ${extracted.map((g) => g.name).join(", ")}`
+        );
+      }
+      extracted = filtered;
+    }
     if (extracted.length === 0) {
       throw new Error(`Module '${specifier}' does not export any Gadget instances.`);
     }