@forwardimpact/pathway 0.25.22 → 0.25.24

package/src/commands/build-packs.js

@@ -1,15 +1,19 @@
 /**
  * Pack generation for Pathway distribution.
  *
- * Emits one pre-built agent/skill pack per valid discipline/track combination
- * and two discovery manifests (`.well-known/agent-skills/index.json` for
- * `npx skills` and `apm.yml` for Microsoft APM). See
- * specs/320-pathway-ecosystem-distribution for context.
+ * Emits one pre-built agent/skill pack per valid discipline/track combination.
+ * Each pack becomes its own `npx skills`-compatible repository at
+ * `packs/{name}/.well-known/skills/`, with an aggregate repository at
+ * `packs/.well-known/skills/` listing every skill from every pack.
+ * An `apm.yml` for Microsoft APM is also written at the site root.
+ *
+ * See specs/320-pathway-ecosystem-distribution for context.
  *
  * Invoked from build.js after the distribution bundle has been generated.
  */
 
-import { mkdir, rm, readFile, writeFile } from "fs/promises";
+import { mkdir, rm, readFile, writeFile, readdir, cp } from "fs/promises";
+import { utimesSync } from "fs";
 import { join } from "path";
 import { execFileSync } from "child_process";
 import { createHash } from "crypto";
@@ -209,50 +213,205 @@ function derivePackContent({
   return { profiles, skillFiles, teamInstructions };
 }
 
+/**
+ * Recursively collect all paths (files and directories) under `dir`,
+ * relative to `dir`, in sorted order.
+ */
+async function collectPaths(dir, prefix = ".") {
+  const entries = await readdir(dir, { withFileTypes: true });
+  const result = [];
+  for (const entry of entries) {
+    const rel = prefix + "/" + entry.name;
+    const abs = join(dir, entry.name);
+    if (entry.isDirectory()) {
+      result.push(rel);
+      result.push(...(await collectPaths(abs, rel)));
+    } else {
+      result.push(rel);
+    }
+  }
+  return result;
+}
+
+/**
+ * Set mtime and atime to the Unix epoch for every entry under `dir`.
+ */
+async function resetTimestamps(dir) {
+  const epoch = new Date(0);
+  const paths = await collectPaths(dir);
+  for (const rel of paths) {
+    utimesSync(join(dir, rel), epoch, epoch);
+  }
+  utimesSync(dir, epoch, epoch);
+}
+
 /**
  * Archive a staged pack directory as a deterministic tar.gz and return its
  * sha256 digest.
+ *
+ * Determinism strategy (works on GNU tar and BSD tar):
+ *  1. Reset all file timestamps to epoch via Node's utimesSync.
+ *  2. Collect and sort the file list in JS — no reliance on --sort=name.
+ *  3. Create an uncompressed tar to stdout with the sorted list.
+ *  4. Pipe through `gzip -n` to suppress the gzip header timestamp.
+ *
  * @param {string} packDir - Staging directory containing the pack files
  * @param {string} archivePath - Destination path for the tar.gz
  * @returns {Promise<string>} sha256 digest string (e.g. "sha256:abc...")
  */
 async function archivePack(packDir, archivePath) {
-  execFileSync("tar", [
-    "-czf",
-    archivePath,
-    "--sort=name",
-    "--mtime=1970-01-01",
-    "--owner=0",
-    "--group=0",
-    "--numeric-owner",
-    "-C",
-    packDir,
-    ".",
-  ]);
+  await resetTimestamps(packDir);
+
+  const files = await collectPaths(packDir);
+  files.sort();
+
+  const tarBuf = execFileSync("tar", ["-cf", "-", "-C", packDir, ...files]);
+  const gzBuf = execFileSync("gzip", ["-n"], { input: tarBuf });
+  await writeFile(archivePath, gzBuf);
 
   const bytes = await readFile(archivePath);
   return "sha256:" + createHash("sha256").update(bytes).digest("hex");
 }
 
 /**
- * Write the `npx skills` discovery manifest.
- * @param {string} outputDir
- * @param {Array<{name: string, description: string, url: string, digest: string}>} packs
- * @param {string} version
+ * Collect all file paths under `dir`, relative to `dir`, for the manifest
+ * `files` array. Returns sorted paths with forward slashes.
+ * @param {string} dir
+ * @param {string} [prefix]
+ * @returns {Promise<string[]>}
+ */
+async function collectFileList(dir, prefix = "") {
+  const entries = await readdir(dir, { withFileTypes: true });
+  const result = [];
+  for (const entry of entries) {
+    const rel = prefix ? prefix + "/" + entry.name : entry.name;
+    if (entry.isDirectory()) {
+      result.push(...(await collectFileList(join(dir, entry.name), rel)));
+    } else {
+      result.push(rel);
+    }
+  }
+  return result.sort();
+}
+
+/**
+ * Parse YAML frontmatter from a SKILL.md file. Returns an object with
+ * the key/value pairs found between the `---` fences.
+ * @param {string} content
+ * @returns {Record<string, string>}
+ */
+function parseFrontmatter(content) {
+  const match = content.match(/^---\n([\s\S]*?)\n---/);
+  if (!match) return {};
+  const result = {};
+  for (const line of match[1].split("\n")) {
+    const idx = line.indexOf(":");
+    if (idx > 0) result[line.slice(0, idx).trim()] = line.slice(idx + 1).trim();
+  }
+  return result;
+}
+
+/**
+ * Build a single skill index entry from a staged skill directory.
+ * @param {string} skillDir - Path containing SKILL.md and optional extras
+ * @param {string} name - Skill name for the manifest
+ * @returns {Promise<{name: string, description: string, files: string[]}>}
+ */
+async function buildSkillEntry(skillDir, name) {
+  const skillMd = await readFile(join(skillDir, "SKILL.md"), "utf-8");
+  const fm = parseFrontmatter(skillMd);
+  const files = await collectFileList(skillDir);
+  return { description: fm.description || "", files, name };
+}
+
+/**
+ * Write a `npx skills`-compatible repository for a single pack.
+ *
+ * Each pack becomes its own skill repository at
+ * `packs/{name}/.well-known/skills/` so that individual skills
+ * within the pack can be discovered and installed independently:
+ *
+ *   npx skills add domain.org/packs/se-platform --all
+ *   npx skills add domain.org/packs/se-platform -s architecture-design
+ *
+ * @param {string} packsOutputDir - The `packs/` output directory
+ * @param {string} packStagingDir - Staging directory for this pack
+ * @param {string} packName - Pack name (e.g. "se-platform")
+ * @returns {Promise<Array<{name: string, description: string, files: string[]}>>}
+ *   The skill entries written, for use in the aggregate manifest.
  */
-async function writeSkillsManifest(outputDir, packs, version) {
-  const wellKnownDir = join(outputDir, ".well-known", "agent-skills");
+async function writePackRepository(packsOutputDir, packStagingDir, packName) {
+  const wellKnownDir = join(packsOutputDir, packName, ".well-known", "skills");
   await mkdir(wellKnownDir, { recursive: true });
+
+  // Discover individual skills from the staged pack's .claude/skills/
+  const skillsSrcDir = join(packStagingDir, ".claude", "skills");
+  const skillDirs = (
+    await readdir(skillsSrcDir, { withFileTypes: true })
+  ).filter((e) => e.isDirectory());
+
+  const entries = [];
+  for (const dir of skillDirs) {
+    const src = join(skillsSrcDir, dir.name);
+    const dest = join(wellKnownDir, dir.name);
+    await cp(src, dest, { recursive: true });
+    entries.push(await buildSkillEntry(dest, dir.name));
+  }
+
   const manifest = {
     $schema: "https://schemas.agentskills.io/discovery/0.2.0/schema.json",
-    skills: packs.map((pack) => ({
-      description: pack.description,
-      digest: pack.digest,
-      name: pack.name,
-      type: "archive",
-      url: pack.url,
-      version,
-    })),
+    skills: entries,
+  };
+  await writeFile(
+    join(wellKnownDir, "index.json"),
+    stringifySorted(manifest),
+    "utf-8",
+  );
+
+  return entries;
+}
+
+/**
+ * Write an aggregate `npx skills` repository at `packs/` that lists every
+ * unique skill across all packs. Skills with the same name produce identical
+ * SKILL.md content regardless of discipline/track, so we deduplicate by name
+ * and write one copy.
+ *
+ *   npx skills add domain.org/packs --list
+ *
+ * @param {string} packsOutputDir
+ * @param {Array<{packName: string, entries: Array}>} allPackEntries
+ */
+async function writeAggregateRepository(packsOutputDir, allPackEntries) {
+  const wellKnownDir = join(packsOutputDir, ".well-known", "skills");
+  await mkdir(wellKnownDir, { recursive: true });
+
+  // Deduplicate: first occurrence of each skill name wins (content is identical)
+  const seen = new Map();
+  for (const { packName, entries } of allPackEntries) {
+    for (const entry of entries) {
+      if (seen.has(entry.name)) continue;
+      seen.set(entry.name, { packName, entry });
+    }
+  }
+
+  const skills = [];
+  for (const [, { packName, entry }] of seen) {
+    const dest = join(wellKnownDir, entry.name);
+    const src = join(
+      packsOutputDir,
+      packName,
+      ".well-known",
+      "skills",
+      entry.name,
+    );
+    await cp(src, dest, { recursive: true });
+    skills.push(entry);
+  }
+
+  const manifest = {
+    $schema: "https://schemas.agentskills.io/discovery/0.2.0/schema.json",
+    skills,
   };
   await writeFile(
     join(wellKnownDir, "index.json"),
@@ -382,10 +541,25 @@ export async function generatePacks({
     console.log(`   ✓ packs/${agentName}.tar.gz`);
   }
 
-  await rm(stagingDir, { recursive: true, force: true });
+  // Write per-pack skill repositories (one per discipline/track combination)
+  const allPackEntries = [];
+  for (const pack of packs) {
+    const entries = await writePackRepository(
+      packsDir,
+      join(stagingDir, pack.name),
+      pack.name,
+    );
+    allPackEntries.push({ packName: pack.name, entries });
+    console.log(
+      `   ✓ packs/${pack.name}/.well-known/skills/ (${entries.length} skills)`,
+    );
+  }
 
-  await writeSkillsManifest(outputDir, packs, version);
-  console.log("   ✓ .well-known/agent-skills/index.json");
+  // Write aggregate repository at packs/ level
+  await writeAggregateRepository(packsDir, allPackEntries);
+  console.log("   ✓ packs/.well-known/skills/index.json (aggregate)");
+
+  await rm(stagingDir, { recursive: true, force: true });
 
   await writeApmManifest(outputDir, packs, version, frameworkTitle);
   console.log("   ✓ apm.yml");

package/src/commands/build.js

@@ -222,10 +222,10 @@ ${framework.emojiIcon} Generating ${framework.title} static site...
 ✅ Site generated successfully!
 
 Output: ${outputDir}
-${siteUrl ? `\nDistribution:\n  ${outputDir}/bundle.tar.gz\n  ${outputDir}/install.sh\n  ${outputDir}/packs/ (agent/skill packs)\n  ${outputDir}/.well-known/agent-skills/index.json\n  ${outputDir}/apm.yml\n` : ""}
+${siteUrl ? `\nDistribution:\n  ${outputDir}/bundle.tar.gz\n  ${outputDir}/install.sh\n  ${outputDir}/packs/ (agent/skill packs)\n  ${outputDir}/packs/{name}/.well-known/skills/ (per-pack skill repositories)\n  ${outputDir}/packs/.well-known/skills/ (aggregate skill repository)\n  ${outputDir}/apm.yml\n` : ""}
 To serve locally:
   cd ${relative(process.cwd(), outputDir) || "."}
-  bunx serve .
+  npx serve .
 `);
 }
 

package/src/commands/command-factory.js

@@ -89,7 +89,7 @@ export function createEntityCommand({
 function handleValidate({ data, _entityName, pluralName, validate }) {
   if (!validate) {
     console.log(`No specific validation for ${pluralName}.`);
-    console.log(`Run 'bunx pathway --validate' for full data validation.`);
+    console.log(`Run 'npx fit-pathway --validate' for full data validation.`);
     return;
   }
 
@@ -178,7 +178,7 @@ export function createCompositeCommand({
   return async function runCommand({ data, args, options }) {
     if (args.length < requiredArgs.length) {
       const argsList = requiredArgs.map((arg) => `<${arg}>`).join(" ");
-      console.error(`Usage: bunx pathway ${commandName} ${argsList}`);
+      console.error(`Usage: npx fit-pathway ${commandName} ${argsList}`);
       if (usageExample) {
         console.error(`Example: ${usageExample}`);
       }

package/src/commands/discipline.js

@@ -4,15 +4,15 @@
  * Handles discipline summary, listing, and detail display in the terminal.
  *
  * Usage:
- *   bunx pathway discipline              # Summary with stats
- *   bunx pathway discipline --list       # IDs only (for piping)
- *   bunx pathway discipline <id>         # Detail view
- *   bunx pathway discipline --validate   # Validation checks
+ *   npx fit-pathway discipline              # Summary with stats
+ *   npx fit-pathway discipline --list       # IDs only (for piping)
+ *   npx fit-pathway discipline <id>         # Detail view
+ *   npx fit-pathway discipline --validate   # Validation checks
  */
 
 import { createEntityCommand } from "./command-factory.js";
 import { disciplineToMarkdown } from "../formatters/discipline/markdown.js";
-import { formatTable } from "../lib/cli-output.js";
+import { formatTable } from "@forwardimpact/libcli";
 
 /**
  * Format discipline list item for --list output
@@ -43,8 +43,8 @@ function formatSummary(disciplines) {
 
   console.log(formatTable(["ID", "Specialization", "Type", "Tracks"], rows));
   console.log(`\nTotal: ${disciplines.length} disciplines`);
-  console.log(`\nRun 'bunx pathway discipline --list' for IDs and names`);
-  console.log(`Run 'bunx pathway discipline <id>' for details\n`);
+  console.log(`\nRun 'npx fit-pathway discipline --list' for IDs and names`);
+  console.log(`Run 'npx fit-pathway discipline <id>' for details\n`);
 }
 
 /**

package/src/commands/driver.js

@@ -4,20 +4,20 @@
  * Handles driver summary, listing, and detail display in the terminal.
  *
  * Usage:
- *   bunx pathway driver              # Summary with stats
- *   bunx pathway driver --list       # IDs only (for piping)
- *   bunx pathway driver <id>         # Detail view
- *   bunx pathway driver --validate   # Validation checks
+ *   npx fit-pathway driver              # Summary with stats
+ *   npx fit-pathway driver --list       # IDs only (for piping)
+ *   npx fit-pathway driver <id>         # Detail view
+ *   npx fit-pathway driver --validate   # Validation checks
  */
 
 import { createEntityCommand } from "./command-factory.js";
 import { prepareDriverDetail } from "../formatters/driver/shared.js";
-import { formatTable } from "../lib/cli-output.js";
 import {
+  formatTable,
   formatHeader,
   formatSubheader,
   formatBullet,
-} from "../lib/cli-output.js";
+} from "@forwardimpact/libcli";
 import { getConceptEmoji } from "@forwardimpact/map/levels";
 
 /**
@@ -52,8 +52,8 @@ function formatSummary(drivers, data) {
 
   console.log(formatTable(["ID", "Name", "Skills", "Behaviours"], rows));
   console.log(`\nTotal: ${drivers.length} drivers`);
-  console.log(`\nRun 'bunx pathway driver --list' for IDs and names`);
-  console.log(`Run 'bunx pathway driver <id>' for details\n`);
+  console.log(`\nRun 'npx fit-pathway driver --list' for IDs and names`);
+  console.log(`Run 'npx fit-pathway driver <id>' for details\n`);
 }
 
 /**

package/src/commands/index.js

@@ -17,6 +17,5 @@ export { runInterviewCommand } from "./interview.js";
 export { runProgressCommand } from "./progress.js";
 export { runQuestionsCommand } from "./questions.js";
 export { runServeCommand } from "./serve.js";
-export { runInitCommand } from "./init.js";
 export { runSiteCommand } from "./site.js";
 export { runUpdateCommand } from "./update.js";

package/src/commands/interview.js

@@ -4,9 +4,9 @@
  * Generates and displays interview questions in the terminal.
  *
  * Usage:
- *   bunx fit-pathway interview <discipline> <level>                                  # All interview types
- *   bunx fit-pathway interview <discipline> <level> --track=<track>                  # With track
- *   bunx fit-pathway interview <discipline> <level> --track=<track> --type=mission   # Single type
+ *   npx fit-pathway interview <discipline> <level>                                  # All interview types
+ *   npx fit-pathway interview <discipline> <level> --track=<track>                  # With track
+ *   npx fit-pathway interview <discipline> <level> --track=<track> --type=mission   # Single type
  */
 
 import { createCompositeCommand } from "./command-factory.js";
@@ -109,5 +109,5 @@ export const runInterviewCommand = createCompositeCommand({
     }
   },
   usageExample:
-    "bunx fit-pathway interview software_engineering J090 --track=platform --type=mission",
+    "npx fit-pathway interview software_engineering J090 --track=platform --type=mission",
 });

package/src/commands/job.js

@@ -4,14 +4,14 @@
  * Generates and displays job definitions in the terminal.
  *
  * Usage:
- *   bunx pathway job                                          # Summary with stats
- *   bunx pathway job --list                                   # All valid combinations (for piping)
- *   bunx pathway job <discipline> <level>                     # Detail view (trackless)
- *   bunx pathway job <discipline> <level> --track=<track>     # Detail view (with track)
- *   bunx pathway job <d> <l> [--track=<t>] --skills           # Plain list of skill IDs
- *   bunx pathway job <d> <l> [--track=<t>] --tools            # Plain list of tool names
- *   bunx pathway job se L3 --track=platform --checklist=code  # Show checklist for handoff
- *   bunx pathway job --validate                               # Validation checks
+ *   npx fit-pathway job                                          # Summary with stats
+ *   npx fit-pathway job --list                                   # All valid combinations (for piping)
+ *   npx fit-pathway job <discipline> <level>                     # Detail view (trackless)
+ *   npx fit-pathway job <discipline> <level> --track=<track>     # Detail view (with track)
+ *   npx fit-pathway job <d> <l> [--track=<t>] --skills           # Plain list of skill IDs
+ *   npx fit-pathway job <d> <l> [--track=<t>] --tools            # Plain list of tool names
+ *   npx fit-pathway job se L3 --track=platform --checklist=code  # Show checklist for handoff
+ *   npx fit-pathway job --validate                               # Validation checks
  */
 
 import { prepareJobDetail } from "@forwardimpact/libskill/job";
@@ -20,7 +20,7 @@ import {
   generateJobTitle,
   generateAllJobs,
 } from "@forwardimpact/libskill/derivation";
-import { formatTable } from "../lib/cli-output.js";
+import { formatTable } from "@forwardimpact/libcli";
 import {
   deriveChecklist,
   formatChecklistMarkdown,
@@ -96,10 +96,10 @@ function printJobSummary(filteredJobs, options) {
   );
   console.log(`\nTotal: ${filteredJobs.length} valid job combinations`);
   console.log(
-    `\nRun 'bunx pathway job --list' for all combinations with titles`,
+    `\nRun 'npx fit-pathway job --list' for all combinations with titles`,
   );
   console.log(
-    `Run 'bunx pathway job <discipline> <level> [--track=<track>]' for details\n`,
+    `Run 'npx fit-pathway job <discipline> <level> [--track=<track>]' for details\n`,
   );
 }
 
@@ -113,7 +113,7 @@ function handleSingleArg(arg, data) {
   const isTrack = data.tracks.some((t) => t.id === arg);
   if (isLevel) {
     console.error(
-      `Missing discipline. Usage: bunx pathway job <discipline> ${arg} [--track=<track>]`,
+      `Missing discipline. Usage: npx fit-pathway job <discipline> ${arg} [--track=<track>]`,
     );
     console.error(
       `Disciplines: ${data.disciplines.map((d) => d.id).join(", ")}`,
@@ -121,13 +121,13 @@ function handleSingleArg(arg, data) {
   } else if (isTrack) {
     console.error(`Track must be passed as a flag: --track=${arg}`);
     console.error(
-      `Usage: bunx pathway job <discipline> <level> --track=${arg}`,
+      `Usage: npx fit-pathway job <discipline> <level> --track=${arg}`,
     );
   } else {
     console.error(
-      "Usage: bunx pathway job <discipline> <level> [--track=<track>]",
+      "Usage: npx fit-pathway job <discipline> <level> [--track=<track>]",
     );
-    console.error("       bunx pathway job --list");
+    console.error("       npx fit-pathway job --list");
   }
   process.exit(1);
 }
@@ -152,7 +152,7 @@ function resolveJobEntities(data, args, options) {
     if (maybeLevel && maybeDiscipline) {
       console.error(`Arguments are in the wrong order. Try:`);
       console.error(
-        `  bunx pathway job ${args[1]} ${args[0]}${options.track ? ` --track=${options.track}` : ""}`,
+        `  npx fit-pathway job ${args[1]} ${args[0]}${options.track ? ` --track=${options.track}` : ""}`,
       );
     } else {
       console.error(`Discipline not found: ${args[0]}`);
@@ -169,7 +169,9 @@ function resolveJobEntities(data, args, options) {
       console.error(
         `Track must be passed as a flag, not a positional argument:`,
       );
-      console.error(`  bunx pathway job ${args[0]} <level> --track=${args[1]}`);
+      console.error(
+        `  npx fit-pathway job ${args[0]} <level> --track=${args[1]}`,
+      );
       console.error(`Levels: ${data.levels.map((g) => g.id).join(", ")}`);
     } else {
       console.error(`Level not found: ${args[1]}`);

package/src/commands/level.js

@@ -4,15 +4,15 @@
  * Handles level summary, listing, and detail display in the terminal.
  *
  * Usage:
- *   bunx pathway level              # Summary with stats
- *   bunx pathway level --list       # IDs only (for piping)
- *   bunx pathway level <id>         # Detail view
- *   bunx pathway level --validate   # Validation checks
+ *   npx fit-pathway level              # Summary with stats
+ *   npx fit-pathway level --list       # IDs only (for piping)
+ *   npx fit-pathway level <id>         # Detail view
+ *   npx fit-pathway level --validate   # Validation checks
  */
 
 import { createEntityCommand } from "./command-factory.js";
 import { levelToMarkdown } from "../formatters/level/markdown.js";
-import { formatTable } from "../lib/cli-output.js";
+import { formatTable } from "@forwardimpact/libcli";
 import { getConceptEmoji } from "@forwardimpact/map/levels";
 import { capitalize } from "../formatters/shared.js";
 
@@ -57,8 +57,8 @@ function formatSummary(levels, data) {
     ),
   );
   console.log(`\nTotal: ${levels.length} levels`);
-  console.log(`\nRun 'bunx pathway level --list' for IDs and titles`);
-  console.log(`Run 'bunx pathway level <id>' for details\n`);
+  console.log(`\nRun 'npx fit-pathway level --list' for IDs and titles`);
+  console.log(`Run 'npx fit-pathway level <id>' for details\n`);
 }
 
 /**

package/src/commands/progress.js

@@ -4,9 +4,9 @@
  * Shows career progression analysis in the terminal.
  *
  * Usage:
- *   bunx pathway progress <discipline> <level>                            # Progress for trackless job
- *   bunx pathway progress <discipline> <level> --track=<track>            # Progress with track
- *   bunx pathway progress <discipline> <from_level> --compare=<to_level>  # Compare levels
+ *   npx fit-pathway progress <discipline> <level>                            # Progress for trackless job
+ *   npx fit-pathway progress <discipline> <level> --track=<track>            # Progress with track
+ *   npx fit-pathway progress <discipline> <from_level> --compare=<to_level>  # Compare levels
  */
 
 import { createCompositeCommand } from "./command-factory.js";
@@ -80,5 +80,5 @@ export const runProgressCommand = createCompositeCommand({
     }),
   formatter: formatProgress,
   usageExample:
-    "bunx pathway progress software_engineering L3 --track=platform --compare=L4",
+    "npx fit-pathway progress software_engineering L3 --track=platform --compare=L4",
 });

package/src/commands/questions.js

@@ -4,10 +4,10 @@
  * Browse and compare interview questions across skills and behaviours.
  *
  * Usage:
- *   bunx pathway questions                    # Summary with stats
- *   bunx pathway questions --list             # Question IDs (for piping)
- *   bunx pathway questions --level=practitioner  # Filter by level
- *   bunx pathway questions --stats            # Detailed statistics
+ *   npx fit-pathway questions                    # Summary with stats
+ *   npx fit-pathway questions --list             # Question IDs (for piping)
+ *   npx fit-pathway questions --level=practitioner  # Filter by level
+ *   npx fit-pathway questions --stats            # Detailed statistics
  */
 
 import {
@@ -17,7 +17,7 @@ import {
 import { questionsToMarkdown } from "../formatters/questions/markdown.js";
 import { questionsToYaml } from "../formatters/questions/yaml.js";
 import { questionsToJson } from "../formatters/questions/json.js";
-import { formatTable } from "../lib/cli-output.js";
+import { formatTable } from "@forwardimpact/libcli";
 
 /**
  * Parse questions command options
@@ -97,9 +97,11 @@ function showQuestionsSummary(data) {
   console.log("\nBehaviour Questions:");
   console.log(formatTable(["Maturity", "Count"], behaviourRows));
 
-  console.log(`\nRun 'bunx pathway questions --list' for question IDs`);
-  console.log(`Run 'bunx pathway questions --stats' for detailed stats`);
-  console.log(`Run 'bunx pathway questions --level=practitioner' to filter\n`);
+  console.log(`\nRun 'npx fit-pathway questions --list' for question IDs`);
+  console.log(`Run 'npx fit-pathway questions --stats' for detailed stats`);
+  console.log(
+    `Run 'npx fit-pathway questions --level=practitioner' to filter\n`,
+  );
 }
 
 /**

package/src/commands/skill.js

@@ -4,18 +4,18 @@
  * Handles skill summary, listing, and detail display in the terminal.
  *
  * Usage:
- *   bunx pathway skill              # Summary with stats
- *   bunx pathway skill --list       # IDs only (for piping)
- *   bunx pathway skill <id>         # Detail view
- *   bunx pathway skill <id> --agent # Agent SKILL.md output
- *   bunx pathway skill --validate   # Validation checks
+ *   npx fit-pathway skill              # Summary with stats
+ *   npx fit-pathway skill --list       # IDs only (for piping)
+ *   npx fit-pathway skill <id>         # Detail view
+ *   npx fit-pathway skill <id> --agent # Agent SKILL.md output
+ *   npx fit-pathway skill --validate   # Validation checks
  */
 
 import { createEntityCommand } from "./command-factory.js";
 import { skillToMarkdown } from "../formatters/skill/markdown.js";
 import { prepareSkillsList } from "../formatters/skill/shared.js";
 import { getConceptEmoji } from "@forwardimpact/map/levels";
-import { formatTable, formatError } from "../lib/cli-output.js";
+import { formatTable, formatError } from "@forwardimpact/libcli";
 import { generateSkillMarkdown } from "@forwardimpact/libskill/agent";
 import { formatAgentSkill } from "../formatters/agent/skill.js";
 
@@ -40,8 +40,8 @@ function formatSummary(skills, data) {
 
   console.log(formatTable(["Capability", "Count", "Agent"], rows));
   console.log(`\nTotal: ${skills.length} skills`);
-  console.log(`\nRun 'bunx pathway skill --list' for IDs`);
-  console.log(`Run 'bunx pathway skill <id>' for details\n`);
+  console.log(`\nRun 'npx fit-pathway skill --list' for IDs`);
+  console.log(`Run 'npx fit-pathway skill <id>' for details\n`);
 }
 
 /**
@@ -73,7 +73,7 @@ async function formatAgentDetail(skill, stages, templateLoader, dataDir) {
     console.error(formatError(`Skill '${skill.id}' has no agent section`));
     console.error(`\nSkills with agent support:`);
     console.error(
-      `  bunx pathway skill --list | xargs -I{} sh -c 'bunx pathway skill {} --json | jq -e .skill.agent > /dev/null && echo {}'`,
+      `  npx fit-pathway skill --list | xargs -I{} sh -c 'npx fit-pathway skill {} --json | jq -e .skill.agent > /dev/null && echo {}'`,
     );
     process.exit(1);
   }