@elevasis/core 0.2.1 → 0.4.0

package/src/organization-model/__tests__/graph.test.ts

@@ -25,7 +25,7 @@ describe('organization-graph', () => {
       sourceId: 'operations',
       label: 'Operations',
       enabled: true,
-      featureKey: 'operations'
+      featureId: 'operations'
     })
 
     const disabledFeature = graph.nodes.find((node) => node.id === 'feature:seo')
@@ -35,8 +35,10 @@ describe('organization-graph', () => {
       enabled: false
     })
 
-    expect(graph.nodes.find((node) => node.id === 'domain:crm')).toMatchObject({
-      kind: 'domain',
+    // Features now carry semantic data directly (no separate domain nodes)
+    const crmFeature = graph.nodes.find((node) => node.id === 'feature:crm')
+    expect(crmFeature).toMatchObject({
+      kind: 'feature',
       sourceId: 'crm',
       label: 'CRM'
     })
@@ -64,24 +66,24 @@ describe('organization-graph', () => {
         expect.objectContaining({
           kind: 'contains',
           sourceId: 'organization-model',
-          targetId: 'domain:crm'
+          targetId: 'feature:crm'
         }),
         expect.objectContaining({
           kind: 'exposes',
-          sourceId: 'feature:acquisition',
+          sourceId: 'feature:crm',
           targetId: 'surface:crm.pipeline'
         }),
         expect.objectContaining({
           kind: 'references',
           sourceId: 'surface:crm.pipeline',
-          targetId: 'domain:crm'
+          targetId: 'feature:crm'
         })
       ])
     )
   })
 
-  describe('titleCase fallback for feature labels', () => {
-    it('uses titleCase of the feature key when no label is configured', () => {
+  describe('feature labels', () => {
+    it('uses the feature label directly from the unified features array', () => {
       const model = resolveOrganizationModel(
         defineOrganizationModel({
           branding: { organizationName: 'Acme', productName: 'Acme OS', shortName: 'Acme' }
@@ -90,50 +92,75 @@ describe('organization-graph', () => {
 
       const graph = buildOrganizationGraph({ organizationModel: model })
 
-      // All feature keys are single lowercase words with no label overrides by default.
-      // titleCase('acquisition') => 'Acquisition', etc.
-      const featureKeys = ['acquisition', 'delivery', 'operations', 'monitoring', 'settings', 'seo', 'calibration']
-      for (const key of featureKeys) {
-        const node = graph.nodes.find((n) => n.id === `feature:${key}`)
-        expect(node, `feature node for '${key}' should exist`).toBeDefined()
-        // No label override is set, so the label must be the titleCase of the key.
-        const expected = key.charAt(0).toUpperCase() + key.slice(1)
-        expect(node?.label).toBe(expected)
+      // Verify all default features have their labels from the unified feature definitions
+      const expectedLabels: Record<string, string> = {
+        crm: 'CRM',
+        'lead-gen': 'Lead Gen',
+        projects: 'Projects',
+        operations: 'Operations',
+        monitoring: 'Monitoring',
+        settings: 'Settings',
+        seo: 'SEO'
+      }
+
+      for (const [featureId, expectedLabel] of Object.entries(expectedLabels)) {
+        const node = graph.nodes.find((n) => n.id === `feature:${featureId}`)
+        expect(node, `feature node for '${featureId}' should exist`).toBeDefined()
+        expect(node?.label).toBe(expectedLabel)
       }
     })
 
-    it('uses the explicit label from features.labels when one is configured', () => {
+    it('uses the overridden label when a feature label is customized', () => {
       const model = resolveOrganizationModel(
         defineOrganizationModel({
           branding: { organizationName: 'Acme', productName: 'Acme OS', shortName: 'Acme' },
-          features: {
-            labels: { acquisition: 'Lead Generation' }
+          features: [
+            {
+              id: 'crm',
+              label: 'Deals',
+              enabled: true,
+              entityIds: [],
+              surfaceIds: ['crm.pipeline'],
+              resourceIds: [],
+              capabilityIds: []
+            }
+          ],
+          navigation: {
+            defaultSurfaceId: 'crm.pipeline',
+            surfaces: [
+              {
+                id: 'crm.pipeline',
+                label: 'Pipeline',
+                path: '/crm/pipeline',
+                surfaceType: 'graph',
+                featureId: 'crm',
+                featureIds: ['crm'],
+                entityIds: [],
+                resourceIds: [],
+                capabilityIds: []
+              }
+            ],
+            groups: [{ id: 'g', label: 'CRM', placement: 'primary', surfaceIds: ['crm.pipeline'] }]
           }
         })
       )
 
       const graph = buildOrganizationGraph({ organizationModel: model })
 
-      const node = graph.nodes.find((n) => n.id === 'feature:acquisition')
-      expect(node?.label).toBe('Lead Generation')
-
-      // Other features without explicit labels still fall back to titleCase.
-      const deliveryNode = graph.nodes.find((n) => n.id === 'feature:delivery')
-      expect(deliveryNode?.label).toBe('Delivery')
+      const node = graph.nodes.find((n) => n.id === 'feature:crm')
+      expect(node?.label).toBe('Deals')
     })
   })
 
   describe('resource node upsert merging', () => {
     it('keeps resourceMappings label and merges description from commandViewData', () => {
-      // Surface and domain are kept minimal (no cross-references) so that
-      // OrganizationModelSchema bidirectional integrity checks pass. The test
-      // is only exercising resource node merging, not surface/domain linkage.
       const model = resolveOrganizationModel(
         defineOrganizationModel({
-          domains: [
+          features: [
             {
               id: 'operations',
               label: 'Operations',
+              enabled: true,
               color: 'violet',
               entityIds: [],
               surfaceIds: ['operations.command-view'],
@@ -149,8 +176,8 @@ describe('organization-graph', () => {
                 label: 'Command View',
                 path: '/operations/command-view',
                 surfaceType: 'graph',
-                featureKey: 'operations',
-                domainIds: ['operations'],
+                featureId: 'operations',
+                featureIds: ['operations'],
                 entityIds: [],
                 resourceIds: ['workflow-order'],
                 capabilityIds: []
@@ -171,7 +198,7 @@ describe('organization-graph', () => {
               label: 'Order Workflow',
               resourceId: 'workflow-order',
               resourceType: 'workflow',
-              domainIds: ['operations'],
+              featureIds: ['operations'],
               entityIds: [],
               surfaceIds: ['operations.command-view'],
               capabilityIds: []
@@ -209,19 +236,18 @@ describe('organization-graph', () => {
       expect(resourceNodes).toHaveLength(1)
 
       const node = resourceNodes[0]
-      // Label from resourceMappings is a real label (not just the sourceId), so it is preserved.
       expect(node.label).toBe('Order Workflow')
-      // Description was absent in resourceMappings, so it is filled in from commandViewData.
       expect(node.description).toBe('Runtime description from commandViewData')
     })
 
     it('preserves existing non-default label even when commandViewData provides a different name', () => {
       const model = resolveOrganizationModel(
         defineOrganizationModel({
-          domains: [
+          features: [
             {
               id: 'ops',
               label: 'Ops',
+              enabled: true,
               color: 'blue',
               entityIds: [],
               surfaceIds: ['ops.view'],
@@ -237,8 +263,8 @@ describe('organization-graph', () => {
                 label: 'Ops View',
                 path: '/ops/view',
                 surfaceType: 'graph',
-                featureKey: 'operations',
-                domainIds: ['ops'],
+                featureId: 'operations',
+                featureIds: ['ops'],
                 entityIds: [],
                 resourceIds: ['res-a'],
                 capabilityIds: []
@@ -252,7 +278,7 @@ describe('organization-graph', () => {
               label: 'My Custom Label',
               resourceId: 'res-a',
               resourceType: 'workflow',
-              domainIds: ['ops'],
+              featureIds: ['ops'],
               entityIds: [],
               surfaceIds: ['ops.view'],
               capabilityIds: []
@@ -292,13 +318,14 @@ describe('organization-graph', () => {
   })
 
   describe('de-duplication of graph elements', () => {
-    it('creates only one domain node when multiple surfaces reference the same domain', () => {
+    it('creates only one feature node when multiple surfaces reference the same feature', () => {
       const model = resolveOrganizationModel(
         defineOrganizationModel({
-          domains: [
+          features: [
             {
               id: 'crm',
               label: 'CRM',
+              enabled: true,
               color: 'blue',
               entityIds: [],
               surfaceIds: ['crm.pipeline', 'crm.accounts'],
@@ -314,8 +341,8 @@ describe('organization-graph', () => {
                 label: 'Pipeline',
                 path: '/crm/pipeline',
                 surfaceType: 'graph',
-                featureKey: 'acquisition',
-                domainIds: ['crm'],
+                featureId: 'crm',
+                featureIds: ['crm'],
                 entityIds: [],
                 resourceIds: [],
                 capabilityIds: []
@@ -325,8 +352,8 @@ describe('organization-graph', () => {
                 label: 'Accounts',
                 path: '/crm/accounts',
                 surfaceType: 'list',
-                featureKey: 'acquisition',
-                domainIds: ['crm'],
+                featureId: 'crm',
+                featureIds: ['crm'],
                 entityIds: [],
                 resourceIds: [],
                 capabilityIds: []
@@ -339,17 +366,18 @@ describe('organization-graph', () => {
 
       const graph = buildOrganizationGraph({ organizationModel: model })
 
-      const domainNodes = graph.nodes.filter((n) => n.id === 'domain:crm')
-      expect(domainNodes).toHaveLength(1)
+      const featureNodes = graph.nodes.filter((n) => n.id === 'feature:crm')
+      expect(featureNodes).toHaveLength(1)
     })
 
-    it('creates only one entity node when the same entity appears in both a domain and a surface', () => {
+    it('creates only one entity node when the same entity appears in both a feature and a surface', () => {
       const model = resolveOrganizationModel(
         defineOrganizationModel({
-          domains: [
+          features: [
             {
               id: 'crm',
               label: 'CRM',
+              enabled: true,
               color: 'blue',
               entityIds: ['crm.deal'],
               surfaceIds: ['crm.pipeline'],
@@ -365,8 +393,8 @@ describe('organization-graph', () => {
                 label: 'Pipeline',
                 path: '/crm/pipeline',
                 surfaceType: 'graph',
-                featureKey: 'acquisition',
-                domainIds: ['crm'],
+                featureId: 'crm',
+                featureIds: ['crm'],
                 entityIds: ['crm.deal'],
                 resourceIds: [],
                 capabilityIds: []
@@ -386,10 +414,11 @@ describe('organization-graph', () => {
     it('creates only one resource node when the same resource appears in resourceMappings and commandViewData', () => {
       const model = resolveOrganizationModel(
         defineOrganizationModel({
-          domains: [
+          features: [
             {
               id: 'ops',
               label: 'Ops',
+              enabled: true,
               color: 'violet',
               entityIds: [],
               surfaceIds: ['ops.view'],
@@ -405,8 +434,8 @@ describe('organization-graph', () => {
                 label: 'Ops View',
                 path: '/ops/view',
                 surfaceType: 'graph',
-                featureKey: 'operations',
-                domainIds: ['ops'],
+                featureId: 'operations',
+                featureIds: ['ops'],
                 entityIds: [],
                 resourceIds: ['wf-shared'],
                 capabilityIds: []
@@ -420,7 +449,7 @@ describe('organization-graph', () => {
               label: 'Shared Workflow',
               resourceId: 'wf-shared',
               resourceType: 'workflow',
-              domainIds: ['ops'],
+              featureIds: ['ops'],
               entityIds: [],
               surfaceIds: ['ops.view'],
               capabilityIds: []
@@ -463,10 +492,11 @@ describe('organization-graph', () => {
     it('creates a stub resource node with label === resourceId for edges referencing unknown resources', () => {
       const model = resolveOrganizationModel(
         defineOrganizationModel({
-          domains: [
+          features: [
             {
               id: 'ops',
               label: 'Ops',
+              enabled: true,
               color: 'violet',
               entityIds: [],
               surfaceIds: [],
@@ -482,8 +512,8 @@ describe('organization-graph', () => {
                 label: 'Ops View',
                 path: '/ops/view',
                 surfaceType: 'graph',
-                featureKey: 'operations',
-                domainIds: [],
+                featureId: 'operations',
+                featureIds: [],
                 entityIds: [],
                 resourceIds: [],
                 capabilityIds: []
@@ -494,7 +524,6 @@ describe('organization-graph', () => {
         })
       )
 
-      // Both source and target in the edge are NOT listed in any workflow/agent/etc. array.
       const graph = buildOrganizationGraph({
         organizationModel: model,
         commandViewData: {
@@ -529,10 +558,11 @@ describe('organization-graph', () => {
     it('normalizes humanCheckpoints type to human_checkpoint on resource nodes', () => {
       const model = resolveOrganizationModel(
         defineOrganizationModel({
-          domains: [
+          features: [
             {
               id: 'ops',
               label: 'Ops',
+              enabled: true,
               color: 'violet',
               entityIds: [],
               surfaceIds: [],
@@ -548,8 +578,8 @@ describe('organization-graph', () => {
                 label: 'Ops View',
                 path: '/ops/view',
                 surfaceType: 'graph',
-                featureKey: 'operations',
-                domainIds: [],
+                featureId: 'operations',
+                featureIds: [],
                 entityIds: [],
                 resourceIds: [],
                 capabilityIds: []
@@ -591,10 +621,11 @@ describe('organization-graph', () => {
     it('creates a references edge with label and relationshipType for commandViewData edges', () => {
       const model = resolveOrganizationModel(
         defineOrganizationModel({
-          domains: [
+          features: [
             {
               id: 'ops',
               label: 'Ops',
+              enabled: true,
               color: 'violet',
               entityIds: [],
               surfaceIds: [],
@@ -610,8 +641,8 @@ describe('organization-graph', () => {
                 label: 'Ops View',
                 path: '/ops/view',
                 surfaceType: 'graph',
-                featureKey: 'operations',
-                domainIds: [],
+                featureId: 'operations',
+                featureIds: [],
                 entityIds: [],
                 resourceIds: [],
                 capabilityIds: []
@@ -659,11 +690,12 @@ describe('organization-graph', () => {
   it('bridges command view topology into resource nodes and labeled relationship edges', () => {
     const model = resolveOrganizationModel(
       defineOrganizationModel({
-        domains: [
+        features: [
           {
             id: 'operations',
             label: 'Operations',
             description: 'Operational resources, topology, and orchestration visibility',
+            enabled: true,
             color: 'violet',
             entityIds: [],
             surfaceIds: ['operations.command-view'],
@@ -679,8 +711,8 @@ describe('organization-graph', () => {
               label: 'Command View',
               path: '/operations/command-view',
               surfaceType: 'graph',
-              featureKey: 'operations',
-              domainIds: ['operations'],
+              featureId: 'operations',
+              featureIds: ['operations'],
               entityIds: [],
               resourceIds: ['workflow-order'],
               capabilityIds: ['operations.command-view']
@@ -701,7 +733,7 @@ describe('organization-graph', () => {
             label: 'Order Workflow Model',
             resourceId: 'workflow-order',
             resourceType: 'workflow',
-            domainIds: ['operations'],
+            featureIds: ['operations'],
             entityIds: [],
             surfaceIds: ['operations.command-view'],
             capabilityIds: []
@@ -823,7 +855,7 @@ describe('organization-graph', () => {
         expect.objectContaining({
           kind: 'references',
           sourceId: 'resource:agent-order',
-          targetId: 'domain:operations'
+          targetId: 'feature:operations'
         }),
         expect.objectContaining({
           kind: 'references',
@@ -849,7 +881,7 @@ describe('organization-graph', () => {
         expect.objectContaining({
           kind: 'maps_to',
           sourceId: 'resource:workflow-order',
-          targetId: 'domain:operations'
+          targetId: 'feature:operations'
         }),
         expect.objectContaining({
           kind: 'maps_to',

package/src/organization-model/__tests__/resolve.test.ts

@@ -17,16 +17,19 @@ describe('organization-model', () => {
     expect(model.branding.organizationName).toBe('Acme')
     expect(model.crm.pipelines[0]?.stages).toHaveLength(6)
     expect(model.navigation.defaultSurfaceId).toBe('crm.pipeline')
-    expect(model.features.enabled.operations).toBe(true)
+
+    const operationsFeature = model.features.find((f) => f.id === 'operations')
+    expect(operationsFeature?.enabled).toBe(true)
   })
 
   it('replaces arrays when a downstream override supplies a full slice', () => {
     const model = resolveOrganizationModel({
-      domains: [
+      features: [
         {
           id: 'crm',
           label: 'CRM',
           description: 'Custom CRM workspace',
+          enabled: true,
           color: 'blue',
           entityIds: [],
           surfaceIds: ['custom.home'],
@@ -42,7 +45,7 @@ describe('organization-model', () => {
             label: 'Home',
             path: '/home',
             surfaceType: 'page',
-            domainIds: ['crm'],
+            featureIds: ['crm'],
             entityIds: [],
             resourceIds: [],
             capabilityIds: []
@@ -65,10 +68,10 @@ describe('organization-model', () => {
       expect(model.branding.organizationName).toBe('Default Organization')
       expect(model.branding.productName).toBe('Elevasis')
       expect(model.branding.shortName).toBe('Elevasis')
-      expect(model.domains).toHaveLength(4)
+      expect(model.features).toHaveLength(7)
       expect(model.navigation.defaultSurfaceId).toBe('crm.pipeline')
-      expect(model.navigation.surfaces).toHaveLength(5)
-      expect(model.navigation.groups).toHaveLength(2)
+      expect(model.navigation.surfaces).toHaveLength(22)
+      expect(model.navigation.groups).toHaveLength(4)
     })
 
     it('preserves sibling fields when overriding a nested property', () => {
@@ -84,15 +87,13 @@ describe('organization-model', () => {
     })
 
     it('replaces arrays entirely rather than merging', () => {
-      // Override domains with a single-item array that has no surfaceIds, so no
-      // cross-reference validation is needed. This proves the array is replaced (1 item)
-      // rather than merged/concatenated (would be 5 = 4 defaults + 1).
       const model = resolveOrganizationModel({
-        domains: [
+        features: [
           {
             id: 'crm',
             label: 'CRM',
             description: 'CRM only',
+            enabled: true,
             color: 'blue',
             entityIds: [],
             surfaceIds: [],
@@ -108,7 +109,7 @@ describe('organization-model', () => {
               label: 'Home',
               path: '/home',
               surfaceType: 'page',
-              domainIds: [],
+              featureIds: [],
               entityIds: [],
               resourceIds: [],
               capabilityIds: []
@@ -118,8 +119,8 @@ describe('organization-model', () => {
         }
       })
 
-      expect(model.domains).toHaveLength(1)
-      expect(model.domains[0]?.id).toBe('crm')
+      expect(model.features).toHaveLength(1)
+      expect(model.features[0]?.id).toBe('crm')
     })
 
     it('ignores undefined values in the override', () => {
@@ -136,15 +137,13 @@ describe('organization-model', () => {
   })
 
   describe('navigation group normalization', () => {
-    // A self-consistent single-surface override: one domain pointing at one surface,
-    // one surface pointing back at that domain. Groups are intentionally NOT overridden
-    // so normalization fires.
     const singleSurfaceOverride = {
-      domains: [
+      features: [
         {
           id: 'crm',
           label: 'CRM',
           description: 'CRM workspace',
+          enabled: true,
           color: 'blue',
           entityIds: [],
           surfaceIds: ['crm.pipeline'],
@@ -160,22 +159,17 @@ describe('organization-model', () => {
             label: 'Pipeline',
             path: '/crm/pipeline',
             surfaceType: 'graph' as const,
-            domainIds: ['crm'],
+            featureIds: ['crm'],
             entityIds: [],
             resourceIds: [],
             capabilityIds: []
           }
         ]
-        // groups intentionally omitted — normalization must filter inherited groups
+        // groups intentionally omitted -- normalization must filter inherited groups
       }
     }
 
     it('filters inherited groups to match overridden surfaces', () => {
-      // Only crm.pipeline is present. The default 'primary-workspace' group references
-      // crm.pipeline, lead-gen.lists, and projects.index. After normalization it should
-      // only contain crm.pipeline.
-      // The 'primary-operations' group references operations surfaces that are now gone,
-      // so it should be dropped entirely.
       const model = resolveOrganizationModel(singleSurfaceOverride)
 
       expect(model.navigation.surfaces).toHaveLength(1)
@@ -190,21 +184,19 @@ describe('organization-model', () => {
     it('removes groups with no valid surface references', () => {
       const model = resolveOrganizationModel(singleSurfaceOverride)
 
-      // The operations group (operations.organization-graph, operations.command-view)
-      // references surfaces not present in the override — it must be removed entirely
+      // The operations group references surfaces not present in the override -- it must be removed
       const operationsGroup = model.navigation.groups.find((g) => g.id === 'primary-operations')
       expect(operationsGroup).toBeUndefined()
     })
 
     it('skips normalization when groups are explicitly overridden', () => {
-      // When groups are explicitly provided alongside surfaces, normalization is skipped.
-      // The group references only crm.pipeline (which is in the surface list).
       const model = resolveOrganizationModel({
-        domains: [
+        features: [
           {
             id: 'crm',
             label: 'CRM',
             description: 'CRM workspace',
+            enabled: true,
             color: 'blue',
             entityIds: [],
             surfaceIds: ['crm.pipeline'],
@@ -220,7 +212,7 @@ describe('organization-model', () => {
               label: 'Pipeline',
               path: '/crm/pipeline',
               surfaceType: 'graph',
-              domainIds: ['crm'],
+              featureIds: ['crm'],
               entityIds: [],
               resourceIds: [],
               capabilityIds: []
@@ -237,7 +229,6 @@ describe('organization-model', () => {
         }
       })
 
-      // Groups come from the override exactly — no filtering applied
       expect(model.navigation.groups).toHaveLength(1)
       expect(model.navigation.groups[0]?.id).toBe('custom-group')
       expect(model.navigation.groups[0]?.surfaceIds).toEqual(['crm.pipeline'])

package/src/organization-model/contracts.ts

@@ -0,0 +1,3 @@
+export const PROJECTS_FEATURE_ID = 'projects' as const
+export const PROJECTS_INDEX_SURFACE_ID = 'projects.index' as const
+export const DELIVERY_PROJECTS_VIEW_CAPABILITY_ID = 'delivery.projects.view' as const