@forwardimpact/pathway 0.23.2 → 0.25.0

package/README.md

@@ -14,8 +14,8 @@ web experience and command line.
 
 - **Web application** — Interactive browser for jobs, skills, and career paths
 - **CLI tools** — Command-line access to all functionality
-- **Agent teams** — Generate VS Code Custom Agent teams (`.agent.md`) and skills
-  (`SKILL.md`)
+- **Agent teams** — Generate Claude Code agent teams (`.claude/agents/`) and
+  skills (`.claude/skills/`)
 - **Interview prep** — Build interview question sets by role
 - **Static site** — Export everything as a static site
 
@@ -30,7 +30,7 @@ npx fit-pathway skill --list
 npx fit-pathway job software_engineering senior --track=platform
 
 # Generate agent teams and skills
-npx fit-pathway agent software_engineering --track=platform --output=./.github/agents
+npx fit-pathway agent software_engineering --track=platform --output=.
 ```
 
 ## CLI Commands

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forwardimpact/pathway",
-  "version": "0.23.2",
+  "version": "0.25.0",
   "description": "Career progression web app and CLI for exploring roles and generating agent teams",
   "license": "Apache-2.0",
   "repository": {
@@ -40,8 +40,8 @@
     "./commands": "./src/commands/index.js"
   },
   "dependencies": {
-    "@forwardimpact/map": "^0.13.0",
-    "@forwardimpact/libskill": "^3.0.0",
+    "@forwardimpact/map": "^0.14.0",
+    "@forwardimpact/libskill": "^4.0.0",
     "@forwardimpact/libtemplate": "^0.2.0",
     "@forwardimpact/libui": "^1.0.0",
     "mustache": "^4.2.0",

package/src/commands/agent.js

@@ -2,7 +2,8 @@
  * Agent Command
  *
  * CLI command for generating AI coding agent configurations
- * from Engineering Pathway data.
+ * from Engineering Pathway data. Outputs follow the Claude Code
+ * agent specification.
  *
  * All agents are stage-specific. Use --stage for a single stage
  * or --all-stages (default) for all stages.
@@ -26,7 +27,6 @@
 import { writeFile, mkdir, readFile } from "fs/promises";
 import { join, dirname } from "path";
 import { existsSync } from "fs";
-import { stringify as stringifyYaml } from "yaml";
 import { createDataLoader } from "@forwardimpact/map/loader";
 import {
   generateStageAgentProfile,
@@ -36,7 +36,6 @@ import {
   deriveAgentSkills,
   generateSkillMarkdown,
   deriveToolkit,
-  buildAgentIndex,
   getDisciplineAbbreviation,
   toKebabCase,
 } from "@forwardimpact/libskill";
@@ -58,13 +57,13 @@ async function ensureDir(filePath) {
 }
 
 /**
- * Generate VS Code settings file with required settings
+ * Generate Claude Code settings file
  * Merges with existing settings if file exists
  * @param {string} baseDir - Base output directory
- * @param {Object} vscodeSettings - Settings loaded from data
+ * @param {Object} claudeCodeSettings - Settings loaded from data
  */
-async function generateVSCodeSettings(baseDir, vscodeSettings) {
-  const settingsPath = join(baseDir, ".vscode", "settings.json");
+async function generateClaudeCodeSettings(baseDir, claudeCodeSettings) {
+  const settingsPath = join(baseDir, ".claude", "settings.json");
 
   let settings = {};
   if (existsSync(settingsPath)) {
@@ -72,7 +71,7 @@ async function generateVSCodeSettings(baseDir, vscodeSettings) {
     settings = JSON.parse(content);
   }
 
-  const merged = { ...settings, ...vscodeSettings };
+  const merged = { ...settings, ...claudeCodeSettings };
 
   await ensureDir(settingsPath);
   await writeFile(
@@ -83,64 +82,6 @@ async function generateVSCodeSettings(baseDir, vscodeSettings) {
   console.log(formatSuccess(`Updated: ${settingsPath}`));
 }
 
-/**
- * Generate devcontainer.json from template with VS Code settings embedded
- * @param {string} baseDir - Base output directory
- * @param {Object} devcontainerConfig - Devcontainer config loaded from data
- * @param {Object} vscodeSettings - VS Code settings to embed in customizations
- */
-async function generateDevcontainer(
-  baseDir,
-  devcontainerConfig,
-  vscodeSettings,
-) {
-  if (!devcontainerConfig || Object.keys(devcontainerConfig).length === 0) {
-    return;
-  }
-
-  const devcontainerPath = join(baseDir, ".devcontainer", "devcontainer.json");
-
-  // Build devcontainer.json with VS Code settings embedded
-  const devcontainer = {
-    ...devcontainerConfig,
-    customizations: {
-      vscode: {
-        settings: vscodeSettings,
-      },
-    },
-  };
-
-  await ensureDir(devcontainerPath);
-  await writeFile(
-    devcontainerPath,
-    JSON.stringify(devcontainer, null, 2) + "\n",
-    "utf-8",
-  );
-  console.log(formatSuccess(`Created: ${devcontainerPath}`));
-}
-
-/**
- * Generate GitHub Actions workflow for Copilot Coding Agent setup steps
- * @param {string} baseDir - Base output directory
- * @param {Object|null} copilotSetupSteps - Workflow config loaded from data
- */
-async function generateCopilotSetupSteps(baseDir, copilotSetupSteps) {
-  if (!copilotSetupSteps) {
-    return;
-  }
-
-  const workflowPath = join(
-    baseDir,
-    ".github",
-    "workflows",
-    "copilot-setup-steps.yml",
-  );
-
-  await ensureDir(workflowPath);
-  await writeFile(workflowPath, stringifyYaml(copilotSetupSteps), "utf-8");
-  console.log(formatSuccess(`Created: ${workflowPath}`));
-}
-
 /**
  * Show agent summary with stats
  * @param {Object} data - Pathway data
@@ -258,7 +199,7 @@ function listAgentCombinations(data, agentData, verbose = false) {
  * @param {string} template - Mustache template for agent profile
  */
 async function writeProfile(profile, baseDir, template) {
-  const profilePath = join(baseDir, ".github", "agents", profile.filename);
+  const profilePath = join(baseDir, ".claude", "agents", profile.filename);
   const profileContent = formatAgentProfile(profile, template);
   await ensureDir(profilePath);
   await writeFile(profilePath, profileContent, "utf-8");
@@ -451,15 +392,6 @@ export async function runAgentCommand({
 
   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,
@@ -471,7 +403,6 @@ export async function runAgentCommand({
     agentDiscipline,
     agentTrack,
     stages: data.stages,
-    agentIndex,
   };
 
   // Handle --stage flag for single stage agent
@@ -508,13 +439,7 @@ export async function runAgentCommand({
     }
 
     await writeProfile(profile, baseDir, agentTemplate);
-    await generateVSCodeSettings(baseDir, agentData.vscodeSettings);
-    await generateDevcontainer(
-      baseDir,
-      agentData.devcontainer,
-      agentData.vscodeSettings,
-    );
-    await generateCopilotSetupSteps(baseDir, agentData.copilotSetupSteps);
+    await generateClaudeCodeSettings(baseDir, agentData.claudeCodeSettings);
     console.log("");
     console.log(
       formatSuccess(`Generated stage agent: ${profile.frontmatter.name}`),
@@ -522,8 +447,7 @@ export async function runAgentCommand({
     return;
   }
 
-  // Default behavior: generate all stage agents (or single stage if --stage specified)
-  // No generic agents - all agents are stage-specific
+  // Default behavior: generate all stage agents
   const profiles = [];
 
   // Generate all stage agents
@@ -603,13 +527,7 @@ export async function runAgentCommand({
     await writeProfile(profile, baseDir, agentTemplate);
   }
   const fileCount = await writeSkills(skillFiles, baseDir, skillTemplates);
-  await generateVSCodeSettings(baseDir, agentData.vscodeSettings);
-  await generateDevcontainer(
-    baseDir,
-    agentData.devcontainer,
-    agentData.vscodeSettings,
-  );
-  await generateCopilotSetupSteps(baseDir, agentData.copilotSetupSteps);
+  await generateClaudeCodeSettings(baseDir, agentData.claudeCodeSettings);
 
   console.log("");
   console.log(formatSuccess(`Generated ${profiles.length} agents:`));

package/src/commands/build.js

@@ -160,6 +160,24 @@ ${framework.emojiIcon} Generating ${framework.title} static site...
   });
   console.log(`   ✓ ui/lib + ui/css`);
 
+  // Copy vendor dependencies for offline usage
+  console.log("📦 Copying vendor dependencies...");
+  const vendorDir = join(outputDir, "vendor");
+  await mkdir(vendorDir, { recursive: true });
+
+  // mustache (ESM module)
+  const mustacheSrc = fileURLToPath(import.meta.resolve("mustache"));
+  const mustacheMjs = join(dirname(mustacheSrc), "mustache.mjs");
+  await cp(mustacheMjs, join(vendorDir, "mustache.mjs"));
+  console.log("   ✓ vendor/mustache.mjs");
+
+  // yaml (browser ESM build — not in package exports, resolve via filesystem)
+  // import.meta.resolve("yaml") → .../yaml/dist/index.js, go up two levels
+  const yamlPkg = dirname(dirname(fileURLToPath(import.meta.resolve("yaml"))));
+  const yamlBrowserDist = join(yamlPkg, "browser", "dist");
+  await cp(yamlBrowserDist, join(vendorDir, "yaml"), { recursive: true });
+  console.log("   ✓ vendor/yaml/");
+
   // Copy data directory (dereference symlinks to copy actual content)
   console.log("📁 Copying data files...");
   const dataOutputDir = join(outputDir, "data");

package/src/commands/dev.js

@@ -34,10 +34,19 @@ const mapLibDir = resolvePackageLib("@forwardimpact/map");
 const modelLibDir = resolvePackageLib("@forwardimpact/libskill");
 const uiLibDir = resolvePackageLib("@forwardimpact/libui");
 
+// Vendor dependencies — mirror the paths that build.js copies to vendor/
+const mustacheDir = dirname(fileURLToPath(import.meta.resolve("mustache")));
+const yamlBrowserDir = join(
+  dirname(dirname(fileURLToPath(import.meta.resolve("yaml")))),
+  "browser",
+  "dist",
+);
+
 const MIME_TYPES = {
   ".html": "text/html; charset=utf-8",
   ".css": "text/css; charset=utf-8",
   ".js": "application/javascript; charset=utf-8",
+  ".mjs": "application/javascript; charset=utf-8",
   ".yaml": "text/yaml; charset=utf-8",
   ".yml": "text/yaml; charset=utf-8",
   ".json": "application/json; charset=utf-8",
@@ -149,6 +158,12 @@ export async function runDevCommand({ dataDir, options }) {
     } else if (pathname.startsWith("/ui/css/")) {
       // Serve @forwardimpact/libui package CSS files
       filePath = join(uiLibDir, "css", pathname.slice(8));
+    } else if (pathname === "/vendor/mustache.mjs") {
+      // Serve vendored mustache ESM module
+      filePath = join(mustacheDir, "mustache.mjs");
+    } else if (pathname.startsWith("/vendor/yaml/")) {
+      // Serve vendored yaml browser ESM build
+      filePath = join(yamlBrowserDir, pathname.slice(13));
     } else if (pathname === "/" || pathname === "") {
       // Serve index.html for root
       filePath = join(publicDir, "index.html");

package/src/components/skill-matrix.js

@@ -22,17 +22,20 @@ import { SKILL_PROFICIENCY_ORDER } from "@forwardimpact/map/levels";
 import { truncate } from "../formatters/shared.js";
 
 /**
- * Sort skills by level descending (expert first), then alphabetically
+ * Sort skills by capability group order, then by level descending within each group
  * @param {SkillMatrixItem[]} skills
+ * @param {string[]} capabilityOrder - Ordered capability IDs
  * @returns {SkillMatrixItem[]}
  */
-function sortByLevelDescending(skills) {
+function sortByCapabilityThenLevel(skills, capabilityOrder) {
+  const orderMap = new Map(capabilityOrder.map((id, i) => [id, i]));
   return [...skills].sort((a, b) => {
-    const levelA = SKILL_PROFICIENCY_ORDER.indexOf(a.level);
-    const levelB = SKILL_PROFICIENCY_ORDER.indexOf(b.level);
-    if (levelB !== levelA) {
-      return levelB - levelA;
-    }
+    const capA = orderMap.has(a.capability) ? orderMap.get(a.capability) : capabilityOrder.length;
+    const capB = orderMap.has(b.capability) ? orderMap.get(b.capability) : capabilityOrder.length;
+    if (capA !== capB) return capA - capB;
+    const levelA = SKILL_PROFICIENCY_ORDER.indexOf(a.proficiency);
+    const levelB = SKILL_PROFICIENCY_ORDER.indexOf(b.proficiency);
+    if (levelB !== levelA) return levelB - levelA;
     return a.skillName.localeCompare(b.skillName);
   });
 }
@@ -40,14 +43,19 @@ function sortByLevelDescending(skills) {
 /**
  * Create a skill matrix table
  * @param {SkillMatrixItem[]} skillMatrix - Skill matrix entries
+ * @param {Object} [options]
+ * @param {string[]} [options.capabilityOrder] - Capability IDs in desired display order
  * @returns {HTMLElement}
  */
-export function createSkillMatrix(skillMatrix) {
+export function createSkillMatrix(skillMatrix, options = {}) {
   if (!skillMatrix || skillMatrix.length === 0) {
     return div({ className: "empty-state" }, "No skills in matrix");
   }
 
-  const sortedSkills = sortByLevelDescending(skillMatrix);
+  const { capabilityOrder } = options;
+  const sortedSkills = capabilityOrder
+    ? sortByCapabilityThenLevel(skillMatrix, capabilityOrder)
+    : [...skillMatrix];
 
   const rows = sortedSkills.map((skill) => {
     const levelIndex = getSkillProficiencyIndex(skill.proficiency);

package/src/formatters/agent/dom.js

@@ -17,14 +17,14 @@ import { getStageEmoji } from "../stage/shared.js";
  * @param {Object} deployment.profile - Agent profile
  * @param {Array} deployment.skills - Agent skills
  * @param {Array} [deployment.roleAgents] - Role variant agents (plan, review)
- * @param {Object} [deployment.vscodeSettings] - VS Code settings to include in download
+ * @param {Object} [deployment.claudeCodeSettings] - Claude Code settings to include in download
  * @returns {HTMLElement}
  */
 export function agentDeploymentToDOM({
   profile,
   skills,
   roleAgents = [],
-  vscodeSettings = {},
+  claudeCodeSettings = {},
 }) {
   const profileContent = formatAgentProfile(profile);
   const agentName = profile.frontmatter.name;
@@ -37,7 +37,7 @@ export function agentDeploymentToDOM({
       profile,
       skills,
       roleAgents,
-      vscodeSettings,
+      claudeCodeSettings,
       agentName,
     ),
 
@@ -90,7 +90,7 @@ export function agentDeploymentToDOM({
  * @param {Object} profile - Agent profile
  * @param {Array} skills - Agent skills
  * @param {Array} roleAgents - Role variant agents
- * @param {Object} vscodeSettings - VS Code settings to include
+ * @param {Object} claudeCodeSettings - Claude Code settings to include
  * @param {string} agentName - Agent name for zip filename
  * @returns {HTMLElement}
  */
@@ -98,7 +98,7 @@ function createDownloadButton(
   profile,
   skills,
   roleAgents,
-  vscodeSettings,
+  claudeCodeSettings,
   agentName,
 ) {
   const btn = button(
@@ -115,7 +115,7 @@ function createDownloadButton(
         profile,
         skills,
         roleAgents,
-        vscodeSettings,
+        claudeCodeSettings,
         agentName,
       );
     } finally {
@@ -167,28 +167,28 @@ function createRoleAgentCard(agent) {
  * @param {Object} profile - Agent profile
  * @param {Array} skills - Agent skills
  * @param {Array} roleAgents - Role variant agents
- * @param {Object} vscodeSettings - VS Code settings to include
+ * @param {Object} claudeCodeSettings - Claude Code settings to include
  * @param {string} agentName - Agent name for zip filename
  */
 async function downloadAllAsZip(
   profile,
   skills,
   roleAgents,
-  vscodeSettings,
+  claudeCodeSettings,
   agentName,
 ) {
   // Dynamically import JSZip
   const JSZip = await importJSZip();
   const zip = new JSZip();
 
-  // Add main profile to .github/agents/ folder
+  // Add main profile to .claude/agents/ folder
   const profileContent = formatAgentProfile(profile);
-  zip.file(`.github/agents/${profile.filename}`, profileContent);
+  zip.file(`.claude/agents/${profile.filename}`, profileContent);
 
-  // Add role agent profiles to .github/agents/ folder
+  // Add role agent profiles to .claude/agents/ folder
   for (const roleAgent of roleAgents) {
     const roleContent = formatAgentProfile(roleAgent);
-    zip.file(`.github/agents/${roleAgent.filename}`, roleContent);
+    zip.file(`.claude/agents/${roleAgent.filename}`, roleContent);
   }
 
   // Add skills to .claude/skills/ folder
@@ -197,11 +197,11 @@ async function downloadAllAsZip(
     zip.file(`.claude/skills/${skill.dirname}/SKILL.md`, skillContent);
   }
 
-  // Add VS Code settings for multi-agent features
-  if (Object.keys(vscodeSettings).length > 0) {
+  // Add Claude Code settings
+  if (Object.keys(claudeCodeSettings).length > 0) {
     zip.file(
-      ".vscode/settings.json",
-      JSON.stringify(vscodeSettings, null, 2) + "\n",
+      ".claude/settings.json",
+      JSON.stringify(claudeCodeSettings, null, 2) + "\n",
     );
   }
 
@@ -235,13 +235,12 @@ async function importJSZip() {
  * @param {Object} profile - Generated profile with frontmatter and body
  * @param {Object} options - Options
  * @param {Array} [options.stages] - All stages for emoji lookup
- * @param {Object} [options.vscodeSettings] - VS Code settings for download
+ * @param {Object} [options.claudeCodeSettings] - Claude Code settings for download
  * @returns {HTMLElement}
  */
 export function stageAgentToDOM(stageAgent, profile, options = {}) {
-  const { vscodeSettings = {}, stages = [] } = options;
-  const { stage, tools, handoffs, constraints, checklist, derivedSkills } =
-    stageAgent;
+  const { claudeCodeSettings = {}, stages = [] } = options;
+  const { stage, tools, constraints, checklist, derivedSkills } = stageAgent;
   const stageEmoji = getStageEmoji(stages, stage.id);
   const profileContent = formatAgentProfile(profile);
 
@@ -287,25 +286,6 @@ export function stageAgentToDOM(stageAgent, profile, options = {}) {
         )
       : null,
 
-    // Handoffs section
-    handoffs.length > 0
-      ? section(
-          { className: "agent-section" },
-          h3({}, "Handoffs"),
-          div(
-            { className: "handoff-buttons" },
-            ...handoffs.map((h) => {
-              const targetEmoji = getStageEmoji(stages, h.target);
-              return div(
-                { className: "handoff-button-preview" },
-                span({ className: "handoff-icon" }, targetEmoji),
-                span({ className: "handoff-label" }, h.label),
-              );
-            }),
-          ),
-        )
-      : null,
-
     // Checklist section
     checklist.length > 0
       ? section(
@@ -353,7 +333,7 @@ export function stageAgentToDOM(stageAgent, profile, options = {}) {
     ),
 
     // Download button
-    createStageAgentDownloadButton(profile, vscodeSettings),
+    createStageAgentDownloadButton(profile, claudeCodeSettings),
   );
 }
 
@@ -387,10 +367,10 @@ function createChecklistPreview(checklist) {
 /**
  * Create download button for stage agent
  * @param {Object} profile - Agent profile
- * @param {Object} vscodeSettings - VS Code settings
+ * @param {Object} claudeCodeSettings - Claude Code settings
  * @returns {HTMLElement}
  */
-function createStageAgentDownloadButton(profile, vscodeSettings) {
+function createStageAgentDownloadButton(profile, claudeCodeSettings) {
   const btn = button(
     { className: "btn btn-primary download-all-btn" },
     "📥 Download Agent Profile",
@@ -406,13 +386,13 @@ function createStageAgentDownloadButton(profile, vscodeSettings) {
 
       // Add profile
       const profileContent = formatAgentProfile(profile);
-      zip.file(`.github/agents/${profile.filename}`, profileContent);
+      zip.file(`.claude/agents/${profile.filename}`, profileContent);
 
-      // Add VS Code settings
-      if (Object.keys(vscodeSettings).length > 0) {
+      // Add Claude Code settings
+      if (Object.keys(claudeCodeSettings).length > 0) {
         zip.file(
-          ".vscode/settings.json",
-          JSON.stringify(vscodeSettings, null, 2) + "\n",
+          ".claude/settings.json",
+          JSON.stringify(claudeCodeSettings, null, 2) + "\n",
         );
       }
 

package/src/formatters/agent/profile.js

@@ -1,8 +1,8 @@
 /**
  * Agent Profile Formatter
  *
- * Formats agent profile data into .agent.md file content
- * following the GitHub Copilot Custom Agents specification.
+ * Formats agent profile data into .md file content
+ * following the Claude Code agent specification.
  *
  * Uses Mustache templates for flexible output formatting.
  * Templates are loaded from data/ directory with fallback to templates/ directory.
@@ -11,10 +11,7 @@
 import Mustache from "mustache";
 
 import { trimValue, trimRequired, trimFields } from "../shared.js";
-import {
-  flattenToLine,
-  preprocessArrayFrontmatter,
-} from "../template-preprocess.js";
+import { flattenToLine } from "../template-preprocess.js";
 
 /**
  * @typedef {Object} WorkingStyleEntry
@@ -29,8 +26,8 @@ import {
  * @param {Object} params.frontmatter - YAML frontmatter data
  * @param {string} params.frontmatter.name - Agent name
  * @param {string} params.frontmatter.description - Agent description
- * @param {boolean} params.frontmatter.infer - Whether to auto-select
- * @param {Array} [params.frontmatter.handoffs] - Handoff definitions
+ * @param {string} params.frontmatter.model - Claude Code model (sonnet, opus, haiku)
+ * @param {string[]} params.frontmatter.skills - Skill dirnames for auto-loading
  * @param {Object} params.bodyData - Structured body data
  * @param {string} params.bodyData.title - Agent title
  * @param {string} params.bodyData.stageDescription - Stage description text
@@ -43,41 +40,51 @@ import {
  * @param {string} params.bodyData.roleContext - Role context text
  * @param {WorkingStyleEntry[]} params.bodyData.workingStyles - Working style entries
  * @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
+ * @param {Array<{targetStageName: string, summaryInstruction: string, entryCriteria: string[]}>} params.bodyData.stageTransitions - Stage transition definitions
  * @returns {Object} Data object ready for Mustache template
  */
 function prepareAgentProfileData({ frontmatter, bodyData }) {
-  // Preprocess handoffs - flatten prompt field for front matter compatibility
-  const preprocessedHandoffs = preprocessArrayFrontmatter(
-    frontmatter.handoffs,
-    ["prompt"],
+  const stageConstraints = (bodyData.stageConstraints || []).map((c) =>
+    trimRequired(c),
+  );
+  const disciplineConstraints = (bodyData.disciplineConstraints || []).map(
+    (c) => trimRequired(c),
+  );
+  const trackConstraints = (bodyData.trackConstraints || []).map((c) =>
+    trimRequired(c),
+  );
+  const returnFormat = (bodyData.returnFormat || []).map((r) =>
+    trimRequired(r),
   );
-  // Then trim as before
-  const handoffs = trimFields(preprocessedHandoffs, { prompt: "required" });
-
-  const constraints = (bodyData.constraints || []).map((c) => trimRequired(c));
   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",
   });
 
+  // Prepare stage transitions for body rendering
+  const stageTransitions = (bodyData.stageTransitions || []).map((t) => ({
+    targetStageName: t.targetStageName,
+    summaryInstruction: trimValue(t.summaryInstruction),
+    entryCriteria: (t.entryCriteria || []).map((c) => trimRequired(c)),
+    hasEntryCriteria: (t.entryCriteria || []).length > 0,
+  }));
+
+  const hasConstraints =
+    stageConstraints.length > 0 ||
+    disciplineConstraints.length > 0 ||
+    trackConstraints.length > 0;
+
   return {
-    // Frontmatter - flatten description for single-line front matter
+    // Frontmatter
     name: frontmatter.name,
     description: flattenToLine(frontmatter.description),
-    infer: frontmatter.infer,
-    handoffs,
+    model: frontmatter.model,
+    skills: frontmatter.skills,
 
     // Body data - trim all string fields
     title: bodyData.title,
@@ -92,22 +99,28 @@ function prepareAgentProfileData({ frontmatter, bodyData }) {
     roleContext: trimValue(bodyData.roleContext),
     workingStyles,
     hasWorkingStyles: workingStyles.length > 0,
-    constraints,
-    hasConstraints: constraints.length > 0,
-    agentIndex,
-    hasAgentIndex: agentIndex.length > 0,
+    stageConstraints,
+    disciplineConstraints,
+    trackConstraints,
+    hasStageConstraints: stageConstraints.length > 0,
+    hasDisciplineOrTrackConstraints:
+      disciplineConstraints.length > 0 || trackConstraints.length > 0,
+    hasConstraints,
+    returnFormat,
+    hasReturnFormat: returnFormat.length > 0,
+    stageTransitions,
+    hasStageTransitions: stageTransitions.length > 0,
   };
 }
 
 /**
- * Format agent profile as .agent.md file content using Mustache template
+ * Format agent profile as .md file content using Mustache template
  * @param {Object} profile - Profile with frontmatter and bodyData
  * @param {Object} profile.frontmatter - YAML frontmatter data
  * @param {string} profile.frontmatter.name - Agent name
  * @param {string} profile.frontmatter.description - Agent description
- * @param {string[]} profile.frontmatter.tools - Available tools
- * @param {boolean} profile.frontmatter.infer - Whether to auto-select
- * @param {Array} [profile.frontmatter.handoffs] - Handoff definitions
+ * @param {string} profile.frontmatter.model - Claude Code model
+ * @param {string[]} profile.frontmatter.skills - Skill dirnames
  * @param {Object} profile.bodyData - Structured body data
  * @param {string} profile.bodyData.title - Agent title (e.g. "Software Engineering - Platform - Plan Agent")
  * @param {string} profile.bodyData.stageDescription - Stage description text
@@ -117,8 +130,9 @@ function prepareAgentProfileData({ frontmatter, bodyData }) {
  * @param {string} profile.bodyData.roleContext - Role context text
  * @param {WorkingStyleEntry[]} profile.bodyData.workingStyles - Working style entries
  * @param {string[]} profile.bodyData.constraints - List of constraints
+ * @param {Array} profile.bodyData.stageTransitions - Stage transitions for body section
  * @param {string} template - Mustache template string
- * @returns {string} Complete .agent.md file content
+ * @returns {string} Complete .md file content
  */
 export function formatAgentProfile({ frontmatter, bodyData }, template) {
   const data = prepareAgentProfileData({ frontmatter, bodyData });

package/src/formatters/job/dom.js

@@ -2,7 +2,7 @@
  * Job formatting for DOM/web output
  */
 
-import { div, h1, h2, p, a, span, section } from "../../lib/render.js";
+import { div, h1, h2, a, section } from "../../lib/render.js";
 import { createBackLink } from "../../components/nav.js";
 import {
   createDetailSection,
@@ -117,7 +117,9 @@ export function jobToDOM(view, options = {}) {
 
           createDetailSection({
             title: "Skill Matrix",
-            content: createSkillMatrix(view.skillMatrix),
+            content: createSkillMatrix(view.skillMatrix, {
+              capabilityOrder: view.capabilityOrder,
+            }),
           }),
 
           // Toolkit (after skill matrix)
@@ -127,21 +129,6 @@ export function jobToDOM(view, options = {}) {
                 content: createToolkitTable(view.toolkit),
               })
             : null,
-
-          // Driver coverage
-          view.driverCoverage.length > 0
-            ? createDetailSection({
-                title: "Driver Coverage",
-                content: div(
-                  {},
-                  p(
-                    { className: "text-muted", style: "margin-bottom: 1rem" },
-                    "How well this job aligns with organizational outcome drivers.",
-                  ),
-                  createDriverCoverageDisplay(view.driverCoverage),
-                ),
-              })
-            : null,
         )
       : null,
 
@@ -164,48 +151,6 @@ export function jobToDOM(view, options = {}) {
   );
 }
 
-/**
- * Create driver coverage display
- */
-function createDriverCoverageDisplay(coverage) {
-  const items = coverage.map((c) => {
-    const percentage = Math.round(c.coverage * 100);
-
-    return div(
-      { className: "driver-coverage-item" },
-      div(
-        { className: "driver-coverage-header" },
-        a(
-          {
-            href: `#/driver/${c.id}`,
-            className: "driver-coverage-name",
-          },
-          c.name,
-        ),
-        span({ className: "driver-coverage-score" }, `${percentage}%`),
-      ),
-      div(
-        { className: "progress-bar" },
-        div({
-          className: "progress-bar-fill",
-          style: `width: ${percentage}%; background: ${getScoreColor(c.coverage)}`,
-        }),
-      ),
-    );
-  });
-
-  return div({ className: "driver-coverage" }, ...items);
-}
-
-/**
- * Get color based on score
- */
-function getScoreColor(score) {
-  if (score >= 0.8) return "#10b981"; // Green
-  if (score >= 0.5) return "#f59e0b"; // Yellow
-  return "#ef4444"; // Red
-}
-
 /**
  * Create the job description section with copy button
  * @param {Object} params
@@ -243,6 +188,7 @@ export function createJobDescriptionSection({
         "Copy this markdown-formatted job description for use in job postings, documentation, or sharing.",
       toHtml: markdownToHtml,
       minHeight: 450,
+      open: true,
     }),
   );
 }

package/src/handout.html

@@ -8,7 +8,7 @@
     <script type="importmap">
       {
         "imports": {
-          "mustache": "https://esm.sh/mustache@4.2.0",
+          "mustache": "/vendor/mustache.mjs",
           "@forwardimpact/map": "/map/lib/index.js",
           "@forwardimpact/map/levels": "/map/lib/levels.js",
           "@forwardimpact/map/loader": "/map/lib/loader.js",

package/src/index.html

@@ -15,12 +15,18 @@
       href="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/themes/prism.min.css"
     />
     <link rel="stylesheet" href="css/bundles/app.css" />
-    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/prism.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/components/prism-markdown.min.js"></script>
+    <script
+      src="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/prism.min.js"
+      defer
+    ></script>
+    <script
+      src="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/components/prism-markdown.min.js"
+      defer
+    ></script>
     <script type="importmap">
       {
         "imports": {
-          "mustache": "https://esm.sh/mustache@4.2.0",
+          "mustache": "/vendor/mustache.mjs",
           "@forwardimpact/map": "/map/lib/index.js",
           "@forwardimpact/map/levels": "/map/lib/levels.js",
           "@forwardimpact/map/loader": "/map/lib/loader.js",

package/src/lib/yaml-loader.js

@@ -287,27 +287,15 @@ export async function loadAllData(dataDir = "./data") {
  * @returns {Promise<Object>}
  */
 export async function loadAgentDataBrowser(dataDir = "./data") {
-  const [
-    disciplines,
-    tracks,
-    behaviours,
-    vscodeSettings,
-    devcontainer,
-    copilotSetupSteps,
-  ] = await Promise.all([
-    loadDisciplinesFromDir(`${dataDir}/disciplines`),
-    loadTracksFromDir(`${dataDir}/tracks`),
-    loadBehavioursFromDir(`${dataDir}/behaviours`),
-    tryLoadYamlFile(`${dataDir}/repository/vscode-settings.yaml`).then(
-      (r) => r ?? tryLoadYamlFile(`${dataDir}/vscode-settings.yaml`),
-    ),
-    tryLoadYamlFile(`${dataDir}/repository/devcontainer.yaml`).then(
-      (r) => r ?? tryLoadYamlFile(`${dataDir}/devcontainer.yaml`),
-    ),
-    tryLoadYamlFile(`${dataDir}/repository/copilot-setup-steps.yaml`).then(
-      (r) => r ?? tryLoadYamlFile(`${dataDir}/copilot-setup-steps.yaml`),
-    ),
-  ]);
+  const [disciplines, tracks, behaviours, claudeCodeSettings] =
+    await Promise.all([
+      loadDisciplinesFromDir(`${dataDir}/disciplines`),
+      loadTracksFromDir(`${dataDir}/tracks`),
+      loadBehavioursFromDir(`${dataDir}/behaviours`),
+      tryLoadYamlFile(`${dataDir}/repository/claude-code-settings.yaml`).then(
+        (r) => r ?? tryLoadYamlFile(`${dataDir}/claude-code-settings.yaml`),
+      ),
+    ]);
 
   return {
     disciplines: disciplines
@@ -319,8 +307,6 @@ export async function loadAgentDataBrowser(dataDir = "./data") {
     behaviours: behaviours
       .filter((b) => b.agent)
       .map((b) => ({ id: b.id, ...b.agent })),
-    vscodeSettings: vscodeSettings || {},
-    devcontainer: devcontainer || {},
-    copilotSetupSteps: copilotSetupSteps || null,
+    claudeCodeSettings: claudeCodeSettings || {},
   };
 }

package/src/main.js

@@ -50,6 +50,7 @@ async function init() {
   // Load data
   try {
     const data = await loadAllData("./data");
+    data.disciplines = data.disciplines.filter((d) => !d.hidden);
     setData(data);
 
     // Populate branding from framework data

package/src/pages/agent-builder.js

@@ -28,7 +28,6 @@ import {
   deriveAgentSkills,
   deriveReferenceLevel,
   deriveToolkit,
-  buildAgentIndex,
 } from "@forwardimpact/libskill";
 import {
   createSelectWithValue,
@@ -259,15 +258,6 @@ export async function renderAgentBuilder() {
     // Get reference level for derivation
     const level = deriveReferenceLevel(data.levels);
 
-    // 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,
@@ -279,10 +269,8 @@ export async function renderAgentBuilder() {
       skills: data.skills,
       behaviours: data.behaviours,
       agentBehaviours: agentData.behaviours,
-      vscodeSettings: agentData.vscodeSettings,
-      devcontainer: agentData.devcontainer,
+      claudeCodeSettings: agentData.claudeCodeSettings,
       templates,
-      agentIndex,
     };
 
     // Generate preview based on stage selection
@@ -316,7 +304,7 @@ export async function renderAgentBuilder() {
       p(
         { className: "page-description" },
         "Generate coding agent teams from discipline × track × stage combinations. " +
-          "Export complete agent profiles and skill files for GitHub Copilot.",
+          "Export complete agent profiles and skill files for Claude Code.",
       ),
     ),
 
@@ -456,10 +444,8 @@ function createAllStagesPreview(context) {
     skills,
     behaviours,
     agentBehaviours,
-    vscodeSettings,
-    devcontainer,
+    claudeCodeSettings,
     templates,
-    agentIndex,
   } = context;
 
   // Generate all stage agents
@@ -474,7 +460,6 @@ function createAllStagesPreview(context) {
       agentBehaviours,
       agentDiscipline,
       agentTrack,
-      stages,
     });
 
     const profile = generateStageAgentProfile({
@@ -488,7 +473,6 @@ function createAllStagesPreview(context) {
       agentDiscipline,
       agentTrack,
       stages,
-      agentIndex,
     });
 
     return { stage, derived, profile };
@@ -521,8 +505,7 @@ function createAllStagesPreview(context) {
     createDownloadAllButton(
       stageAgents,
       skillFiles,
-      vscodeSettings,
-      devcontainer,
+      claudeCodeSettings,
       context,
     ),
 
@@ -532,7 +515,7 @@ function createAllStagesPreview(context) {
       h2({}, `Agents (${stageAgents.length})`),
       p(
         { className: "text-muted" },
-        "Stage-specific agents with appropriate tools, constraints, and handoffs.",
+        "Stage-specific agents with skills, constraints, and stage transitions.",
       ),
       div(
         { className: "agent-cards-grid" },
@@ -598,11 +581,9 @@ function createSingleStagePreview(context, stage) {
     skills,
     behaviours,
     agentBehaviours,
-    vscodeSettings,
-    devcontainer,
+    claudeCodeSettings,
     stages,
     templates,
-    agentIndex,
   } = context;
 
   const profile = generateStageAgentProfile({
@@ -616,7 +597,6 @@ function createSingleStagePreview(context, stage) {
     agentDiscipline,
     agentTrack,
     stages,
-    agentIndex,
   });
 
   // Get skills for this stage (using full derived skills)
@@ -645,8 +625,7 @@ function createSingleStagePreview(context, stage) {
     createDownloadSingleButton(
       profile,
       skillFiles,
-      vscodeSettings,
-      devcontainer,
+      claudeCodeSettings,
       templates,
     ),
 
@@ -756,16 +735,14 @@ function buildSkillFileCard(skill, templates) {
  * Create download all button for all stages
  * @param {Array} stageAgents - Array of {stage, derived, profile}
  * @param {Array} skillFiles - Array of skill file objects
- * @param {Object} vscodeSettings - VS Code settings
- * @param {Object} devcontainer - Devcontainer config
+ * @param {Object} claudeCodeSettings - Claude Code settings
  * @param {Object} context - Context with discipline/track info and templates
  * @returns {HTMLElement}
  */
 function createDownloadAllButton(
   stageAgents,
   skillFiles,
-  vscodeSettings,
-  devcontainer,
+  claudeCodeSettings,
   context,
 ) {
   const { humanDiscipline, humanTrack, templates } = context;
@@ -783,10 +760,10 @@ function createDownloadAllButton(
       const JSZip = await importJSZip();
       const zip = new JSZip();
 
-      // Add all stage agent profiles
+      // Add all stage agent profiles to .claude/agents/
       for (const { profile } of stageAgents) {
         const content = formatAgentProfile(profile, templates.agent);
-        zip.file(`.github/agents/${profile.filename}`, content);
+        zip.file(`.claude/agents/${profile.filename}`, content);
       }
 
       // Add skills (SKILL.md + optional install script + optional reference)
@@ -812,27 +789,11 @@ function createDownloadAllButton(
         }
       }
 
-      // Add VS Code settings
-      if (Object.keys(vscodeSettings).length > 0) {
-        zip.file(
-          ".vscode/settings.json",
-          JSON.stringify(vscodeSettings, null, 2) + "\n",
-        );
-      }
-
-      // Add devcontainer.json with VS Code settings embedded
-      if (devcontainer && Object.keys(devcontainer).length > 0) {
-        const devcontainerJson = {
-          ...devcontainer,
-          customizations: {
-            vscode: {
-              settings: vscodeSettings,
-            },
-          },
-        };
+      // Add Claude Code settings
+      if (Object.keys(claudeCodeSettings).length > 0) {
         zip.file(
-          ".devcontainer/devcontainer.json",
-          JSON.stringify(devcontainerJson, null, 2) + "\n",
+          ".claude/settings.json",
+          JSON.stringify(claudeCodeSettings, null, 2) + "\n",
         );
       }
 
@@ -861,16 +822,14 @@ function createDownloadAllButton(
  * Create download button for single stage
  * @param {Object} profile - Agent profile
  * @param {Array} skillFiles - Skill files
- * @param {Object} vscodeSettings - VS Code settings
- * @param {Object} devcontainer - Devcontainer config
+ * @param {Object} claudeCodeSettings - Claude Code settings
  * @param {{agent: string, skill: string}} templates - Mustache templates
  * @returns {HTMLElement}
  */
 function createDownloadSingleButton(
   profile,
   skillFiles,
-  vscodeSettings,
-  devcontainer,
+  claudeCodeSettings,
   templates,
 ) {
   const btn = document.createElement("button");
@@ -885,9 +844,9 @@ function createDownloadSingleButton(
       const JSZip = await importJSZip();
       const zip = new JSZip();
 
-      // Add profile
+      // Add profile to .claude/agents/
       const content = formatAgentProfile(profile, templates.agent);
-      zip.file(`.github/agents/${profile.filename}`, content);
+      zip.file(`.claude/agents/${profile.filename}`, content);
 
       // Add skills (SKILL.md + optional install script + optional reference)
       for (const skill of skillFiles) {
@@ -912,27 +871,11 @@ function createDownloadSingleButton(
         }
       }
 
-      // Add VS Code settings
-      if (Object.keys(vscodeSettings).length > 0) {
-        zip.file(
-          ".vscode/settings.json",
-          JSON.stringify(vscodeSettings, null, 2) + "\n",
-        );
-      }
-
-      // Add devcontainer.json with VS Code settings embedded
-      if (devcontainer && Object.keys(devcontainer).length > 0) {
-        const devcontainerJson = {
-          ...devcontainer,
-          customizations: {
-            vscode: {
-              settings: vscodeSettings,
-            },
-          },
-        };
+      // Add Claude Code settings
+      if (Object.keys(claudeCodeSettings).length > 0) {
         zip.file(
-          ".devcontainer/devcontainer.json",
-          JSON.stringify(devcontainerJson, null, 2) + "\n",
+          ".claude/settings.json",
+          JSON.stringify(claudeCodeSettings, null, 2) + "\n",
         );
       }
 
@@ -982,7 +925,7 @@ function createHelpSection() {
         p(
           {},
           "Agents are generated for each stage: Plan (research), Code (implement), and Review (verify). " +
-            "Each stage has specific tools, constraints, and handoffs.",
+            "Each stage has specific skills, constraints, and stage transitions.",
         ),
       ),
       div(
@@ -990,8 +933,8 @@ function createHelpSection() {
         div({ className: "detail-item-label" }, "Agent Profiles"),
         p(
           {},
-          "The .agent.md files contain the agent's identity, capabilities, and constraints. " +
-            "Place them in .github/agents/ to register with GitHub Copilot.",
+          "The .md files contain the agent's identity, skills, and constraints. " +
+            "Place them in .claude/agents/ for Claude Code to discover.",
         ),
       ),
       div(

package/src/pages/landing.js

@@ -299,7 +299,7 @@ export function renderLanding() {
           p(
             {},
             "Generate coding agent team configurations from discipline × track combinations " +
-              "for GitHub Copilot custom agents.",
+              "for Claude Code agents.",
           ),
           div(
             { className: "page-actions", style: "justify-content: center" },

package/src/slides.html

@@ -8,7 +8,7 @@
     <script type="importmap">
       {
         "imports": {
-          "mustache": "https://esm.sh/mustache@4.2.0",
+          "mustache": "/vendor/mustache.mjs",
           "@forwardimpact/map": "/map/lib/index.js",
           "@forwardimpact/map/levels": "/map/lib/levels.js",
           "@forwardimpact/map/loader": "/map/lib/loader.js",

package/templates/agent.template.md

@@ -3,22 +3,13 @@
 name: {{name}}
 {{/name}}
 description: {{{description}}}
-{{#infer}}
-infer: {{infer}}
-{{/infer}}
-{{#handoffs.length}}
-handoffs:
-{{#handoffs}}
-  - label: {{label}}
-{{#agent}}
-    agent: {{agent}}
-{{/agent}}
-    prompt: "{{{prompt}}}"
-{{#send}}
-    send: {{send}}
-{{/send}}
-{{/handoffs}}
-{{/handoffs.length}}
+model: sonnet
+{{#skills.length}}
+skills:
+{{#skills}}
+  - {{.}}
+{{/skills}}
+{{/skills.length}}
 ---
 
 # {{title}}
@@ -41,89 +32,77 @@ handoffs:
 {{#hasWorkingStyles}}
 
 ## Working style
-{{#workingStyles}}
 
-### {{title}}
+{{#workingStyles}}
+**{{title}}**
 
 {{{content}}}
+
 {{/workingStyles}}
 {{/hasWorkingStyles}}
 {{#hasSkills}}
 
 ## Required skills
 
-**MANDATORY:** Before starting work, you MUST read ALL listed skill files below,
-not just the most relevant one. Every skill contributes project-specific
-guidance, required tools, and technology standards. Pre-training knowledge alone
-is insufficient—skills contain organizational standards that override general
-knowledge.
-
-**FIRST ACTION:** Read every skill file listed below. For each skill, note
-its `<read_then_do_{{stageId}}>` and `<do_then_confirm_{{stageId}}>` checklist
-items. List all checklist items from all skills before beginning any work. Do
-not start implementation until every skill has been read and its checklists
-acknowledged.
-
-Each skill contains marked-up sections and references for precise navigation:
-
-- `<read_then_do_{{stageId}}>` — Read-Then-Do checklist for the
-  {{stageName}} stage. Read and understand these items BEFORE starting work.
-  These are prerequisites and context you must absorb first.
-- `<do_then_confirm_{{stageId}}>` — Do-Then-Confirm checklist for the
-  {{stageName}} stage. Complete your work, then verify each item. These are
-  quality gates to check AFTER implementation.
-- `<required_tools>` — Mandatory tools for this skill. You MUST use these
-  organizational standards that override general knowledge or personal
-  preferences.
-{{#isOnboard}}
-- `scripts/install.sh` — Self-contained install script for environment setup.
-  **Step 1 of onboarding — run FIRST:** Execute
-  `bash .claude/skills/<skill-name>/scripts/install.sh` for each skill before
-  doing any manual setup. Only install manually if the script is missing or
-  fails. Do not skip this step even if you can install the same tools manually.
-- `references/REFERENCE.md` — Detailed code examples and reference material.
-  Consult this for implementation patterns, common pitfalls, and verification
-  steps.
-{{/isOnboard}}
-
-| Skill | Location | Use when |
-| ----- | -------- | -------- |
+| Skill | Use when |
+| ----- | -------- |
 {{#skillIndex}}
-| {{{name}}} | `.claude/skills/{{dirname}}/SKILL.md` | {{{useWhen}}} |
+| {{{name}}} | {{{useWhen}}} |
 {{/skillIndex}}
+{{#isOnboard}}
+
+For each skill, run `bash .claude/skills/<skill-name>/scripts/install.sh`
+BEFORE any manual setup. Consult `references/REFERENCE.md` for implementation
+patterns.
+{{/isOnboard}}
 {{/hasSkills}}
-{{#hasAgentIndex}}
+{{#hasStageTransitions}}
+
+## Stage transitions
+{{#stageTransitions}}
+
+When your work is complete, the next stage is **{{targetStageName}}**.
 
-## Required subagent delegations
+{{{summaryInstruction}}}
+{{#hasEntryCriteria}}
 
-**MANDATORY:** You MUST delegate work outside your speciality using the
-`runSubagent` tool. Do not attempt work that another agent is better suited for.
+The {{targetStageName}} stage requires the following entry criteria:
+{{#entryCriteria}}
+- [ ] {{{.}}}
+{{/entryCriteria}}
 
-You are part of an agentic team with specialized roles. Attempting work outside
-your speciality produces inferior results and violates team structure. If you
-cannot delegate due to a blocking constraint, document in your output: (1) the
-specialized work required, (2) the specific constraint preventing delegation,
-and (3) the compromised approach with acknowledged limitations.
+If critical items are missing, continue working in the current stage.
+{{/hasEntryCriteria}}
+{{/stageTransitions}}
+{{/hasStageTransitions}}
 
-| Agent name | Speciality | Description |
-| ---------- | ---------- | ----------- |
-{{#agentIndex}}
-| `{{id}}` | {{{name}}} | {{{description}}} |
-{{/agentIndex}}
-{{/hasAgentIndex}}
+{{#hasReturnFormat}}
 
 ## Return format
 
-When completing work (for handoff or as a subagent), provide:
+When completing work, provide:
 
-1. **Work completed**: What was accomplished
-2. **Checklist status**: Items verified from skill Do-Then-Confirm checklists
-3. **Recommendation**: Ready for next stage, or needs more work
+{{#returnFormat}}
+1. {{{.}}}
+{{/returnFormat}}
+{{/hasReturnFormat}}
 
 {{#hasConstraints}}
 ## Constraints
 
-{{#constraints}}
+{{#hasStageConstraints}}
+{{#stageConstraints}}
+- {{{.}}}
+{{/stageConstraints}}
+{{/hasStageConstraints}}
+{{#hasDisciplineOrTrackConstraints}}
+
+**General:**
+{{#disciplineConstraints}}
+- {{{.}}}
+{{/disciplineConstraints}}
+{{#trackConstraints}}
 - {{{.}}}
-{{/constraints}}
+{{/trackConstraints}}
+{{/hasDisciplineOrTrackConstraints}}
 {{/hasConstraints}}