@forwardimpact/pathway 0.21.0 → 0.23.0

package/README.md

@@ -52,9 +52,9 @@ Use `--help` with any command for full options.
 
 ## Web App Features
 
-- **Job Builder** — Select discipline, track, and grade to explore roles
-- **Skill Browser** — View all skills with level descriptions
-- **Career Progression** — Compare grades and identify growth areas
+- **Job Builder** — Select discipline, track, and level to explore roles
+- **Skill Browser** — View all skills with proficiency descriptions
+- **Career Progression** — Compare levels and identify growth areas
 - **Interview Prep** — Generate role-specific question sets
 - **Agent Preview** — Preview generated agent profiles
 

package/bin/fit-pathway.js

@@ -10,16 +10,16 @@
  *
  * Commands:
  *   discipline [<id>]           Show disciplines
- *   grade [<id>]                Show grades
+ *   level [<id>]                Show levels
  *   track [<id>]                Show tracks
  *   behaviour [<id>]            Show behaviours
  *   skill [<id>]                Show skills (summary, --list, or detail)
  *   driver [<id>]               Show drivers
  *   stage [<id>]                Show stages
  *   tool [<name>]               Show tools
- *   job [<discipline> <grade>] [--track=TRACK]  Generate job definition
- *   interview <discipline> <grade> [--track=TRACK] [--type=mission|decomposition|stakeholder]  Generate interview
- *   progress <discipline> <grade> [--track=TRACK] [--compare=GRADE]  Career progression
+ *   job [<discipline> <level>] [--track=TRACK]  Generate job definition
+ *   interview <discipline> <level> [--track=TRACK] [--type=mission|decomposition|stakeholder]  Generate interview
+ *   progress <discipline> <level> [--track=TRACK] [--compare=LEVEL]  Career progression
  *   questions [options]         Browse interview questions
  *   agent [<discipline> <track>] [--output=PATH]  Generate AI agent
  *
@@ -37,7 +37,7 @@ import { formatError } from "../src/lib/cli-output.js";
 
 // Import command handlers
 import { runDisciplineCommand } from "../src/commands/discipline.js";
-import { runGradeCommand } from "../src/commands/grade.js";
+import { runLevelCommand } from "../src/commands/level.js";
 import { runTrackCommand } from "../src/commands/track.js";
 import { runBehaviourCommand } from "../src/commands/behaviour.js";
 import { runSkillCommand } from "../src/commands/skill.js";
@@ -56,7 +56,7 @@ import { runUpdateCommand } from "../src/commands/update.js";
 
 const COMMANDS = {
   discipline: runDisciplineCommand,
-  grade: runGradeCommand,
+  level: runLevelCommand,
   track: runTrackCommand,
   behaviour: runBehaviourCommand,
   skill: runSkillCommand,
@@ -98,7 +98,7 @@ ENTITY COMMANDS
 All entity commands support: summary (default), --list (IDs for piping), <id> (detail)
 
   discipline [<id>]     Browse engineering disciplines
-  grade [<id>]          Browse career grades/levels
+  level [<id>]          Browse career levels
   track [<id>]          Browse track specializations
   behaviour [<id>]      Browse professional behaviours
   driver [<id>]         Browse outcome drivers
@@ -113,16 +113,16 @@ All entity commands support: summary (default), --list (IDs for piping), <id> (d
 JOB COMMAND
 ────────────────────────────────────────────────────────────────────────────────
 
-Generate job definitions from discipline × grade × track combinations.
+Generate job definitions from discipline × level × track combinations.
 
 Usage:
   npx fit-pathway job                                  Summary with stats
   npx fit-pathway job --list                           All valid combinations
-  npx fit-pathway job <discipline> <grade>             Detail view (trackless)
-  npx fit-pathway job <d> <g> --track=<track>          Detail view (with track)
-  npx fit-pathway job <d> <g> --skills                 Plain list of skill IDs
-  npx fit-pathway job <d> <g> --tools                  Plain list of tool names
-  npx fit-pathway job <d> <g> --checklist=<stage>      Show handoff checklist
+  npx fit-pathway job <discipline> <level>             Detail view (trackless)
+  npx fit-pathway job <d> <l> --track=<track>          Detail view (with track)
+  npx fit-pathway job <d> <l> --skills                 Plain list of skill IDs
+  npx fit-pathway job <d> <l> --tools                  Plain list of tool names
+  npx fit-pathway job <d> <l> --checklist=<stage>      Show handoff checklist
 
 Options:
   --track=TRACK       Track specialization (e.g., platform, forward_deployed)
@@ -170,9 +170,9 @@ INTERVIEW COMMAND
 Generate interview question sets based on job requirements.
 
 Usage:
-  npx fit-pathway interview <discipline> <grade>                     All types
-  npx fit-pathway interview <d> <g> --track=<track>                  With track
-  npx fit-pathway interview <d> <g> --track=<t> --type=<type>        Single type
+  npx fit-pathway interview <discipline> <level>                     All types
+  npx fit-pathway interview <d> <l> --track=<track>                  With track
+  npx fit-pathway interview <d> <l> --track=<t> --type=<type>        Single type
 
 Options:
   --track=TRACK       Track specialization
@@ -183,16 +183,16 @@ Options:
 PROGRESS COMMAND
 ────────────────────────────────────────────────────────────────────────────────
 
-Analyze career progression between grades.
+Analyze career progression between levels.
 
 Usage:
-  npx fit-pathway progress <discipline> <grade>
-  npx fit-pathway progress <d> <g> --track=<track>
-  npx fit-pathway progress <d> <g> --compare=<to_grade>
+  npx fit-pathway progress <discipline> <level>
+  npx fit-pathway progress <d> <l> --track=<track>
+  npx fit-pathway progress <d> <l> --compare=<to_level>
 
 Options:
   --track=TRACK        Track specialization
-  --compare=GRADE      Compare to specific grade
+  --compare=LEVEL      Compare to specific level
 
 ────────────────────────────────────────────────────────────────────────────────
 QUESTIONS COMMAND
@@ -207,7 +207,7 @@ Usage:
   npx fit-pathway questions --stats
 
 Options:
-  --level=LEVEL        Filter by skill level
+  --level=LEVEL        Filter by skill proficiency
   --maturity=MATURITY  Filter by behaviour maturity
   --skill=ID           Filter to specific skill
   --behaviour=ID       Filter to specific behaviour

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forwardimpact/pathway",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "description": "Career progression web app and CLI for exploring roles and generating agent teams",
   "license": "Apache-2.0",
   "repository": {
@@ -40,8 +40,9 @@
     "./commands": "./src/commands/index.js"
   },
   "dependencies": {
-    "@forwardimpact/map": "^0.10.0",
-    "@forwardimpact/libpathway": "^2.0.0",
+    "@forwardimpact/map": "^0.11.0",
+    "@forwardimpact/libskill": "^3.0.0",
+    "@forwardimpact/libui": "^1.0.0",
     "mustache": "^4.2.0",
     "simple-icons": "^16.7.0",
     "yaml": "^2.3.4"

package/src/commands/agent.js

@@ -35,14 +35,14 @@ import {
   generateStageAgentProfile,
   validateAgentProfile,
   validateAgentSkill,
-  deriveReferenceGrade,
+  deriveReferenceLevel,
   deriveAgentSkills,
   generateSkillMarkdown,
   deriveToolkit,
   buildAgentIndex,
   getDisciplineAbbreviation,
   toKebabCase,
-} from "@forwardimpact/libpathway";
+} from "@forwardimpact/libskill";
 import { formatAgentProfile } from "../formatters/agent/profile.js";
 import {
   formatAgentSkill,
@@ -199,7 +199,7 @@ function showAgentSummary(data, agentData, skillsWithAgent) {
  */
 function listAgentCombinations(data, agentData, verbose = false) {
   if (!verbose) {
-    // Clean output for piping
+    // Descriptive output for piping and AI agent discovery
     for (const discipline of agentData.disciplines) {
       for (const track of agentData.tracks) {
         const humanDiscipline = data.disciplines.find(
@@ -209,7 +209,11 @@ function listAgentCombinations(data, agentData, verbose = false) {
         if (humanDiscipline && humanTrack) {
           const abbrev = getDisciplineAbbreviation(discipline.id);
           const agentName = `${abbrev}-${toKebabCase(track.id)}`;
-          console.log(`${agentName} ${discipline.id} ${track.id}`);
+          const specName =
+            humanDiscipline.specialization || humanDiscipline.id;
+          console.log(
+            `${agentName} ${discipline.id} ${track.id}, ${specName} (${humanTrack.name})`,
+          );
         }
       }
     }
@@ -414,15 +418,15 @@ export async function runAgentCommand({ data, args, options, dataDir }) {
     process.exit(1);
   }
 
-  // Get reference grade for derivation
-  const grade = deriveReferenceGrade(data.grades);
+  // Get reference level for derivation
+  const level = deriveReferenceLevel(data.levels);
 
   // --skills: Output plain list of skill IDs (for piping)
   if (options.skills) {
     const derivedSkills = deriveAgentSkills({
       discipline: humanDiscipline,
       track: humanTrack,
-      grade,
+      level,
       skills: skillsWithAgent,
     });
     for (const skill of derivedSkills) {
@@ -436,7 +440,7 @@ export async function runAgentCommand({ data, args, options, dataDir }) {
     const derivedSkills = deriveAgentSkills({
       discipline: humanDiscipline,
       track: humanTrack,
-      grade,
+      level,
       skills: skillsWithAgent,
     });
     const toolkit = deriveToolkit({
@@ -462,7 +466,7 @@ export async function runAgentCommand({ data, args, options, dataDir }) {
   const stageParams = {
     discipline: humanDiscipline,
     track: humanTrack,
-    grade,
+    level,
     skills: skillsWithAgent,
     behaviours: data.behaviours,
     agentBehaviours: agentData.behaviours,
@@ -534,7 +538,7 @@ export async function runAgentCommand({ data, args, options, dataDir }) {
   const derivedSkills = deriveAgentSkills({
     discipline: humanDiscipline,
     track: humanTrack,
-    grade,
+    level,
     skills: skillsWithAgent,
   });
 

package/src/commands/behaviour.js

@@ -14,6 +14,15 @@ import { createEntityCommand } from "./command-factory.js";
 import { behaviourToMarkdown } from "../formatters/behaviour/markdown.js";
 import { formatTable } from "../lib/cli-output.js";
 
+/**
+ * Format behaviour list item for --list output
+ * @param {Object} behaviour - Behaviour entity
+ * @returns {string} Formatted list line
+ */
+function formatListItem(behaviour) {
+  return `${behaviour.id}, ${behaviour.name}`;
+}
+
 /**
  * Format behaviour summary output
  * @param {Array} behaviours - Raw behaviour entities
@@ -34,7 +43,7 @@ function formatSummary(behaviours, data) {
 
   console.log(formatTable(["ID", "Name", "Drivers"], rows));
   console.log(`\nTotal: ${behaviours.length} behaviours`);
-  console.log(`\nRun 'npx pathway behaviour --list' for IDs`);
+  console.log(`\nRun 'npx pathway behaviour --list' for IDs and names`);
   console.log(`Run 'npx pathway behaviour <id>' for details\n`);
 }
 
@@ -57,5 +66,6 @@ export const runBehaviourCommand = createEntityCommand({
   }),
   formatSummary,
   formatDetail,
+  formatListItem,
   emojiIcon: "🧠",
 });

package/src/commands/build.js

@@ -42,7 +42,8 @@ function resolvePackageLib(packageName) {
 }
 
 const mapLibDir = resolvePackageLib("@forwardimpact/map");
-const modelLibDir = resolvePackageLib("@forwardimpact/libpathway");
+const modelLibDir = resolvePackageLib("@forwardimpact/libskill");
+const uiLibDir = resolvePackageLib("@forwardimpact/libui");
 
 /**
  * Files and directories to copy from app/
@@ -141,13 +142,21 @@ ${framework.emojiIcon} Generating ${framework.title} static site...
     }
   }
 
-  // Copy @forwardimpact/map and @forwardimpact/libpathway packages
+  // Copy @forwardimpact/map and @forwardimpact/libskill packages
   // These are needed by the browser's import map
   console.log("📚 Copying package dependencies...");
   await cp(mapLibDir, join(outputDir, "map/lib"), { recursive: true });
   console.log(`   ✓ map/lib`);
   await cp(modelLibDir, join(outputDir, "model/lib"), { recursive: true });
   console.log(`   ✓ model/lib`);
+  // Copy libui JS (src/) and CSS (src/css/)
+  await cp(uiLibDir, join(outputDir, "ui/lib"), { recursive: true });
+  // CSS is within uiLibDir/css/ so it's already copied as ui/lib/css/
+  // Create ui/css/ symlink-like copy for the CSS @import paths
+  await cp(join(uiLibDir, "css"), join(outputDir, "ui/css"), {
+    recursive: true,
+  });
+  console.log(`   ✓ ui/lib + ui/css`);
 
   // Copy data directory (dereference symlinks to copy actual content)
   console.log("📁 Copying data files...");

package/src/commands/command-factory.js

@@ -22,6 +22,7 @@ import { capitalize } from "../formatters/shared.js";
  * @param {Function} config.presentDetail - Function to present detail: (entity, data, options) => view
  * @param {Function} config.formatSummary - Function to format summary output: (items, data) => void
  * @param {Function} config.formatDetail - Function to format detail output: (view, framework) => void
+ * @param {Function} [config.formatListItem] - Optional function to format list item: (item) => string (defaults to item.id)
  * @param {Function} [config.sortItems] - Optional function to sort items: (items) => sortedItems
  * @param {Function} [config.validate] - Optional validation function: (data) => {errors: [], warnings: []}
  * @param {string} [config.emojiIcon] - Optional emoji for the entity
@@ -34,6 +35,7 @@ export function createEntityCommand({
   presentDetail,
   formatSummary,
   formatDetail,
+  formatListItem,
   sortItems,
   validate,
   _emojiIcon = "",
@@ -48,10 +50,10 @@ export function createEntityCommand({
       return handleValidate({ data, entityName, pluralName, validate });
     }
 
-    // --list: Output clean newline-separated IDs for piping
+    // --list: Output descriptive comma-separated lines for piping and AI agent discovery
     if (options.list) {
       for (const item of items) {
-        console.log(item.id);
+        console.log(formatListItem ? formatListItem(item) : item.id);
       }
       return;
     }

package/src/commands/dev.js

@@ -31,7 +31,8 @@ function resolvePackageLib(packageName) {
 }
 
 const mapLibDir = resolvePackageLib("@forwardimpact/map");
-const modelLibDir = resolvePackageLib("@forwardimpact/libpathway");
+const modelLibDir = resolvePackageLib("@forwardimpact/libskill");
+const uiLibDir = resolvePackageLib("@forwardimpact/libui");
 
 const MIME_TYPES = {
   ".html": "text/html; charset=utf-8",
@@ -138,8 +139,14 @@ export async function runDevCommand({ dataDir, options }) {
       // Serve @forwardimpact/map package files (resolved via Node module resolution)
       filePath = join(mapLibDir, pathname.slice(9));
     } else if (pathname.startsWith("/model/lib/")) {
-      // Serve @forwardimpact/libpathway package files (resolved via Node module resolution)
+      // Serve @forwardimpact/libskill package files (resolved via Node module resolution)
       filePath = join(modelLibDir, pathname.slice(11));
+    } else if (pathname.startsWith("/ui/lib/")) {
+      // Serve @forwardimpact/libui package JS files
+      filePath = join(uiLibDir, pathname.slice(8));
+    } else if (pathname.startsWith("/ui/css/")) {
+      // Serve @forwardimpact/libui package CSS files
+      filePath = join(uiLibDir, "css", pathname.slice(8));
     } else if (pathname === "/" || pathname === "") {
       // Serve index.html for root
       filePath = join(publicDir, "index.html");

package/src/commands/discipline.js

@@ -14,6 +14,15 @@ import { createEntityCommand } from "./command-factory.js";
 import { disciplineToMarkdown } from "../formatters/discipline/markdown.js";
 import { formatTable } from "../lib/cli-output.js";
 
+/**
+ * Format discipline list item for --list output
+ * @param {Object} discipline - Discipline entity
+ * @returns {string} Formatted list line
+ */
+function formatListItem(discipline) {
+  return `${discipline.id}, ${discipline.specialization || discipline.id}, ${discipline.roleTitle || discipline.id}`;
+}
+
 /**
  * Format discipline summary output
  * @param {Array} disciplines - Raw discipline entities
@@ -23,14 +32,21 @@ function formatSummary(disciplines) {
 
   const rows = disciplines.map((d) => [
     d.id,
+    d.specialization || d.id,
+    d.roleTitle || d.id,
     d.coreSkills?.length || 0,
     d.supportingSkills?.length || 0,
     d.broadSkills?.length || 0,
   ]);
 
-  console.log(formatTable(["ID", "Core", "Supporting", "Broad"], rows));
+  console.log(
+    formatTable(
+      ["ID", "Specialization", "Role Title", "Core", "Supporting", "Broad"],
+      rows,
+    ),
+  );
   console.log(`\nTotal: ${disciplines.length} disciplines`);
-  console.log(`\nRun 'npx pathway discipline --list' for IDs`);
+  console.log(`\nRun 'npx pathway discipline --list' for IDs and names`);
   console.log(`Run 'npx pathway discipline <id>' for details\n`);
 }
 
@@ -54,5 +70,6 @@ export const runDisciplineCommand = createEntityCommand({
   }),
   formatSummary,
   formatDetail,
+  formatListItem,
   emojiIcon: "📋",
 });

package/src/commands/driver.js

@@ -20,6 +20,15 @@ import {
 } from "../lib/cli-output.js";
 import { getConceptEmoji } from "@forwardimpact/map/levels";
 
+/**
+ * Format driver list item for --list output
+ * @param {Object} driver - Driver entity
+ * @returns {string} Formatted list line
+ */
+function formatListItem(driver) {
+  return `${driver.id}, ${driver.name}`;
+}
+
 /**
  * Format driver summary output
  * @param {Array} drivers - Raw driver entities
@@ -43,7 +52,7 @@ function formatSummary(drivers, data) {
 
   console.log(formatTable(["ID", "Name", "Skills", "Behaviours"], rows));
   console.log(`\nTotal: ${drivers.length} drivers`);
-  console.log(`\nRun 'npx pathway driver --list' for IDs`);
+  console.log(`\nRun 'npx pathway driver --list' for IDs and names`);
   console.log(`Run 'npx pathway driver <id>' for details\n`);
 }
 
@@ -90,5 +99,6 @@ export const runDriverCommand = createEntityCommand({
   }),
   formatSummary,
   formatDetail,
+  formatListItem,
   emojiIcon: "🎯",
 });

package/src/commands/index.js

@@ -5,7 +5,7 @@
  */
 
 export { runDisciplineCommand } from "./discipline.js";
-export { runGradeCommand } from "./grade.js";
+export { runLevelCommand } from "./level.js";
 export { runTrackCommand } from "./track.js";
 export { runBehaviourCommand } from "./behaviour.js";
 export { runSkillCommand } from "./skill.js";

package/src/commands/init.js

@@ -54,7 +54,7 @@ Next steps:
 Data structure:
   data/
   ├── framework.yaml      # Framework metadata
-  ├── grades.yaml         # Career levels
+  ├── levels.yaml         # Career levels
   ├── stages.yaml         # Lifecycle stages
   ├── drivers.yaml        # Business drivers
   ├── capabilities.yaml   # Capability areas

package/src/commands/interview.js

@@ -4,9 +4,9 @@
  * Generates and displays interview questions in the terminal.
  *
  * Usage:
- *   npx fit-pathway interview <discipline> <grade>                                  # All interview types
- *   npx fit-pathway interview <discipline> <grade> --track=<track>                  # With track
- *   npx fit-pathway interview <discipline> <grade> --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";
@@ -45,7 +45,7 @@ function formatAllInterviews(views, options) {
 
 export const runInterviewCommand = createCompositeCommand({
   commandName: "interview",
-  requiredArgs: ["discipline_id", "grade_id"],
+  requiredArgs: ["discipline_id", "level_id"],
   findEntities: (data, args, options) => {
     const interviewType = options.type === "full" ? null : options.type;
 
@@ -57,7 +57,7 @@ export const runInterviewCommand = createCompositeCommand({
 
     return {
       discipline: data.disciplines.find((d) => d.id === args[0]),
-      grade: data.grades.find((g) => g.id === args[1]),
+      level: data.levels.find((g) => g.id === args[1]),
       track: options.track
         ? data.tracks.find((t) => t.id === options.track)
         : null,
@@ -68,8 +68,8 @@ export const runInterviewCommand = createCompositeCommand({
     if (!entities.discipline) {
       return `Discipline not found: ${entities.discipline}`;
     }
-    if (!entities.grade) {
-      return `Grade not found: ${entities.grade}`;
+    if (!entities.level) {
+      return `Level not found: ${entities.level}`;
     }
     if (options.track && !entities.track) {
       return `Track not found: ${options.track}`;
@@ -79,7 +79,7 @@ export const runInterviewCommand = createCompositeCommand({
   presenter: (entities, data, _options) => {
     const params = {
       discipline: entities.discipline,
-      grade: entities.grade,
+      level: entities.level,
       track: entities.track,
       skills: data.skills,
       behaviours: data.behaviours,

package/src/commands/job.js

@@ -6,22 +6,22 @@
  * Usage:
  *   npx pathway job                                          # Summary with stats
  *   npx pathway job --list                                   # All valid combinations (for piping)
- *   npx pathway job <discipline> <grade>                     # Detail view (trackless)
- *   npx pathway job <discipline> <grade> --track=<track>     # Detail view (with track)
- *   npx pathway job <d> <g> [--track=<t>] --skills           # Plain list of skill IDs
- *   npx pathway job <d> <g> [--track=<t>] --tools            # Plain list of tool names
+ *   npx pathway job <discipline> <level>                     # Detail view (trackless)
+ *   npx pathway job <discipline> <level> --track=<track>     # Detail view (with track)
+ *   npx pathway job <d> <l> [--track=<t>] --skills           # Plain list of skill IDs
+ *   npx pathway job <d> <l> [--track=<t>] --tools            # Plain list of tool names
  *   npx pathway job se L3 --track=platform --checklist=code  # Show checklist for handoff
  *   npx pathway job --validate                               # Validation checks
  */
 
-import { prepareJobDetail } from "@forwardimpact/libpathway/job";
+import { prepareJobDetail } from "@forwardimpact/libskill/job";
 import { jobToMarkdown } from "../formatters/job/markdown.js";
-import { generateAllJobs } from "@forwardimpact/libpathway/derivation";
+import { generateJobTitle, generateAllJobs } from "@forwardimpact/libskill/derivation";
 import { formatTable } from "../lib/cli-output.js";
 import {
   deriveChecklist,
   formatChecklistMarkdown,
-} from "@forwardimpact/libpathway/checklist";
+} from "@forwardimpact/libskill/checklist";
 import { loadJobTemplate } from "../lib/template-loader.js";
 import { toolkitToPlainList } from "../formatters/toolkit/markdown.js";
 
@@ -47,20 +47,23 @@ function formatJob(view, _options, entities, jobTemplate) {
 export async function runJobCommand({ data, args, options, dataDir }) {
   const jobs = generateAllJobs({
     disciplines: data.disciplines,
-    grades: data.grades,
+    levels: data.levels,
     tracks: data.tracks,
     skills: data.skills,
     behaviours: data.behaviours,
     validationRules: data.framework.validationRules,
   });
 
-  // --list: Output clean lines for piping (discipline grade track format)
+  // --list: Output descriptive comma-separated lines for piping and AI agent discovery
   if (options.list) {
     for (const job of jobs) {
+      const title = generateJobTitle(job.discipline, job.level, job.track);
       if (job.track) {
-        console.log(`${job.discipline.id} ${job.grade.id} ${job.track.id}`);
+        console.log(
+          `${job.discipline.id} ${job.level.id} ${job.track.id}, ${title}`,
+        );
       } else {
-        console.log(`${job.discipline.id} ${job.grade.id}`);
+        console.log(`${job.discipline.id} ${job.level.id}, ${title}`);
       }
     }
     return;
@@ -70,27 +73,37 @@ export async function runJobCommand({ data, args, options, dataDir }) {
   if (args.length === 0) {
     console.log(`\n💼 Jobs\n`);
 
-    // Count by discipline
+    // Count by discipline with name
     const byDiscipline = {};
     for (const job of jobs) {
-      byDiscipline[job.discipline.id] =
-        (byDiscipline[job.discipline.id] || 0) + 1;
+      const key = job.discipline.id;
+      if (!byDiscipline[key]) {
+        byDiscipline[key] = {
+          name: job.discipline.specialization || job.discipline.id,
+          count: 0,
+        };
+      }
+      byDiscipline[key].count++;
     }
 
-    const rows = Object.entries(byDiscipline).map(([id, count]) => [id, count]);
-    console.log(formatTable(["Discipline", "Combinations"], rows));
+    const rows = Object.entries(byDiscipline).map(([id, info]) => [
+      id,
+      info.name,
+      info.count,
+    ]);
+    console.log(formatTable(["ID", "Specialization", "Combinations"], rows));
     console.log(`\nTotal: ${jobs.length} valid job combinations`);
-    console.log(`\nRun 'npx pathway job --list' for all combinations`);
+    console.log(`\nRun 'npx pathway job --list' for all combinations with titles`);
     console.log(
-      `Run 'npx pathway job <discipline> <grade> [--track=<track>]' for details\n`,
+      `Run 'npx pathway job <discipline> <level> [--track=<track>]' for details\n`,
     );
     return;
   }
 
-  // Handle job detail view - requires discipline and grade
+  // Handle job detail view - requires discipline and level
   if (args.length < 2) {
     console.error(
-      "Usage: npx pathway job <discipline> <grade> [--track=<track>]",
+      "Usage: npx pathway job <discipline> <level> [--track=<track>]",
     );
     console.error("       npx pathway job --list");
     console.error("Example: npx pathway job software_engineering L4");
@@ -101,7 +114,7 @@ export async function runJobCommand({ data, args, options, dataDir }) {
   }
 
   const discipline = data.disciplines.find((d) => d.id === args[0]);
-  const grade = data.grades.find((g) => g.id === args[1]);
+  const level = data.levels.find((g) => g.id === args[1]);
   const track = options.track
     ? data.tracks.find((t) => t.id === options.track)
     : null;
@@ -112,9 +125,9 @@ export async function runJobCommand({ data, args, options, dataDir }) {
     process.exit(1);
   }
 
-  if (!grade) {
-    console.error(`Grade not found: ${args[1]}`);
-    console.error(`Available: ${data.grades.map((g) => g.id).join(", ")}`);
+  if (!level) {
+    console.error(`Level not found: ${args[1]}`);
+    console.error(`Available: ${data.levels.map((g) => g.id).join(", ")}`);
     process.exit(1);
   }
 
@@ -126,7 +139,7 @@ export async function runJobCommand({ data, args, options, dataDir }) {
 
   const view = prepareJobDetail({
     discipline,
-    grade,
+    level,
     track,
     skills: data.skills,
     behaviours: data.behaviours,
@@ -137,8 +150,8 @@ export async function runJobCommand({ data, args, options, dataDir }) {
 
   if (!view) {
     const combo = track
-      ? `${discipline.id} × ${grade.id} × ${track.id}`
-      : `${discipline.id} × ${grade.id}`;
+      ? `${discipline.id} × ${level.id} × ${track.id}`
+      : `${discipline.id} × ${level.id}`;
     console.error(`Invalid combination: ${combo}`);
     if (track) {
       const validTracks =
@@ -212,5 +225,5 @@ export async function runJobCommand({ data, args, options, dataDir }) {
 
   // Load job template for description formatting
   const jobTemplate = await loadJobTemplate(dataDir);
-  formatJob(view, options, { discipline, grade, track }, jobTemplate);
+  formatJob(view, options, { discipline, level, track }, jobTemplate);
 }