@xemahq/xema 0.12.0 → 0.14.0

package/dist/runtime/waves.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.bootGraphHardClosure = bootGraphHardClosure;
 exports.deriveWaves = deriveWaves;
 exports.findWaveOrderViolations = findWaveOrderViolations;
+const distribution_1 = require("@xemahq/kernel-contracts/distribution");
+const boot_graph_loader_1 = require("./boot-graph-loader");
 function bootGraphHardClosure(seed, bootGraph, exists) {
     const out = new Set(seed.filter(exists));
     const queue = [...out];
@@ -21,25 +23,89 @@ function bootGraphHardClosure(seed, bootGraph, exists) {
     }
     return [...out];
 }
-const DEFAULT_TIER_RANK = {
-    kernel: 0,
-    system: 1,
-    base: 2,
-    platform: 3,
-    edge: 4,
-};
+const CANONICAL_TIER_RANK = distribution_1.PLATFORM_SERVICE_TIER_RANK;
 function deriveWaves(roster, bootGraph) {
+    if (bootGraph === undefined) {
+        return deriveTierWaves(roster);
+    }
+    (0, boot_graph_loader_1.assertBootGraphIntegrity)(bootGraph);
+    const entries = new Map();
+    for (const entry of roster) {
+        if (entries.has(entry.name)) {
+            throw new Error(`Cannot compile boot waves: duplicate roster service "${entry.name}".`);
+        }
+        entries.set(entry.name, entry);
+    }
+    const prerequisites = new Map();
+    const dependents = new Map();
+    for (const name of entries.keys()) {
+        prerequisites.set(name, new Set());
+        dependents.set(name, new Set());
+    }
+    for (const [name] of entries) {
+        const node = bootGraph.services.get(name);
+        for (const dependency of node?.startupRequires ?? []) {
+            if (bootGraph.infraServices.has(dependency)) {
+                continue;
+            }
+            if (!entries.has(dependency)) {
+                throw new Error(`Cannot compile boot waves: service "${name}" hard-requires "${dependency}", ` +
+                    `but that dependency is absent from the resolved roster.`);
+            }
+            prerequisites.get(name)?.add(dependency);
+            dependents.get(dependency)?.add(name);
+        }
+    }
+    const effectiveTier = (name) => bootGraph.services.get(name)?.tier ?? entries.get(name)?.tier ?? '';
     const rank = (tier) => {
-        const fromGraph = bootGraph?.tiers[tier];
+        const fromGraph = bootGraph.tiers[tier];
         if (typeof fromGraph === 'number') {
             return fromGraph;
         }
-        const fromDefault = DEFAULT_TIER_RANK[tier];
-        if (typeof fromDefault === 'number') {
-            return fromDefault;
+        const fromCanonical = CANONICAL_TIER_RANK[tier];
+        if (typeof fromCanonical === 'number') {
+            return fromCanonical;
         }
         return Number.MAX_SAFE_INTEGER;
     };
+    const remaining = new Set(entries.keys());
+    const waves = [];
+    while (remaining.size > 0) {
+        const ready = [...remaining].filter((name) => (prerequisites.get(name)?.size ?? 0) === 0);
+        if (ready.length === 0) {
+            throw new Error(`Cannot compile boot waves: no dependency-free service remains among ${[
+                ...remaining,
+            ]
+                .sort()
+                .join(', ')}.`);
+        }
+        const orderedTiers = [...new Set(ready.map(effectiveTier))].sort((left, right) => rank(left) - rank(right) || left.localeCompare(right));
+        const tier = orderedTiers[0];
+        if (tier === undefined) {
+            throw new Error('Cannot compile boot waves: ready service set has no tier.');
+        }
+        const members = ready
+            .filter((name) => effectiveTier(name) === tier)
+            .sort()
+            .map((name) => entries.get(name))
+            .filter((entry) => entry !== undefined);
+        waves.push({ index: waves.length, tier, members });
+        for (const member of members) {
+            remaining.delete(member.name);
+            for (const dependent of dependents.get(member.name) ?? []) {
+                prerequisites.get(dependent)?.delete(member.name);
+            }
+        }
+    }
+    return waves;
+}
+function deriveTierWaves(roster) {
+    const rank = (tier) => {
+        const fromCanonical = CANONICAL_TIER_RANK[tier];
+        return typeof fromCanonical === 'number'
+            ? fromCanonical
+            : Number.MAX_SAFE_INTEGER;
+    };
     const byTier = new Map();
     for (const entry of roster) {
         const bucket = byTier.get(entry.tier);
@@ -54,17 +120,18 @@ function deriveWaves(roster, bootGraph) {
     return orderedTiers.map((tier, index) => ({
         index,
         tier,
-        members: (byTier.get(tier) ?? []).slice().sort((a, b) => a.name.localeCompare(b.name)),
+        members: (byTier.get(tier) ?? [])
+            .slice()
+            .sort((a, b) => a.name.localeCompare(b.name)),
     }));
 }
 function findWaveOrderViolations(waves, bootGraph) {
-    const tierOfService = new Map();
+    const waveOfService = new Map();
     for (const wave of waves) {
         for (const m of wave.members) {
-            tierOfService.set(m.name, wave.tier);
+            waveOfService.set(m.name, { index: wave.index, tier: wave.tier });
         }
     }
-    const rank = (tier) => typeof bootGraph.tiers[tier] === 'number' ? bootGraph.tiers[tier] : Number.MAX_SAFE_INTEGER;
     const violations = [];
     for (const wave of waves) {
         for (const m of wave.members) {
@@ -76,16 +143,16 @@ function findWaveOrderViolations(waves, bootGraph) {
                 if (bootGraph.infraServices.has(req)) {
                     continue;
                 }
-                const reqTier = tierOfService.get(req);
-                if (reqTier === undefined) {
+                const required = waveOfService.get(req);
+                if (required === undefined) {
                     continue;
                 }
-                if (rank(reqTier) >= rank(wave.tier)) {
+                if (required.index >= wave.index) {
                     violations.push({
                         service: m.name,
                         requires: req,
                         serviceTier: wave.tier,
-                        requiresTier: reqTier,
+                        requiresTier: required.tier,
                     });
                 }
             }

package/dist/runtime/waves.js.map

@@ -1 +1 @@
-{"version":3,"file":"waves.js","sourceRoot":"","sources":["../../src/runtime/waves.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"waves.js","sourceRoot":"","sources":["../../src/runtime/waves.ts"],"names":[],"mappings":"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"}

package/examples/01-local-native.yaml

@@ -14,7 +14,10 @@ infra:
   # etcd is REQUIRED — it backs cross-process service discovery.
   # If you want the launcher to manage infra too, use the container substrate
   # (see 02-local-container-full.yaml).
-  postgres: { mode: external, url: postgresql://postgres:postgres@127.0.0.1:5432 }
+  postgres:
+    { mode: external, url: postgresql://xema@127.0.0.1:5432, secretRef: postgres-password }
   redis:    { mode: external, url: redis://127.0.0.1:6379 }
   etcd:     { mode: external, url: http://127.0.0.1:2379 }
   keycloak: { mode: external, url: http://127.0.0.1:8180, realm: xema }
+secrets:
+  postgres-password: { from: env, env: XEMA_POSTGRES_PASSWORD }

package/examples/03-byo-infra.yaml

@@ -8,10 +8,20 @@ app:
   substrate: container
   include: all
 infra:
-  postgres:    { mode: external, url: postgresql://app:secret@db.corp.internal:5432 }
-  keycloak:    { mode: external, url: https://sso.corp/realms/xema, realm: xema }
-  objectStore: { mode: external, url: https://s3.corp.internal, bucketPrefix: xema-, secretRef: corp-s3 }
-  redis:       { mode: managed }
-  etcd:        { mode: managed }
-  search:      { mode: managed }
-  temporal:    { mode: disabled }   # this install doesn't use durable workflows
+  postgres:
+    {
+      mode: external,
+      url: postgresql://app@db.corp.internal:5432,
+      secretRef: corp-postgres-password,
+    }
+  keycloak: { mode: external, url: https://sso.corp/realms/xema, realm: xema }
+  objectStore:
+    { mode: external, url: https://s3.corp.internal, bucketPrefix: xema- }
+  redis: { mode: managed }
+  etcd: { mode: managed }
+  search: { mode: managed }
+  temporal: { mode: disabled } # this install doesn't use durable workflows
+secrets:
+  corp-postgres-password: { from: env, env: XEMA_POSTGRES_PASSWORD }
+  S3_ACCESS_KEY_ID: { from: env }
+  S3_SECRET_ACCESS_KEY: { from: env }

package/examples/05-appliance-helm.yaml

@@ -2,7 +2,7 @@
 # `helm upgrade --install` per service; Kubernetes owns lifecycle (rollout,
 # restart, scaling). Infra (Postgres/etcd/...) is a cluster prerequisite, not
 # managed by the launcher here. Env: XEMA_CHART_REPO, XEMA_NAMESPACE, KUBECONFIG.
-#   Equivalent CLI: xema serve --profile appliance
+#   Equivalent CLI: xema serve --substrate appliance
 edition: oss
 app:
   substrate: helm

package/examples/06-biome-sources.yaml

@@ -46,6 +46,9 @@ sources:
     authTokenEnv: NPM_TOKEN_ACME
 
 infra:
-  postgres: { mode: external, url: postgresql://postgres:postgres@127.0.0.1:5432 }
+  postgres:
+    { mode: external, url: postgresql://xema@127.0.0.1:5432, secretRef: postgres-password }
   redis:    { mode: external, url: redis://127.0.0.1:6379 }
   keycloak: { mode: external, url: http://127.0.0.1:8180, realm: xema }
+secrets:
+  postgres-password: { from: env, env: XEMA_POSTGRES_PASSWORD }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xemahq/xema",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "license": "Apache-2.0",
   "description": "Xema OS global CLI (plan v4.3 §6 Phase J). Single binary day-0 onboarding: `npm i -g @xemahq/xema && xema dev` boots the whole stack; `xema biome scaffold` / `install` / `publish` / `lint` author and ship biomes; `xema run <capability>` invokes through the local capability-router. Multi-platform: works without pnpm or any monorepo clone.",
   "type": "commonjs",
@@ -21,10 +21,11 @@
     "@nestjs/common": "11.1.13",
     "@nestjs/core": "11.1.13",
     "@nestjs/platform-express": "11.1.13",
-    "@xemahq/distribution-resolver": "^0.1.1",
-    "@xemahq/kernel-contracts": "^0.22.0",
-    "@xemahq/kernel-state-runtime": "^0.2.0",
-    "@xemahq/service-registry-nest": "^0.2.0",
+    "@xemahq/distribution-resolver": "^0.1.2",
+    "@xemahq/dsl": "^0.6.1",
+    "@xemahq/kernel-contracts": "^0.59.0",
+    "@xemahq/kernel-state-runtime": "^0.2.1",
+    "@xemahq/service-registry-nest": "^0.5.0",
     "commander": "^12.1.0",
     "reflect-metadata": "0.2.2",
     "rxjs": "7.8.2",

package/xema.config.example.yaml

@@ -3,7 +3,7 @@
 #
 # Every value shown is the default; delete what you don't override.
 
-edition: oss                     # which distribution edition to launch
+edition: oss # which distribution edition to launch
 
 # ── backing infrastructure (BYO model) ───────────────────────────────────────
 # mode ∈ managed | external | disabled
@@ -11,36 +11,40 @@ edition: oss                     # which distribution edition to launch
 #   external — you already run it; give the URL (launcher health-probes it)
 #   disabled — not run (only allowed for optional components)
 infra:
-  postgres:    { mode: managed }                 # mandatory
-  redis:       { mode: managed }                 # mandatory
-  etcd:        { mode: managed }                 # mandatory (service discovery)
-  keycloak:    { mode: managed }                 # mandatory (identity)
-  objectStore: { mode: managed }                 # mandatory (blobs/artifacts)
-  search:      { mode: managed }                 # optional (full-text / vectors)
-  fga:         { mode: managed }                 # optional (authorization ReBAC)
-  git:         { mode: disabled }                # optional (SCM integration)
-  temporal:    { mode: managed }                 # optional (durable workflows)
+  postgres: { mode: managed } # mandatory
+  redis: { mode: managed } # mandatory
+  etcd: { mode: managed } # mandatory (service discovery)
+  keycloak: { mode: managed } # mandatory (identity)
+  objectStore: { mode: managed } # mandatory (blobs/artifacts)
+  search: { mode: managed } # optional (full-text / vectors)
+  fga: { mode: managed } # optional (authorization ReBAC)
+  git: { mode: disabled } # optional (SCM integration)
+  temporal: { mode: managed } # optional (durable workflows)
   # Example BYO:
+  # postgres: { mode: external, url: postgresql://xema@db.example.com:5432, secretRef: postgres-password }
   # keycloak: { mode: external, url: https://sso.example.com/realms/xema, realm: xema }
-  # objectStore: { mode: external, url: https://s3.example.com, secretRef: my-s3 }
+  # objectStore: { mode: external, url: https://s3.example.com }
 
 # ── application services ─────────────────────────────────────────────────────
 app:
-  substrate: container           # container | native | helm
-  processModel: distributed      # distributed (microservices, etcd discovery) — the only supported model
-  include: [ all ]               # all | tier names (kernel/system/base/platform) | service names
-  exclude: []                    # service names to drop
-  features: []                   # curated capability bundles (union with include)
+  substrate: container # container | native | helm
+  processModel: distributed # distributed (microservices, etcd discovery) — the only supported model
+  include: default # default (skips distribution-optional biomes) | all | list of tier names (kernel/system/base/platform/edge) and/or service names
+  exclude: [] # service names to drop
+  features: [] # curated capability bundles (union with include)
   web:
-    enabled: false               # start the host-shell frontend (or use `xema up --web`)
+    enabled: false # start the host-shell frontend (or use `xema up --web`)
 
 # ── persistence ──────────────────────────────────────────────────────────────
 state:
   workspaces:
-    driver: docker_local         # docker_local (container) | host_path (native)
+    driver: docker_local # docker_local (container) | host_path (native)
 
 # ── secrets the launcher must obtain (never dev-defaulted in production) ──────
 secrets:
   OPENCODE_SERVER_PASSWORD: { from: prompt }
+  # postgres-password: { from: env, env: XEMA_POSTGRES_PASSWORD }
+  # S3_ACCESS_KEY_ID: { from: env }
+  # S3_SECRET_ACCESS_KEY: { from: env }
   # DELEGATED_SESSION_JWT_PRIVATE_KEY: { from: file, path: ./keys/session.pem }
   # LLM_PROVIDER_ANTHROPIC_API_KEY: { from: env }