eventmodeler 0.2.3 → 0.2.5

package/dist/slices/show-completeness/index.js

@@ -7,38 +7,92 @@ const INCOMING_FLOW_TYPES = {
     processor: ['ReadModelToProcessor'],
 };
 function findElementByName(model, name) {
+    // Check for UUID lookup (id:prefix or full UUID format)
+    if (name.startsWith('id:')) {
+        const idSearch = name.slice(3).toLowerCase();
+        // Search all element types by ID
+        for (const cmd of model.commands.values()) {
+            if (cmd.id.toLowerCase().startsWith(idSearch)) {
+                return { element: { id: cmd.id, name: cmd.name, fields: cmd.fields, type: 'command' }, ambiguous: [] };
+            }
+        }
+        for (const evt of model.events.values()) {
+            if (evt.id.toLowerCase().startsWith(idSearch)) {
+                return { element: { id: evt.id, name: evt.name, fields: evt.fields, type: 'event' }, ambiguous: [] };
+            }
+        }
+        for (const rm of model.readModels.values()) {
+            if (rm.id.toLowerCase().startsWith(idSearch)) {
+                return { element: { id: rm.id, name: rm.name, fields: rm.fields, type: 'readModel', canonicalId: rm.canonicalId }, ambiguous: [] };
+            }
+        }
+        for (const scr of model.screens.values()) {
+            if (scr.id.toLowerCase().startsWith(idSearch)) {
+                return { element: { id: scr.id, name: scr.name, fields: scr.fields, type: 'screen' }, ambiguous: [] };
+            }
+        }
+        for (const proc of model.processors.values()) {
+            if (proc.id.toLowerCase().startsWith(idSearch)) {
+                return { element: { id: proc.id, name: proc.name, fields: proc.fields, type: 'processor' }, ambiguous: [] };
+            }
+        }
+        return { element: null, ambiguous: [] };
+    }
+    // Check if it's a full UUID
+    const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    if (uuidPattern.test(name)) {
+        const cmd = model.commands.get(name);
+        if (cmd)
+            return { element: { id: cmd.id, name: cmd.name, fields: cmd.fields, type: 'command' }, ambiguous: [] };
+        const evt = model.events.get(name);
+        if (evt)
+            return { element: { id: evt.id, name: evt.name, fields: evt.fields, type: 'event' }, ambiguous: [] };
+        const rm = model.readModels.get(name);
+        if (rm)
+            return { element: { id: rm.id, name: rm.name, fields: rm.fields, type: 'readModel', canonicalId: rm.canonicalId }, ambiguous: [] };
+        const scr = model.screens.get(name);
+        if (scr)
+            return { element: { id: scr.id, name: scr.name, fields: scr.fields, type: 'screen' }, ambiguous: [] };
+        const proc = model.processors.get(name);
+        if (proc)
+            return { element: { id: proc.id, name: proc.name, fields: proc.fields, type: 'processor' }, ambiguous: [] };
+        return { element: null, ambiguous: [] };
+    }
+    // Case-insensitive exact name match across all types
     const nameLower = name.toLowerCase();
-    // Search commands
+    const matches = [];
     for (const cmd of model.commands.values()) {
-        if (cmd.name.toLowerCase() === nameLower || cmd.name.toLowerCase().includes(nameLower)) {
-            return { id: cmd.id, name: cmd.name, fields: cmd.fields, type: 'command' };
+        if (cmd.name.toLowerCase() === nameLower) {
+            matches.push({ element: { id: cmd.id, name: cmd.name, fields: cmd.fields, type: 'command' }, type: 'command' });
         }
     }
-    // Search events
     for (const evt of model.events.values()) {
-        if (evt.name.toLowerCase() === nameLower || evt.name.toLowerCase().includes(nameLower)) {
-            return { id: evt.id, name: evt.name, fields: evt.fields, type: 'event' };
+        if (evt.name.toLowerCase() === nameLower) {
+            matches.push({ element: { id: evt.id, name: evt.name, fields: evt.fields, type: 'event' }, type: 'event' });
         }
     }
-    // Search read models
     for (const rm of model.readModels.values()) {
-        if (rm.name.toLowerCase() === nameLower || rm.name.toLowerCase().includes(nameLower)) {
-            return { id: rm.id, name: rm.name, fields: rm.fields, type: 'readModel' };
+        if (rm.name.toLowerCase() === nameLower) {
+            matches.push({ element: { id: rm.id, name: rm.name, fields: rm.fields, type: 'readModel', canonicalId: rm.canonicalId }, type: 'readModel' });
         }
     }
-    // Search screens
     for (const scr of model.screens.values()) {
-        if (scr.name.toLowerCase() === nameLower || scr.name.toLowerCase().includes(nameLower)) {
-            return { id: scr.id, name: scr.name, fields: scr.fields, type: 'screen' };
+        if (scr.name.toLowerCase() === nameLower) {
+            matches.push({ element: { id: scr.id, name: scr.name, fields: scr.fields, type: 'screen' }, type: 'screen' });
         }
     }
-    // Search processors
     for (const proc of model.processors.values()) {
-        if (proc.name.toLowerCase() === nameLower || proc.name.toLowerCase().includes(nameLower)) {
-            return { id: proc.id, name: proc.name, fields: proc.fields, type: 'processor' };
+        if (proc.name.toLowerCase() === nameLower) {
+            matches.push({ element: { id: proc.id, name: proc.name, fields: proc.fields, type: 'processor' }, type: 'processor' });
         }
     }
-    return null;
+    if (matches.length === 1) {
+        return { element: matches[0].element, ambiguous: [] };
+    }
+    if (matches.length > 1) {
+        return { element: null, ambiguous: matches };
+    }
+    return { element: null, ambiguous: [] };
 }
 function getSourceFields(model, sourceId) {
     const cmd = model.commands.get(sourceId);
@@ -69,6 +123,95 @@ function flattenFields(fields, prefix = '') {
     }
     return result;
 }
+/**
+ * Calculates completeness for a read model using the union approach.
+ * A field is satisfied if ANY incoming event provides it.
+ * For linked copies, considers flows into ALL nodes in the canonical group.
+ */
+function calculateReadModelUnionCompleteness(model, readModelId, readModelFields, canonicalId) {
+    // Find all node IDs in the canonical group (original + all copies)
+    let targetNodeIds;
+    if (canonicalId) {
+        targetNodeIds = [...model.readModels.values()]
+            .filter(rm => rm.canonicalId === canonicalId)
+            .map(rm => rm.id);
+    }
+    else {
+        targetNodeIds = [readModelId];
+    }
+    // Find all incoming EventToReadModel flows to ANY node in the group
+    const incomingFlows = [...model.flows.values()].filter(f => targetNodeIds.includes(f.targetId) && f.flowType === 'EventToReadModel');
+    // Collect all source fields from all incoming events (union)
+    const allSourceFields = [];
+    const allManualMappings = [];
+    const sourceEventNames = [];
+    for (const flow of incomingFlows) {
+        const sourceFields = getSourceFields(model, flow.sourceId);
+        allSourceFields.push(...flattenFields(sourceFields));
+        if (flow.fieldMappings) {
+            allManualMappings.push(...flow.fieldMappings);
+        }
+        // Get event name for reporting
+        const event = model.events.get(flow.sourceId);
+        if (event && !sourceEventNames.includes(event.name)) {
+            sourceEventNames.push(event.name);
+        }
+    }
+    // Check each target field against the union of all sources
+    const flatTarget = flattenFields(readModelFields);
+    const untraceableFields = [];
+    const optionalMissingFields = [];
+    const fieldStatuses = [];
+    for (const { id, path, field } of flatTarget) {
+        // 1. Generated fields don't need a source
+        if (field.isGenerated) {
+            fieldStatuses.push({ fieldId: id, fieldName: path, status: 'generated' });
+            continue;
+        }
+        // 2. Check if there's a manual mapping from any flow
+        const manualMapping = allManualMappings.find(m => m.targetFieldId === id);
+        if (manualMapping) {
+            const sourceField = allSourceFields.find(sf => sf.id === manualMapping.sourceFieldId);
+            fieldStatuses.push({
+                fieldId: id,
+                fieldName: path,
+                status: 'satisfied',
+                sourceFieldId: manualMapping.sourceFieldId,
+                sourceFieldName: sourceField?.path,
+            });
+            continue;
+        }
+        // 3. Check auto-mapping by path match from any source
+        const autoMatch = allSourceFields.find(sf => sf.path === path);
+        if (autoMatch) {
+            fieldStatuses.push({
+                fieldId: id,
+                fieldName: path,
+                status: 'satisfied',
+                sourceFieldId: autoMatch.id,
+                sourceFieldName: autoMatch.path,
+            });
+            continue;
+        }
+        // 4. Optional fields missing is a warning, not an error
+        if (field.isOptional) {
+            optionalMissingFields.push(path);
+            fieldStatuses.push({ fieldId: id, fieldName: path, status: 'optional-missing' });
+            continue;
+        }
+        // Field is untraceable (required but no source)
+        untraceableFields.push(path);
+        fieldStatuses.push({ fieldId: id, fieldName: path, status: 'unsatisfied' });
+    }
+    return {
+        isComplete: untraceableFields.length === 0,
+        hasWarnings: optionalMissingFields.length > 0,
+        untraceableFields,
+        optionalMissingFields,
+        sourceEvents: sourceEventNames,
+        fieldStatuses,
+    };
+}
 function calculateFlowCompleteness(model, flow, targetFields, sourceFields) {
     const flatSource = flattenFields(sourceFields);
     const flatTarget = flattenFields(targetFields);
@@ -159,16 +302,153 @@ function calculateFlowCompleteness(model, flow, targetFields, sourceFields) {
 }
 export function showCompleteness(model, elementName, format) {
     // Find the element by name (searches all element types)
-    const element = findElementByName(model, elementName);
+    const { element, ambiguous } = findElementByName(model, elementName);
+    if (ambiguous.length > 0) {
+        console.error(`Error: Multiple elements found with name "${elementName}"`);
+        console.error('Please specify using the element ID:');
+        for (const match of ambiguous) {
+            console.error(`  - "${match.element.name}" (${match.type}) (id: ${match.element.id})`);
+        }
+        console.error('');
+        console.error(`Usage: eventmodeler show completeness "id:${ambiguous[0].element.id.slice(0, 8)}"`);
+        process.exit(1);
+    }
     if (!element) {
-        console.error(`Error: Element not found: ${elementName}`);
-        console.error('Search looked in: commands, events, read models, screens, processors');
+        console.error(`Error: Element not found: "${elementName}"`);
+        // List all available elements with their IDs
+        const allElements = [];
+        for (const cmd of model.commands.values()) {
+            allElements.push({ name: cmd.name, type: 'command', id: cmd.id });
+        }
+        for (const evt of model.events.values()) {
+            allElements.push({ name: evt.name, type: 'event', id: evt.id });
+        }
+        for (const rm of model.readModels.values()) {
+            allElements.push({ name: rm.name, type: 'read model', id: rm.id });
+        }
+        for (const scr of model.screens.values()) {
+            allElements.push({ name: scr.name, type: 'screen', id: scr.id });
+        }
+        for (const proc of model.processors.values()) {
+            allElements.push({ name: proc.name, type: 'processor', id: proc.id });
+        }
+        if (allElements.length > 0) {
+            console.error('Available elements:');
+            for (const el of allElements) {
+                console.error(`  - "${el.name}" (${el.type}) (id: ${el.id.slice(0, 8)})`);
+            }
+        }
+        else {
+            console.error('No elements exist in the model.');
+        }
         process.exit(1);
     }
-    // Find all incoming flows for this element type
+    const elementTypeLabel = element.type === 'readModel' ? 'read-model' : element.type;
+    // For read models, use union completeness (all incoming events combined)
+    if (element.type === 'readModel') {
+        const unionResult = calculateReadModelUnionCompleteness(model, element.id, element.fields, element.canonicalId);
+        // Check if there are any incoming flows at all
+        let targetNodeIds;
+        if (element.canonicalId) {
+            targetNodeIds = [...model.readModels.values()]
+                .filter(rm => rm.canonicalId === element.canonicalId)
+                .map(rm => rm.id);
+        }
+        else {
+            targetNodeIds = [element.id];
+        }
+        const hasIncomingFlows = [...model.flows.values()].some(f => targetNodeIds.includes(f.targetId) && f.flowType === 'EventToReadModel');
+        if (!hasIncomingFlows) {
+            if (format === 'json') {
+                outputJson({
+                    elementType: elementTypeLabel,
+                    name: element.name,
+                    message: `No flows into this ${elementTypeLabel}`
+                });
+            }
+            else {
+                console.log(`<completeness ${elementTypeLabel}="${escapeXml(element.name)}">`);
+                console.log(`  <no-flows>No flows into this ${elementTypeLabel}</no-flows>`);
+                console.log('</completeness>');
+            }
+            return;
+        }
+        const overallStatus = unionResult.isComplete ? 'complete' : 'incomplete';
+        const flatTargetFields = flattenFields(element.fields);
+        if (format === 'json') {
+            outputJson({
+                elementType: elementTypeLabel,
+                name: element.name,
+                status: overallStatus,
+                ...(unionResult.hasWarnings ? { hasWarnings: true } : {}),
+                sourceEvents: unionResult.sourceEvents,
+                ...(unionResult.untraceableFields.length > 0 ? { untraceableFields: unionResult.untraceableFields } : {}),
+                ...(unionResult.optionalMissingFields.length > 0 ? { optionalMissingFields: unionResult.optionalMissingFields } : {}),
+                fieldStatuses: unionResult.fieldStatuses.map(f => ({
+                    name: f.fieldName,
+                    status: f.status,
+                    ...(f.sourceFieldName ? { source: f.sourceFieldName } : {})
+                })),
+                elementFields: flatTargetFields.map(({ id, path, field }) => ({
+                    id,
+                    name: path,
+                    type: field.fieldType,
+                    ...(field.isList ? { isList: true } : {}),
+                    ...(field.isOptional ? { isOptional: true } : {}),
+                    ...(field.isGenerated ? { isGenerated: true } : {})
+                }))
+            });
+            return;
+        }
+        // XML output for read models
+        console.log(`<completeness ${elementTypeLabel}="${escapeXml(element.name)}" status="${overallStatus}"${unionResult.hasWarnings ? ' hasWarnings="true"' : ''}>`);
+        console.log('  <source-events>');
+        for (const eventName of unionResult.sourceEvents) {
+            console.log(`    <event name="${escapeXml(eventName)}"/>`);
+        }
+        console.log('  </source-events>');
+        if (unionResult.untraceableFields.length > 0) {
+            console.log('  <untraceable-fields>');
+            for (const fieldName of unionResult.untraceableFields) {
+                console.log(`    <field name="${escapeXml(fieldName)}"/>`);
+            }
+            console.log('  </untraceable-fields>');
+        }
+        if (unionResult.optionalMissingFields.length > 0) {
+            console.log('  <optional-missing-fields>');
+            for (const fieldName of unionResult.optionalMissingFields) {
+                console.log(`    <field name="${escapeXml(fieldName)}"/>`);
+            }
+            console.log('  </optional-missing-fields>');
+        }
+        console.log('  <field-statuses>');
+        for (const field of unionResult.fieldStatuses) {
+            if (field.sourceFieldName) {
+                console.log(`    <field name="${escapeXml(field.fieldName)}" status="${field.status}" source="${escapeXml(field.sourceFieldName)}"/>`);
+            }
+            else {
+                console.log(`    <field name="${escapeXml(field.fieldName)}" status="${field.status}"/>`);
+            }
+        }
+        console.log('  </field-statuses>');
+        console.log(`  <${elementTypeLabel}-fields>`);
+        for (const { id, path, field } of flatTargetFields) {
+            const attrs = [`id="${id}"`, `name="${escapeXml(path)}"`, `type="${field.fieldType}"`];
+            if (field.isList)
+                attrs.push('isList="true"');
+            if (field.isOptional)
+                attrs.push('isOptional="true"');
+            if (field.isGenerated)
+                attrs.push('isGenerated="true"');
+            console.log(`    <field ${attrs.join(' ')}/>`);
+        }
+        console.log(`  </${elementTypeLabel}-fields>`);
+        console.log('</completeness>');
+        return;
+    }
+    // For non-read-model elements, use per-flow completeness
     const validFlowTypes = INCOMING_FLOW_TYPES[element.type];
     const incomingFlows = [...model.flows.values()].filter(f => f.targetId === element.id && validFlowTypes.includes(f.flowType));
-    const elementTypeLabel = element.type === 'readModel' ? 'read-model' : element.type;
     if (incomingFlows.length === 0) {
         if (format === 'json') {
             outputJson({
@@ -278,14 +558,22 @@ export function showModelCompleteness(model, format) {
     const incompleteFlows = [];
     let completeCount = 0;
     let totalCount = 0;
+    // For read models, we use union completeness - track which canonical groups we've processed
+    const processedReadModelGroups = new Set();
+    const incompleteReadModels = [];
+    let readModelCompleteCount = 0;
+    let readModelTotalCount = 0;
     for (const flow of allFlows) {
+        // Skip EventToReadModel flows - we handle read models separately with union logic
+        if (flow.flowType === 'EventToReadModel') {
+            continue;
+        }
         // Get target element info
         let targetName = 'Unknown';
         let targetType = 'unknown';
         let targetFields = [];
         const targetCmd = model.commands.get(flow.targetId);
         const targetEvt = model.events.get(flow.targetId);
-        const targetRm = model.readModels.get(flow.targetId);
         const targetScr = model.screens.get(flow.targetId);
         const targetProc = model.processors.get(flow.targetId);
         if (targetCmd) {
@@ -298,11 +586,6 @@ export function showModelCompleteness(model, format) {
             targetType = 'event';
             targetFields = targetEvt.fields;
         }
-        else if (targetRm) {
-            targetName = targetRm.name;
-            targetType = 'read-model';
-            targetFields = targetRm.fields;
-        }
         else if (targetScr) {
             targetName = targetScr.name;
             targetType = 'screen';
@@ -334,13 +617,51 @@ export function showModelCompleteness(model, format) {
             });
         }
     }
+    // Process read models with union completeness
+    // Group read models by canonicalId (or use id if no canonicalId)
+    for (const rm of model.readModels.values()) {
+        const groupKey = rm.canonicalId ?? rm.id;
+        // Skip if we've already processed this canonical group
+        if (processedReadModelGroups.has(groupKey)) {
+            continue;
+        }
+        processedReadModelGroups.add(groupKey);
+        // Check if this read model has any incoming EventToReadModel flows
+        let targetNodeIds;
+        if (rm.canonicalId) {
+            targetNodeIds = [...model.readModels.values()]
+                .filter(r => r.canonicalId === rm.canonicalId)
+                .map(r => r.id);
+        }
+        else {
+            targetNodeIds = [rm.id];
+        }
+        const hasIncomingFlows = allFlows.some(f => targetNodeIds.includes(f.targetId) && f.flowType === 'EventToReadModel');
+        if (!hasIncomingFlows) {
+            // No incoming flows - skip this read model
+            continue;
+        }
+        readModelTotalCount++;
+        const unionResult = calculateReadModelUnionCompleteness(model, rm.id, rm.fields, rm.canonicalId);
+        if (unionResult.isComplete) {
+            readModelCompleteCount++;
+        }
+        else {
+            incompleteReadModels.push({
+                name: rm.name,
+                untraceableFields: unionResult.untraceableFields,
+                sourceEvents: unionResult.sourceEvents,
+            });
+        }
+    }
     const incompleteCount = totalCount - completeCount;
+    const readModelIncompleteCount = readModelTotalCount - readModelCompleteCount;
     if (format === 'json') {
         outputJson({
             summary: {
-                complete: completeCount,
-                incomplete: incompleteCount,
-                total: totalCount
+                complete: completeCount + readModelCompleteCount,
+                incomplete: incompleteCount + readModelIncompleteCount,
+                total: totalCount + readModelTotalCount
             },
             incompleteFlows: incompleteFlows.map(item => ({
                 from: item.sourceName,
@@ -348,12 +669,19 @@ export function showModelCompleteness(model, format) {
                 targetType: item.targetType,
                 flowType: item.flow.flowType,
                 unsatisfiedFields: item.unsatisfiedFields
-            }))
+            })),
+            ...(incompleteReadModels.length > 0 ? {
+                incompleteReadModels: incompleteReadModels.map(item => ({
+                    name: item.name,
+                    untraceableFields: item.untraceableFields,
+                    sourceEvents: item.sourceEvents
+                }))
+            } : {})
         });
         return;
     }
     console.log('<model-completeness>');
-    console.log(`  <summary complete="${completeCount}" incomplete="${incompleteCount}" total="${totalCount}"/>`);
+    console.log(`  <summary complete="${completeCount + readModelCompleteCount}" incomplete="${incompleteCount + readModelIncompleteCount}" total="${totalCount + readModelTotalCount}"/>`);
     if (incompleteFlows.length > 0) {
         console.log('  <incomplete-flows>');
         for (const item of incompleteFlows) {
@@ -369,5 +697,23 @@ export function showModelCompleteness(model, format) {
         }
         console.log('  </incomplete-flows>');
     }
+    if (incompleteReadModels.length > 0) {
+        console.log('  <incomplete-read-models>');
+        for (const item of incompleteReadModels) {
+            console.log(`    <read-model name="${escapeXml(item.name)}">`);
+            console.log('      <untraceable-fields>');
+            for (const fieldName of item.untraceableFields) {
+                console.log(`        <field name="${escapeXml(fieldName)}"/>`);
+            }
+            console.log('      </untraceable-fields>');
+            console.log('      <source-events>');
+            for (const eventName of item.sourceEvents) {
+                console.log(`        <event name="${escapeXml(eventName)}"/>`);
+            }
+            console.log('      </source-events>');
+            console.log('    </read-model>');
+        }
+        console.log('  </incomplete-read-models>');
+    }
     console.log('</model-completeness>');
 }

package/dist/slices/show-event/index.js

@@ -1,4 +1,5 @@
 import { escapeXml, outputJson } from '../../lib/format.js';
+import { findElementOrExit } from '../../lib/element-lookup.js';
 function formatFieldXml(field, indent) {
     const attrs = [
         `name="${escapeXml(field.name)}"`,
@@ -56,7 +57,7 @@ function findAggregateForEvent(model, event) {
 function formatEventXml(model, event) {
     const aggregate = findAggregateForEvent(model, event);
     const aggregateAttr = aggregate ? ` aggregate="${escapeXml(aggregate.name)}"` : '';
-    let xml = `<event name="${escapeXml(event.name)}"${aggregateAttr}>\n`;
+    let xml = `<event id="${event.id}" name="${escapeXml(event.name)}"${aggregateAttr}>\n`;
     if (event.fields.length > 0) {
         xml += '  <fields>\n';
         for (const field of event.fields) {
@@ -88,22 +89,13 @@ function formatEventXml(model, event) {
     return xml;
 }
 export function showEvent(model, name, format) {
-    const events = [...model.events.values()];
-    const nameLower = name.toLowerCase();
-    const event = events.find(e => e.name.toLowerCase() === nameLower || e.name.toLowerCase().includes(nameLower));
-    if (!event) {
-        console.error(`Error: Event not found: ${name}`);
-        console.error('Available events:');
-        for (const e of events) {
-            console.error(`  - ${e.name}`);
-        }
-        process.exit(1);
-    }
+    const event = findElementOrExit(model.events, name, 'event');
     if (format === 'json') {
         const aggregate = findAggregateForEvent(model, event);
         const incomingFlows = [...model.flows.values()].filter(f => f.targetId === event.id);
         const outgoingFlows = [...model.flows.values()].filter(f => f.sourceId === event.id);
         const result = {
+            id: event.id,
             name: event.name,
             fields: event.fields.map(fieldToJson)
         };

package/dist/slices/show-slice/index.js

@@ -1,4 +1,5 @@
 import { escapeXml, outputJson } from '../../lib/format.js';
+import { findElementOrExit } from '../../lib/element-lookup.js';
 function formatFieldValues(values) {
     if (!values || Object.keys(values).length === 0)
         return '';
@@ -120,7 +121,7 @@ function formatSliceXml(model, slice) {
             model.processors.get(id)?.name ??
             id);
     }
-    let xml = `<slice name="${escapeXml(slice.name)}" status="${slice.status}">\n`;
+    let xml = `<slice id="${slice.id}" name="${escapeXml(slice.name)}" status="${slice.status}">\n`;
     xml += '  <components>\n';
     for (const screen of components.screens) {
         // Check if this is a linked copy
@@ -135,7 +136,7 @@ function formatSliceXml(model, slice) {
         // Check which actor this screen belongs to
         const actor = findActorForScreen(model, screen);
         const actorAttr = actor ? ` actor="${escapeXml(actor.name)}"` : '';
-        xml += `    <screen name="${escapeXml(screen.name)}"${copyAttr}${originAttr}${actorAttr}>\n`;
+        xml += `    <screen id="${screen.id}" name="${escapeXml(screen.name)}"${copyAttr}${originAttr}${actorAttr}>\n`;
         if (screen.fields.length > 0) {
             xml += '      <fields>\n';
             for (const field of screen.fields) {
@@ -146,7 +147,7 @@ function formatSliceXml(model, slice) {
         xml += '    </screen>\n';
     }
     for (const command of components.commands) {
-        xml += `    <command name="${escapeXml(command.name)}">\n`;
+        xml += `    <command id="${command.id}" name="${escapeXml(command.name)}">\n`;
         if (command.fields.length > 0) {
             xml += '      <fields>\n';
             for (const field of command.fields) {
@@ -177,7 +178,7 @@ function formatSliceXml(model, slice) {
         // Check which aggregate this event belongs to
         const aggregate = findAggregateForEvent(model, event);
         const aggregateAttr = aggregate ? ` aggregate="${escapeXml(aggregate.name)}"` : '';
-        xml += `    <event name="${escapeXml(event.name)}"${copyAttr}${originAttr}${aggregateAttr}>\n`;
+        xml += `    <event id="${event.id}" name="${escapeXml(event.name)}"${copyAttr}${originAttr}${aggregateAttr}>\n`;
         if (event.fields.length > 0) {
             xml += '      <fields>\n';
             for (const field of event.fields) {
@@ -208,7 +209,7 @@ function formatSliceXml(model, slice) {
                 originAttr = ` origin-slice="${escapeXml(originSlice.name)}"`;
             }
         }
-        xml += `    <read-model name="${escapeXml(readModel.name)}"${copyAttr}${originAttr}>\n`;
+        xml += `    <read-model id="${readModel.id}" name="${escapeXml(readModel.name)}"${copyAttr}${originAttr}>\n`;
         if (readModel.fields.length > 0) {
             xml += '      <fields>\n';
             for (const field of readModel.fields) {
@@ -219,7 +220,7 @@ function formatSliceXml(model, slice) {
         xml += '    </read-model>\n';
     }
     for (const processor of components.processors) {
-        xml += `    <processor name="${escapeXml(processor.name)}">\n`;
+        xml += `    <processor id="${processor.id}" name="${escapeXml(processor.name)}">\n`;
         if (processor.fields.length > 0) {
             xml += '      <fields>\n';
             for (const field of processor.fields) {
@@ -337,11 +338,13 @@ function formatSliceJson(model, slice) {
             id);
     }
     const result = {
+        id: slice.id,
         name: slice.name,
         status: slice.status,
         components: {
             screens: components.screens.map(screen => {
                 const screenObj = {
+                    id: screen.id,
                     name: screen.name,
                     fields: screen.fields.map(fieldToJson)
                 };
@@ -357,11 +360,13 @@ function formatSliceJson(model, slice) {
                 return screenObj;
             }),
             commands: components.commands.map(cmd => ({
+                id: cmd.id,
                 name: cmd.name,
                 fields: cmd.fields.map(fieldToJson)
             })),
             events: components.events.map(event => {
                 const eventObj = {
+                    id: event.id,
                     name: event.name,
                     fields: event.fields.map(fieldToJson)
                 };
@@ -378,6 +383,7 @@ function formatSliceJson(model, slice) {
             }),
             readModels: components.readModels.map(rm => {
                 const rmObj = {
+                    id: rm.id,
                     name: rm.name,
                     fields: rm.fields.map(fieldToJson)
                 };
@@ -390,6 +396,7 @@ function formatSliceJson(model, slice) {
                 return rmObj;
             }),
             processors: components.processors.map(proc => ({
+                id: proc.id,
                 name: proc.name,
                 fields: proc.fields.map(fieldToJson)
             }))
@@ -456,17 +463,7 @@ function formatSliceJson(model, slice) {
     return result;
 }
 export function showSlice(model, name, format) {
-    const slices = [...model.slices.values()];
-    const nameLower = name.toLowerCase();
-    const slice = slices.find(s => s.name.toLowerCase() === nameLower || s.name.toLowerCase().includes(nameLower));
-    if (!slice) {
-        console.error(`Error: Slice not found: ${name}`);
-        console.error('Available slices:');
-        for (const s of slices) {
-            console.error(`  - ${s.name}`);
-        }
-        process.exit(1);
-    }
+    const slice = findElementOrExit(model.slices, name, 'slice');
     if (format === 'json') {
         outputJson(formatSliceJson(model, slice));
         return;