@transitrix/diagrams 1.2.0 → 1.3.0

package/dist/activity-card/__tests__/example.test.js

@@ -61,13 +61,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/dist/activity-card/__tests__/layout.test.js

@@ -82,19 +82,16 @@ describe('layoutActivityCard', () => {
         const l = layoutActivityCard({ ...RESOLVED, cardDescription: undefined });
         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']);
     });
@@ -111,10 +108,6 @@ describe('layoutActivityCard', () => {
         expect(l.chainEdges).toContainEqual({ sourceId: 'FACTOR-EU-MDR-1', targetId: 'GOAL-EU-MARKET-1' });
         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);
         expect(l.milestones).toHaveLength(1);

package/dist/activity-card/__tests__/resolver.test.js

@@ -198,6 +198,31 @@ describe('resolveActivityCard', () => {
         expect(r.resolved.stakeholders).toEqual([{ id: 'STAKEHOLDER-OPS-1', name: 'STAKEHOLDER-OPS-1', role: 'sponsor' }]);
         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, {

package/dist/activity-card/layout.js

@@ -164,7 +164,7 @@ export function layoutActivityCard(card, options) {
         descriptionRow = { label: 'Description', valueLines: lines, x: contentX, y: cursorY, width: contentW, height };
         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.
@@ -192,9 +192,7 @@ export function layoutActivityCard(card, options) {
         cursorY += sectionH + CONNECTOR_H;
     }
     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 })));
     pushChainSection('changes', 'Changes', 'What will change?', changes.map((c) => ({ id: c.id, name: c.name })));
     // Remove trailing CONNECTOR_H — last section connects to milestones with SECTION_GAP.
@@ -202,10 +200,6 @@ export function layoutActivityCard(card, options) {
     // 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))

package/dist/activity-card/resolver.js

@@ -350,10 +350,19 @@ export function resolveActivityCard(doc, sources) {
     // goals referenced only by in-scope changes). Resolve each id to its GOAL
     // 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 = [
+        ...relStakeholderRefs,
+        ...inlineStakeholderIds.map((id) => ({ id })),
+    ];
     const stakeholders = [];
-    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({

package/dist/activity-card/types.d.ts

@@ -214,7 +214,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/dist/fgca/__tests__/parse-canonical.test.js

@@ -143,9 +143,22 @@ describe('parseCanonicalFGCA — edge-driving fields populated', () => {
         expect(parsed.goals[0].factor).toHaveLength(1);
         // goal → change edge
         expect(parsed.changes[0].goal_id).not.toBe(0);
+        expect(parsed.changes[0].goal_id).not.toBe('');
         // change → activity edge
         expect(parsed.changes[0].activity_ids).toHaveLength(1);
     });
+    it('preserves canonical string IDs — not converted to sequential numbers', () => {
+        const r = parseCanonicalFGCA(VALID);
+        expect(r.valid).toBe(true);
+        const parsed = r.parsed;
+        expect(parsed.factors[0].id).toBe('FACTOR-1');
+        expect(parsed.goals[0].id).toBe('GOAL-1');
+        expect(parsed.goals[0].factor[0].id).toBe('FACTOR-1');
+        expect(parsed.changes[0].id).toBe('CHANGE-1');
+        expect(parsed.changes[0].goal_id).toBe('GOAL-1');
+        expect(parsed.changes[0].activity_ids[0]).toBe('ACTIVITY-1');
+        expect(parsed.activities[0].id).toBe('ACTIVITY-1');
+    });
 });
 describe('parseCanonicalFGA', () => {
     const VALID_FGA = {
@@ -218,7 +231,7 @@ describe('parseCanonicalFGA — example file regression', () => {
             expect(r.errors).toEqual([]);
             expect(r.valid).toBe(true);
             // Every activity must carry a goal_id, or the FGA preview draws no edges.
-            expect(r.parsed.activities.every((a) => a.goal_id != null && a.goal_id !== 0)).toBe(true);
+            expect(r.parsed.activities.every((a) => a.goal_id != null && a.goal_id !== 0 && a.goal_id !== '')).toBe(true);
         });
     }
 });

package/dist/fgca/parse-canonical.js

@@ -179,29 +179,19 @@ export function parseCanonicalFGCA(input) {
         }
         return out;
     }
-    // Build internal id-maps (canonical string ID → internal sequential number).
-    const idMap = { toInternal: new Map() };
-    const allCanonicalIds = [...factorIds, ...goalIds, ...changeIds, ...activityIds];
-    allCanonicalIds.forEach((id, i) => idMap.toInternal.set(id, i + 1));
-    function intId(canonical) {
-        const n = idMap.toInternal.get(canonical);
-        if (n === undefined) {
-            // Shouldn't happen — we built the map from the same sets.
-            throw new Error(`internal: canonical id "${canonical}" not mapped`);
-        }
-        return n;
-    }
-    // Layer entries (internal form).
+    // Layer entries (internal form). Canonical string IDs are passed through
+    // directly — no conversion to sequential numbers. The layout and renderer
+    // treat IDs as opaque keys and also display them verbatim to the user.
     const internalFactors = factors.map((el) => ({
-        id: intId(String(el['id'])),
+        id: String(el['id']),
         name: String(el['name'] ?? ''),
     }));
     const internalGoals = goals.map((el, i) => {
         const refIds = checkRefArray(el, 'factors', factorIds, FACTOR_OR_DRIVER_ID_RE, 'FGCA-008', `goals[${i}]`);
         return {
-            id: intId(String(el['id'])),
+            id: String(el['id']),
             name: String(el['name'] ?? ''),
-            factor: refIds.map((r) => ({ id: intId(r) })),
+            factor: refIds.map((r) => ({ id: r })),
         };
     });
     // Build a reverse mapping: which changes does each activity reference (via
@@ -234,19 +224,19 @@ export function parseCanonicalFGCA(input) {
         const canonicalChangeId = String(el['id']);
         const linkedActivityIds = activitiesForChange.get(canonicalChangeId) ?? [];
         return {
-            id: intId(canonicalChangeId),
+            id: canonicalChangeId,
             name: String(el['name'] ?? ''),
-            goal_id: goalRefs.length > 0 ? intId(goalRefs[0]) : 0,
-            activity_ids: linkedActivityIds.map((aid) => intId(aid)),
+            goal_id: goalRefs.length > 0 ? goalRefs[0] : '',
+            activity_ids: linkedActivityIds,
         };
     });
     const internalActivities = activities.map((el, i) => {
         const goalRefs = checkRefArray(el, 'goals', goalIds, GOAL_ID_RE, 'FGCA-011', `actions[${i}]`);
         const typeVal = typeof el['type'] === 'string' ? el['type'] : undefined;
         return {
-            id: intId(String(el['id'])),
+            id: String(el['id']),
             name: String(el['name'] ?? ''),
-            goal_id: goalRefs.length > 0 ? intId(goalRefs[0]) : null,
+            goal_id: goalRefs.length > 0 ? goalRefs[0] : null,
             ...(typeVal !== undefined ? { type: typeVal } : {}),
         };
     });

package/dist/fgca/preview-layout.js

@@ -61,18 +61,67 @@ export function layoutFGCAPreview(inputDoc, options = {}) {
         change: changes.map(c => ({ id: `change_${c.id}`, label: c.name })),
         activity: doc.activities.map(a => ({ id: `activity_${a.id}`, label: a.name })),
     };
+    // Build predecessor map: for each node, which node IDs in the previous column
+    // connect to it from the left. Used for barycenter crossing minimization.
+    const predecessors = new Map();
+    for (const g of doc.goals) {
+        predecessors.set(`goal_${g.id}`, (g.factor ?? []).map(f => `driver_${f.id}`));
+    }
+    if (!hideChanges) {
+        for (const c of changes) {
+            predecessors.set(`change_${c.id}`, [`goal_${c.goal_id}`]);
+        }
+        const coveredActs = new Set(changes.flatMap(c => c.activity_ids.map(String)));
+        for (const a of doc.activities) {
+            const preds = changes
+                .filter(c => c.activity_ids.map(String).includes(String(a.id)))
+                .map(c => `change_${c.id}`);
+            if (a.goal_id != null && !coveredActs.has(String(a.id)))
+                preds.push(`goal_${a.goal_id}`);
+            predecessors.set(`activity_${a.id}`, preds);
+        }
+    }
+    else {
+        const connectedViaChange = new Set();
+        for (const c of changes) {
+            for (const aid of c.activity_ids) {
+                predecessors.set(`activity_${aid}`, [`goal_${c.goal_id}`]);
+                connectedViaChange.add(String(aid));
+            }
+        }
+        for (const a of doc.activities) {
+            if (a.goal_id != null && !connectedViaChange.has(String(a.id))) {
+                predecessors.set(`activity_${a.id}`, [`goal_${a.goal_id}`]);
+            }
+        }
+    }
+    // Sort a column's items by the barycenter of their predecessors' y-centres.
+    // Nodes with no predecessors sort last (Infinity barycenter) so they don't
+    // displace connected nodes.
+    function barycentricSort(items, yCenters) {
+        return [...items].sort((a, b) => {
+            const pA = (predecessors.get(a.id) ?? []).map(p => yCenters.get(p) ?? 0).filter(v => v > 0);
+            const pB = (predecessors.get(b.id) ?? []).map(p => yCenters.get(p) ?? 0).filter(v => v > 0);
+            const bcA = pA.length > 0 ? pA.reduce((s, v) => s + v, 0) / pA.length : Infinity;
+            const bcB = pB.length > 0 ? pB.reduce((s, v) => s + v, 0) / pB.length : Infinity;
+            return bcA - bcB;
+        });
+    }
     const nodeMap = new Map();
     const nodes = [];
     const columns = [];
+    const yCenters = new Map(); // nodeId → y + FGCA_NODE_H / 2
     for (let ci = 0; ci < cols.length; ci++) {
         const col = cols[ci];
         const x = FGCA_PAD + ci * colStride;
         columns.push({ col, x });
+        const items = ci === 0 ? colItems[col] : barycentricSort(colItems[col], yCenters);
         let y = FGCA_PAD + FGCA_HEADER_H + rowGap;
-        for (const item of colItems[col]) {
+        for (const item of items) {
             const node = { id: item.id, x, y, label: item.label, col };
             nodes.push(node);
             nodeMap.set(item.id, node);
+            yCenters.set(item.id, y + FGCA_NODE_H / 2);
             y += FGCA_NODE_H + rowGap;
         }
     }

package/dist/webview/render-activity-card.js

@@ -12,7 +12,7 @@
  * CROSS-DOCUMENT RESOLUTION CAVEAT
  * The Activity Card is the only MULTI-DOCUMENT Studio notation: the card YAML
  * names a project Activity, and the project's name, dates, motivation chain
- * (Drivers → Assessments → Goals → Changes) and child activities are pulled BY
+ * (Drivers → Goals → Changes) and child activities are pulled BY
  * REFERENCE from the canonical element + relation store (`canon/elements/**`,
  * `canon/relations/**`; see `../activity-card/resolver.ts`). That resolution
  * requires reading those files from disk, which is NOT available inside the
@@ -108,10 +108,9 @@ export function renderActivityCardBody(layout, ox, oy) {
             parts.push(`<text class="text-primary" x="${r.x + ox + 12}" y="${r.y + oy + 44 + i * 18}" style="dominant-baseline:central">${escXml(line)}</text>`);
         });
     }
-    // Chain sections (Drivers → Assessments → Goals → Changes).
+    // Chain sections (Drivers → Goals → Changes).
     const SECTION_LEVEL = {
         drivers: 4,
-        assessments: 5,
         goals: 5,
         changes: 6,
     };

package/dist/webview/render-fgca.js

@@ -67,7 +67,7 @@ export function renderFgcaBody(columns, nodes, edges, curvature, entryCurvature)
             `<rect class="diagram-node layer-${n.col}" x="${n.x}" y="${n.y}" width="${NODE_W}" height="${NODE_H}" rx="8"/>`,
             `<text class="text-primary" x="${n.x + NODE_W / 2}" y="${y1}" text-anchor="middle" dominant-baseline="central">${escXml(line1)}</text>`,
             twoLines
-                ? `<text class="text-secondary" x="${n.x + NODE_W / 2}" y="${y2}" text-anchor="middle" dominant-baseline="central">${escXml(line2)}</text>`
+                ? `<text class="text-primary" x="${n.x + NODE_W / 2}" y="${y2}" text-anchor="middle" dominant-baseline="central">${escXml(line2)}</text>`
                 : '',
             `<text class="text-id" x="${n.x + NODE_W / 2}" y="${idY}" text-anchor="middle" dominant-baseline="central">${escXml(entityId)}</text>`,
         ]

package/dist/webview/render-goals.js

@@ -15,12 +15,11 @@ import { horizontalCubicEdgePath, DEFAULT_EDGE_CURVATURE } from '../edge-path.js
 import { generateSvgEmbedCss } from '../theme/index.js';
 import { escXml } from './render-util.js';
 const NODE_W = 250;
-const NODE_H = 60;
+const NODE_H = 72;
 const RANK_SEP = 100;
 const NODE_SEP = 24;
 const PAD = 24;
-const LABEL_MAX = 36;
-const LABEL_TRIM = 34;
+const LABEL_CHARS = 30;
 /**
  * Host-neutral goals renderer (IntelliJ/UI). Lays the tree out with the default
  * spacing, then delegates the actual SVG emission to {@link renderGoalsLayoutSvg}
@@ -81,10 +80,34 @@ export function renderGoalsLayoutSvg(layout, options = {}) {
         const y = n.y + oy;
         const level = n.data.level % 8;
         const labelText = n.data.name ?? String(n.id);
-        const label = labelText.length > LABEL_MAX ? labelText.slice(0, LABEL_TRIM) + '…' : labelText;
+        const words = labelText.split(' ');
+        let line1 = '';
+        let line2 = '';
+        for (const w of words) {
+            if ((line1 + ' ' + w).trim().length <= LABEL_CHARS) {
+                line1 = (line1 + ' ' + w).trim();
+            }
+            else if ((line2 + ' ' + w).trim().length <= LABEL_CHARS) {
+                line2 = (line2 + ' ' + w).trim();
+            }
+            else if (!line2) {
+                line2 = w.slice(0, LABEL_CHARS - 2) + '…';
+                break;
+            }
+        }
+        const twoLines = line2.length > 0;
+        const nameY1 = twoLines ? y + 12 : y + 16;
+        const nameY2 = y + 26;
+        const typeY = twoLines ? y + 43 : y + 35;
+        const idY = twoLines ? y + 59 : y + 55;
+        const typeLabel = n.data.type ?? '';
+        const idText = String(n.data.id);
         return `<g>
   <rect class="diagram-node level-${level}" x="${x}" y="${y}" width="${n.width}" height="${n.height}" rx="8"/>
-  <text class="text-primary" x="${x + n.width / 2}" y="${y + n.height / 2}" text-anchor="middle" dominant-baseline="central">${escXml(label)}</text>
+  <text class="text-primary" x="${x + n.width / 2}" y="${nameY1}" text-anchor="middle" dominant-baseline="central">${escXml(line1)}</text>${twoLines ? `
+  <text class="text-primary" x="${x + n.width / 2}" y="${nameY2}" text-anchor="middle" dominant-baseline="central">${escXml(line2)}</text>` : ''}${typeLabel ? `
+  <text class="text-secondary" x="${x + n.width / 2}" y="${typeY}" text-anchor="middle" dominant-baseline="central">${escXml(typeLabel)}</text>` : ''}
+  <text class="text-id" x="${x + n.width / 2}" y="${idY}" text-anchor="middle" dominant-baseline="central">${escXml(idText)}</text>
 </g>`;
     })
         .join('\n');

package/package.json

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

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, {

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

@@ -372,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({

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/fgca/__tests__/parse-canonical.test.ts

@@ -159,9 +159,23 @@ describe('parseCanonicalFGCA — edge-driving fields populated', () => {
     expect(parsed.goals[0].factor).toHaveLength(1);
     // goal → change edge
     expect(parsed.changes[0].goal_id).not.toBe(0);
+    expect(parsed.changes[0].goal_id).not.toBe('');
     // change → activity edge
     expect(parsed.changes[0].activity_ids).toHaveLength(1);
   });
+
+  it('preserves canonical string IDs — not converted to sequential numbers', () => {
+    const r = parseCanonicalFGCA(VALID);
+    expect(r.valid).toBe(true);
+    const parsed = r.parsed!;
+    expect(parsed.factors[0].id).toBe('FACTOR-1');
+    expect(parsed.goals[0].id).toBe('GOAL-1');
+    expect(parsed.goals[0].factor![0].id).toBe('FACTOR-1');
+    expect(parsed.changes[0].id).toBe('CHANGE-1');
+    expect(parsed.changes[0].goal_id).toBe('GOAL-1');
+    expect(parsed.changes[0].activity_ids[0]).toBe('ACTIVITY-1');
+    expect(parsed.activities[0].id).toBe('ACTIVITY-1');
+  });
 });
 
 describe('parseCanonicalFGA', () => {
@@ -242,7 +256,7 @@ describe('parseCanonicalFGA — example file regression', () => {
       expect(r.errors).toEqual([]);
       expect(r.valid).toBe(true);
       // Every activity must carry a goal_id, or the FGA preview draws no edges.
-      expect(r.parsed!.activities.every((a) => a.goal_id != null && a.goal_id !== 0)).toBe(true);
+      expect(r.parsed!.activities.every((a) => a.goal_id != null && a.goal_id !== 0 && a.goal_id !== '')).toBe(true);
     });
   }
 });

package/src/fgca/parse-canonical.ts

@@ -63,10 +63,6 @@ function asObjectArray(v: unknown): Array<Record<string, unknown>> | null {
   return v.map((el) => (el && typeof el === 'object' ? (el as Record<string, unknown>) : null) as Record<string, unknown>);
 }
 
-interface InternalIdMap {
-  /** Canonical typed-string ID → internal numeric ID for layout consumption. */
-  toInternal: Map<string, number>;
-}
 
 /**
  * Validate canonical FGCA YAML and, on success, return an internal-form
@@ -223,32 +219,20 @@ export function parseCanonicalFGCA(input: unknown): CanonicalFGCAResult {
     return out;
   }
 
-  // Build internal id-maps (canonical string ID → internal sequential number).
-  const idMap: InternalIdMap = { toInternal: new Map() };
-  const allCanonicalIds = [...factorIds, ...goalIds, ...changeIds, ...activityIds];
-  allCanonicalIds.forEach((id, i) => idMap.toInternal.set(id, i + 1));
-
-  function intId(canonical: string): number {
-    const n = idMap.toInternal.get(canonical);
-    if (n === undefined) {
-      // Shouldn't happen — we built the map from the same sets.
-      throw new Error(`internal: canonical id "${canonical}" not mapped`);
-    }
-    return n;
-  }
-
-  // Layer entries (internal form).
+  // Layer entries (internal form). Canonical string IDs are passed through
+  // directly — no conversion to sequential numbers. The layout and renderer
+  // treat IDs as opaque keys and also display them verbatim to the user.
   const internalFactors: DriverItem[] = factors.map((el) => ({
-    id: intId(String(el!['id'])),
+    id: String(el!['id']),
     name: String(el!['name'] ?? ''),
   }));
 
   const internalGoals: GoalItem[] = goals.map((el, i) => {
     const refIds = checkRefArray(el!, 'factors', factorIds, FACTOR_OR_DRIVER_ID_RE, 'FGCA-008', `goals[${i}]`);
     return {
-      id: intId(String(el!['id'])),
+      id: String(el!['id']),
       name: String(el!['name'] ?? ''),
-      factor: refIds.map((r) => ({ id: intId(r) })),
+      factor: refIds.map((r) => ({ id: r })),
     };
   });
 
@@ -284,10 +268,10 @@ export function parseCanonicalFGCA(input: unknown): CanonicalFGCAResult {
     const canonicalChangeId = String(el!['id']);
     const linkedActivityIds = activitiesForChange.get(canonicalChangeId) ?? [];
     return {
-      id: intId(canonicalChangeId),
+      id: canonicalChangeId,
       name: String(el!['name'] ?? ''),
-      goal_id: goalRefs.length > 0 ? intId(goalRefs[0]) : 0,
-      activity_ids: linkedActivityIds.map((aid) => intId(aid)),
+      goal_id: goalRefs.length > 0 ? goalRefs[0] : '',
+      activity_ids: linkedActivityIds,
     };
   });
 
@@ -295,9 +279,9 @@ export function parseCanonicalFGCA(input: unknown): CanonicalFGCAResult {
     const goalRefs = checkRefArray(el!, 'goals', goalIds, GOAL_ID_RE, 'FGCA-011', `actions[${i}]`);
     const typeVal = typeof el!['type'] === 'string' ? el!['type'] : undefined;
     return {
-      id: intId(String(el!['id'])),
+      id: String(el!['id']),
       name: String(el!['name'] ?? ''),
-      goal_id: goalRefs.length > 0 ? intId(goalRefs[0]) : null,
+      goal_id: goalRefs.length > 0 ? goalRefs[0] : null,
       ...(typeVal !== undefined ? { type: typeVal } : {}),
     };
   });

package/src/fgca/preview-layout.ts

@@ -154,19 +154,71 @@ export function layoutFGCAPreview(
     activity: doc.activities.map(a => ({ id: `activity_${a.id}`, label: a.name })),
   };
 
+  // Build predecessor map: for each node, which node IDs in the previous column
+  // connect to it from the left. Used for barycenter crossing minimization.
+  const predecessors = new Map<string, string[]>();
+  for (const g of doc.goals) {
+    predecessors.set(`goal_${g.id}`, (g.factor ?? []).map(f => `driver_${f.id}`));
+  }
+  if (!hideChanges) {
+    for (const c of changes) {
+      predecessors.set(`change_${c.id}`, [`goal_${c.goal_id}`]);
+    }
+    const coveredActs = new Set(changes.flatMap(c => c.activity_ids.map(String)));
+    for (const a of doc.activities) {
+      const preds = changes
+        .filter(c => c.activity_ids.map(String).includes(String(a.id)))
+        .map(c => `change_${c.id}`);
+      if (a.goal_id != null && !coveredActs.has(String(a.id))) preds.push(`goal_${a.goal_id}`);
+      predecessors.set(`activity_${a.id}`, preds);
+    }
+  } else {
+    const connectedViaChange = new Set<string>();
+    for (const c of changes) {
+      for (const aid of c.activity_ids) {
+        predecessors.set(`activity_${aid}`, [`goal_${c.goal_id}`]);
+        connectedViaChange.add(String(aid));
+      }
+    }
+    for (const a of doc.activities) {
+      if (a.goal_id != null && !connectedViaChange.has(String(a.id))) {
+        predecessors.set(`activity_${a.id}`, [`goal_${a.goal_id}`]);
+      }
+    }
+  }
+
+  // Sort a column's items by the barycenter of their predecessors' y-centres.
+  // Nodes with no predecessors sort last (Infinity barycenter) so they don't
+  // displace connected nodes.
+  function barycentricSort(
+    items: Array<{ id: string; label: string }>,
+    yCenters: Map<string, number>,
+  ): Array<{ id: string; label: string }> {
+    return [...items].sort((a, b) => {
+      const pA = (predecessors.get(a.id) ?? []).map(p => yCenters.get(p) ?? 0).filter(v => v > 0);
+      const pB = (predecessors.get(b.id) ?? []).map(p => yCenters.get(p) ?? 0).filter(v => v > 0);
+      const bcA = pA.length > 0 ? pA.reduce((s, v) => s + v, 0) / pA.length : Infinity;
+      const bcB = pB.length > 0 ? pB.reduce((s, v) => s + v, 0) / pB.length : Infinity;
+      return bcA - bcB;
+    });
+  }
+
   const nodeMap = new Map<string, FGCAPreviewNode>();
   const nodes: FGCAPreviewNode[] = [];
   const columns: FGCAPreviewColumnPos[] = [];
+  const yCenters = new Map<string, number>(); // nodeId → y + FGCA_NODE_H / 2
 
   for (let ci = 0; ci < cols.length; ci++) {
     const col = cols[ci];
     const x = FGCA_PAD + ci * colStride;
     columns.push({ col, x });
+    const items = ci === 0 ? colItems[col] : barycentricSort(colItems[col], yCenters);
     let y = FGCA_PAD + FGCA_HEADER_H + rowGap;
-    for (const item of colItems[col]) {
+    for (const item of items) {
       const node: FGCAPreviewNode = { id: item.id, x, y, label: item.label, col };
       nodes.push(node);
       nodeMap.set(item.id, node);
+      yCenters.set(item.id, y + FGCA_NODE_H / 2);
       y += FGCA_NODE_H + rowGap;
     }
   }

package/src/webview/render-activity-card.ts

@@ -12,7 +12,7 @@
  * CROSS-DOCUMENT RESOLUTION CAVEAT
  * The Activity Card is the only MULTI-DOCUMENT Studio notation: the card YAML
  * names a project Activity, and the project's name, dates, motivation chain
- * (Drivers → Assessments → Goals → Changes) and child activities are pulled BY
+ * (Drivers → Goals → Changes) and child activities are pulled BY
  * REFERENCE from the canonical element + relation store (`canon/elements/**`,
  * `canon/relations/**`; see `../activity-card/resolver.ts`). That resolution
  * requires reading those files from disk, which is NOT available inside the
@@ -135,10 +135,9 @@ export function renderActivityCardBody(layout: ActivityCardLayout, ox: number, o
     });
   }
 
-  // Chain sections (Drivers → Assessments → Goals → Changes).
+  // Chain sections (Drivers → Goals → Changes).
   const SECTION_LEVEL: Record<string, number> = {
     drivers: 4,
-    assessments: 5,
     goals: 5,
     changes: 6,
   };

package/src/webview/render-fgca.ts

@@ -90,7 +90,7 @@ export function renderFgcaBody(
         `<rect class="diagram-node layer-${n.col}" x="${n.x}" y="${n.y}" width="${NODE_W}" height="${NODE_H}" rx="8"/>`,
         `<text class="text-primary" x="${n.x + NODE_W / 2}" y="${y1}" text-anchor="middle" dominant-baseline="central">${escXml(line1)}</text>`,
         twoLines
-          ? `<text class="text-secondary" x="${n.x + NODE_W / 2}" y="${y2}" text-anchor="middle" dominant-baseline="central">${escXml(line2)}</text>`
+          ? `<text class="text-primary" x="${n.x + NODE_W / 2}" y="${y2}" text-anchor="middle" dominant-baseline="central">${escXml(line2)}</text>`
           : '',
         `<text class="text-id" x="${n.x + NODE_W / 2}" y="${idY}" text-anchor="middle" dominant-baseline="central">${escXml(entityId)}</text>`,
       ]

package/src/webview/render-goals.ts

@@ -17,12 +17,11 @@ import { generateSvgEmbedCss, type ThemeId } from '../theme/index.js';
 import { escXml } from './render-util.js';
 
 const NODE_W = 250;
-const NODE_H = 60;
+const NODE_H = 72;
 const RANK_SEP = 100;
 const NODE_SEP = 24;
 const PAD = 24;
-const LABEL_MAX = 36;
-const LABEL_TRIM = 34;
+const LABEL_CHARS = 30;
 
 export interface RenderGoalsOptions {
   treeName?: string;
@@ -110,10 +109,32 @@ export function renderGoalsLayoutSvg(layout: GoalTreeLayout, options: RenderGoal
       const y = n.y + oy;
       const level = n.data.level % 8;
       const labelText = n.data.name ?? String(n.id);
-      const label = labelText.length > LABEL_MAX ? labelText.slice(0, LABEL_TRIM) + '…' : labelText;
+      const words = labelText.split(' ');
+      let line1 = '';
+      let line2 = '';
+      for (const w of words) {
+        if ((line1 + ' ' + w).trim().length <= LABEL_CHARS) {
+          line1 = (line1 + ' ' + w).trim();
+        } else if ((line2 + ' ' + w).trim().length <= LABEL_CHARS) {
+          line2 = (line2 + ' ' + w).trim();
+        } else if (!line2) {
+          line2 = w.slice(0, LABEL_CHARS - 2) + '…';
+          break;
+        }
+      }
+      const twoLines = line2.length > 0;
+      const nameY1 = twoLines ? y + 12 : y + 16;
+      const nameY2 = y + 26;
+      const typeY = twoLines ? y + 43 : y + 35;
+      const idY = twoLines ? y + 59 : y + 55;
+      const typeLabel = n.data.type ?? '';
+      const idText = String(n.data.id);
       return `<g>
   <rect class="diagram-node level-${level}" x="${x}" y="${y}" width="${n.width}" height="${n.height}" rx="8"/>
-  <text class="text-primary" x="${x + n.width / 2}" y="${y + n.height / 2}" text-anchor="middle" dominant-baseline="central">${escXml(label)}</text>
+  <text class="text-primary" x="${x + n.width / 2}" y="${nameY1}" text-anchor="middle" dominant-baseline="central">${escXml(line1)}</text>${twoLines ? `
+  <text class="text-primary" x="${x + n.width / 2}" y="${nameY2}" text-anchor="middle" dominant-baseline="central">${escXml(line2)}</text>` : ''}${typeLabel ? `
+  <text class="text-secondary" x="${x + n.width / 2}" y="${typeY}" text-anchor="middle" dominant-baseline="central">${escXml(typeLabel)}</text>` : ''}
+  <text class="text-id" x="${x + n.width / 2}" y="${idY}" text-anchor="middle" dominant-baseline="central">${escXml(idText)}</text>
 </g>`;
     })
     .join('\n');