@elevasis/core 0.35.0 → 0.35.1

package/dist/auth/index.js

@@ -410,6 +410,8 @@ function childSystemsOf(system) {
   return system.systems ?? system.subsystems ?? {};
 }
 function getSystem(model, path) {
+  const flatMatch = model.systems[path];
+  if (flatMatch !== void 0) return flatMatch;
   const segments = path.split(".");
   let current = model.systems;
   let node;

package/dist/index.js

@@ -726,6 +726,8 @@ function childSystemsOf2(system) {
   return system.systems ?? system.subsystems ?? {};
 }
 function getSystem(model, path) {
+  const flatMatch = model.systems[path];
+  if (flatMatch !== void 0) return flatMatch;
   const segments = path.split(".");
   let current = model.systems;
   let node;

package/dist/organization-model/index.js

@@ -726,6 +726,8 @@ function childSystemsOf2(system) {
   return system.systems ?? system.subsystems ?? {};
 }
 function getSystem(model, path) {
+  const flatMatch = model.systems[path];
+  if (flatMatch !== void 0) return flatMatch;
   const segments = path.split(".");
   let current = model.systems;
   let node;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elevasis/core",
-  "version": "0.35.0",
+  "version": "0.35.1",
   "license": "MIT",
   "description": "Minimal shared constants across Elevasis monorepo",
   "sideEffects": false,

package/src/organization-model/__tests__/lookup-helpers.test.ts

@@ -64,6 +64,23 @@ describe('getSystem', () => {
     expect(sys?.label).toBe('Leaf')
   })
 
+  it('returns a flat system whose id contains dots', () => {
+    const model = resolveOrganizationModel({
+      systems: {
+        sales: { id: 'sales', order: 10, label: 'Sales', enabled: true, path: '/sales' },
+        'sales.lead-gen': {
+          id: 'sales.lead-gen',
+          order: 20,
+          label: 'Lead Gen',
+          enabled: true,
+          path: '/lead-gen'
+        }
+      }
+    })
+
+    expect(getSystem(model, 'sales.lead-gen')?.label).toBe('Lead Gen')
+  })
+
   it('returns undefined for unresolved paths', () => {
     const model = makeNestedModel()
     expect(getSystem(model, 'nonexistent')).toBeUndefined()
@@ -90,6 +107,23 @@ describe('getSystemAncestors', () => {
     ])
   })
 
+  it('returns available ancestors for flat dotted system ids', () => {
+    const model = resolveOrganizationModel({
+      systems: {
+        sales: { id: 'sales', order: 10, label: 'Sales', enabled: true, path: '/sales' },
+        'sales.lead-gen': {
+          id: 'sales.lead-gen',
+          order: 20,
+          label: 'Lead Gen',
+          enabled: true,
+          path: '/lead-gen'
+        }
+      }
+    })
+
+    expect(getSystemAncestors(model, 'sales.lead-gen').map((system) => system.label)).toEqual(['Sales', 'Lead Gen'])
+  })
+
   it('returns empty arrays for unresolved paths', () => {
     const model = makeNestedModel()
     expect(getSystemAncestors(model, 'does.not.exist')).toEqual([])

package/src/organization-model/helpers.ts

@@ -149,6 +149,9 @@ export function devOnlyFor(systems: Record<string, OrganizationModelSystemEntry>
  * Returns `undefined` if any segment is missing.
  */
 export function getSystem(model: OrganizationModel, path: string): SystemEntryWithTree | undefined {
+  const flatMatch = (model.systems as Record<string, SystemEntryWithTree>)[path]
+  if (flatMatch !== undefined) return flatMatch
+
   const segments = path.split('.')
   // model.systems is typed as Record<string, OrganizationModelSystemEntry>; cast
   // to SystemEntryWithTree (which extends it with optional content + subsystems).
@@ -171,6 +174,21 @@ export function getSystem(model: OrganizationModel, path: string): SystemEntryWi
  * Returns an empty array if the path cannot be resolved.
  */
 export function getSystemAncestors(model: OrganizationModel, path: string): SystemEntryWithTree[] {
+  const flatMatch = (model.systems as Record<string, SystemEntryWithTree>)[path]
+  if (flatMatch !== undefined) {
+    const ancestorIds = path
+      .split('.')
+      .map((_, index, segments) => segments.slice(0, index + 1).join('.'))
+      .slice(0, -1)
+
+    return [
+      ...ancestorIds
+        .map((ancestorId) => (model.systems as Record<string, SystemEntryWithTree>)[ancestorId])
+        .filter((system): system is SystemEntryWithTree => system !== undefined),
+      flatMatch
+    ]
+  }
+
   const segments = path.split('.')
   const result: SystemEntryWithTree[] = []
   let current: Record<string, SystemEntryWithTree> = model.systems as Record<string, SystemEntryWithTree>

package/src/platform/constants/versions.ts

@@ -1,3 +1,3 @@
-export const VERSION = {
-  CURRENT: '1.12.7'
-}
+export const VERSION = {
+  CURRENT: '1.12.9'
+}

package/src/platform/registry/__tests__/resource-registry.test.ts

@@ -1800,10 +1800,79 @@ describe('ResourceRegistry', () => {
       })
     })
 
-    describe('registerOrganization -- redeploy (register twice)', () => {
-      it('second registerOrganization call replaces previous remote resources', () => {
-        const remoteWorkflowV1 = createMockWorkflow('remote-wf')
-        const remoteWorkflowV2 = createMockWorkflow('remote-wf-v2')
+    describe('registerOrganization -- redeploy (register twice)', () => {
+      it('validates redeploy candidates against the incoming Organization Model snapshot', () => {
+        const registry = new ResourceRegistry({})
+        const remoteConfig = createMockRemoteConfig({ deploymentId: 'deploy-old' })
+        const resourceId = 'remote-wf'
+        const system = {
+          id: 'sales.lead-gen',
+          title: 'Lead Gen',
+          description: 'Lead generation system',
+          kind: 'domain',
+          lifecycle: 'active'
+        } as unknown as SystemEntry
+        const makeResource = (actionId: string): ResourceEntry =>
+          ({
+            id: resourceId,
+            kind: 'workflow',
+            systemPath: system.id,
+            title: 'Remote workflow',
+            description: 'Remote workflow',
+            status: 'active',
+            ontology: {
+              actions: [actionId],
+              primaryAction: actionId
+            }
+          }) as ResourceEntry
+        const makeModel = (resource: ResourceEntry) =>
+          ({
+            systems: { [system.id]: system },
+            resources: { [resource.id]: resource }
+          }) as any
+        const makeDescriptorBackedWorkflow = (resource: ResourceEntry): WorkflowDefinition => {
+          const workflow = createMockWorkflow(resource.id)
+
+          return {
+            ...workflow,
+            config: {
+              ...workflow.config,
+              resource
+            }
+          } as WorkflowDefinition
+        }
+
+        const oldResource = makeResource('sales.lead-gen:action/old-import')
+        const newResource = makeResource('sales.lead-gen:action/new-import')
+
+        registry.registerOrganization(
+          'test-org',
+          {
+            version: '1.0.0',
+            organizationModel: makeModel(oldResource),
+            workflows: [makeDescriptorBackedWorkflow(oldResource)]
+          },
+          remoteConfig
+        )
+
+        expect(() =>
+          registry.registerOrganization(
+            'test-org',
+            {
+              version: '1.0.1',
+              organizationModel: makeModel(newResource),
+              workflows: [makeDescriptorBackedWorkflow(newResource)]
+            },
+            createMockRemoteConfig({ deploymentId: 'deploy-new' })
+          )
+        ).not.toThrow()
+
+        expect(registry.getRemoteConfig('test-org', resourceId)?.deploymentId).toBe('deploy-new')
+      })
+
+      it('second registerOrganization call replaces previous remote resources', () => {
+        const remoteWorkflowV1 = createMockWorkflow('remote-wf')
+        const remoteWorkflowV2 = createMockWorkflow('remote-wf-v2')
 
         const registry = new ResourceRegistry({})
 

package/src/platform/registry/resource-registry.ts

@@ -240,6 +240,7 @@ export class ResourceRegistry {
       ? {
           ...base,
           version: incoming.version ?? base.version ?? '0.0.0',
+          organizationModel: incoming.organizationModel ?? base.organizationModel,
           workflows: [...(base.workflows ?? []), ...(incoming.workflows ?? [])],
           agents: [...(base.agents ?? []), ...(incoming.agents ?? [])],
           triggers: incoming.triggers,
@@ -458,6 +459,7 @@ export class ResourceRegistry {
     // Merge incoming resources into the org (or create new org entry)
     const existingOrg = this.registry[orgName]
     if (existingOrg) {
+      existingOrg.organizationModel = org.organizationModel ?? existingOrg.organizationModel
       existingOrg.workflows = [...(existingOrg.workflows ?? []), ...(org.workflows ?? [])]
       existingOrg.agents = [...(existingOrg.agents ?? []), ...(org.agents ?? [])]
       // Deployment-owned metadata: replace entirely (unregister cleared these)