@lgtm-hq/ai-skills 0.7.0 → 0.8.0

package/data/vendors.json

@@ -4,6 +4,7 @@
       "id": "mattpocock",
       "repo": "mattpocock/skills",
       "sha": "391a2701dd948f94f56a39f7533f8eea9a859c87",
+      "displayRef": "latest",
       "skillRoots": [
         "skills"
       ],
@@ -14,6 +15,7 @@
       "id": "anthropics",
       "repo": "anthropics/skills",
       "sha": "9d2f1ae187231d8199c64b5b762e1bdf2244733d",
+      "displayRef": "latest",
       "skillRoots": [
         "skills"
       ],
@@ -24,6 +26,7 @@
       "id": "anthropics-claude-code",
       "repo": "anthropics/claude-code",
       "sha": "15a21e1b4e240e2da6a4953d5f148a806c9c9bb2",
+      "displayRef": "latest",
       "skillRoots": [
         "plugins/*/skills"
       ],

package/data/vendors.yaml

@@ -3,6 +3,7 @@ vendors:
   - id: mattpocock
     repo: mattpocock/skills
     sha: "391a2701dd948f94f56a39f7533f8eea9a859c87"
+    displayRef: latest
     skillRoots:
       - skills
     license: MIT
@@ -10,6 +11,7 @@ vendors:
   - id: anthropics
     repo: anthropics/skills
     sha: "9d2f1ae187231d8199c64b5b762e1bdf2244733d"
+    displayRef: latest
     skillRoots:
       - skills
     license: Apache-2.0
@@ -17,6 +19,7 @@ vendors:
   - id: anthropics-claude-code
     repo: anthropics/claude-code
     sha: "15a21e1b4e240e2da6a4953d5f148a806c9c9bb2"
+    displayRef: latest
     skillRoots:
       - plugins/*/skills
     license: Commercial

package/lib/catalog.js

@@ -27,7 +27,7 @@ export function loadBundles() {
 /**
  * Load all vendor records baked into the package.
  *
- * @returns {Promise<{vendors: Array<{id: string, repo: string, sha: string, skillRoots: string[], license: string, homepage: string}>}>} Vendor registry.
+ * @returns {Promise<{vendors: Array<{id: string, repo: string, sha: string, displayRef?: string, skillRoots: string[], license: string, homepage: string}>}>} Vendor registry.
  */
 export function loadVendors() {
   return readCatalog("vendors.json");

package/lib/install.js

@@ -6,69 +6,111 @@ import { buildSkillsArguments, runSkills } from "./skills-runner.js";
 import { createClackUi, KNOWN_AGENTS } from "./ui.js";
 
 /**
- * Fill unset install selections through the terminal picker.
+ * @typedef {{firstParty: string[], vendors: Record<string, string[]>}} InstallCart
+ * Interactive skill cart keyed by catalog source.
+ */
+
+/**
+ * @typedef {{vendor: string | null, skills: string[]}} InstallBatch
+ * One upstream `skills add` invocation (single source).
+ */
+
+/**
+ * Fill unset install selections through the home/cart wizard.
  *
- * Happy path asks for catalog source, skills (grouped multi-select for first-party),
- * and agents. Scope defaults to global, installs symlink (not copy), and uses
- * overwrite for the gateway fail-closed `--on-conflict` API without prompting —
- * upstream `skills` does not implement conflict policies yet.
+ * Home lists catalogs to browse; selections accumulate in a cart. Proceed asks
+ * for agents/scope once, then returns install batches. Scope defaults to global,
+ * installs symlink (not copy), and uses overwrite for the gateway fail-closed
+ * `--on-conflict` API without prompting.
  *
  * @param {{agents: string[], bundle: string | null, copy: boolean, global: boolean, onConflict: string | null, project: boolean, skills: string[], vendor: string | null, yes: boolean}} options - Initial install options.
  * @param {ReturnType<typeof createClackUi>} [ui] - Injectable interactive UI.
- * @returns {Promise<typeof options>} Fully selected options.
+ * @returns {Promise<typeof options & {installBatches: InstallBatch[]}>} Shared options plus per-source install batches.
  */
 export async function completeInteractively(options, ui = createClackUi()) {
   ui.intro("ai-skills gateway");
 
+  // CLI already named a source/skills: honor it instead of discarding into an empty cart.
+  if (options.vendor || options.bundle || options.skills.length > 0) {
+    const installBatches = await batchesFromCliOptions(options);
+    return finishInteractiveInstall(options, ui, installBatches);
+  }
+
   const bundles = await loadBundles();
   const vendors = await loadVendors();
-  const packageVersion = getPackageVersion();
-  const sourceChoices = [
-    {
-      value: "first-party",
-      label: `lgtm-hq/ai-skills @ v${packageVersion}`,
-    },
-    ...vendors.vendors.map((vendor) => ({
-      value: `vendor:${vendor.id}`,
-      label: vendor.repo,
-    })),
-  ];
-
-  const sourceValue = await cancelable(
-    ui,
-    ui.select({
-      message: "Install from which catalog?",
-      options: sourceChoices,
-    }),
-  );
+  /** @type {InstallCart} */
+  const cart = { firstParty: [], vendors: {} };
 
-  if (sourceValue === "first-party") {
-    const skillGroups = buildFirstPartySkillGroups(bundles);
-    options.skills = await cancelable(
-      ui,
-      ui.groupMultiselect({
-        message: "Select skills to install",
-        options: skillGroups,
-        required: true,
-      }),
-    );
-  } else {
-    const vendorId = parseVendorSourceValue(sourceValue);
-    const index = await loadVendorIndex(vendorId);
-    options.vendor = vendorId;
-    options.skills = await cancelable(
+  while (true) {
+    const action = await cancelable(
       ui,
-      ui.multiselect({
-        message: `Select skills from ${index.vendor.repo}`,
-        options: index.skills.map((skill) => ({
-          value: skill.name,
-          label: skill.name,
-        })),
-        required: true,
+      ui.select({
+        message: "Install skills",
+        options: buildHomeOptions(cart, vendors),
       }),
     );
+
+    if (action === "cancel") {
+      throw new Error("Install cancelled");
+    }
+    if (action === "proceed") {
+      break;
+    }
+    if (action === "browse:first-party") {
+      cart.firstParty = await cancelable(
+        ui,
+        ui.groupMultiselect({
+          message: `Skills from lgtm-hq/ai-skills @ v${getPackageVersion()}`,
+          options: buildFirstPartySkillGroups(bundles),
+          initialValues: cart.firstParty,
+          required: false,
+        }),
+      );
+      continue;
+    }
+    if (action.startsWith("browse:vendor:")) {
+      const vendorId = action.slice("browse:vendor:".length);
+      const index = await loadVendorIndex(vendorId);
+      // Prefer registry record so displayRef survives (baked indexes omit it).
+      const vendor = vendors.vendors.find((entry) => entry.id === vendorId) ?? index.vendor;
+      cart.vendors[vendorId] = await cancelable(
+        ui,
+        ui.multiselect({
+          message: `Skills from ${vendorDisplayLabel(vendor)}`,
+          options: index.skills.map((skill) => ({
+            value: skill.name,
+            label: skill.name,
+          })),
+          initialValues: cart.vendors[vendorId] ?? [],
+          required: false,
+        }),
+      );
+      continue;
+    }
+    throw new Error(`Unknown home action: ${action}`);
+  }
+
+  const installBatches = batchesFromCart(cart);
+  if (installBatches.length === 0) {
+    throw new Error("Install cancelled");
   }
 
+  return finishInteractiveInstall(options, ui, installBatches);
+}
+
+/**
+ * Ask agents/scope/advanced once, then return shared options plus install batches.
+ *
+ * @param {{agents: string[], bundle: string | null, copy: boolean, global: boolean, onConflict: string | null, project: boolean, skills: string[], vendor: string | null, yes: boolean}} options - Initial install options.
+ * @param {ReturnType<typeof createClackUi>} ui - Interactive UI.
+ * @param {InstallBatch[]} installBatches - Per-catalog install batches.
+ * @returns {Promise<typeof options & {installBatches: InstallBatch[]}>} Shared options plus batches.
+ */
+async function finishInteractiveInstall(options, ui, installBatches) {
+  options.bundle = null;
+  options.vendor = null;
+  options.skills = [];
+
   if (options.agents.length === 0) {
     const selected = await cancelable(
       ui,
@@ -139,9 +181,110 @@ export async function completeInteractively(options, ui = createClackUi()) {
   }
 
   ui.outro("Starting install…");
+  return { ...options, installBatches };
+}
+
+/**
+ * Build home-screen options for the install wizard.
+ *
+ * @param {InstallCart} cart - Current skill cart.
+ * @param {{vendors: Array<{id: string, repo: string, displayRef?: string}>}} vendors - Vendor registry.
+ * @returns {{value: string, label: string}[]} Clack select options.
+ */
+export function buildHomeOptions(cart, vendors) {
+  const options = [
+    {
+      value: "browse:first-party",
+      label: `Browse lgtm-hq/ai-skills @ v${getPackageVersion()}`,
+    },
+    ...vendors.vendors.map((vendor) => ({
+      value: `browse:vendor:${vendor.id}`,
+      label: `Browse ${vendorDisplayLabel(vendor)}`,
+    })),
+  ];
+  const total = cartSkillCount(cart);
+  if (total > 0) {
+    options.push({
+      value: "proceed",
+      label: `Proceed with install (${total} skill${total === 1 ? "" : "s"})`,
+    });
+  }
+  options.push({ value: "cancel", label: "Cancel" });
   return options;
 }
 
+/**
+ * Consumer-facing catalog pin for a vendor (never a SHA).
+ *
+ * @param {{repo: string, displayRef?: string}} vendor - Vendor record.
+ * @returns {string} `owner/repo @ pin` label.
+ */
+export function vendorDisplayLabel(vendor) {
+  const displayRef = typeof vendor.displayRef === "string" ? vendor.displayRef : undefined;
+  const pin = displayRef?.trim() || "latest";
+  return `${vendor.repo} @ ${pin}`;
+}
+
+/**
+ * Count skills currently in the cart.
+ *
+ * @param {InstallCart} cart - Skill cart.
+ * @returns {number} Total selected skills.
+ */
+export function cartSkillCount(cart) {
+  return (
+    cart.firstParty.length +
+    Object.values(cart.vendors).reduce((sum, skills) => sum + skills.length, 0)
+  );
+}
+
+/**
+ * Convert a cart into install batches (first-party first).
+ *
+ * @param {InstallCart} cart - Skill cart.
+ * @returns {InstallBatch[]} Non-empty batches only.
+ */
+export function batchesFromCart(cart) {
+  /** @type {InstallBatch[]} */
+  const batches = [];
+  if (cart.firstParty.length > 0) {
+    batches.push({ vendor: null, skills: [...cart.firstParty] });
+  }
+  for (const [vendorId, skills] of Object.entries(cart.vendors)) {
+    if (skills.length > 0) {
+      batches.push({ vendor: vendorId, skills: [...skills] });
+    }
+  }
+  return batches;
+}
+
+/**
+ * Build install batches from CLI source flags (interactive, without -y).
+ *
+ * @param {{bundle: string | null, skills: string[], vendor: string | null}} options - Parsed install options.
+ * @returns {Promise<InstallBatch[]>} One batch for the CLI-selected source.
+ */
+export async function batchesFromCliOptions(options) {
+  if (options.vendor) {
+    if (options.skills.length === 0) {
+      throw new Error(
+        "Interactive install with --vendor requires --skill, or omit both to browse catalogs",
+      );
+    }
+    return [{ vendor: options.vendor, skills: [...options.skills] }];
+  }
+  if (options.bundle) {
+    const bundles = await loadBundles();
+    const bundle = bundles.groups[options.bundle];
+    if (!bundle) {
+      throw new Error(`Unknown first-party bundle: ${options.bundle}`);
+    }
+    const skills = options.skills.length > 0 ? options.skills : bundle.skills;
+    return [{ vendor: null, skills: [...skills] }];
+  }
+  return [{ vendor: null, skills: [...options.skills] }];
+}
+
 /**
  * Build grouped skill options for first-party interactive install.
  *
@@ -161,20 +304,6 @@ function buildFirstPartySkillGroups(bundles) {
   return groups;
 }
 
-/**
- * Parse a vendor catalog selection value.
- *
- * @param {string} value - Combined select value (`vendor:<id>`).
- * @returns {string} Vendor id.
- */
-function parseVendorSourceValue(value) {
-  const prefix = "vendor:";
-  if (!value.startsWith(prefix)) {
-    throw new Error(`Unknown catalog selection: ${value}`);
-  }
-  return value.slice(prefix.length);
-}
-
 /**
  * Abort when Clack reports cancel (Ctrl+C / escape).
  *
@@ -311,9 +440,30 @@ async function createLockEntries(options, vendor, now) {
 /**
  * Create an interactive installer session.
  *
+ * Runs one upstream install per selected catalog so mixed first-party + vendor
+ * picks complete in a single interactive session.
+ *
  * @param {{agents: string[], bundle: string | null, copy: boolean, global: boolean, onConflict: string | null, project: boolean, skills: string[], vendor: string | null, yes: boolean}} options - Install options.
  * @returns {Promise<void>} Resolves when installation completes.
  */
 export async function installInteractively(options) {
-  await install(await completeInteractively(options));
+  const completed = await completeInteractively(options);
+  const finished = [];
+  for (const batch of completed.installBatches) {
+    try {
+      await install({
+        ...completed,
+        bundle: null,
+        vendor: batch.vendor,
+        skills: batch.skills,
+      });
+      finished.push(batch.vendor ?? "first-party");
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : String(error);
+      throw new Error(
+        `Install failed for "${batch.vendor ?? "first-party"}" after completing: ` +
+          `${finished.length > 0 ? finished.join(", ") : "none"}. ${detail}`,
+      );
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lgtm-hq/ai-skills",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Pinned installer gateway for first-party and vendor AI skills.",
   "license": "MIT",
   "homepage": "https://github.com/lgtm-hq/ai-skills#readme",