@transitrix/diagrams 1.1.0 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transitrix/diagrams",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "type": "module",
   "description": "Shared rendering, validation, and pure mutations for Transitrix custom diagram formats.",
   "license": "MIT",

package/src/activities/__tests__/validate.test.ts

@@ -15,9 +15,43 @@ const minimalValid = {
 };
 
 describe('validateActivities', () => {
-  it('ACT-001 — accepts valid notation field', () => {
+  it('ACT-001 — accepts notation: activities (deprecated)', () => {
     const r = validateActivities(minimalValid);
     expect(r.valid).toBe(true);
+    // deprecated notation emits a warning, not an error
+    expect(r.warnings.some(w => w.code === 'DEPRECATED_NOTATION')).toBe(true);
+  });
+
+  it('ACT-001 — accepts notation: action (canonical)', () => {
+    const r = validateActivities({
+      notation: 'action',
+      actions: [
+        { id: 'ACTION-001', name: 'Start', duration: 3 },
+        { id: 'ACTION-002', name: 'End', duration: 2, predecessors: ['ACTION-001'] },
+      ],
+    });
+    expect(r.valid).toBe(true);
+    expect(r.warnings.some(w => w.code === 'DEPRECATED_NOTATION')).toBe(false);
+  });
+
+  it('ACT-001 — accepts notation: action with deprecated activities: key (emits field warning)', () => {
+    const r = validateActivities({
+      notation: 'action',
+      activities: [{ id: 'ACTION-001', name: 'Foo', duration: 1 }],
+    });
+    expect(r.valid).toBe(true);
+    expect(r.warnings.some(w => w.code === 'DEPRECATED_FIELD')).toBe(true);
+  });
+
+  it('ACT-001 — normalises action_type to activity_type for downstream layout', () => {
+    const input: Record<string, unknown> = {
+      notation: 'action',
+      actions: [{ id: 'ACTION-001', name: 'Foo', duration: 1, action_type: 'project' }],
+    };
+    const r = validateActivities(input);
+    expect(r.valid).toBe(true);
+    const entry = (input.actions as Array<Record<string, unknown>>)[0];
+    expect(entry['activity_type']).toBe('project');
   });
 
   it('ACT-001 — rejects missing notation', () => {

package/src/activities/validate.ts

@@ -19,20 +19,31 @@ export function validateActivities(input: unknown): ActivityValidationResult {
 
   const raw = input as Record<string, unknown>;
 
-  // ACT-001: notation must equal "activities"
+  // ACT-001: notation must be "action" (canonical) or "activities" (deprecated)
   if (raw.notation === undefined) {
     errors.push({ code: 'ACT-001', message: 'notation field is required' });
     return { valid: false, errors, warnings };
   }
-  if (raw.notation !== 'activities') {
-    errors.push({ code: 'ACT-001', message: `notation must be "activities", got "${String(raw.notation)}"` });
+  if (raw.notation !== 'action' && raw.notation !== 'activities') {
+    errors.push({ code: 'ACT-001', message: `notation must be "action", got "${String(raw.notation)}"` });
     return { valid: false, errors, warnings };
   }
+  if (raw.notation === 'activities') {
+    warnings.push({ code: 'DEPRECATED_NOTATION', message: 'notation: "activities" is deprecated — migrate to notation: "action"' });
+  }
 
-  if (!Array.isArray(raw.activities)) {
-    errors.push({ code: 'SCHEMA_INVALID', message: 'activities must be an array', path: 'activities' });
+  // Accept "actions:" (canonical) or "activities:" (deprecated)
+  const rawArray = Array.isArray(raw.actions) ? raw.actions : (Array.isArray(raw.activities) ? raw.activities : undefined);
+  if (Array.isArray(raw.activities) && !Array.isArray(raw.actions)) {
+    warnings.push({ code: 'DEPRECATED_FIELD', message: 'Root key "activities:" is deprecated — rename to "actions:"' });
+  }
+  if (!rawArray) {
+    const canonKey = raw.notation === 'action' ? 'actions' : 'activities';
+    errors.push({ code: 'SCHEMA_INVALID', message: `${canonKey} must be an array`, path: canonKey });
     return { valid: false, errors, warnings };
   }
+  // Normalise onto raw.activities for the rest of this function (avoids touching downstream code)
+  if (!Array.isArray(raw.activities)) raw.activities = raw.actions;
 
   // ACT-014 / ACT-015: project.calendar validation (run before per-activity loop;
   // surfaces clearly even when activities also have issues).
@@ -99,6 +110,11 @@ export function validateActivities(input: unknown): ActivityValidationResult {
     }
     const act = a as Record<string, unknown>;
 
+    // Normalise action_type → activity_type (canonical rename; old name kept for compat)
+    if (act['action_type'] !== undefined && act['activity_type'] === undefined) {
+      act['activity_type'] = act['action_type'];
+    }
+
     // ACT-010: reject single-value forms
     if ('goal' in act) {
       errors.push({ code: 'ACT-010', message: `Use "goals: []" array form instead of "goal:" (activity at index ${i})`, path });

package/src/activity-card/__tests__/example.test.ts

@@ -71,13 +71,11 @@ describe('activity-card worked example (eu-programme)', () => {
     // Description row
     expect(layout.descriptionRow?.label).toBe('Description');
     // Chain sections
-    expect(layout.chainSections.map((s) => s.type)).toEqual(['drivers', 'assessments', 'goals', 'changes']);
+    expect(layout.chainSections.map((s) => s.type)).toEqual(['drivers', 'goals', 'changes']);
     const driversSection = layout.chainSections.find((s) => s.type === 'drivers')!;
     const goalsSection = layout.chainSections.find((s) => s.type === 'goals')!;
-    const assessmentsSection = layout.chainSections.find((s) => s.type === 'assessments')!;
     expect(driversSection.nodes.map((n) => n.id)).toContain('FACTOR-EU-MDR-1');
     expect(goalsSection.nodes.map((n) => n.id)).toContain('GOAL-EU-MARKET-1');
-    expect(assessmentsSection.isEmpty).toBe(true); // no assessment in this fixture
     // Chain edges
     expect(layout.chainEdges).toContainEqual({ sourceId: 'FACTOR-EU-MDR-1', targetId: 'GOAL-EU-MARKET-1' });
     expect(layout.chainEdges).toContainEqual({ sourceId: 'GOAL-EU-MARKET-1', targetId: 'CHANGE-EU-COMPLIANCE-1' });

package/src/activity-card/__tests__/layout.test.ts

@@ -94,20 +94,17 @@ describe('layoutActivityCard', () => {
     expect(l.descriptionRow).toBeUndefined();
   });
 
-  it('four chain sections in order: drivers, assessments, goals, changes', () => {
+  it('three chain sections in order: drivers, goals, changes', () => {
     const l = layoutActivityCard(RESOLVED);
-    expect(l.chainSections.map((s) => s.type)).toEqual(['drivers', 'assessments', 'goals', 'changes']);
+    expect(l.chainSections.map((s) => s.type)).toEqual(['drivers', 'goals', 'changes']);
   });
 
   it('chain sections carry the resolved nodes', () => {
     const l = layoutActivityCard(RESOLVED);
     const drivers = l.chainSections.find((s) => s.type === 'drivers')!;
-    const assessments = l.chainSections.find((s) => s.type === 'assessments')!;
     const goals = l.chainSections.find((s) => s.type === 'goals')!;
     const changes = l.chainSections.find((s) => s.type === 'changes')!;
     expect(drivers.nodes.map((n) => n.id)).toEqual(['FACTOR-EU-MDR-1']);
-    expect(assessments.nodes.map((n) => n.id)).toEqual(['ASSESSMENT-MDR-1']);
-    expect(assessments.nodes[0].meta).toBe('2026-03-01');
     expect(goals.nodes.map((n) => n.id)).toEqual(['GOAL-EU-MARKET-1']);
     expect(changes.nodes.map((n) => n.id)).toEqual(['CHANGE-EU-COMPLIANCE-1']);
   });
@@ -127,10 +124,6 @@ describe('layoutActivityCard', () => {
     expect(l.chainEdges).toContainEqual({ sourceId: 'GOAL-EU-MARKET-1', targetId: 'CHANGE-EU-COMPLIANCE-1' });
   });
 
-  it('builds driver→assessment edge when assessment is linked', () => {
-    const l = layoutActivityCard(RESOLVED);
-    expect(l.chainEdges).toContainEqual({ sourceId: 'FACTOR-EU-MDR-1', targetId: 'ASSESSMENT-MDR-1' });
-  });
 
   it('milestone ArchiMate class is set', () => {
     const l = layoutActivityCard(RESOLVED);

package/src/activity-card/__tests__/resolver.test.ts

@@ -217,6 +217,33 @@ describe('resolveActivityCard', () => {
     expect(r.warnings.some((w) => w.code === 'PC-001')).toBe(true);
   });
 
+  it('resolves stakeholders from inline stakeholders: [] on the Action element', () => {
+    const projectWithInlineStakeholders = { ...PROJECT, stakeholders: ['STAKEHOLDER-OPS-1'] };
+    const r = resolveActivityCard(CARD, {
+      elements: [projectWithInlineStakeholders, CHILD, FACTOR, GOAL, CHANGE, STAKEHOLDER],
+      relations: [REL_GOAL],
+    });
+    expect(r.valid).toBe(true);
+    const sh = r.resolved!.stakeholders!;
+    expect(sh).toHaveLength(1);
+    expect(sh[0].id).toBe('STAKEHOLDER-OPS-1');
+    expect(sh[0].name).toBe('Operations');
+    expect(sh[0].role).toBeUndefined();
+  });
+
+  it('REL stakeholder takes precedence over inline duplicate (carries role)', () => {
+    const projectWithInlineStakeholders = { ...PROJECT, stakeholders: ['STAKEHOLDER-OPS-1'] };
+    const r = resolveActivityCard(CARD, {
+      elements: [projectWithInlineStakeholders, CHILD, FACTOR, GOAL, CHANGE, STAKEHOLDER],
+      relations: [REL_GOAL, REL_STAKEHOLDER],
+    });
+    expect(r.valid).toBe(true);
+    const sh = r.resolved!.stakeholders!;
+    // deduplicated — REL entry wins, inline duplicate is dropped
+    expect(sh).toHaveLength(1);
+    expect(sh[0].role).toBe('sponsor');
+  });
+
   it('falls back to the inline goals field when no activity_goal relation exists', () => {
     const projectWithInline = { ...PROJECT, goals: ['GOAL-EU-MARKET-1'] };
     const r = resolveActivityCard(CARD, {
@@ -241,7 +268,7 @@ describe('resolveActivityCard', () => {
     expect(pc001!.message).toContain('canon/elements/**');
     expect(pc001!.message).toContain('canon/views/activities/**');
     // Must include actionable hint with expected file pattern (§7 PC-001)
-    expect(pc001!.message).toContain('notation: activity');
+    expect(pc001!.message).toContain('notation: action');
     expect(pc001!.message).toContain(`id: "${CARD.activity_card.project}"`);
   });
 

package/src/activity-card/__tests__/validate.test.ts

@@ -20,10 +20,34 @@ const VALID = {
 };
 
 describe('validateActivityCard', () => {
-  it('accepts a well-formed card', () => {
+  it('accepts a well-formed card (deprecated notation: activity-card)', () => {
     const r = validateActivityCard(VALID);
     expect(r.valid).toBe(true);
     expect(r.errors).toHaveLength(0);
+    expect(r.warnings.some(w => w.code === 'DEPRECATED_NOTATION')).toBe(true);
+  });
+
+  it('accepts notation: action-card with action_card block (canonical)', () => {
+    const r = validateActivityCard({
+      notation: 'action-card',
+      action_card: {
+        id: 'ACTION_CARD-EU-PROGRAMME-1',
+        project: 'ACTION-EU-PROGRAMME-1',
+      },
+    });
+    expect(r.valid).toBe(true);
+    expect(r.warnings.some(w => w.code === 'DEPRECATED_NOTATION')).toBe(false);
+  });
+
+  it('accepts action_card block with legacy ACTIVITY_CARD id prefix', () => {
+    const r = validateActivityCard({
+      notation: 'action-card',
+      action_card: {
+        id: 'ACTIVITY_CARD-EU-PROGRAMME-1',
+        project: 'ACTION-EU-PROGRAMME-1',
+      },
+    });
+    expect(r.valid).toBe(true);
   });
 
   it('rejects non-object input', () => {

package/src/activity-card/layout.ts

@@ -183,7 +183,7 @@ export function layoutActivityCard(
     cursorY += height + SECTION_GAP;
   }
 
-  // ── 5. Chain: Drivers → Assessments → Goals → Changes ────────────────────
+  // ── 5. Chain: Drivers → Goals → Changes ──────────────────────────────────
   // Each section is a full-width band with a header label and stacked node rows.
   // An empty section shows a gap indicator ("— not on file") so the author
   // sees which parts of the narrative are missing.
@@ -222,14 +222,10 @@ export function layoutActivityCard(
   }
 
   const { drivers, goals, changes } = card.motivation;
-  const assessments = card.assessments ?? [];
 
   pushChainSection('drivers', 'Drivers', 'What prompted this initiative?',
     drivers.map((d) => ({ id: d.id, name: d.name })));
 
-  pushChainSection('assessments', 'Assessments', 'What is the current gap?',
-    assessments.map((a) => ({ id: a.id, name: a.name, meta: a.observed_at })));
-
   pushChainSection('goals', 'Goals', 'What outcome do we target?',
     goals.map((g) => ({ id: g.id, name: g.name })));
 
@@ -242,9 +238,6 @@ export function layoutActivityCard(
   // Node-level chain edges.
   const driverIdSet = new Set(drivers.map((d) => d.id));
   const goalIdSet = new Set(goals.map((g) => g.id));
-  for (const a of assessments) {
-    if (driverIdSet.has(a.driverId)) chainEdges.push({ sourceId: a.driverId, targetId: a.id });
-  }
   for (const g of goals) {
     for (const did of g.driverIds) {
       if (driverIdSet.has(did)) chainEdges.push({ sourceId: did, targetId: g.id });

package/src/activity-card/resolver.ts

@@ -104,16 +104,17 @@ function collectByNotation(
 }
 
 /**
- * GOAL ids reached by an *active* `activity_goal` relation originating at
- * `fromId`. A relation with a non-null `valid_to` has ended (the activity was
- * re-aimed) and is excluded — the card shows the currently-served goals.
+ * GOAL ids reached by an *active* `action_goal` (or legacy `activity_goal`)
+ * relation originating at `fromId`. A relation with a non-null `valid_to` has
+ * ended (the activity was re-aimed) and is excluded.
  */
 function activeActivityGoals(relations: unknown[], fromId: string): string[] {
   const out: string[] = [];
   for (const doc of relations) {
     if (!isObject(doc)) continue;
     if (str(doc['notation']) !== 'relation') continue;
-    if (str(doc['type']) !== 'activity_goal') continue;
+    const type = str(doc['type']);
+    if (type !== 'action_goal' && type !== 'activity_goal') continue;
     if (str(doc['from']) !== fromId) continue;
     const to = str(doc['to']);
     if (!to) continue;
@@ -125,11 +126,8 @@ function activeActivityGoals(relations: unknown[], fromId: string): string[] {
 }
 
 /**
- * STAKEHOLDER ids + roles reached by an *active* `activity_stakeholder`
- * relation originating at `fromId`. A relation with a non-null `valid_to` has
- * ended and is excluded, so the card shows the project's currently-engaged
- * stakeholders. The optional `role` field on the relation carries the
- * project-role (initiator | owner | sponsor | project_manager).
+ * STAKEHOLDER ids + roles reached by an *active* `action_stakeholder` (or
+ * legacy `activity_stakeholder`) relation originating at `fromId`.
  */
 function activeActivityStakeholders(
   relations: unknown[],
@@ -139,7 +137,8 @@ function activeActivityStakeholders(
   for (const doc of relations) {
     if (!isObject(doc)) continue;
     if (str(doc['notation']) !== 'relation') continue;
-    if (str(doc['type']) !== 'activity_stakeholder') continue;
+    const type = str(doc['type']);
+    if (type !== 'action_stakeholder' && type !== 'activity_stakeholder') continue;
     if (str(doc['from']) !== fromId) continue;
     const to = str(doc['to']);
     if (!to) continue;
@@ -165,20 +164,22 @@ export function resolveActivityCard(
     return { valid: false, errors, warnings };
   }
 
-  const activities = collectByNotation(sources.elements, 'activity');
-  const projectRec = activities.get(projectId);
+  // Look up by canonical `notation: action` first, then legacy `notation: activity`.
+  const actionElements = collectByNotation(sources.elements, 'action');
+  const activityElements = collectByNotation(sources.elements, 'activity');
+  const allActionElements = new Map([...activityElements, ...actionElements]); // action wins on duplicate id
+  const projectRec = allActionElements.get(projectId);
 
-  // PC-001 — project must resolve to an admitted ACTIVITY element after
-  // exhausting the canonical resolution scope (§6.1): canon/elements/**
-  // recursively first, then canon/views/activities/** as secondary fallback.
+  // PC-001 — project must resolve to an admitted ACTION (or legacy ACTIVITY)
+  // element after exhausting the canonical resolution scope (§6.1).
   if (!projectRec) {
     errors.push({
       code: 'PC-001',
       message:
-        `activity_card.project "${projectId}" not found after searching ` +
+        `action_card.project "${projectId}" not found after searching ` +
         `canon/elements/** and canon/views/activities/** — ` +
-        `add a YAML file with notation: activity and id: "${projectId}" ` +
-        `(e.g. canon/elements/05_implementation/activities/${projectId}.yaml)`,
+        `add a YAML file with notation: action and id: "${projectId}" ` +
+        `(e.g. canon/elements/05_implementation/actions/${projectId}.yaml)`,
     });
     return { valid: false, errors, warnings };
   }
@@ -349,13 +350,14 @@ export function resolveActivityCard(
   });
 
   // ── Child activities — parent = project id ──────────────────────────────────
+  // Look in both `notation: action` and legacy `notation: activity` elements.
   const childActivities: ResolvedChildActivity[] = [];
-  for (const [id, rec] of activities) {
+  for (const [id, rec] of allActionElements) {
     if (str(rec['parent']) !== projectId) continue;
     childActivities.push({
       id,
       name: str(rec['name']) ?? id,
-      activity_type: str(rec['activity_type']),
+      activity_type: str(rec['action_type']) ?? str(rec['activity_type']),
       start_date: str(rec['start_date']),
       end_date: str(rec['end_date']),
       owner: str(rec['owner']),
@@ -370,10 +372,19 @@ export function resolveActivityCard(
   // element name, falling back to the id when the element is absent.
   const goalNames = projectGoalIds.map((gid) => str(goalElems.get(gid)?.['name']) ?? gid);
 
-  // ── Stakeholders — active `activity_stakeholder` relations from the project ──
+  // ── Stakeholders — inline `stakeholders: []` on the Action element PLUS active
+  //    `action_stakeholder` / `activity_stakeholder` REL files. Both sources are
+  //    merged; REL entries take precedence (they carry the role field).
   const stakeholderElems = collectByNotation(sources.elements, 'stakeholder');
+  const relStakeholderRefs = activeActivityStakeholders(sources.relations, projectId);
+  const relStakeholderIds = new Set(relStakeholderRefs.map((s) => s.id));
+  const inlineStakeholderIds = strArray(projectRec['stakeholders']).filter((id) => !relStakeholderIds.has(id));
+  const allStakeholderRefs: Array<{ id: string; role?: string }> = [
+    ...relStakeholderRefs,
+    ...inlineStakeholderIds.map((id) => ({ id })),
+  ];
   const stakeholders: ResolvedStakeholder[] = [];
-  for (const { id: sid, role } of activeActivityStakeholders(sources.relations, projectId)) {
+  for (const { id: sid, role } of allStakeholderRefs) {
     const rec = stakeholderElems.get(sid);
     if (!rec) {
       warnings.push({
@@ -401,7 +412,7 @@ export function resolveActivityCard(
     valid_to: validToOk ? (validToRaw as string) : undefined,
     start_date: str(projectRec['start_date']),
     end_date: str(projectRec['end_date']),
-    activity_type: str(projectRec['activity_type']),
+    activity_type: str(projectRec['action_type']) ?? str(projectRec['activity_type']),
     status: str(projectRec['status']),
   };
 

package/src/activity-card/types.ts

@@ -285,7 +285,7 @@ export interface ChainEdge {
  * so the author sees the missing data.
  */
 export interface ChainSectionLayout {
-  type: 'drivers' | 'assessments' | 'goals' | 'changes';
+  type: 'drivers' | 'goals' | 'changes';
   /** Section header label. */
   label: string;
   /** Short question answered by this section, shown in grey after the label. */

package/src/activity-card/validate.ts

@@ -26,8 +26,8 @@ import type { ValidationError, ValidationWarning, ValidationResult } from '../va
 
 export type { ValidationError, ValidationWarning, ValidationResult };
 
-const ACTIVITY_CARD_ID_RE = /^ACTIVITY_CARD(-[A-Z0-9][A-Z0-9_]*)*-\d+$/;
-const ACTIVITY_ID_RE = /^ACTIVITY(-[A-Z0-9][A-Z0-9_]*)*-\d+$/;
+const ACTIVITY_CARD_ID_RE = /^(ACTIVITY_CARD|ACTION_CARD)(-[A-Z0-9][A-Z0-9_]*)*-\d+$/;
+const ACTIVITY_ID_RE = /^(ACTIVITY|ACTION)(-[A-Z0-9][A-Z0-9_]*)*-\d+$/;
 const MILESTONE_ID_RE = /^MILESTONE(-[A-Z0-9][A-Z0-9_]*)*-\d+$/;
 const CHANGE_ID_RE = /^CHANGE(-[A-Z0-9][A-Z0-9_]*)*-\d+$/;
 const DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
@@ -49,37 +49,46 @@ export function validateActivityCard(input: unknown): ValidationResult {
   // ── Header (CONTRACT.md §2) ────────────────────────────────────────────────
   if (!('notation' in raw)) {
     errors.push({ code: 'HDR-001', message: 'notation field is required' });
-  } else if (raw['notation'] !== 'activity-card') {
+  } else if (raw['notation'] !== 'action-card' && raw['notation'] !== 'activity-card') {
     errors.push({
       code: 'HDR-002',
-      message: `notation must be "activity-card", got "${String(raw['notation'])}"`,
+      message: `notation must be "action-card", got "${String(raw['notation'])}"`,
     });
+  } else if (raw['notation'] === 'activity-card') {
+    warnings.push({ code: 'DEPRECATED_NOTATION', message: 'notation: "activity-card" is deprecated — migrate to notation: "action-card"' });
   }
 
-  // ── activity_card block ─────────────────────────────────────────────────────
-  const block = raw['activity_card'];
+  // ── action_card / activity_card block ───────────────────────────────────────
+  // "action_card:" is canonical; "activity_card:" is accepted for compat.
+  const rawBlock = raw['action_card'] ?? raw['activity_card'];
+  if (raw['activity_card'] !== undefined && raw['action_card'] === undefined) {
+    warnings.push({ code: 'DEPRECATED_FIELD', message: 'Root key "activity_card:" is deprecated — rename to "action_card:"' });
+  }
+  const block = rawBlock;
   if (!block || typeof block !== 'object' || Array.isArray(block)) {
-    errors.push({ code: 'AC-001', message: 'Missing required root key: activity_card (object)' });
+    errors.push({ code: 'AC-001', message: 'Missing required root key: action_card (object)' });
     return { valid: false, errors, warnings };
   }
+  // Normalise onto activity_card for downstream (resolver reads doc.activity_card)
+  if (raw['activity_card'] === undefined) raw['activity_card'] = rawBlock;
   const card = block as Record<string, unknown>;
 
   if (!isNonEmptyString(card['id'])) {
-    errors.push({ code: 'AC-002', message: 'activity_card.id is required' });
+    errors.push({ code: 'AC-002', message: 'action_card.id is required' });
   } else if (!ACTIVITY_CARD_ID_RE.test(card['id'])) {
     errors.push({
       code: 'AC-002',
-      message: `activity_card.id "${card['id']}" must match ACTIVITY_CARD-[<middle>-]<INTEGER>`,
+      message: `action_card.id "${card['id']}" must match ACTION_CARD-[<middle>-]<INTEGER> (or legacy ACTIVITY_CARD-…)`,
     });
   }
 
   // PC-001 (document-local half): project present + well-formed.
   if (!isNonEmptyString(card['project'])) {
-    errors.push({ code: 'PC-001', message: 'activity_card.project is required (an ACTIVITY-… id)' });
+    errors.push({ code: 'PC-001', message: 'action_card.project is required (an ACTION-… id)' });
   } else if (!ACTIVITY_ID_RE.test(card['project'])) {
     errors.push({
       code: 'PC-001',
-      message: `activity_card.project "${card['project']}" is malformed; must match ACTIVITY-[<middle>-]<INTEGER>`,
+      message: `action_card.project "${card['project']}" is malformed; must match ACTION-[<middle>-]<INTEGER> (or legacy ACTIVITY-…)`,
     });
   }
 

package/src/capability-map/index.ts

@@ -6,3 +6,14 @@ export type {
 } from './types.js';
 
 export { validateCapabilityMap } from './validate.js';
+
+export type {
+  CapabilityTreeNode,
+  CapabilityTreeEdge,
+  CapabilityTreeLevelCounts,
+  CapabilityTreeLayout,
+} from './layout-tree.js';
+export { layoutCapabilityTree, TREE_NODE_WIDTH, TREE_NODE_HEIGHT, TREE_RANK_SEP, TREE_NODE_SEP } from './layout-tree.js';
+
+export type { RenderCapabilityTreeOptions } from './render-capability-tree.js';
+export { renderCapabilityTreeSvg } from './render-capability-tree.js';

package/src/capability-map/layout-tree.ts

@@ -0,0 +1,114 @@
+import type { CapabilityNode, CapabilityMapHeader } from './types.js';
+
+export const TREE_NODE_WIDTH = 250;
+export const TREE_NODE_HEIGHT = 64;
+/** Gap between sibling columns (node width + rank sep = 330px, matching DSM). */
+export const TREE_RANK_SEP = 80;
+/** Vertical gap between sibling nodes. */
+export const TREE_NODE_SEP = 24;
+
+export interface CapabilityTreeNode {
+  id: string;
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+  data: CapabilityNode;
+  depth: number;
+  hasChildren: boolean;
+  isCollapsed: boolean;
+}
+
+export interface CapabilityTreeEdge {
+  source: string;
+  target: string;
+}
+
+export interface CapabilityTreeLevelCounts {
+  /** Nodes at depth 0–2 (pink band). */
+  band0: number;
+  /** Nodes at depth 3–4 (yellow band). */
+  band1: number;
+  /** Nodes at depth 5+ (blue band). */
+  band2: number;
+}
+
+export interface CapabilityTreeLayout {
+  nodes: CapabilityTreeNode[];
+  edges: CapabilityTreeEdge[];
+  bounds: { x: number; y: number; width: number; height: number };
+  levelCounts: CapabilityTreeLevelCounts;
+}
+
+export function layoutCapabilityTree(
+  map: CapabilityMapHeader,
+  collapsedIds: Set<string> = new Set(),
+): CapabilityTreeLayout {
+  const nodes: CapabilityTreeNode[] = [];
+  const edges: CapabilityTreeEdge[] = [];
+
+  const colNextY = new Map<number, number>();
+  function getNextY(col: number): number {
+    return colNextY.get(col) ?? 0;
+  }
+  function advanceY(col: number, delta: number): void {
+    colNextY.set(col, (colNextY.get(col) ?? 0) + delta);
+  }
+
+  function placeNode(node: CapabilityNode, depth: number): { top: number; bottom: number } {
+    const isCollapsed = collapsedIds.has(node.id);
+    const hasChildren = Boolean(node.children?.length);
+    const visibleChildren = !isCollapsed && node.children?.length ? node.children : [];
+
+    const x = depth * (TREE_NODE_WIDTH + TREE_RANK_SEP);
+
+    if (visibleChildren.length === 0) {
+      const y = getNextY(depth);
+      advanceY(depth, TREE_NODE_HEIGHT + TREE_NODE_SEP);
+      nodes.push({ id: node.id, x, y, width: TREE_NODE_WIDTH, height: TREE_NODE_HEIGHT, data: node, depth, hasChildren, isCollapsed });
+      return { top: y, bottom: y + TREE_NODE_HEIGHT };
+    }
+
+    const childSpans: Array<{ top: number; bottom: number }> = [];
+    for (const child of visibleChildren) {
+      childSpans.push(placeNode(child, depth + 1));
+      edges.push({ source: node.id, target: child.id });
+    }
+
+    const spanTop = Math.min(...childSpans.map(s => s.top));
+    const spanBottom = Math.max(...childSpans.map(s => s.bottom));
+    const parentY = spanTop + (spanBottom - spanTop) / 2 - TREE_NODE_HEIGHT / 2;
+
+    const curColY = getNextY(depth);
+    const finalY = Math.max(parentY, curColY);
+    advanceY(depth, finalY - curColY + TREE_NODE_HEIGHT + TREE_NODE_SEP);
+
+    nodes.push({ id: node.id, x, y: finalY, width: TREE_NODE_WIDTH, height: TREE_NODE_HEIGHT, data: node, depth, hasChildren, isCollapsed });
+    return { top: Math.min(finalY, spanTop), bottom: Math.max(finalY + TREE_NODE_HEIGHT, spanBottom) };
+  }
+
+  for (const root of map.capabilities) {
+    placeNode(root, 0);
+    for (const [col, y] of colNextY) {
+      colNextY.set(col, y + TREE_NODE_SEP);
+    }
+  }
+
+  if (nodes.length === 0) {
+    return { nodes: [], edges: [], bounds: { x: 0, y: 0, width: 0, height: 0 }, levelCounts: { band0: 0, band1: 0, band2: 0 } };
+  }
+
+  const minX = Math.min(...nodes.map(n => n.x));
+  const minY = Math.min(...nodes.map(n => n.y));
+  const maxX = Math.max(...nodes.map(n => n.x + n.width));
+  const maxY = Math.max(...nodes.map(n => n.y + n.height));
+
+  const levelCounts: CapabilityTreeLevelCounts = { band0: 0, band1: 0, band2: 0 };
+  for (const n of nodes) {
+    if (n.depth <= 2) levelCounts.band0++;
+    else if (n.depth <= 4) levelCounts.band1++;
+    else levelCounts.band2++;
+  }
+
+  return { nodes, edges, bounds: { x: minX, y: minY, width: maxX - minX, height: maxY - minY }, levelCounts };
+}