@elevasis/core 0.24.1 → 0.26.0

package/src/organization-model/__tests__/domains/systems.test.ts

@@ -118,13 +118,12 @@ describe('SystemStatusSchema', () => {
   })
 })
 
-describe('resolveOrganizationModel - systems domain integration', () => {
-  it('omitting systems keeps default system entries', () => {
-    const model = resolveOrganizationModel({})
-
-    expect(Object.keys(model.systems).length).toBeGreaterThan(Object.keys(DEFAULT_ORGANIZATION_MODEL_SYSTEMS).length)
-    expect(model.systems['sales.crm']?.path).toBe('/crm')
-  })
+describe('resolveOrganizationModel - systems domain integration', () => {
+  it('omitting systems keeps the generic systems domain empty', () => {
+    const model = resolveOrganizationModel({})
+
+    expect(model.systems).toEqual(DEFAULT_ORGANIZATION_MODEL_SYSTEMS)
+  })
 
   it('accepts valid responsible role, knowledge, and goal references', () => {
     expect(() =>

package/src/organization-model/__tests__/flatten-additive-merge.test.ts

@@ -24,7 +24,7 @@ import type { DeepPartial, OrganizationModel } from '../types'
 
 describe('flatten: deepMerge produces additive-by-id behavior across all 9 flattened domains', () => {
   // Phase 4 (D1): 'statuses' top-level field removed from OrganizationModel.
-  // Status data moved into system.content as (schema:status-flow) / (schema:status) nodes.
+  // Status data moved into System.ontology.catalogTypes.
   // The remaining 8 domains are all Record<string, Entry> after the flatten.
   const FLATTENED_DOMAINS = [
     'systems',
@@ -59,12 +59,9 @@ describe('flatten: deepMerge produces additive-by-id behavior across all 9 flatt
       }
     })
 
-    expect(Object.keys(model.systems)).toHaveLength(baseSize + 1)
-    expect(model.systems['tenant.workspace']?.label).toBe('Tenant Workspace')
-    // Default systems survive
-    expect(model.systems['dashboard']).toBeDefined()
-    expect(model.systems['operations']).toBeDefined()
-  })
+    expect(Object.keys(model.systems)).toHaveLength(baseSize + 1)
+    expect(model.systems['tenant.workspace']?.label).toBe('Tenant Workspace')
+  })
 
   it('merges a tenant role additively without clobbering default roles', () => {
     const baseSize = Object.keys(DEFAULT_ORGANIZATION_MODEL.roles).length
@@ -83,11 +80,10 @@ describe('flatten: deepMerge produces additive-by-id behavior across all 9 flatt
     expect(model.roles['role.tenant-lead']?.title).toBe('Tenant Lead')
   })
 
-  it('merges a tenant action additively while preserving the default action catalog', () => {
-    const baseSize = Object.keys(DEFAULT_ORGANIZATION_MODEL.actions).length
-    expect(baseSize).toBeGreaterThan(0)
-
-    const model = resolveOrganizationModel({
+  it('merges a tenant action additively while preserving the default action catalog', () => {
+    const baseSize = Object.keys(DEFAULT_ORGANIZATION_MODEL.actions).length
+
+    const model = resolveOrganizationModel({
       actions: {
         'tenant.custom-action': {
           id: 'tenant.custom-action',
@@ -98,12 +94,10 @@ describe('flatten: deepMerge produces additive-by-id behavior across all 9 flatt
         }
       }
     })
-
-    expect(Object.keys(model.actions)).toHaveLength(baseSize + 1)
-    expect(model.actions['tenant.custom-action']?.label).toBe('Custom Action')
-    expect(model.actions['lead-gen.company.source']).toBeDefined()
-    expect(model.actions['send_reply']).toBeDefined()
-  })
+
+    expect(Object.keys(model.actions)).toHaveLength(baseSize + 1)
+    expect(model.actions['tenant.custom-action']?.label).toBe('Custom Action')
+  })
 
   it('overrides an existing system by id (last write wins on the same map key)', () => {
     const model = resolveOrganizationModel({
@@ -119,29 +113,23 @@ describe('flatten: deepMerge produces additive-by-id behavior across all 9 flatt
     })
 
     expect(model.systems['dashboard']?.label).toBe('Tenant Dashboard')
-    // Other defaults remain
-    expect(model.systems['operations']).toBeDefined()
-  })
-
-  it('merges nested fields within a single entry deeply (not replacing the whole entry)', () => {
-    // Overriding only `label` on a default system preserves its other fields.
-    const defaultDashboard = DEFAULT_ORGANIZATION_MODEL.systems['dashboard']
-    expect(defaultDashboard).toBeDefined()
-
-    const model = resolveOrganizationModel({
-      systems: {
-        dashboard: {
-          id: 'dashboard',
-          order: defaultDashboard!.order,
-          label: 'Renamed'
-        }
-      }
-    })
-
-    const merged = model.systems['dashboard']
-    expect(merged?.label).toBe('Renamed')
-    // Path from defaults survives because object merge is deep per-key.
-    expect(merged?.path).toBe(defaultDashboard!.path)
+  })
+
+  it('adds a complete system entry when no generic default entry exists', () => {
+    const model = resolveOrganizationModel({
+      systems: {
+        dashboard: {
+          id: 'dashboard',
+          order: 10,
+          label: 'Renamed',
+          path: '/'
+        }
+      }
+    })
+
+    const merged = model.systems['dashboard']
+    expect(merged?.label).toBe('Renamed')
+    expect(merged?.path).toBe('/')
   })
 
   it('confirms no special-case mergeSystemsById helper exists in resolve.ts', async () => {
@@ -216,23 +204,18 @@ describe('flatten: deepMerge produces additive-by-id behavior across all 9 flatt
     })
   })
 
-  it('override entry omitting order preserves the base order value', () => {
-    const baseOrder = DEFAULT_ORGANIZATION_MODEL.systems['dashboard']!.order
-
-    const override: DeepPartial<OrganizationModel> = {
-      systems: {
-        dashboard: {
-          id: 'dashboard',
-          label: 'Renamed Dashboard'
+  it('override entry omitting required order is rejected when no base entry exists', () => {
+    const override: DeepPartial<OrganizationModel> = {
+      systems: {
+        dashboard: {
+          id: 'dashboard',
+          label: 'Renamed Dashboard'
         }
       }
     }
 
-    const resolved = resolveOrganizationModel(override)
-
-    expect(resolved.systems['dashboard']!.order).toBe(baseOrder)
-    expect(resolved.systems['dashboard']!.label).toBe('Renamed Dashboard')
-  })
+    expect(() => resolveOrganizationModel(override)).toThrow()
+  })
 
   it('throws when system map key does not match the entry id', () => {
     const badOverride: DeepPartial<OrganizationModel> = {
@@ -255,13 +238,20 @@ describe('flatten: deepMerge produces additive-by-id behavior across all 9 flatt
     // deepMerge hits Array.isArray(existing) => returns override value directly.
     const singleRef = [{ actionId: 'lead-gen.company.source', intent: 'exposes' as const }]
 
-    const override: DeepPartial<OrganizationModel> = {
-      systems: {
-        'sales.lead-gen': {
-          id: 'sales.lead-gen',
-          order: DEFAULT_ORGANIZATION_MODEL.systems['sales.lead-gen']!.order,
-          label: 'Lead Gen',
-          actions: singleRef
+    const override: DeepPartial<OrganizationModel> = {
+      actions: {
+        'lead-gen.company.source': {
+          id: 'lead-gen.company.source',
+          order: 10,
+          label: 'Source companies'
+        }
+      },
+      systems: {
+        'sales.lead-gen': {
+          id: 'sales.lead-gen',
+          order: 10,
+          label: 'Lead Gen',
+          actions: singleRef
         }
       }
     }
@@ -280,23 +270,21 @@ describe('flatten: deepMerge produces additive-by-id behavior across all 9 flatt
     expect(withEmpty.systems).toEqual(withNone.systems)
   })
 
-  it('field set to undefined in override is skipped and retains the base value', () => {
-    const basePath = DEFAULT_ORGANIZATION_MODEL.systems['dashboard']!.path
-
-    const override: DeepPartial<OrganizationModel> = {
-      systems: {
-        dashboard: {
-          id: 'dashboard',
-          order: DEFAULT_ORGANIZATION_MODEL.systems['dashboard']!.order,
-          label: 'Dashboard',
-          path: undefined
+  it('field set to undefined in override is skipped and retains the base value', () => {
+    const override: DeepPartial<OrganizationModel> = {
+      systems: {
+        dashboard: {
+          id: 'dashboard',
+          order: 10,
+          label: 'Dashboard',
+          path: undefined
         }
       }
     }
 
-    const resolved = resolveOrganizationModel(override)
-
-    expect(resolved.systems['dashboard']!.path).toBe(basePath)
+    const resolved = resolveOrganizationModel(override)
+
+    expect(resolved.systems['dashboard']!.path).toBeUndefined()
   })
 
   it('simultaneous override of systems, roles, and actions merges each domain independently without cross-contamination', () => {
@@ -343,12 +331,12 @@ describe('flatten: deepMerge produces additive-by-id behavior across all 9 flatt
     const replacementInvocations = [{ kind: 'slash-command' as const, command: '/custom-source' }]
 
     const override: DeepPartial<OrganizationModel> = {
-      actions: {
-        'lead-gen.company.source': {
-          id: 'lead-gen.company.source',
-          order: DEFAULT_ORGANIZATION_MODEL.actions['lead-gen.company.source']!.order,
-          label: 'Source companies',
-          invocations: replacementInvocations
+      actions: {
+        'lead-gen.company.source': {
+          id: 'lead-gen.company.source',
+          order: 10,
+          label: 'Source companies',
+          invocations: replacementInvocations
         }
       }
     }

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

@@ -1,11 +1,77 @@
 import { describe, expect, it } from 'vitest'
-import { createFoundationOrganizationModel } from '../foundation'
-
-describe('createFoundationOrganizationModel', () => {
-  it('builds the foundation model from derived sidebar navigation', () => {
-    const result = createFoundationOrganizationModel({
-      branding: { organizationName: 'Acme', productName: 'Acme OS', shortName: 'Acme' }
-    })
+import { createFoundationOrganizationModel } from '../foundation'
+
+const foundationFixture = {
+  branding: { organizationName: 'Acme', productName: 'Acme OS', shortName: 'Acme' },
+  systems: {
+    dashboard: { id: 'dashboard', order: 10, label: 'Dashboard', lifecycle: 'active' as const },
+    sales: { id: 'sales', order: 20, label: 'Sales', lifecycle: 'active' as const },
+    clients: { id: 'clients', order: 30, label: 'Clients', lifecycle: 'active' as const },
+    projects: { id: 'projects', order: 40, label: 'Projects', lifecycle: 'active' as const },
+    operations: { id: 'operations', order: 50, label: 'Operations', lifecycle: 'active' as const },
+    'settings.account': { id: 'settings.account', order: 60, label: 'Account', lifecycle: 'active' as const }
+  },
+  navigation: {
+    sidebar: {
+      primary: {
+        dashboard: {
+          type: 'surface' as const,
+          label: 'Dashboard',
+          path: '/',
+          surfaceType: 'dashboard' as const,
+          order: 10,
+          targets: { systems: ['dashboard'] }
+        },
+        sales: {
+          type: 'surface' as const,
+          label: 'Sales',
+          path: '/sales',
+          surfaceType: 'page' as const,
+          order: 20,
+          targets: { systems: ['sales'] }
+        },
+        clients: {
+          type: 'surface' as const,
+          label: 'Clients',
+          path: '/clients',
+          surfaceType: 'list' as const,
+          order: 30,
+          targets: { systems: ['clients'] }
+        },
+        projects: {
+          type: 'surface' as const,
+          label: 'Projects',
+          path: '/projects',
+          surfaceType: 'page' as const,
+          order: 40,
+          targets: { systems: ['projects'] }
+        },
+        'operations-overview': {
+          type: 'surface' as const,
+          label: 'Operations',
+          path: '/operations',
+          surfaceType: 'page' as const,
+          order: 50,
+          targets: { systems: ['operations'] }
+        }
+      },
+      bottom: {
+        'settings-account': {
+          type: 'surface' as const,
+          label: 'Account',
+          path: '/settings/account',
+          surfaceType: 'settings' as const,
+          order: 10,
+          targets: { systems: ['settings.account'] }
+        }
+      }
+    }
+  }
+}
+
+describe('createFoundationOrganizationModel', () => {
+  it('builds the foundation model from derived sidebar navigation', () => {
+    const result = createFoundationOrganizationModel(foundationFixture)
 
     expect(result.canonical.branding.organizationName).toBe('Acme')
     expect(result.homeLabel).toBe('Dashboard')
@@ -27,13 +93,11 @@ describe('createFoundationOrganizationModel', () => {
 
   it.skip('passes deeper overrides through to the canonical model (deferred - Phase 4: sales domain removed)', () => {
     // Previously tested: result.canonical.sales.pipelines.
-    // Re-enable with a content-node based pipeline override test if needed.
+    // Re-enable with an ontology catalog based pipeline override test if needed.
   })
 
-  it('exposes a working getOrganizationSurface lookup', () => {
-    const result = createFoundationOrganizationModel({
-      branding: { organizationName: 'Acme', productName: 'Acme OS', shortName: 'Acme' }
-    })
+  it('exposes a working getOrganizationSurface lookup', () => {
+    const result = createFoundationOrganizationModel(foundationFixture)
 
     const clientsSurface = result.getOrganizationSurface('clients')
     expect(clientsSurface).toBeDefined()
@@ -44,8 +108,11 @@ describe('createFoundationOrganizationModel', () => {
   })
 
   it('does not require hardcoded system-backed foundation surfaces', () => {
-    const result = createFoundationOrganizationModel({
-      navigation: {
+    const result = createFoundationOrganizationModel({
+      systems: {
+        dashboard: { id: 'dashboard', order: 10, label: 'Dashboard', lifecycle: 'active' }
+      },
+      navigation: {
         sidebar: {
           primary: {
             dashboard: {