@elevasis/core 0.24.0 → 0.25.0

package/src/platform/registry/validation.ts

@@ -10,9 +10,11 @@ import type { ModelConfig } from '../../execution/engine/llm/model-info'
 import { validateModelConfig, ModelConfigError } from '../../execution/engine/llm/errors'
 import type { DeploymentSpec } from './resource-registry'
 import type { ResourceEntry } from '../../organization-model/domains/resources'
-import type { SystemEntry } from '../../organization-model/domains/systems'
-import type { OrganizationModel } from '../../organization-model/types'
-import { listAllSystems } from '../../organization-model/helpers'
+import type { SystemEntry } from '../../organization-model/domains/systems'
+import type { OrganizationModel } from '../../organization-model/types'
+import { listAllSystems } from '../../organization-model/helpers'
+import { compileOrganizationOntology, type OntologyKind, type ResolvedOntologyIndex } from '../../organization-model/ontology'
+import type { OmTopologyNodeRef } from '../../organization-model/domains/topology'
 import type {
   TriggerDefinition,
   ResourceRelationships,
@@ -44,13 +46,24 @@ export type ResourceGovernanceValidationIssueType =
   | 'missing-om-resource'
   | 'type-mismatch'
   | 'system-mismatch'
-  | 'missing-om-system'
-  | 'raw-resource-id'
-
-export interface ResourceGovernanceModel {
-  systems?: Record<string, SystemEntry>
-  resources?: Record<string, ResourceEntry>
-}
+  | 'missing-om-system'
+  | 'raw-resource-id'
+  | 'descriptor-mismatch'
+  | 'missing-ontology-actions'
+  | 'ontology-reference-missing'
+  | 'primary-action-mismatch'
+  | 'topology-reference-missing'
+
+export interface ResourceGovernanceModel {
+  systems?: Record<string, SystemEntry>
+  resources?: Record<string, ResourceEntry>
+  ontology?: OrganizationModel['ontology']
+  topology?: OrganizationModel['topology']
+  roles?: OrganizationModel['roles']
+  policies?: OrganizationModel['policies']
+  entities?: OrganizationModel['entities']
+  actions?: OrganizationModel['actions']
+}
 
 export interface ResourceGovernanceValidationIssue {
   type: ResourceGovernanceValidationIssueType
@@ -109,7 +122,7 @@ function emitGovernanceIssues(
   }
 }
 
-function getRuntimeResources(resources: DeploymentSpec): Array<{
+function getRuntimeResources(resources: DeploymentSpec): Array<{
   resourceId: string
   type: ResourceType
   descriptor?: ResourceEntry
@@ -130,8 +143,159 @@ function getRuntimeResources(resources: DeploymentSpec): Array<{
       type: integration.type,
       descriptor: (integration as { resource?: ResourceEntry }).resource
     }))
-  ]
-}
+  ]
+}
+
+function hasOntologySources(organizationModel: ResourceGovernanceModel): boolean {
+  return (
+    organizationModel.ontology !== undefined ||
+    organizationModel.entities !== undefined ||
+    organizationModel.actions !== undefined ||
+    Object.values(organizationModel.systems ?? {}).some(systemHasOntologySource)
+  )
+}
+
+function systemHasOntologySource(system: SystemEntry): boolean {
+  if (system.ontology !== undefined || (system.content !== undefined && Object.keys(system.content).length > 0)) return true
+  return Object.values(system.systems ?? system.subsystems ?? {}).some(systemHasOntologySource)
+}
+
+function ontologyIndexForKind(index: ResolvedOntologyIndex, kind: OntologyKind): Record<string, unknown> {
+  switch (kind) {
+    case 'object':
+      return index.objectTypes
+    case 'link':
+      return index.linkTypes
+    case 'action':
+      return index.actionTypes
+    case 'catalog':
+      return index.catalogTypes
+    case 'event':
+      return index.eventTypes
+    case 'interface':
+      return index.interfaceTypes
+    case 'value-type':
+      return index.valueTypes
+    case 'property':
+      return index.sharedProperties
+    case 'group':
+      return index.groups
+    case 'surface':
+      return index.surfaces
+  }
+}
+
+function sameJson(left: unknown, right: unknown): boolean {
+  return JSON.stringify(left ?? null) === JSON.stringify(right ?? null)
+}
+
+function addOntologyBindingIssues(
+  issues: ResourceGovernanceValidationIssue[],
+  orgName: string,
+  resource: ResourceEntry,
+  ontologyIndex: ResolvedOntologyIndex | undefined
+): void {
+  const binding = resource.ontology
+  if (binding === undefined) return
+
+  if ((resource.kind === 'workflow' || resource.kind === 'agent') && (binding.actions?.length ?? 0) === 0) {
+    addGovernanceIssue(
+      issues,
+      'missing-ontology-actions',
+      orgName,
+      resource.id,
+      `[${orgName}] Resource '${resource.id}' declares ontology bindings but no ontology actions.`
+    )
+  }
+
+  if (binding.primaryAction !== undefined && !binding.actions?.includes(binding.primaryAction)) {
+    addGovernanceIssue(
+      issues,
+      'primary-action-mismatch',
+      orgName,
+      resource.id,
+      `[${orgName}] Resource '${resource.id}' primaryAction '${binding.primaryAction}' must be included in ontology.actions.`
+    )
+  }
+
+  if (ontologyIndex === undefined) return
+
+  const validateRefs = (
+    bindingKey: 'actions' | 'primaryAction' | 'reads' | 'writes' | 'usesCatalogs' | 'emits',
+    expectedKind: OntologyKind,
+    refs: string[] | string | undefined
+  ) => {
+    const values = refs === undefined ? [] : Array.isArray(refs) ? refs : [refs]
+    const index = ontologyIndexForKind(ontologyIndex, expectedKind)
+
+    for (const ref of values) {
+      if (index[ref] !== undefined) continue
+      addGovernanceIssue(
+        issues,
+        'ontology-reference-missing',
+        orgName,
+        resource.id,
+        `[${orgName}] Resource '${resource.id}' ontology.${bindingKey} references missing ${expectedKind} ontology record '${ref}'.`
+      )
+    }
+  }
+
+  validateRefs('actions', 'action', binding.actions)
+  validateRefs('primaryAction', 'action', binding.primaryAction)
+  validateRefs('reads', 'object', binding.reads)
+  validateRefs('writes', 'object', binding.writes)
+  validateRefs('usesCatalogs', 'catalog', binding.usesCatalogs)
+  validateRefs('emits', 'event', binding.emits)
+}
+
+function addTopologyIssues(
+  issues: ResourceGovernanceValidationIssue[],
+  orgName: string,
+  deployment: DeploymentSpec,
+  organizationModel: ResourceGovernanceModel,
+  systemsById: Map<string, SystemEntry>,
+  omResourcesById: Map<string, ResourceEntry>,
+  ontologyIndex: ResolvedOntologyIndex | undefined
+): void {
+  const relationships = organizationModel.topology?.relationships
+  if (relationships === undefined) return
+
+  const rolesById = new Set(Object.keys(organizationModel.roles ?? {}))
+  const policiesById = new Set(Object.keys(organizationModel.policies ?? {}))
+  const triggerIds = new Set(deployment.triggers?.map((trigger) => trigger.resourceId) ?? [])
+  const humanCheckpointIds = new Set(deployment.humanCheckpoints?.map((checkpoint) => checkpoint.resourceId) ?? [])
+  const externalResourceIds = new Set(deployment.externalResources?.map((external) => external.resourceId) ?? [])
+
+  const topologyRefExists = (ref: OmTopologyNodeRef): boolean => {
+    if (ref.kind === 'system') return systemsById.has(ref.id)
+    if (ref.kind === 'resource') return omResourcesById.has(ref.id)
+    if (ref.kind === 'policy') return policiesById.has(ref.id)
+    if (ref.kind === 'role') return rolesById.has(ref.id)
+    if (ref.kind === 'trigger') return triggerIds.has(ref.id)
+    if (ref.kind === 'humanCheckpoint') return humanCheckpointIds.has(ref.id)
+    if (ref.kind === 'externalResource') return externalResourceIds.has(ref.id)
+    if (ref.kind === 'ontology') {
+      if (ontologyIndex === undefined) return true
+      return Object.values(ontologyIndex).some((records) => records[ref.id] !== undefined)
+    }
+    return false
+  }
+
+  for (const [relationshipId, relationship] of Object.entries(relationships)) {
+    ;(['from', 'to'] as const).forEach((side) => {
+      const ref = relationship[side]
+      if (topologyRefExists(ref)) return
+
+      addGovernanceIssue(
+        issues,
+        'topology-reference-missing',
+        orgName,
+        ref.id,
+        `[${orgName}] Topology relationship '${relationshipId}' ${side} references missing ${ref.kind} '${ref.id}'.`
+      )
+    })
+  }
+}
 
 /**
  * Validates runtime resource definitions against OM Resources and Systems.
@@ -147,9 +311,9 @@ export function validateResourceGovernance(
   options: ResourceGovernanceValidationOptions = {}
 ): ResourceGovernanceValidationResult {
   const mode = getResourceValidatorMode(options.mode)
-  const omResourcesMap = organizationModel?.resources
-  const omSystemsMap = organizationModel?.systems
-  const issues: ResourceGovernanceValidationIssue[] = []
+  const omResourcesMap = organizationModel?.resources
+  const omSystemsMap = organizationModel?.systems
+  const issues: ResourceGovernanceValidationIssue[] = []
 
   if (!omResourcesMap || !omSystemsMap) {
     return { valid: true, mode, issues }
@@ -160,12 +324,26 @@ export function validateResourceGovernance(
   const systemsById = new Map(
     listAllSystems({ systems: omSystemsMap } as OrganizationModel).map(({ path, system }) => [path, system])
   )
-  const activeOmResources = Object.values(omResourcesMap).filter((resource) => resource.status === 'active')
-  const omResourcesById = new Map(activeOmResources.map((resource) => [resource.id, resource]))
-  const runtimeResources = getRuntimeResources(deployment)
-  const runtimeResourcesById = new Map(runtimeResources.map((resource) => [resource.resourceId, resource]))
-
-  for (const resource of activeOmResources) {
+  const activeOmResources = Object.values(omResourcesMap).filter((resource) => resource.status === 'active')
+  const omResourcesById = new Map(activeOmResources.map((resource) => [resource.id, resource]))
+  const runtimeResources = getRuntimeResources(deployment)
+  const runtimeResourcesById = new Map(runtimeResources.map((resource) => [resource.resourceId, resource]))
+  const ontologyCompilation = hasOntologySources(organizationModel)
+    ? compileOrganizationOntology(organizationModel)
+    : undefined
+  const ontologyIndex = ontologyCompilation?.ontology
+
+  for (const diagnostic of ontologyCompilation?.diagnostics ?? []) {
+    addGovernanceIssue(
+      issues,
+      'ontology-reference-missing',
+      orgName,
+      diagnostic.id,
+      `[${orgName}] ${diagnostic.message}`
+    )
+  }
+
+  for (const resource of activeOmResources) {
     if (!systemsById.has(resource.systemPath)) {
       addGovernanceIssue(
         issues,
@@ -198,16 +376,28 @@ export function validateResourceGovernance(
       )
     }
 
-    if (runtimeResource.descriptor && runtimeResource.descriptor.systemPath !== resource.systemPath) {
-      addGovernanceIssue(
+    if (runtimeResource.descriptor && runtimeResource.descriptor.systemPath !== resource.systemPath) {
+      addGovernanceIssue(
         issues,
         'system-mismatch',
         orgName,
         resource.id,
         `[${orgName}] Resource '${resource.id}' system mismatch: code descriptor has '${runtimeResource.descriptor.systemPath}', OM has '${resource.systemPath}'.`
-      )
-    }
-  }
+      )
+    }
+
+    if (runtimeResource.descriptor && !sameJson(runtimeResource.descriptor.ontology, resource.ontology)) {
+      addGovernanceIssue(
+        issues,
+        'descriptor-mismatch',
+        orgName,
+        resource.id,
+        `[${orgName}] Resource '${resource.id}' ontology descriptor mismatch between code and OM.`
+      )
+    }
+
+    addOntologyBindingIssues(issues, orgName, resource, ontologyIndex)
+  }
 
   for (const runtimeResource of runtimeResources) {
     const omResource = omResourcesById.get(runtimeResource.resourceId)
@@ -242,18 +432,20 @@ export function validateResourceGovernance(
       )
     }
 
-    if (runtimeResource.descriptor.kind !== runtimeResource.type) {
-      addGovernanceIssue(
+    if (runtimeResource.descriptor.kind !== runtimeResource.type) {
+      addGovernanceIssue(
         issues,
         'type-mismatch',
         orgName,
         runtimeResource.resourceId,
         `[${orgName}] Code-side resource '${runtimeResource.resourceId}' descriptor kind '${runtimeResource.descriptor.kind}' does not match runtime type '${runtimeResource.type}'.`
-      )
-    }
-  }
-
-  emitGovernanceIssues(issues, mode, options.onWarning)
+      )
+    }
+  }
+
+  addTopologyIssues(issues, orgName, deployment, organizationModel, systemsById, omResourcesById, ontologyIndex)
+
+  emitGovernanceIssues(issues, mode, options.onWarning)
 
   return {
     valid: issues.length === 0,

package/src/reference/_generated/contracts.md

@@ -418,6 +418,42 @@ export type OrganizationModelIntegrationResourceEntry = z.infer<typeof Integrati
 export type OrganizationModelScriptResourceEntry = z.infer<typeof ScriptResourceEntrySchema>
 ```
 
+### `OrganizationModelTopology`
+
+```typescript
+export type OrganizationModelTopology = z.infer<typeof OmTopologyDomainSchema>
+```
+
+### `OrganizationModelTopologyNodeKind`
+
+```typescript
+export type OrganizationModelTopologyNodeKind = z.infer<typeof OmTopologyNodeKindSchema>
+```
+
+### `OrganizationModelTopologyNodeRef`
+
+```typescript
+export type OrganizationModelTopologyNodeRef = z.infer<typeof OmTopologyNodeRefSchema>
+```
+
+### `OrganizationModelTopologyRelationshipKind`
+
+```typescript
+export type OrganizationModelTopologyRelationshipKind = z.infer<typeof OmTopologyRelationshipKindSchema>
+```
+
+### `OrganizationModelTopologyRelationship`
+
+```typescript
+export type OrganizationModelTopologyRelationship = z.infer<typeof OmTopologyRelationshipSchema>
+```
+
+### `OrganizationModelTopologyMetadata`
+
+```typescript
+export type OrganizationModelTopologyMetadata = z.infer<typeof OmTopologyMetadataSchema>
+```
+
 ### `OrganizationModelActions`
 
 ```typescript
@@ -598,8 +634,8 @@ export type DeepPartial<T> =
 ### `ElevasisOrganizationModel`
 
 ```typescript
-export type ElevasisOrganizationModel = Omit<OrganizationModel, 'knowledge'> & {
-  knowledge?: OrganizationModel['knowledge']
+export type ElevasisOrganizationModel = Omit<OrganizationModel, 'knowledge'> & {
+  knowledge?: OrganizationModel['knowledge']
 }
 ```
 
@@ -624,107 +660,107 @@ export type SystemSidebarWidthResolver = number | ((context: { currentPath: stri
 ### `SystemModule`
 
 ```typescript
-export interface SystemModule {
-  /** Unique stable identifier for this UI system module. */
-  key: string
-  /** Organization Model system id this module presents. Omit for navigation-only app surfaces. */
-  systemId?: string
-  /** Route prefixes owned by navigation-only app surfaces. */
-  routePrefixes?: string[]
-  /** Capability identifiers contributed by this system module. */
-  capabilityIds?: string[]
-  /** Icon used when this system node appears in shell navigation. */
-  icon?: SystemIconComponent
-  /** Sidebar component rendered when this system's subtree route is active. */
-  sidebar?: SystemSidebarComponent
-  /** Optional shell sidebar width override. Defaults to 250px. */
-  sidebarWidth?: SystemSidebarWidthResolver
-  /** Operations-only bridge connecting this system to the organization graph node. */
-  organizationGraph?: OrganizationGraphSystemBridge
+export interface SystemModule {
+  /** Unique stable identifier for this UI system module. */
+  key: string
+  /** Organization Model system id this module presents. Omit for navigation-only app surfaces. */
+  systemId?: string
+  /** Route prefixes owned by navigation-only app surfaces. */
+  routePrefixes?: string[]
+  /** Capability identifiers contributed by this system module. */
+  capabilityIds?: string[]
+  /** Icon used when this system node appears in shell navigation. */
+  icon?: SystemIconComponent
+  /** Sidebar component rendered when this system's subtree route is active. */
+  sidebar?: SystemSidebarComponent
+  /** Optional shell sidebar width override. Defaults to 250px. */
+  sidebarWidth?: SystemSidebarWidthResolver
+  /** Operations-only bridge connecting this system to the organization graph node. */
+  organizationGraph?: OrganizationGraphSystemBridge
 }
 ```
 
 ### `ResolvedSystemAccess`
 
 ```typescript
-export interface ResolvedSystemAccess {
-  featureKey: string
-  systemId?: string
-  enabled: boolean
+export interface ResolvedSystemAccess {
+  systemKey: string
+  systemId?: string
+  enabled: boolean
 }
 ```
 
 ### `ResolvedSystemSemantics`
 
 ```typescript
-export interface ResolvedSystemSemantics {
-  capabilityIds: string[]
+export interface ResolvedSystemSemantics {
+  capabilityIds: string[]
 }
 ```
 
 ### `ResolvedSystemModule`
 
 ```typescript
-export interface ResolvedSystemModule extends SystemModule {
-  access: ResolvedSystemAccess
-  semantics: ResolvedSystemSemantics
+export interface ResolvedSystemModule extends SystemModule {
+  access: ResolvedSystemAccess
+  semantics: ResolvedSystemSemantics
 }
 ```
 
 ### `ResolvedShellSystem`
 
 ```typescript
-export type ResolvedShellSystem = OrganizationModelSystemEntry & {
-  label: string
-  iconComponent?: SystemIconComponent
+export type ResolvedShellSystem = OrganizationModelSystemEntry & {
+  label: string
+  iconComponent?: SystemIconComponent
 }
 ```
 
 ### `ResolvedShellModel`
 
 ```typescript
-export interface ResolvedShellModel {
-  systems: readonly ResolvedShellSystem[]
-  findByPath: (path: string) => ResolvedShellSystem | undefined
-  findById: (id: string) => ResolvedShellSystem | undefined
-  childrenOf: (id: string) => ResolvedShellSystem[]
-  ancestorsOf: (id: string) => ResolvedShellSystem[]
-  parentOf: (id: string) => ResolvedShellSystem | undefined
-  topLevel: () => ResolvedShellSystem[]
-  requiresAdminFor: (id: string) => boolean
-  devOnlyFor: (id: string) => boolean
+export interface ResolvedShellModel {
+  systems: readonly ResolvedShellSystem[]
+  findByPath: (path: string) => ResolvedShellSystem | undefined
+  findById: (id: string) => ResolvedShellSystem | undefined
+  childrenOf: (id: string) => ResolvedShellSystem[]
+  ancestorsOf: (id: string) => ResolvedShellSystem[]
+  parentOf: (id: string) => ResolvedShellSystem | undefined
+  topLevel: () => ResolvedShellSystem[]
+  requiresAdminFor: (id: string) => boolean
+  devOnlyFor: (id: string) => boolean
 }
 ```
 
 ### `ShellSidebarLinkItem`
 
 ```typescript
-export interface ShellSidebarLinkItem {
-  label: string
-  link: string
-  exact?: boolean
-  activeMatchPaths?: string[]
+export interface ShellSidebarLinkItem {
+  label: string
+  link: string
+  exact?: boolean
+  activeMatchPaths?: string[]
 }
 ```
 
 ### `ShellSidebarLinkGroup`
 
 ```typescript
-export interface ShellSidebarLinkGroup {
-  icon: SystemIconComponent
-  label: string
-  links?: ShellSidebarLinkItem[]
-  link?: string
+export interface ShellSidebarLinkGroup {
+  icon: SystemIconComponent
+  label: string
+  links?: ShellSidebarLinkItem[]
+  link?: string
 }
 ```
 
 ### `ShellSidebarProjectionOptions`
 
 ```typescript
-export interface ShellSidebarProjectionOptions {
-  isPlatformAdmin?: boolean
-  isDev?: boolean
-  section?: 'primary' | 'bottom'
+export interface ShellSidebarProjectionOptions {
+  isPlatformAdmin?: boolean
+  isDev?: boolean
+  section?: 'primary' | 'bottom'
 }
 ```
 
@@ -737,75 +773,75 @@ export type ShellRouteMatchStatus = 'matched' | 'hidden' | 'unmatched'
 ### `ResolvedShellRouteMatch`
 
 ```typescript
-export interface ResolvedShellRouteMatch {
-  status: ShellRouteMatchStatus
-  path: string
-  system?: ResolvedSystemModule
-  node?: ResolvedShellSystem
+export interface ResolvedShellRouteMatch {
+  status: ShellRouteMatchStatus
+  path: string
+  system?: ResolvedSystemModule
+  node?: ResolvedShellSystem
 }
 ```
 
 ### `ShellRuntime`
 
 ```typescript
-export interface ShellRuntime {
-  resolveRoute: (path: string) => ResolvedShellRouteMatch
+export interface ShellRuntime {
+  resolveRoute: (path: string) => ResolvedShellRouteMatch
 }
 ```
 
 ### `OrganizationGraphSystemBridge`
 
 ```typescript
-export interface OrganizationGraphSystemBridge {
-  systemId?: string
+export interface OrganizationGraphSystemBridge {
+  systemId?: string
 }
 ```
 
 ### `OrganizationGraphContextValue`
 
 ```typescript
-export interface OrganizationGraphContextValue {
-  available: boolean
-  systemId?: string
-  systemPath?: string
+export interface OrganizationGraphContextValue {
+  available: boolean
+  systemId?: string
+  systemPath?: string
 }
 ```
 
 ### `ElevasisSystemsProviderProps`
 
 ```typescript
-export interface ElevasisSystemsProviderProps {
-  systems?: SystemModule[]
-  organizationModel?: ElevasisOrganizationModel
-  timeRange?: TimeRange
-  operationsApiUrl?: string
-  operationsSSEManager?: SSEConnectionManagerLike
-  deliveryApiUrl?: string
-  deliverySSEManager?: SSEConnectionManagerLike
-  disabledSubsectionPaths?: string[]
-  children: ReactNode
+export interface ElevasisSystemsProviderProps {
+  systems?: SystemModule[]
+  organizationModel?: ElevasisOrganizationModel
+  timeRange?: TimeRange
+  operationsApiUrl?: string
+  operationsSSEManager?: SSEConnectionManagerLike
+  deliveryApiUrl?: string
+  deliverySSEManager?: SSEConnectionManagerLike
+  disabledSubsectionPaths?: string[]
+  children: ReactNode
 }
 ```
 
 ### `ElevasisSystemsContextValue`
 
 ```typescript
-export interface ElevasisSystemsContextValue {
-  shellModel: ResolvedShellModel
-  shellRuntime: ShellRuntime
-  getSidebarLinks: (options?: ShellSidebarProjectionOptions) => ShellSidebarLinkGroup[]
-  enabledResolvedSystems: ResolvedSystemModule[]
-  resolvedSystems: ResolvedSystemModule[]
-  organizationGraph: OrganizationGraphContextValue
-  organizationModel?: OrganizationModel
-  timeRange?: TimeRange
-  operationsApiUrl?: string
-  operationsSSEManager?: SSEConnectionManagerLike
-  deliveryApiUrl?: string
-  deliverySSEManager?: SSEConnectionManagerLike
-  disabledSubsectionPaths: string[]
-  isSystemEnabled: (key: string) => boolean
-  getResolvedSystem: (key: string) => ResolvedSystemModule | undefined
+export interface ElevasisSystemsContextValue {
+  shellModel: ResolvedShellModel
+  shellRuntime: ShellRuntime
+  getSidebarLinks: (options?: ShellSidebarProjectionOptions) => ShellSidebarLinkGroup[]
+  enabledResolvedSystems: ResolvedSystemModule[]
+  resolvedSystems: ResolvedSystemModule[]
+  organizationGraph: OrganizationGraphContextValue
+  organizationModel?: OrganizationModel
+  timeRange?: TimeRange
+  operationsApiUrl?: string
+  operationsSSEManager?: SSEConnectionManagerLike
+  deliveryApiUrl?: string
+  deliverySSEManager?: SSEConnectionManagerLike
+  disabledSubsectionPaths: string[]
+  isSystemEnabled: (key: string) => boolean
+  getResolvedSystem: (key: string) => ResolvedSystemModule | undefined
 }
 ```
 
@@ -1287,13 +1323,15 @@ export interface HumanCheckpointDefinition extends ResourceDefinition {
  * Used by ResourceRegistry for discovery and Command View for visualization.
  */
 export interface DeploymentSpec {
-  /** Deployment version (semver) */
-  version: string
-  /** Optional Organization Model governance catalog used for OM-code validation */
-  organizationModel?: {
-    systems?: OrganizationModelSystems
-    resources?: OrganizationModelResources
-  }
+  /** Deployment version (semver) */
+  version: string
+  /** Optional Organization Model governance catalog used for OM-code validation */
+  organizationModel?: Partial<
+    Pick<
+      OrganizationModel,
+      'systems' | 'resources' | 'ontology' | 'topology' | 'roles' | 'policies' | 'entities' | 'actions'
+    >
+  >
   /** Workflow definitions */
   workflows?: WorkflowDefinition[]
   /** Agent definitions */