@agentblueprint/mcp-server 0.2.1 → 0.3.1

package/dist/renderers.js

@@ -24,6 +24,26 @@ function arr(val) {
 function rec(val) {
     return val && typeof val === 'object' && !Array.isArray(val) ? val : {};
 }
+/** Returns string representation for numbers, passes through strings, '' otherwise */
+function numStr(val) {
+    if (typeof val === 'number')
+        return String(val);
+    if (typeof val === 'string')
+        return val;
+    return '';
+}
+/** Checks if a string value is a placeholder/garbage value that shouldn't be rendered */
+function isPlaceholder(val) {
+    return ['—', '–', '-', 'N/A', 'n/a', 'TBD', 'null', 'undefined', 'none'].includes(val.trim());
+}
+/** Strips a trailing unit suffix to prevent double-units (e.g. "3.6 months" + " months") */
+function stripTrailingUnit(val, unit) {
+    return val.replace(new RegExp(`\\s*${unit}\\s*$`, 'i'), '');
+}
+/** Joins string arrays with separator; returns '' for non-arrays */
+function arrStr(val, sep = ', ') {
+    return Array.isArray(val) ? val.filter((v) => typeof v === 'string').join(sep) : '';
+}
 function getPlatformName(bp) {
     const pr = rec(bp.platformRecommendation);
     const pp = rec(pr.primaryPlatform);
@@ -43,7 +63,12 @@ function getInvestmentTier(bc) {
     const amount = str(ask.investmentAmount);
     if (!amount)
         return 'unknown';
-    const num = parseFloat(amount.replace(/[^0-9.]/g, ''));
+    // Extract the first number group only (avoid concatenating multiple numbers
+    // e.g. "$13,143 one-time + $2,981 annual" → 13143, not 131432981)
+    const match = amount.match(/[\d,]+(?:\.\d+)?/);
+    if (!match)
+        return 'unknown';
+    const num = parseFloat(match[0].replace(/,/g, ''));
     if (isNaN(num))
         return 'unknown';
     if (num < 100000)
@@ -131,89 +156,130 @@ function buildSkillBody(input) {
     });
     lines.push('');
     lines.push('> Full agent specifications in `references/agent-specifications.md`', '');
-    // Phase 1: Pilot
-    lines.push('## Phase 1: Pilot', '');
-    const phases = arr(bp.phases);
-    const pilotPhase = phases.find((p) => str(p?.name).toLowerCase().includes('pilot') || str(p?.name).toLowerCase().includes('phase 1'));
-    if (pilotPhase) {
-        const p = rec(pilotPhase);
-        if (str(p.phaseGoal))
-            lines.push(`**Goal:** ${str(p.phaseGoal)}`, '');
-        if (p.durationWeeks)
-            lines.push(`**Duration:** ${p.durationWeeks} weeks`);
-        if (str(p.phaseCost))
-            lines.push(`**Cost target:** ${str(p.phaseCost)}`);
-        lines.push('');
-        const workstreams = arr(p.workstreams);
-        if (workstreams.length > 0) {
-            lines.push('**Pilot workstreams:**', '');
-            for (const ws of workstreams) {
-                const w = rec(ws);
-                lines.push(`- ${str(w.title)}`);
+    // Phase rendering — prefer implementation plan epics when available
+    const ipEpics = input.implementationPlanData ? arr(rec(input.implementationPlanData).epics) : [];
+    if (ipEpics.length > 0) {
+        const pilotEpics = ipEpics.filter((e) => str(rec(e).phase).toLowerCase().includes('pilot'));
+        const fullEpics = ipEpics.filter((e) => !str(rec(e).phase).toLowerCase().includes('pilot'));
+        lines.push('## Phase 1: Pilot', '');
+        if (pilotEpics.length > 0) {
+            const seen = new Set();
+            for (const epic of pilotEpics) {
+                const e = rec(epic);
+                const name = str(e.name);
+                if (name && !seen.has(name)) {
+                    seen.add(name);
+                    lines.push(`- **${name}**${str(e.estimatedDuration) ? ` (${str(e.estimatedDuration)})` : ''}`);
+                }
             }
             lines.push('');
         }
-        const gate = rec(p.decisionGate);
-        if (gate.criteria) {
-            lines.push('**Decision gate criteria:**', '');
-            for (const c of arr(gate.criteria)) {
-                const cr = rec(c);
-                const label = str(cr.name) || str(cr.criterion) || str(cr.metric) || str(cr.description) || 'Unnamed criterion';
-                lines.push(`- ${label}: ${str(cr.target) || str(cr.threshold)}`);
+        else {
+            lines.push('_No pilot epics defined. See `references/implementation-roadmap.md` for phasing._', '');
+        }
+        lines.push('## Phase 2: Full Implementation', '');
+        if (fullEpics.length > 0) {
+            const seen = new Set();
+            for (const epic of fullEpics) {
+                const e = rec(epic);
+                const name = str(e.name);
+                if (name && !seen.has(name)) {
+                    seen.add(name);
+                    lines.push(`- **${name}**${str(e.estimatedDuration) ? ` (${str(e.estimatedDuration)})` : ''}`);
+                }
             }
             lines.push('');
         }
-        const exitCriteria = arr(p.exitCriteria);
-        if (exitCriteria.length > 0) {
-            lines.push('**Exit criteria:**', '');
-            for (const c of exitCriteria)
-                lines.push(`- ${c}`);
-            lines.push('');
+        else {
+            lines.push('_See `references/implementation-roadmap.md` for full rollout plan._', '');
         }
     }
     else {
-        lines.push('_No pilot phase defined. See `references/implementation-roadmap.md` for phasing._', '');
-    }
-    // Phase 2: Full Implementation
-    lines.push('## Phase 2: Full Implementation', '');
-    const fullPhases = phases.filter((p) => !str(p?.name).toLowerCase().includes('pilot') && !str(p?.name).toLowerCase().includes('phase 1'));
-    if (fullPhases.length > 0) {
-        for (const phase of fullPhases) {
-            const p = rec(phase);
-            lines.push(`### ${str(p.name)}`, '');
+        lines.push('## Phase 1: Pilot', '');
+        const phases = arr(bp.phases);
+        const pilotPhase = phases.find((p) => str(p?.name).toLowerCase().includes('pilot') || str(p?.name).toLowerCase().includes('phase 1'));
+        if (pilotPhase) {
+            const p = rec(pilotPhase);
             if (str(p.phaseGoal))
-                lines.push(str(p.phaseGoal), '');
+                lines.push(`**Goal:** ${str(p.phaseGoal)}`, '');
             if (p.durationWeeks)
                 lines.push(`**Duration:** ${p.durationWeeks} weeks`);
             if (str(p.phaseCost))
-                lines.push(`**Cost:** ${str(p.phaseCost)}`);
+                lines.push(`**Cost target:** ${str(p.phaseCost)}`);
             lines.push('');
+            const workstreams = arr(p.workstreams);
+            if (workstreams.length > 0) {
+                lines.push('**Pilot workstreams:**', '');
+                for (const ws of workstreams) {
+                    const w = rec(ws);
+                    lines.push(`- ${str(w.title)}`);
+                }
+                lines.push('');
+            }
+            const gate = rec(p.decisionGate);
+            if (gate.criteria) {
+                lines.push('**Decision gate criteria:**', '');
+                for (const c of arr(gate.criteria)) {
+                    const cr = rec(c);
+                    const label = str(cr.name) || str(cr.criterion) || str(cr.metric) || str(cr.description) || 'Unnamed criterion';
+                    lines.push(`- ${label}: ${str(cr.target) || str(cr.threshold)}`);
+                }
+                lines.push('');
+            }
+            const exitCriteria = arr(p.exitCriteria);
+            if (exitCriteria.length > 0) {
+                lines.push('**Exit criteria:**', '');
+                for (const c of exitCriteria)
+                    lines.push(`- ${c}`);
+                lines.push('');
+            }
+        }
+        else {
+            lines.push('_No pilot phase defined. See `references/implementation-roadmap.md` for phasing._', '');
+        }
+        lines.push('## Phase 2: Full Implementation', '');
+        const fullPhases = phases.filter((p) => !str(p?.name).toLowerCase().includes('pilot') && !str(p?.name).toLowerCase().includes('phase 1'));
+        if (fullPhases.length > 0) {
+            for (const phase of fullPhases) {
+                const p = rec(phase);
+                lines.push(`### ${str(p.name)}`, '');
+                if (str(p.phaseGoal))
+                    lines.push(str(p.phaseGoal), '');
+                if (p.durationWeeks)
+                    lines.push(`**Duration:** ${p.durationWeeks} weeks`);
+                if (str(p.phaseCost))
+                    lines.push(`**Cost:** ${str(p.phaseCost)}`);
+                lines.push('');
+            }
+        }
+        else {
+            lines.push('_See `references/implementation-roadmap.md` for full rollout plan._', '');
         }
-    }
-    else {
-        lines.push('_See `references/implementation-roadmap.md` for full rollout plan._', '');
     }
     // Financial Summary
     lines.push('## Financial Summary', '');
     if (bc) {
         const benefits = rec(bc.benefits);
         const quantifiedROI = rec(benefits.quantifiedROI);
-        if (str(quantifiedROI.roi))
+        if (str(quantifiedROI.roi) && !isPlaceholder(str(quantifiedROI.roi)))
             lines.push(`- **ROI:** ${str(quantifiedROI.roi)}`);
-        if (str(quantifiedROI.npv))
+        if (str(quantifiedROI.npv) && !isPlaceholder(str(quantifiedROI.npv)))
             lines.push(`- **NPV:** ${str(quantifiedROI.npv)}`);
-        if (str(quantifiedROI.paybackPeriod))
+        if (str(quantifiedROI.paybackPeriod) && !isPlaceholder(str(quantifiedROI.paybackPeriod)))
             lines.push(`- **Payback:** ${str(quantifiedROI.paybackPeriod)}`);
         const pilotROI = rec(quantifiedROI.pilotROI);
-        if (str(pilotROI.pilotCost) || str(pilotROI.pilotBenefit)) {
+        const skillPilotCapex = str(rec(pilotROI.pilotCapex).value);
+        const skillPilotSavings = str(rec(pilotROI.pilotAnnualSavings).value);
+        const skillPilotYear1Net = str(rec(pilotROI.pilotYear1Net).value);
+        if (skillPilotCapex || skillPilotSavings) {
             lines.push('');
             lines.push('**Pilot economics:**');
-            if (str(pilotROI.pilotCost))
-                lines.push(`- Pilot cost: ${str(pilotROI.pilotCost)}`);
-            if (str(pilotROI.pilotBenefit))
-                lines.push(`- Pilot benefit: ${str(pilotROI.pilotBenefit)}`);
-            if (str(pilotROI.pilotROI))
-                lines.push(`- Pilot ROI: ${str(pilotROI.pilotROI)}`);
+            if (skillPilotCapex)
+                lines.push(`- Pilot capex: ${skillPilotCapex}`);
+            if (skillPilotSavings)
+                lines.push(`- Pilot annual savings: ${skillPilotSavings}`);
+            if (skillPilotYear1Net)
+                lines.push(`- Pilot Year 1 net: ${skillPilotYear1Net}`);
         }
         lines.push('');
         lines.push('> Full financial analysis in `references/financial-case.md`', '');
@@ -344,6 +410,244 @@ function buildBusinessContext(input) {
     }
     return lines.join('\n');
 }
+function buildOrganizationContext(input) {
+    const bp = input.businessProfileData;
+    const lines = ['# Organization Context', ''];
+    if (!bp) {
+        lines.push('_No business profile data available. Create a Business Profile to enrich this section._', '');
+        return lines.join('\n');
+    }
+    // Company overview
+    const companyName = str(bp.companyName);
+    if (companyName) {
+        lines.push(`## ${companyName}`, '');
+    }
+    if (str(bp.description))
+        lines.push(str(bp.description), '');
+    // Industry & scale
+    if (str(bp.industry) || str(bp.size) || str(bp.revenue)) {
+        lines.push('## Industry & Scale', '');
+        if (str(bp.industry))
+            lines.push(`- **Industry:** ${str(bp.industry)}`);
+        if (str(bp.size))
+            lines.push(`- **Company size:** ${str(bp.size)}`);
+        if (str(bp.revenue))
+            lines.push(`- **Revenue:** ${str(bp.revenue)}`);
+        if (str(bp.currency) && str(bp.currency) !== 'USD')
+            lines.push(`- **Currency:** ${str(bp.currency)}`);
+        lines.push('');
+    }
+    // Technology profile
+    const tech = rec(bp.technologyProfile);
+    const systems = arr(tech.systems);
+    const dataInfra = rec(tech.dataInfrastructure);
+    const integration = rec(tech.integrationCapabilities);
+    const security = rec(tech.securityCompliance);
+    if (systems.length > 0 || dataInfra.cloudPlatforms || dataInfra.dataWarehouseExists !== undefined || integration.apiReadiness || integration.apiMaturity) {
+        lines.push('## Technology Landscape', '');
+        if (systems.length > 0) {
+            lines.push('### Current Systems', '');
+            lines.push('| System | Category | Criticality |');
+            lines.push('|--------|----------|-------------|');
+            for (const sys of systems) {
+                const s = rec(sys);
+                lines.push(`| ${str(s.name)} | ${str(s.category)} | ${str(s.criticality) || str(s.businessCriticality)} |`);
+            }
+            lines.push('');
+        }
+        const cloudPlatforms = arrStr(dataInfra.cloudPlatforms);
+        if (cloudPlatforms || dataInfra.dataWarehouseExists !== undefined || str(dataInfra.cloudProvider)) {
+            lines.push('### Data Infrastructure', '');
+            if (cloudPlatforms)
+                lines.push(`- **Cloud platforms:** ${cloudPlatforms}`);
+            else if (str(dataInfra.cloudProvider))
+                lines.push(`- **Cloud provider:** ${str(dataInfra.cloudProvider)}`);
+            if (dataInfra.dataWarehouseExists !== undefined)
+                lines.push(`- **Data warehouse:** ${dataInfra.dataWarehouseExists ? 'Yes' : 'No'}`);
+            if (dataInfra.dataLakeExists !== undefined)
+                lines.push(`- **Data lake:** ${dataInfra.dataLakeExists ? 'Yes' : 'No'}`);
+            if (str(dataInfra.dataGovernanceMaturity))
+                lines.push(`- **Data governance maturity:** ${str(dataInfra.dataGovernanceMaturity)}`);
+            else if (str(dataInfra.dataQuality))
+                lines.push(`- **Data quality:** ${str(dataInfra.dataQuality)}`);
+            lines.push('');
+        }
+        const apiReadiness = str(integration.apiReadiness) || str(integration.apiMaturity);
+        const currentIntegrations = arrStr(integration.currentIntegrations);
+        if (apiReadiness || currentIntegrations || str(integration.integrationPatterns)) {
+            lines.push('### Integration Capabilities', '');
+            if (apiReadiness)
+                lines.push(`- **API readiness:** ${apiReadiness}`);
+            if (currentIntegrations)
+                lines.push(`- **Current integrations:** ${currentIntegrations}`);
+            else if (str(integration.integrationPatterns))
+                lines.push(`- **Integration patterns:** ${str(integration.integrationPatterns)}`);
+            if (str(integration.integrationPlatform) && !isPlaceholder(str(integration.integrationPlatform)))
+                lines.push(`- **Integration platform:** ${str(integration.integrationPlatform)}`);
+            else if (str(integration.middlewarePlatforms) && !isPlaceholder(str(integration.middlewarePlatforms)))
+                lines.push(`- **Middleware:** ${str(integration.middlewarePlatforms)}`);
+            lines.push('');
+        }
+        const complianceCerts = arrStr(security.complianceCertifications);
+        const privacyMeasures = arrStr(security.dataPrivacyMeasures);
+        if (complianceCerts || privacyMeasures || str(security.complianceFrameworks) || str(security.dataPrivacy)) {
+            lines.push('### Security & Compliance', '');
+            if (complianceCerts)
+                lines.push(`- **Compliance certifications:** ${complianceCerts}`);
+            else if (str(security.complianceFrameworks))
+                lines.push(`- **Compliance frameworks:** ${str(security.complianceFrameworks)}`);
+            if (privacyMeasures)
+                lines.push(`- **Data privacy measures:** ${privacyMeasures}`);
+            else if (str(security.dataPrivacy))
+                lines.push(`- **Data privacy:** ${str(security.dataPrivacy)}`);
+            lines.push('');
+        }
+    }
+    // Business operations
+    const ops = rec(bp.businessOperations);
+    const keyProcesses = arr(ops.keyProcesses);
+    const painPoints = arr(ops.painPoints);
+    const stakeholders = arr(ops.stakeholders);
+    if (keyProcesses.length > 0 || painPoints.length > 0) {
+        lines.push('## Business Operations', '');
+        if (keyProcesses.length > 0) {
+            lines.push('### Key Processes', '');
+            for (const proc of keyProcesses) {
+                const p = rec(proc);
+                const name = str(p.name) || str(p.processName);
+                const volume = str(p.volume) || str(p.transactionVolume);
+                if (name) {
+                    lines.push(`- **${name}**${volume ? ` (${volume})` : ''}`);
+                    if (str(p.frequency))
+                        lines.push(`  - Frequency: ${str(p.frequency)}`);
+                    if (str(p.automationLevel))
+                        lines.push(`  - Automation level: ${str(p.automationLevel)}`);
+                }
+            }
+            lines.push('');
+        }
+        if (painPoints.length > 0) {
+            lines.push('### Operational Pain Points', '');
+            for (const pp of painPoints) {
+                if (typeof pp === 'string') {
+                    lines.push(`- ${pp}`);
+                }
+                else {
+                    const p = rec(pp);
+                    const desc = str(p.description) || str(p.painPoint);
+                    if (desc)
+                        lines.push(`- ${desc}${str(p.severity) ? ` _(${str(p.severity)})_` : ''}`);
+                }
+            }
+            lines.push('');
+        }
+        if (stakeholders.length > 0) {
+            lines.push('### Key Stakeholders', '');
+            for (const sh of stakeholders) {
+                const s = rec(sh);
+                const role = str(s.role) || str(s.title);
+                const name = str(s.name);
+                if (role || name)
+                    lines.push(`- **${role || name}**${name && role ? ` — ${name}` : ''}`);
+            }
+            lines.push('');
+        }
+    }
+    // Organizational capabilities
+    const caps = rec(bp.organizationalCapabilities);
+    const technicalTeam = rec(caps.technicalTeam);
+    const currentAutomation = rec(caps.currentAutomation);
+    const devCapacity = numStr(technicalTeam.developmentCapacity);
+    if (devCapacity || str(technicalTeam.size) || str(currentAutomation.level)) {
+        lines.push('## Organizational Capabilities', '');
+        if (devCapacity)
+            lines.push(`- **Development capacity:** ${devCapacity} FTEs`);
+        else if (str(technicalTeam.size))
+            lines.push(`- **Technical team size:** ${str(technicalTeam.size)}`);
+        if (str(technicalTeam.aiMlExperience))
+            lines.push(`- **AI/ML experience:** ${str(technicalTeam.aiMlExperience)}`);
+        else if (str(technicalTeam.aiExperience))
+            lines.push(`- **AI experience:** ${str(technicalTeam.aiExperience)}`);
+        if (str(currentAutomation.level))
+            lines.push(`- **Current automation level:** ${str(currentAutomation.level)}`);
+        const automatedProcesses = arrStr(currentAutomation.automatedProcesses);
+        if (automatedProcesses)
+            lines.push(`- **Automated processes:** ${automatedProcesses}`);
+        else if (str(currentAutomation.tools))
+            lines.push(`- **Automation tools:** ${str(currentAutomation.tools)}`);
+        lines.push('');
+    }
+    // Constraints
+    const constraints = rec(bp.constraintsProfile);
+    const budget = rec(constraints.budget);
+    const timeline = rec(constraints.timeline);
+    const technical = rec(constraints.technical);
+    const regulatory = rec(constraints.regulatory);
+    const totalBudget = str(budget.totalAiBudget) || str(budget.totalBudget);
+    const annualBudget = str(budget.annualOpexAvailable) || str(budget.annualBudget);
+    const deadlines = arrStr(timeline.criticalDeadlines);
+    const rolloutTimeline = str(timeline.fullRolloutTimeline) || str(timeline.preferredTimeline);
+    const legacyConstraints = arrStr(technical.legacySystemConstraints);
+    const regulations = arrStr(regulatory.industryRegulations);
+    if (totalBudget || deadlines || str(timeline.deadline) || regulations || str(regulatory.requirements)) {
+        lines.push('## Constraints', '');
+        if (totalBudget)
+            lines.push(`- **Budget:** ${totalBudget}`);
+        if (annualBudget)
+            lines.push(`- **Annual budget:** ${annualBudget}`);
+        if (deadlines)
+            lines.push(`- **Critical deadlines:** ${deadlines}`);
+        else if (str(timeline.deadline))
+            lines.push(`- **Deadline:** ${str(timeline.deadline)}`);
+        if (rolloutTimeline)
+            lines.push(`- **Rollout timeline:** ${rolloutTimeline}`);
+        if (legacyConstraints)
+            lines.push(`- **Legacy system constraints:** ${legacyConstraints}`);
+        else if (str(technical.limitations))
+            lines.push(`- **Technical limitations:** ${str(technical.limitations)}`);
+        if (regulations)
+            lines.push(`- **Industry regulations:** ${regulations}`);
+        else if (str(regulatory.requirements))
+            lines.push(`- **Regulatory:** ${str(regulatory.requirements)}`);
+        lines.push('');
+    }
+    // Strategic initiatives
+    const initiatives = arr(bp.strategicInitiatives);
+    if (initiatives.length > 0) {
+        lines.push('## Strategic Initiatives', '');
+        for (const init of initiatives) {
+            const i = rec(init);
+            const title = str(i.title);
+            if (title) {
+                lines.push(`### ${title}`, '');
+                if (str(i.description))
+                    lines.push(str(i.description), '');
+                if (str(i.priority))
+                    lines.push(`- **Priority:** ${str(i.priority)}`);
+                if (str(i.status))
+                    lines.push(`- **Status:** ${str(i.status)}`);
+                if (str(i.budget))
+                    lines.push(`- **Budget:** ${str(i.budget)}`);
+                if (str(i.timeline))
+                    lines.push(`- **Timeline:** ${str(i.timeline)}`);
+                const outcomes = arr(i.expectedOutcomes);
+                if (outcomes.length > 0) {
+                    lines.push('- **Expected outcomes:**');
+                    for (const o of outcomes)
+                        lines.push(`  - ${o}`);
+                }
+                lines.push('');
+            }
+        }
+    }
+    // AI readiness
+    if (bp.aiReadinessScore !== null && bp.aiReadinessScore !== undefined) {
+        lines.push('## AI Readiness', '');
+        lines.push(`- **Score:** ${bp.aiReadinessScore}/100`);
+        lines.push('');
+    }
+    return lines.join('\n');
+}
 function buildAgentSpecifications(input) {
     const bp = input.blueprintData;
     const team = getTeam(bp);
@@ -351,7 +655,7 @@ function buildAgentSpecifications(input) {
     for (const agent of team) {
         const name = str(agent.name);
         lines.push(`## ${name}`, '');
-        const role = str(agent.role);
+        const role = str(agent.role) || str(rec(agent.instructions).role);
         const type = str(agent.agentRole) || str(agent.orchestrationRole) || str(agent.type) || 'Worker';
         const supervision = str(agent.supervisionLevel) || 'Supervised';
         lines.push(`- **Role:** ${role}`);
@@ -388,7 +692,7 @@ function buildAgentSpecifications(input) {
                 const t = rec(tool);
                 const tName = str(t.name);
                 const tCat = str(t.toolCategory) || str(t.type) || '';
-                const tDesc = str(t.description).replace(/\|/g, '\\|').slice(0, 100);
+                const tDesc = str(t.description).replace(/\|/g, '\\|');
                 lines.push(`| ${tName} | ${tCat} | ${tDesc} |`);
             }
             lines.push('');
@@ -410,10 +714,12 @@ function buildAgentSpecifications(input) {
             lines.push('');
         }
         const risk = rec(agent.riskAssessment);
-        if (str(risk.level)) {
+        if (str(risk.level) && !isPlaceholder(str(risk.level))) {
             lines.push('### Risk Assessment', '');
             lines.push(`- **Level:** ${str(risk.level)}`);
-            lines.push(`- **Impact:** ${str(risk.impact)}`);
+            const riskImpact = str(risk.impact);
+            if (riskImpact && !isPlaceholder(riskImpact))
+                lines.push(`- **Impact:** ${riskImpact}`);
             const controls = arr(risk.controls);
             if (controls.length > 0) {
                 lines.push('- **Controls:**');
@@ -476,64 +782,90 @@ function buildFinancialCase(input) {
     }
     const benefits = rec(bc.benefits);
     const qROI = rec(benefits.quantifiedROI);
-    if (str(qROI.roi) || str(qROI.npv) || str(qROI.paybackPeriod)) {
+    const roiVal = str(qROI.roi);
+    const npvVal = str(qROI.npv);
+    const paybackVal = str(qROI.paybackPeriod);
+    if ((roiVal && !isPlaceholder(roiVal)) || (npvVal && !isPlaceholder(npvVal)) || (paybackVal && !isPlaceholder(paybackVal))) {
         lines.push('## Return on Investment', '');
-        if (str(qROI.roi))
-            lines.push(`- **ROI:** ${str(qROI.roi)}`);
-        if (str(qROI.npv))
-            lines.push(`- **NPV:** ${str(qROI.npv)}`);
-        if (str(qROI.paybackPeriod))
-            lines.push(`- **Payback period:** ${str(qROI.paybackPeriod)}`);
+        if (roiVal && !isPlaceholder(roiVal))
+            lines.push(`- **ROI:** ${roiVal}`);
+        if (npvVal && !isPlaceholder(npvVal))
+            lines.push(`- **NPV:** ${npvVal}`);
+        if (paybackVal && !isPlaceholder(paybackVal))
+            lines.push(`- **Payback period:** ${paybackVal}`);
         lines.push('');
     }
+    // Labor cost detail (nested object: currentStateBaseline / projectedSavings)
     const laborDetail = rec(qROI.laborCostDetail);
-    if (str(laborDetail.annualLaborCost) || str(laborDetail.avgFullyLoadedRate)) {
+    const currentBaseline = rec(laborDetail.currentStateBaseline);
+    const projectedSavings = rec(laborDetail.projectedSavings);
+    const blendedRate = str(rec(currentBaseline.blendedHourlyRate).value);
+    const totalAnnualCost = str(rec(currentBaseline.totalAnnualCost).value);
+    const totalAnnualHours = str(rec(currentBaseline.totalAnnualHours).value);
+    const costSavingsAnnual = str(rec(projectedSavings.costSavingsAnnual).value);
+    if (totalAnnualCost || blendedRate) {
         lines.push('## Labor Cost Analysis', '');
-        if (str(laborDetail.avgFullyLoadedRate))
-            lines.push(`- **Avg. fully-loaded rate:** ${str(laborDetail.avgFullyLoadedRate)}`);
-        if (str(laborDetail.annualLaborCost))
-            lines.push(`- **Annual labor cost:** ${str(laborDetail.annualLaborCost)}`);
-        if (str(laborDetail.annualHoursAffected))
-            lines.push(`- **Annual hours affected:** ${str(laborDetail.annualHoursAffected)}`);
-        if (str(laborDetail.automationSavings))
-            lines.push(`- **Automation savings:** ${str(laborDetail.automationSavings)}`);
+        if (blendedRate)
+            lines.push(`- **Avg. fully-loaded rate:** ${blendedRate}`);
+        if (totalAnnualCost)
+            lines.push(`- **Annual labor cost:** ${totalAnnualCost}`);
+        if (totalAnnualHours)
+            lines.push(`- **Annual hours affected:** ${totalAnnualHours}`);
+        if (costSavingsAnnual)
+            lines.push(`- **Automation savings:** ${costSavingsAnnual}`);
         lines.push('');
     }
+    // Cost breakdown (each field is { value, notes?, source? })
     const costBreakdown = rec(qROI.costBreakdown);
-    if (str(costBreakdown.implementation) || str(costBreakdown.annualLicensing)) {
+    const cbImpl = str(rec(costBreakdown.implementation).value);
+    const cbLic = str(rec(costBreakdown.annualLicensing).value);
+    const cbSupport = str(rec(costBreakdown.annualSupportMaintenance).value);
+    if (cbImpl || cbLic) {
         lines.push('## Cost Breakdown', '');
-        if (str(costBreakdown.implementation))
-            lines.push(`- **Implementation:** ${str(costBreakdown.implementation)}`);
-        if (str(costBreakdown.annualLicensing))
-            lines.push(`- **Annual licensing:** ${str(costBreakdown.annualLicensing)}`);
-        if (str(costBreakdown.annualSupportMaintenance))
-            lines.push(`- **Annual support/maintenance:** ${str(costBreakdown.annualSupportMaintenance)}`);
+        if (cbImpl)
+            lines.push(`- **Implementation:** ${cbImpl}`);
+        if (cbLic)
+            lines.push(`- **Annual licensing:** ${cbLic}`);
+        if (cbSupport)
+            lines.push(`- **Annual support/maintenance:** ${cbSupport}`);
         lines.push('');
     }
+    // Pilot ROI (nested: pilotCapex/pilotOpex/pilotAnnualSavings/pilotYear1Net are { value, calculation })
     const pilotROI = rec(qROI.pilotROI);
-    if (str(pilotROI.pilotCost) || str(pilotROI.pilotBenefit)) {
+    const pilotCapex = str(rec(pilotROI.pilotCapex).value);
+    const pilotOpex = str(rec(pilotROI.pilotOpex).value);
+    const pilotSavings = str(rec(pilotROI.pilotAnnualSavings).value);
+    const pilotYear1Net = str(rec(pilotROI.pilotYear1Net).value);
+    const pilotPayback = numStr(pilotROI.pilotPaybackMonths);
+    if (pilotCapex || pilotSavings) {
         lines.push('## Pilot Economics', '');
-        if (str(pilotROI.pilotCost))
-            lines.push(`- **Pilot cost:** ${str(pilotROI.pilotCost)}`);
-        if (str(pilotROI.pilotBenefit))
-            lines.push(`- **Pilot benefit:** ${str(pilotROI.pilotBenefit)}`);
-        if (str(pilotROI.pilotROI))
-            lines.push(`- **Pilot ROI:** ${str(pilotROI.pilotROI)}`);
-        if (str(pilotROI.pilotDuration))
-            lines.push(`- **Duration:** ${str(pilotROI.pilotDuration)}`);
+        if (pilotCapex)
+            lines.push(`- **Pilot capex:** ${pilotCapex}`);
+        if (pilotOpex)
+            lines.push(`- **Pilot opex:** ${pilotOpex}`);
+        if (pilotSavings)
+            lines.push(`- **Pilot annual savings:** ${pilotSavings}`);
+        if (pilotYear1Net)
+            lines.push(`- **Pilot Year 1 net:** ${pilotYear1Net}`);
+        if (pilotPayback)
+            lines.push(`- **Payback:** ${stripTrailingUnit(pilotPayback, 'months')} months`);
         lines.push('');
     }
+    // Sensitivity analysis (roiPercentage, paybackMonths, annualSavings — all numbers/strings)
     const sensitivity = rec(qROI.sensitivity);
     if (sensitivity.conservative || sensitivity.realistic || sensitivity.optimistic) {
         lines.push('## Sensitivity Analysis', '');
-        lines.push('| Scenario | NPV | ROI | Payback |');
-        lines.push('|----------|-----|-----|---------|');
+        lines.push('| Scenario | ROI | Payback | Annual Savings |');
+        lines.push('|----------|-----|---------|----------------|');
         for (const [label, key] of [['Conservative', 'conservative'], ['Realistic', 'realistic'], ['Optimistic', 'optimistic']]) {
             const s = rec(sensitivity[key]);
-            lines.push(`| ${label} | ${str(s.npv)} | ${str(s.roi)} | ${str(s.paybackPeriod)} |`);
+            const roi = numStr(s.roiPercentage);
+            const payback = numStr(s.paybackMonths);
+            lines.push(`| ${label} | ${roi ? stripTrailingUnit(roi, '%') + '%' : ''} | ${payback ? stripTrailingUnit(payback, 'months') + ' months' : ''} | ${str(s.annualSavings)} |`);
         }
         lines.push('');
     }
+    // 5-year projection (calculator uses costsThisYear/valueDelivered/netThisYear/runningTotal)
     const fiveYear = arr(qROI.fiveYearProjection);
     if (fiveYear.length > 0) {
         lines.push('## Five-Year Projection', '');
@@ -541,7 +873,7 @@ function buildFinancialCase(input) {
         lines.push('|------|-----------|-------|---------------|------------|');
         for (const yr of fiveYear) {
             const y = rec(yr);
-            lines.push(`| ${str(y.year)} | ${str(y.investment)} | ${str(y.value)} | ${str(y.netCashFlow)} | ${str(y.cumulative)} |`);
+            lines.push(`| ${numStr(y.year)} | ${str(y.costsThisYear) || str(y.investment)} | ${str(y.valueDelivered) || str(y.value)} | ${str(y.netThisYear) || str(y.netCashFlow)} | ${str(y.runningTotal) || str(y.cumulative)} |`);
         }
         lines.push('');
     }
@@ -558,6 +890,26 @@ function buildFinancialCase(input) {
             lines.push(`- **Time to market:** ${str(tangible.timeToMarket)}`);
         lines.push('');
     }
+    // Recommendation
+    const recommendation = rec(bc.recommendation);
+    if (str(recommendation.summary) || str(recommendation.decisionRequest)) {
+        lines.push('## Recommendation', '');
+        if (str(recommendation.summary))
+            lines.push(str(recommendation.summary), '');
+        if (str(recommendation.decisionRequest)) {
+            lines.push(`**Decision request:** ${str(recommendation.decisionRequest)}`, '');
+        }
+        const immediateActions = arr(recommendation.immediateActions);
+        if (immediateActions.length > 0) {
+            lines.push('**Immediate actions upon approval:**', '');
+            for (const action of immediateActions)
+                lines.push(`1. ${action}`);
+            lines.push('');
+        }
+        if (str(recommendation.blueprintImplementationRef)) {
+            lines.push(`> ${str(recommendation.blueprintImplementationRef)}`, '');
+        }
+    }
     return lines.join('\n');
 }
 function buildImplementationRoadmap(input) {
@@ -783,12 +1135,14 @@ function buildArchitectureDecisions(input) {
         }
     }
     const feasibility = rec(bp.feasibilityIndicators);
-    if (str(feasibility.overallScore) || str(feasibility.recommendation)) {
+    const feasConfidence = str(feasibility.feasibilityConfidence) || str(feasibility.overallScore);
+    const feasBasis = str(feasibility.feasibilityBasis) || str(feasibility.recommendation);
+    if (feasConfidence || feasBasis) {
         lines.push('## Feasibility Assessment', '');
-        if (str(feasibility.overallScore))
-            lines.push(`**Score:** ${str(feasibility.overallScore)}`);
-        if (str(feasibility.recommendation))
-            lines.push(`**Recommendation:** ${str(feasibility.recommendation)}`);
+        if (feasConfidence)
+            lines.push(`**Confidence:** ${feasConfidence}`);
+        if (feasBasis)
+            lines.push(`**Basis:** ${feasBasis}`);
         lines.push('');
     }
     return lines.join('\n');
@@ -849,8 +1203,12 @@ function buildGuardrailsAndGovernance(input) {
                 lines.push('');
             }
             const risk = rec(agent.riskAssessment);
-            if (str(risk.level)) {
-                lines.push(`**Risk:** ${str(risk.level)} — ${str(risk.impact)}`);
+            if (str(risk.level) && !isPlaceholder(str(risk.level))) {
+                const impactStr = str(risk.impact);
+                const riskLine = impactStr && !isPlaceholder(impactStr)
+                    ? `**Risk:** ${str(risk.level)} — ${impactStr}`
+                    : `**Risk:** ${str(risk.level)}`;
+                lines.push(riskLine);
                 lines.push('');
             }
         }
@@ -944,6 +1302,7 @@ fi
 echo ""
 echo "--- Optional Files ---"
 check_optional "references/business-context.md"
+check_optional "references/organization-context.md"
 check_optional "references/financial-case.md"
 check_optional "references/implementation-roadmap.md"
 check_optional "references/guardrails-and-governance.md"
@@ -977,6 +1336,7 @@ export function renderSkillDirectory(input) {
     files.set('SKILL.md', `${frontmatter}\n\n${body}`);
     // Reference files
     files.set('references/business-context.md', buildBusinessContext(input));
+    files.set('references/organization-context.md', buildOrganizationContext(input));
     files.set('references/agent-specifications.md', buildAgentSpecifications(input));
     files.set('references/financial-case.md', buildFinancialCase(input));
     files.set('references/implementation-roadmap.md', buildImplementationRoadmap(input));