willosborne
diff --git a/‎.github/workflows/automated-release-calm-studio.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/automated-release-calm-studio.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/workflows/build-calm-studio-desktop.yml‎
Lines changed: 2 additions & 0 deletions b/‎.github/workflows/build-calm-studio-desktop.yml‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎.github/workflows/build-calm-studio.yml‎
Lines changed: 4 additions & 0 deletions b/‎.github/workflows/build-calm-studio.yml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎calm-suite/calm-studio/AGENTS.md‎
Lines changed: 11 additions & 1 deletion b/‎calm-suite/calm-studio/AGENTS.md‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎calm-suite/calm-studio/apps/studio/src/lib/io/scalerToml.ts‎
Lines changed: 6 additions & 3 deletions b/‎calm-suite/calm-studio/apps/studio/src/lib/io/scalerToml.ts‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎calm-suite/calm-studio/apps/studio/src/lib/layout/elkLayout.ts‎
Lines changed: 92 additions & 39 deletions b/‎calm-suite/calm-studio/apps/studio/src/lib/layout/elkLayout.ts‎
Lines changed: 92 additions & 39 deletions
diff --git a/‎calm-suite/calm-studio/apps/studio/src/lib/properties/EdgeProperties.svelte‎
Lines changed: 35 additions & 6 deletions b/‎calm-suite/calm-studio/apps/studio/src/lib/properties/EdgeProperties.svelte‎
Lines changed: 35 additions & 6 deletions
diff --git a/‎calm-suite/calm-studio/apps/studio/src/lib/stores/flowState.svelte.test.ts‎
Lines changed: 2 additions & 6 deletions b/‎calm-suite/calm-studio/apps/studio/src/lib/stores/flowState.svelte.test.ts‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎calm-suite/calm-studio/apps/studio/src/lib/stores/flowState.svelte.ts‎
Lines changed: 2 additions & 1 deletion b/‎calm-suite/calm-studio/apps/studio/src/lib/stores/flowState.svelte.ts‎
Lines changed: 2 additions & 1 deletion
@@ -41,6 +41,7 @@ jobs:
 
             - name: Build (in dep order)
               run: |
+                  npm run build --if-present --workspace=@finos/calm-models
                   npm run build --if-present --workspace=@calmstudio/calm-core
                   npm run build --if-present --workspace=@calmstudio/extensions
                   npm run build --if-present --workspace=@calmstudio/mcp
 
@@ -41,6 +41,7 @@ jobs:
                   cache: npm
                   cache-dependency-path: package-lock.json
             - run: npm ci
+            - run: npm run build --if-present --workspace=@finos/calm-models
             - run: npm run build --if-present --workspace=@calmstudio/calm-core
             - name: Build sidecar bundle
               run: npm run build:bundle --workspace=@calmstudio/mcp
@@ -117,6 +118,7 @@ jobs:
 
             - name: Build calm-core and studio (pre-Tauri)
               run: |
+                  npm run build --if-present --workspace=@finos/calm-models
                   npm run build --if-present --workspace=@calmstudio/calm-core
                   npm run build --if-present --workspace=@calmstudio/extensions
                   npm run build --if-present --workspace=@calmstudio/studio
 
@@ -8,13 +8,15 @@ on:
         branches: ['main', 'release*']
         paths:
             - 'calm-suite/calm-studio/**'
+            - 'calm-models/**'
             - '.github/workflows/build-calm-studio.yml'
             - 'package.json'
             - 'package-lock.json'
     push:
         branches: ['main', 'release*']
         paths:
             - 'calm-suite/calm-studio/**'
+            - 'calm-models/**'
             - '.github/workflows/build-calm-studio.yml'
             - 'package.json'
             - 'package-lock.json'
@@ -39,6 +41,7 @@ jobs:
 
             - name: Build (in dep order)
               run: |
+                  npm run build --if-present --workspace=@finos/calm-models
                   npm run build --if-present --workspace=@calmstudio/calm-core
                   npm run build --if-present --workspace=@calmstudio/extensions
                   npm run build --if-present --workspace=@calmstudio/mcp
@@ -91,6 +94,7 @@ jobs:
 
             - name: Build
               run: |
+                  npm run build --if-present --workspace=@finos/calm-models
                   npm run build --if-present --workspace=@calmstudio/calm-core
                   npm run build --if-present --workspace=@calmstudio/extensions
                   npm run build --if-present --workspace=@calmstudio/mcp
 
@@ -26,7 +26,17 @@ All output must conform to CALM 1.2. These are non-negotiable:
 
 **Node types:** `actor`, `ecosystem`, `system`, `service`, `database`, `network`, `ldap`, `webclient`, `data-asset`. Extensions: `fluxnova:engine`, `ai:llm`, etc.
 
-**Relationships:** `connects`, `interacts`, `deployed-in`, `composed-of`, `options`
+**Relationships** — nested form per CALM 1.2 meta-schema. `relationship-type` is an **object** keyed by variant. Exactly one variant key is present:
+
+```json
+{ "unique-id": "...", "relationship-type": { "connects": { "source": { "node": "..." }, "destination": { "node": "..." } } } }
+{ "unique-id": "...", "relationship-type": { "composed-of": { "container": "...", "nodes": ["..."] } } }
+{ "unique-id": "...", "relationship-type": { "interacts": { "actor": "...", "nodes": ["..."] } } }
+{ "unique-id": "...", "relationship-type": { "deployed-in": { "container": "...", "nodes": ["..."] } } }
+{ "unique-id": "...", "relationship-type": { "options": [ ... ] } }
+```
+
+The legacy flat shape (`'relationship-type': 'connects'` + sibling `source`/`destination` strings) is **not valid CALM 1.2** and was removed in #2550. Use the variant accessors `getRelationshipVariant`, `getConnectsEndpoints`, `getContainerAndNodes`, `getActorAndNodes`, `getReferencedNodeIds` from `@calmstudio/calm-core` to traverse relationships generically.
 
 **Protocols:** `HTTP`, `HTTPS`, `FTP`, `SFTP`, `JDBC`, `WebSocket`, `SocketIO`, `LDAP`, `AMQP`, `TLS`, `mTLS`, `TCP`
 
 
@@ -123,10 +123,13 @@ function findConnectedPeers(
 ): CalmNode[] {
 	const peers: CalmNode[] = [];
 	for (const rel of relationships) {
-		if (rel['relationship-type'] !== 'connects') continue;
+		const rt = rel['relationship-type'];
+		if (!('connects' in rt)) continue;
+		const src = rt.connects.source.node;
+		const dst = rt.connects.destination.node;
 		let peerId: string | null = null;
-		if (rel.source === nodeId) peerId = rel.destination;
-		else if (rel.destination === nodeId) peerId = rel.source;
+		if (src === nodeId) peerId = dst;
+		else if (dst === nodeId) peerId = src;
 		if (peerId !== null) {
 			const peer = nodeMap.get(peerId);
 			if (peer) peers.push(peer);
 
@@ -17,7 +17,11 @@
 
 import ELK from 'elkjs/lib/elk.bundled.js';
 import type { ElkNode, ElkExtendedEdge } from 'elkjs/lib/elk.bundled.js';
-import type { CalmArchitecture, CalmRelationship } from '@calmstudio/calm-core';
+import type {
+	CalmArchitecture,
+	CalmRelationship,
+	CalmRelationshipVariant
+} from '@calmstudio/calm-core';
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -26,8 +30,52 @@ export type LayoutDirection = 'DOWN' | 'RIGHT' | 'UP';
 /** Position map: node unique-id -> {x, y, width?, height?} from ELK layout. */
 export type PositionMap = Map<string, { x: number; y: number; width?: number; height?: number }>;
 
-/** The set of CALM edge types that imply containment. */
-const CONTAINMENT_EDGE_TYPES = new Set(['deployed-in', 'composed-of']);
+/** The set of CALM 1.2 variant keys that imply containment. */
+const CONTAINMENT_VARIANTS: ReadonlySet<CalmRelationshipVariant> = new Set([
+	'deployed-in',
+	'composed-of'
+]);
+
+/**
+ * Expand a CALM relationship into flat (source, target) edge pairs for layout.
+ * Mirrors stores/projection.ts but kept local to avoid app→lib coupling.
+ */
+function expandLayoutPairs(
+	rel: CalmRelationship,
+): Array<{ source: string; target: string; variant: CalmRelationshipVariant }> {
+	const rt = rel['relationship-type'];
+	if ('connects' in rt) {
+		return [
+			{
+				source: rt.connects.source.node,
+				target: rt.connects.destination.node,
+				variant: 'connects'
+			}
+		];
+	}
+	if ('composed-of' in rt) {
+		return rt['composed-of'].nodes.map((child) => ({
+			source: rt['composed-of'].container,
+			target: child,
+			variant: 'composed-of' as const
+		}));
+	}
+	if ('deployed-in' in rt) {
+		return rt['deployed-in'].nodes.map((child) => ({
+			source: rt['deployed-in'].container,
+			target: child,
+			variant: 'deployed-in' as const
+		}));
+	}
+	if ('interacts' in rt) {
+		return rt.interacts.nodes.map((peer) => ({
+			source: rt.interacts.actor,
+			target: peer,
+			variant: 'interacts' as const
+		}));
+	}
+	return [];
+}
 
 /** Default node dimensions — sized to fit typical node labels + icons */
 const NODE_WIDTH = 180;
@@ -65,38 +113,43 @@ export async function layoutCalm(
 	const parentChildren = new Map<string, Set<string>>();
 
 	for (const rel of arch.relationships) {
-		if (!CONTAINMENT_EDGE_TYPES.has(rel['relationship-type'])) continue;
-		if (pinnedIds.has(rel.source) || pinnedIds.has(rel.destination)) continue;
-
-		let parentId: string;
-		let childId: string;
-
-		if (rel['relationship-type'] === 'deployed-in') {
-			parentId = rel.destination;
-			childId = rel.source;
-		} else {
-			parentId = rel.source;
-			childId = rel.destination;
-		}
+		for (const pair of expandLayoutPairs(rel)) {
+			if (!CONTAINMENT_VARIANTS.has(pair.variant)) continue;
+			if (pinnedIds.has(pair.source) || pinnedIds.has(pair.target)) continue;
 
-		if (!freeNodeIds.has(parentId) || !freeNodeIds.has(childId)) continue;
+			// In CALM 1.2, composed-of and deployed-in both use `container` as
+			// the source position in the expanded pair → container is parent.
+			const parentId = pair.source;
+			const childId = pair.target;
 
-		childToParent.set(childId, parentId);
-		if (!parentChildren.has(parentId)) {
-			parentChildren.set(parentId, new Set());
+			if (!freeNodeIds.has(parentId) || !freeNodeIds.has(childId)) continue;
+
+			childToParent.set(childId, parentId);
+			if (!parentChildren.has(parentId)) {
+				parentChildren.set(parentId, new Set());
+			}
+			parentChildren.get(parentId)!.add(childId);
 		}
-		parentChildren.get(parentId)!.add(childId);
 	}
 
-	// Non-containment edges (for ELK layout edges)
-	const layoutEdges = arch.relationships.filter(
-		(r) =>
-			!CONTAINMENT_EDGE_TYPES.has(r['relationship-type']) &&
-			freeNodeIds.has(r.source) &&
-			freeNodeIds.has(r.destination) &&
-			!pinnedIds.has(r.source) &&
-			!pinnedIds.has(r.destination)
-	);
+	// Flatten all relationships into (source, target) pairs once, then keep
+	// only the non-containment pairs that connect two free, non-pinned nodes.
+	type LayoutPair = { id: string; source: string; target: string };
+	const layoutEdges: LayoutPair[] = [];
+	for (const rel of arch.relationships) {
+		const pairs = expandLayoutPairs(rel);
+		const multi = pairs.length > 1;
+		pairs.forEach((p, i) => {
+			if (CONTAINMENT_VARIANTS.has(p.variant)) return;
+			if (!freeNodeIds.has(p.source) || !freeNodeIds.has(p.target)) return;
+			if (pinnedIds.has(p.source) || pinnedIds.has(p.target)) return;
+			layoutEdges.push({
+				id: multi ? `${rel['unique-id']}#${i}` : rel['unique-id'],
+				source: p.source,
+				target: p.target
+			});
+		});
+	}
 
 	// Find the direct child of a container that a descendant belongs to.
 	// E.g., for VPC containing subnets containing services,
@@ -150,11 +203,11 @@ export async function layoutCalm(
 			// Add edges between direct children within this container
 			const childSet = children;
 			const innerEdges: ElkExtendedEdge[] = layoutEdges
-				.filter((r) => childSet.has(r.source) && childSet.has(r.destination))
+				.filter((r) => childSet.has(r.source) && childSet.has(r.target))
 				.map((r) => ({
-					id: r['unique-id'],
+					id: r.id,
 					sources: [r.source],
-					targets: [r.destination],
+					targets: [r.target],
 				}));
 
 			// Also find cross-child-container edges: edges between descendants in
@@ -164,11 +217,11 @@ export async function layoutCalm(
 			const allDescendants = getAllDescendants(nodeId);
 			const seenCrossEdgePairs = new Set<string>();
 			for (const r of layoutEdges) {
-				if (childSet.has(r.source) && childSet.has(r.destination)) continue; // already handled
-				if (!allDescendants.has(r.source) || !allDescendants.has(r.destination)) continue;
+				if (childSet.has(r.source) && childSet.has(r.target)) continue; // already handled
+				if (!allDescendants.has(r.source) || !allDescendants.has(r.target)) continue;
 
 				const srcChild = findDirectChildOf(nodeId, r.source);
-				const tgtChild = findDirectChildOf(nodeId, r.destination);
+				const tgtChild = findDirectChildOf(nodeId, r.target);
 				if (!srcChild || !tgtChild || srcChild === tgtChild) continue;
 
 				const pairKey = `${srcChild}->${tgtChild}`;
@@ -268,16 +321,16 @@ export async function layoutCalm(
 	const seenTopEdgePairs = new Set<string>();
 	const topEdges: ElkExtendedEdge[] = [];
 	for (const r of layoutEdges) {
-		if (usedEdgeIds.has(r['unique-id'])) continue;
+		if (usedEdgeIds.has(r.id)) continue;
 		const src = findTopLevelAncestor(r.source, childToParent);
-		const tgt = findTopLevelAncestor(r.destination, childToParent);
+		const tgt = findTopLevelAncestor(r.target, childToParent);
 		// Skip self-loops (both endpoints inside same top-level container)
 		if (src === tgt) continue;
 		const pairKey = `${src}->${tgt}`;
 		if (seenTopEdgePairs.has(pairKey)) continue;
 		seenTopEdgePairs.add(pairKey);
 		topEdges.push({
-			id: r['unique-id'],
+			id: r.id,
 			sources: [src],
 			targets: [tgt],
 		});
 
@@ -8,10 +8,34 @@
 -->
 <script lang="ts">
 	import type { Edge } from '@xyflow/svelte';
-	import type { CalmRelationshipType } from '@calmstudio/calm-core';
+	import type {
+		CalmRelationshipType,
+		CalmRelationshipVariant
+	} from '@calmstudio/calm-core';
 	import { updateEdgeProperty } from '$lib/stores/calmModel.svelte';
 	import ControlsList from './ControlsList.svelte';
 
+	function buildRelationshipType(
+		variant: CalmRelationshipVariant,
+		source: string,
+		target: string,
+	): CalmRelationshipType {
+		switch (variant) {
+			case 'connects':
+				return {
+					connects: { source: { node: source }, destination: { node: target } },
+				};
+			case 'composed-of':
+				return { 'composed-of': { container: source, nodes: [target] } };
+			case 'deployed-in':
+				return { 'deployed-in': { container: source, nodes: [target] } };
+			case 'interacts':
+				return { interacts: { actor: source, nodes: [target] } };
+			case 'options':
+				return { options: [] };
+		}
+	}
+
 	let {
 		edge,
 		onBeforeFirstEdit,
@@ -24,7 +48,7 @@
 		onmutate?: () => void;
 	} = $props();
 
-	const RELATIONSHIP_TYPES: CalmRelationshipType[] = [
+	const RELATIONSHIP_TYPES: CalmRelationshipVariant[] = [
 		'connects',
 		'interacts',
 		'deployed-in',
@@ -72,8 +96,8 @@
 		localProtocol = String(edge.data?.protocol ?? '');
 	});
 
-	const relType: CalmRelationshipType = $derived(
-		(edge.data?.calmRelType ?? edge.type ?? 'connects') as CalmRelationshipType
+	const relType: CalmRelationshipVariant = $derived(
+		(edge.data?.calmVariant ?? edge.type ?? 'connects') as CalmRelationshipVariant
 	);
 	const showProtocol: boolean = $derived(PROTOCOL_TYPES.includes(relType));
 
@@ -88,9 +112,14 @@
 	}
 
 	function handleRelTypeChange(e: Event) {
-		const value = (e.target as HTMLSelectElement).value;
+		const value = (e.target as HTMLSelectElement).value as CalmRelationshipVariant;
 		signalFirstEdit();
-		updateEdgeProperty(edge.id, 'relationship-type', value);
+		// CALM 1.2 nested form: build a fresh relationship-type object using the
+		// edge's current source/target endpoints. Switching variant preserves
+		// connectivity but reshapes the payload (e.g. connects.source.node →
+		// composed-of.container).
+		const nested = buildRelationshipType(value, edge.source, edge.target);
+		updateEdgeProperty(edge.id, 'relationship-type', nested);
 		onmutate?.();
 	}
 
 
@@ -22,15 +22,11 @@ const testArch: CalmArchitecture = {
 	relationships: [
 		{
 			'unique-id': 'rel-1',
-			'relationship-type': 'connects',
-			source: 'node-a',
-			destination: 'node-b',
+			'relationship-type': { connects: { source: { node: 'node-a' }, destination: { node: 'node-b' } } },
 		},
 		{
 			'unique-id': 'rel-2',
-			'relationship-type': 'connects',
-			source: 'node-b',
-			destination: 'node-c',
+			'relationship-type': { connects: { source: { node: 'node-b' }, destination: { node: 'node-c' } } },
 		},
 	],
 	flows: [
 
@@ -9,6 +9,7 @@
  * animated dot overlays with sequence badges on active flow edges.
  */
 import type { CalmArchitecture, CalmTransition } from '@calmstudio/calm-core';
+import { getReferencedNodeIds } from '@calmstudio/calm-core';
 
 // Reactive state — module-level $state so it is shared across all consumers.
 let activeFlowId = $state<string | null>(null);
@@ -61,6 +62,6 @@ export function isNodeInActiveFlow(arch: CalmArchitecture, nodeId: string): bool
 	const flowEdgeIds = getActiveFlowEdgeIds(arch);
 	if (flowEdgeIds.size === 0) return true;
 	return arch.relationships.some(
-		(r) => flowEdgeIds.has(r['unique-id']) && (r.source === nodeId || r.destination === nodeId)
+		(r) => flowEdgeIds.has(r['unique-id']) && getReferencedNodeIds(r).includes(nodeId)
 	);
 }