@elevasis/core 0.2.1 → 0.4.0

package/src/organization-model/schema.ts

@@ -2,16 +2,15 @@ import { z } from 'zod'
 import { OrganizationModelBrandingSchema } from './domains/branding'
 import { OrganizationModelCrmSchema } from './domains/crm'
 import { OrganizationModelDeliverySchema } from './domains/delivery'
-import { OrganizationModelFeaturesSchema } from './domains/features'
+import { FeatureSchema } from './domains/features'
 import { OrganizationModelLeadGenSchema } from './domains/lead-gen'
 import { OrganizationModelNavigationSchema } from './domains/navigation'
-import { ResourceMappingSchema, SemanticDomainSchema } from './domains/shared'
+import { ResourceMappingSchema } from './domains/shared'
 
 const OrganizationModelSchemaBase = z.object({
   version: z.literal(1).default(1),
-  domains: z.array(SemanticDomainSchema).default([]),
+  features: z.array(FeatureSchema).default([]),
   branding: OrganizationModelBrandingSchema,
-  features: OrganizationModelFeaturesSchema,
   navigation: OrganizationModelNavigationSchema,
   crm: OrganizationModelCrmSchema,
   leadGen: OrganizationModelLeadGenSchema,
@@ -48,7 +47,7 @@ function collectIds<T extends { id: string }>(
 }
 
 export const OrganizationModelSchema = OrganizationModelSchemaBase.superRefine((model, ctx) => {
-  const domainsById = collectIds(model.domains, ctx, ['domains'], 'Domain')
+  const featuresById = collectIds(model.features, ctx, ['features'], 'Feature')
   const surfacesById = collectIds(model.navigation.surfaces, ctx, ['navigation', 'surfaces'], 'Surface')
   collectIds(model.navigation.groups, ctx, ['navigation', 'groups'], 'Navigation group')
   collectIds(model.resourceMappings, ctx, ['resourceMappings'], 'Resource mapping')
@@ -87,48 +86,51 @@ export const OrganizationModelSchema = OrganizationModelSchemaBase.superRefine((
     })
   })
 
-  model.domains.forEach((domain, domainIndex) => {
-    domain.surfaceIds.forEach((surfaceId, surfaceIndex) => {
+  // Feature -> Surface bidirectional validation
+  model.features.forEach((feature, featureIndex) => {
+    feature.surfaceIds.forEach((surfaceId, surfaceIndex) => {
       const surface = surfacesById.get(surfaceId)
       if (!surface) {
         addIssue(
           ctx,
-          ['domains', domainIndex, 'surfaceIds', surfaceIndex],
-          `Domain "${domain.id}" references unknown surface "${surfaceId}"`
+          ['features', featureIndex, 'surfaceIds', surfaceIndex],
+          `Feature "${feature.id}" references unknown surface "${surfaceId}"`
         )
         return
       }
 
-      if (!surface.domainIds.includes(domain.id)) {
+      if (!surface.featureIds.includes(feature.id)) {
         addIssue(
           ctx,
-          ['domains', domainIndex, 'surfaceIds', surfaceIndex],
-          `Domain "${domain.id}" references surface "${surfaceId}" but that surface does not include domain "${domain.id}"`
+          ['features', featureIndex, 'surfaceIds', surfaceIndex],
+          `Feature "${feature.id}" references surface "${surfaceId}" but that surface does not include feature "${feature.id}"`
         )
       }
     })
 
-    domain.resourceIds.forEach((resourceId, resourceIndex) => {
+    // Feature -> Resource bidirectional validation
+    feature.resourceIds.forEach((resourceId, resourceIndex) => {
       const resourceMapping = resourceMappingsByResourceId.get(resourceId)
       if (!resourceMapping) {
         addIssue(
           ctx,
-          ['domains', domainIndex, 'resourceIds', resourceIndex],
-          `Domain "${domain.id}" references unknown resource "${resourceId}"`
+          ['features', featureIndex, 'resourceIds', resourceIndex],
+          `Feature "${feature.id}" references unknown resource "${resourceId}"`
         )
         return
       }
 
-      if (!resourceMapping.domainIds.includes(domain.id)) {
+      if (!resourceMapping.featureIds.includes(feature.id)) {
         addIssue(
           ctx,
-          ['domains', domainIndex, 'resourceIds', resourceIndex],
-          `Domain "${domain.id}" references resource "${resourceId}" but that resource mapping does not include domain "${domain.id}"`
+          ['features', featureIndex, 'resourceIds', resourceIndex],
+          `Feature "${feature.id}" references resource "${resourceId}" but that resource mapping does not include feature "${feature.id}"`
         )
       }
     })
   })
 
+  // Surface -> Feature bidirectional validation and other surface refs
   model.navigation.surfaces.forEach((surface, surfaceIndex) => {
     if (surface.parentId && !surfacesById.has(surface.parentId)) {
       addIssue(
@@ -138,26 +140,27 @@ export const OrganizationModelSchema = OrganizationModelSchemaBase.superRefine((
       )
     }
 
-    surface.domainIds.forEach((domainId, domainIndex) => {
-      const domain = domainsById.get(domainId)
-      if (!domain) {
+    surface.featureIds.forEach((featureId, featureIndex) => {
+      const feature = featuresById.get(featureId)
+      if (!feature) {
         addIssue(
           ctx,
-          ['navigation', 'surfaces', surfaceIndex, 'domainIds', domainIndex],
-          `Surface "${surface.id}" references unknown domain "${domainId}"`
+          ['navigation', 'surfaces', surfaceIndex, 'featureIds', featureIndex],
+          `Surface "${surface.id}" references unknown feature "${featureId}"`
         )
         return
       }
 
-      if (!domain.surfaceIds.includes(surface.id)) {
+      if (!feature.surfaceIds.includes(surface.id)) {
         addIssue(
           ctx,
-          ['navigation', 'surfaces', surfaceIndex, 'domainIds', domainIndex],
-          `Surface "${surface.id}" references domain "${domainId}" but that domain does not include surface "${surface.id}"`
+          ['navigation', 'surfaces', surfaceIndex, 'featureIds', featureIndex],
+          `Surface "${surface.id}" references feature "${featureId}" but that feature does not include surface "${surface.id}"`
         )
       }
     })
 
+    // Surface -> Resource bidirectional validation
     surface.resourceIds.forEach((resourceId, resourceIndex) => {
       const resourceMapping = resourceMappingsByResourceId.get(resourceId)
       if (!resourceMapping) {
@@ -179,23 +182,24 @@ export const OrganizationModelSchema = OrganizationModelSchemaBase.superRefine((
     })
   })
 
+  // ResourceMapping -> Feature and Surface bidirectional validation
   model.resourceMappings.forEach((resourceMapping, resourceIndex) => {
-    resourceMapping.domainIds.forEach((domainId, domainIndex) => {
-      const domain = domainsById.get(domainId)
-      if (!domain) {
+    resourceMapping.featureIds.forEach((featureId, featureIndex) => {
+      const feature = featuresById.get(featureId)
+      if (!feature) {
         addIssue(
           ctx,
-          ['resourceMappings', resourceIndex, 'domainIds', domainIndex],
-          `Resource mapping "${resourceMapping.id}" references unknown domain "${domainId}"`
+          ['resourceMappings', resourceIndex, 'featureIds', featureIndex],
+          `Resource mapping "${resourceMapping.id}" references unknown feature "${featureId}"`
         )
         return
       }
 
-      if (!domain.resourceIds.includes(resourceMapping.resourceId)) {
+      if (!feature.resourceIds.includes(resourceMapping.resourceId)) {
         addIssue(
           ctx,
-          ['resourceMappings', resourceIndex, 'domainIds', domainIndex],
-          `Resource mapping "${resourceMapping.id}" references domain "${domainId}" but that domain does not include resource "${resourceMapping.resourceId}"`
+          ['resourceMappings', resourceIndex, 'featureIds', featureIndex],
+          `Resource mapping "${resourceMapping.id}" references feature "${featureId}" but that feature does not include resource "${resourceMapping.resourceId}"`
         )
       }
     })

package/src/organization-model/types.ts

@@ -2,10 +2,10 @@ import type { z } from 'zod'
 import { OrganizationModelBrandingSchema } from './domains/branding'
 import { OrganizationModelCrmSchema } from './domains/crm'
 import { OrganizationModelDeliverySchema } from './domains/delivery'
-import { OrganizationModelFeaturesSchema, FeatureKeySchema } from './domains/features'
+import { FeatureSchema } from './domains/features'
 import { OrganizationModelLeadGenSchema } from './domains/lead-gen'
 import { OrganizationModelNavigationSchema, SurfaceDefinitionSchema } from './domains/navigation'
-import { ResourceMappingSchema, SemanticDomainSchema } from './domains/shared'
+import { ResourceMappingSchema } from './domains/shared'
 import { OrganizationModelSchema } from './schema'
 
 export type OrganizationModel = z.infer<typeof OrganizationModelSchema>
@@ -13,15 +13,10 @@ export type OrganizationModelBranding = z.infer<typeof OrganizationModelBranding
 export type OrganizationModelCrm = z.infer<typeof OrganizationModelCrmSchema>
 export type OrganizationModelLeadGen = z.infer<typeof OrganizationModelLeadGenSchema>
 export type OrganizationModelDelivery = z.infer<typeof OrganizationModelDeliverySchema>
-export type OrganizationModelFeatures = z.infer<typeof OrganizationModelFeaturesSchema>
-export type OrganizationModelFeatureKey = z.infer<typeof FeatureKeySchema>
+export type OrganizationModelFeature = z.infer<typeof FeatureSchema>
 export type OrganizationModelNavigation = z.infer<typeof OrganizationModelNavigationSchema>
 export type OrganizationModelSurface = z.infer<typeof SurfaceDefinitionSchema>
-export type OrganizationModelSemanticDomain = z.infer<typeof SemanticDomainSchema>
 export type OrganizationModelResourceMapping = z.infer<typeof ResourceMappingSchema>
 
-export type DeepPartial<T> = T extends Array<infer U>
-  ? Array<DeepPartial<U>>
-  : T extends object
-    ? { [K in keyof T]?: DeepPartial<T[K]> }
-    : T
+export type DeepPartial<T> =
+  T extends Array<infer U> ? Array<DeepPartial<U>> : T extends object ? { [K in keyof T]?: DeepPartial<T[K]> } : T

package/src/platform/constants/versions.ts

@@ -1,3 +1,3 @@
 export const VERSION = {
-  CURRENT: '1.5.7'
+  CURRENT: '1.6.0'
 }

package/src/platform/sse/events.ts

@@ -14,54 +14,21 @@ import type {
   ExecutionCompleteEvent,
   ExecutionConnectedEvent
 } from '../../execution/core/sse-executions'
-import type {
-  CalibrationSSEEvent,
-  CalibrationExecutionStartedEvent,
-  CalibrationExecutionCompletedEvent,
-  CalibrationExecutionFailedEvent,
-  CalibrationSessionStartedEvent,
-  CalibrationTurnStartedEvent,
-  CalibrationTurnCompletedEvent,
-  CalibrationSessionCompletedEvent,
-  CalibrationGradingStartedEvent,
-  CalibrationGradingCompletedEvent,
-  CalibrationGradingFailedEvent,
-  CalibrationCompletedEvent,
-  CalibrationFailedEvent,
-  CalibrationConnectedEvent
-} from '../../execution/calibration/sse-events'
 
 // Re-export domain-specific event types
 export type { NotificationSSEEvent, NotificationCountUpdatedEvent }
 export type { ActivitySSEEvent, ActivityCreatedEvent, ActivityConnectedEvent }
 export type { CommandQueueSSEEvent, CommandQueueTaskUpdatedEvent, CommandQueueConnectedEvent }
 export type { ExecutionSSEEvent, ExecutionStartedEvent, ExecutionLogEvent, ExecutionCompleteEvent, ExecutionConnectedEvent }
-export type {
-  CalibrationSSEEvent,
-  CalibrationExecutionStartedEvent,
-  CalibrationExecutionCompletedEvent,
-  CalibrationExecutionFailedEvent,
-  CalibrationSessionStartedEvent,
-  CalibrationTurnStartedEvent,
-  CalibrationTurnCompletedEvent,
-  CalibrationSessionCompletedEvent,
-  CalibrationGradingStartedEvent,
-  CalibrationGradingCompletedEvent,
-  CalibrationGradingFailedEvent,
-  CalibrationCompletedEvent,
-  CalibrationFailedEvent,
-  CalibrationConnectedEvent
-}
 
 /**
  * Union of all application-level SSE events across all domains
  *
  * Use this for generic SSE handling that needs to support all event types.
- * For domain-specific handling, use NotificationSSEEvent, ActivitySSEEvent, ExecutionSSEEvent, CalibrationSSEEvent, etc.
+ * For domain-specific handling, use NotificationSSEEvent, ActivitySSEEvent, ExecutionSSEEvent, etc.
  */
 export type AppSSEEvent =
   | NotificationSSEEvent
   | ActivitySSEEvent
   | CommandQueueSSEEvent
   | ExecutionSSEEvent
-  | CalibrationSSEEvent

package/src/projects/api-schemas.ts

@@ -102,7 +102,8 @@ export const UpdateProjectRequestSchema = z
 export const GetProjectsQuerySchema = z
   .object({
     kind: ProjectKindSchema.optional(),
-    status: ProjectStatusSchema.optional()
+    status: ProjectStatusSchema.optional(),
+    search: z.string().trim().min(1).max(255).optional()
   })
   .strict()
 

package/src/reference/_generated/contracts.md

@@ -1,3 +1,4 @@
+<!-- Auto-generated on 2026-04-18T10:41:03.508Z by scripts/monorepo/generate-scaffold-contracts.js -->
 ---
 title: Reference Contracts
 description: Auto-generated TypeScript contracts for SDK consumers. Do not edit manually.
@@ -37,16 +38,10 @@ export type OrganizationModelLeadGen = z.infer<typeof OrganizationModelLeadGenSc
 export type OrganizationModelDelivery = z.infer<typeof OrganizationModelDeliverySchema>
 ```
 
-### `OrganizationModelFeatures`
+### `OrganizationModelFeature`
 
 ```typescript
-export type OrganizationModelFeatures = z.infer<typeof OrganizationModelFeaturesSchema>
-```
-
-### `OrganizationModelFeatureKey`
-
-```typescript
-export type OrganizationModelFeatureKey = z.infer<typeof FeatureKeySchema>
+export type OrganizationModelFeature = z.infer<typeof FeatureSchema>
 ```
 
 ### `OrganizationModelNavigation`
@@ -61,12 +56,6 @@ export type OrganizationModelNavigation = z.infer<typeof OrganizationModelNaviga
 export type OrganizationModelSurface = z.infer<typeof SurfaceDefinitionSchema>
 ```
 
-### `OrganizationModelSemanticDomain`
-
-```typescript
-export type OrganizationModelSemanticDomain = z.infer<typeof SemanticDomainSchema>
-```
-
 ### `OrganizationModelResourceMapping`
 
 ```typescript
@@ -76,11 +65,7 @@ export type OrganizationModelResourceMapping = z.infer<typeof ResourceMappingSch
 ### `DeepPartial`
 
 ```typescript
-export type DeepPartial<T> = T extends Array<infer U>
-  ? Array<DeepPartial<U>>
-  : T extends object
-    ? { [K in keyof T]?: DeepPartial<T[K]> }
-    : T
+export type DeepPartial<T> = T extends Array<infer U> ? Array<DeepPartial<U>> : T extends object ? { [K in keyof T]?: DeepPartial<T[K]> } : T
 ```
 
 ## Feature System
@@ -121,15 +106,10 @@ export type FeatureSidebarComponent = ComponentType
 
 ```typescript
 export interface FeatureModule {
-  /** Unique stable identifier for this feature (e.g. `'crm'`, `'delivery'`). */
+  /** Unique stable identifier for this feature (e.g. `'crm'`, `'projects'`). */
   key: string
-  /** Feature key used for access-flag gating in the organization model. */
-  accessFeatureKey: OrganizationModelFeatureKey
-  /**
-   * Semantic domain identifiers contributed by this feature.
-   * Merged with surface-derived domain IDs during resolution.
-   */
-  domainIds?: OrganizationModelSemanticDomain['id'][]
+  /** Feature ID used for access-flag gating — must match the `id` of a feature in the organization model. */
+  featureId: string
   /**
    * Capability identifiers contributed by this feature.
    * Merged into `ResolvedFeatureSemantics.capabilityIds` at resolution time.
@@ -156,7 +136,7 @@ export interface FeatureModule {
 
 ```typescript
 export interface ResolvedFeatureAccess {
-  featureKey: string
+  featureId: string
   enabled: boolean
 }
 ```
@@ -165,7 +145,6 @@ export interface ResolvedFeatureAccess {
 
 ```typescript
 export interface ResolvedFeatureSemantics {
-  domainIds: OrganizationModelSemanticDomain['id'][]
   capabilityIds: string[]
   surfaceIds: string[]
   surfaces: OrganizationModelSurface[]
@@ -199,7 +178,7 @@ export type ShellNavSource = 'app' | 'feature'
 export interface ResolvedShellNavItem extends FeatureNavEntry {
   placement: ShellNavPlacement
   source: ShellNavSource
-  accessFeatureKey?: string
+  featureId?: string
 }
 ```
 
@@ -262,7 +241,7 @@ export interface OrganizationGraphContextValue {
   surfaceId?: string
   surfacePath?: string
   surfaceType?: OrganizationModelSurface['surfaceType']
-  featureKey?: OrganizationModelFeatureKey
+  featureId?: string
 }
 ```
 

package/src/reference/glossary.md

@@ -13,7 +13,7 @@ This condensed version covers every ambiguity-prone term a template consumer or
 
 ## Terms
 
-**accessFeatureKey** -- the `OrganizationModelFeatureKey` a `FeatureModule` declares so the provider knows which org-level gate to check. Required field on every `FeatureModule`. Distinct from the nav-item `featureKey` (see below). Shell keys like `crm` and `lead-gen` map to grouped org-model keys (`acquisition`) via `FEATURE_KEY_ALIASES` -- this aliasing is automatic; callers do not need to translate manually.
+**featureId** (on FeatureModule) -- the `id` string a `FeatureModule` declares so the provider knows which entry in `OrganizationModel.features` to check for access gating. Required field on every `FeatureModule`. Must match the `id` of an entry in the features array (e.g. `'crm'`, `'projects'`). Distinct from the nav-item `featureKey` (see below). No aliasing layer -- IDs are direct matches.
 
 **AdminGuard** -- route-level admin wrapper from `@elevasis/ui/features/auth`. Wraps routes restricted to admin members. Must nest inside `ProtectedRoute`. Does not replace `requiresAdmin` on nav entries -- use both when both route access and nav visibility need admin enforcement.
 
@@ -21,45 +21,41 @@ This condensed version covers every ambiguity-prone term a template consumer or
 
 **DeploymentSpec** -- the complete resource collection for one organization (`workflows`, `agents`, `triggers`, `integrations`, `relationships`, `externalResources`, `humanCheckpoints`). Defined in `@repo/core`. The `operations/src/index.ts` file in each external project exports one `DeploymentSpec`.
 
-**Domain** -- a semantic business area in `OrganizationModel.domains`. Four defaults: `crm`, `lead-gen`, `delivery`, `operations`. Domains group entity IDs, surface IDs, resource IDs, and capability IDs into a coherent business area. Semantic, not navigational -- describes what business area a thing belongs to, not which access key gates it. Distinct from "feature": a domain describes business meaning; a feature key describes access and enablement.
+**Domain** -- removed concept. What was previously a `SemanticDomain` entry in `OrganizationModel.domains` is now expressed directly as a **Feature** in the `features` array. The `domains` field no longer exists on `OrganizationModel`. Semantic grouping (entity IDs, surface IDs, resource IDs, capability IDs) now lives on each `OrganizationModelFeature` object.
 
-**FEATURE_KEY_ALIASES** -- the alias map in `@elevasis/ui` that bridges shell feature-module keys to org-model grouped keys: `crm -> acquisition`, `lead-gen -> acquisition`, `projects -> delivery`. Used internally by `createFeatureAccessHook` so `isFeatureEnabled('crm')` resolves correctly against `MembershipFeatureConfig.features.acquisition`.
-
-**FoundationLegacyFeatureKey** -- template-local union for feature keys defined in `foundations/config/organization-model.ts`. Distinct from the published `OrganizationModelFeatureKey` (seven-key union from `@elevasis/core`). Extension point for template-specific feature identity without modifying the published core union. `FoundationFeatureKey` combines both (`OrganizationModelFeatureKey | FoundationLegacyFeatureKey`). `FEATURE_KEY_ALIASES` maps between shell keys and org-model grouped keys at runtime.
-
-**Feature** -- an overloaded term. Always qualify which layer is in scope:
+**Feature** -- the unified concept replacing the former three-layer system (feature keys, semantic domains, feature modules). Always qualify which layer is in scope:
 
 - **Platform capability** -- a product area (Execution Engine, Workflows, Agents, etc.). Not one-to-one with shell features.
-- **Shell FeatureModule** -- a manifest-backed UI feature registered with `ElevasisFeaturesProvider`. Seven manifest-backed: `lead-gen`, `crm`, `delivery`, `operations`, `monitoring`, `settings`, `seo`. Two utility (no manifest): `auth`, `dashboard`.
-- **Organization-model feature key** (`OrganizationModelFeatureKey`) -- grouped access key. Seven values: `acquisition`, `delivery`, `operations`, `monitoring`, `settings`, `seo`, `calibration`. Controls org-level gating and membership overrides.
+- **Organization-model feature** (`OrganizationModelFeature`) -- a single entry in `OrganizationModel.features`. Combines access gating (`enabled`), semantic grouping (`entityIds`, `surfaceIds`, `resourceIds`, `capabilityIds`), and display metadata (`label`, `description`, `color`, `icon`). Seven defaults: `crm`, `lead-gen`, `projects`, `operations`, `monitoring`, `settings`, `seo`.
+- **Shell FeatureModule** -- a manifest-backed UI feature registered with `ElevasisFeaturesProvider`. Declares `featureId` matching an org-model feature ID. Seven manifest-backed: `lead-gen`, `crm`, `projects`, `operations`, `monitoring`, `settings`, `seo`. Two utility (no manifest): `auth`, `dashboard`.
 
-**featureKey** (nav-item) -- optional field on `FeatureNavEntry` and `FeatureNavLink` that gates a specific nav item's visibility independently of the module's `accessFeatureKey`. Resolved through `FEATURE_KEY_ALIASES`. May be more specific than the module's access key when a nested link needs a narrower gate.
+**featureKey** (nav-item) -- optional field on `FeatureNavEntry` and `FeatureNavLink` that gates a specific nav item's visibility independently of the module's `featureId`. Must match a feature ID in the org model. May be more specific than the module's `featureId` when a nested link needs a narrower gate.
 
 **FeatureGuard** -- route-level feature gate from `@elevasis/ui/features/auth`. Blocks access to a route when the resolved org model has the relevant feature key disabled. Must nest inside `ProtectedRoute`. Distinct from `AdminGuard` (admin membership) and `ProtectedRoute` (authentication).
 
-**FeatureModule** -- the manifest contract each shell feature provides to `ElevasisFeaturesProvider`. Defined in `@repo/ui`, NOT `@repo/core`. Fields: `key`, `accessFeatureKey` (required), `domainIds`, `capabilityIds`, `navEntry`, `sidebar`, `subshellRoutes`, `organizationGraph` (Operations-only). Template consumers build a local manifest array and pass it to `ElevasisFeaturesProvider` in `__root.tsx`.
+**FeatureModule** -- the manifest contract each shell feature provides to `ElevasisFeaturesProvider`. Defined in `@repo/ui`, NOT `@repo/core`. Fields: `key`, `featureId` (required -- replaces the former `accessFeatureKey`), `capabilityIds`, `navEntry`, `sidebar`, `subshellRoutes`, `organizationGraph` (Operations-only). Template consumers build a local manifest array and pass it to `ElevasisFeaturesProvider` in `__root.tsx`.
 
 **Foundations** -- the adapter layer in `foundations/` (two modules: `config/organization-model.ts` and `types/index.ts`). Source package with no build step. Depends only on `@elevasis/core` (npm) and `zod`. Never import `@repo/core` from foundations -- that would break standalone deployment.
 
 **Manifest** -- a `FeatureModule` instance that declares what one shell feature contributes at runtime (nav, sidebar, subshell routes, access key, semantic references). The provider registers an array of manifests at startup and validates them against the resolved org model.
 
-**MembershipFeatureConfig** -- per-member-per-org feature overrides stored in `org_memberships.config`. Six keys: `operations`, `monitoring`, `acquisition`, `delivery`, `calibration`, `seo`. Note: `settings` is absent -- see **Settings asymmetry** below.
+**MembershipFeatureConfig** -- per-member-per-org feature overrides stored in `org_memberships.config`. The `features` field is now `Record<string, boolean>` -- any feature ID can be overridden per member. Previously hardcoded to five keys (`operations`, `monitoring`, `acquisition`, `delivery`, `seo`); now open to any feature ID in the org model.
 
 **OrganizationModel** -- the top-level semantic contract for an organization. Published from `@elevasis/core/organization-model`. In the template, authored in `foundations/config/organization-model.ts` and exported as `canonicalOrganizationModel` (passed to `ElevasisFeaturesProvider`) and `organizationModel` (enriched shape for app-local use).
 
-**OrganizationModelFeatureKey** -- seven values: `acquisition`, `delivery`, `operations`, `monitoring`, `settings`, `seo`, `calibration`. These appear in `OrganizationModel.features.enabled` and as `accessFeatureKey` on `FeatureModule` instances. `MembershipFeatureConfig` overrides six of them per member (no `settings` slot -- see **Settings asymmetry**).
+**OrganizationModelFeature** -- the TypeScript type (`z.infer<typeof FeatureSchema>`) for a single entry in `OrganizationModel.features`. Replaces the former `OrganizationModelFeatureKey` (closed enum) and `OrganizationModelSemanticDomain`. Each feature has `id`, `label`, `enabled`, and semantic grouping arrays (`entityIds`, `surfaceIds`, `resourceIds`, `capabilityIds`). Exported from `@elevasis/core/organization-model`.
 
 **Provider / ElevasisFeaturesProvider** -- the runtime that registers manifests, resolves feature access against the org model, dispatches subshell routing via `FeatureShell`, and exposes resolved state through `useElevasisFeatures()`. Mounted in `__root.tsx`. Accepts `features`, optional `organizationModel`, and optional `appShellOverrides`.
 
-**Resolved types (ResolvedFeatureModule, ResolvedShellNavItem)** -- provider output. `ResolvedFeatureModule` extends `FeatureModule` with `access` (enabled state) and `semantics` (merged domain, capability, and surface IDs). `ResolvedShellNavItem` extends `FeatureNavEntry` with `placement`, `source`, and `accessFeatureKey`. Both from `@elevasis/ui`.
+**Resolved types (ResolvedFeatureModule, ResolvedShellNavItem)** -- provider output. `ResolvedFeatureModule` extends `FeatureModule` with `access` (enabled state and `featureId`) and `semantics` (merged capability and surface IDs). `ResolvedShellNavItem` extends `FeatureNavEntry` with `placement`, `source`, and `featureId`. Both from `@elevasis/ui`.
 
 **Resource** -- an entry in `OrganizationModel.resourceMappings` linking a deployable automation resource into the semantic model. At the registry layer, resources are `WorkflowDefinition` or `AgentDefinition` instances in a `DeploymentSpec`.
 
-**Settings asymmetry** -- `settings` is a valid `OrganizationModelFeatureKey` (org-level, present in `OrganizationModel.features.enabled`). It is absent from `MembershipFeatureConfig` (six keys, no `settings`). The org can disable settings entirely, but per-member disabling is not supported. Settings visibility for individual members is controlled via `requiresAdmin` on the nav entry and `AdminGuard` on routes.
+**Settings asymmetry** -- `settings` is a valid feature ID (org-level, present in `OrganizationModel.features` with `enabled: true` by default). `MembershipFeatureConfig.features` is now `Record<string, boolean>`, so `settings` can technically be overridden per member, but the convention is still to gate settings visibility via `requiresAdmin` on the nav entry and `AdminGuard` on routes rather than per-member feature overrides.
 
 **Subshell / Sidebar** -- the feature-scoped UI region rendered when the current route matches a manifest's `subshellRoutes`. Each `FeatureModule.sidebar` is a `ComponentType`. Consumers customize by composing the feature's published sidebar primitives (`CrmSidebar`, `CrmSidebarMiddle`, etc.) and assigning their component to `manifest.sidebar`.
 
-**Surface** -- a navigable view in `OrganizationModel.navigation.surfaces`. Identified by a dotted `id` (e.g., `crm.pipeline`). Has `path`, `surfaceType`, optional `featureKey` gate, and cross-reference arrays. Distinct from "page": a surface is the org-model declaration; a page is the React component rendered at the route.
+**Surface** -- a navigable view in `OrganizationModel.navigation.surfaces`. Identified by a dotted `id` (e.g., `crm.pipeline`). Has `path`, `surfaceType`, optional `featureId` gate (replaces the former `featureKey` field), and cross-reference arrays (`featureIds`, `entityIds`, `resourceIds`, `capabilityIds`). Distinct from "page": a surface is the org-model declaration; a page is the React component rendered at the route.
 
 **Topology** -- resource relationships (`triggers`, `uses`, `approval`) declared in `DeploymentSpec.relationships` and `HumanCheckpointDefinition.routesTo`. Used for Command View graph edges.
 
@@ -69,7 +65,7 @@ This condensed version covers every ambiguity-prone term a template consumer or
 
 **`@elevasis/core`** (published npm)
 
-- `OrganizationModel`, `OrganizationModelFeatureKey`, `OrganizationModelSurface`, `OrganizationModelResourceMapping`
+- `OrganizationModel`, `OrganizationModelFeature`, `OrganizationModelSurface`, `OrganizationModelResourceMapping`
 - `resolveOrganizationModel`, `defineOrganizationModel`, `DEFAULT_ORGANIZATION_MODEL`
 - `MembershipFeatureConfig`
 
@@ -79,7 +75,7 @@ This condensed version covers every ambiguity-prone term a template consumer or
 - `ResolvedFeatureModule`, `ResolvedShellNavItem`
 - `FeatureGuard`, `AdminGuard`, `ProtectedRoute`
 - `ElevasisFeaturesProvider`, `ElevasisCoreProvider`, `useElevasisFeatures`
-- `FEATURE_KEY_ALIASES`, `createFeatureAccessHook`
+- `createFeatureAccessHook`
 
 **`foundations/`** (local source package -- not published)
 

package/src/supabase/database.types.ts

@@ -1117,113 +1117,6 @@ export type Database = {
           },
         ]
       }
-      calibration_projects: {
-        Row: {
-          created_at: string | null
-          description: string | null
-          id: string
-          name: string
-          organization_id: string
-          resource_id: string
-          resource_type: string
-          updated_at: string | null
-        }
-        Insert: {
-          created_at?: string | null
-          description?: string | null
-          id?: string
-          name: string
-          organization_id: string
-          resource_id: string
-          resource_type: string
-          updated_at?: string | null
-        }
-        Update: {
-          created_at?: string | null
-          description?: string | null
-          id?: string
-          name?: string
-          organization_id?: string
-          resource_id?: string
-          resource_type?: string
-          updated_at?: string | null
-        }
-        Relationships: [
-          {
-            foreignKeyName: "calibration_projects_organization_id_fkey"
-            columns: ["organization_id"]
-            isOneToOne: false
-            referencedRelation: "organizations"
-            referencedColumns: ["id"]
-          },
-        ]
-      }
-      calibration_runs: {
-        Row: {
-          completed_at: string | null
-          config_variants: Json
-          created_at: string | null
-          description: string | null
-          execution_mode: string
-          grader_model: string | null
-          grading_rubric: Json | null
-          id: string
-          name: string
-          organization_id: string
-          project_id: string
-          results: Json
-          status: string
-          test_inputs: Json
-        }
-        Insert: {
-          completed_at?: string | null
-          config_variants: Json
-          created_at?: string | null
-          description?: string | null
-          execution_mode?: string
-          grader_model?: string | null
-          grading_rubric?: Json | null
-          id?: string
-          name: string
-          organization_id: string
-          project_id: string
-          results?: Json
-          status?: string
-          test_inputs: Json
-        }
-        Update: {
-          completed_at?: string | null
-          config_variants?: Json
-          created_at?: string | null
-          description?: string | null
-          execution_mode?: string
-          grader_model?: string | null
-          grading_rubric?: Json | null
-          id?: string
-          name?: string
-          organization_id?: string
-          project_id?: string
-          results?: Json
-          status?: string
-          test_inputs?: Json
-        }
-        Relationships: [
-          {
-            foreignKeyName: "calibration_runs_organization_id_fkey"
-            columns: ["organization_id"]
-            isOneToOne: false
-            referencedRelation: "organizations"
-            referencedColumns: ["id"]
-          },
-          {
-            foreignKeyName: "calibration_runs_project_id_fkey"
-            columns: ["project_id"]
-            isOneToOne: false
-            referencedRelation: "calibration_projects"
-            referencedColumns: ["id"]
-          },
-        ]
-      }
       command_queue: {
         Row: {
           action_payload: Json | null

package/src/test-utils/rls/RLSTestContext.ts

@@ -68,8 +68,6 @@ export class RLSTestContext {
     notifications: string[]
     credentials: string[]
     activities: string[]
-    calibration_projects: string[]
-    calibration_runs: string[]
   }
 
   constructor() {
@@ -105,9 +103,7 @@ export class RLSTestContext {
       executionMetrics: [],
       notifications: [],
       credentials: [],
-      activities: [],
-      calibration_projects: [],
-      calibration_runs: []
+      activities: []
     }
   }
 
@@ -396,8 +392,6 @@ export class RLSTestContext {
    * - credentials (FK: organizations, users)
    * - sessions (FK: organizations, users)
    * - activities (FK: organizations)
-   * - calibration_runs (FK: calibration_projects, organizations)
-   * - calibration_projects (FK: organizations)
    *
    * Level 3 (Organization/User dependencies):
    * - invitations (FK: organizations, users)
@@ -505,30 +499,6 @@ export class RLSTestContext {
       }
     }
 
-    // Delete calibration_runs (FK: calibration_projects, organizations)
-    if (this.createdIds.calibration_runs.length > 0) {
-      const { error } = await this.adminClient
-        .from('calibration_runs')
-        .delete()
-        .in('id', this.createdIds.calibration_runs)
-
-      if (error) {
-        errors.push(`Failed to delete calibration_runs: ${error.message}`)
-      }
-    }
-
-    // Delete calibration_projects (FK: organizations)
-    if (this.createdIds.calibration_projects.length > 0) {
-      const { error } = await this.adminClient
-        .from('calibration_projects')
-        .delete()
-        .in('id', this.createdIds.calibration_projects)
-
-      if (error) {
-        errors.push(`Failed to delete calibration_projects: ${error.message}`)
-      }
-    }
-
     // LEVEL 3: Delete organization/user relationship tables
 
     // Delete invitations