@forwardimpact/pathway 0.7.0 → 0.8.0

package/bin/fit-pathway.js

@@ -27,10 +27,6 @@
  *   --list         Output IDs only (for piping)
  *   --json         Output as JSON
  *   --help         Show help
- *
- * Validation (moved to fit-schema):
- *   npx fit-schema validate
- *   npx fit-schema generate-index
  */
 
 import { join, resolve } from "path";
@@ -78,76 +74,142 @@ Engineering Pathway CLI
 Usage:
   npx fit-pathway <command> [options]
 
-Validation (use fit-schema instead):
-  npx fit-schema validate             Run full data validation
-  npx fit-schema generate-index       Generate browser index files
+Global Options:
+  --list            Output IDs only (for piping to other commands)
+  --json            Output as JSON
+  --data=PATH       Path to data directory (default: ./data or examples/)
+  --help            Show this help message
+
+────────────────────────────────────────────────────────────────────────────────
+GETTING STARTED
+────────────────────────────────────────────────────────────────────────────────
 
-Getting Started:
   init                                Create ./data/ with example data
   serve [--port=PORT]                 Serve web app at http://localhost:3000
   site [--output=PATH]                Generate static site to ./site/
 
-Entity Commands (summary by default, --list for IDs, <id> for detail):
-  discipline [<id>]                   Browse disciplines
-  grade [<id>]                        Browse grades
-  track [<id>]                        Browse tracks
-  behaviour [<id>]                    Browse behaviours  
-  skill [<id>]                        Browse skills
-    --agent                           Output as agent SKILL.md format
-  driver [<id>]                       Browse drivers
-  stage [<id>]                        Browse lifecycle stages
-  tool [<name>]                       Browse recommended tools
-
-Composite Commands:
-  job [<discipline> <grade>] [--track=TRACK]  Generate job definition
-  interview <discipline> <grade> [--track=TRACK] [--type=TYPE]
-                                      Generate interview questions
-  progress <discipline> <grade> [--track=TRACK] [--compare=GRADE]
-                                      Show career progression
-  questions [filters]                 Browse interview questions
-  agent <discipline> [--track=<track>] Generate AI coding agent
+────────────────────────────────────────────────────────────────────────────────
+ENTITY COMMANDS
+────────────────────────────────────────────────────────────────────────────────
 
-Global Options:
-  --list            Output IDs only (for piping to other commands)
-  --json            Output as JSON
-  --data=PATH       Path to data directory (default: ./data or examples/)
-  --help            Show this help message
+All entity commands support: summary (default), --list (IDs for piping), <id> (detail)
 
-Questions Filters:
-  --level=LEVEL       Filter by skill level
-  --maturity=MAT      Filter by behaviour maturity
-  --skill=ID          Filter to specific skill
-  --behaviour=ID      Filter to behaviour
-  --capability=CAP    Filter by capability
-  --stats             Show detailed statistics
-  --format=FORMAT     Output format: table, yaml, json
-
-Agent Options:
-  --track=TRACK       Track for the agent (e.g., platform, forward_deployed)
-  --output=PATH       Write files to directory (without this, outputs to console)
-  --stage=STAGE       Generate specific stage agent (plan, code, review)
-  --all-stages        Generate all stage agents (default)
+  discipline [<id>]     Browse engineering disciplines
+  grade [<id>]          Browse career grades/levels
+  track [<id>]          Browse track specializations
+  behaviour [<id>]      Browse professional behaviours
+  driver [<id>]         Browse outcome drivers
+  stage [<id>]          Browse lifecycle stages
 
-Examples:
-  npx fit-pathway skill                    # Summary of all skills
-  npx fit-pathway skill --list             # Skill IDs for piping
-  npx fit-pathway skill ai_evaluation      # Detail view
-  npx fit-pathway skill architecture_design --agent  # Agent SKILL.md output
+  skill [<id>]          Browse skills
+    --agent             Output as agent SKILL.md format
+
+  tool [<name>]         Browse recommended tools (aggregated from skills)
+
+────────────────────────────────────────────────────────────────────────────────
+JOB COMMAND
+────────────────────────────────────────────────────────────────────────────────
 
-  npx fit-pathway tool                     # Summary of all tools
-  npx fit-pathway tool --list              # Tool names for piping
-  npx fit-pathway tool DuckDB              # Tool detail with skill usages
+Generate job definitions from discipline × grade × track combinations.
 
-  npx fit-pathway job                      # Summary of valid combinations
-  npx fit-pathway job --list               # All combinations for piping
+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
+
+Options:
+  --track=TRACK       Track specialization (e.g., platform, forward_deployed)
+  --skills            Output plain list of skill IDs (for piping)
+  --tools             Output plain list of tool names (for piping)
+  --checklist=STAGE   Show checklist for stage handoff (plan, code)
+
+Examples:
   npx fit-pathway job software_engineering L4
   npx fit-pathway job software_engineering L4 --track=platform
-  npx fit-pathway job se L3 --track=platform --checklist=code
+  npx fit-pathway job se L3 --track=platform --skills
+  npx fit-pathway job se L3 --track=platform --tools
+
+────────────────────────────────────────────────────────────────────────────────
+AGENT COMMAND
+────────────────────────────────────────────────────────────────────────────────
+
+Generate AI coding agent configurations from discipline × track × stage.
 
+Usage:
+  npx fit-pathway agent                                Summary with stats
+  npx fit-pathway agent --list                         All valid combinations
+  npx fit-pathway agent <discipline> --track=<track>   Generate all stage agents
+  npx fit-pathway agent <d> --track=<t> --stage=<s>    Generate single stage agent
+  npx fit-pathway agent <d> --track=<t> --skills       Plain list of skill IDs
+  npx fit-pathway agent <d> --track=<t> --tools        Plain list of tool names
+
+Options:
+  --track=TRACK       Track for the agent (required for generation)
+  --stage=STAGE       Generate specific stage agent (plan, code, review)
+  --output=PATH       Write files to directory (without this, outputs to console)
+  --skills            Output plain list of skill IDs (for piping)
+  --tools             Output plain list of tool names (for piping)
+
+Examples:
+  npx fit-pathway agent software_engineering --track=platform
+  npx fit-pathway agent software_engineering --track=platform --stage=plan
+  npx fit-pathway agent software_engineering --track=platform --output=./agents
+  npx fit-pathway agent software_engineering --track=platform --skills
+
+────────────────────────────────────────────────────────────────────────────────
+INTERVIEW COMMAND
+────────────────────────────────────────────────────────────────────────────────
+
+Generate interview question sets based on job requirements.
+
+Usage:
+  npx fit-pathway interview <discipline> <grade>
+  npx fit-pathway interview <d> <g> --track=<track>
+  npx fit-pathway interview <d> <g> --type=<type>
+
+Options:
+  --track=TRACK       Track specialization
+  --type=TYPE         Interview type: full (default), short
+
+────────────────────────────────────────────────────────────────────────────────
+PROGRESS COMMAND
+────────────────────────────────────────────────────────────────────────────────
+
+Analyze career progression between grades.
+
+Usage:
+  npx fit-pathway progress <discipline> <grade>
+  npx fit-pathway progress <d> <g> --track=<track>
+  npx fit-pathway progress <d> <g> --compare=<to_grade>
+
+Options:
+  --track=TRACK        Track specialization
+  --compare=GRADE      Compare to specific grade
+
+────────────────────────────────────────────────────────────────────────────────
+QUESTIONS COMMAND
+────────────────────────────────────────────────────────────────────────────────
+
+Browse and filter interview questions.
+
+Usage:
+  npx fit-pathway questions
   npx fit-pathway questions --level=practitioner
+  npx fit-pathway questions --skill=architecture_design
   npx fit-pathway questions --stats
 
-  npx fit-pathway agent software_engineering --track=platform --output=./agents
+Options:
+  --level=LEVEL        Filter by skill level
+  --maturity=MATURITY  Filter by behaviour maturity
+  --skill=ID           Filter to specific skill
+  --behaviour=ID       Filter to specific behaviour
+  --capability=CAP     Filter by capability
+  --stats              Show detailed statistics
+  --format=FORMAT      Output format: table, yaml, json
 `;
 
 /**
@@ -177,6 +239,8 @@ function parseArgs(args) {
     stats: false,
     // Job command options
     checklist: null,
+    skills: false,
+    tools: false,
     // Agent command options
     output: null,
     stage: null,
@@ -233,6 +297,10 @@ function parseArgs(args) {
       result.agent = true;
     } else if (arg.startsWith("--checklist=")) {
       result.checklist = arg.slice(12);
+    } else if (arg === "--skills") {
+      result.skills = true;
+    } else if (arg === "--tools") {
+      result.tools = true;
     } else if (arg.startsWith("--port=")) {
       result.port = parseInt(arg.slice(7), 10);
     } else if (arg.startsWith("--path=")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forwardimpact/pathway",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Career progression web app and CLI for exploring roles and generating agents",
   "license": "Apache-2.0",
   "repository": {
@@ -40,8 +40,8 @@
     "./commands": "./src/commands/index.js"
   },
   "dependencies": {
-    "@forwardimpact/schema": "^0.2.0",
-    "@forwardimpact/model": "^0.2.0",
+    "@forwardimpact/schema": "^0.3.0",
+    "@forwardimpact/model": "^0.3.0",
     "mustache": "^4.2.0",
     "simple-icons": "^16.7.0",
     "yaml": "^2.3.4"

package/src/commands/agent.js

@@ -13,6 +13,8 @@
  *   npx pathway agent <discipline> [--track=<track>]
  *   npx pathway agent <discipline> --track=<track> --stage=plan
  *   npx pathway agent <discipline> --track=<track> --output=./agents
+ *   npx pathway agent <discipline> [--track=<track>] --skills  # Plain list of skill IDs
+ *   npx pathway agent <discipline> [--track=<track>] --tools   # Plain list of tool names
  *   npx pathway agent --list
  *
  * Examples:
@@ -36,7 +38,9 @@ import {
   deriveReferenceGrade,
   deriveAgentSkills,
   generateSkillMd,
-} from "@forwardimpact/model/agent";
+  deriveToolkit,
+  buildAgentIndex,
+} from "@forwardimpact/model";
 import { formatAgentProfile } from "../formatters/agent/profile.js";
 import { formatAgentSkill } from "../formatters/agent/skill.js";
 import { formatError, formatSuccess } from "../lib/cli-output.js";
@@ -44,6 +48,7 @@ import {
   loadAgentTemplate,
   loadSkillTemplate,
 } from "../lib/template-loader.js";
+import { toolkitToPlainList } from "../formatters/toolkit/markdown.js";
 
 /**
  * Ensure directory exists for a file path
@@ -372,8 +377,47 @@ export async function runAgentCommand({ data, args, options, dataDir }) {
   // Get reference grade for derivation
   const grade = deriveReferenceGrade(data.grades);
 
+  // --skills: Output plain list of skill IDs (for piping)
+  if (options.skills) {
+    const derivedSkills = deriveAgentSkills({
+      discipline: humanDiscipline,
+      track: humanTrack,
+      grade,
+      skills: skillsWithAgent,
+    });
+    for (const skill of derivedSkills) {
+      console.log(skill.skillId);
+    }
+    return;
+  }
+
+  // --tools: Output plain list of tool names (for piping)
+  if (options.tools) {
+    const derivedSkills = deriveAgentSkills({
+      discipline: humanDiscipline,
+      track: humanTrack,
+      grade,
+      skills: skillsWithAgent,
+    });
+    const toolkit = deriveToolkit({
+      skillMatrix: derivedSkills,
+      skills: skillsWithAgent,
+    });
+    console.log(toolkitToPlainList(toolkit));
+    return;
+  }
+
   const baseDir = options.output || ".";
 
+  // Build agent index for all valid combinations
+  const agentIndex = buildAgentIndex({
+    disciplines: data.disciplines,
+    tracks: data.tracks,
+    stages: data.stages,
+    agentDisciplines: agentData.disciplines,
+    agentTracks: agentData.tracks,
+  });
+
   // Common params for stage-based generation
   const stageParams = {
     discipline: humanDiscipline,
@@ -386,6 +430,7 @@ export async function runAgentCommand({ data, args, options, dataDir }) {
     agentTrack,
     capabilities: data.capabilities,
     stages: data.stages,
+    agentIndex,
   };
 
   // Handle --stage flag for single stage agent

package/src/commands/job.js

@@ -8,6 +8,8 @@
  *   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 se L3 --track=platform --checklist=code  # Show checklist for handoff
  *   npx pathway job --validate                               # Validation checks
  */
@@ -21,6 +23,7 @@ import {
   formatChecklistMarkdown,
 } from "@forwardimpact/model/checklist";
 import { loadJobTemplate } from "../lib/template-loader.js";
+import { toolkitToPlainList } from "../formatters/toolkit/markdown.js";
 
 /**
  * Format job output
@@ -132,10 +135,38 @@ export async function runJobCommand({ data, args, options, dataDir }) {
   });
 
   if (!view) {
-    console.error("Failed to generate job output.");
+    const combo = track
+      ? `${discipline.id} × ${grade.id} × ${track.id}`
+      : `${discipline.id} × ${grade.id}`;
+    console.error(`Invalid combination: ${combo}`);
+    if (track) {
+      const validTracks =
+        discipline.validTracks?.filter((t) => t !== null) || [];
+      if (validTracks.length > 0) {
+        console.error(
+          `Valid tracks for ${discipline.id}: ${validTracks.join(", ")}`,
+        );
+      } else {
+        console.error(`${discipline.id} does not support tracks`);
+      }
+    }
     process.exit(1);
   }
 
+  // --skills: Output plain list of skill IDs (for piping)
+  if (options.skills) {
+    for (const skill of view.skillMatrix) {
+      console.log(skill.skillId);
+    }
+    return;
+  }
+
+  // --tools: Output plain list of tool names (for piping)
+  if (options.tools) {
+    console.log(toolkitToPlainList(view.toolkit));
+    return;
+  }
+
   if (options.json) {
     console.log(JSON.stringify(view, null, 2));
     return;

package/src/formatters/agent/profile.js

@@ -12,6 +12,12 @@ import Mustache from "mustache";
 
 import { trimValue, trimRequired, trimFields } from "../shared.js";
 
+/**
+ * @typedef {Object} WorkingStyleEntry
+ * @property {string} title - Section title
+ * @property {string} content - Working style content (markdown)
+ */
+
 /**
  * Prepare agent profile data for template rendering
  * Normalizes string values by trimming trailing newlines for consistent template output.
@@ -27,30 +33,32 @@ import { trimValue, trimRequired, trimFields } from "../shared.js";
  * @param {string} params.bodyData.identity - Core identity text
  * @param {string} [params.bodyData.priority] - Priority/philosophy statement
  * @param {Array<{name: string, dirname: string, useWhen: string}>} params.bodyData.skillIndex - Skill index entries
- * @param {Array<{index: number, text: string}>} params.bodyData.beforeMakingChanges - Numbered steps
- * @param {string} [params.bodyData.delegation] - Delegation guidance
- * @param {string} params.bodyData.operationalContext - Operational context text
- * @param {string} params.bodyData.workingStyle - Working style markdown section
+ * @param {string} params.bodyData.roleContext - Role context text
+ * @param {WorkingStyleEntry[]} params.bodyData.workingStyles - Working style entries
  * @param {string} [params.bodyData.beforeHandoff] - Before handoff checklist markdown
  * @param {string[]} params.bodyData.constraints - List of constraints
+ * @param {Array<{id: string, name: string, description: string}>} [params.bodyData.agentIndex] - List of all available agents
+ * @param {boolean} [params.bodyData.hasAgentIndex] - Whether agent index is available
  * @returns {Object} Data object ready for Mustache template
  */
 function prepareAgentProfileData({ frontmatter, bodyData }) {
-  // Trim array fields using helpers
+  // Trim array fields using shared helpers
   const handoffs = trimFields(frontmatter.handoffs, { prompt: "required" });
-  const beforeMakingChanges = trimFields(bodyData.beforeMakingChanges, {
-    text: "required",
-  });
-
-  // Trim simple string arrays
   const constraints = (bodyData.constraints || []).map((c) => trimRequired(c));
-
-  // Trim skill index entries
-  const skillIndex = (bodyData.skillIndex || []).map((s) => ({
-    name: trimRequired(s.name),
-    dirname: trimRequired(s.dirname),
-    useWhen: trimRequired(s.useWhen),
-  }));
+  const skillIndex = trimFields(bodyData.skillIndex, {
+    name: "required",
+    dirname: "required",
+    useWhen: "required",
+  });
+  const agentIndex = trimFields(bodyData.agentIndex, {
+    id: "required",
+    name: "required",
+    description: "required",
+  });
+  const workingStyles = trimFields(bodyData.workingStyles, {
+    title: "required",
+    content: "required",
+  });
 
   return {
     // Frontmatter
@@ -66,12 +74,14 @@ function prepareAgentProfileData({ frontmatter, bodyData }) {
     priority: trimValue(bodyData.priority),
     skillIndex,
     hasSkills: skillIndex.length > 0,
-    beforeMakingChanges,
-    delegation: trimValue(bodyData.delegation),
-    operationalContext: trimValue(bodyData.operationalContext),
-    workingStyle: trimValue(bodyData.workingStyle),
+    roleContext: trimValue(bodyData.roleContext),
+    workingStyles,
+    hasWorkingStyles: workingStyles.length > 0,
     beforeHandoff: trimValue(bodyData.beforeHandoff),
     constraints,
+    hasConstraints: constraints.length > 0,
+    agentIndex,
+    hasAgentIndex: agentIndex.length > 0,
   };
 }
 
@@ -90,10 +100,8 @@ function prepareAgentProfileData({ frontmatter, bodyData }) {
  * @param {string} profile.bodyData.identity - Core identity text
  * @param {string} [profile.bodyData.priority] - Priority/philosophy statement (optional)
  * @param {Array<{name: string, dirname: string, useWhen: string}>} profile.bodyData.skillIndex - Skill index entries
- * @param {Array<{index: number, text: string}>} profile.bodyData.beforeMakingChanges - Numbered steps
- * @param {string} [profile.bodyData.delegation] - Delegation guidance (optional)
- * @param {string} profile.bodyData.operationalContext - Operational context text
- * @param {string} profile.bodyData.workingStyle - Working style markdown section
+ * @param {string} profile.bodyData.roleContext - Role context text
+ * @param {WorkingStyleEntry[]} profile.bodyData.workingStyles - Working style entries
  * @param {string} [profile.bodyData.beforeHandoff] - Before handoff checklist markdown (optional)
  * @param {string[]} profile.bodyData.constraints - List of constraints
  * @param {string} template - Mustache template string

package/src/formatters/agent/skill.js

@@ -40,14 +40,24 @@ function prepareAgentSkillData({
     ready: "array",
   });
 
+  const descriptionLines = splitLines(frontmatter.description);
+  const useWhenLines = splitLines(frontmatter.useWhen);
+  const trimmedReference = trimValue(reference) || "";
+  const tools = toolReferences || [];
+
   return {
     name: frontmatter.name,
-    descriptionLines: splitLines(frontmatter.description),
-    useWhenLines: splitLines(frontmatter.useWhen),
+    descriptionLines,
+    hasDescription: descriptionLines.length > 0,
+    useWhenLines,
+    hasUseWhen: useWhenLines.length > 0,
     title,
     stages: processedStages,
-    reference: trimValue(reference) || "",
-    toolReferences: toolReferences || [],
+    hasStages: processedStages.length > 0,
+    reference: trimmedReference,
+    hasReference: !!trimmedReference,
+    toolReferences: tools,
+    hasToolReferences: tools.length > 0,
   };
 }
 

package/src/formatters/job/description.js

@@ -129,25 +129,38 @@ function prepareJobDescriptionData({ job, discipline, grade, track }) {
       grade.typicalExperienceRange || "",
     ) || null;
 
+  const responsibilities = trimFields(job.derivedResponsibilities, {
+    responsibility: "required",
+  });
+  const behaviours = trimFields(sortedBehaviours, {
+    maturityDescription: "optional",
+  });
+  const trimmedTrackRoleContext = trimValue(track?.roleContext);
+  const trimmedExpectationsParagraph = trimValue(expectationsParagraph);
+  const trimmedQualificationSummary = trimValue(qualificationSummary);
+
   return {
     title: job.title,
     gradeId: grade.id,
     typicalExperienceRange: grade.typicalExperienceRange,
     trackName: track?.name || null,
+    hasTrack: !!track,
     roleSummary: trimValue(roleSummary),
-    trackRoleContext: trimValue(track?.roleContext),
-    expectationsParagraph: trimValue(expectationsParagraph),
-    responsibilities: trimFields(job.derivedResponsibilities, {
-      responsibility: "required",
-    }),
-    behaviours: trimFields(sortedBehaviours, {
-      maturityDescription: "optional",
-    }),
+    trackRoleContext: trimmedTrackRoleContext,
+    hasTrackRoleContext: !!trimmedTrackRoleContext,
+    expectationsParagraph: trimmedExpectationsParagraph,
+    hasExpectationsParagraph: !!trimmedExpectationsParagraph,
+    responsibilities,
+    hasResponsibilities: responsibilities.length > 0,
+    behaviours,
+    hasBehaviours: behaviours.length > 0,
     skillLevels: skillLevels.map((level) => ({
       ...level,
       skills: trimFields(level.skills, { levelDescription: "optional" }),
     })),
-    qualificationSummary: trimValue(qualificationSummary),
+    hasSkillLevels: skillLevels.length > 0,
+    qualificationSummary: trimmedQualificationSummary,
+    hasQualificationSummary: !!trimmedQualificationSummary,
   };
 }
 

package/src/formatters/job/dom.js

@@ -17,6 +17,7 @@ import { createBehaviourProfile } from "../../components/behaviour-profile.js";
 import { createCodeDisplay } from "../../components/code-display.js";
 import { markdownToHtml } from "../../lib/markdown.js";
 import { formatJobDescription } from "./description.js";
+import { createToolkitTable } from "../toolkit/dom.js";
 
 /**
  * Format job detail as DOM elements
@@ -77,14 +78,14 @@ export function jobToDOM(view, options = {}) {
     // Radar charts
     div(
       { className: "section auto-grid-lg" },
-      createSkillRadar(view.skillMatrix, {
-        title: "Skills Radar",
-        size: 420,
-      }),
       createBehaviourRadar(view.behaviourProfile, {
         title: "Behaviours Radar",
         size: 420,
       }),
+      createSkillRadar(view.skillMatrix, {
+        title: "Skills Radar",
+        size: 420,
+      }),
     ),
 
     // Job Description HTML (for print view)
@@ -104,21 +105,29 @@ export function jobToDOM(view, options = {}) {
         })
       : null,
 
-    // Skill matrix, Behaviour profile, Driver coverage tables
+    // Behaviour profile, Skill matrix, Toolkit, Driver coverage tables
     showTables
       ? div(
           { className: "job-tables-section" },
-          createDetailSection({
-            title: "Skill Matrix",
-            content: createSkillMatrix(view.skillMatrix),
-          }),
-
           // Behaviour profile table
           createDetailSection({
             title: "Behaviour Profile",
             content: createBehaviourProfile(view.behaviourProfile),
           }),
 
+          createDetailSection({
+            title: "Skill Matrix",
+            content: createSkillMatrix(view.skillMatrix),
+          }),
+
+          // Toolkit (after skill matrix)
+          view.toolkit && view.toolkit.length > 0
+            ? createDetailSection({
+                title: "Tool Kit",
+                content: createToolkitTable(view.toolkit),
+              })
+            : null,
+
           // Driver coverage
           view.driverCoverage.length > 0
             ? createDetailSection({

package/src/formatters/job/markdown.js

@@ -10,6 +10,7 @@ import {
 import { formatLevel } from "../../lib/render.js";
 import { formatJobDescription } from "./description.js";
 import { SKILL_LEVEL_ORDER } from "@forwardimpact/schema/levels";
+import { toolkitToMarkdown } from "../toolkit/markdown.js";
 
 /**
  * Format job detail as markdown
@@ -33,6 +34,15 @@ export function jobToMarkdown(view, entities = {}, jobTemplate) {
     lines.push("");
   }
 
+  // Behaviour Profile
+  lines.push("## Behaviour Profile", "");
+  const behaviourRows = view.behaviourProfile.map((b) => [
+    b.behaviourName,
+    formatLevel(b.maturity),
+  ]);
+  lines.push(tableToMarkdown(["Behaviour", "Maturity"], behaviourRows));
+  lines.push("");
+
   // Skill Matrix - sorted by level descending
   lines.push("## Skill Matrix", "");
   const sortedSkills = [...view.skillMatrix].sort((a, b) => {
@@ -50,14 +60,12 @@ export function jobToMarkdown(view, entities = {}, jobTemplate) {
   lines.push(tableToMarkdown(["Skill", "Level"], skillRows));
   lines.push("");
 
-  // Behaviour Profile
-  lines.push("## Behaviour Profile", "");
-  const behaviourRows = view.behaviourProfile.map((b) => [
-    b.behaviourName,
-    formatLevel(b.maturity),
-  ]);
-  lines.push(tableToMarkdown(["Behaviour", "Maturity"], behaviourRows));
-  lines.push("");
+  // Toolkit
+  if (view.toolkit && view.toolkit.length > 0) {
+    lines.push("## Tool Kit", "");
+    lines.push(toolkitToMarkdown(view.toolkit));
+    lines.push("");
+  }
 
   // Driver Coverage
   if (view.driverCoverage.length > 0) {

package/src/formatters/toolkit/dom.js

@@ -0,0 +1,75 @@
+/**
+ * Toolkit formatting for DOM/web output
+ *
+ * Displays a compact toolkit table showing tools with icons and descriptions.
+ */
+
+import {
+  div,
+  table,
+  thead,
+  tbody,
+  tr,
+  th,
+  td,
+  a,
+  span,
+} from "../../lib/render.js";
+import { createToolIcon } from "../../lib/card-mappers.js";
+
+/**
+ * Create a toolkit table for display in job/agent detail pages
+ * @param {Array<{name: string, description: string, url?: string, simpleIcon?: string, skillIds: string[]}>} toolkit - Derived toolkit entries
+ * @returns {HTMLElement}
+ */
+export function createToolkitTable(toolkit) {
+  if (!toolkit || toolkit.length === 0) {
+    return div({ className: "empty-state" }, "No tools in toolkit");
+  }
+
+  const rows = toolkit.map((tool) => {
+    const iconCell = tool.simpleIcon
+      ? td(
+          { className: "tool-icon-cell" },
+          createToolIcon(tool.simpleIcon, tool.name),
+        )
+      : td({ className: "tool-icon-cell" });
+
+    const nameContent = tool.url
+      ? a(
+          {
+            href: tool.url,
+            target: "_blank",
+            rel: "noopener noreferrer",
+            className: "tool-link",
+          },
+          tool.name,
+          span({ className: "external-icon" }, " ↗"),
+        )
+      : span({}, tool.name);
+
+    return tr(
+      {},
+      iconCell,
+      td({ className: "tool-name-cell" }, nameContent),
+      td({ className: "tool-description-cell" }, tool.description),
+    );
+  });
+
+  return div(
+    { className: "table-container" },
+    table(
+      { className: "table toolkit-table" },
+      thead(
+        {},
+        tr(
+          {},
+          th({ style: "width: 40px" }, ""),
+          th({}, "Tool"),
+          th({}, "Description"),
+        ),
+      ),
+      tbody({}, ...rows),
+    ),
+  );
+}

package/src/formatters/toolkit/markdown.js

@@ -0,0 +1,38 @@
+/**
+ * Toolkit formatting for markdown/CLI output
+ *
+ * Displays toolkit as a markdown table with tools, icons, and descriptions.
+ */
+
+import { tableToMarkdown } from "../shared.js";
+
+/**
+ * Format toolkit as markdown table
+ * @param {Array<{name: string, description: string, url?: string, simpleIcon?: string, skillIds: string[]}>} toolkit - Derived toolkit entries
+ * @returns {string}
+ */
+export function toolkitToMarkdown(toolkit) {
+  if (!toolkit || toolkit.length === 0) {
+    return "";
+  }
+
+  const rows = toolkit.map((tool) => {
+    const name = tool.url ? `[${tool.name}](${tool.url})` : tool.name;
+    return [name, tool.description];
+  });
+
+  return tableToMarkdown(["Tool", "Description"], rows);
+}
+
+/**
+ * Format toolkit as a plain list of tool names (for --tools flag)
+ * @param {Array<{name: string}>} toolkit - Derived toolkit entries
+ * @returns {string}
+ */
+export function toolkitToPlainList(toolkit) {
+  if (!toolkit || toolkit.length === 0) {
+    return "";
+  }
+
+  return toolkit.map((tool) => tool.name).join("\n");
+}

package/src/pages/agent-builder.js

@@ -27,7 +27,9 @@ import {
   generateSkillMd,
   deriveAgentSkills,
   deriveReferenceGrade,
-} from "@forwardimpact/model/agent";
+  deriveToolkit,
+  buildAgentIndex,
+} from "@forwardimpact/model";
 import {
   createSelectWithValue,
   createDisciplineSelect,
@@ -37,6 +39,8 @@ import { getStageEmoji } from "../formatters/stage/shared.js";
 import { formatAgentProfile } from "../formatters/agent/profile.js";
 import { formatAgentSkill } from "../formatters/agent/skill.js";
 import { createCodeDisplay } from "../components/code-display.js";
+import { createToolkitTable } from "../formatters/toolkit/dom.js";
+import { createDetailSection } from "../components/detail.js";
 
 /** All stages option value */
 const ALL_STAGES_VALUE = "all";
@@ -247,6 +251,15 @@ export async function renderAgentBuilder() {
     // Get reference grade for derivation
     const grade = deriveReferenceGrade(data.grades);
 
+    // Build agent index for all valid combinations
+    const agentIndex = buildAgentIndex({
+      disciplines: data.disciplines,
+      tracks: data.tracks,
+      stages,
+      agentDisciplines: agentData.disciplines,
+      agentTracks: agentData.tracks,
+    });
+
     // Build context for generation
     const context = {
       humanDiscipline,
@@ -262,6 +275,7 @@ export async function renderAgentBuilder() {
       vscodeSettings: agentData.vscodeSettings,
       devcontainer: agentData.devcontainer,
       templates,
+      agentIndex,
     };
 
     // Generate preview based on stage selection
@@ -439,6 +453,7 @@ function createAllStagesPreview(context) {
     vscodeSettings,
     devcontainer,
     templates,
+    agentIndex,
   } = context;
 
   // Generate all stage agents
@@ -469,6 +484,7 @@ function createAllStagesPreview(context) {
       agentTrack,
       capabilities,
       stages,
+      agentIndex,
     });
 
     return { stage, derived, profile };
@@ -488,6 +504,12 @@ function createAllStagesPreview(context) {
     .filter((skill) => skill?.agent)
     .map((skill) => generateSkillMd(skill, stages));
 
+  // Derive toolkit from agent skills
+  const toolkit = deriveToolkit({
+    skillMatrix: derivedSkills,
+    skills,
+  });
+
   return div(
     { className: "agent-deployment" },
 
@@ -533,6 +555,14 @@ function createAllStagesPreview(context) {
           ),
     ),
 
+    // Tool Kit section
+    toolkit.length > 0
+      ? createDetailSection({
+          title: `Tool Kit (${toolkit.length})`,
+          content: createToolkitTable(toolkit),
+        })
+      : null,
+
     // CLI hint
     createCliHint(humanDiscipline.id, humanTrack.id),
   );
@@ -559,6 +589,7 @@ function createSingleStagePreview(context, stage) {
     devcontainer,
     stages,
     templates,
+    agentIndex,
   } = context;
 
   // Derive stage agent
@@ -588,6 +619,7 @@ function createSingleStagePreview(context, stage) {
     agentTrack,
     capabilities,
     stages,
+    agentIndex,
   });
 
   // Get skills for this stage (using full derived skills)
@@ -603,6 +635,12 @@ function createSingleStagePreview(context, stage) {
     .filter((skill) => skill?.agent)
     .map((skill) => generateSkillMd(skill, stages));
 
+  // Derive toolkit from agent skills
+  const toolkit = deriveToolkit({
+    skillMatrix: derivedSkills,
+    skills,
+  });
+
   return div(
     { className: "agent-deployment" },
 
@@ -642,6 +680,14 @@ function createSingleStagePreview(context, stage) {
           ),
     ),
 
+    // Tool Kit section
+    toolkit.length > 0
+      ? createDetailSection({
+          title: `Tool Kit (${toolkit.length})`,
+          content: createToolkitTable(toolkit),
+        })
+      : null,
+
     // CLI hint
     createCliHint(humanDiscipline.id, humanTrack.id, stage.id),
   );

package/templates/agent.template.md

@@ -28,10 +28,27 @@ handoffs:
 ## Core Identity
 
 {{{identity}}}
+{{#priority}}
 
-{{#priority}} {{{priority}}}
+{{{priority}}}
+{{/priority}}
+{{#roleContext}}
 
-{{/priority}} {{#hasSkills}}
+## Role Context
+
+{{{roleContext}}}
+{{/roleContext}}
+{{#hasWorkingStyles}}
+
+## Working Style
+{{#workingStyles}}
+
+### {{title}}
+
+{{{content}}}
+{{/workingStyles}}
+{{/hasWorkingStyles}}
+{{#hasSkills}}
 
 ## Available Skills and Tools
 
@@ -47,26 +64,30 @@ and (3) trade-offs of the alternative.
 
 | Skill | Location | Use When |
 | ----- | -------- | -------- |
-
-{{#skillIndex}} | {{{name}}} | `.claude/skills/{{dirname}}/SKILL.md` |
-{{{useWhen}}} | {{/skillIndex}}
-
-{{/hasSkills}} {{#beforeMakingChanges.length}} Before making changes:
-
-{{#beforeMakingChanges}} {{index}}. {{{text}}} {{/beforeMakingChanges}}
-{{/beforeMakingChanges.length}}
-
-{{#delegation}}
-
-## Delegation
-
-{{{delegation}}} {{/delegation}}
-
-## Operational Context
-
-{{{operationalContext}}}
-
-{{{workingStyle}}} {{#beforeHandoff}}
+{{#skillIndex}}
+| {{{name}}} | `.claude/skills/{{dirname}}/SKILL.md` | {{{useWhen}}} |
+{{/skillIndex}}
+{{/hasSkills}}
+{{#hasAgentIndex}}
+
+## Available Sub-Agents for Delegation
+
+**IMPORTANT:** If you come across work that is not strictly within your
+speciality, then you must delegate the task using the `runSubagent` tool.
+
+You are part of a team of agents and should not carry out all work yourself.
+Rely on other agents around you that have a speciality better suited for
+individual tasks. If you choose to not delegate specialised work to a sub-agent,
+document in your output: (1) what the specialised work is, (2) the constraint
+preventing delegation and (3) trade-offs of the alternative.
+
+| Agent Name | Speciality | Description |
+| ---------- | ---------- | ----------- |
+{{#agentIndex}}
+| `{{id}}` | {{{name}}} | {{{description}}} |
+{{/agentIndex}}
+{{/hasAgentIndex}}
+{{#beforeHandoff}}
 
 ## Before Handoff
 
@@ -76,7 +97,6 @@ Before offering a handoff, verify and summarize completion of these items:
 
 When verified, summarize what was accomplished then offer the handoff. If items
 are incomplete, explain what remains.
-
 {{/beforeHandoff}}
 
 ## Return Format
@@ -87,10 +107,10 @@ When completing work (for handoff or as a subagent), provide:
 2. **Checklist status**: Items verified from Before Handoff section
 3. **Recommendation**: Ready for next stage, or needs more work
 
-{{#constraints.length}}
-
+{{#hasConstraints}}
 ## Constraints
 
 {{#constraints}}
-
-- {{{.}}} {{/constraints}} {{/constraints.length}}
+- {{{.}}}
+{{/constraints}}
+{{/hasConstraints}}

package/templates/job.template.md

@@ -1,41 +1,50 @@
 # {{{title}}}
 
 - **Level:** {{{gradeId}}}
-- **Experience:** {{{typicalExperienceRange}}} {{#trackName}}- **Track:**
-  {{{trackName}}} {{/trackName}}
+- **Experience:** {{{typicalExperienceRange}}}
+{{#hasTrack}}- **Track:** {{{trackName}}}
+{{/hasTrack}}
 
 ## ROLE SUMMARY
 
 {{{roleSummary}}}
+{{#hasTrackRoleContext}}
 
-{{#trackRoleContext}} {{{trackRoleContext}}}
+{{{trackRoleContext}}}
+{{/hasTrackRoleContext}}
+{{#hasExpectationsParagraph}}
 
-{{/trackRoleContext}} {{#expectationsParagraph}} {{{expectationsParagraph}}}
-
-{{/expectationsParagraph}}
+{{{expectationsParagraph}}}
+{{/hasExpectationsParagraph}}
+{{#hasResponsibilities}}
 
 ## ROLE RESPONSIBILITIES
 
 {{#responsibilities}}
-
-- **{{{capabilityName}}}:** {{{responsibility}}} {{/responsibilities}}
+- **{{{capabilityName}}}:** {{{responsibility}}}
+{{/responsibilities}}
+{{/hasResponsibilities}}
+{{#hasBehaviours}}
 
 ## ROLE BEHAVIOURS
 
 {{#behaviours}}
-
-- **{{{behaviourName}}}:** {{{maturityDescription}}} {{/behaviours}}
-
+- **{{{behaviourName}}}:** {{{maturityDescription}}}
+{{/behaviours}}
+{{/hasBehaviours}}
+{{#hasSkillLevels}}
 {{#skillLevels}}
 
 ## {{{levelHeading}}}
 
 {{#skills}}
-
-- **{{{skillName}}}:** {{{levelDescription}}} {{/skills}}
-
+- **{{{skillName}}}:** {{{levelDescription}}}
+{{/skills}}
 {{/skillLevels}}
+{{/hasSkillLevels}}
+{{#hasQualificationSummary}}
 
 ## QUALIFICATIONS
 
-{{#qualificationSummary}} {{{qualificationSummary}}} {{/qualificationSummary}}
+{{{qualificationSummary}}}
+{{/hasQualificationSummary}}

package/templates/skill.template.md

@@ -4,41 +4,50 @@ description: |
 {{#descriptionLines}}
   {{{.}}}
 {{/descriptionLines}}
-{{#useWhenLines.length}}
+{{#hasUseWhen}}
   **Use When:** {{#useWhenLines}}{{{.}}}{{/useWhenLines}}
-{{/useWhenLines.length}}
+{{/hasUseWhen}}
 ---
 
 # {{{title}}}
+{{#hasUseWhen}}
 
-{{#useWhenLines.length}} **Use This Skill When:**
-{{#useWhenLines}}{{{.}}}{{/useWhenLines}} {{/useWhenLines.length}}
+**Use This Skill When:**
+{{#useWhenLines}}{{{.}}}{{/useWhenLines}}
+{{/hasUseWhen}}
+{{#hasStages}}
 
 ## Stage Guidance
-
 {{#stages}}
 
 ### {{stageName}} Stage
 
 **Focus:** {{{focus}}}
 
-**Activities:** {{#activities}}
-
-- {{{.}}} {{/activities}}
+**Activities:**
+{{#activities}}
+- {{{.}}}
+{{/activities}}
 
-**Ready for {{nextStageName}} when:** {{#ready}}
+**Ready for {{nextStageName}} when:**
+{{#ready}}
+- [ ] {{{.}}}
+{{/ready}}
+{{/stages}}
+{{/hasStages}}
+{{#hasToolReferences}}
 
-- [ ] {{{.}}} {{/ready}} {{/stages}} {{#toolReferences.length}}
-
-## Recommended Tools
+# Recommended Tools
 
 | Tool | Use When |
 | ---- | -------- |
+{{#toolReferences}}
+| {{#url}}[{{{name}}}]({{{url}}}){{/url}}{{^url}}{{{name}}}{{/url}} | {{{useWhen}}} |
+{{/toolReferences}}
+{{/hasToolReferences}}
+{{#hasReference}}
 
-{{#toolReferences}} |
-{{#url}}[{{{name}}}]({{{url}}}){{/url}}{{^url}}{{{name}}}{{/url}} |
-{{{useWhen}}} | {{/toolReferences}} {{/toolReferences.length}} {{#reference}}
-
-## Reference
+# Reference
 
-{{{reference}}} {{/reference}}
+{{{reference}}}
+{{/hasReference}}