@elevasis/core 0.25.0 → 0.26.0

package/src/organization-model/helpers.ts

@@ -1,26 +1,22 @@
-import type { OrganizationModel, OrganizationModelSystemEntry } from './types'
-import type { ContentNode } from './content-kinds/types'
-import type { JsonValue } from './domains/systems'
-import type { ResourceEntry } from './domains/resources'
-import type { OmTopologyRelationship } from './domains/topology'
-
-// W1A has landed: ContentNode and SystemEntry (with content + subsystems) are now
-// defined in their canonical locations.
+import type { OrganizationModel, OrganizationModelSystemEntry } from './types'
+import type { JsonValue } from './domains/systems'
+import type { ResourceEntry } from './domains/resources'
+import type { OmTopologyRelationship } from './domains/topology'
+
 // Phase 4: removed locally-scoped inferred types for deleted compound-domain schemas
 // (SalesPipeline, ProspectingBuildTemplate, etc.). migration-helpers.ts imports them directly.
 
 /**
- * SystemEntry extended with the recursive tree slots (`content`, `subsystems`).
+ * SystemEntry extended with the recursive tree slots (`systems`, `subsystems`).
  * `OrganizationModelSystemEntry` is inferred from `SystemEntrySchema: ZodType<SystemEntry>`
  * so it already carries these fields; this alias re-exports it under the tree-walker name
  * for clarity at call sites.
  */
-export type { ContentNode }
-export type SystemEntryWithTree = OrganizationModelSystemEntry
-
-function childSystemsOf(system: SystemEntryWithTree): Record<string, SystemEntryWithTree> {
-  return system.systems ?? system.subsystems ?? {}
-}
+export type SystemEntryWithTree = OrganizationModelSystemEntry
+
+function childSystemsOf(system: SystemEntryWithTree): Record<string, SystemEntryWithTree> {
+  return system.systems ?? system.subsystems ?? {}
+}
 
 export function defaultPathFor(id: string): string {
   return `/${id.replaceAll('.', '/')}`
@@ -131,11 +127,11 @@ export function getSystem(model: OrganizationModel, path: string): SystemEntryWi
   // to SystemEntryWithTree (which extends it with optional content + subsystems).
   let current: Record<string, SystemEntryWithTree> = model.systems as Record<string, SystemEntryWithTree>
   let node: SystemEntryWithTree | undefined
-  for (const seg of segments) {
-    node = current[seg]
-    if (node === undefined) return undefined
-    current = childSystemsOf(node)
-  }
+  for (const seg of segments) {
+    node = current[seg]
+    if (node === undefined) return undefined
+    current = childSystemsOf(node)
+  }
   return node
 }
 
@@ -152,11 +148,11 @@ export function getSystemAncestors(model: OrganizationModel, path: string): Syst
   const result: SystemEntryWithTree[] = []
   let current: Record<string, SystemEntryWithTree> = model.systems as Record<string, SystemEntryWithTree>
   for (const seg of segments) {
-    const node = current[seg]
-    if (node === undefined) return []
-    result.push(node)
-    current = childSystemsOf(node)
-  }
+    const node = current[seg]
+    if (node === undefined) return []
+    result.push(node)
+    current = childSystemsOf(node)
+  }
   return result
 }
 
@@ -172,133 +168,49 @@ export function listAllSystems(model: OrganizationModel): Array<{ path: string;
 
   function walk(map: Record<string, SystemEntryWithTree>, prefix: string): void {
     for (const [localId, system] of Object.entries(map)) {
-      const fullPath = prefix ? `${prefix}.${localId}` : localId
-      results.push({ path: fullPath, system })
-      const childSystems = childSystemsOf(system)
-      if (Object.keys(childSystems).length > 0) {
-        walk(childSystems, fullPath)
-      }
-    }
-  }
+      const fullPath = prefix ? `${prefix}.${localId}` : localId
+      results.push({ path: fullPath, system })
+      const childSystems = childSystemsOf(system)
+      if (Object.keys(childSystems).length > 0) {
+        walk(childSystems, fullPath)
+      }
+    }
+  }
 
   walk(model.systems as Record<string, SystemEntryWithTree>, '')
   return results
 }
 
-/**
- * Resolve a content node by its qualified id (`<system-path>:<local-content-id>`).
- *
- * `getContent(model, 'sales.crm:default-pipeline')` resolves the `sales.crm`
- * system and then looks up `system.content['default-pipeline']`.
- *
- * Returns `undefined` if the system or local id is not found, or if the
- * qualified id does not contain exactly one `:` separator.
- */
-export function getContent(model: OrganizationModel, qualifiedId: string): ContentNode | undefined {
-  const colonIndex = qualifiedId.indexOf(':')
-  if (colonIndex === -1) return undefined
-  const systemPath = qualifiedId.slice(0, colonIndex)
-  const localId = qualifiedId.slice(colonIndex + 1)
-  if (!systemPath || !localId) return undefined
-  const system = getSystem(model, systemPath)
-  return system?.content?.[localId]
+
+function isPlainJsonObject(value: JsonValue | undefined): value is Record<string, JsonValue> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
 }
 
-/**
- * Resolve the layered content view for a system.
- *
- * Returns:
- * - `own`: the system's direct `content` map (empty record if none).
- * - `inherited`: ancestor content nodes that are NOT shadowed by `own` or by a
- *   closer ancestor (depth-wins cascade, same as CSS specificity).
- *
- * Shadow rule: if two ancestors both declare `content['x']`, the deeper one
- * wins. If the system itself declares `content['x']`, neither ancestor entry
- * for `'x'` appears in `inherited`.
- *
- * `resolveSystemContent(model, 'sales.crm')` with both `sales.content['x']`
- * and `sales.crm.content['x']` defined → `own` contains `'x'`, `inherited`
- * contains NO entry for `'x'` from `sales`.
- */
-export function resolveSystemContent(
-  model: OrganizationModel,
-  path: string
-): { own: Record<string, ContentNode>; inherited: Array<{ fromPath: string; node: ContentNode; localId: string }> } {
-  const ancestors = getSystemAncestors(model, path)
-  if (ancestors.length === 0) return { own: {}, inherited: [] }
-
-  const system = ancestors[ancestors.length - 1]
-  const own: Record<string, ContentNode> = { ...(system.content ?? {}) }
-
-  // Collect ancestor entries depth-first (deepest ancestor first, excluding self).
-  // We reconstruct paths for each ancestor by slicing the path segments.
-  const segments = path.split('.')
-  const shadowedIds = new Set(Object.keys(own))
-  const inherited: Array<{ fromPath: string; node: ContentNode; localId: string }> = []
-
-  // Iterate ancestors from deepest-parent to root so deeper wins.
-  for (let i = ancestors.length - 2; i >= 0; i--) {
-    const ancestor = ancestors[i]
-    const ancestorPath = segments.slice(0, i + 1).join('.')
-    const contentMap = ancestor.content ?? {}
-    for (const [localId, node] of Object.entries(contentMap)) {
-      if (!shadowedIds.has(localId)) {
-        shadowedIds.add(localId)
-        inherited.push({ fromPath: ancestorPath, node, localId })
-      }
-    }
+function mergeJsonConfig(
+  base: Record<string, JsonValue>,
+  override: Record<string, JsonValue>
+): Record<string, JsonValue> {
+  const result: Record<string, JsonValue> = { ...base }
+
+  for (const [key, value] of Object.entries(override)) {
+    const existing = result[key]
+    result[key] =
+      isPlainJsonObject(existing) && isPlainJsonObject(value) ? mergeJsonConfig(existing, value) : value
   }
 
-  // Re-order inherited so shallower ancestors come first (root-first display order).
-  inherited.reverse()
-
-  return { own, inherited }
-}
-
-function isPlainJsonObject(value: JsonValue | undefined): value is Record<string, JsonValue> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
-}
-
-function mergeJsonConfig(
-  base: Record<string, JsonValue>,
-  override: Record<string, JsonValue>
-): Record<string, JsonValue> {
-  const result: Record<string, JsonValue> = { ...base }
-
-  for (const [key, value] of Object.entries(override)) {
-    const existing = result[key]
-    result[key] =
-      isPlainJsonObject(existing) && isPlainJsonObject(value) ? mergeJsonConfig(existing, value) : value
-  }
-
-  return result
-}
-
-/**
- * Resolve a system's effective local config.
- *
- * Bridge-era `content` entries with `(kind, type) === ('config', 'kv')` are
- * projected first, then first-class `system.config` overlays them. This keeps
- * direct config authoring authoritative while continuing to read old content.
- */
-export function resolveSystemConfig(model: OrganizationModel, path: string): Record<string, JsonValue> {
-  const system = getSystem(model, path)
-  if (system === undefined) return {}
-
-  let resolved: Record<string, JsonValue> = {}
-  for (const node of Object.values(system.content ?? {})) {
-    if (node.kind !== 'config' || node.type !== 'kv') continue
-    const entries = node.data?.entries
-    if (isPlainJsonObject(entries as JsonValue)) {
-      resolved = mergeJsonConfig(resolved, entries as Record<string, JsonValue>)
-    }
-  }
-
-  return mergeJsonConfig(resolved, system.config ?? {})
-}
-
-/**
- * Return all resources whose `systemPath` belongs to the given system.
+  return result
+}
+
+/** Resolve a system's effective local config from first-class `System.config`. */
+export function resolveSystemConfig(model: OrganizationModel, path: string): Record<string, JsonValue> {
+  const system = getSystem(model, path)
+  if (system === undefined) return {}
+
+  return mergeJsonConfig({}, system.config ?? {})
+}
+
+/**
+ * Return all resources whose `systemPath` belongs to the given system.
  *
  * When `includeDescendants` is false (default), only resources whose
  * `systemPath` exactly matches `systemPath` are returned.
@@ -315,80 +227,80 @@ export function resolveSystemConfig(model: OrganizationModel, path: string): Rec
  * getResourcesForSystem(model, 'sales', { includeDescendants: true })
  * // → resources where systemPath === 'sales' OR systemPath starts with 'sales.'
  */
-export function getResourcesForSystem(
-  model: OrganizationModel,
-  systemPath: string,
-  options: { includeDescendants?: boolean } = {}
-): ResourceEntry[] {
+export function getResourcesForSystem(
+  model: OrganizationModel,
+  systemPath: string,
+  options: { includeDescendants?: boolean } = {}
+): ResourceEntry[] {
   const { includeDescendants = false } = options
   const prefix = systemPath + '.'
-  return Object.values(model.resources ?? {}).filter(
-    (r) => r.systemPath === systemPath || (includeDescendants && r.systemPath.startsWith(prefix))
-  )
-}
-
-export interface SystemTopologyEdge {
-  id: string
-  relationship: OmTopologyRelationship
-}
-
-export interface SystemDeprecationDependents {
-  resources: ResourceEntry[]
-  topologyEdges: SystemTopologyEdge[]
-}
-
-function systemPathIsInScope(candidate: string, systemPath: string, includeDescendants: boolean): boolean {
-  return candidate === systemPath || (includeDescendants && candidate.startsWith(`${systemPath}.`))
-}
-
-function topologyRelationshipTouchesSystem(
-  relationship: OmTopologyRelationship,
-  systemPath: string,
-  resourceIds: Set<string>,
-  includeDescendants: boolean
-): boolean {
-  if (
-    relationship.systemPath !== undefined &&
-    systemPathIsInScope(relationship.systemPath, systemPath, includeDescendants)
-  ) {
-    return true
-  }
-
-  for (const ref of [relationship.from, relationship.to]) {
-    if (ref.kind === 'system' && systemPathIsInScope(ref.id, systemPath, includeDescendants)) return true
-    if (ref.kind === 'resource' && resourceIds.has(ref.id)) return true
-  }
-
-  return false
-}
-
-export function getTopologyEdgesForSystem(
-  model: OrganizationModel,
-  systemPath: string,
-  options: { includeDescendants?: boolean; resourceIds?: Iterable<string> } = {}
-): SystemTopologyEdge[] {
-  const { includeDescendants = false } = options
-  const resourceIds = new Set(
-    options.resourceIds ?? getResourcesForSystem(model, systemPath, { includeDescendants }).map((r) => r.id)
-  )
-
-  return Object.entries(model.topology?.relationships ?? {})
-    .filter(([, relationship]) =>
-      topologyRelationshipTouchesSystem(relationship, systemPath, resourceIds, includeDescendants)
-    )
-    .map(([id, relationship]) => ({ id, relationship }))
-}
-
-export function getSystemDeprecationDependents(
-  model: OrganizationModel,
-  systemPath: string,
-  options: { includeDescendants?: boolean } = {}
-): SystemDeprecationDependents {
-  const resources = getResourcesForSystem(model, systemPath, options).filter((resource) => resource.status === 'active')
-  const resourceIds = new Set(resources.map((resource) => resource.id))
-
-  return {
-    resources,
-    topologyEdges: getTopologyEdgesForSystem(model, systemPath, { ...options, resourceIds })
-  }
-}
+  return Object.values(model.resources ?? {}).filter(
+    (r) => r.systemPath === systemPath || (includeDescendants && r.systemPath.startsWith(prefix))
+  )
+}
+
+export interface SystemTopologyEdge {
+  id: string
+  relationship: OmTopologyRelationship
+}
+
+export interface SystemDeprecationDependents {
+  resources: ResourceEntry[]
+  topologyEdges: SystemTopologyEdge[]
+}
+
+function systemPathIsInScope(candidate: string, systemPath: string, includeDescendants: boolean): boolean {
+  return candidate === systemPath || (includeDescendants && candidate.startsWith(`${systemPath}.`))
+}
+
+function topologyRelationshipTouchesSystem(
+  relationship: OmTopologyRelationship,
+  systemPath: string,
+  resourceIds: Set<string>,
+  includeDescendants: boolean
+): boolean {
+  if (
+    relationship.systemPath !== undefined &&
+    systemPathIsInScope(relationship.systemPath, systemPath, includeDescendants)
+  ) {
+    return true
+  }
+
+  for (const ref of [relationship.from, relationship.to]) {
+    if (ref.kind === 'system' && systemPathIsInScope(ref.id, systemPath, includeDescendants)) return true
+    if (ref.kind === 'resource' && resourceIds.has(ref.id)) return true
+  }
+
+  return false
+}
+
+export function getTopologyEdgesForSystem(
+  model: OrganizationModel,
+  systemPath: string,
+  options: { includeDescendants?: boolean; resourceIds?: Iterable<string> } = {}
+): SystemTopologyEdge[] {
+  const { includeDescendants = false } = options
+  const resourceIds = new Set(
+    options.resourceIds ?? getResourcesForSystem(model, systemPath, { includeDescendants }).map((r) => r.id)
+  )
+
+  return Object.entries(model.topology?.relationships ?? {})
+    .filter(([, relationship]) =>
+      topologyRelationshipTouchesSystem(relationship, systemPath, resourceIds, includeDescendants)
+    )
+    .map(([id, relationship]) => ({ id, relationship }))
+}
+
+export function getSystemDeprecationDependents(
+  model: OrganizationModel,
+  systemPath: string,
+  options: { includeDescendants?: boolean } = {}
+): SystemDeprecationDependents {
+  const resources = getResourcesForSystem(model, systemPath, options).filter((resource) => resource.status === 'active')
+  const resourceIds = new Set(resources.map((resource) => resource.id))
+
+  return {
+    resources,
+    topologyEdges: getTopologyEdgesForSystem(model, systemPath, { ...options, resourceIds })
+  }
+}

package/src/organization-model/index.ts

@@ -1,135 +1,115 @@
-export * from './content-kinds/index'
 export * from './schema'
 export * from './types'
 export * from './ontology'
 export * from './contracts'
-export {
-  ORGANIZATION_MODEL_ICON_TOKENS,
-  OrganizationModelBuiltinIconTokenSchema,
-  OrganizationModelIconTokenSchema
-} from './icons'
-export * from './defaults'
-export * from './resolve'
-export * from './foundation'
-export * from './surface-projection'
-export * from './helpers'
+export {
+  ORGANIZATION_MODEL_ICON_TOKENS,
+  OrganizationModelBuiltinIconTokenSchema,
+  OrganizationModelIconTokenSchema
+} from './icons'
+export * from './defaults'
+export * from './resolve'
+export * from './foundation'
+export * from './surface-projection'
+export * from './helpers'
 export * from './migration-helpers'
 export * from './scaffolders'
 export * from './graph'
-export * from './catalogs/lead-gen'
-export * from './domains/branding'
-// Phase 4: OrganizationModelSalesSchema, OrganizationModelProspectingSchema,
-// OrganizationModelProjectsSchema removed. Business-logic exports (StatefulPipelineDefinition,
-// CRM_PIPELINE_DEFINITION, ProspectingBuildTemplateSchema, etc.) still re-exported below.
-export {
-  SalesStageSemanticClassSchema,
-  SalesStageSchema,
-  SalesPipelineSchema,
-  CRM_DISCOVERY_REPLIED_STATE,
-  CRM_DISCOVERY_LINK_SENT_STATE,
-  CRM_DISCOVERY_NUDGING_STATE,
-  CRM_DISCOVERY_BOOKING_CANCELLED_STATE,
-  CRM_REPLY_SENT_STATE,
-  CRM_FOLLOWUP_1_SENT_STATE,
-  CRM_FOLLOWUP_2_SENT_STATE,
-  CRM_FOLLOWUP_3_SENT_STATE,
-  CRM_PIPELINE_DEFINITION,
-  CRM_PRIORITY_BUCKETS,
-  DEFAULT_CRM_PRIORITY_RULE_CONFIG,
-  DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG,
-  ACQ_LIST_MEMBERS_LEAD_GEN_PIPELINE,
-  ACQ_LIST_COMPANIES_LEAD_GEN_PIPELINE,
-  LEAD_GEN_PIPELINE_DEFINITIONS,
-  findPipeline,
-  getValidStatesForStage,
-  LEAD_GEN_STAGE_CATALOG
-} from './domains/sales'
-export type {
-  StatefulStateDefinition,
-  StatefulStageDefinition,
-  StatefulPipelineDefinition,
-  CrmPriorityBucketKey,
-  CrmPriorityBucketDefinition,
-  CrmPriorityRuleConfig,
-  CrmNextActionMapping,
-  CrmNextActionRuleConfig
-} from './domains/sales'
-export {
-  ProspectingLifecycleStageSchema,
-  RecordColumnConfigSchema,
-  RecordColumnsConfigSchema,
-  CredentialRequirementSchema,
-  ProspectingBuildTemplateStepSchema,
-  ProspectingBuildTemplateSchema,
-  PROSPECTING_STEPS,
-  ACTION_REGISTRY,
-  findActionById
-} from './domains/prospecting'
-export type {
-  ListBuilderStep,
-  RecordColumnConfig,
-  CredentialRequirement,
-  TemplateName,
-  StepName,
-  ActionRegistry
-} from './domains/prospecting'
-export { ProjectsDomainStateSchema } from './domains/projects'
+export * from './catalogs/lead-gen'
+export * from './domains/branding'
+// Phase 4: OrganizationModelSalesSchema, OrganizationModelProspectingSchema,
+// OrganizationModelProjectsSchema removed. Business-logic exports (StatefulPipelineDefinition,
+// ProspectingBuildTemplateSchema, StatefulPipelineDefinition, etc.) still re-exported below.
+export {
+  SalesStageSemanticClassSchema,
+  SalesStageSchema,
+  SalesPipelineSchema,
+  findPipeline,
+  getValidStatesForStage
+} from './domains/sales'
+export type {
+  StatefulStateDefinition,
+  StatefulStageDefinition,
+  StatefulPipelineDefinition,
+  CrmPriorityBucketKey,
+  CrmPriorityBucketDefinition,
+  CrmPriorityRuleConfig,
+  CrmNextActionMapping,
+  CrmNextActionRuleConfig
+} from './domains/sales'
+export {
+  ProspectingLifecycleStageSchema,
+  RecordColumnConfigSchema,
+  RecordColumnsConfigSchema,
+  CredentialRequirementSchema,
+  ProspectingBuildTemplateStepSchema,
+  ProspectingBuildTemplateSchema,
+  ACTION_REGISTRY,
+  findActionById
+} from './domains/prospecting'
+export type {
+  ListBuilderStep,
+  RecordColumnConfig,
+  CredentialRequirement,
+  TemplateName,
+  StepName,
+  ActionRegistry
+} from './domains/prospecting'
+export { ProjectsDomainStateSchema } from './domains/projects'
 export * from './domains/systems'
 export * from './domains/resources'
 export * from './domains/topology'
 export {
-  DEFAULT_ORGANIZATION_MODEL_NAVIGATION,
-  getSortedSidebarEntries,
-  NavigationGroupSchema,
-  OrganizationModelNavigationSchema,
-  SidebarNavigationSchema,
-  SidebarNodeSchema,
-  SidebarSectionSchema,
-  SidebarSurfaceTargetsSchema,
-  SurfaceDefinitionSchema,
-  SurfaceTypeSchema
-} from './domains/navigation'
-export {
-  EntitiesDomainSchema,
-  EntityIdSchema,
-  EntityLinkKindSchema,
-  EntityLinkSchema,
-  EntitySchema
-} from './domains/entities'
-export {
-  KnowledgeDomainSchema,
-  KnowledgeLinkSchema,
-  KnowledgeTargetKindSchema,
-  KnowledgeTargetRefSchema,
-  OrgKnowledgeKindSchema,
-  OrgKnowledgeNodeSchema
-} from './domains/knowledge'
-export * from './domains/roles'
-export * from './domains/identity'
-export * from './domains/policies'
-export {
-  ActionsDomainSchema,
-  ActionIdSchema,
-  ActionInvocationKindSchema,
-  ActionInvocationSchema,
-  ActionRefSchema,
-  ActionSchema,
-  ActionScopeSchema,
-  ApiEndpointInvocationSchema,
-  CRM_ACTION_ENTRIES,
-  DEFAULT_ORGANIZATION_MODEL_ACTIONS,
-  findOrganizationActionById,
-  LEAD_GEN_ACTION_ENTRIES,
-  McpToolInvocationSchema,
-  ScriptExecutionInvocationSchema,
-  SlashCommandInvocationSchema
-} from './domains/actions'
-export type {
-  ActionsDomain,
-  Action as OrganizationAction,
-  ActionId,
-  ActionInvocation,
-  ActionInvocationKind,
-  ActionRef,
-  ActionScope
-} from './domains/actions'
+  DEFAULT_ORGANIZATION_MODEL_NAVIGATION,
+  getSortedSidebarEntries,
+  NavigationGroupSchema,
+  OrganizationModelNavigationSchema,
+  SidebarNavigationSchema,
+  SidebarNodeSchema,
+  SidebarSectionSchema,
+  SidebarSurfaceTargetsSchema,
+  SurfaceDefinitionSchema,
+  SurfaceTypeSchema
+} from './domains/navigation'
+export {
+  EntitiesDomainSchema,
+  EntityIdSchema,
+  EntityLinkKindSchema,
+  EntityLinkSchema,
+  EntitySchema
+} from './domains/entities'
+export {
+  KnowledgeDomainSchema,
+  KnowledgeLinkSchema,
+  KnowledgeTargetKindSchema,
+  KnowledgeTargetRefSchema,
+  OrgKnowledgeKindSchema,
+  OrgKnowledgeNodeSchema
+} from './domains/knowledge'
+export * from './domains/roles'
+export * from './domains/identity'
+export * from './domains/policies'
+export {
+  ActionsDomainSchema,
+  ActionIdSchema,
+  ActionInvocationKindSchema,
+  ActionInvocationSchema,
+  ActionRefSchema,
+  ActionSchema,
+  ActionScopeSchema,
+  ApiEndpointInvocationSchema,
+  DEFAULT_ORGANIZATION_MODEL_ACTIONS,
+  findOrganizationActionById,
+  McpToolInvocationSchema,
+  ScriptExecutionInvocationSchema,
+  SlashCommandInvocationSchema
+} from './domains/actions'
+export type {
+  ActionsDomain,
+  Action as OrganizationAction,
+  ActionId,
+  ActionInvocation,
+  ActionInvocationKind,
+  ActionRef,
+  ActionScope
+} from './domains/actions'