Merge pull request 'Fix native package verification on hardened noexec /tmp' (#88) from fix/verifier-exec-scratch into main

Reviewed-on: https://git.riverofglorymn.org/River_of_Glory_Church/Ekklesia/pulls/88
Reviewed-by: The_River <[email protected]>

.dockerignore

@@ -0,0 +1,30 @@
+# Build context for deploy/Dockerfile (ADR 0044). The image installs its own dependencies with
+# `pnpm install --frozen-lockfile` and builds its own outputs, so nothing installed or built on the
+# host may enter the context, and no secret or environment file may enter any layer.
+
+# Installed modules never enter the platform image (ADR 0048): an installation keeps them in its own
+# module storage, mounted at run time. Excluding the checkout's `modules/` is what makes a build
+# identical whether or not modules happen to be present in the source tree.
+/modules
+
+# Host-installed dependencies and build outputs: the image produces its own.
+**/node_modules
+**/dist
+**/.turbo
+**/coverage
+**/*.tsbuildinfo
+
+# Environment and secret material. Configuration reaches the container only through its runtime
+# environment; `.env.example` is excluded too, since nothing in the image reads it.
+**/.env
+**/.env.*
+
+# Repository and tooling metadata the image never reads.
+.git
+.github
+.gitea
+.forgejo
+.vscode
+.idea
+**/*.log
+**/.DS_Store

.env.example

@@ -10,6 +10,12 @@
 # The plaintext loopback DATABASE_URL below is therefore only usable with this set.
 NODE_ENV=development
 
+# Installed modules (ADR 0048). Unset, the checkout's own modules/ is used, as module development
+# and the platform's tests expect. Set, it must be an absolute path to an existing directory;
+# anything else stops the API and every module command with a sanitized error. The production
+# image sets /var/lib/ekklesia/modules.
+# EKKLESIA_MODULES_DIR=/absolute/path/to/modules
+
 POSTGRES_DB=ekklesia
 POSTGRES_USER=ekklesia
 POSTGRES_PASSWORD=ekklesia-development-only

.gitattributes

@@ -6,3 +6,7 @@
 *.gif binary
 *.webp binary
 *.woff2 binary
+
+# Reviewed license supplements are named by the SHA-256 of their exact bytes (ADR 0052), so Git must
+# never rewrite their line endings.
+packages/module-pack/license-supplements/** -text

.github/workflows/ci.yml

@@ -1,18 +1,13 @@
 name: CI
 
-# IMPORTANT — the currently inventoried server is Gitea 1.24.2, which *ignores* several keys used
-# below. Per https://docs.gitea.com/1.24/usage/actions/comparison, its unsupported workflow syntax
-# includes `permissions` / `jobs.<job_id>.permissions`, `concurrency`, and
-# `jobs.<job_id>.timeout-minutes`. They are declared here deliberately, so the workflow is already
-# correct on a supported release and on GitHub Actions, but on this server they are inert:
+# The server runs Gitea 1.27.2 (docs/development/security.md, "What this server honours"):
 #
-#   * `permissions:` does NOT restrict the in-job `GITEA_TOKEN`. Job-token permission controls,
-#     repository/owner defaults, and server-side maximum-permission clamping arrive in the 1.26
-#     feature line (https://docs.gitea.com/1.26/usage/actions/token-permissions). Until the server
-#     is upgraded and configured, the token's authority is whatever the server grants — not what
-#     this file requests.
-#   * `concurrency:` and `timeout-minutes:` are NOT bounded-execution guarantees here. Cancellation,
-#     timeout, and teardown must be enforced by the trusted runner provisioner/reaper.
+#   * `concurrency:` is honoured: a newer push to a pull request cancels the run it supersedes, so a
+#     cancelled run's own cleanup is never guaranteed (see the CI stack sweep in each stack job).
+#   * `permissions:` is supported by 1.27 with Gitea's own scopes, but what the job token can do on
+#     this server is not yet proven, so nothing here relies on it being read-only.
+#   * `timeout-minutes:` is no longer listed as unsupported, but is not verified here either;
+#     teardown relies on the stack sweep and the runner's own reaper.
 #
 # `persist-credentials: false` below is unaffected by any of this and is enforced by the action
 # itself. See docs/development/security.md.
@@ -63,6 +58,9 @@ jobs:
     needs: verify
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    env:
+      # Names this job's stacks, so its final step removes exactly these (scripts/lib/ci-project.sh).
+      EKKLESIA_CI_JOB_KEY: infrastructure-smoke
     steps:
       - name: Check out repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -72,13 +70,73 @@ jobs:
           # in this workflow pushes, so the credential is never needed after checkout.
           persist-credentials: false
 
+      # A job the runner killed (cancelled, or past the runner's own time limit) never ran its
+      # cleanup. Anything a CI job left on this shared daemon more than three hours ago goes first.
+      - name: Sweep stale CI stacks from the runner
+        run: bash scripts/ci-sweep.sh --stale
+
+      - name: Prove the sweep removes exactly what it should, against real Docker resources
+        run: bash scripts/test-ci-sweep.sh
+
       - name: Exercise PostgreSQL and S3 infrastructure
         run: bash scripts/smoke-infrastructure.sh
 
+      # Whatever happened above, this job's own stacks do not outlive it.
+      - name: Remove this job's CI stacks
+        if: always()
+        run: bash scripts/ci-sweep.sh --job
+
   migration-smoke:
     needs: verify
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    env:
+      # Names this job's stacks, so its final step removes exactly these (scripts/lib/ci-project.sh).
+      EKKLESIA_CI_JOB_KEY: migration-smoke
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          # `actions/checkout` defaults to leaving the job token in `.git/config`, where any later
+          # step — including one a pull request added to this file — could read or reuse it. Nothing
+          # in this workflow pushes, so the credential is never needed after checkout.
+          persist-credentials: false
+
+      # A job the runner killed (cancelled, or past the runner's own time limit) never ran its
+      # cleanup. Anything a CI job left on this shared daemon more than three hours ago goes first.
+      - name: Sweep stale CI stacks from the runner
+        run: bash scripts/ci-sweep.sh --stale
+
+      - name: Set up Node.js
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: .node-version
+
+      - name: Activate pinned pnpm
+        run: |
+          corepack enable
+          corepack prepare [email protected] --activate
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Exercise transactional migrations against PostgreSQL
+        run: pnpm test:migrations:integration
+
+      # Whatever happened above, this job's own stacks do not outlive it.
+      - name: Remove this job's CI stacks
+        if: always()
+        run: bash scripts/ci-sweep.sh --job
+
+  package-release:
+    needs: verify
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    # What the gate proved, for the job that consumes its artifact to check it received exactly that.
+    outputs:
+      version: ${{ steps.release.outputs.version }}
+      revision: ${{ steps.release.outputs.revision }}
+      manifest_sha256: ${{ steps.release.outputs.manifest_sha256 }}
     steps:
       - name: Check out repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -101,5 +159,177 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: Exercise transactional migrations against PostgreSQL
-        run: pnpm test:migrations:integration
+      # ADR 0053's package release gate: build the public package train from this commit, build it
+      # again from a second checkout and require byte-identical artifacts, then install exactly those
+      # tarballs (offline, no registry) into a module outside this repository and prove it builds,
+      # packages, and verifies. Nothing is published and no credential exists here. A future publish
+      # job must depend on this job and publish only the artifacts it proved.
+      - name: Build, reproduce, and consume the public package train
+        run: pnpm test:package-release --keep package-train
+
+      - name: Describe the proven release train
+        id: release
+        run: |
+          release="$(find package-train -mindepth 1 -maxdepth 1 -type d)"
+          manifest="$release/ekklesia-package-train.json"
+          {
+            echo "version=$(node -p 'JSON.parse(require("fs").readFileSync(process.argv[1], "utf8")).version' "$manifest")"
+            echo "revision=$(node -p 'JSON.parse(require("fs").readFileSync(process.argv[1], "utf8")).source.revision' "$manifest")"
+            echo "manifest_sha256=$(sha256sum "$manifest" | cut -d' ' -f1)"
+          } >>"$GITHUB_OUTPUT"
+          cat "$manifest"
+
+      # The exact release artifacts, for the jobs that consume them, from a directory whose name does
+      # not start with a dot: the artifact actions leave hidden files out. Version 3 of the artifact
+      # actions: version 4 refuses any server that is not github.com, which this Gitea is not, while
+      # Gitea implements the protocol version 3 uses. A consumer checks the files, not the wrapper.
+      - name: Hand the release train on
+        uses: actions/upload-artifact@c6a3b2bd78b3985e4b2f15397fec357f0fd808de # v3.2.2-node20
+        with:
+          name: package-train
+          path: package-train/
+          if-no-files-found: error
+          retention-days: 7
+
+  # The publication tool, given exactly the artifact the package-release job proved, against a
+  # disposable Gitea 1.27.2 (scripts/test-package-publication.sh). Never the real registry, and no
+  # credential: the disposable registry's accounts are created and discarded inside the job.
+  package-publication:
+    needs: package-release
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    env:
+      # Names this job's stacks, so its final step removes exactly these (scripts/lib/ci-project.sh).
+      EKKLESIA_CI_JOB_KEY: package-publication
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      # A job the runner killed (cancelled, or past the runner's own time limit) never ran its
+      # cleanup. Anything a CI job left on this shared daemon more than three hours ago goes first.
+      - name: Sweep stale CI stacks from the runner
+        run: bash scripts/ci-sweep.sh --stale
+
+      - name: Set up Node.js
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: .node-version
+
+      - name: Activate pinned pnpm
+        run: |
+          corepack enable
+          corepack prepare [email protected] --activate
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Receive the release train the gate proved
+        uses: actions/download-artifact@ad191675b41f6a5b46da9a048cb6893812da158b # v3.1.0-node20
+        with:
+          name: package-train
+          path: package-train/
+
+      - name: Check it is exactly that train
+        env:
+          EXPECTED_MANIFEST_SHA256: ${{ needs.package-release.outputs.manifest_sha256 }}
+        run: |
+          release="$(find package-train -mindepth 1 -maxdepth 1 -type d)"
+          actual="$(sha256sum "$release/ekklesia-package-train.json" | cut -d' ' -f1)"
+          if [[ -z "$EXPECTED_MANIFEST_SHA256" || "$actual" != "$EXPECTED_MANIFEST_SHA256" ]]; then
+            echo "The received release manifest is not the one the package-release job proved." >&2
+            exit 1
+          fi
+          (cd "$release" && sha256sum --check --strict SHA256SUMS)
+
+      - name: Publish it to a disposable Gitea, and prove the round trip and recovery
+        run: bash scripts/test-package-publication.sh --release "$(find package-train -mindepth 1 -maxdepth 1 -type d)"
+
+      # Whatever happened above, this job's own stacks do not outlive it.
+      - name: Remove this job's CI stacks
+        if: always()
+        run: bash scripts/ci-sweep.sh --job
+
+  image-build:
+    needs: verify
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    env:
+      # Names this job's stacks, so its final step removes exactly these (scripts/lib/ci-project.sh).
+      EKKLESIA_CI_JOB_KEY: image-build
+      # Cache mounts in deploy/Dockerfile need BuildKit; this selects it even where the Docker CLI
+      # has no buildx plugin.
+      DOCKER_BUILDKIT: "1"
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          # `actions/checkout` defaults to leaving the job token in `.git/config`, where any later
+          # step — including one a pull request added to this file — could read or reuse it. Nothing
+          # in this workflow pushes, so the credential is never needed after checkout.
+          persist-credentials: false
+
+      # A job the runner killed (cancelled, or past the runner's own time limit) never ran its
+      # cleanup. Anything a CI job left on this shared daemon more than three hours ago goes first.
+      - name: Sweep stale CI stacks from the runner
+        run: bash scripts/ci-sweep.sh --stale
+
+      # The one generic platform image (ADR 0044, ADR 0048), proved rather than assumed: it contains no
+      # module, no module template, and no module manifest; its module storage mount point is empty;
+      # EKKLESIA_MODULES_DIR names it; and a checkout with a populated modules/ directory builds an
+      # identical runtime file system. Build only — no registry login, no credentials, no push, no tag
+      # anywhere but this runner's local image store. Tagged per run and attempt, and labeled like
+      # every CI stack, so this job's final step removes the images even if a build is killed.
+      - name: Build the generic platform image and prove it holds no modules
+        run: bash scripts/check-image.sh
+
+      # Whatever happened above, this job's own stacks do not outlive it.
+      - name: Remove this job's CI stacks
+        if: always()
+        run: bash scripts/ci-sweep.sh --job
+
+  deploy-smoke:
+    needs: verify
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    # Both topologies (ADR 0045), each on the one generic image: same-origin, the default every
+    # installation gets, and split, which installs a test-only module into module storage, removes
+    # it, and restores it (ADR 0048), and drives a real headless browser across the two origins.
+    strategy:
+      fail-fast: false
+      matrix:
+        topology:
+          - same-origin
+          - split
+    env:
+      # Names this job's stacks, so its final step removes exactly these (scripts/lib/ci-project.sh).
+      EKKLESIA_CI_JOB_KEY: deploy-smoke-${{ matrix.topology }}
+      DOCKER_BUILDKIT: "1"
+      EKKLESIA_SMOKE_TOPOLOGY: ${{ matrix.topology }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          # `actions/checkout` defaults to leaving the job token in `.git/config`, where any later
+          # step — including one a pull request added to this file — could read or reuse it. Nothing
+          # in this workflow pushes, so the credential is never needed after checkout.
+          persist-credentials: false
+
+      # A job the runner killed (cancelled, or past the runner's own time limit) never ran its
+      # cleanup. Anything a CI job left on this shared daemon more than three hours ago goes first.
+      - name: Sweep stale CI stacks from the runner
+        run: bash scripts/ci-sweep.sh --stale
+
+      # The reference deployment end to end (ADR 0044): the generic platform image, base + proxy with
+      # Caddy's internal CA (test-only), an explicit migration apply against this job's own fresh
+      # PostgreSQL, then the API, Dashboard, storage delivery, client-address chain, and verify-full
+      # database TLS through the proxy. Every secret is generated for this run and discarded with
+      # it; nothing is pushed, published, or logged in to.
+      - name: Smoke-test the reference deployment (${{ matrix.topology }})
+        run: bash scripts/smoke-deploy.sh
+
+      # Whatever happened above, this job's own stacks do not outlive it.
+      - name: Remove this job's CI stacks
+        if: always()
+        run: bash scripts/ci-sweep.sh --job

.github/workflows/publish-packages.yml

@@ -0,0 +1,133 @@
+name: Publish packages
+
+# Publishes one public @ekklesia/* package train (ADR 0053, docs/development/releases.md) to the
+# npm registry: exactly the artifacts this run's package-release gate proves, and nothing else.
+#
+# Only ever started by hand, on `main`, by someone with write access to this repository: no pull
+# request or push can start it. It needs the version-set commit of a release (`version` must equal
+# the platform version there), and the repository secret EKKLESIA_PACKAGES_PUBLISH_TOKEN, a token of
+# the dedicated publisher account with only the `write:package` scope. Packages are publicly
+# readable (ADR 0054); publishing is what this protects.
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: The package train version to publish, equal to the platform version on main.
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+# Never cancel a publication part way, and never run two at once. A rerun resumes safely.
+concurrency:
+  group: publish-packages
+  cancel-in-progress: false
+
+env:
+  # The only registry-specific setting: where the train is published.
+  EKKLESIA_PACKAGES_REGISTRY: https://git.riverofglorymn.org/api/packages/River_of_Glory_Church/npm/
+
+jobs:
+  package-release:
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    outputs:
+      version: ${{ steps.release.outputs.version }}
+      revision: ${{ steps.release.outputs.revision }}
+      manifest_sha256: ${{ steps.release.outputs.manifest_sha256 }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Set up Node.js
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: .node-version
+
+      - name: Activate pinned pnpm
+        run: |
+          corepack enable
+          corepack prepare [email protected] --activate
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      # The same credential-free gate as CI: build, reproduce, and consume the train.
+      - name: Build, reproduce, and consume the public package train
+        run: pnpm test:package-release --keep package-train
+
+      - name: Describe the proven release train
+        id: release
+        run: |
+          release="$(find package-train -mindepth 1 -maxdepth 1 -type d)"
+          manifest="$release/ekklesia-package-train.json"
+          {
+            echo "version=$(node -p 'JSON.parse(require("fs").readFileSync(process.argv[1], "utf8")).version' "$manifest")"
+            echo "revision=$(node -p 'JSON.parse(require("fs").readFileSync(process.argv[1], "utf8")).source.revision' "$manifest")"
+            echo "manifest_sha256=$(sha256sum "$manifest" | cut -d' ' -f1)"
+          } >>"$GITHUB_OUTPUT"
+
+      # Artifact actions version 3: version 4 refuses any server that is not github.com. The directory
+      # name must not start with a dot: the artifact actions leave hidden files out.
+      - name: Hand the release train on
+        uses: actions/upload-artifact@c6a3b2bd78b3985e4b2f15397fec357f0fd808de # v3.2.2-node20
+        with:
+          name: package-train
+          path: package-train/
+          if-no-files-found: error
+          retention-days: 90
+
+  publish:
+    needs: package-release
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      # Only for the publication tool itself: nothing is built or installed in this job.
+      - name: Check out repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Set up Node.js
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: .node-version
+
+      - name: Receive the release train the gate proved
+        uses: actions/download-artifact@ad191675b41f6a5b46da9a048cb6893812da158b # v3.1.0-node20
+        with:
+          name: package-train
+          path: package-train/
+
+      # The tool validates the whole train against its manifest, that manifest against the gate's,
+      # its version against the request, and its revision against this commit, before it sends
+      # anything; then publishes, verifies every package byte for byte, and moves `latest` last.
+      - name: Publish the exact release train
+        env:
+          EKKLESIA_PACKAGES_PUBLISH_TOKEN: ${{ secrets.EKKLESIA_PACKAGES_PUBLISH_TOKEN }}
+          TRAIN_VERSION: ${{ inputs.version }}
+          TRAIN_REVISION: ${{ github.sha }}
+          MANIFEST_SHA256: ${{ needs.package-release.outputs.manifest_sha256 }}
+        run: |
+          node scripts/publish-package-train.ts \
+            --release "$(find package-train -mindepth 1 -maxdepth 1 -type d)" \
+            --registry "$EKKLESIA_PACKAGES_REGISTRY" \
+            --version "$TRAIN_VERSION" \
+            --revision "$TRAIN_REVISION" \
+            --manifest-sha256 "$MANIFEST_SHA256" \
+            --record publication-record.json \
+            --require-public-read
+
+      - name: Keep the publication record
+        uses: actions/upload-artifact@c6a3b2bd78b3985e4b2f15397fec357f0fd808de # v3.2.2-node20
+        with:
+          name: package-train-publication-record
+          path: publication-record.json
+          if-no-files-found: error
+          retention-days: 90

.gitignore

@@ -1,4 +1,8 @@
 node_modules/
+# pnpm's content-addressed package store. pnpm keeps it beside node_modules on the same file system,
+# so when the checkout is its own mount (a CI runner's workspace volume, a bind-mounted container),
+# `pnpm install` creates it here, at the checkout's root. A package cache, never source.
+.pnpm-store/
 .turbo/
 coverage/
 dist/
@@ -16,3 +20,11 @@ generated/*
 
 core/.identity-schema-reference.ts
 core/.identity-schema-check-*
+
+# The packager tests copy fixture modules here (packages/module-pack/tests/support/fixture-module.ts).
+packages/module-pack/.fixtures/
+
+# `pnpm packages:release` writes package release trains here (scripts/package-release.ts).
+.package-release/
+# CI keeps the proven release here to hand it on as a workflow artifact (scripts/test-package-release.sh --keep).
+/package-train/

CLAUDE.md

@@ -78,6 +78,13 @@ ever disagree:
 - `pnpm test:migrations:integration` — live, disposable-PostgreSQL evidence: migration discovery,
   planning, and execution, plus the `apps/api` HTTP transport (signup, sign-in, principal
   resolution, sign-out). Requires Docker. Run this for any change touching either area.
+- `pnpm test:package-release` — builds the public `@ekklesia/*` package train, proves it
+  reproducible, and proves a standalone module consumes exactly those tarballs. Publishes nothing.
+  Run it for any change to the public packages or their release tooling.
+- `pnpm test:package-publication` — publishes a release train to a disposable Gitea (Docker) and
+  proves the publication tool. Never the real registry. The real publication is the manual
+  `Publish packages` workflow only; never run `scripts/publish-package-train.ts` against the real
+  registry without the user's explicit intent.
 - `pnpm doctor` — read-only local readiness report. Never treat it as a substitute for `pnpm
   verify` or the integration suite.
 - `pnpm migrations:plan` / `pnpm migrations:apply` — read-only planning vs. mutating execution

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -35,6 +35,48 @@ concurrency and release, exact destructive approvals, and sanitization against t
 adapter. A Core-owned `pnpm doctor` dashboard combines the existing static discovery and read-only
 migration-planning services into one concise readiness report.
 
+**Ekklesia ships one generic image, and installed modules live outside it
+([ADR 0048](docs/architecture/decisions/0048-generic-image-and-installed-module-storage.md)).** The
+production image built from [`deploy/Dockerfile`](deploy/Dockerfile) contains zero feature modules
+and is the same for every installation. Installed modules live in installation-owned module storage,
+selected by `EKKLESIA_MODULES_DIR` (`/var/lib/ekklesia/modules` in the image, the checkout's
+`modules/` when unset) and mounted read-only by the reference deployment. Each installed module is a
+self-contained directory carrying its own production dependencies. Installing, updating, or removing
+a module needs only a controlled restart and, when it has migrations, an explicit plan and apply.
+Nothing is hot loaded. Removing a module's code keeps its data and its stored state; its applied
+migration history is retained and reported, and blocks no other migration. A module is distributed
+as one **Ekklesia Module Package v1**
+([ADR 0049](docs/architecture/decisions/0049-module-package-v1.md)): a deterministic `.tar.gz` and
+its SHA-256, produced by the canonical packager (`@ekklesia/module-pack`) with the module's backend
+bundled, and checked by Core's verifier before it is installed. Two targets exist:
+- the portable `any` target, for pure-JavaScript modules;
+- `linux-x64-glibc`, for modules with a native dependency such as `sharp`. Its native runtime
+  packages are carried as real files under the package's `node_modules`, and the verifier checks the
+  host before anything is loaded.
+
+Every package records the module's validated SPDX expression and carries its explicitly
+supplied `LICENSE` bytes; dependency material remains separate in `THIRD_PARTY_NOTICES`. ABI-v1
+packages may bundle a module-owned Drizzle version without coupling it to Core;
+legacy-v8 packages retain their transitional exact-version check. Where a redistributed dependency
+omits licence material, the packager may add reviewed licence supplements
+([ADR 0052](docs/architecture/decisions/0052-reviewed-license-supplements.md)). A native package that
+redistributes LGPL or MPL code is distributed publicly only with its corresponding-source artifact,
+which `ekklesia-corresponding-source` builds and gates
+([ADR 0055](docs/architecture/decisions/0055-corresponding-source-artifacts.md)). Purge, other
+operating-system or CPU targets, signing, and any installer or marketplace do not exist yet.
+
+A module can be built in its own repository from Ekklesia's public module-development packages
+([ADR 0053](docs/architecture/decisions/0053-standalone-module-development-packages.md)):
+a curated `@ekklesia/module-sdk`, `@ekklesia/module-database`, the UI packages, and the build and
+packaging tools. They are released as one coordinated train of tarballs with a release manifest,
+and CI proves on every run that two builds of a commit are byte-identical and that a module outside
+the repository installs, builds, packages, and verifies from those artifacts alone. A manual
+workflow, the only way to publish, publishes exactly those artifacts to the npm registry and
+verifies every package byte for byte. Anyone may read and install the packages before launch
+([ADR 0054](docs/architecture/decisions/0054-public-package-reads-before-launch.md)). The first train
+published will be the next platform release
+([Releases and the public package train](docs/development/releases.md)).
+
 Phase 4A added Core-owned identity foundations: a Core-owned Better Auth database schema
 (`ekklesia_core_user`, `ekklesia_core_session`, `ekklesia_core_account`,
 `ekklesia_core_verification`), a first-class Core-owned migration source that coexists with
@@ -218,9 +260,10 @@ undeployed state, and the launch checklist in a single place. **CI is accepted a
 trusted-code-only boundary**: the self-hosted Gitea runner executes only code controlled and
 reviewed by trusted repository collaborators, and unknown or untrusted pull requests must not
 execute on it automatically. What remains is operational and cannot be proven from this repository —
-upgrading Gitea past 1.24.2 (which *ignores* the workflow's `permissions`, `concurrency`, and
-`timeout-minutes` declarations), clamping job-token authority server-side, enforcing timeout and
-teardown in a trusted provisioner/reaper, and proving disposable runner isolation. Those are
+configuring and proving job-token authority server-side (the server now runs Gitea 1.27.2, which
+honours `concurrency` and documents `permissions`, but neither token limits nor `timeout-minutes` are
+verified on it yet), enforcing timeout and teardown in a trusted provisioner/reaper, and proving
+disposable runner isolation. Those are
 prerequisites for **executing untrusted contributions**, alongside the deployment checklist that
 gates a **public launch**; moving future public contribution workflows to a service with isolated
 hosted runners is an acceptable alternative. **Neither set of requirements blocks Phase 6** — Surface
@@ -489,8 +532,8 @@ reported `blocked · configuration_missing · bucket` — never imported, never
 from inside its own `start` hook — and its required dependents block behind it through ADR 0028's
 existing mechanism. Doctor and `pnpm modules:validate` report the same thing while still importing no
 module code. That change introduced `manifestVersion: 5` as a hard cutover; the current strict
-manifest is version 7 after ADR 0033 added the optional display declaration and ADR 0041 added
-browser contributions.
+manifest is version 8 after ADR 0050 added the optional database ABI declaration. Version 8 is a
+hard cutover; a version 7 source module or package must be updated and rebuilt.
 
 **Ekklesia does not store secrets, and does not pretend to.** There is no encryption at rest here and
 no key management, so a `secret` key's value is supplied by the deployment
@@ -824,7 +867,7 @@ is versioned with no dual acceptance; migrating is one `pnpm build`.
 
 Phase 8 pass 3 lets one module contribute a browser renderer to a capability another module provides
 ([ADR 0041](docs/architecture/decisions/0041-module-browser-contributions.md)) — the browser half of
-the capability system Core has had since Phase 1. `manifestVersion: 7` declares a namespaced id, its
+the capability system Core has had since Phase 1. `manifestVersion: 8` declares a namespaced id, its
 own version, a target capability, a compatible range, and one artifact, and nothing else: there is no
 payload schema, slot, ordering, or rendering hint anywhere, so Core cannot learn what any of it
 means. Publication requires that another eligible module provides the capability inside the declared
@@ -1055,5 +1098,27 @@ environment.
 - [Module development](docs/module-development/README.md)
 - [Architecture decisions](docs/architecture/decisions/README.md)
 
-No open-source license has been selected yet. A license should be added only after the project
-owner makes that decision.
+## License
+
+Ekklesia is licensed under the **GNU Affero General Public License, version 3 or any later version**
+(SPDX `AGPL-3.0-or-later`). The full text of version 3 is in [LICENSE](LICENSE). Its source is
+available to you under the terms of that license.
+
+> Ekklesia is free software: you can redistribute it and/or modify it under the terms of the GNU
+> Affero General Public License as published by the Free Software Foundation, either version 3 of
+> the License, or (at your option) any later version.
+>
+> Ekklesia is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+> the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
+> General Public License for more details.
+>
+> You should have received a copy of the GNU Affero General Public License along with Ekklesia. If
+> not, see <https://www.gnu.org/licenses/>.
+
+Section 13 of the license adds an obligation for network use: if you modify Ekklesia and run your
+modified version for users who interact with it remotely over a network, your version must offer
+those users the opportunity to receive its Corresponding Source.
+
+Official Ekklesia modules, published by the Ekklesia project, are licensed under `AGPL-3.0-or-later`
+as well. Each module's own repository declares its license. The module template declares it in its
+`package.json`, so a module started from the template begins with the same license.

apps/api/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@ekklesia/api",
-  "version": "0.1.0",
+  "version": "0.2.2",
+  "license": "AGPL-3.0-or-later",
   "private": true,
   "type": "module",
   "files": [

apps/api/src/app.ts

@@ -1,6 +1,5 @@
 import {
   isAuthenticatedPrincipal,
-  type ModuleRuntimeServices,
   type ModuleSecretSource,
   type RegisteredModuleHttpRoute,
 } from "@ekklesia/contracts";
@@ -13,6 +12,7 @@ import type { DashboardStore } from "@ekklesia/core/dashboard";
 import type { DeviceStore } from "@ekklesia/core/devices";
 import { type EkklesiaIdentityRuntime, IdentityRuntimeError } from "@ekklesia/core/identity";
 import type {
+  AnyModuleRuntimeServices,
   DiscoveredModule,
   ModuleConfigurationLookup,
   ModuleConfigurationSettings,
@@ -20,6 +20,7 @@ import type {
   ModuleLifecycleSnapshot,
   ModuleLifecycleStore,
   ModuleRealtimeRegistry,
+  ModuleRuntimeServicesLookup,
   ModuleStorageLookup,
   ModuleUiPublicationRegistry,
 } from "@ekklesia/core/modules";
@@ -27,10 +28,13 @@ import type { Context, MiddlewareHandler } from "hono";
 import { Hono } from "hono";
 import { cors } from "hono/cors";
 import { AUTH_REQUEST_MAX_BODY_BYTES, platformBodyLimit } from "./body-limits.js";
+import type { DashboardHostAssets } from "./dashboard-host-assets.js";
+import { createDashboardHostRoutes } from "./dashboard-host-routes.js";
 import { createDashboardRoutes } from "./dashboard-routes.js";
 import { createDeviceRoutes } from "./device-routes.js";
 import type { DisplayHostAssets } from "./display-host-assets.js";
 import { createGrantsRoutes } from "./grants-routes.js";
+import { type ApiHealthOptions, createHealthRoutes } from "./health-routes.js";
 import { createModuleConfigurationRoutes } from "./module-configuration-routes.js";
 import { mountModuleDisplayRoutes } from "./module-display-routes.js";
 import { canonicalizeVaryHeader, mountModuleHttpRoutes } from "./module-http-routes.js";
@@ -59,11 +63,10 @@ export interface CreateApiAppOptions {
   /** The started runtime's immutable module-owned realtime registry. Required explicitly even when
    * empty, for the same reason as module routes: application composition never guesses what ran. */
   readonly moduleRealtime: ModuleRealtimeRegistry;
-  /** The same frozen services object the caller's started module runtime already passed to every
-   * module's `start`/`stop` hooks (`apps/api/src/server.ts`) — reference-identical, never a fresh
-   * object built here, so a module's HTTP handlers and lifecycle hooks share exactly one
-   * `ModuleDatabase` for the lifetime of this API runtime. */
-  readonly moduleServices: ModuleRuntimeServices;
+  /** The same per-module service lookup the caller's started module runtime used for every
+   * module's `start`/`stop` hooks (`apps/api/src/server.ts`) — each handler receives its module's
+   * reference-identical service object, never a fresh facade or executor built per request. */
+  readonly moduleServices: ModuleRuntimeServicesLookup | AnyModuleRuntimeServices;
   /** The platform's module UI publication policy — always the one Core builds from the exact
    * discovered inventory this runtime started (`createModuleUiPublicationRegistry`,
    * `apps/api/src/server.ts`). Required rather than defaulted, for the same reason `moduleRoutes`
@@ -137,6 +140,20 @@ export interface CreateApiAppOptions {
    * presentation only — nothing reachable through this store influences discovery, dependency
    * ordering, module startup, or any authorization decision. */
   readonly dashboard: DashboardStore;
+  /**
+   * The built Dashboard's two files, read once by production startup (ADR 0044). Required rather
+   * than optional, unlike `displayHostAssets`: every installation has a Dashboard, and a missing
+   * shell build fails startup instead of leaving this origin answering `/` with a 404. See
+   * `./dashboard-host-routes.js`.
+   */
+  readonly dashboardHostAssets: DashboardHostAssets;
+  /**
+   * The readiness inputs behind the unauthenticated health routes (ADR 0044). Required rather than
+   * defaulted, like every other dependency here: a composition that cannot reach a database says so
+   * with a check that rejects, never falls through to an implicitly healthy one. `checkDatabase` is
+   * the bare query; the routes themselves bound and serialize it. See `./health-routes.js`.
+   */
+  readonly health: ApiHealthOptions;
   readonly runtime: EkklesiaIdentityRuntime;
   /** Exact allowed browser origins. Never a wildcard; combined with `credentials: true`, only an
    * exact, reflected match is ever returned in `Access-Control-Allow-Origin`. Also the trusted set
@@ -341,6 +358,16 @@ export function createApiApp(options: CreateApiAppOptions): Hono {
     }
   });
 
+  // Unauthenticated liveness/readiness under a platform-owned sibling prefix: like every route below,
+  // it is mounted before module routes and never inside `/api/v1/modules/`, which installed modules
+  // own entirely. See `./health-routes.js`.
+  app.route("/", createHealthRoutes(options.health));
+
+  // The Dashboard page and its one script, at exact literal paths outside `/api/` (ADR 0044). They
+  // grant no authority and resolve no principal; the page asks `/api/v1/principal` itself. See
+  // `./dashboard-host-routes.js`.
+  app.route("/", createDashboardHostRoutes(options.dashboardHostAssets));
+
   app.route(
     "/",
     createGrantsRoutes({

apps/api/src/conditional-request.ts

@@ -0,0 +1,16 @@
+/**
+ * RFC 9110 weak comparison for a GET/HEAD `If-None-Match` precondition, shared by the host-owned
+ * asset routes that answer `304` against a strong validator they computed from their own bytes.
+ */
+export function etagMatches(headerValue: string | undefined, etag: string): boolean {
+  if (headerValue === undefined) {
+    return false;
+  }
+  if (headerValue.trim() === "*") {
+    return true;
+  }
+  return headerValue.split(",").some((candidate) => {
+    const value = candidate.trim();
+    return (value.startsWith("W/") ? value.slice(2) : value) === etag;
+  });
+}

apps/api/src/config.ts

@@ -200,3 +200,19 @@ export function createApiRuntimeConfig(
     storage,
   });
 }
+
+/**
+ * The exact browser origins the API trusts: CORS on `/api/auth/*` and `/api/v1/*`, and every
+ * mutation route's origin check (ADR 0045).
+ *
+ * The configured trusted origins plus the identity base URL's own origin, which is where the API
+ * lives. Better Auth already trusts its base URL implicitly; this makes the API's own checks agree,
+ * so a page the API itself serves (the display host, and the Dashboard in the same-origin topology)
+ * passes without an operator listing the API's origin. Order is preserved and duplicates removed;
+ * every entry is already a canonical origin.
+ */
+export function apiTrustedOrigins(
+  identity: Pick<IdentityConfig, "baseUrl" | "trustedOrigins">,
+): readonly string[] {
+  return Object.freeze([...new Set([...identity.trustedOrigins, identity.baseUrl])]);
+}

apps/api/src/dashboard-host-assets.ts

@@ -0,0 +1,108 @@
+import { createHash } from "node:crypto";
+import { readFile } from "node:fs/promises";
+import { dashboardHostAssetUrls } from "@ekklesia/shell/dashboard-assets";
+
+/**
+ * The two immutable, platform-owned files that make up the built Ekklesia Dashboard (ADR 0044).
+ *
+ * Exactly the model `./display-host-assets.js` uses: read once, before the HTTP listener is bound,
+ * from the exact URLs the surface package exports. Request input is never involved in this read, the
+ * package is never exposed as a static directory, and the source map beside the script is never
+ * read. Text rather than a mutable `Buffer` keeps the frozen snapshot a genuinely immutable value
+ * every response can reuse.
+ */
+export interface DashboardHostAssets {
+  readonly html: string;
+  readonly htmlEtag: string;
+  readonly script: string;
+  readonly scriptEtag: string;
+}
+
+/** A startup failure with a fixed, non-secret shape. The originating filesystem exception, package
+ * location, and machine path are intentionally not retained or surfaced. */
+export class DashboardHostAssetError extends Error {
+  readonly code = "DASHBOARD_HOST_ASSET_UNAVAILABLE" as const;
+
+  constructor() {
+    super("The Dashboard host browser assets are unavailable.");
+    this.name = "DashboardHostAssetError";
+    this.stack = `${this.name}: ${this.message}`;
+    Object.freeze(this);
+  }
+}
+
+function strongEtag(text: string): string {
+  return `"${createHash("sha256").update(text).digest("base64url")}"`;
+}
+
+/**
+ * Captures one immutable, internally consistent Dashboard asset snapshot.
+ *
+ * Each strong validator is derived from the exact text in the same snapshot, so bytes from one build
+ * can never be paired with an ETag from another. Empty output is a failed shell build rather than a
+ * valid page that can never render anything.
+ */
+export function createDashboardHostAssets(html: string, script: string): DashboardHostAssets {
+  if (html.trim().length === 0 || script.trim().length === 0) {
+    throw new DashboardHostAssetError();
+  }
+  return Object.freeze({
+    html,
+    htmlEtag: strongEtag(html),
+    script,
+    scriptEtag: strongEtag(script),
+  });
+}
+
+/**
+ * The exact element the built Dashboard page carries for its API origin (ADR 0045), empty. The shell
+ * reads the filled-in value at run time; empty means the page's own origin.
+ */
+export const DASHBOARD_API_ORIGIN_PLACEHOLDER = '<meta content="" name="ekklesia-api-origin" />';
+
+function isCanonicalHttpOrigin(value: string): boolean {
+  try {
+    const url = new URL(value);
+    return (url.protocol === "https:" || url.protocol === "http:") && url.origin === value;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Writes the API's own origin into the Dashboard page, once, before the page's `ETag` is computed.
+ *
+ * The origin is the identity base URL's, which is where `/api` lives in either topology: the page's
+ * own origin when the Dashboard and the API share one, the API hostname when they are split. The
+ * built page must carry exactly one empty placeholder; anything else is a shell build this API does
+ * not understand, and startup fails rather than serving a page that might send credentials somewhere
+ * unintended. The value is escaped for an attribute even though a canonical origin cannot contain
+ * any character that needs it.
+ */
+export function renderDashboardPage(html: string, apiOrigin: string): string {
+  const parts = html.split(DASHBOARD_API_ORIGIN_PLACEHOLDER);
+  if (parts.length !== 2 || !isCanonicalHttpOrigin(apiOrigin)) {
+    throw new DashboardHostAssetError();
+  }
+  const escaped = apiOrigin
+    .replaceAll("&", "&amp;")
+    .replaceAll('"', "&quot;")
+    .replaceAll("<", "&lt;")
+    .replaceAll(">", "&gt;");
+  return parts.join(`<meta content="${escaped}" name="ekklesia-api-origin" />`);
+}
+
+/** Loads only the two surface-declared files, and renders the API origin into the page. A missing,
+ * unreadable, or incompatible build fails startup rather than leaving an API whose own origin answers
+ * `/` with a 404 or a page that cannot find its API. */
+export async function loadDashboardHostAssets(apiOrigin: string): Promise<DashboardHostAssets> {
+  try {
+    // Sequential deliberately, as for the display host: diagnostics stay deterministic and no
+    // rejected sibling read is left running after this function has already failed.
+    const html = await readFile(new URL(dashboardHostAssetUrls.html), "utf8");
+    const script = await readFile(new URL(dashboardHostAssetUrls.script), "utf8");
+    return createDashboardHostAssets(renderDashboardPage(html, apiOrigin), script);
+  } catch {
+    throw new DashboardHostAssetError();
+  }
+}

apps/api/src/dashboard-host-routes.ts

@@ -0,0 +1,123 @@
+import { Hono } from "hono";
+import { etagMatches } from "./conditional-request.js";
+import { createDashboardHostAssets, type DashboardHostAssets } from "./dashboard-host-assets.js";
+
+/**
+ * The Dashboard's two host-owned routes (ADR 0044). Neither can collide with anything else the API
+ * serves: `/` is the only page the Dashboard has — it has no client router, and every emailed
+ * verification or reset link lands on `/` with a query (ADR 0038) — and the script lives beside, never
+ * inside, the display host's `/assets/ekklesia-display/` namespace. Module routes all live under
+ * `/api/v1/modules/<module-id>`.
+ */
+export const DASHBOARD_HOST_PAGE_PATH = "/";
+export const DASHBOARD_HOST_SCRIPT_PATH = "/assets/ekklesia-dashboard/app.js";
+
+/**
+ * Revalidate-always with a strong `ETag`, exactly the module UI and display-host script policy. The
+ * shell emits fixed, unhashed file names, so no response here may be cached as `immutable`: a
+ * rebuilt Dashboard must reach a browser on its next load, and an unchanged one costs a `304`.
+ */
+const DASHBOARD_HOST_CACHE_CONTROL = "no-cache";
+
+/**
+ * Headers the Dashboard page carries on every answer, including a `304`, so a revalidated cache
+ * entry never keeps an older set.
+ *
+ * The page holds the platform sign-in form, so it refuses to be framed by anyone — `X-Frame-Options`
+ * for older browsers, and CSP `frame-ancestors`, the one directive a policy here carries until the
+ * full Content-Security-Policy is decided separately. `no-referrer` keeps the page's URL, which can
+ * briefly hold an emailed reset token before the shell strips it, out of every request it makes.
+ */
+const DASHBOARD_PAGE_SECURITY_HEADERS = Object.freeze({
+  "Content-Security-Policy": "frame-ancestors 'none'",
+  "Referrer-Policy": "no-referrer",
+  "X-Content-Type-Options": "nosniff",
+  "X-Frame-Options": "DENY",
+});
+
+/** A composition error, detected before any Dashboard route is registered. Carries no file path,
+ * package location, or asset content. */
+export class DashboardHostConfigurationError extends Error {
+  constructor() {
+    super("The Dashboard host configuration is inconsistent.");
+    this.name = "DashboardHostConfigurationError";
+    this.stack = `${this.name}: ${this.message}`;
+    Object.freeze(this);
+  }
+}
+
+/** Copies and validates injected assets before registering any route, as the display host does, so
+ * a composition can never pair bytes with a validator computed from different bytes. */
+function snapshotAssets(input: DashboardHostAssets): DashboardHostAssets {
+  try {
+    const snapshot = createDashboardHostAssets(input.html, input.script);
+    if (snapshot.htmlEtag !== input.htmlEtag || snapshot.scriptEtag !== input.scriptEtag) {
+      throw new DashboardHostConfigurationError();
+    }
+    return snapshot;
+  } catch {
+    throw new DashboardHostConfigurationError();
+  }
+}
+
+function fixedAsset(
+  ifNoneMatch: string | undefined,
+  body: string,
+  etag: string,
+  contentType: string,
+  extraHeaders: Readonly<Record<string, string>>,
+): Response {
+  if (etagMatches(ifNoneMatch, etag)) {
+    return new Response(null, {
+      headers: { ...extraHeaders, "Cache-Control": DASHBOARD_HOST_CACHE_CONTROL, ETag: etag },
+      status: 304,
+    });
+  }
+  return new Response(body, {
+    headers: {
+      "X-Content-Type-Options": "nosniff",
+      ...extraHeaders,
+      "Cache-Control": DASHBOARD_HOST_CACHE_CONTROL,
+      "Content-Type": contentType,
+      ETag: etag,
+    },
+    status: 200,
+  });
+}
+
+/**
+ * Serves the built Dashboard from the same origin as `/api`, so the identity system keeps its
+ * default same-origin shape.
+ *
+ * Two exact literal routes over one frozen snapshot: never a static directory, never a path or file
+ * name taken from the request, and never the source map. Any other path — `/index.html`, `/app.js`,
+ * the `.map`, a traversal spelling — has no route and falls through to the application's ordinary
+ * sanitized `404`. Like the display host's code, these bytes grant no authority: the page renders
+ * the sign-in form until `/api/v1/principal` says otherwise.
+ */
+export function createDashboardHostRoutes(assets: DashboardHostAssets): Hono {
+  const snapshot = snapshotAssets(assets);
+  const routes = new Hono();
+
+  routes.get(DASHBOARD_HOST_PAGE_PATH, (c) =>
+    fixedAsset(
+      c.req.header("if-none-match"),
+      snapshot.html,
+      snapshot.htmlEtag,
+      "text/html; charset=utf-8",
+      DASHBOARD_PAGE_SECURITY_HEADERS,
+    ),
+  );
+
+  routes.get(DASHBOARD_HOST_SCRIPT_PATH, (c) =>
+    fixedAsset(
+      c.req.header("if-none-match"),
+      snapshot.script,
+      snapshot.scriptEtag,
+      "text/javascript; charset=utf-8",
+      {},
+    ),
+  );
+
+  return routes;
+}

apps/api/src/database.ts

@@ -1,4 +1,4 @@
-import type { ModuleDatabase } from "@ekklesia/contracts";
+import type { ModuleDatabaseExecutor, ModuleId } from "@ekklesia/contracts";
 import {
   type AuthorizationDrizzleDatabase,
   createAuthorizationDrizzleView,
@@ -12,9 +12,11 @@ import { createDeviceDrizzleView, type DeviceDrizzleDatabase } from "@ekklesia/c
 import { createIdentityDrizzleView, type IdentityDrizzleDatabase } from "@ekklesia/core/identity";
 import {
   createModuleConfigurationView,
+  createModuleDatabaseExecutor,
   createModuleDatabaseView,
   createModuleLifecycleView,
   type ModuleConfigurationDrizzleDatabase,
+  type ModuleDatabase,
   type ModuleLifecycleDrizzleDatabase,
 } from "@ekklesia/core/modules";
 
@@ -24,13 +26,35 @@ export interface ApiDatabaseHandle {
   readonly dashboard: DashboardDrizzleDatabase;
   readonly identity: IdentityDrizzleDatabase;
   readonly module: ModuleDatabase;
+  /** Builds one ABI-v1 executor attributed to exactly one module, over this handle's shared pool. */
+  readonly moduleExecutor: (moduleId: ModuleId) => ModuleDatabaseExecutor;
   readonly moduleConfiguration: ModuleConfigurationDrizzleDatabase;
   readonly moduleLifecycle: ModuleLifecycleDrizzleDatabase;
+  /**
+   * One trivial round trip on the shared pool, for readiness (`./health-routes.js`). The `SELECT 1`
+   * runs in a read-only transaction carrying its own `SET LOCAL statement_timeout`, so PostgreSQL
+   * cancels a stalled statement itself rather than the caller merely abandoning it; the pool's
+   * session-wide `statement_timeout`/`query_timeout` remain the outer bound. The four statements
+   * travel as one simple-protocol message, so the check costs a single round trip. On any failure
+   * the pool discards that connection instead of returning it, so a transaction left open by a
+   * cancelled statement never reaches another caller. Rejects with whatever the driver raised; no
+   * caller may surface it.
+   */
+  readonly ping: (statementTimeoutMs: number) => Promise<void>;
   /** Closes the one shared pool exactly once, regardless of how many typed views were created
    * over it. Safe to call from both a startup-failure cleanup path and normal shutdown. */
   readonly close: () => Promise<void>;
 }
 
+function pingStatement(statementTimeoutMs: number): string {
+  // Interpolated rather than bound: neither SET nor a multi-statement simple query accepts
+  // parameters. Only a positive safe integer can ever reach the SQL text.
+  if (!Number.isSafeInteger(statementTimeoutMs) || statementTimeoutMs <= 0) {
+    throw new RangeError("The ping statement timeout must be a positive integer.");
+  }
+  return `BEGIN READ ONLY; SET LOCAL statement_timeout = ${statementTimeoutMs}; SELECT 1; COMMIT`;
+}
+
 /**
  * Composes the one physical PostgreSQL pool this process uses for Core's identity and
  * authorization schemas plus the module database facade: one validated, timeout-bounded
@@ -56,7 +80,11 @@ export function createApiDatabase(
     dashboard: createDashboardDrizzleView(pool),
     identity: createIdentityDrizzleView(pool),
     module: createModuleDatabaseView(pool),
+    moduleExecutor: (moduleId: ModuleId) => createModuleDatabaseExecutor(pool, { moduleId }),
     moduleConfiguration: createModuleConfigurationView(pool),
     moduleLifecycle: createModuleLifecycleView(pool),
+    ping: async (statementTimeoutMs: number) => {
+      await pool.query(pingStatement(statementTimeoutMs));
+    },
   });
 }

apps/api/src/health-routes.ts

@@ -0,0 +1,121 @@
+import { Hono } from "hono";
+
+/**
+ * The longest a readiness probe waits on the database before answering `503` (ADR 0044). Short
+ * enough for a Compose health check or an external monitor to treat a stall as "not ready" rather
+ * than as a hung probe, and well inside the shared pool's own 10s connection and operation
+ * timeouts, which bound the underlying query independently.
+ */
+export const READINESS_DATABASE_TIMEOUT_MS = 2_000;
+
+export const HEALTH_LIVE_PATH = "/api/v1/health/live";
+export const HEALTH_READY_PATH = "/api/v1/health/ready";
+
+export interface ApiHealthOptions {
+  /**
+   * One trivial database round trip. Resolves when the database answered; rejects on any failure.
+   * The rejection is never read — not its message, code, or cause — so nothing a driver says can
+   * reach a response. The route bounds the wait and never overlaps two calls; this function only
+   * has to perform the query.
+   */
+  readonly checkDatabase: () => Promise<void>;
+  /** Whether module startup has completed. `false` again from the moment shutdown begins, so a
+   * draining instance stops reporting ready while it finishes in-flight requests. */
+  readonly isModuleStartupComplete: () => boolean;
+}
+
+const LIVE_BODY = Object.freeze({ status: "live" });
+const READY_BODY = Object.freeze({ status: "ready" });
+const NOT_READY_BODY = Object.freeze({ code: "NOT_READY" });
+
+/**
+ * Wraps `checkDatabase` so at most one call is ever unsettled, and no probe waits longer than
+ * `timeoutMs`.
+ *
+ * Every probe arriving while a check is unsettled shares that check's outcome, including after its
+ * deadline has passed: the deadline resolves the shared outcome to `false`, so those later probes
+ * answer immediately. A new check starts only once the previous call has actually settled. A timed-
+ * out query still occupies a pool connection until the database or the pool's own timeouts end it,
+ * so starting a fresh query on every probe would let a stalled database drain the pool one health
+ * check at a time.
+ */
+function createBoundedDatabaseCheck(
+  checkDatabase: () => Promise<void>,
+  timeoutMs: number,
+): () => Promise<boolean> {
+  let inFlight: Promise<boolean> | undefined;
+
+  return () => {
+    if (inFlight !== undefined) {
+      return inFlight;
+    }
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    // The executor runs `checkDatabase` synchronously, so a synchronous throw is a rejection like
+    // any other rather than an exception escaping the route.
+    const settled = new Promise<void>((resolve) => resolve(checkDatabase())).then(
+      () => true,
+      () => false,
+    );
+    const outcome = Promise.race([
+      settled,
+      new Promise<false>((resolve) => {
+        timer = setTimeout(() => resolve(false), timeoutMs);
+      }),
+    ]);
+    inFlight = outcome;
+    void settled.then(() => {
+      clearTimeout(timer);
+      inFlight = undefined;
+    });
+    return outcome;
+  };
+}
+
+/** The same fixed refusal `./module-realtime-routes.js` uses: Hono lets a GET handler answer HEAD,
+ * and these routes accept GET alone. */
+function methodNotAllowed(): Response {
+  return new Response(null, {
+    headers: { Allow: "GET", "Cache-Control": "no-store" },
+    status: 405,
+  });
+}
+
+/**
+ * Unauthenticated liveness and readiness (ADR 0044), for Compose health checks and external
+ * monitoring. Neither route resolves a principal or reads a cookie, and both return fixed bodies
+ * that name no module, version, error, or connection detail; `pnpm doctor` remains the detailed
+ * operator report. They live under `/api/v1/health/`, a sibling of the `/api/v1/modules/` prefix that
+ * installed modules own entirely, so no module route can shadow them.
+ */
+export function createHealthRoutes(options: ApiHealthOptions): Hono {
+  const checkDatabase = createBoundedDatabaseCheck(
+    options.checkDatabase,
+    READINESS_DATABASE_TIMEOUT_MS,
+  );
+  const routes = new Hono();
+
+  routes.all(HEALTH_LIVE_PATH, (c) => {
+    if (c.req.method !== "GET") {
+      return methodNotAllowed();
+    }
+    c.header("Cache-Control", "no-store");
+    return c.json(LIVE_BODY, 200);
+  });
+
+  routes.all(HEALTH_READY_PATH, async (c) => {
+    if (c.req.method !== "GET") {
+      return methodNotAllowed();
+    }
+    c.header("Cache-Control", "no-store");
+    if (!options.isModuleStartupComplete()) {
+      return c.json(NOT_READY_BODY, 503);
+    }
+    const databaseReady = await checkDatabase();
+    // Checked again afterwards: shutdown may have begun while the query was in flight.
+    return databaseReady && options.isModuleStartupComplete()
+      ? c.json(READY_BODY, 200)
+      : c.json(NOT_READY_BODY, 503);
+  });
+
+  return routes;
+}

apps/api/src/module-display-routes.ts

@@ -6,6 +6,7 @@ import {
   getAuthorizedPrincipal,
   requirePermission,
 } from "./authorization-middleware.js";
+import { etagMatches } from "./conditional-request.js";
 import { createDisplayHostAssets, type DisplayHostAssets } from "./display-host-assets.js";
 export {
   MODULE_DISPLAY_DESCRIPTOR_PREFIX,
@@ -100,20 +101,6 @@ function displayFailure(c: Context): Response {
   return c.json({ code: "AUTHORIZATION_EVALUATION_FAILED" }, 503);
 }
 
-/** RFC 9110 weak comparison for a GET/HEAD `If-None-Match` precondition. */
-function etagMatches(headerValue: string | undefined, etag: string): boolean {
-  if (headerValue === undefined) {
-    return false;
-  }
-  if (headerValue.trim() === "*") {
-    return true;
-  }
-  return headerValue.split(",").some((candidate) => {
-    const value = candidate.trim();
-    return (value.startsWith("W/") ? value.slice(2) : value) === etag;
-  });
-}
-
 /** Copies and validates injected assets before registering any route. Production's loader already
  * creates this exact shape, while this check keeps a test/composition caller from pairing mutable
  * bytes with a stale validator. */

apps/api/src/module-http-routes.ts

@@ -1,14 +1,17 @@
 import {
   EMPTY_MODULE_CONFIGURATION,
   EMPTY_MODULE_STORAGE,
+  type ModuleDatabaseExecutor,
   type ModuleId,
   type ModuleRouteHandlerContext,
-  type ModuleRuntimeServices,
   type RegisteredModuleHttpRoute,
 } from "@ekklesia/contracts";
 import type {
+  AnyModuleRuntimeServices,
   ModuleConfigurationLookup,
+  ModuleDatabase,
   ModuleRealtimeRegistry,
+  ModuleRuntimeServicesLookup,
   ModuleStorageLookup,
 } from "@ekklesia/core/modules";
 import type { Context, Hono } from "hono";
@@ -37,14 +40,14 @@ export interface ModuleHttpRoutesOptions extends AuthorizationMiddlewareOptions
    * received for this API runtime — never a fresh one built per request, and never touched for a
    * denied, trusted-origin-rejected, or `OPTIONS` request, since a handler is only ever invoked
    * after authorization succeeds. */
-  readonly services: ModuleRuntimeServices;
+  readonly services: ModuleRuntimeServicesLookup | AnyModuleRuntimeServices;
   /**
    * Per-module frozen configuration snapshots — the exact map the module runtime started from
    * (ADR 0029), so a handler and that module's `start`/`stop` hooks receive the identical object
    * rather than two independently resolved values. A module with no entry receives
    * `EMPTY_MODULE_CONFIGURATION`, so `context.config` is always present.
    *
-   * Unlike `services`, which is one shared object, this is keyed by module id: a handler can only
+   * Like `services`, this is keyed by module id: a handler can only
    * ever reach its own module's configuration, because that is the only entry looked up for it.
    */
   readonly configurations: ModuleConfigurationLookup;
@@ -232,6 +235,11 @@ export function mountModuleHttpRoutes(
     if (!options.registry.has(route.permission)) {
       throw new ModuleRouteConfigurationError();
     }
+    const services =
+      "get" in options.services ? options.services.get(route.moduleId) : options.services;
+    if (!services) {
+      throw new ModuleRouteConfigurationError();
+    }
 
     const requireRoutePermission = requirePermission(middlewareOptions, route.permission);
     // The route's own conscious body contract (`route.maxBodyBytes` — 0 means no body accepted at
@@ -243,19 +251,24 @@ export function mountModuleHttpRoutes(
     const routeBodyLimit = platformBodyLimit(route.maxBodyBytes, route.bodyMode);
     const path = moduleRoutePath(route.moduleId, route.path);
     const finalHandler = async (c: Context): Promise<Response> => {
-      const context: ModuleRouteHandlerContext = Object.freeze({
+      const context = Object.freeze({
         config: options.configurations.get(route.moduleId) ?? EMPTY_MODULE_CONFIGURATION,
         moduleId: route.moduleId,
         storage: options.storages.get(route.moduleId) ?? EMPTY_MODULE_STORAGE,
         params: Object.freeze({ ...c.req.param() }),
         principal: getAuthorizedPrincipal(c),
         realtime: options.realtime.publisherFor(route.moduleId),
-        services: options.services,
-      });
+        services,
+      }) as ModuleRouteHandlerContext<ModuleDatabase | ModuleDatabaseExecutor>;
 
       let response: Response;
       try {
-        response = await route.handler(c.req.raw, context);
+        response = await (
+          route.handler as (
+            request: Request,
+            context: ModuleRouteHandlerContext<ModuleDatabase | ModuleDatabaseExecutor>,
+          ) => PromiseLike<Response> | Response
+        )(c.req.raw, context);
       } catch {
         return sanitizedModuleHandlerFailure(c);
       }

apps/api/src/platform-permissions.ts

@@ -6,6 +6,7 @@ import {
   composePlatformPermissionRegistry,
   discoverModules,
   type DiscoveredModule,
+  resolveModulesDirectory,
 } from "@ekklesia/core/modules";
 
 export type PlatformPermissionConfigurationErrorCode = "PLATFORM_PERMISSION_CONFIGURATION_INVALID";
@@ -55,10 +56,18 @@ async function readPackageVersion(packagePath: string): Promise<string> {
 }
 
 export interface PrepareStartupModuleInventoryOptions {
+  /**
+   * The deployment's `EKKLESIA_MODULES_DIR`, raw, exactly as host configuration read it (ADR 0048).
+   * A production input, not a test seam: the executable entry point always passes it. Unset means
+   * the repository's own `modules/`; set means that absolute directory, which must exist. It is
+   * resolved by Core's one resolver, so an unusable value fails startup with a sanitized
+   * `ModuleDiscoveryError` before any pool exists.
+   */
+  readonly configuredModulesDirectory?: string | undefined;
   /** Test-only escape hatch: overrides the directory module discovery scans for installed
-   * modules. Never set by the executable entry point — production always discovers the real
-   * repository's `modules/` directory. Platform and Module SDK versions are always read from the
-   * real repository's own `package.json` files regardless of this override. */
+   * modules, taking precedence over `configuredModulesDirectory`, which is then never resolved.
+   * Never set by the executable entry point. Platform and Module SDK versions are always read from
+   * the real repository's own `package.json` files regardless of this override. */
   readonly modulesDirectoryOverride?: string;
   /** Test-only escape hatch: supplies an already-discovered module list directly, skipping the
    * filesystem discovery step entirely, while still running the real `composePlatformPermissionRegistry`
@@ -109,6 +118,11 @@ export async function prepareStartupModuleInventory(
   }
 
   const repositoryRoot = resolveRepositoryRoot();
+  // Chosen before anything is read, so an unusable configured directory fails first and alone.
+  const modulesDirectory =
+    options.modulesDirectoryOverride === undefined
+      ? resolveModulesDirectory({ configured: options.configuredModulesDirectory, repositoryRoot })
+      : { modulesDirectory: options.modulesDirectoryOverride, modulesDirectoryRequired: false };
   const [platformVersion, moduleSdkVersion] = await Promise.all([
     readPackageVersion(path.join(repositoryRoot, "package.json")),
     readPackageVersion(path.join(repositoryRoot, "packages/module-sdk/package.json")),
@@ -116,7 +130,7 @@ export async function prepareStartupModuleInventory(
 
   const modules = await discoverModules({
     moduleSdkVersion,
-    modulesDirectory: options.modulesDirectoryOverride ?? path.join(repositoryRoot, "modules"),
+    ...modulesDirectory,
     platformVersion,
   });
 

apps/api/src/server.ts

@@ -1,11 +1,7 @@
 import type { Socket } from "node:net";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
-import {
-  EMPTY_MODULE_SECRET_SOURCE,
-  type ModuleRuntimeServices,
-  type ModuleSecretSource,
-} from "@ekklesia/contracts";
+import { EMPTY_MODULE_SECRET_SOURCE, type ModuleSecretSource } from "@ekklesia/contracts";
 import {
   createAuthorizationEvaluator,
   createAuthorizationStore,
@@ -21,12 +17,14 @@ import {
 } from "@ekklesia/core/identity";
 import { createSmtpMailProvider, type MailProvider } from "@ekklesia/core/mail";
 import {
+  type AnyModuleRuntimeServices,
   createModuleConfigurationStore,
   createModuleLifecycleStore,
   createModuleUiPublicationRegistry,
   type DiscoveredModule,
   type ModuleConfigurationSettings,
   type ModuleEligibilityResolution,
+  type ModuleRuntimeServicesLookup,
   resolveModuleEligibility,
   type StartedModuleRuntime,
   startDiscoveredModuleRuntime,
@@ -44,10 +42,12 @@ import {
   createClientAddressResolver,
   wrapFetchWithClientAddress,
 } from "./client-address.js";
-import { type ApiRuntimeConfig, createApiRuntimeConfig } from "./config.js";
+import { type ApiRuntimeConfig, apiTrustedOrigins, createApiRuntimeConfig } from "./config.js";
+import { loadDashboardHostAssets } from "./dashboard-host-assets.js";
 import { type ApiDatabaseHandle, createApiDatabase } from "./database.js";
 import { withDevicePrincipals } from "./device-principal.js";
 import { loadDisplayHostAssets } from "./display-host-assets.js";
+import { READINESS_DATABASE_TIMEOUT_MS } from "./health-routes.js";
 import { prepareStartupModuleInventory } from "./platform-permissions.js";
 
 const connectionTimeoutMs = 10_000;
@@ -152,8 +152,12 @@ export interface StartApiOptions {
    * test needs somewhere to observe the operational failure the user is never shown.
    */
   readonly reportNotificationFailure?: IdentityNotificationReporter;
-  /** Test-only escape hatch: overrides the directory module discovery scans. Never set by the
-   * executable entry point. See `prepareStartupModuleInventory`. */
+  /** The deployment's raw `EKKLESIA_MODULES_DIR` (ADR 0048), a production input the executable
+   * entry point always passes from host configuration. See `prepareStartupModuleInventory`. */
+  readonly configuredModulesDirectory?: string | undefined;
+  /** Test-only escape hatch: overrides the directory module discovery scans, taking precedence
+   * over `configuredModulesDirectory`. Never set by the executable entry point. See
+   * `prepareStartupModuleInventory`. */
   readonly modulesDirectoryOverride?: string;
   /** Test-only escape hatch: supplies an already-discovered module list directly, skipping
    * filesystem discovery entirely — this exact list drives both permission composition and module
@@ -387,16 +391,13 @@ function bindServer(
  *    (`prepareStartupModuleInventory`, `./platform-permissions.js`).
  * 2. Construct the one shared PostgreSQL pool (identity, authorization, and the module database
  *    facade each get a typed Drizzle view over it — see `./database.js`).
- * 3. Construct the frozen `ModuleRuntimeServices` (currently just `database`) from that same pool,
- *    then the Core identity runtime, authorization store, and evaluator.
+ * 3. Construct the Core identity runtime, authorization store, and evaluator from that pool.
  * 4. Read the stored module enablement configuration and resolve, from that exact same discovered
  *    inventory, which modules are eligible to run (`resolveModuleEligibility`).
  * 5. Start the module runtime from the eligible subset (`startDiscoveredModuleRuntime`) — never
- *    rediscovering modules a second time — passing it the same services object every module's
- *    `start`/`stop` hook receives.
+ *    rediscovering modules a second time — passing the manifest-selected service map.
  * 6. Create the Hono application, mounting the started module runtime's published routes, publishing
- *    UI for that same eligible set, and passing the exact same services object to every module HTTP
- *    handler.
+ *    UI for that same eligible set, and passing the same per-module service map to HTTP handlers.
  * 7. Bind the Node HTTP server.
  *
  * Discovery and permission composition happen before any pool, Better Auth instance, module
@@ -427,6 +428,7 @@ export async function startApi(
   options: StartApiOptions = {},
 ): Promise<RunningApi> {
   const inventory = await prepareStartupModuleInventory({
+    configuredModulesDirectory: options.configuredModulesDirectory,
     ...(options.modulesDirectoryOverride === undefined
       ? {}
       : { modulesDirectoryOverride: options.modulesDirectoryOverride }),
@@ -452,12 +454,10 @@ export async function startApi(
   const storageProvider = config.storage ? createS3StorageProvider(config.storage) : undefined;
   const mailProvider = config.mail ? createSmtpMailProvider(config.mail) : undefined;
 
-  let services: ModuleRuntimeServices;
   let runtime: ReturnType<typeof createIdentityRuntime>;
   let authorizationStore: ReturnType<typeof createAuthorizationStore>;
   let deviceStore: ReturnType<typeof createDeviceStore>;
   try {
-    services = Object.freeze({ database: databaseHandle.module });
     runtime = createIdentityRuntime({
       config: config.identity,
       db: databaseHandle.identity,
@@ -525,6 +525,15 @@ export async function startApi(
     throw error;
   }
 
+  const services: ModuleRuntimeServicesLookup = new Map<string, AnyModuleRuntimeServices>(
+    eligibility.eligibleModules.map((module) => [
+      module.manifest.id,
+      module.manifest.database?.abi === 1
+        ? Object.freeze({ database: databaseHandle.moduleExecutor(module.manifest.id) })
+        : Object.freeze({ database: databaseHandle.module }),
+    ]),
+  );
+
   // One scoped facade per eligible module, over the exact buckets that module's own manifest
   // declares. Built from the eligible set so a blocked module never receives storage at all.
   const moduleStorages = createModuleStorageLookup(
@@ -542,9 +551,15 @@ export async function startApi(
   // starts and application composition succeeds.
   const moduleUi = createModuleUiPublicationRegistry(eligibility.eligibleModules);
   let displayHostAssets: Awaited<ReturnType<typeof loadDisplayHostAssets>> | undefined;
+  let dashboardHostAssets: Awaited<ReturnType<typeof loadDashboardHostAssets>>;
   try {
     displayHostAssets =
       moduleUi.listDisplays().length === 0 ? undefined : await loadDisplayHostAssets();
+    // Unconditional, unlike the display host: every installation serves its Dashboard (ADR 0044),
+    // so a missing shell build fails here, before any module code is imported.
+    // The page learns its API origin from the API that serves it, so one build serves either
+    // topology (ADR 0045).
+    dashboardHostAssets = await loadDashboardHostAssets(config.identity.baseUrl);
   } catch (error) {
     await safeCloseStorage(storageProvider);
     await safeCloseMail(mailProvider);
@@ -576,6 +591,10 @@ export async function startApi(
     throw error;
   }
 
+  // Set by the first `shutdown()` call, before anything is drained or stopped, so readiness turns
+  // `503` while the instance still finishes in-flight requests.
+  let shuttingDown = false;
+
   let app: Hono;
   try {
     app = createApiApp({
@@ -620,6 +639,13 @@ export async function startApi(
       },
       // A typed view over the same single pool as identity, authorization, and the module facade.
       dashboard: createDashboardStore(databaseHandle.dashboard),
+      dashboardHostAssets,
+      // The app is only composed after `startDiscoveredModuleRuntime` resolved, so module startup
+      // has completed whenever it can answer; it stops counting as complete once shutdown begins.
+      health: {
+        checkDatabase: () => databaseHandle.ping(READINESS_DATABASE_TIMEOUT_MS),
+        isModuleStartupComplete: () => !shuttingDown,
+      },
       devices: {
         // `Secure` follows the deployment's own scheme, read from the already-validated identity
         // base URL rather than from any request. Production is https by configuration policy, so a
@@ -631,7 +657,8 @@ export async function startApi(
       // Principal resolution, extended with managed devices. A human session still wins, and this
       // is the only place a device credential ever becomes a principal.
       runtime: withDevicePrincipals({ devices: deviceStore, runtime }),
-      trustedOrigins: config.identity.trustedOrigins,
+      // The configured origins plus the API's own (ADR 0045).
+      trustedOrigins: apiTrustedOrigins(config.identity),
     });
   } catch (error) {
     await safeStopModuleRuntime(moduleRuntime);
@@ -677,6 +704,7 @@ export async function startApi(
   let shutdownPromise: Promise<void> | undefined;
   const shutdown = (): Promise<void> => {
     if (!shutdownPromise) {
+      shuttingDown = true;
       shutdownPromise = (async () => {
         // Close long-lived streams so HTTP can drain, but leave publishers active until the drain
         // completes: an in-flight module command may still commit and publish its resulting state.
@@ -748,6 +776,7 @@ export function readConfigFromEnvironment(processEnvironment: HostEnvironment):
   readonly input: Parameters<typeof createApiRuntimeConfig>[0];
   readonly environment: "development" | "production";
   readonly moduleSecrets: ModuleSecretSource;
+  readonly modulesDirectory: string | undefined;
 } {
   const host = loadHostConfiguration(processEnvironment);
   return {
@@ -763,13 +792,19 @@ export function readConfigFromEnvironment(processEnvironment: HostEnvironment):
       storage: host.storage,
     },
     moduleSecrets: host.moduleSecrets,
+    modulesDirectory: host.modulesDirectory,
   };
 }
 
 export async function main(): Promise<void> {
-  const { environment, input, moduleSecrets } = readConfigFromEnvironment(process.env);
+  const { environment, input, moduleSecrets, modulesDirectory } = readConfigFromEnvironment(
+    process.env,
+  );
   const config = createApiRuntimeConfig(input, { environment });
-  const running = await startApi(config, { moduleSecrets });
+  const running = await startApi(config, {
+    configuredModulesDirectory: modulesDirectory,
+    moduleSecrets,
+  });
 
   const address = running.server.address();
   const boundPort = address && typeof address === "object" ? address.port : config.port;

apps/api/tests/api-http.integration.ts

@@ -1,5 +1,5 @@
 import { randomBytes } from "node:crypto";
-import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { request as httpRequest } from "node:http";
 import net from "node:net";
 import { tmpdir } from "node:os";
@@ -26,7 +26,19 @@ import {
 import { Client, type QueryResultRow } from "pg";
 import { afterAll, describe, expect, it, vi } from "vitest";
 import type { ClientAddressConfigInput } from "../src/client-address.js";
+import { dashboardHostAssetUrls } from "@ekklesia/shell/dashboard-assets";
 import { createApiRuntimeConfig } from "../src/config.js";
+import { createApiDatabase } from "../src/database.js";
+import { DASHBOARD_API_ORIGIN_PLACEHOLDER } from "../src/dashboard-host-assets.js";
+import {
+  DASHBOARD_HOST_PAGE_PATH,
+  DASHBOARD_HOST_SCRIPT_PATH,
+} from "../src/dashboard-host-routes.js";
+import {
+  HEALTH_LIVE_PATH,
+  HEALTH_READY_PATH,
+  READINESS_DATABASE_TIMEOUT_MS,
+} from "../src/health-routes.js";
 import {
   MODULE_UI_CACHE_CONTROL,
   MODULE_UI_CONTENT_TYPE,
@@ -209,9 +221,9 @@ async function applyCoreMigrations(url: string): Promise<void> {
     const aggregate = await discoverAllMigrations({
       coreMigrationsDirectory,
       moduleDiscovery: {
-        moduleSdkVersion: "0.1.0",
+        moduleSdkVersion: "0.2.0",
         modulesDirectory: emptyModulesDirectory,
-        platformVersion: "0.1.0",
+        platformVersion: "0.2.0",
       },
     });
     // Phase 4A's and Phase 4C pass 1's committed migrations must not have drifted while building
@@ -327,10 +339,10 @@ async function createGatedRouteModule(
     writeFile(
       path.join(moduleDirectory, "ekklesia.module.json"),
       JSON.stringify({
-        compatibility: { moduleSdk: "^0.1.0", platform: "^0.1.0" },
+        compatibility: { moduleSdk: "^0.2.0", platform: "^0.2.0" },
         entrypoints: { server: "./dist/server/index.js" },
         id,
-        manifestVersion: 7,
+        manifestVersion: 8,
         name: `${id} module`,
         permissions: [{ baseline: "public", description: "Gated drain probe.", id: permissionId }],
         version: "0.1.0",
@@ -374,11 +386,11 @@ async function createFixtureModule(
 ): Promise<void> {
   const moduleDirectory = path.join(modulesDirectory, id);
   const manifest = {
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "0.1.0",
-    compatibility: { platform: "^0.1.0", moduleSdk: "^0.1.0" },
+    compatibility: { platform: "^0.2.0", moduleSdk: "^0.2.0" },
     permissions: [],
     entrypoints: { server: "./dist/server/index.js" },
     ...manifestOverrides,
@@ -509,10 +521,10 @@ async function createUiModule(
     writeFile(
       path.join(moduleDirectory, "ekklesia.module.json"),
       JSON.stringify({
-        compatibility: { moduleSdk: "^0.1.0", platform: "^0.1.0" },
+        compatibility: { moduleSdk: "^0.2.0", platform: "^0.2.0" },
         entrypoints: { server: "./dist/server/index.js", ui: "./dist/ui/index.js" },
         id,
-        manifestVersion: 7,
+        manifestVersion: 8,
         name: `${id} module`,
         version,
       }),
@@ -2578,19 +2590,18 @@ describe.sequential("live API — installed module permission end-to-end", () =>
     });
 
     const report = await diagnoseEkklesia({
+      coreMigrationsDirectory,
       moduleDiscovery: {
-        moduleSdkVersion: "0.1.0",
+        moduleSdkVersion: "0.2.0",
         modulesDirectory,
-        platformVersion: "0.1.0",
+        platformVersion: "0.2.0",
       },
       runtimeRange: ">=0.0.0",
       runtimeVersion: process.versions.node,
     });
 
-    // Only the module-discovery and permission-composition checks are asserted here — this
-    // fixture's temporary directory has no `core/drizzle` sibling for migrations discovery to
-    // find, which is unrelated to what this scenario proves and would otherwise make the check
-    // fail for a reason that has nothing to do with permission composition.
+    // Only the module-discovery and permission-composition checks are asserted here; nothing else
+    // in the report bears on what this scenario proves.
     const moduleCheck = report.checks.find((entry) => entry.id === "modules.discovery");
     const permissionsCheck = report.checks.find((entry) => entry.id === "modules.permissions");
     expect(moduleCheck).toMatchObject({ status: "pass" });
@@ -2977,6 +2988,106 @@ describe.sequential("live API — published module UI artifact", () => {
   });
 });
 
+describe.sequential("live API — the built Dashboard on the API's own origin", () => {
+  it("serves the built shell's index.html at /, with only its API origin written in, and its exact script, and nothing beside them", async () => {
+    const database = await createDisposableDatabase("dashboard_host");
+    await applyCoreMigrations(database.url);
+    const running = await startMigratedApi(database.url);
+    try {
+      const origin = apiOrigin(running);
+      const builtHtml = await readFile(new URL(dashboardHostAssetUrls.html), "utf8");
+      const builtScript = await readFile(new URL(dashboardHostAssetUrls.script), "utf8");
+
+      const page = await fetch(`${origin}${DASHBOARD_HOST_PAGE_PATH}`);
+      const html = await page.text();
+      expect(page.status).toBe(200);
+      expect(page.headers.get("content-type")).toBe("text/html; charset=utf-8");
+      expect(page.headers.get("cache-control")).toBe("no-cache");
+      expect(page.headers.get("x-frame-options")).toBe("DENY");
+      expect(page.headers.get("content-security-policy")).toBe("frame-ancestors 'none'");
+      expect(page.headers.get("referrer-policy")).toBe("no-referrer");
+      // The built page carries one empty API-origin element; the API fills in its own origin
+      // (the identity base URL) and changes nothing else (ADR 0045).
+      expect(builtHtml.split(DASHBOARD_API_ORIGIN_PLACEHOLDER)).toHaveLength(2);
+      expect(html).toBe(
+        builtHtml.replace(
+          DASHBOARD_API_ORIGIN_PLACEHOLDER,
+          `<meta content="${identityBaseUrl}" name="ekklesia-api-origin" />`,
+        ),
+      );
+      expect(html).toContain('id="ekklesia-host"');
+      expect(html).toContain(`<script src="${DASHBOARD_HOST_SCRIPT_PATH}" type="module"></script>`);
+
+      const revalidated = await fetch(`${origin}${DASHBOARD_HOST_PAGE_PATH}`, {
+        headers: { "if-none-match": page.headers.get("etag") ?? "" },
+      });
+      expect(revalidated.status).toBe(304);
+
+      const script = await fetch(`${origin}${DASHBOARD_HOST_SCRIPT_PATH}`);
+      expect(script.status).toBe(200);
+      expect(script.headers.get("content-type")).toBe("text/javascript; charset=utf-8");
+      expect(await script.text()).toBe(builtScript);
+
+      // The source map sits beside the script on disk and is never published.
+      const sourceMap = await fetch(`${origin}${DASHBOARD_HOST_SCRIPT_PATH}.map`);
+      expect(sourceMap.status).toBe(404);
+      expect(await sourceMap.json()).toEqual({ code: "NOT_FOUND" });
+    } finally {
+      await running.shutdown();
+    }
+  });
+});
+
+describe.sequential("live API — health", () => {
+  it("answers liveness and readiness with 200 against a migrated disposable PostgreSQL", async () => {
+    const database = await createDisposableDatabase("health");
+    await applyCoreMigrations(database.url);
+    const running = await startMigratedApi(database.url);
+    try {
+      const origin = apiOrigin(running);
+
+      const live = await fetch(`${origin}${HEALTH_LIVE_PATH}`);
+      expect(live.status).toBe(200);
+      expect(live.headers.get("cache-control")).toBe("no-store");
+      expect(await live.json()).toEqual({ status: "live" });
+
+      const ready = await fetch(`${origin}${HEALTH_READY_PATH}`);
+      expect(ready.status).toBe(200);
+      expect(ready.headers.get("cache-control")).toBe("no-store");
+      expect(await ready.json()).toEqual({ status: "ready" });
+    } finally {
+      await running.shutdown();
+    }
+  });
+
+  it("pings through the shared pool, and PostgreSQL itself cancels a statement that outlives the ping's transaction-local timeout", async () => {
+    const database = await createDisposableDatabase("health_ping");
+    const handle = createApiDatabase(database.url);
+    try {
+      await expect(handle.ping(READINESS_DATABASE_TIMEOUT_MS)).resolves.toBeUndefined();
+    } finally {
+      await handle.close();
+    }
+
+    // The ping's exact statement shape, with a statement that cannot finish inside its timeout: the
+    // server cancels it (query_canceled) long before the sleep would end, on a client that has no
+    // client-side timeout of its own.
+    const client = new Client({ connectionString: database.url });
+    await client.connect();
+    try {
+      const startedAt = Date.now();
+      await expect(
+        client.query(
+          "BEGIN READ ONLY; SET LOCAL statement_timeout = 50; SELECT pg_sleep(5); COMMIT",
+        ),
+      ).rejects.toMatchObject({ code: "57014" });
+      expect(Date.now() - startedAt).toBeLessThan(2_000);
+    } finally {
+      await client.end();
+    }
+  });
+});
+
 describe.sequential("live API — public signup is disabled by default", () => {
   it("rejects sign-up with a stable sanitized 400 when publicSignupEnabled is not set, creating no user row", async () => {
     const database = await createDisposableDatabase("signup_disabled");
@@ -3795,9 +3906,9 @@ describe.sequential("live API — module lifecycle governs what actually runs",
     const aggregate = await discoverAllMigrations({
       coreMigrationsDirectory,
       moduleDiscovery: {
-        moduleSdkVersion: "0.1.0",
+        moduleSdkVersion: "0.2.0",
         modulesDirectory,
-        platformVersion: "0.1.0",
+        platformVersion: "0.2.0",
       },
     });
     expect(aggregate.discoveredModules.map((module) => module.manifest.id)).toEqual(["calendar"]);

apps/api/tests/app.test.ts

@@ -1,13 +1,16 @@
 import {
   ANONYMOUS_PRINCIPAL,
   createAuthenticatedPrincipal,
-  type ModuleDatabase,
-  type ModuleRuntimeServices,
+  moduleIdSchema,
+  parseEkklesiaUserId,
+  parsePermissionId,
 } from "@ekklesia/contracts";
 import {
   type AuthorizationEvaluator,
   type AuthorizationStore,
+  CORE_PERMISSION_DECLARATIONS,
   CORE_PERMISSION_REGISTRY,
+  createPermissionRegistry,
   type PermissionRegistry,
 } from "@ekklesia/core/authorization";
 import type { EkklesiaIdentityRuntime } from "@ekklesia/core/identity";
@@ -15,7 +18,10 @@ import { IdentityRuntimeError } from "@ekklesia/core/identity";
 import {
   createModuleUiPublicationRegistry,
   EMPTY_MODULE_REALTIME_REGISTRY,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
   type ModuleUiPublicationRegistry,
+  StagedModuleRealtimeRegistry,
 } from "@ekklesia/core/modules";
 import { describe, expect, it, vi } from "vitest";
 import {
@@ -25,6 +31,8 @@ import {
 } from "../src/app.js";
 import { AUTH_REQUEST_MAX_BODY_BYTES } from "../src/body-limits.js";
 import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
+import { testDashboardHostAssets } from "./support/dashboard-host-assets.js";
+import { readyHealth } from "./support/ready-health.js";
 import { emptyModuleConfiguration } from "./support/in-memory-module-configuration.js";
 import { emptyModuleLifecycle } from "./support/in-memory-module-lifecycle.js";
 import { emptyModuleStorage } from "./support/in-memory-module-storage.js";
@@ -40,9 +48,9 @@ function fakeRuntime(overrides: Partial<EkklesiaIdentityRuntime> = {}): Ekklesia
   };
 }
 
-/** A small typed fake `ModuleRuntimeServices` — these tests exercise `createApiApp`'s own wiring,
+/** A small typed fake `LegacyModuleRuntimeServices` — these tests exercise `createApiApp`'s own wiring,
  * never real database behavior, so no PostgreSQL is required. */
-function fakeModuleServices(): ModuleRuntimeServices {
+function fakeModuleServices(): LegacyModuleRuntimeServices {
   const database = Object.freeze({
     delete: vi.fn(),
     execute: vi.fn(),
@@ -104,6 +112,8 @@ function createAuthWiringApp(runtime: EkklesiaIdentityRuntime) {
     moduleConfiguration: emptyModuleConfiguration(),
     moduleStorage: emptyModuleStorage(),
     dashboard: createInMemoryDashboardStore(),
+    dashboardHostAssets: testDashboardHostAssets(),
+    health: readyHealth(),
     moduleServices: fakeModuleServices(),
     authorization: fakeAuthorization({}),
     runtime,
@@ -121,6 +131,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime,
@@ -355,6 +367,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime,
@@ -378,6 +392,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime,
@@ -403,6 +419,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime,
@@ -430,6 +448,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime,
@@ -457,6 +477,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime,
@@ -481,6 +503,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime,
@@ -507,6 +531,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime,
@@ -530,6 +556,8 @@ describe("Ekklesia API Hono application", () => {
         moduleConfiguration: emptyModuleConfiguration(),
         moduleStorage: emptyModuleStorage(),
         dashboard: createInMemoryDashboardStore(),
+        dashboardHostAssets: testDashboardHostAssets(),
+        health: readyHealth(),
         moduleServices: fakeModuleServices(),
         authorization: fakeAuthorization({}),
         runtime,
@@ -555,6 +583,8 @@ describe("Ekklesia API Hono application", () => {
         moduleConfiguration: emptyModuleConfiguration(),
         moduleStorage: emptyModuleStorage(),
         dashboard: createInMemoryDashboardStore(),
+        dashboardHostAssets: testDashboardHostAssets(),
+        health: readyHealth(),
         moduleServices: fakeModuleServices(),
         authorization: fakeAuthorization({}),
         runtime,
@@ -587,6 +617,8 @@ describe("Ekklesia API Hono application", () => {
         moduleConfiguration: emptyModuleConfiguration(),
         moduleStorage: emptyModuleStorage(),
         dashboard: createInMemoryDashboardStore(),
+        dashboardHostAssets: testDashboardHostAssets(),
+        health: readyHealth(),
         moduleServices: fakeModuleServices(),
         authorization: fakeAuthorization({}),
         runtime,
@@ -620,6 +652,8 @@ describe("Ekklesia API Hono application", () => {
         moduleConfiguration: emptyModuleConfiguration(),
         moduleStorage: emptyModuleStorage(),
         dashboard: createInMemoryDashboardStore(),
+        dashboardHostAssets: testDashboardHostAssets(),
+        health: readyHealth(),
         moduleServices: fakeModuleServices(),
         authorization: fakeAuthorization({}),
         runtime,
@@ -658,6 +692,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime: fakeRuntime(),
@@ -678,6 +714,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime: fakeRuntime(),
@@ -700,6 +738,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime: fakeRuntime(),
@@ -721,6 +761,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime: fakeRuntime(),
@@ -740,6 +782,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime: fakeRuntime(),
@@ -766,6 +810,8 @@ describe("Ekklesia API Hono application", () => {
       moduleConfiguration: emptyModuleConfiguration(),
       moduleStorage: emptyModuleStorage(),
       dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
       moduleServices: fakeModuleServices(),
       authorization: fakeAuthorization({}),
       runtime: fakeRuntime(),
@@ -795,6 +841,8 @@ describe("Ekklesia API Hono application", () => {
         moduleConfiguration: emptyModuleConfiguration(),
         moduleStorage: emptyModuleStorage(),
         dashboard: createInMemoryDashboardStore(),
+        dashboardHostAssets: testDashboardHostAssets(),
+        health: readyHealth(),
         moduleServices: fakeModuleServices(),
         authorization: fakeAuthorization({ evaluator: { authorize: evaluatorAuthorize } }),
         runtime: fakeRuntime(),
@@ -827,6 +875,8 @@ describe("Ekklesia API Hono application", () => {
         moduleConfiguration: emptyModuleConfiguration(),
         moduleStorage: emptyModuleStorage(),
         dashboard: createInMemoryDashboardStore(),
+        dashboardHostAssets: testDashboardHostAssets(),
+        health: readyHealth(),
         moduleServices: fakeModuleServices(),
         authorization: fakeAuthorization({
           evaluator: { authorize: evaluatorAuthorize },
@@ -850,6 +900,8 @@ describe("Ekklesia API Hono application", () => {
         moduleConfiguration: emptyModuleConfiguration(),
         moduleStorage: emptyModuleStorage(),
         dashboard: createInMemoryDashboardStore(),
+        dashboardHostAssets: testDashboardHostAssets(),
+        health: readyHealth(),
         moduleServices: fakeModuleServices(),
         authorization: fakeAuthorization({}),
         runtime: fakeRuntime(),
@@ -864,3 +916,101 @@ describe("Ekklesia API Hono application", () => {
     });
   });
 });
+
+describe("split Dashboard and API origins (ADR 0045)", () => {
+  const moduleId = moduleIdSchema.parse("announcements");
+  const permission = parsePermissionId("announcements.slideshow.view");
+  const endpoint = "/api/v1/module-realtime/announcements/state";
+
+  /** The full application with one live channel, a signed-in caller, and an evaluator that allows
+   * it: the same composition a Dashboard on another origin reaches. */
+  function realtimeApp() {
+    const staged = new StagedModuleRealtimeRegistry();
+    const registration = staged.createRegistrationStage(moduleId, new Set([permission]));
+    registration.realtime.channel({ channel: "state", permission });
+    registration.commit();
+    staged.publisherFor(moduleId).publish("state", { mode: "on" } as never);
+    const moduleRealtime = staged.publish();
+    const app = createApiAppWithModules({
+      moduleRoutes: Object.freeze([]),
+      moduleUi: emptyModuleUiPublication(),
+      moduleLifecycle: emptyModuleLifecycle(),
+      moduleConfiguration: emptyModuleConfiguration(),
+      moduleStorage: emptyModuleStorage(),
+      moduleRealtime,
+      dashboard: createInMemoryDashboardStore(),
+      dashboardHostAssets: testDashboardHostAssets(),
+      health: readyHealth(),
+      moduleServices: fakeModuleServices(),
+      authorization: fakeAuthorization({
+        evaluator: { authorize: vi.fn().mockResolvedValue({ allowed: true }) },
+        registry: createPermissionRegistry([
+          ...CORE_PERMISSION_DECLARATIONS,
+          {
+            baseline: "restricted",
+            description: "View the announcement slideshow.",
+            id: permission,
+          },
+        ]),
+      }),
+      runtime: fakeRuntime({
+        resolvePrincipal: vi
+          .fn()
+          .mockResolvedValue(
+            createAuthenticatedPrincipal(
+              parseEkklesiaUserId("88888888-8888-4888-8888-888888888888"),
+            ),
+          ),
+      }),
+      trustedOrigins: [trustedOrigin],
+    });
+    return { app, moduleRealtime };
+  }
+
+  it("lets the Dashboard's origin open a credentialed realtime stream", async () => {
+    const { app, moduleRealtime } = realtimeApp();
+
+    const response = await app.request(endpoint, {
+      headers: { cookie: "session=1", origin: trustedOrigin },
+    });
+
+    expect(response.status).toBe(200);
+    expect(response.headers.get("content-type")).toBe("text/event-stream; charset=utf-8");
+    expect(response.headers.get("access-control-allow-origin")).toBe(trustedOrigin);
+    expect(response.headers.get("access-control-allow-credentials")).toBe("true");
+    expect(response.headers.get("vary")).toContain("Origin");
+    await response.body?.cancel();
+    moduleRealtime.closeSubscriptions();
+  });
+
+  it("gives an untrusted origin's realtime request no CORS permission to read the stream", async () => {
+    const { app, moduleRealtime } = realtimeApp();
+
+    const response = await app.request(endpoint, {
+      headers: { cookie: "session=1", origin: untrustedOrigin },
+    });
+
+    expect(response.headers.get("access-control-allow-origin")).toBeNull();
+    await response.body?.cancel();
+    moduleRealtime.closeSubscriptions();
+  });
+
+  it("allows only Content-Type beyond the CORS-safelisted request headers, and exposes none", async () => {
+    const app = createAuthWiringApp(fakeRuntime());
+
+    const response = await app.request("/api/v1/principal", {
+      headers: {
+        "access-control-request-headers": "content-type, x-module-custom",
+        "access-control-request-method": "PATCH",
+        origin: trustedOrigin,
+      },
+      method: "OPTIONS",
+    });
+
+    expect(response.headers.get("access-control-allow-origin")).toBe(trustedOrigin);
+    expect(response.headers.get("access-control-allow-headers")?.toLowerCase()).toBe(
+      "content-type",
+    );
+    expect(response.headers.get("access-control-expose-headers")).toBeNull();
+  });
+});

apps/api/tests/config.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { ApiConfigError, createApiRuntimeConfig } from "../src/config.js";
+import { ApiConfigError, apiTrustedOrigins, createApiRuntimeConfig } from "../src/config.js";
 
 const validSecret = "correct-horse-battery-staple-0123456789";
 
@@ -337,3 +337,24 @@ describe("API runtime configuration", () => {
     expect(publicText).not.toContain("db.internal.example");
   });
 });
+
+describe("the API's trusted browser origins (ADR 0045)", () => {
+  it("adds the API's own origin to the configured ones, as Better Auth does", () => {
+    const origins = apiTrustedOrigins({
+      baseUrl: "https://api.example.test",
+      trustedOrigins: ["https://dash.example.test"],
+    });
+
+    expect(origins).toEqual(["https://dash.example.test", "https://api.example.test"]);
+    expect(Object.isFrozen(origins)).toBe(true);
+  });
+
+  it("does not duplicate an API origin already listed (the same-origin topology)", () => {
+    expect(
+      apiTrustedOrigins({
+        baseUrl: "https://ekklesia.example.test",
+        trustedOrigins: ["https://ekklesia.example.test"],
+      }),
+    ).toEqual(["https://ekklesia.example.test"]);
+  });
+});

apps/api/tests/dashboard-host-assets.test.ts

@@ -0,0 +1,131 @@
+import { createHash } from "node:crypto";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const readFileMock = vi.hoisted(() => vi.fn());
+
+vi.mock("node:fs/promises", () => ({ readFile: readFileMock }));
+vi.mock("@ekklesia/shell/dashboard-assets", () => ({
+  dashboardHostAssetUrls: Object.freeze({
+    html: "file:///surface/browser/index.html",
+    script: "file:///surface/browser/assets/ekklesia-dashboard/app.js",
+  }),
+}));
+
+import {
+  createDashboardHostAssets,
+  DASHBOARD_API_ORIGIN_PLACEHOLDER,
+  DashboardHostAssetError,
+  loadDashboardHostAssets,
+  renderDashboardPage,
+} from "../src/dashboard-host-assets.js";
+
+const API_ORIGIN = "https://api.example.test";
+
+function sha256Etag(text: string): string {
+  return `"${createHash("sha256").update(text).digest("base64url")}"`;
+}
+
+describe("Dashboard host asset loading", () => {
+  beforeEach(() => readFileMock.mockReset());
+
+  it("reads only the two declared file URLs in order and freezes one consistent snapshot", async () => {
+    const html = `<!doctype html>${DASHBOARD_API_ORIGIN_PLACEHOLDER}<div id="ekklesia-host"></div>`;
+    const script = "export const dashboardHost = true;\n";
+    readFileMock.mockResolvedValueOnce(html).mockResolvedValueOnce(script);
+
+    const assets = await loadDashboardHostAssets(API_ORIGIN);
+
+    expect(readFileMock.mock.calls).toEqual([
+      [new URL("file:///surface/browser/index.html"), "utf8"],
+      [new URL("file:///surface/browser/assets/ekklesia-dashboard/app.js"), "utf8"],
+    ]);
+    const rendered = `<!doctype html><meta content="${API_ORIGIN}" name="ekklesia-api-origin" /><div id="ekklesia-host"></div>`;
+    expect(assets).toEqual({
+      html: rendered,
+      htmlEtag: sha256Etag(rendered),
+      script,
+      scriptEtag: sha256Etag(script),
+    });
+    expect(Object.isFrozen(assets)).toBe(true);
+  });
+
+  it("fails deterministically without attempting a neighboring file or exposing the read error", async () => {
+    readFileMock.mockRejectedValueOnce(
+      new Error("ENOENT /home/operator/private/surface-build secret-token"),
+    );
+
+    const failure = await loadDashboardHostAssets(API_ORIGIN).catch((error: unknown) => error);
+
+    expect(readFileMock).toHaveBeenCalledTimes(1);
+    expect(failure).toBeInstanceOf(DashboardHostAssetError);
+    expect(failure).toMatchObject({
+      code: "DASHBOARD_HOST_ASSET_UNAVAILABLE",
+      message: "The Dashboard host browser assets are unavailable.",
+      name: "DashboardHostAssetError",
+    });
+    expect((failure as Error).stack).toBe(
+      "DashboardHostAssetError: The Dashboard host browser assets are unavailable.",
+    );
+    const publicText = `${String(failure)}\n${JSON.stringify(failure)}\n${(failure as Error).stack}`;
+    for (const secret of ["/home/", "operator", "ENOENT", "secret-token"]) {
+      expect(publicText).not.toContain(secret);
+    }
+  });
+
+  it("fails when the script is missing even though the page was read", async () => {
+    readFileMock
+      .mockResolvedValueOnce(`<!doctype html>${DASHBOARD_API_ORIGIN_PLACEHOLDER}`)
+      .mockRejectedValueOnce(new Error("ENOENT app.js"));
+
+    await expect(loadDashboardHostAssets(API_ORIGIN)).rejects.toBeInstanceOf(
+      DashboardHostAssetError,
+    );
+    expect(readFileMock).toHaveBeenCalledTimes(2);
+  });
+
+  it("rejects an empty page or script as an unavailable shell build", () => {
+    for (const [html, script] of [
+      ["", "export {};"],
+      ["<html></html>", "   \n"],
+    ] as const) {
+      expect(() => createDashboardHostAssets(html, script)).toThrow(DashboardHostAssetError);
+    }
+  });
+
+  it("fails startup on a page without exactly one empty API-origin element (ADR 0045)", async () => {
+    for (const html of [
+      "<!doctype html>",
+      `<!doctype html>${DASHBOARD_API_ORIGIN_PLACEHOLDER}${DASHBOARD_API_ORIGIN_PLACEHOLDER}`,
+      '<!doctype html><meta content="https://elsewhere.test" name="ekklesia-api-origin" />',
+    ]) {
+      readFileMock.mockReset();
+      readFileMock.mockResolvedValueOnce(html).mockResolvedValueOnce("export {};\n");
+      await expect(loadDashboardHostAssets(API_ORIGIN)).rejects.toBeInstanceOf(
+        DashboardHostAssetError,
+      );
+    }
+  });
+});
+
+describe("Dashboard page API origin (ADR 0045)", () => {
+  const page = `<head>${DASHBOARD_API_ORIGIN_PLACEHOLDER}</head>`;
+
+  it("writes the API's origin into the one placeholder, in either topology", () => {
+    expect(renderDashboardPage(page, "https://api.example.test")).toBe(
+      '<head><meta content="https://api.example.test" name="ekklesia-api-origin" /></head>',
+    );
+    expect(renderDashboardPage(page, "http://127.0.0.1:3000")).toBe(
+      '<head><meta content="http://127.0.0.1:3000" name="ekklesia-api-origin" /></head>',
+    );
+  });
+
+  it.each([
+    "https://api.example.test/",
+    "https://api.example.test/api",
+    'https://api.example.test"><script>',
+    "javascript:alert(1)",
+    "",
+  ])("refuses a value that is not a canonical http(s) origin: %s", (origin) => {
+    expect(() => renderDashboardPage(page, origin)).toThrow(DashboardHostAssetError);
+  });
+});

apps/api/tests/dashboard-host-routes.test.ts

@@ -0,0 +1,347 @@
+import { createHash } from "node:crypto";
+import {
+  ANONYMOUS_PRINCIPAL,
+  type ModuleRouteHandler,
+  parsePermissionId,
+  type RegisteredModuleHttpRoute,
+} from "@ekklesia/contracts";
+import {
+  type AuthorizationEvaluator,
+  type AuthorizationStore,
+  createPermissionRegistry,
+} from "@ekklesia/core/authorization";
+import type { EkklesiaIdentityRuntime } from "@ekklesia/core/identity";
+import {
+  createModuleUiPublicationRegistry,
+  EMPTY_MODULE_REALTIME_REGISTRY,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
+} from "@ekklesia/core/modules";
+import { describe, expect, it, vi } from "vitest";
+
+// Every byte these routes serve must come from the injected startup snapshot. Any filesystem read
+// while answering a request — the hallmark of a static directory — fails these tests.
+const readFileMock = vi.hoisted(() => vi.fn());
+vi.mock("node:fs/promises", () => ({ readFile: readFileMock }));
+
+import { createApiApp } from "../src/app.js";
+import {
+  createDashboardHostAssets,
+  type DashboardHostAssets,
+} from "../src/dashboard-host-assets.js";
+import {
+  DASHBOARD_HOST_PAGE_PATH,
+  DASHBOARD_HOST_SCRIPT_PATH,
+  DashboardHostConfigurationError,
+} from "../src/dashboard-host-routes.js";
+import { DISPLAY_HOST_SCRIPT_PATH } from "../src/module-display-routes.js";
+import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
+import { emptyModuleConfiguration } from "./support/in-memory-module-configuration.js";
+import { emptyModuleLifecycle } from "./support/in-memory-module-lifecycle.js";
+import { emptyModuleStorage } from "./support/in-memory-module-storage.js";
+import { readyHealth } from "./support/ready-health.js";
+
+const trustedOrigin = "https://dashboard.example.test";
+const modulePermission = parsePermissionId("dashboard.page.read");
+
+const PAGE_HTML =
+  '<!doctype html><html lang="en"><body><div id="ekklesia-host"></div><script src="/assets/ekklesia-dashboard/app.js" type="module"></script></body></html>\n';
+const SCRIPT = "export const dashboard = 'built shell';\n";
+
+function sha256Etag(text: string): string {
+  return `"${createHash("sha256").update(text).digest("base64url")}"`;
+}
+
+const PAGE_ETAG = sha256Etag(PAGE_HTML);
+const SCRIPT_ETAG = sha256Etag(SCRIPT);
+
+function fakeRuntime(): EkklesiaIdentityRuntime {
+  return {
+    handleAuthRequest: vi.fn(),
+    resolvePrincipal: vi.fn().mockResolvedValue(ANONYMOUS_PRINCIPAL),
+  };
+}
+
+function fakeStore(): AuthorizationStore {
+  return {
+    createGrant: vi.fn(),
+    grantPlatformOwner: vi.fn(),
+    hasActiveGrant: vi.fn().mockResolvedValue(false),
+    isPlatformOwner: vi.fn().mockResolvedValue(false),
+    listGrantsForUser: vi.fn().mockResolvedValue({ grants: [] }),
+    revokeGrant: vi.fn(),
+    revokePlatformOwner: vi.fn(),
+  };
+}
+
+function fakeModuleServices(): LegacyModuleRuntimeServices {
+  return Object.freeze({ database: Object.freeze({}) as unknown as ModuleDatabase });
+}
+
+function buildApp(
+  options: {
+    readonly assets?: DashboardHostAssets;
+    readonly moduleRoutes?: readonly RegisteredModuleHttpRoute[];
+  } = {},
+) {
+  const evaluator: AuthorizationEvaluator = {
+    authorize: vi.fn().mockResolvedValue({ allowed: true }),
+  };
+  const runtime = fakeRuntime();
+  const app = createApiApp({
+    authorization: {
+      evaluator,
+      registry: createPermissionRegistry([
+        { baseline: "public", description: "Test permission.", id: modulePermission },
+      ]),
+      store: fakeStore(),
+    },
+    moduleRoutes: options.moduleRoutes ?? Object.freeze([]),
+    moduleRealtime: EMPTY_MODULE_REALTIME_REGISTRY,
+    moduleServices: fakeModuleServices(),
+    moduleUi: createModuleUiPublicationRegistry([]),
+    moduleLifecycle: emptyModuleLifecycle(),
+    moduleConfiguration: emptyModuleConfiguration(),
+    moduleStorage: emptyModuleStorage(),
+    dashboard: createInMemoryDashboardStore(),
+    dashboardHostAssets: options.assets ?? createDashboardHostAssets(PAGE_HTML, SCRIPT),
+    health: readyHealth(),
+    runtime,
+    trustedOrigins: [trustedOrigin],
+  });
+  return { app, evaluator, runtime };
+}
+
+function expectPageSecurityHeaders(response: Response): void {
+  expect(response.headers.get("x-frame-options")).toBe("DENY");
+  expect(response.headers.get("content-security-policy")).toBe("frame-ancestors 'none'");
+  expect(response.headers.get("referrer-policy")).toBe("no-referrer");
+  expect(response.headers.get("x-content-type-options")).toBe("nosniff");
+}
+
+async function expectSanitizedNotFound(response: Response, label: string): Promise<void> {
+  expect(response.status, label).toBe(404);
+  expect(response.headers.get("content-type"), label).toMatch(/^application\/json/u);
+  expect(await response.json(), label).toEqual({ code: "NOT_FOUND" });
+}
+
+describe("GET / (the Dashboard page)", () => {
+  it("serves the exact startup HTML bytes with revalidation, a strong ETag, and the page security headers", async () => {
+    const { app } = buildApp();
+
+    const response = await app.request(DASHBOARD_HOST_PAGE_PATH);
+
+    expect(response.status).toBe(200);
+    expect(await response.text()).toBe(PAGE_HTML);
+    expect(response.headers.get("content-type")).toBe("text/html; charset=utf-8");
+    expect(response.headers.get("cache-control")).toBe("no-cache");
+    expect(response.headers.get("etag")).toBe(PAGE_ETAG);
+    expectPageSecurityHeaders(response);
+    // The one CSP directive is the only one: the full policy is a separate decision.
+    expect(response.headers.get("content-security-policy")).not.toContain(";");
+  });
+
+  it("serves the same page for an emailed-link landing, since the query never selects a file", async () => {
+    const { app } = buildApp();
+
+    const response = await app.request("/?ekklesia_auth=reset-password&token=abc123");
+
+    expect(response.status).toBe(200);
+    expect(await response.text()).toBe(PAGE_HTML);
+    expect(response.headers.get("etag")).toBe(PAGE_ETAG);
+  });
+
+  it("answers a matching If-None-Match with an empty 304 that keeps the validator and every page security header", async () => {
+    const { app } = buildApp();
+
+    for (const ifNoneMatch of [PAGE_ETAG, `W/${PAGE_ETAG}`, `"other", ${PAGE_ETAG}`, "*"]) {
+      const response = await app.request(DASHBOARD_HOST_PAGE_PATH, {
+        headers: { "If-None-Match": ifNoneMatch },
+      });
+
+      expect(response.status, ifNoneMatch).toBe(304);
+      expect(await response.text(), ifNoneMatch).toBe("");
+      expect(response.headers.get("etag")).toBe(PAGE_ETAG);
+      expect(response.headers.get("cache-control")).toBe("no-cache");
+      expectPageSecurityHeaders(response);
+    }
+  });
+
+  it("serves the full page again when the browser holds a different build's validator", async () => {
+    const { app } = buildApp();
+
+    const response = await app.request(DASHBOARD_HOST_PAGE_PATH, {
+      headers: { "If-None-Match": sha256Etag("an older build") },
+    });
+
+    expect(response.status).toBe(200);
+    expect(await response.text()).toBe(PAGE_HTML);
+  });
+
+  it("is unauthenticated and outside the API's CORS policy: it resolves no principal and reflects no origin", async () => {
+    const { app, evaluator, runtime } = buildApp();
+
+    const response = await app.request(DASHBOARD_HOST_PAGE_PATH, {
+      headers: { Cookie: "better-auth.session_token=anything", Origin: trustedOrigin },
+    });
+
+    expect(response.status).toBe(200);
+    expect(runtime.resolvePrincipal).not.toHaveBeenCalled();
+    expect(evaluator.authorize).not.toHaveBeenCalled();
+    expect(response.headers.get("access-control-allow-origin")).toBeNull();
+    expect(response.headers.get("set-cookie")).toBeNull();
+  });
+});
+
+describe("GET /assets/ekklesia-dashboard/app.js (the Dashboard script)", () => {
+  it("serves the exact startup script bytes as JavaScript with revalidation and a strong ETag", async () => {
+    const { app } = buildApp();
+
+    const response = await app.request(DASHBOARD_HOST_SCRIPT_PATH);
+
+    expect(response.status).toBe(200);
+    expect(await response.text()).toBe(SCRIPT);
+    expect(response.headers.get("content-type")).toBe("text/javascript; charset=utf-8");
+    expect(response.headers.get("cache-control")).toBe("no-cache");
+    expect(response.headers.get("etag")).toBe(SCRIPT_ETAG);
+    expect(response.headers.get("x-content-type-options")).toBe("nosniff");
+  });
+
+  it("answers a matching If-None-Match with an empty 304 carrying the script's own validator", async () => {
+    const { app } = buildApp();
+
+    const response = await app.request(DASHBOARD_HOST_SCRIPT_PATH, {
+      headers: { "If-None-Match": SCRIPT_ETAG },
+    });
+
+    expect(response.status).toBe(304);
+    expect(await response.text()).toBe("");
+    expect(response.headers.get("etag")).toBe(SCRIPT_ETAG);
+    expect(response.headers.get("cache-control")).toBe("no-cache");
+  });
+
+  it("does not accept the page's validator as the script's", async () => {
+    const { app } = buildApp();
+
+    const response = await app.request(DASHBOARD_HOST_SCRIPT_PATH, {
+      headers: { "If-None-Match": PAGE_ETAG },
+    });
+
+    expect(response.status).toBe(200);
+  });
+});
+
+describe("Dashboard host boundaries", () => {
+  it("serves nothing but its two exact paths, answering every other spelling with the sanitized 404", async () => {
+    const { app } = buildApp();
+
+    for (const path of [
+      "/index.html",
+      "/app.js",
+      "/app.js.map",
+      "/assets/ekklesia-dashboard/app.js.map",
+      "/assets/ekklesia-dashboard/",
+      "/assets/ekklesia-dashboard",
+      "/assets/ekklesia-dashboard/app.js/",
+      "/assets/ekklesia-dashboard/index.html",
+      "/assets/",
+      "/assets/ekklesia-dashboard/APP.JS",
+      "/dashboard",
+      "/login",
+    ]) {
+      await expectSanitizedNotFound(await app.request(path), path);
+    }
+  });
+
+  it("cannot be walked out of: encoded traversal, separators, and double slashes reach no file", async () => {
+    const { app } = buildApp();
+
+    for (const path of [
+      "/assets/ekklesia-dashboard/%2e%2e/%2e%2e/package.json",
+      "/assets/ekklesia-dashboard/..%2fapp.js.map",
+      "/assets/ekklesia-dashboard/%2e%2e%2fapp.js.map",
+      "/assets/ekklesia-dashboard/app.js%2f..%2f..%2fpackage.json",
+      "/assets/ekklesia-dashboard/..%5c..%5cpackage.json",
+      "/%2e%2e/%2e%2e/etc/passwd",
+      "/../../etc/passwd",
+      "//assets/ekklesia-dashboard/app.js",
+      "/assets//ekklesia-dashboard/app.js",
+      "/assets/ekklesia-dashboard/app.js%00.map",
+    ]) {
+      const response = await app.request(path);
+      expect(await response.text(), path).not.toContain(SCRIPT);
+      expect(response.status, path).toBe(404);
+    }
+    expect(readFileMock).not.toHaveBeenCalled();
+  });
+
+  it("never touches the filesystem while answering, even across every served path", async () => {
+    const { app } = buildApp();
+
+    await app.request(DASHBOARD_HOST_PAGE_PATH);
+    await app.request(DASHBOARD_HOST_SCRIPT_PATH);
+    await app.request("/assets/ekklesia-dashboard/app.js.map");
+
+    expect(readFileMock).not.toHaveBeenCalled();
+  });
+
+  it("serves GET (and Hono's implicit HEAD) only; every other method is the ordinary 404", async () => {
+    const { app } = buildApp();
+
+    const head = await app.request(DASHBOARD_HOST_PAGE_PATH, { method: "HEAD" });
+    expect(head.status).toBe(200);
+    expect(head.headers.get("etag")).toBe(PAGE_ETAG);
+    expect(await head.text()).toBe("");
+
+    for (const path of [DASHBOARD_HOST_PAGE_PATH, DASHBOARD_HOST_SCRIPT_PATH]) {
+      for (const method of ["POST", "PUT", "PATCH", "DELETE"]) {
+        await expectSanitizedNotFound(await app.request(path, { method }), `${method} ${path}`);
+      }
+    }
+  });
+
+  it("leaves the API, the display host's namespace, and module routes exactly where they were", async () => {
+    const moduleHandler = vi.fn<ModuleRouteHandler>(
+      async () => new Response("module", { status: 200 }),
+    );
+    const { app } = buildApp({
+      moduleRoutes: [
+        Object.freeze({
+          bodyMode: "buffered",
+          handler: moduleHandler,
+          maxBodyBytes: 1024,
+          method: "GET",
+          moduleId: "dashboard",
+          path: "/",
+          permission: modulePermission,
+        }) as RegisteredModuleHttpRoute,
+      ],
+    });
+
+    expect(await (await app.request("/api/v1/principal")).json()).toEqual({ kind: "anonymous" });
+    expect(await (await app.request("/api/v1/health/live")).json()).toEqual({ status: "live" });
+    expect(await (await app.request("/api/v1/modules/dashboard")).text()).toBe("module");
+    await expectSanitizedNotFound(await app.request("/api/v1/unknown"), "/api/v1/unknown");
+    // No display is published here, so the display host's script is absent rather than answered
+    // by the Dashboard's.
+    await expectSanitizedNotFound(
+      await app.request(DISPLAY_HOST_SCRIPT_PATH),
+      DISPLAY_HOST_SCRIPT_PATH,
+    );
+    expect(DASHBOARD_HOST_SCRIPT_PATH.startsWith("/assets/ekklesia-display/")).toBe(false);
+    expect(await (await app.request(DASHBOARD_HOST_PAGE_PATH)).text()).toBe(PAGE_HTML);
+    expect(moduleHandler).toHaveBeenCalledTimes(1);
+  });
+
+  it("refuses at composition a snapshot whose validator does not match its bytes, or empty bytes", () => {
+    const consistent = createDashboardHostAssets(PAGE_HTML, SCRIPT);
+
+    for (const assets of [
+      { ...consistent, html: `${PAGE_HTML}<!-- tampered -->` },
+      { ...consistent, scriptEtag: PAGE_ETAG },
+      { html: "", htmlEtag: sha256Etag(""), script: SCRIPT, scriptEtag: SCRIPT_ETAG },
+    ]) {
+      expect(() => buildApp({ assets })).toThrow(DashboardHostConfigurationError);
+    }
+  });
+});

apps/api/tests/dashboard-routes.test.ts

@@ -5,8 +5,6 @@ import {
   ANONYMOUS_PRINCIPAL,
   createAuthenticatedPrincipal,
   type EkklesiaPrincipal,
-  type ModuleDatabase,
-  type ModuleRuntimeServices,
   parseEkklesiaUserId,
 } from "@ekklesia/contracts";
 import {
@@ -20,6 +18,8 @@ import {
   createModuleUiPublicationRegistry,
   discoverModules,
   EMPTY_MODULE_REALTIME_REGISTRY,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
 } from "@ekklesia/core/modules";
 import type { Hono } from "hono";
 import { afterEach, describe, expect, it, vi } from "vitest";
@@ -27,6 +27,8 @@ import { createApiApp } from "../src/app.js";
 import { DASHBOARD_NAVIGATION_PATH } from "../src/dashboard-routes.js";
 import { MODULE_UI_INVENTORY_PATH } from "../src/module-ui-inventory.js";
 import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
+import { testDashboardHostAssets } from "./support/dashboard-host-assets.js";
+import { readyHealth } from "./support/ready-health.js";
 import {
   createInMemoryModuleLifecycleStore,
   moduleLifecycleSnapshotFor,
@@ -75,7 +77,7 @@ async function createModule(modulesDirectory: string, fixture: ModuleFixture): P
         ...(fixture.withUi === false ? {} : { ui: "./dist/ui/index.js" }),
       },
       id: fixture.id,
-      manifestVersion: 7,
+      manifestVersion: 8,
       name: fixture.name,
       version: "1.0.0",
     }),
@@ -139,11 +141,13 @@ async function install(options: InstallOptions = {}): Promise<{ app: Hono }> {
   const app = createApiApp({
     authorization: { evaluator, registry: composePlatformPermissionRegistry(modules), store },
     dashboard: createInMemoryDashboardStore(options.configuration ?? {}),
+    dashboardHostAssets: testDashboardHostAssets(),
+    health: readyHealth(),
     moduleRoutes: Object.freeze([]),
     moduleRealtime: EMPTY_MODULE_REALTIME_REGISTRY,
     moduleServices: Object.freeze({
       database: Object.freeze({}) as unknown as ModuleDatabase,
-    }) as ModuleRuntimeServices,
+    }) as LegacyModuleRuntimeServices,
     moduleUi: createModuleUiPublicationRegistry(modules),
     moduleLifecycle: {
       snapshot: moduleLifecycleSnapshotFor(modules),

apps/api/tests/device-pairing.integration.ts

@@ -118,13 +118,13 @@ async function createDisplayModuleDirectory(): Promise<string> {
     writeFile(
       path.join(moduleDirectory, "ekklesia.module.json"),
       JSON.stringify({
-        compatibility: { moduleSdk: "^0.1.0", platform: "^0.1.0" },
+        compatibility: { moduleSdk: "^0.2.0", platform: "^0.2.0" },
         entrypoints: {
           display: { artifact: "./dist/ui/display.js", permission: displayPermission },
           server: "./dist/server/index.js",
         },
         id: "announcements",
-        manifestVersion: 7,
+        manifestVersion: 8,
         name: "Announcements fixture",
         permissions: [
           {

apps/api/tests/health-routes.test.ts

@@ -0,0 +1,373 @@
+import {
+  ANONYMOUS_PRINCIPAL,
+  type ModuleRouteHandler,
+  parsePermissionId,
+  type RegisteredModuleHttpRoute,
+} from "@ekklesia/contracts";
+import {
+  type AuthorizationEvaluator,
+  type AuthorizationStore,
+  createPermissionRegistry,
+} from "@ekklesia/core/authorization";
+import type { EkklesiaIdentityRuntime } from "@ekklesia/core/identity";
+import {
+  createModuleUiPublicationRegistry,
+  EMPTY_MODULE_REALTIME_REGISTRY,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
+} from "@ekklesia/core/modules";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { createApiApp } from "../src/app.js";
+import {
+  type ApiHealthOptions,
+  HEALTH_LIVE_PATH,
+  HEALTH_READY_PATH,
+  READINESS_DATABASE_TIMEOUT_MS,
+} from "../src/health-routes.js";
+import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
+import { testDashboardHostAssets } from "./support/dashboard-host-assets.js";
+import { emptyModuleConfiguration } from "./support/in-memory-module-configuration.js";
+import { emptyModuleLifecycle } from "./support/in-memory-module-lifecycle.js";
+import { emptyModuleStorage } from "./support/in-memory-module-storage.js";
+
+const trustedOrigin = "https://dashboard.example.test";
+const modulePermission = parsePermissionId("health.status.read");
+
+/** What a real driver failure can carry, and what must therefore never reach a response. */
+const DRIVER_FAILURE_DETAIL =
+  "connect ECONNREFUSED postgresql://ekklesia:[email protected]:5432/ekklesia SELECT 1";
+
+function fakeRuntime(): EkklesiaIdentityRuntime {
+  return {
+    handleAuthRequest: vi.fn(),
+    resolvePrincipal: vi.fn().mockResolvedValue(ANONYMOUS_PRINCIPAL),
+  };
+}
+
+function fakeStore(): AuthorizationStore {
+  return {
+    createGrant: vi.fn(),
+    grantPlatformOwner: vi.fn(),
+    hasActiveGrant: vi.fn().mockResolvedValue(false),
+    isPlatformOwner: vi.fn().mockResolvedValue(false),
+    listGrantsForUser: vi.fn().mockResolvedValue({ grants: [] }),
+    revokeGrant: vi.fn(),
+    revokePlatformOwner: vi.fn(),
+  };
+}
+
+function fakeModuleServices(): LegacyModuleRuntimeServices {
+  return Object.freeze({ database: Object.freeze({}) as unknown as ModuleDatabase });
+}
+
+function healthOptions(overrides: Partial<ApiHealthOptions> = {}) {
+  return {
+    checkDatabase: vi.fn<() => Promise<void>>().mockResolvedValue(undefined),
+    isModuleStartupComplete: vi.fn<() => boolean>().mockReturnValue(true),
+    ...overrides,
+  };
+}
+
+function buildApp(
+  health: ApiHealthOptions,
+  moduleRoutes: readonly RegisteredModuleHttpRoute[] = Object.freeze([]),
+) {
+  const evaluator: AuthorizationEvaluator = {
+    authorize: vi.fn().mockResolvedValue({ allowed: true }),
+  };
+  const runtime = fakeRuntime();
+  const app = createApiApp({
+    authorization: {
+      evaluator,
+      registry: createPermissionRegistry([
+        { baseline: "public", description: "Test permission.", id: modulePermission },
+      ]),
+      store: fakeStore(),
+    },
+    moduleRoutes,
+    moduleRealtime: EMPTY_MODULE_REALTIME_REGISTRY,
+    moduleServices: fakeModuleServices(),
+    moduleUi: createModuleUiPublicationRegistry([]),
+    moduleLifecycle: emptyModuleLifecycle(),
+    moduleConfiguration: emptyModuleConfiguration(),
+    moduleStorage: emptyModuleStorage(),
+    dashboard: createInMemoryDashboardStore(),
+    dashboardHostAssets: testDashboardHostAssets(),
+    health,
+    runtime,
+    trustedOrigins: [trustedOrigin],
+  });
+  return { app, evaluator, runtime };
+}
+
+/** Resolves once every already-queued microtask has run, using the real `setImmediate` — the only
+ * timer functions these tests fake are `setTimeout` and `clearTimeout`. */
+function drainMicrotasks(): Promise<void> {
+  return new Promise((resolve) => setImmediate(resolve));
+}
+
+/** Whether `promise` settled with no fake time advanced at all: "promptly", made exact. */
+async function settlesWithoutWaiting(promise: Response | Promise<Response>): Promise<boolean> {
+  let settled = false;
+  void Promise.resolve(promise).then(
+    () => {
+      settled = true;
+    },
+    () => {
+      settled = true;
+    },
+  );
+  await drainMicrotasks();
+  return settled;
+}
+
+async function expectNotReady(response: Response): Promise<void> {
+  expect(response.status).toBe(503);
+  expect(response.headers.get("cache-control")).toBe("no-store");
+  expect(await response.json()).toEqual({ code: "NOT_READY" });
+}
+
+afterEach(() => {
+  vi.useRealTimers();
+});
+
+describe("GET /api/v1/health/live", () => {
+  it("returns 200 with a fixed body and Cache-Control: no-store", async () => {
+    const health = healthOptions();
+    const { app } = buildApp(health);
+
+    const response = await app.request(HEALTH_LIVE_PATH);
+
+    expect(response.status).toBe(200);
+    expect(response.headers.get("cache-control")).toBe("no-store");
+    expect(response.headers.get("content-type")).toMatch(/^application\/json/u);
+    expect(await response.json()).toEqual({ status: "live" });
+  });
+
+  it("does not consult the database or module startup, so it stays 200 while readiness is 503", async () => {
+    const health = healthOptions({
+      checkDatabase: vi.fn().mockRejectedValue(new Error(DRIVER_FAILURE_DETAIL)),
+      isModuleStartupComplete: vi.fn().mockReturnValue(false),
+    });
+    const { app } = buildApp(health);
+
+    const response = await app.request(HEALTH_LIVE_PATH);
+
+    expect(response.status).toBe(200);
+    expect(health.checkDatabase).not.toHaveBeenCalled();
+    expect(health.isModuleStartupComplete).not.toHaveBeenCalled();
+  });
+});
+
+describe("GET /api/v1/health/ready", () => {
+  it("returns 200 with a fixed body when the database answers and module startup completed", async () => {
+    const health = healthOptions();
+    const { app } = buildApp(health);
+
+    const response = await app.request(HEALTH_READY_PATH);
+
+    expect(response.status).toBe(200);
+    expect(response.headers.get("cache-control")).toBe("no-store");
+    expect(await response.json()).toEqual({ status: "ready" });
+    expect(health.checkDatabase).toHaveBeenCalledTimes(1);
+  });
+
+  it("returns a fixed 503 when the database query fails, carrying nothing from the failure", async () => {
+    const health = healthOptions({
+      checkDatabase: vi.fn().mockRejectedValue(new Error(DRIVER_FAILURE_DETAIL)),
+    });
+    const { app } = buildApp(health);
+
+    const response = await app.request(HEALTH_READY_PATH);
+    const text = await response.clone().text();
+
+    await expectNotReady(response);
+    for (const fragment of ["ECONNREFUSED", "hunter2", "db.internal", "SELECT", "Error"]) {
+      expect(text).not.toContain(fragment);
+    }
+  });
+
+  it("treats a check that throws synchronously exactly like one that rejects", async () => {
+    const health = healthOptions({
+      checkDatabase: vi.fn(() => {
+        throw new Error(DRIVER_FAILURE_DETAIL);
+      }),
+    });
+    const { app } = buildApp(health);
+
+    await expectNotReady(await app.request(HEALTH_READY_PATH));
+  });
+
+  it("returns 503 without touching the database before module startup completed", async () => {
+    const health = healthOptions({ isModuleStartupComplete: vi.fn().mockReturnValue(false) });
+    const { app } = buildApp(health);
+
+    await expectNotReady(await app.request(HEALTH_READY_PATH));
+    expect(health.checkDatabase).not.toHaveBeenCalled();
+  });
+
+  it("returns 503 when shutdown began while the database query was in flight", async () => {
+    let startupComplete = true;
+    const health = healthOptions({
+      checkDatabase: vi.fn(async () => {
+        startupComplete = false;
+      }),
+      isModuleStartupComplete: () => startupComplete,
+    });
+    const { app } = buildApp(health);
+
+    await expectNotReady(await app.request(HEALTH_READY_PATH));
+  });
+
+  it("starts a fresh check for each sequential probe rather than caching a success", async () => {
+    const health = healthOptions();
+    const { app } = buildApp(health);
+
+    await app.request(HEALTH_READY_PATH);
+    await app.request(HEALTH_READY_PATH);
+
+    expect(health.checkDatabase).toHaveBeenCalledTimes(2);
+  });
+
+  it("reports ready for a slow query that still answers inside the bound", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    let answer: () => void = () => undefined;
+    const health = healthOptions({
+      checkDatabase: vi.fn(
+        () =>
+          new Promise<void>((resolve) => {
+            answer = resolve;
+          }),
+      ),
+    });
+    const { app } = buildApp(health);
+
+    const pending = app.request(HEALTH_READY_PATH);
+    await vi.advanceTimersByTimeAsync(READINESS_DATABASE_TIMEOUT_MS - 1);
+    answer();
+
+    expect((await pending).status).toBe(200);
+  });
+});
+
+describe("readiness never piles up database checks", () => {
+  it("keeps exactly one check in flight for a query that never settles, while every probe answers 503 promptly", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    const health = healthOptions({
+      checkDatabase: vi.fn(() => new Promise<void>(() => undefined)),
+    });
+    const { app } = buildApp(health);
+
+    // Probes arriving inside the first check's window share it and its single deadline.
+    const first = app.request(HEALTH_READY_PATH);
+    const concurrent = app.request(HEALTH_READY_PATH);
+    await drainMicrotasks();
+    expect(health.checkDatabase).toHaveBeenCalledTimes(1);
+
+    await vi.advanceTimersByTimeAsync(READINESS_DATABASE_TIMEOUT_MS);
+    await expectNotReady(await first);
+    await expectNotReady(await concurrent);
+
+    // After the deadline the query is still unsettled: no new check starts, and each probe answers
+    // without waiting out another bound.
+    for (let probe = 0; probe < 20; probe += 1) {
+      const pending = app.request(HEALTH_READY_PATH);
+      expect(await settlesWithoutWaiting(pending)).toBe(true);
+      await expectNotReady(await pending);
+    }
+    expect(health.checkDatabase).toHaveBeenCalledTimes(1);
+  });
+
+  it("starts a new check only once the timed-out query has actually settled", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    let settleHungQuery: (error: Error) => void = () => undefined;
+    const checkDatabase = vi
+      .fn<() => Promise<void>>()
+      .mockImplementationOnce(
+        () =>
+          new Promise<void>((_resolve, reject) => {
+            settleHungQuery = reject;
+          }),
+      )
+      .mockResolvedValue(undefined);
+    const { app } = buildApp(healthOptions({ checkDatabase }));
+
+    const first = app.request(HEALTH_READY_PATH);
+    await vi.advanceTimersByTimeAsync(READINESS_DATABASE_TIMEOUT_MS);
+    await expectNotReady(await first);
+    await expectNotReady(await app.request(HEALTH_READY_PATH));
+    expect(checkDatabase).toHaveBeenCalledTimes(1);
+
+    // The database cancels the abandoned statement; the next probe may finally ask again.
+    settleHungQuery(new Error(DRIVER_FAILURE_DETAIL));
+    await drainMicrotasks();
+
+    const recovered = await app.request(HEALTH_READY_PATH);
+    expect(recovered.status).toBe(200);
+    expect(checkDatabase).toHaveBeenCalledTimes(2);
+  });
+});
+
+describe("health route boundaries", () => {
+  it.each([
+    HEALTH_LIVE_PATH,
+    HEALTH_READY_PATH,
+  ])("%s accepts GET only, answering every other method with a fixed 405 and never checking readiness", async (path) => {
+    const health = healthOptions();
+    const { app } = buildApp(health);
+
+    for (const method of ["HEAD", "POST", "PUT", "PATCH", "DELETE"]) {
+      const response = await app.request(path, { method });
+      expect(response.status, method).toBe(405);
+      expect(response.headers.get("allow")).toBe("GET");
+      expect(response.headers.get("cache-control")).toBe("no-store");
+      expect(await response.text()).toBe("");
+    }
+    expect(health.checkDatabase).not.toHaveBeenCalled();
+    expect(health.isModuleStartupComplete).not.toHaveBeenCalled();
+  });
+
+  it.each([
+    HEALTH_LIVE_PATH,
+    HEALTH_READY_PATH,
+  ])("%s is unauthenticated: it never resolves a principal or evaluates authorization, even with a cookie", async (path) => {
+    const { app, evaluator, runtime } = buildApp(healthOptions());
+
+    const response = await app.request(path, {
+      headers: { Cookie: "better-auth.session_token=anything", Origin: trustedOrigin },
+    });
+
+    expect(response.status).toBe(200);
+    expect(runtime.resolvePrincipal).not.toHaveBeenCalled();
+    expect(runtime.handleAuthRequest).not.toHaveBeenCalled();
+    expect(evaluator.authorize).not.toHaveBeenCalled();
+  });
+
+  it('cannot be shadowed by a module, even one whose id is "health"', async () => {
+    const moduleHandler = vi.fn<ModuleRouteHandler>(
+      async () => new Response("module", { status: 200 }),
+    );
+    const moduleRoutes = ["/live", "/ready"].map(
+      (path) =>
+        Object.freeze({
+          bodyMode: "buffered",
+          handler: moduleHandler,
+          maxBodyBytes: 1024,
+          method: "GET",
+          moduleId: "health",
+          path,
+          permission: modulePermission,
+        }) as RegisteredModuleHttpRoute,
+    );
+    const { app } = buildApp(healthOptions(), moduleRoutes);
+
+    expect(await (await app.request(HEALTH_LIVE_PATH)).json()).toEqual({ status: "live" });
+    expect(await (await app.request(HEALTH_READY_PATH)).json()).toEqual({ status: "ready" });
+    expect(moduleHandler).not.toHaveBeenCalled();
+
+    // The module's own routes still live where every module route lives, and only there.
+    const moduleResponse = await app.request("/api/v1/modules/health/ready");
+    expect(await moduleResponse.text()).toBe("module");
+    expect(moduleHandler).toHaveBeenCalledTimes(1);
+  });
+});

apps/api/tests/host-configuration-parity.test.ts

@@ -151,6 +151,13 @@ describe("host configuration parity between startApi and Doctor", () => {
     );
   });
 
+  it("hands the API the same modules directory Doctor and the operator commands read", () => {
+    expect(readConfigFromEnvironment(environment()).modulesDirectory).toBeUndefined();
+    const env = environment({ EKKLESIA_MODULES_DIR: "/var/lib/ekklesia/modules" });
+    expect(readConfigFromEnvironment(env).modulesDirectory).toBe("/var/lib/ekklesia/modules");
+    expect(loadHostConfiguration(env).modulesDirectory).toBe("/var/lib/ekklesia/modules");
+  });
+
   it("reads only this listener's own address and port outside the shared loader", () => {
     const config = apiView(
       environment({ EKKLESIA_API_HOST: "0.0.0.0", EKKLESIA_API_PORT: "8080" }),

apps/api/tests/lifecycle.test.ts

@@ -9,11 +9,21 @@ const drizzleAdapterMock = vi.hoisted(() => vi.fn());
 const serveMock = vi.hoisted(() => vi.fn());
 const processOnSpy = vi.hoisted(() => vi.fn());
 const loadDisplayHostAssetsMock = vi.hoisted(() => vi.fn());
+const loadDashboardHostAssetsMock = vi.hoisted(() => vi.fn());
 
 vi.mock("pg", () => ({ Pool: poolConstructor }));
 vi.mock("better-auth", () => ({ betterAuth: betterAuthMock }));
 vi.mock("better-auth/adapters/drizzle", () => ({ drizzleAdapter: drizzleAdapterMock }));
 vi.mock("@hono/node-server", () => ({ serve: serveMock }));
+// Every startup reads the built Dashboard (ADR 0044), and this file never depends on a built shell,
+// so the loader answers a small consistent snapshot unless a test makes it fail.
+vi.mock("../src/dashboard-host-assets.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../src/dashboard-host-assets.js")>();
+  loadDashboardHostAssetsMock.mockImplementation(async () =>
+    actual.createDashboardHostAssets("<!doctype html>", "export {};\n"),
+  );
+  return { ...actual, loadDashboardHostAssets: loadDashboardHostAssetsMock };
+});
 vi.mock("../src/display-host-assets.js", async (importOriginal) => {
   const actual = await importOriginal<typeof import("../src/display-host-assets.js")>();
   return { ...actual, loadDisplayHostAssets: loadDisplayHostAssetsMock };
@@ -35,7 +45,13 @@ import {
 import { PermissionRegistryError } from "@ekklesia/core/authorization";
 import { createApiApp } from "../src/app.js";
 import { createApiRuntimeConfig } from "../src/config.js";
+import { DashboardHostAssetError } from "../src/dashboard-host-assets.js";
 import { DisplayHostAssetError } from "../src/display-host-assets.js";
+import {
+  HEALTH_LIVE_PATH,
+  HEALTH_READY_PATH,
+  READINESS_DATABASE_TIMEOUT_MS,
+} from "../src/health-routes.js";
 import { installShutdownSignalHandlers, startApi } from "../src/server.js";
 
 function validConfig() {
@@ -88,11 +104,11 @@ async function createFixtureModule(
 ): Promise<void> {
   const moduleDirectory = path.join(modulesDirectory, id);
   const manifest = {
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "0.1.0",
-    compatibility: { platform: "^0.1.0", moduleSdk: "^0.1.0" },
+    compatibility: { platform: "^0.2.0", moduleSdk: "^0.2.0" },
     permissions: [],
     entrypoints: { server: "./dist/server/index.js" },
     ...manifestOverrides,
@@ -251,10 +267,10 @@ function fakeDiscoveredModule(
 ): DiscoveredModule {
   const manifest = parseModuleManifest({
     capabilities: [],
-    compatibility: { moduleSdk: "^0.1.0", platform: "^0.1.0" },
+    compatibility: { moduleSdk: "^0.2.0", platform: "^0.2.0" },
     entrypoints: { server: "./dist/does-not-exist/index.js" },
     id,
-    manifestVersion: 7,
+    manifestVersion: 8,
     name: `${id} module`,
     permissions,
     version: "0.1.0",
@@ -447,6 +463,36 @@ describe("Ekklesia API shutdown lifecycle", () => {
     expect(poolEnd).toHaveBeenCalledTimes(1);
   });
 
+  it("answers readiness with one bounded ping on the shared pool, and turns it 503 the moment shutdown begins", async () => {
+    const query = emptyQuery();
+    poolConstructor.mockImplementation(function fakePool() {
+      return { end: vi.fn().mockResolvedValue(undefined), on: vi.fn(), query };
+    });
+    betterAuthMock.mockReturnValue({ api: { getSession: vi.fn() }, handler: vi.fn() });
+    mockSuccessfulServe();
+
+    const running = await startApi(validConfig());
+    query.mockClear();
+
+    const ready = await running.app.request(HEALTH_READY_PATH);
+    expect(ready.status).toBe(200);
+    expect(query).toHaveBeenCalledTimes(1);
+    // The statement timeout is server-side and scoped to this one transaction, so PostgreSQL itself
+    // cancels a stalled ping rather than the route merely abandoning it.
+    expect(query).toHaveBeenCalledWith(
+      `BEGIN READ ONLY; SET LOCAL statement_timeout = ${READINESS_DATABASE_TIMEOUT_MS}; SELECT 1; COMMIT`,
+    );
+
+    const shutdown = running.shutdown();
+    const draining = await running.app.request(HEALTH_READY_PATH);
+    expect(draining.status).toBe(503);
+    expect(await draining.json()).toEqual({ code: "NOT_READY" });
+    // Draining is not dead: liveness still answers while in-flight requests finish.
+    expect((await running.app.request(HEALTH_LIVE_PATH)).status).toBe(200);
+    expect(query).toHaveBeenCalledTimes(1);
+    await shutdown;
+  });
+
   it("keeps shutdown idempotent for calls made after the first has already resolved", async () => {
     const poolEnd = vi.fn().mockResolvedValue(undefined);
     poolConstructor.mockImplementation(function fakePool() {
@@ -958,6 +1004,73 @@ describe("Ekklesia API module permission composition at startup", () => {
     expect(poolEnd).toHaveBeenCalledTimes(1);
   });
 
+  it("discovers installed modules from the configured modules directory (ADR 0048)", async () => {
+    const modulesDirectory = await createTemporaryModulesDirectory();
+    await createFixtureModule(modulesDirectory, "incompatible", {
+      compatibility: { moduleSdk: "^0.1.0", platform: ">=99.0.0" },
+    });
+
+    // The module that fails discovery lives only in the configured directory, so this rejection
+    // proves discovery read it rather than the repository's own `modules/`.
+    await expect(
+      startApi(validConfig(), { configuredModulesDirectory: modulesDirectory }),
+    ).rejects.toBeInstanceOf(ModuleDiscoveryError);
+    expect(poolConstructor).not.toHaveBeenCalled();
+  });
+
+  it("starts with zero modules from an empty configured modules directory", async () => {
+    const modulesDirectory = await createTemporaryModulesDirectory();
+    poolConstructor.mockImplementation(function fakePool() {
+      return { end: vi.fn().mockResolvedValue(undefined), on: vi.fn(), query: emptyQuery() };
+    });
+    betterAuthMock.mockReturnValue({ api: { getSession: vi.fn() }, handler: vi.fn() });
+    mockSuccessfulServe();
+
+    const running = await startApi(validConfig(), { configuredModulesDirectory: modulesDirectory });
+
+    expect(poolConstructor).toHaveBeenCalledTimes(1);
+    await running.shutdown();
+  });
+
+  it.each([
+    ["a relative path", "relative/private-mount-5b2a", "MODULES_DIRECTORY_INVALID"],
+    ["a missing directory", "/nonexistent/private-mount-5b2a", "MODULES_DIRECTORY_UNREADABLE"],
+  ])("fails closed on %s, before any pool exists, naming no path", async (_label, configured, code) => {
+    let captured: unknown;
+    try {
+      await startApi(validConfig(), { configuredModulesDirectory: configured });
+    } catch (error) {
+      captured = error;
+    }
+
+    expect(captured).toBeInstanceOf(ModuleDiscoveryError);
+    const issues = (captured as ModuleDiscoveryError).issues;
+    expect(issues.map((issue) => issue.code)).toEqual([code]);
+    expect(JSON.stringify(issues)).not.toContain("private-mount-5b2a");
+    expect((captured as Error).message).not.toContain("private-mount-5b2a");
+    expect(poolConstructor).not.toHaveBeenCalled();
+    expect(betterAuthMock).not.toHaveBeenCalled();
+    expect(serveMock).not.toHaveBeenCalled();
+  });
+
+  it("lets the test-only override take precedence over a configured directory", async () => {
+    const modulesDirectory = await createTemporaryModulesDirectory();
+    poolConstructor.mockImplementation(function fakePool() {
+      return { end: vi.fn().mockResolvedValue(undefined), on: vi.fn(), query: emptyQuery() };
+    });
+    betterAuthMock.mockReturnValue({ api: { getSession: vi.fn() }, handler: vi.fn() });
+    mockSuccessfulServe();
+
+    // The configured value is unusable; the override wins, so it is never even resolved.
+    const running = await startApi(validConfig(), {
+      configuredModulesDirectory: "relative/never-resolved",
+      modulesDirectoryOverride: modulesDirectory,
+    });
+
+    expect(poolConstructor).toHaveBeenCalledTimes(1);
+    await running.shutdown();
+  });
+
   it("does not perform module discovery merely by importing the platform-permissions module", async () => {
     const module = await import("../src/platform-permissions.js");
 
@@ -1022,6 +1135,30 @@ describe("Ekklesia API module runtime startup and shutdown", () => {
     expect(serveMock).not.toHaveBeenCalled();
   });
 
+  it("fails on missing Dashboard assets before importing module code and still closes startup resources", async () => {
+    const modulesDirectory = await createTemporaryModulesDirectory();
+    const recorder = createEventRecorder();
+    await createWorkingFixtureModule(modulesDirectory, "calendar", recorder);
+    const { poolEnd } = mockPoolAndAuth();
+    loadDashboardHostAssetsMock.mockRejectedValueOnce(new DashboardHostAssetError());
+
+    const failure = await startApi(validConfig(), {
+      modulesDirectoryOverride: modulesDirectory,
+    }).catch((error: unknown) => error);
+
+    expect(failure).toMatchObject({
+      code: "DASHBOARD_HOST_ASSET_UNAVAILABLE",
+      message: "The Dashboard host browser assets are unavailable.",
+      name: "DashboardHostAssetError",
+    });
+    expect((failure as Error).stack).toBe(
+      "DashboardHostAssetError: The Dashboard host browser assets are unavailable.",
+    );
+    expect(recorder.events).toEqual([]);
+    expect(poolEnd).toHaveBeenCalledTimes(1);
+    expect(serveMock).not.toHaveBeenCalled();
+  });
+
   it("does not read display-host assets when the eligible set declares no display", async () => {
     const modulesDirectory = await createTemporaryModulesDirectory();
     const recorder = createEventRecorder();
@@ -1298,9 +1435,9 @@ describe("Ekklesia API module runtime startup and shutdown", () => {
     const recorder = createEventRecorder();
     await createWorkingFixtureModule(modulesDirectory, "calendar", recorder, { withRoute: true });
     const discovered = await (await import("@ekklesia/core/modules")).discoverModules({
-      moduleSdkVersion: "0.1.0",
+      moduleSdkVersion: "0.2.0",
       modulesDirectory,
-      platformVersion: "0.1.0",
+      platformVersion: "0.2.0",
     });
     mockPoolAndAuth();
     mockSuccessfulServe();

apps/api/tests/module-configuration-routes.test.ts

@@ -6,8 +6,6 @@ import {
   createAuthenticatedPrincipal,
   type EkklesiaPrincipal,
   type ModuleConfigurationDeclarationInput,
-  type ModuleDatabase,
-  type ModuleRuntimeServices,
   parseEkklesiaUserId,
 } from "@ekklesia/contracts";
 import {
@@ -22,10 +20,12 @@ import {
   createModuleUiPublicationRegistry,
   type DiscoveredModule,
   discoverModules,
+  type LegacyModuleRuntimeServices,
   type ModuleConfigurationRecord,
   type ModuleConfigurationStore,
   ModuleConfigurationStoreError,
   EMPTY_MODULE_REALTIME_REGISTRY,
+  type ModuleDatabase,
   resolveModuleEligibility,
 } from "@ekklesia/core/modules";
 import type { Hono } from "hono";
@@ -35,6 +35,8 @@ import { CORE_MUTATION_MAX_BODY_BYTES } from "../src/body-limits.js";
 import { MODULE_CONFIGURATION_PATH } from "../src/module-configuration-routes.js";
 import { MODULE_LIFECYCLE_PATH } from "../src/module-lifecycle-routes.js";
 import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
+import { testDashboardHostAssets } from "./support/dashboard-host-assets.js";
+import { readyHealth } from "./support/ready-health.js";
 import {
   createFakeModuleSecretSource,
   createInMemoryModuleConfigurationStore,
@@ -106,7 +108,7 @@ async function createModule(modulesDirectory: string, fixture: ModuleFixture): P
         configuration: fixture.configuration ?? [],
         entrypoints: { server: "./dist/server/index.js" },
         id: fixture.id,
-        manifestVersion: 7,
+        manifestVersion: 8,
         name: `${fixture.id} module`,
         version: "1.0.0",
       }),
@@ -189,6 +191,8 @@ async function install(options: InstallOptions = {}): Promise<Installation> {
       store: authorizationStore,
     },
     dashboard: createInMemoryDashboardStore(),
+    dashboardHostAssets: testDashboardHostAssets(),
+    health: readyHealth(),
     moduleConfiguration: {
       bootSettings,
       discoveredModules: modules,
@@ -209,7 +213,7 @@ async function install(options: InstallOptions = {}): Promise<Installation> {
     moduleRealtime: EMPTY_MODULE_REALTIME_REGISTRY,
     moduleServices: Object.freeze({
       database: Object.freeze({}) as unknown as ModuleDatabase,
-    }) as ModuleRuntimeServices,
+    }) as LegacyModuleRuntimeServices,
     moduleUi: createModuleUiPublicationRegistry(eligibility.eligibleModules),
     runtime,
     trustedOrigins: [trustedOrigin],

apps/api/tests/module-database.integration.ts

@@ -8,6 +8,7 @@ import {
   createPostgresMigrationDatabase,
   discoverAllMigrations,
 } from "@ekklesia/core/migrations";
+import { moduleDatabaseExecutorModuleId } from "@ekklesia/core/modules";
 import { Client, type QueryResultRow } from "pg";
 import { afterAll, describe, expect, it } from "vitest";
 import { createApiRuntimeConfig } from "../src/config.js";
@@ -211,9 +212,9 @@ async function applyCoreMigrations(url: string): Promise<void> {
     const aggregate = await discoverAllMigrations({
       coreMigrationsDirectory,
       moduleDiscovery: {
-        moduleSdkVersion: "0.1.0",
+        moduleSdkVersion: "0.2.0",
         modulesDirectory: emptyModulesDirectory,
-        platformVersion: "0.1.0",
+        platformVersion: "0.2.0",
       },
     });
     expect(aggregate.migrations.map((entry) => entry.identity)).toEqual([
@@ -240,9 +241,9 @@ async function applyMigrationsWithModule(url: string): Promise<void> {
   const aggregate = await discoverAllMigrations({
     coreMigrationsDirectory,
     moduleDiscovery: {
-      moduleSdkVersion: "0.1.0",
+      moduleSdkVersion: "0.2.0",
       modulesDirectory: fixtureModulesDirectory,
-      platformVersion: "0.1.0",
+      platformVersion: "0.2.0",
     },
   });
   // Core migrations aggregate first, exactly once each, and always before any module migration.
@@ -441,6 +442,11 @@ describe.sequential("live API — module database explicit migration ownership",
 
       const handle = createApiDatabase(database.url);
       expect(handle.module).toBeDefined();
+      const alpha = handle.moduleExecutor("alpha");
+      const beta = handle.moduleExecutor("beta");
+      expect(alpha).not.toBe(beta);
+      expect(moduleDatabaseExecutorModuleId(alpha)).toBe("alpha");
+      expect(moduleDatabaseExecutorModuleId(beta)).toBe("beta");
       await handle.close();
       expect(await tableExists(database.url)).toBe(false);
 

apps/api/tests/module-display-routes.test.ts

@@ -5,8 +5,6 @@ import {
   ANONYMOUS_PRINCIPAL,
   createAuthenticatedPrincipal,
   type EkklesiaPrincipal,
-  type ModuleDatabase,
-  type ModuleRuntimeServices,
   parseEkklesiaUserId,
 } from "@ekklesia/contracts";
 import {
@@ -21,6 +19,8 @@ import {
   type DiscoveredModule,
   discoverModules,
   EMPTY_MODULE_REALTIME_REGISTRY,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
 } from "@ekklesia/core/modules";
 import type { Hono } from "hono";
 import { afterEach, describe, expect, it, vi } from "vitest";
@@ -38,6 +38,8 @@ import { moduleRealtimeBaseUrl } from "../src/module-realtime-routes.js";
 import { MODULE_UI_INVENTORY_PATH } from "../src/module-ui-inventory.js";
 import { moduleDisplayUiArtifactUrl } from "../src/module-ui-routes.js";
 import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
+import { testDashboardHostAssets } from "./support/dashboard-host-assets.js";
+import { readyHealth } from "./support/ready-health.js";
 import { moduleConfigurationOptionFor } from "./support/in-memory-module-configuration.js";
 import {
   createInMemoryModuleLifecycleStore,
@@ -103,7 +105,7 @@ async function createModule(modulesDirectory: string, fixture: ModuleFixture = {
           : {}),
       },
       id,
-      manifestVersion: 7,
+      manifestVersion: 8,
       name: `${id} module`,
       permissions: fixture.display
         ? [
@@ -153,7 +155,7 @@ interface Installation {
   readonly modules: readonly DiscoveredModule[];
 }
 
-function fakeServices(): ModuleRuntimeServices {
+function fakeServices(): LegacyModuleRuntimeServices {
   return Object.freeze({ database: Object.freeze({}) as unknown as ModuleDatabase });
 }
 
@@ -198,6 +200,8 @@ async function install(options: InstallOptions): Promise<Installation> {
       store: fakeAuthorizationStore(),
     },
     dashboard: createInMemoryDashboardStore(),
+    dashboardHostAssets: testDashboardHostAssets(),
+    health: readyHealth(),
     ...(moduleUi.listDisplays().length > 0 && options.withAssets !== false
       ? { displayHostAssets: options.assets ?? displayHostAssets }
       : {}),

apps/api/tests/module-http-routes.test.ts

@@ -1,13 +1,11 @@
 import {
   ANONYMOUS_PRINCIPAL,
   createAuthenticatedPrincipal,
-  type ModuleDatabase,
   type ModuleRouteHandler,
   type ModuleRouteHandlerContext,
-  type ModuleRuntimeServices,
   moduleRoutesOverlap,
-  parsePermissionId,
   type PermissionId,
+  parsePermissionId,
   type RegisteredModuleHttpRoute,
 } from "@ekklesia/contracts";
 import {
@@ -20,18 +18,23 @@ import type { EkklesiaIdentityRuntime } from "@ekklesia/core/identity";
 import {
   createModuleUiPublicationRegistry,
   EMPTY_MODULE_REALTIME_REGISTRY,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
+  type ModuleRuntimeServicesLookup,
 } from "@ekklesia/core/modules";
 import { describe, expect, it, vi } from "vitest";
-import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
 import { createApiApp } from "../src/app.js";
 import {
   canonicalizeVaryHeader,
-  mergedVaryHeader,
   ModuleRouteConfigurationError,
+  mergedVaryHeader,
 } from "../src/module-http-routes.js";
-import { emptyModuleLifecycle } from "./support/in-memory-module-lifecycle.js";
+import { testDashboardHostAssets } from "./support/dashboard-host-assets.js";
+import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
 import { emptyModuleConfiguration } from "./support/in-memory-module-configuration.js";
+import { emptyModuleLifecycle } from "./support/in-memory-module-lifecycle.js";
 import { emptyModuleStorage } from "./support/in-memory-module-storage.js";
+import { readyHealth } from "./support/ready-health.js";
 
 const trustedOrigin = "https://dashboard.example.test";
 const untrustedOrigin = "https://evil.example.test";
@@ -71,11 +74,11 @@ function moduleRoute(
   return Object.freeze({ bodyMode: "buffered", maxBodyBytes: 1024, ...fields });
 }
 
-/** A small typed fake `ModuleRuntimeServices` — these tests exercise route mounting,
+/** A small typed fake `LegacyModuleRuntimeServices` — these tests exercise route mounting,
  * authorization, and response sanitization, never real database behavior, so no PostgreSQL is
  * required. Each `database` method stays a distinct spy so a test can assert none of them were
  * ever called (denied, trusted-origin-rejected, and `OPTIONS` requests never reach a handler). */
-function fakeModuleServices(): ModuleRuntimeServices {
+function fakeModuleServices(): LegacyModuleRuntimeServices {
   const database = Object.freeze({
     delete: vi.fn(),
     execute: vi.fn(),
@@ -89,7 +92,7 @@ function fakeModuleServices(): ModuleRuntimeServices {
   return Object.freeze({ database });
 }
 
-function expectDatabaseFakeUntouched(services: ModuleRuntimeServices): void {
+function expectDatabaseFakeUntouched(services: LegacyModuleRuntimeServices): void {
   expect(vi.mocked(services.database.select)).not.toHaveBeenCalled();
   expect(vi.mocked(services.database.selectDistinct)).not.toHaveBeenCalled();
   expect(vi.mocked(services.database.selectDistinctOn)).not.toHaveBeenCalled();
@@ -105,7 +108,7 @@ function buildModuleApp(options: {
   readonly registry: PermissionRegistry;
   readonly routes: readonly RegisteredModuleHttpRoute[];
   readonly runtime?: EkklesiaIdentityRuntime;
-  readonly services?: ModuleRuntimeServices;
+  readonly services?: LegacyModuleRuntimeServices | ModuleRuntimeServicesLookup;
   readonly trustedOrigins?: readonly string[];
 }) {
   const evaluator = options.evaluator ?? {
@@ -123,6 +126,8 @@ function buildModuleApp(options: {
     moduleConfiguration: emptyModuleConfiguration(),
     moduleStorage: emptyModuleStorage(),
     dashboard: createInMemoryDashboardStore(),
+    dashboardHostAssets: testDashboardHostAssets(),
+    health: readyHealth(),
     runtime,
     trustedOrigins: options.trustedOrigins ?? [trustedOrigin],
   });
@@ -141,6 +146,36 @@ function permissionRegistry(
 }
 
 describe("module HTTP route mounting", () => {
+  it("selects the owning module's stable service entry for its handler", async () => {
+    const calendar = fakeModuleServices();
+    const people = fakeModuleServices();
+    const services: ModuleRuntimeServicesLookup = new Map([
+      ["calendar", calendar],
+      ["people", people],
+    ]);
+    let received: unknown;
+    const { app } = buildModuleApp({
+      registry: permissionRegistry([{ id: readPermission, baseline: "public" }]),
+      routes: [
+        moduleRoute({
+          handler: (_request, context) => {
+            received = context.services;
+            return Response.json({ ok: true });
+          },
+          method: "GET",
+          moduleId: "calendar",
+          path: "/services",
+          permission: readPermission,
+        }),
+      ],
+      services,
+    });
+
+    expect((await app.request("/api/v1/modules/calendar/services")).status).toBe(200);
+    expect(received).toBe(calendar);
+    expect(received).not.toBe(people);
+  });
+
   it('mounts a "/" route at exactly the module root, never with an added trailing slash', async () => {
     const handler = vi.fn<ModuleRouteHandler>(async () => new Response("root", { status: 200 }));
     const { app } = buildModuleApp({
@@ -504,7 +539,7 @@ describe("module route authorization", () => {
     expect(response.status).toBe(403);
     expect(await response.json()).toEqual({ code: "AUTHORIZATION_DENIED" });
     expect(handler).not.toHaveBeenCalled();
-    expectDatabaseFakeUntouched(services);
+    expectDatabaseFakeUntouched(services as LegacyModuleRuntimeServices);
   });
 
   it("does not invoke the handler when principal resolution fails", async () => {
@@ -633,7 +668,7 @@ describe("module route trusted-origin enforcement", () => {
     }
     expect(handler).not.toHaveBeenCalled();
     expect(evaluator.authorize).not.toHaveBeenCalled();
-    expectDatabaseFakeUntouched(services);
+    expectDatabaseFakeUntouched(services as LegacyModuleRuntimeServices);
   });
 
   it("allows a trusted-origin state-changing request through to the handler", async () => {
@@ -762,7 +797,7 @@ describe("module route CORS", () => {
 
     expect(handler).not.toHaveBeenCalled();
     expect(evaluator.authorize).not.toHaveBeenCalled();
-    expectDatabaseFakeUntouched(services);
+    expectDatabaseFakeUntouched(services as LegacyModuleRuntimeServices);
   });
 
   it("never reflects an untrusted origin for a module route", async () => {

apps/api/tests/module-lifecycle-routes.test.ts

@@ -5,8 +5,6 @@ import {
   ANONYMOUS_PRINCIPAL,
   createAuthenticatedPrincipal,
   type EkklesiaPrincipal,
-  type ModuleDatabase,
-  type ModuleRuntimeServices,
   parseEkklesiaUserId,
 } from "@ekklesia/contracts";
 import {
@@ -20,6 +18,8 @@ import {
   createModuleUiPublicationRegistry,
   type DiscoveredModule,
   discoverModules,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
   type ModuleLifecycleStore,
   ModuleLifecycleStoreError,
   EMPTY_MODULE_REALTIME_REGISTRY,
@@ -33,6 +33,8 @@ import { CORE_MUTATION_MAX_BODY_BYTES } from "../src/body-limits.js";
 import { MODULE_LIFECYCLE_PATH } from "../src/module-lifecycle-routes.js";
 import { MODULE_UI_INVENTORY_PATH } from "../src/module-ui-inventory.js";
 import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
+import { testDashboardHostAssets } from "./support/dashboard-host-assets.js";
+import { readyHealth } from "./support/ready-health.js";
 import { createInMemoryModuleLifecycleStore } from "./support/in-memory-module-lifecycle.js";
 import { moduleConfigurationOptionFor } from "./support/in-memory-module-configuration.js";
 import { moduleStorageOptionFor } from "./support/in-memory-module-storage.js";
@@ -77,7 +79,7 @@ async function createModule(modulesDirectory: string, fixture: ModuleFixture): P
         ...(fixture.dependencies ? { dependencies: fixture.dependencies } : {}),
         entrypoints: { server: "./dist/server/index.js", ui: "./dist/ui/index.js" },
         id: fixture.id,
-        manifestVersion: 7,
+        manifestVersion: 8,
         name: `${fixture.id} module`,
         version: "1.0.0",
       }),
@@ -171,6 +173,8 @@ async function install(options: InstallOptions = {}): Promise<Installation> {
       store: authorizationStore,
     },
     dashboard: createInMemoryDashboardStore(),
+    dashboardHostAssets: testDashboardHostAssets(),
+    health: readyHealth(),
     moduleConfiguration: moduleConfigurationOptionFor(modules),
     moduleStorage: moduleStorageOptionFor(modules),
     moduleLifecycle: {
@@ -185,7 +189,7 @@ async function install(options: InstallOptions = {}): Promise<Installation> {
     moduleRealtime: EMPTY_MODULE_REALTIME_REGISTRY,
     moduleServices: Object.freeze({
       database: Object.freeze({}) as unknown as ModuleDatabase,
-    }) as ModuleRuntimeServices,
+    }) as LegacyModuleRuntimeServices,
     moduleUi: createModuleUiPublicationRegistry(eligibility.eligibleModules),
     runtime,
     trustedOrigins: [trustedOrigin],

apps/api/tests/module-realtime-live.test.ts

@@ -4,9 +4,7 @@ import path from "node:path";
 import {
   ANONYMOUS_PRINCIPAL,
   createAuthenticatedPrincipal,
-  type ModuleDatabase,
   type ModuleRealtimePublisher,
-  type ModuleRuntimeServices,
   parseEkklesiaUserId,
 } from "@ekklesia/contracts";
 import {
@@ -18,6 +16,8 @@ import type { EkklesiaIdentityRuntime } from "@ekklesia/core/identity";
 import {
   composePlatformPermissionRegistry,
   discoverModules,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
   type ModuleRealtimeRegistry,
   type ModuleRealtimeSubscription,
   startDiscoveredModuleRuntime,
@@ -188,7 +188,7 @@ async function createFixtureModule(control: FixtureControl): Promise<{
         compatibility: { moduleSdk: "^0.1.0", platform: "^0.1.0" },
         entrypoints: { server: "./dist/server/index.js" },
         id: "announcements",
-        manifestVersion: 7,
+        manifestVersion: 8,
         name: "Announcements fixture",
         permissions: [
           {
@@ -226,7 +226,7 @@ async function createFixtureModule(control: FixtureControl): Promise<{
   return { directory, symbol };
 }
 
-function services(): ModuleRuntimeServices {
+function services(): LegacyModuleRuntimeServices {
   return Object.freeze({ database: Object.freeze({}) as ModuleDatabase });
 }
 

apps/api/tests/module-ui-host-e2e.test.ts

@@ -5,8 +5,6 @@ import {
   ANONYMOUS_PRINCIPAL,
   createAuthenticatedPrincipal,
   type EkklesiaPrincipal,
-  type ModuleDatabase,
-  type ModuleRuntimeServices,
   parseEkklesiaUserId,
 } from "@ekklesia/contracts";
 import {
@@ -18,6 +16,8 @@ import {
   composePlatformPermissionRegistry,
   createModuleUiPublicationRegistry,
   discoverModules,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
   startDiscoveredModuleRuntime,
 } from "@ekklesia/core/modules";
 import {
@@ -36,6 +36,8 @@ import {
 } from "@ekklesia/shell";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
+import { testDashboardHostAssets } from "./support/dashboard-host-assets.js";
+import { readyHealth } from "./support/ready-health.js";
 import { createApiApp } from "../src/app.js";
 import { createDisplayHostAssets } from "../src/display-host-assets.js";
 import {
@@ -127,7 +129,7 @@ async function createFixtureModule(
           : {}),
       },
       id,
-      manifestVersion: 7,
+      manifestVersion: 8,
       name,
       permissions: [
         {
@@ -239,7 +241,7 @@ async function startHarness(options: HarnessOptions = {}): Promise<Harness> {
     modulesDirectory,
     platformVersion: "0.1.0",
   });
-  const services: ModuleRuntimeServices = Object.freeze({
+  const services: LegacyModuleRuntimeServices = Object.freeze({
     database: Object.freeze({}) as unknown as ModuleDatabase,
   });
   // The module's real runtime: its server entrypoint is imported, registered, and started, and the
@@ -288,6 +290,8 @@ async function startHarness(options: HarnessOptions = {}): Promise<Harness> {
     moduleConfiguration: moduleConfigurationOptionFor(modules),
     moduleStorage: moduleStorageOptionFor(modules),
     dashboard: createInMemoryDashboardStore(),
+    dashboardHostAssets: testDashboardHostAssets(),
+    health: readyHealth(),
     runtime,
     trustedOrigins: ["https://dashboard.example.test"],
   });

apps/api/tests/module-ui-inventory.test.ts

@@ -5,8 +5,6 @@ import {
   ANONYMOUS_PRINCIPAL,
   createAuthenticatedPrincipal,
   type EkklesiaPrincipal,
-  type ModuleDatabase,
-  type ModuleRuntimeServices,
   parseEkklesiaUserId,
 } from "@ekklesia/contracts";
 import {
@@ -21,10 +19,14 @@ import {
   type DiscoveredModule,
   discoverModules,
   EMPTY_MODULE_REALTIME_REGISTRY,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
 } from "@ekklesia/core/modules";
 import type { Hono } from "hono";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
+import { testDashboardHostAssets } from "./support/dashboard-host-assets.js";
+import { readyHealth } from "./support/ready-health.js";
 import { createApiApp } from "../src/app.js";
 import { moduleApiBaseUrl } from "../src/module-http-routes.js";
 import { moduleRealtimeBaseUrl } from "../src/module-realtime-routes.js";
@@ -97,7 +99,7 @@ async function createModule(modulesDirectory: string, fixture: ModuleFixture): P
         version: "1.0.0",
       })),
       id: fixture.id,
-      manifestVersion: 7,
+      manifestVersion: 8,
       name: `${fixture.id} module`,
       permissions: (fixture.permissions ?? []).map((permission) => ({
         ...permission,
@@ -190,7 +192,7 @@ async function install(options: InstallOptions): Promise<Installation> {
     revokeGrant: vi.fn(),
     revokePlatformOwner: vi.fn(),
   } as unknown as AuthorizationStore;
-  const services: ModuleRuntimeServices = Object.freeze({
+  const services: LegacyModuleRuntimeServices = Object.freeze({
     database: Object.freeze({}) as unknown as ModuleDatabase,
   });
   const permissionRegistry = composePlatformPermissionRegistry(modules);
@@ -208,6 +210,8 @@ async function install(options: InstallOptions): Promise<Installation> {
     moduleConfiguration: moduleConfigurationOptionFor(modules),
     moduleStorage: moduleStorageOptionFor(modules),
     dashboard: createInMemoryDashboardStore(),
+    dashboardHostAssets: testDashboardHostAssets(),
+    health: readyHealth(),
     runtime,
     trustedOrigins: [trustedOrigin],
   });

apps/api/tests/module-ui-routes.test.ts

@@ -1,11 +1,7 @@
 import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import {
-  ANONYMOUS_PRINCIPAL,
-  type ModuleDatabase,
-  type ModuleRuntimeServices,
-} from "@ekklesia/contracts";
+import { ANONYMOUS_PRINCIPAL } from "@ekklesia/contracts";
 import type { AuthorizationEvaluator, AuthorizationStore } from "@ekklesia/core/authorization";
 import type { EkklesiaIdentityRuntime } from "@ekklesia/core/identity";
 import {
@@ -14,6 +10,8 @@ import {
   type DiscoveredModule,
   discoverModules,
   EMPTY_MODULE_REALTIME_REGISTRY,
+  type LegacyModuleRuntimeServices,
+  type ModuleDatabase,
 } from "@ekklesia/core/modules";
 import { loadModuleUi } from "@ekklesia/module-ui-host";
 import { MODULE_UI_ABI_VERSION, NO_MODULE_UI_CONTRIBUTIONS } from "@ekklesia/module-ui-sdk";
@@ -21,6 +19,8 @@ import { Window } from "happy-dom";
 import type { Hono } from "hono";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { createInMemoryDashboardStore } from "./support/in-memory-dashboard-store.js";
+import { testDashboardHostAssets } from "./support/dashboard-host-assets.js";
+import { readyHealth } from "./support/ready-health.js";
 import { createApiApp } from "../src/app.js";
 import { createDisplayHostAssets } from "../src/display-host-assets.js";
 import {
@@ -137,7 +137,7 @@ async function createModule(modulesDirectory: string, fixture: ModuleFixture): P
         version: "1.0.0",
       })),
       id: fixture.id,
-      manifestVersion: 7,
+      manifestVersion: 8,
       name: `${fixture.id} module`,
       permissions:
         fixture.display === undefined
@@ -213,7 +213,7 @@ async function install(
       : modules.filter((module) => publicationModuleIds.includes(module.manifest.id));
 
   const database = Object.freeze({}) as unknown as ModuleDatabase;
-  const services: ModuleRuntimeServices = Object.freeze({ database });
+  const services: LegacyModuleRuntimeServices = Object.freeze({ database });
   const runtime: EkklesiaIdentityRuntime = {
     handleAuthRequest: vi.fn().mockResolvedValue(new Response(null, { status: 200 })),
     // Anonymous, and every authorization decision denied: whatever this route does, it does it
@@ -255,6 +255,8 @@ async function install(
     moduleConfiguration: moduleConfigurationOptionFor(modules),
     moduleStorage: moduleStorageOptionFor(modules),
     dashboard: createInMemoryDashboardStore(),
+    dashboardHostAssets: testDashboardHostAssets(),
+    health: readyHealth(),
     runtime,
     trustedOrigins: [trustedOrigin],
   });

apps/api/tests/support/dashboard-host-assets.ts

@@ -0,0 +1,13 @@
+import {
+  createDashboardHostAssets,
+  type DashboardHostAssets,
+} from "../../src/dashboard-host-assets.js";
+
+/** A small, internally consistent Dashboard snapshot for compositions whose tests do not exercise
+ * the Dashboard host. Its own behavior is tested in `../dashboard-host-routes.test.ts`. */
+export function testDashboardHostAssets(): DashboardHostAssets {
+  return createDashboardHostAssets(
+    '<!doctype html><div id="ekklesia-host"></div><script src="/assets/ekklesia-dashboard/app.js" type="module"></script>',
+    "export const dashboardHost = true;\n",
+  );
+}

apps/api/tests/support/ready-health.ts

@@ -0,0 +1,10 @@
+import type { ApiHealthOptions } from "../../src/health-routes.js";
+
+/** Readiness inputs for a composition whose tests do not exercise health: the database answers and
+ * module startup has completed. Health behavior itself is tested in `../health-routes.test.ts`. */
+export function readyHealth(): ApiHealthOptions {
+  return {
+    checkDatabase: async () => undefined,
+    isModuleStartupComplete: () => true,
+  };
+}

core/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@ekklesia/core",
-  "version": "0.1.0",
+  "version": "0.2.2",
+  "license": "AGPL-3.0-or-later",
   "private": true,
   "type": "module",
   "files": [

core/src/cli/doctor.ts

@@ -8,6 +8,7 @@ import {
   formatDoctorReport,
 } from "../diagnostics/index.js";
 import { type HostEnvironment, loadHostConfiguration } from "../host/index.js";
+import { type ModulesDirectorySelection, resolveModulesDirectory } from "../modules/index.js";
 
 interface ModuleSdkPackageDocument {
   readonly version?: unknown;
@@ -25,8 +26,10 @@ interface RootPackageDocument extends ModuleSdkPackageDocument {
  */
 export interface DoctorCommandMetadata {
   readonly moduleSdkVersion: string;
-  readonly modulesDirectory: string;
   readonly platformVersion: string;
+  /** Where the platform is installed: Core's migrations live beneath it, and so does the
+   * development default modules directory. Installed modules may live anywhere else. */
+  readonly repositoryRoot: string;
   readonly runtimeRange: string;
   readonly runtimeVersion: string;
 }
@@ -49,6 +52,22 @@ function requiredString(value: unknown): string {
   return value;
 }
 
+/**
+ * The modules directory exactly as `startApi` would choose it. An unusable configured value is not
+ * thrown here, because Doctor must still produce a report: it is handed on as a required directory
+ * for discovery to refuse, which reports it as a sanitized module-discovery failure.
+ */
+function doctorModulesDirectory(
+  configured: string | undefined,
+  repositoryRoot: string,
+): ModulesDirectorySelection {
+  try {
+    return resolveModulesDirectory({ configured, repositoryRoot });
+  } catch {
+    return { modulesDirectory: configured ?? "", modulesDirectoryRequired: true };
+  }
+}
+
 /**
  * Turns one deployment environment into Doctor's inputs.
  *
@@ -69,6 +88,7 @@ export function createDoctorOptions(
   const host = loadHostConfiguration(environment);
   return {
     clientAddress: host.clientAddress,
+    coreMigrationsDirectory: path.join(metadata.repositoryRoot, "core", "drizzle"),
     databaseEnvironment: host.environment,
     databaseTransport: host.databaseTransport,
     databaseUrl: host.databaseUrl,
@@ -76,7 +96,7 @@ export function createDoctorOptions(
     mailConfiguration: host.mail,
     moduleDiscovery: {
       moduleSdkVersion: metadata.moduleSdkVersion,
-      modulesDirectory: metadata.modulesDirectory,
+      ...doctorModulesDirectory(host.modulesDirectory, metadata.repositoryRoot),
       platformVersion: metadata.platformVersion,
     },
     moduleSecrets: host.moduleSecrets,
@@ -97,8 +117,8 @@ export async function runDoctorCommand(repositoryRoot = process.cwd()): Promise<
   const report = await diagnoseEkklesia(
     createDoctorOptions(process.env, {
       moduleSdkVersion: requiredString(moduleSdkPackage.version),
-      modulesDirectory: path.join(repositoryRoot, "modules"),
       platformVersion: requiredString(rootPackage.version),
+      repositoryRoot,
       runtimeRange: requiredString(rootPackage.engines?.node),
       runtimeVersion: process.versions.node,
     }),

core/src/cli/migration-command-support.ts

@@ -1,7 +1,9 @@
 import { readFile } from "node:fs/promises";
 import path from "node:path";
+import type { HostEnvironment } from "../host/index.js";
 import { discoverAllMigrations } from "../migrations/index.js";
 import type { ModuleMigrationAggregate } from "../modules/index.js";
+import { resolveCommandModulesDirectory } from "./modules-directory-environment.js";
 
 interface PackageVersion {
   readonly version?: unknown;
@@ -15,9 +17,16 @@ async function readPackageVersion(packagePath: string): Promise<string> {
   return packageData.version;
 }
 
+/**
+ * Core's migrations come from the platform (`<repositoryRoot>/core/drizzle`); installed modules'
+ * come from the configured modules directory, wherever it is (ADR 0048). Neither is ever derived
+ * from the other.
+ */
 export async function discoverRepositoryMigrations(
   repositoryRoot = process.cwd(),
+  environment: HostEnvironment = process.env,
 ): Promise<ModuleMigrationAggregate> {
+  const modulesDirectory = resolveCommandModulesDirectory(environment, repositoryRoot);
   const [platformVersion, moduleSdkVersion] = await Promise.all([
     readPackageVersion(path.join(repositoryRoot, "package.json")),
     readPackageVersion(path.join(repositoryRoot, "packages/module-sdk/package.json")),
@@ -27,7 +36,7 @@ export async function discoverRepositoryMigrations(
     coreMigrationsDirectory: path.join(repositoryRoot, "core", "drizzle"),
     moduleDiscovery: {
       moduleSdkVersion,
-      modulesDirectory: path.join(repositoryRoot, "modules"),
+      ...modulesDirectory,
       platformVersion,
     },
   });

core/src/cli/migration-report.ts

@@ -1,5 +1,9 @@
 import type { ModuleMigrationAggregate } from "../modules/index.js";
-import type { MigrationApplyResult, MigrationPlanResult } from "../migrations/index.js";
+import type {
+  MigrationApplyResult,
+  MigrationPlanResult,
+  RetainedMigrationHistory,
+} from "../migrations/index.js";
 
 function plural(count: number, singular: string): string {
   return count === 1 ? singular : `${singular}s`;
@@ -28,10 +32,19 @@ export function formatMigrationValidationReport(
   return Object.freeze(lines);
 }
 
+/** An absent module's applied history (ADR 0048): kept, reported, and never a reason to stop. */
+function retainedLines(retained: readonly RetainedMigrationHistory[]): readonly string[] {
+  return retained.map(
+    (module) =>
+      `- [retained] ${module.moduleId}: ${module.appliedCount} applied ${plural(module.appliedCount, "migration")} kept; the module is not installed`,
+  );
+}
+
 export function formatMigrationPlanReport(plan: MigrationPlanResult): readonly string[] {
   const readyCount = plan.pendingCount - plan.approvalRequiredCount;
+  const retainedSummary = plan.retained.length === 0 ? "" : `, ${plan.retained.length} retained`;
   const lines = [
-    `Migration plan (${plan.appliedCount} applied, ${readyCount} pending, ${plan.approvalRequiredCount} approval-blocked):`,
+    `Migration plan (${plan.appliedCount} applied, ${readyCount} pending, ${plan.approvalRequiredCount} approval-blocked${retainedSummary}):`,
   ];
 
   for (const entry of plan.entries) {
@@ -40,6 +53,7 @@ export function formatMigrationPlanReport(plan: MigrationPlanResult): readonly s
   if (plan.entries.length === 0) {
     lines.push("- No installed module migrations.");
   }
+  lines.push(...retainedLines(plan.retained));
   lines.push(
     "Informational only: this plan is read-only and may become stale; apply revalidates history under the migration lock.",
   );
@@ -49,7 +63,10 @@ export function formatMigrationPlanReport(plan: MigrationPlanResult): readonly s
 
 export function formatMigrationApplyReport(result: MigrationApplyResult): readonly string[] {
   if (result.noOp) {
-    return Object.freeze(["Migration apply completed: database is already current (no changes)."]);
+    return Object.freeze([
+      "Migration apply completed: database is already current (no changes).",
+      ...retainedLines(result.retained),
+    ]);
   }
 
   const lines = [
@@ -58,5 +75,6 @@ export function formatMigrationApplyReport(result: MigrationApplyResult): readon
   for (const migration of result.applied) {
     lines.push(`- ${migration.identity} sha256=${migration.checksum}`);
   }
+  lines.push(...retainedLines(result.retained));
   return Object.freeze(lines);
 }

core/src/cli/modules-directory-environment.ts

@@ -0,0 +1,17 @@
+import { type HostEnvironment, loadHostConfiguration } from "../host/index.js";
+import { type ModulesDirectorySelection, resolveModulesDirectory } from "../modules/index.js";
+
+/**
+ * The modules directory an operator command discovers, read through the same host configuration
+ * `startApi` and Doctor use and resolved by the one Core resolver (ADR 0048). Throws the resolver's
+ * sanitized `ModuleDiscoveryError` for an unusable value, which every command already reports.
+ */
+export function resolveCommandModulesDirectory(
+  environment: HostEnvironment,
+  repositoryRoot: string,
+): ModulesDirectorySelection {
+  return resolveModulesDirectory({
+    configured: loadHostConfiguration(environment).modulesDirectory,
+    repositoryRoot,
+  });
+}

core/src/cli/set-module-enabled.ts

@@ -12,6 +12,7 @@ import {
   resolveModuleEligibility,
 } from "../modules/index.js";
 import { resolveExecutableDatabaseTransport } from "./database-transport-environment.js";
+import { resolveCommandModulesDirectory } from "./modules-directory-environment.js";
 
 /**
  * Enables or disables one installed module, out of band from the running API.
@@ -99,7 +100,7 @@ async function main(): Promise<void> {
   // configurable here, which is the case this command exists for.
   const discovered = await discoverModules({
     moduleSdkVersion,
-    modulesDirectory: path.join(repositoryRoot, "modules"),
+    ...resolveCommandModulesDirectory(process.env, repositoryRoot),
     platformVersion,
   });
   if (!discovered.some((module) => module.manifest.id === moduleId)) {

core/src/cli/validate-modules.ts

@@ -9,6 +9,7 @@ import {
   ModulePermissionCompositionError,
   ModuleSchemaDiscoveryError,
 } from "../modules/index.js";
+import { resolveCommandModulesDirectory } from "./modules-directory-environment.js";
 
 interface PackageVersion {
   version?: unknown;
@@ -30,7 +31,7 @@ async function main(): Promise<void> {
   ]);
   const schemaAggregate = await discoverModuleSchemas({
     moduleSdkVersion,
-    modulesDirectory: path.join(repositoryRoot, "modules"),
+    ...resolveCommandModulesDirectory(process.env, repositoryRoot),
     platformVersion,
   });
   const modules = schemaAggregate.discoveredModules;

core/src/cli/verify-module-package.ts

@@ -0,0 +1,188 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+import {
+  type ModulePackagePlatform,
+  ModulePackageVerificationError,
+  verifyModulePackage,
+} from "../modules/index.js";
+
+/**
+ * `verify-module-package` — verifies an Ekklesia Module Package v1 archive against this platform
+ * (ADR 0049), and never installs it.
+ *
+ *   node core/dist/cli/verify-module-package.js <archive>
+ *     [--sha256 <hex> | --sha256-file <file>]   the archive's expected SHA-256
+ *     [--extract-to <new directory>]            write the verified module directory there
+ *
+ * Run from the platform's root (`/opt/ekklesia` in the image), like every operator command: the
+ * platform's own versions are read from there. `--extract-to` writes only after every check passed,
+ * into a directory that must not exist yet; it is the staging step of an installation, not the
+ * installation itself.
+ */
+
+class VerifyArgumentsError extends Error {}
+
+const USAGE =
+  "Usage: verify-module-package <archive> [--sha256 <hex> | --sha256-file <file>] [--extract-to <new directory>]";
+export const MODULE_VERIFIER_SCRATCH_ENV = "EKKLESIA_MODULE_VERIFIER_SCRATCH_DIR";
+
+export interface VerifyModulePackageArguments {
+  readonly archivePath: string;
+  readonly expectedSha256?: string;
+  readonly sha256File?: string;
+  readonly extractTo?: string;
+}
+
+function normalizedDigest(value: string): string {
+  const digest = value.trim().toLowerCase();
+  if (!/^[0-9a-f]{64}$/u.test(digest)) {
+    throw new VerifyArgumentsError("The SHA-256 must be 64 hexadecimal characters.");
+  }
+  return digest;
+}
+
+export function parseVerifyModulePackageArguments(
+  argv: readonly string[],
+): VerifyModulePackageArguments {
+  const positional: string[] = [];
+  const options = new Map<string, string>();
+  for (let index = 0; index < argv.length; index += 1) {
+    const argument = argv[index] ?? "";
+    if (argument.startsWith("--")) {
+      if (!["--sha256", "--sha256-file", "--extract-to"].includes(argument)) {
+        throw new VerifyArgumentsError(USAGE);
+      }
+      const value = argv[index + 1];
+      if (value === undefined || value.startsWith("--") || options.has(argument)) {
+        throw new VerifyArgumentsError(USAGE);
+      }
+      options.set(argument, value);
+      index += 1;
+    } else {
+      positional.push(argument);
+    }
+  }
+  const archivePath = positional[0];
+  if (positional.length !== 1 || archivePath === undefined || archivePath === "") {
+    throw new VerifyArgumentsError(USAGE);
+  }
+  if (options.has("--sha256") && options.has("--sha256-file")) {
+    throw new VerifyArgumentsError(USAGE);
+  }
+  const sha256 = options.get("--sha256");
+  const sha256File = options.get("--sha256-file");
+  const extractTo = options.get("--extract-to");
+  return {
+    archivePath,
+    ...(sha256 === undefined ? {} : { expectedSha256: normalizedDigest(sha256) }),
+    ...(sha256File === undefined ? {} : { sha256File }),
+    ...(extractTo === undefined ? {} : { extractTo }),
+  };
+}
+
+/** The `sha256sum` format: one line, the digest, whitespace, and a file name that is never trusted. */
+export function parseSha256File(contents: string): string {
+  const lines = contents.split("\n").filter((line) => line.trim() !== "");
+  const match = lines.length === 1 ? /^([0-9a-fA-F]{64})\s+\*?\S/u.exec(lines[0] ?? "") : null;
+  if (!match?.[1]) {
+    throw new VerifyArgumentsError("The SHA-256 file must hold one sha256sum line.");
+  }
+  return match[1].toLowerCase();
+}
+
+/** The CLI's operator-facing bridge to Core's otherwise explicit verifier option. */
+export function moduleVerifierScratchDirectory(environment: NodeJS.ProcessEnv): string | undefined {
+  const configured = environment[MODULE_VERIFIER_SCRATCH_ENV];
+  if (configured === undefined) return undefined;
+  if (configured === "" || !path.isAbsolute(configured)) {
+    throw new VerifyArgumentsError(`${MODULE_VERIFIER_SCRATCH_ENV} must be an absolute path.`);
+  }
+  return configured;
+}
+
+async function readJson(file: string): Promise<Record<string, unknown>> {
+  return JSON.parse(await readFile(file, "utf8")) as Record<string, unknown>;
+}
+
+function requiredString(value: unknown): string {
+  if (typeof value !== "string" || value === "") {
+    throw new VerifyArgumentsError("The platform's own package metadata could not be read.");
+  }
+  return value;
+}
+
+/** What this platform is, read from where it is installed. The transitional database runtime is
+ * the Drizzle version Core itself depends on (ADR 0049). */
+export async function readModulePackagePlatform(
+  repositoryRoot: string,
+): Promise<ModulePackagePlatform> {
+  const [root, sdk, core] = await Promise.all([
+    readJson(path.join(repositoryRoot, "package.json")),
+    readJson(path.join(repositoryRoot, "packages", "module-sdk", "package.json")),
+    readJson(path.join(repositoryRoot, "core", "package.json")),
+  ]);
+  const dependencies = core.dependencies as Record<string, unknown> | undefined;
+  return {
+    databaseRuntime: { "drizzle-orm": requiredString(dependencies?.["drizzle-orm"]) },
+    moduleSdkVersion: requiredString(sdk.version),
+    platformVersion: requiredString(root.version),
+  };
+}
+
+async function main(): Promise<void> {
+  const parsed = parseVerifyModulePackageArguments(process.argv.slice(2));
+  const executionScratchDirectory = moduleVerifierScratchDirectory(process.env);
+  let expectedSha256 = parsed.expectedSha256;
+  if (parsed.sha256File !== undefined) {
+    let contents: string;
+    try {
+      contents = await readFile(parsed.sha256File, "utf8");
+    } catch {
+      throw new VerifyArgumentsError("The SHA-256 file could not be read.");
+    }
+    expectedSha256 = parseSha256File(contents);
+  }
+  const platform = await readModulePackagePlatform(process.cwd()).catch(() => {
+    throw new VerifyArgumentsError("The platform's own package metadata could not be read.");
+  });
+  const result = await verifyModulePackage({
+    archivePath: parsed.archivePath,
+    platform,
+    ...(executionScratchDirectory === undefined ? {} : { executionScratchDirectory }),
+    ...(expectedSha256 === undefined ? {} : { expectedSha256 }),
+    ...(parsed.extractTo === undefined ? {} : { extractTo: parsed.extractTo }),
+  });
+  console.log(
+    `Module package verified: ${result.moduleId}@${result.version} (target ${result.target}), ${result.fileCount} files, sha256 ${result.archiveSha256}.`,
+  );
+  if (expectedSha256 === undefined) {
+    console.log("The archive's SHA-256 was not checked: no expected digest was given.");
+  }
+  if (parsed.extractTo !== undefined) {
+    console.log("The verified module directory was extracted. Nothing was installed.");
+  }
+}
+
+function isDirectExecution(): boolean {
+  const entrypoint = process.argv[1];
+  return (
+    entrypoint !== undefined && import.meta.url === pathToFileURL(path.resolve(entrypoint)).href
+  );
+}
+
+if (isDirectExecution()) {
+  main().catch((error: unknown) => {
+    if (error instanceof ModulePackageVerificationError) {
+      console.error(`[${error.code}] ${error.message}`);
+      if (error.issueCodes.length > 0) {
+        console.error(`Module validation issues: ${error.issueCodes.join(", ")}`);
+      }
+    } else if (error instanceof VerifyArgumentsError) {
+      console.error(error.message);
+    } else {
+      console.error("Module package verification failed unexpectedly.");
+    }
+    process.exitCode = 1;
+  });
+}

core/src/diagnostics/doctor.ts

@@ -1,4 +1,3 @@
-import path from "node:path";
 import {
   capabilityIdSchema,
   EMPTY_MODULE_SECRET_SOURCE,
@@ -43,6 +42,7 @@ import {
 } from "../mail/index.js";
 import {
   createPostgresMigrationDatabase,
+  type DiscoverAllMigrationsOptions,
   discoverAllMigrations,
   type MigrationDatabase,
   type MigrationPlanResult,
@@ -64,6 +64,7 @@ import {
   isConfigurationBlockedDetail,
   isStorageBlockedDetail,
   type ModuleConfigurationSettings,
+  ModuleDiscoveryError,
   type ModuleDiscoveryOptions,
   type ModuleEligibility,
   type ModuleLifecycleConfiguration,
@@ -126,6 +127,9 @@ export interface DoctorIdentityConfigurationOptions {
 
 export interface DoctorOptions {
   readonly clientAddress?: ClientAddressConfigInput | undefined;
+  /** Core's own migrations, where the platform is installed. Never derived from the modules
+   * directory: installed modules live in installation-owned storage, anywhere at all (ADR 0048). */
+  readonly coreMigrationsDirectory: string;
   /** The environment the executable resolved, used only for transport policy evaluation; identity
    * configuration keeps its own `identityConfiguration.environment` for the same purpose. */
   readonly databaseEnvironment?: DatabaseTransportEnvironment | undefined;
@@ -170,7 +174,7 @@ export interface DoctorDependencies {
     options: PostgresMigrationDatabaseOptions,
   ) => MigrationDatabase;
   readonly discoverMigrations: (
-    options: ModuleDiscoveryOptions,
+    options: DiscoverAllMigrationsOptions,
   ) => Promise<ModuleMigrationAggregate>;
   readonly discoverModules: (
     options: ModuleDiscoveryOptions,
@@ -207,15 +211,6 @@ const checksumPattern = /^[a-f0-9]{64}$/u;
 const migrationIdentityPattern =
   /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*:\d{4,}_[a-z][a-z0-9]*(?:_[a-z0-9]+)*$/u;
 
-async function discoverAllMigrationsForRuntime(
-  options: ModuleDiscoveryOptions,
-): Promise<ModuleMigrationAggregate> {
-  return discoverAllMigrations({
-    coreMigrationsDirectory: path.join(path.dirname(options.modulesDirectory), "core", "drizzle"),
-    moduleDiscovery: options,
-  });
-}
-
 /** Opens its own short-lived connection, reads, and always closes it — Doctor never leaves a pool
  * behind, and never shares one with the migration planner's, whose lifetime it does not control. */
 async function readModuleLifecycleForRuntime(
@@ -273,7 +268,7 @@ async function probeMailForRuntime(config: MailProviderConfig): Promise<void> {
 const productionDependencies: DoctorDependencies = Object.freeze({
   composePermissions: composePlatformPermissionRegistry,
   createMigrationDatabase: createPostgresMigrationDatabase,
-  discoverMigrations: discoverAllMigrationsForRuntime,
+  discoverMigrations: discoverAllMigrations,
   discoverModules,
   discoverSchemas: discoverModuleSchemas,
   planMigrations: planModuleMigrations,
@@ -633,11 +628,23 @@ function storageBindingsCheck(
     details,
   );
 }
+function moduleDiscoveryFailureDetail(error: unknown): string {
+  if (!(error instanceof ModuleDiscoveryError)) {
+    return "Static module discovery could not be completed.";
+  }
+  // The modules directory itself, rather than anything in it (ADR 0048). Fixed wording, never the
+  // configured value: a path is machine detail.
+  if (error.issues.some((issue) => issue.code === "MODULES_DIRECTORY_INVALID")) {
+    return "The configured modules directory is not usable.";
+  }
+  if (error.issues.some((issue) => issue.code === "MODULES_DIRECTORY_UNREADABLE")) {
+    return "The configured modules directory could not be read.";
+  }
+  return "The installed module inventory is invalid.";
+}
+
 function moduleDiscoveryFailure(error: unknown): DoctorCheck {
-  const details =
-    error instanceof Error && error.name === "ModuleDiscoveryError"
-      ? ["The installed module inventory is invalid."]
-      : ["Static module discovery could not be completed."];
+  const details = [moduleDiscoveryFailureDetail(error)];
   return freezeCheck("modules.discovery", "failure", "Module discovery failed", details);
 }
 
@@ -733,6 +740,14 @@ function migrationPlanCheck(plan: MigrationPlanResult): DoctorCheck {
       }
       return `${entry.status} · ${safeMigrationReference(entry.identity, entry.checksum)}`;
     }),
+    // An absent module's applied history (ADR 0048) is information, never attention: removing a
+    // module's code keeps its data, and nothing here is pending.
+    ...plan.retained.map((module) => {
+      if (!/^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/u.test(module.moduleId)) {
+        throw new TypeError("Unsafe migration plan diagnostic value.");
+      }
+      return `retained · ${module.moduleId} · ${module.appliedCount} applied ${plural(module.appliedCount, "migration")} kept; the module is not installed`;
+    }),
   ];
 
   if (pendingCount + blockedCount === 0) {
@@ -757,6 +772,35 @@ function identitySchemaSummary(): string {
   return `Core identity schema defines ${tableNames.length} ${plural(tableNames.length, "table")} (${tableNames.join(", ")}).`;
 }
 
+/**
+ * A heuristic for "same site" between two canonical origins, for a warning only (ADR 0045).
+ *
+ * The same hostname on another port is the same site. Otherwise the two hostnames must be siblings:
+ * identical after their first label, with that parent itself holding at least one dot
+ * (`dash.example.org` and `api.example.org`). Without the Public Suffix List this can be wrong in
+ * both directions for unusual names, which is why its result is a warning and never a failure.
+ */
+function plausiblySameSite(dashboardOrigin: string, apiOrigin: string): boolean {
+  const dashboard = new URL(dashboardOrigin).hostname;
+  const api = new URL(apiOrigin).hostname;
+  if (dashboard === api) {
+    return true;
+  }
+  // An IP address is a site of its own; two different ones never share one.
+  const isIpAddress = (hostname: string): boolean =>
+    hostname.startsWith("[") || /^[0-9]+(\.[0-9]+){3}$/u.test(hostname);
+  if (isIpAddress(dashboard) || isIpAddress(api)) {
+    return false;
+  }
+  const parent = (hostname: string): string => hostname.slice(hostname.indexOf(".") + 1);
+  return (
+    dashboard.includes(".") &&
+    api.includes(".") &&
+    parent(dashboard) === parent(api) &&
+    parent(dashboard).includes(".")
+  );
+}
+
 /**
  * Pure configuration validation only: never constructs Better Auth, never opens a database
  * connection, and never prints the configured secret, base URL, or trusted origins. Missing
@@ -769,6 +813,7 @@ function identityConfigurationCheck(
   const hasAnyValue =
     input?.secret !== undefined ||
     input?.baseUrl !== undefined ||
+    (input?.dashboardOrigin ?? "") !== "" ||
     input?.publicSignupEnabled !== undefined ||
     (input?.trustedOrigins?.length ?? 0) > 0;
 
@@ -783,17 +828,43 @@ function identityConfigurationCheck(
     const config = createIdentityConfig(
       {
         baseUrl: input?.baseUrl,
+        // Validated exactly as the API validates it at startup, so a Dashboard origin the API would
+        // refuse (untrusted, insecure, malformed) fails here first.
+        dashboardOrigin: input?.dashboardOrigin,
         publicSignupEnabled: input?.publicSignupEnabled,
         secret: input?.secret,
         trustedOrigins: input?.trustedOrigins,
       },
       { environment: input?.environment ?? "production" },
     );
+    const signupDetail = config.publicSignupEnabled
+      ? "Public signup is explicitly ENABLED."
+      : "Public signup is disabled (safe default).";
+    if (config.dashboardOrigin === config.baseUrl) {
       return freezeCheck("identity.configuration", "pass", "Identity configuration valid", [
         schemaDetail,
-      config.publicSignupEnabled
-        ? "Public signup is explicitly ENABLED."
-        : "Public signup is disabled (safe default).",
+        signupDetail,
+        "Topology: same-origin (the Dashboard is served from the API's origin).",
+      ]);
+    }
+    const topologyDetail = "Topology: split (the Dashboard and the API are on separate origins).";
+    if (!plausiblySameSite(config.dashboardOrigin, config.baseUrl)) {
+      return freezeCheck(
+        "identity.configuration",
+        "warning",
+        "Identity configuration valid; split origins may not share a site",
+        [
+          schemaDetail,
+          signupDetail,
+          topologyDetail,
+          "The Dashboard and API hostnames are not siblings under one parent domain. Browsers send the session cookie across split origins only within one registrable domain (ADR 0045); Doctor cannot check the Public Suffix List, so confirm it.",
+        ],
+      );
+    }
+    return freezeCheck("identity.configuration", "pass", "Identity configuration valid", [
+      schemaDetail,
+      signupDetail,
+      topologyDetail,
     ]);
   } catch (error) {
     const code =
@@ -849,17 +920,25 @@ function databaseTransportCheck(
   }
 }
 
+/** Doctor reads only its own process's environment, so it says so: run as the reference
+ * deployment's `migrate`, it is given the API's values by the proxy overlay, but run any other way
+ * it may be checking a configuration the API is not running. */
+const CLIENT_ADDRESS_SCOPE =
+  "Checked: the environment Doctor runs with. In the reference deployment `migrate` is given the API's client-address values; a running API's own value is shown by `docker compose exec api printenv EKKLESIA_CLIENT_ADDRESS_MODE`.";
+
 function clientAddressCheck(input: ClientAddressConfigInput | undefined): DoctorCheck {
   try {
     const config = createClientAddressConfig(input, TRUSTED_CLIENT_ADDRESS_HEADER);
     if (config.mode === "direct") {
       return freezeCheck("identity.client-address", "pass", "Direct client-address mode", [
         "Trusts only the actual immediate socket peer for rate limiting; no forwarded header is trusted.",
+        CLIENT_ADDRESS_SCOPE,
       ]);
     }
     return freezeCheck("identity.client-address", "pass", "Trusted-proxy client-address mode", [
       `Trusts header "${config.header}" only from a request whose immediate socket peer matches one of ${config.trustedProxies.length} configured trusted ${plural(config.trustedProxies.length, "proxy")}.`,
       "The reverse proxy must overwrite (never append to) this header, and the origin must not be reachable except through it.",
+      CLIENT_ADDRESS_SCOPE,
     ]);
   } catch (error) {
     const code =
@@ -870,7 +949,7 @@ function clientAddressCheck(input: ClientAddressConfigInput | undefined): Doctor
       "identity.client-address",
       "failure",
       "Client-address configuration invalid",
-      [`[${code}] Configured client-address values failed validation.`],
+      [`[${code}] Configured client-address values failed validation.`, CLIENT_ADDRESS_SCOPE],
     );
   }
 }
@@ -1068,7 +1147,10 @@ export async function diagnoseEkklesia(
     }
 
     try {
-      migrations = await dependencies.discoverMigrations(options.moduleDiscovery);
+      migrations = await dependencies.discoverMigrations({
+        coreMigrationsDirectory: options.coreMigrationsDirectory,
+        moduleDiscovery: options.moduleDiscovery,
+      });
       const inventory = migrations.migrations.map((migration) =>
         safeMigrationReference(migration.identity, migration.checksum),
       );

core/src/host/configuration.ts

@@ -59,6 +59,10 @@ export interface HostConfiguration {
   /** The deployment's module secrets, resolvable only under names Core derives from a module's own
    * declared keys — there is no arbitrary variable lookup. */
   readonly moduleSecrets: ModuleSecretSource;
+  /** `EKKLESIA_MODULES_DIR`, raw and unvalidated: `undefined` only when the variable is unset. Every
+   * executable passes it to `resolveModulesDirectory`, the one place it is interpreted (ADR 0048),
+   * so a relative or blank value is refused there rather than repaired here. */
+  readonly modulesDirectory: string | undefined;
   readonly storage: StorageProviderConfigInput;
 }
 
@@ -144,6 +148,7 @@ export function loadHostConfiguration(environment: HostEnvironment): HostConfigu
       username: environment.EKKLESIA_SMTP_USERNAME,
     },
     moduleSecrets: createEnvironmentModuleSecretSource(environment),
+    modulesDirectory: environment.EKKLESIA_MODULES_DIR,
     // The `S3_*` names ADR 0004 already established for this repository's Compose stack. Absent
     // endpoint means this installation has no object storage, which is a complete deployment
     // (ADR 0030).

core/src/migrations/runner.ts

@@ -2,6 +2,7 @@ import type {
   DiscoveredModuleMigration,
   ModuleMigrationAggregate,
 } from "../modules/migration-discovery.js";
+import { CORE_MIGRATION_SOURCE_ID } from "./core-source.js";
 
 const DEFAULT_MIGRATION_LOCK_TIMEOUT_MS = 10_000;
 
@@ -86,11 +87,24 @@ export interface MigrationPlanEntry {
   readonly tag: string;
 }
 
+/**
+ * Applied history kept for a module that is not installed (ADR 0048): the module id and how many of
+ * its migrations were applied. It is reported, never matched against an inventory, and never a
+ * reason to refuse planning or applying anything else.
+ */
+export interface RetainedMigrationHistory {
+  readonly appliedCount: number;
+  readonly moduleId: string;
+}
+
 export interface MigrationPlanResult {
   readonly appliedCount: number;
   readonly approvalRequiredCount: number;
   readonly entries: readonly MigrationPlanEntry[];
   readonly pendingCount: number;
+  /** Absent modules' applied history, ordered by module id; empty when every applied migration
+   * belongs to Core or an installed module. */
+  readonly retained: readonly RetainedMigrationHistory[];
 }
 
 export interface AppliedMigrationResult {
@@ -105,6 +119,8 @@ export interface MigrationApplyResult {
   readonly applied: readonly AppliedMigrationResult[];
   readonly appliedCount: number;
   readonly noOp: boolean;
+  /** The same report as `MigrationPlanResult.retained`, read under the migration lock. */
+  readonly retained: readonly RetainedMigrationHistory[];
 }
 
 export interface PlanModuleMigrationsOptions {
@@ -204,10 +220,38 @@ function validateHistoryRecordShape(record: AppliedMigrationRecord): void {
   }
 }
 
+interface ValidatedAppliedHistory {
+  /** Identities of applied migrations that belong to Core or an installed module. */
+  readonly applied: ReadonlySet<string>;
+  readonly retained: readonly RetainedMigrationHistory[];
+}
+
+/**
+ * Every module id this inventory treats as installed: each discovered module, whether or not it
+ * owns migrations, every module that contributed migrations, and always Core. A module counts as
+ * absent only when it is none of these, so a module that is installed but no longer ships its old
+ * migrations stays strict, and Core's history can never be classified as an absent module's.
+ */
+function installedMigrationSources(aggregate: ModuleMigrationAggregate): ReadonlySet<string> {
+  return new Set<string>([
+    CORE_MIGRATION_SOURCE_ID,
+    ...aggregate.discoveredModules.map((module) => module.manifest.id),
+    ...aggregate.modules.map((module) => module.moduleId),
+  ]);
+}
+
+function freezeRetained(counts: ReadonlyMap<string, number>): readonly RetainedMigrationHistory[] {
+  return Object.freeze(
+    [...counts.entries()]
+      .sort(([left], [right]) => (left < right ? -1 : left > right ? 1 : 0))
+      .map(([moduleId, appliedCount]) => Object.freeze({ appliedCount, moduleId })),
+  );
+}
+
 function validateAppliedHistoryUnchecked(
   aggregate: ModuleMigrationAggregate,
   history: readonly AppliedMigrationRecord[],
-): ReadonlySet<string> {
+): ValidatedAppliedHistory {
   if (!Array.isArray(history)) {
     throw runnerError("MIGRATION_HISTORY_INVALID");
   }
@@ -215,6 +259,9 @@ function validateAppliedHistoryUnchecked(
   const inventory = new Map(
     aggregate.migrations.map((migration) => [migration.identity, migration]),
   );
+  const installed = installedMigrationSources(aggregate);
+  const applied = new Set<string>();
+  const retained = new Map<string, number>();
   const seenOrders = new Set<number>();
   const seenIdentities = new Set<string>();
   const seenModuleIndexes = new Set<string>();
@@ -240,8 +287,20 @@ function validateAppliedHistoryUnchecked(
 
     const migration = knownMigration(inventory, record.identity);
     if (!migration) {
+      if (installed.has(record.moduleId)) {
+        // Core, or a module that is installed now: its history is strict, exactly as ADR 0009
+        // established. A migration it no longer ships is a downgrade or a rewritten package.
         throw runnerError("MIGRATION_UNKNOWN_APPLIED");
       }
+      // An absent module's history (ADR 0048): retained and reported, never repaired, deleted, or
+      // matched against anything. It must still name its own module and tag, so a corrupt row is
+      // never mistaken for one.
+      if (record.identity !== `${record.moduleId}:${record.tag}`) {
+        throw runnerError("MIGRATION_HISTORY_INVALID");
+      }
+      retained.set(record.moduleId, (retained.get(record.moduleId) ?? 0) + 1);
+      continue;
+    }
     if (
       record.moduleId !== migration.moduleId ||
       record.tag !== migration.tag ||
@@ -252,11 +311,12 @@ function validateAppliedHistoryUnchecked(
     if (record.checksum !== migration.checksum) {
       throw runnerError("MIGRATION_CHECKSUM_MISMATCH", migration.identity);
     }
+    applied.add(record.identity);
   }
 
   for (const module of aggregate.modules) {
-    const applied = history.filter((record) => record.moduleId === module.moduleId);
-    for (const [position, record] of applied.entries()) {
+    const moduleHistory = history.filter((record) => record.moduleId === module.moduleId);
+    for (const [position, record] of moduleHistory.entries()) {
       if (record.identity !== module.migrations[position]?.identity) {
         const migration = knownMigration(inventory, record.identity);
         throw runnerError("MIGRATION_HISTORY_INVALID", migration?.identity);
@@ -264,13 +324,13 @@ function validateAppliedHistoryUnchecked(
     }
   }
 
-  return seenIdentities;
+  return Object.freeze({ applied, retained: freezeRetained(retained) });
 }
 
 function validateAppliedHistory(
   aggregate: ModuleMigrationAggregate,
   history: readonly AppliedMigrationRecord[],
-): ReadonlySet<string> {
+): ValidatedAppliedHistory {
   try {
     return validateAppliedHistoryUnchecked(aggregate, history);
   } catch (error) {
@@ -285,7 +345,7 @@ function planFromHistory(
   aggregate: ModuleMigrationAggregate,
   history: readonly AppliedMigrationRecord[],
 ): MigrationPlanResult {
-  const applied = validateAppliedHistory(aggregate, history);
+  const { applied, retained } = validateAppliedHistory(aggregate, history);
   const entries = Object.freeze(
     aggregate.migrations.map((migration): MigrationPlanEntry => {
       const isApplied = applied.has(migration.identity);
@@ -314,6 +374,7 @@ function planFromHistory(
     approvalRequiredCount,
     entries,
     pendingCount: entries.length - appliedCount,
+    retained,
   });
 }
 
@@ -472,14 +533,14 @@ export async function applyModuleMigrations(
     } catch {
       throw runnerError("MIGRATION_HISTORY_READ_FAILED");
     }
-    const applied = validateAppliedHistory(options.aggregate, history);
+    const { applied, retained } = validateAppliedHistory(options.aggregate, history);
     const pending = Object.freeze(
       options.aggregate.migrations.filter((migration) => !applied.has(migration.identity)),
     );
     await preflightApprovals(pending, options.approvals ?? denyAllMigrationApprovals);
 
     if (pending.length === 0) {
-      return Object.freeze({ applied: Object.freeze([]), appliedCount: 0, noOp: true });
+      return Object.freeze({ applied: Object.freeze([]), appliedCount: 0, noOp: true, retained });
     }
 
     let executingIdentity: string | undefined;
@@ -508,6 +569,7 @@ export async function applyModuleMigrations(
       applied: resultMigrations,
       appliedCount: resultMigrations.length,
       noOp: false,
+      retained,
     });
   } catch (error) {
     primaryError = error;

core/src/modules/database-abi-values.ts

@@ -0,0 +1,349 @@
+import {
+  type ModuleDatabaseField,
+  ModuleDatabaseError,
+  type ModuleDatabaseValue,
+} from "@ekklesia/contracts";
+
+/**
+ * The value contract of Module Database ABI v1 (ADR 0050): how parameters are encoded before they
+ * reach PostgreSQL, and how result text is decoded after. Both are Core's, and neither consults
+ * `pg`'s process-global type registry or any ORM, which module code could change or differ from.
+ *
+ * Every value travels in PostgreSQL's text format. The session settings the decoding depends on
+ * (`DateStyle`, `IntervalStyle`, `TimeZone`, `bytea_output`, `extra_float_digits`) are pinned by the
+ * executor for every ABI operation (`./database-abi.ts`).
+ */
+
+/** PostgreSQL's limit on bound parameters in one statement (the protocol's 16-bit count). */
+export const MODULE_DATABASE_MAX_PARAMETERS = 65_535;
+/** PostgreSQL's limit on array dimensions (`MAXDIM`). */
+const maximumArrayDimensions = 6;
+
+function parameterInvalid(): ModuleDatabaseError {
+  return new ModuleDatabaseError("MODULE_DATABASE_PARAMETER_INVALID");
+}
+
+function isScalar(value: unknown): boolean {
+  return (
+    value === null ||
+    typeof value === "boolean" ||
+    typeof value === "number" ||
+    typeof value === "bigint" ||
+    typeof value === "string" ||
+    value instanceof Uint8Array
+  );
+}
+
+function scalarText(value: boolean | number | bigint | string): string {
+  // `String` spells NaN, Infinity, and -Infinity exactly as PostgreSQL's float and numeric input
+  // accepts them.
+  return typeof value === "string" ? value : String(value);
+}
+
+function byteaText(value: Uint8Array): string {
+  return `\\x${Buffer.from(value.buffer, value.byteOffset, value.byteLength).toString("hex")}`;
+}
+
+function quoteArrayElement(text: string): string {
+  return `"${text.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
+}
+
+/**
+ * Validates one array level and returns its PostgreSQL array literal. Every element of a level is
+ * either a sub-array or a scalar, and sibling sub-arrays have equal lengths, because PostgreSQL
+ * arrays are rectangular. Every non-null element is quoted, which PostgreSQL accepts for any element
+ * type.
+ */
+function arrayLiteral(values: readonly unknown[], depth: number): string {
+  if (depth > maximumArrayDimensions) {
+    throw parameterInvalid();
+  }
+  const elements: string[] = [];
+  let nestedLength: number | undefined;
+  let nested: boolean | undefined;
+  for (let index = 0; index < values.length; index += 1) {
+    if (!Object.hasOwn(values, index)) {
+      throw parameterInvalid();
+    }
+    const element = values[index];
+    const isNested = Array.isArray(element);
+    if (nested === undefined) {
+      nested = isNested;
+    } else if (nested !== isNested) {
+      throw parameterInvalid();
+    }
+    if (isNested) {
+      if (nestedLength === undefined) {
+        nestedLength = element.length;
+      } else if (nestedLength !== element.length) {
+        throw parameterInvalid();
+      }
+      elements.push(arrayLiteral(element, depth + 1));
+    } else if (element === null) {
+      elements.push("NULL");
+    } else if (element instanceof Uint8Array) {
+      elements.push(quoteArrayElement(byteaText(element)));
+    } else if (isScalar(element)) {
+      elements.push(quoteArrayElement(scalarText(element as boolean | number | bigint | string)));
+    } else {
+      throw parameterInvalid();
+    }
+  }
+  return `{${elements.join(",")}}`;
+}
+
+/**
+ * Validates `values` against the ABI's parameter set and encodes each one into the only forms the
+ * driver then passes through unchanged: `null`, a string, or a `Buffer` copy of a `Uint8Array`.
+ * Anything else, including `undefined`, `Date`, plain objects, other class instances, functions,
+ * symbols, sparse or ragged arrays, and arrays deeper than PostgreSQL allows, is refused before
+ * anything reaches PostgreSQL. The error never names the value.
+ */
+export function encodeModuleDatabaseParameters(values: unknown): (string | Buffer | null)[] {
+  if (values === undefined) {
+    return [];
+  }
+  if (!Array.isArray(values) || values.length > MODULE_DATABASE_MAX_PARAMETERS) {
+    throw parameterInvalid();
+  }
+  const encoded: (string | Buffer | null)[] = [];
+  for (let index = 0; index < values.length; index += 1) {
+    if (!Object.hasOwn(values, index)) {
+      throw parameterInvalid();
+    }
+    const value: unknown = values[index];
+    if (value === null) {
+      encoded.push(null);
+    } else if (value instanceof Uint8Array) {
+      // A copy: the driver serializes when the statement is sent, which may be after the caller
+      // has changed its own bytes.
+      encoded.push(Buffer.from(value));
+    } else if (Array.isArray(value)) {
+      encoded.push(arrayLiteral(value, 1));
+    } else if (isScalar(value)) {
+      encoded.push(scalarText(value as boolean | number | bigint | string));
+    } else {
+      throw parameterInvalid();
+    }
+  }
+  return encoded;
+}
+
+// --- Results -----------------------------------------------------------------------------------
+
+type ScalarDecoder = (text: string) => ModuleDatabaseValue;
+
+const asText: ScalarDecoder = (text) => text;
+const asBoolean: ScalarDecoder = (text) => text === "t";
+const asInteger: ScalarDecoder = (text) => Number.parseInt(text, 10);
+// `Number` reads PostgreSQL's NaN, Infinity, -Infinity, and exponent forms. With
+// `extra_float_digits` pinned to 1 the text is the shortest form that round-trips exactly.
+const asFloat: ScalarDecoder = (text) => Number(text);
+
+function hexDigit(code: number): number {
+  if (code >= 48 && code <= 57) {
+    return code - 48;
+  }
+  if (code >= 97 && code <= 102) {
+    return code - 87;
+  }
+  if (code >= 65 && code <= 70) {
+    return code - 55;
+  }
+  return -1;
+}
+
+/**
+ * `bytea` text to bytes. The executor pins `bytea_output` to `hex`; the older `escape` form is read
+ * too, so a transaction that changed the setting still decodes faithfully rather than failing.
+ * Always a plain `Uint8Array`, never a `Buffer`.
+ */
+const asBytes: ScalarDecoder = (text) => {
+  if (text.startsWith("\\x")) {
+    const length = (text.length - 2) / 2;
+    const bytes = new Uint8Array(length);
+    for (let index = 0; index < length; index += 1) {
+      const high = hexDigit(text.charCodeAt(2 + index * 2));
+      const low = hexDigit(text.charCodeAt(3 + index * 2));
+      bytes[index] = high * 16 + low;
+    }
+    return bytes;
+  }
+  const bytes: number[] = [];
+  for (let index = 0; index < text.length; index += 1) {
+    const code = text.charCodeAt(index);
+    if (code === 92 && text.charCodeAt(index + 1) === 92) {
+      bytes.push(92);
+      index += 1;
+    } else if (code === 92) {
+      bytes.push(Number.parseInt(text.slice(index + 1, index + 4), 8));
+      index += 3;
+    } else {
+      bytes.push(code);
+    }
+  }
+  return Uint8Array.from(bytes);
+};
+
+/** Built-in scalar type OIDs with a decoding other than "PostgreSQL's text output, unchanged". Every
+ * type not listed here, `int8`, `numeric`, date and time types, `json`, and `jsonb` included,
+ * arrives as its exact text. */
+const scalarDecoders: ReadonlyMap<number, ScalarDecoder> = new Map([
+  [16, asBoolean], // bool
+  [17, asBytes], // bytea
+  [21, asInteger], // int2
+  [23, asInteger], // int4
+  [26, asInteger], // oid
+  [700, asFloat], // float4
+  [701, asFloat], // float8
+]);
+
+/** Built-in array type OIDs, each with its element type OID. An array of a type not listed here
+ * (an enum, a domain, an extension type) arrives as its text, like any other type. */
+const arrayElementTypes: ReadonlyMap<number, number> = new Map([
+  [1000, 16], // bool[]
+  [1001, 17], // bytea[]
+  [1002, 18], // "char"[]
+  [1003, 19], // name[]
+  [1005, 21], // int2[]
+  [1007, 23], // int4[]
+  [1009, 25], // text[]
+  [1014, 1042], // bpchar[]
+  [1015, 1043], // varchar[]
+  [1016, 20], // int8[]
+  [1021, 700], // float4[]
+  [1022, 701], // float8[]
+  [1028, 26], // oid[]
+  [1115, 1114], // timestamp[]
+  [1182, 1082], // date[]
+  [1183, 1083], // time[]
+  [1185, 1184], // timestamptz[]
+  [1187, 1186], // interval[]
+  [1231, 1700], // numeric[]
+  [1270, 1266], // timetz[]
+  [2951, 2950], // uuid[]
+  [199, 114], // json[]
+  [3807, 3802], // jsonb[]
+]);
+
+class ArrayTextError extends Error {}
+
+/**
+ * Parses PostgreSQL's array text output into nested arrays, each element decoded by `decode`.
+ * Unquoted `NULL` is null; a quoted `"NULL"` is the string. A non-default lower bound
+ * (`[0:1]={…}`) is not represented: a JavaScript array is a zero-based list. Every element type this
+ * decodes uses `,` as its delimiter.
+ */
+export function parsePostgresArrayText(text: string, decode: ScalarDecoder): ModuleDatabaseValue[] {
+  let position = 0;
+  if (text.startsWith("[")) {
+    const equals = text.indexOf("=");
+    if (equals === -1) {
+      throw new ArrayTextError();
+    }
+    position = equals + 1;
+  }
+
+  function parseArray(): ModuleDatabaseValue[] {
+    if (text[position] !== "{") {
+      throw new ArrayTextError();
+    }
+    position += 1;
+    const items: ModuleDatabaseValue[] = [];
+    if (text[position] === "}") {
+      position += 1;
+      return items;
+    }
+    for (;;) {
+      const character = text[position];
+      if (character === "{") {
+        items.push(parseArray());
+      } else if (character === '"') {
+        position += 1;
+        let element = "";
+        for (;;) {
+          const next = text[position];
+          if (next === undefined) {
+            throw new ArrayTextError();
+          }
+          if (next === "\\") {
+            element += text[position + 1] ?? "";
+            position += 2;
+          } else if (next === '"') {
+            position += 1;
+            break;
+          } else {
+            element += next;
+            position += 1;
+          }
+        }
+        items.push(decode(element));
+      } else {
+        const start = position;
+        while (position < text.length && text[position] !== "," && text[position] !== "}") {
+          position += 1;
+        }
+        const element = text.slice(start, position);
+        items.push(element.toUpperCase() === "NULL" ? null : decode(element));
+      }
+      if (text[position] === ",") {
+        position += 1;
+      } else if (text[position] === "}") {
+        position += 1;
+        return items;
+      } else {
+        throw new ArrayTextError();
+      }
+    }
+  }
+
+  const parsed = parseArray();
+  if (position !== text.length) {
+    throw new ArrayTextError();
+  }
+  return parsed;
+}
+
+function scalarDecoder(typeOid: number): ScalarDecoder {
+  return scalarDecoders.get(typeOid) ?? asText;
+}
+
+/** Decodes one non-null column value from its PostgreSQL text by the column's type OID. */
+export function decodeModuleDatabaseValue(typeOid: number, text: string): ModuleDatabaseValue {
+  const elementType = arrayElementTypes.get(typeOid);
+  if (elementType === undefined) {
+    return scalarDecoder(typeOid)(text);
+  }
+  try {
+    return parsePostgresArrayText(text, scalarDecoder(elementType));
+  } catch {
+    // PostgreSQL produced this text, so it cannot be malformed; should it ever be, the column still
+    // arrives faithfully, as text, rather than as a guess.
+    return text;
+  }
+}
+
+/**
+ * The `types` object handed to `pg` for every ABI statement. Its parser returns the raw text for
+ * every type, so the driver's global registry, which module code could change, is never consulted
+ * and the ABI decodes from text itself. It is an empty array as well because the driver also reads
+ * the same option as the Parse message's parameter-type list: empty, so PostgreSQL infers every
+ * parameter type from the statement.
+ */
+export const rawTextTypes: { getTypeParser: () => (text: string) => string } & never[] =
+  Object.freeze(
+    Object.assign([] as never[], {
+      getTypeParser: () => (text: string) => text,
+    }),
+  );
+
+/** Decodes one positional row of raw driver text. */
+export function decodeModuleDatabaseRow(
+  fields: readonly ModuleDatabaseField[],
+  raw: readonly unknown[],
+): ModuleDatabaseValue[] {
+  return fields.map((field, index) => {
+    const value = raw[index];
+    return typeof value === "string" ? decodeModuleDatabaseValue(field.typeOid, value) : null;
+  });
+}

core/src/modules/database-abi.ts

@@ -0,0 +1,596 @@
+import {
+  MODULE_DATABASE_ABI_VERSION,
+  type ModuleDatabaseArrayRow,
+  ModuleDatabaseError,
+  type ModuleDatabaseErrorCode,
+  type ModuleDatabaseExecutor,
+  type ModuleDatabaseField,
+  type ModuleDatabaseObjectRow,
+  type ModuleDatabaseQueryable,
+  type ModuleDatabaseQueryResult,
+  type ModuleDatabaseTransaction,
+  type ModuleId,
+  moduleIdSchema,
+} from "@ekklesia/contracts";
+import { DatabaseError, type Pool, type PoolClient, type QueryArrayConfig } from "pg";
+import {
+  decodeModuleDatabaseRow,
+  encodeModuleDatabaseParameters,
+  rawTextTypes,
+} from "./database-abi-values.js";
+
+/**
+ * Core's Module Database ABI v1 executor (ADR 0050).
+ *
+ * A module hands Core SQL text, ordered parameter values, and a row mode; Core hands back decoded
+ * rows, column metadata, and stable errors. No ORM, driver, pool, client, or connection object ever
+ * crosses in either direction. The executor is built over the one pool the API already owns
+ * (ADR 0016) and never closes it.
+ *
+ * This is a correctness and compatibility boundary, **not a security sandbox**: a trusted module can
+ * still send any SQL its database role permits. Nothing here inspects table names.
+ *
+ * ### Connections and session state
+ *
+ * Every ABI operation, a top-level statement or a whole transaction, borrows a connection from the
+ * pool, pins the session settings the ABI's decoding depends on, does its work, and resets the
+ * session with `DISCARD ALL` before returning the connection. So no setting, temporary table,
+ * listener, advisory lock, prepared statement, or role change a module makes survives the operation
+ * that made it, and nothing the ABI pinned reaches the pool's other users. A connection that cannot
+ * be reset cleanly, or that is not idle when the operation ends, is destroyed rather than returned.
+ * `DISCARD ALL` also deallocates named prepared statements; Core uses none on the shared pool.
+ *
+ * ### One statement per `query`
+ *
+ * Every ABI statement is sent with PostgreSQL's extended query protocol, forced with the driver's
+ * `queryMode: "extended"` even when there are no parameters. PostgreSQL itself refuses a Parse
+ * message holding more than one statement (SQLSTATE 42601), using its own SQL grammar, so comments,
+ * quoted literals, and semicolons inside them are never mistaken for a second statement. Core does
+ * not parse SQL. A statement text that holds no statement at all is refused after PostgreSQL reports
+ * it empty.
+ *
+ * ### Transaction control belongs to the callbacks
+ *
+ * Transaction-control SQL (`BEGIN`, `START TRANSACTION`, `COMMIT`, `ROLLBACK`, `SAVEPOINT`,
+ * `RELEASE SAVEPOINT`, `PREPARE TRANSACTION`, and their aliases) is forbidden through `query`: a
+ * conformance rule for trusted module code, not a security guarantee. Core cannot refuse such a
+ * statement beforehand without parsing SQL, which it does not do, and it cannot undo one PostgreSQL
+ * has already executed: a `COMMIT` sent through a transaction's `query` has committed by the time
+ * Core sees it. What Core does is detect the violation afterwards, from what PostgreSQL itself
+ * reports (the statement's command tag, and the protocol's transaction status), and fail safely:
+ * the call rejects, an enclosing transaction is never committed by Core and rejects too, and the
+ * connection is destroyed rather than returned to the pool. The commit and rollback guarantees of
+ * the transaction API apply to conforming use.
+ */
+
+/** The settings the ABI's decoding and determinism depend on, pinned for every ABI operation. */
+const pinSessionStatement =
+  "SET TimeZone TO 'UTC'; SET DateStyle TO 'ISO, MDY'; SET IntervalStyle TO 'postgres'; " +
+  "SET bytea_output TO 'hex'; SET extra_float_digits TO 1";
+const resetSessionStatement = "DISCARD ALL";
+
+const transactionControlCommands: ReadonlySet<string> = new Set([
+  "BEGIN",
+  "COMMIT",
+  "PREPARE",
+  "RELEASE",
+  "ROLLBACK",
+  "SAVEPOINT",
+  "START",
+]);
+
+const isolationStatements: ReadonlyMap<unknown, string> = new Map([
+  ["read committed", "READ COMMITTED"],
+  ["repeatable read", "REPEATABLE READ"],
+  ["serializable", "SERIALIZABLE"],
+]);
+
+/** `pg` 8.22 reports the protocol's ReadyForQuery transaction status through this method, which
+ * its type declarations omit. `acquire` refuses a client without it rather than guessing. */
+type AbiClient = PoolClient & { getTransactionStatus(): string | null };
+
+interface PreparedQuery {
+  readonly config: QueryArrayConfig;
+  readonly rowMode: "array" | "object";
+}
+
+interface RawResult {
+  readonly command: string | null;
+  readonly fields: readonly { readonly dataTypeID: number; readonly name: string }[];
+  readonly rowCount: number | null;
+  readonly rows: readonly unknown[][];
+}
+
+function databaseError(code: ModuleDatabaseErrorCode, cause?: unknown): ModuleDatabaseError {
+  // Only PostgreSQL's own SQLSTATE survives. The driver's message, detail, hint, position, and
+  // object names, and every non-PostgreSQL error, are dropped here.
+  if (cause instanceof DatabaseError && typeof cause.code === "string") {
+    return new ModuleDatabaseError(code, { sqlState: cause.code });
+  }
+  return new ModuleDatabaseError(code);
+}
+
+/** A PostgreSQL error leaves the connection usable; anything else (a dropped connection, a
+ * client-side timeout) may leave it mid-protocol, so it must be destroyed. */
+function connectionSurvives(error: unknown): boolean {
+  return error instanceof DatabaseError;
+}
+
+function prepareQuery(request: unknown): PreparedQuery {
+  if (typeof request !== "object" || request === null || Array.isArray(request)) {
+    throw new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+  }
+  for (const key of Object.keys(request)) {
+    if (key !== "text" && key !== "values" && key !== "rowMode") {
+      throw new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+    }
+  }
+  const { rowMode, text, values } = request as Record<string, unknown>;
+  if (typeof text !== "string" || text.length === 0) {
+    throw new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+  }
+  if (rowMode !== undefined && rowMode !== "object" && rowMode !== "array") {
+    throw new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+  }
+  const config = {
+    queryMode: "extended",
+    rowMode: "array",
+    text,
+    types: rawTextTypes,
+    values: encodeModuleDatabaseParameters(values),
+  };
+  return { config: config as unknown as QueryArrayConfig, rowMode: rowMode ?? "object" };
+}
+
+function beginStatement(options: unknown): string {
+  if (options === undefined) {
+    return "BEGIN ISOLATION LEVEL READ COMMITTED READ WRITE";
+  }
+  if (typeof options !== "object" || options === null || Array.isArray(options)) {
+    throw new ModuleDatabaseError("MODULE_DATABASE_TRANSACTION_OPTION_INVALID");
+  }
+  for (const key of Object.keys(options)) {
+    if (key !== "isolation" && key !== "readOnly") {
+      throw new ModuleDatabaseError("MODULE_DATABASE_TRANSACTION_OPTION_INVALID");
+    }
+  }
+  const { isolation, readOnly } = options as Record<string, unknown>;
+  const level = isolation === undefined ? "READ COMMITTED" : isolationStatements.get(isolation);
+  if (level === undefined || (readOnly !== undefined && typeof readOnly !== "boolean")) {
+    throw new ModuleDatabaseError("MODULE_DATABASE_TRANSACTION_OPTION_INVALID");
+  }
+  return `BEGIN ISOLATION LEVEL ${level} ${readOnly === true ? "READ ONLY" : "READ WRITE"}`;
+}
+
+function buildResult(
+  raw: RawResult,
+  rowMode: "array" | "object",
+): ModuleDatabaseQueryResult<ModuleDatabaseArrayRow | ModuleDatabaseObjectRow> {
+  if (typeof raw.command !== "string" || raw.command === "") {
+    // PostgreSQL answered with EmptyQueryResponse: the text held no statement.
+    throw new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+  }
+  const fields: readonly ModuleDatabaseField[] = Object.freeze(
+    raw.fields.map((field) => Object.freeze({ name: field.name, typeOid: field.dataTypeID })),
+  );
+  const decoded = raw.rows.map((row) => decodeModuleDatabaseRow(fields, row));
+  let rows: readonly (ModuleDatabaseArrayRow | ModuleDatabaseObjectRow)[];
+  if (rowMode === "array") {
+    rows = decoded;
+  } else {
+    if (new Set(fields.map((field) => field.name)).size !== fields.length) {
+      // Object rows cannot hold two columns with one name; refusing beats dropping one.
+      throw new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+    }
+    // `Object.fromEntries` defines properties, so a column named `__proto__` stays a column.
+    rows = decoded.map((row) =>
+      Object.fromEntries(fields.map((field, index) => [field.name, row[index] ?? null])),
+    );
+  }
+  return Object.freeze({
+    command: raw.command,
+    fields,
+    rowCount: raw.rowCount ?? null,
+    rows: Object.freeze(rows),
+  });
+}
+
+/** A borrowed client's `error` events are already reported through the statement they interrupt.
+ * The pool only listens to idle clients, so without this a connection the server terminates while
+ * borrowed would surface as an unhandled `error` event. */
+function ignoreClientError(): void {}
+
+function destroy(client: AbiClient): void {
+  client.removeListener("error", ignoreClientError);
+  client.release(true);
+}
+
+async function acquire(pool: Pool, failure: ModuleDatabaseErrorCode): Promise<AbiClient> {
+  let client: AbiClient;
+  try {
+    client = (await pool.connect()) as AbiClient;
+  } catch (error) {
+    throw databaseError(failure, error);
+  }
+  client.on("error", ignoreClientError);
+  if (typeof client.getTransactionStatus !== "function") {
+    destroy(client);
+    throw new ModuleDatabaseError(failure);
+  }
+  try {
+    await client.query(pinSessionStatement);
+  } catch (error) {
+    destroy(client);
+    throw databaseError(failure, error);
+  }
+  return client;
+}
+
+/** Returns a connection to the pool only when it is idle and resets cleanly; destroys it
+ * otherwise. Never throws. */
+async function relinquish(client: AbiClient, healthy: boolean): Promise<void> {
+  if (!healthy || client.getTransactionStatus() !== "I") {
+    destroy(client);
+    return;
+  }
+  try {
+    await client.query(resetSessionStatement);
+  } catch {
+    destroy(client);
+    return;
+  }
+  client.removeListener("error", ignoreClientError);
+  client.release();
+}
+
+/** One open scope: a transaction or a savepoint inside it. */
+interface Scope {
+  activeChild: Scope | undefined;
+  readonly children: Set<Scope>;
+  closed: boolean;
+  /** Operations started through this scope's executor that have not settled yet. */
+  pending: number;
+}
+
+interface TransactionState {
+  readonly client: AbiClient;
+  healthy: boolean;
+  /** Set when the transaction can no longer be committed: transaction control sent through
+   * `query`, or a savepoint that could not be undone. */
+  failure: ModuleDatabaseError | undefined;
+  finished: boolean;
+  /** Settled-never-rejecting shadows of every statement sent on the connection. */
+  readonly inflight: Set<Promise<void>>;
+  savepoints: number;
+}
+
+function newScope(parent?: Scope): Scope {
+  const scope: Scope = { activeChild: undefined, children: new Set(), closed: false, pending: 0 };
+  parent?.children.add(scope);
+  return scope;
+}
+
+function closeScope(scope: Scope): void {
+  scope.closed = true;
+  for (const child of scope.children) {
+    closeScope(child);
+  }
+}
+
+function assertActive(scope: Scope): void {
+  if (scope.closed) {
+    throw new ModuleDatabaseError("MODULE_DATABASE_SCOPE_CLOSED");
+  }
+  if (scope.activeChild !== undefined) {
+    throw new ModuleDatabaseError("MODULE_DATABASE_SCOPE_INACTIVE");
+  }
+}
+
+/** Once a transaction can no longer be committed, its scopes send nothing more. After a
+ * transaction-control violation in particular, a later statement would otherwise run outside any
+ * transaction, as its own autocommitted statement. */
+function assertUsable(state: TransactionState): void {
+  if (state.failure !== undefined) {
+    throw new ModuleDatabaseError(state.failure.code);
+  }
+}
+
+function track<T>(state: TransactionState, promise: Promise<T>): Promise<T> {
+  const shadow = promise.then(
+    () => undefined,
+    () => undefined,
+  );
+  state.inflight.add(shadow);
+  void shadow.then(() => state.inflight.delete(shadow));
+  return promise;
+}
+
+/** Waits until every statement already sent has settled, including any sent while waiting. */
+async function drain(state: TransactionState): Promise<void> {
+  while (state.inflight.size > 0) {
+    await Promise.all([...state.inflight]);
+  }
+}
+
+/** Runs one of Core's own transaction-control statements. Refuses, without sending anything, once
+ * the transaction has finished. */
+async function control(state: TransactionState, statement: string): Promise<void> {
+  if (state.finished) {
+    throw new ModuleDatabaseError("MODULE_DATABASE_SCOPE_CLOSED");
+  }
+  try {
+    await track(state, state.client.query(statement));
+  } catch (error) {
+    if (!connectionSurvives(error)) {
+      state.healthy = false;
+    }
+    throw databaseError("MODULE_DATABASE_TRANSACTION_FAILED", error);
+  }
+}
+
+async function rollback(state: TransactionState): Promise<void> {
+  try {
+    await state.client.query("ROLLBACK");
+  } catch {
+    state.healthy = false;
+  }
+}
+
+type Outcome<T> = { readonly value: T } | { readonly error: unknown };
+
+async function settle<T>(run: () => Promise<T> | T): Promise<Outcome<T>> {
+  try {
+    return { value: await run() };
+  } catch (error) {
+    return { error };
+  }
+}
+
+const moduleByExecutor = new WeakMap<object, ModuleId>();
+
+/** Which module an ABI executor, or a transaction or savepoint executor derived from it, belongs
+ * to. For Core's own logging, diagnostics, and attribution; never exposed to modules. */
+export function moduleDatabaseExecutorModuleId(executor: object): ModuleId | undefined {
+  return moduleByExecutor.get(executor);
+}
+
+export interface ModuleDatabaseExecutorOptions {
+  /** The module this executor serves. Carried for attribution only: the ABI enforces no table
+   * ownership at run time (ADR 0050). */
+  readonly moduleId: ModuleId;
+}
+
+/**
+ * Creates one module's ABI v1 executor over the API's existing pool. Synchronous and free of I/O:
+ * nothing touches the database until the module calls it. The returned object, and every
+ * transaction and savepoint executor it hands out, is frozen and holds exactly the ABI's members.
+ */
+export function createModuleDatabaseExecutor(
+  pool: Pool,
+  options: ModuleDatabaseExecutorOptions,
+): ModuleDatabaseExecutor {
+  const parsedModuleId = moduleIdSchema.safeParse(options.moduleId);
+  if (!parsedModuleId.success) {
+    throw new TypeError("A module database executor needs a valid module ID.");
+  }
+  const moduleId = parsedModuleId.data;
+
+  async function query(
+    request: unknown,
+  ): Promise<ModuleDatabaseQueryResult<ModuleDatabaseArrayRow | ModuleDatabaseObjectRow>> {
+    const prepared = prepareQuery(request);
+    const client = await acquire(pool, "MODULE_DATABASE_QUERY_FAILED");
+    let healthy = true;
+    try {
+      let raw: RawResult;
+      try {
+        raw = (await client.query(prepared.config)) as unknown as RawResult;
+      } catch (error) {
+        healthy = connectionSurvives(error);
+        throw databaseError("MODULE_DATABASE_QUERY_FAILED", error);
+      }
+      if (
+        (raw.command !== null && transactionControlCommands.has(raw.command)) ||
+        client.getTransactionStatus() !== "I"
+      ) {
+        // A transaction-control violation. PostgreSQL has already run it; the connection is
+        // destroyed below rather than returned in a state Core did not choose.
+        healthy = false;
+        throw new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+      }
+      return buildResult(raw, prepared.rowMode);
+    } finally {
+      await relinquish(client, healthy);
+    }
+  }
+
+  function scopeExecutor(state: TransactionState, scope: Scope): ModuleDatabaseTransaction {
+    async function scopeQuery(
+      request: unknown,
+    ): Promise<ModuleDatabaseQueryResult<ModuleDatabaseArrayRow | ModuleDatabaseObjectRow>> {
+      assertActive(scope);
+      assertUsable(state);
+      const prepared = prepareQuery(request);
+      scope.pending += 1;
+      try {
+        let raw: RawResult;
+        try {
+          raw = (await track(state, state.client.query(prepared.config))) as unknown as RawResult;
+        } catch (error) {
+          if (!connectionSurvives(error)) {
+            state.healthy = false;
+          }
+          throw databaseError("MODULE_DATABASE_QUERY_FAILED", error);
+        }
+        if (
+          (raw.command !== null && transactionControlCommands.has(raw.command)) ||
+          state.client.getTransactionStatus() === "I"
+        ) {
+          // A transaction-control violation. PostgreSQL has already run it, and Core cannot undo
+          // that; it can only never commit this transaction itself, and destroy the connection.
+          state.failure ??= new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+          state.healthy = false;
+          throw new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+        }
+        return buildResult(raw, prepared.rowMode);
+      } finally {
+        scope.pending -= 1;
+      }
+    }
+
+    async function savepoint<T>(
+      callback: (savepoint: ModuleDatabaseTransaction) => Promise<T> | T,
+    ): Promise<T> {
+      assertActive(scope);
+      assertUsable(state);
+      if (typeof callback !== "function") {
+        throw new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+      }
+      scope.pending += 1;
+      const child = newScope(scope);
+      scope.activeChild = child;
+      state.savepoints += 1;
+      // Core's own identifier: a fixed prefix and a counter, never anything a module supplied.
+      const name = `ekklesia_savepoint_${state.savepoints}`;
+      try {
+        await control(state, `SAVEPOINT ${name}`);
+        if (child.closed) {
+          throw new ModuleDatabaseError("MODULE_DATABASE_SCOPE_CLOSED");
+        }
+        const outcome = await settle(() => callback(scopeExecutor(state, child)));
+        const outstanding = child.pending > 0;
+        closeScope(child);
+        await drain(state);
+        if (scope.closed) {
+          // The enclosing transaction finished first; it rolls back, and nothing more is sent.
+          throw new ModuleDatabaseError("MODULE_DATABASE_SCOPE_CLOSED");
+        }
+        if ("error" in outcome) {
+          // A rejected callback's own error stays the error, even if sibling work it started was
+          // still settling: that work has been drained, and is undone here with everything else.
+          try {
+            await control(state, `ROLLBACK TO SAVEPOINT ${name}`);
+            await control(state, `RELEASE SAVEPOINT ${name}`);
+          } catch (error) {
+            state.failure ??= new ModuleDatabaseError("MODULE_DATABASE_TRANSACTION_FAILED");
+            throw error;
+          }
+          throw outcome.error;
+        }
+        if (outstanding) {
+          // A callback that resolved with work outstanding forgot an await. Roll back to the
+          // savepoint and never release it.
+          try {
+            await control(state, `ROLLBACK TO SAVEPOINT ${name}`);
+          } catch (error) {
+            state.failure ??= new ModuleDatabaseError("MODULE_DATABASE_TRANSACTION_FAILED");
+            throw error;
+          }
+          throw new ModuleDatabaseError("MODULE_DATABASE_SCOPE_WORK_OUTSTANDING");
+        }
+        try {
+          await control(state, `RELEASE SAVEPOINT ${name}`);
+        } catch (releaseError) {
+          // Typically a failed statement left the transaction aborted. Undo the savepoint so the
+          // transaction stays usable, and report that this savepoint did not complete.
+          try {
+            await control(state, `ROLLBACK TO SAVEPOINT ${name}`);
+            await control(state, `RELEASE SAVEPOINT ${name}`);
+          } catch {
+            state.failure ??= new ModuleDatabaseError("MODULE_DATABASE_TRANSACTION_FAILED");
+          }
+          throw releaseError;
+        }
+        return (outcome as { readonly value: T }).value;
+      } finally {
+        closeScope(child);
+        if (scope.activeChild === child) {
+          scope.activeChild = undefined;
+        }
+        scope.pending -= 1;
+      }
+    }
+
+    const executor = Object.freeze({
+      abiVersion: MODULE_DATABASE_ABI_VERSION,
+      query: scopeQuery as ModuleDatabaseQueryable["query"],
+      savepoint,
+    });
+    moduleByExecutor.set(executor, moduleId);
+    return executor;
+  }
+
+  async function transaction<T>(
+    callback: (transaction: ModuleDatabaseTransaction) => Promise<T> | T,
+    options?: unknown,
+  ): Promise<T> {
+    if (typeof callback !== "function") {
+      throw new ModuleDatabaseError("MODULE_DATABASE_REQUEST_INVALID");
+    }
+    const begin = beginStatement(options);
+    const client = await acquire(pool, "MODULE_DATABASE_TRANSACTION_FAILED");
+    const state: TransactionState = {
+      client,
+      failure: undefined,
+      finished: false,
+      healthy: true,
+      inflight: new Set(),
+      savepoints: 0,
+    };
+    try {
+      try {
+        await client.query(begin);
+      } catch (error) {
+        state.healthy = connectionSurvives(error);
+        throw databaseError("MODULE_DATABASE_TRANSACTION_FAILED", error);
+      }
+      const scope = newScope();
+      const outcome = await settle(() => callback(scopeExecutor(state, scope)));
+      const outstanding = scope.pending > 0;
+      closeScope(scope);
+      await drain(state);
+      state.finished = true;
+
+      if ("error" in outcome) {
+        // The callback's own error stays primary, even when sibling work it started (say, the
+        // other half of a `Promise.all`) was still settling. That work has been drained, and rolls
+        // back with the rest; outstanding work never leads to a commit.
+        await rollback(state);
+        throw outcome.error;
+      }
+      if (outstanding) {
+        // The callback resolved with work it never awaited: a forgotten `await`.
+        await rollback(state);
+        throw new ModuleDatabaseError("MODULE_DATABASE_SCOPE_WORK_OUTSTANDING");
+      }
+      if (state.failure !== undefined) {
+        await rollback(state);
+        throw state.failure;
+      }
+      let committed: { readonly command: string | null };
+      try {
+        committed = await client.query("COMMIT");
+      } catch (error) {
+        state.healthy = connectionSurvives(error);
+        throw databaseError("MODULE_DATABASE_TRANSACTION_FAILED", error);
+      }
+      if (committed.command !== "COMMIT") {
+        // PostgreSQL answers COMMIT with ROLLBACK when a failed statement had aborted the
+        // transaction. Nothing was committed, and PostgreSQL supplied no SQLSTATE to report.
+        throw new ModuleDatabaseError("MODULE_DATABASE_TRANSACTION_FAILED");
+      }
+      return outcome.value;
+    } finally {
+      state.finished = true;
+      await relinquish(client, state.healthy);
+    }
+  }
+
+  const executor = Object.freeze({
+    abiVersion: MODULE_DATABASE_ABI_VERSION,
+    query: query as ModuleDatabaseQueryable["query"],
+    transaction: transaction as ModuleDatabaseExecutor["transaction"],
+  });
+  moduleByExecutor.set(executor, moduleId);
+  return executor;
+}

core/src/modules/database.ts

@@ -1,7 +1,54 @@
-import type { ModuleDatabase } from "@ekklesia/contracts";
-import { drizzle } from "drizzle-orm/node-postgres";
+import type { ModuleDatabaseAbiRuntimeServices, ModuleRuntimeServices } from "@ekklesia/contracts";
+import { drizzle, type NodePgDatabase } from "drizzle-orm/node-postgres";
 import type { Pool } from "pg";
 
+/**
+ * A trusted backend module's typed Drizzle query surface — the same query-building methods a
+ * platform-owned Drizzle instance exposes, restricted to exactly the operations a module needs to
+ * read and write its own tables. Derived with `Pick` from the real `drizzle-orm/node-postgres`
+ * database type rather than hand-declared, so every method keeps Drizzle's own table-aware
+ * argument and result inference exactly as-is — a module calling `database.select().from(table)`
+ * or `database.insert(table).values(...)` gets the identical typed builder a direct Drizzle caller
+ * would, with no `any`/`unknown` erasure anywhere in the chain.
+ *
+ * Deliberately excludes everything `NodePgDatabase` or the `drizzle(...)` factory otherwise
+ * exposes: `$client` (the raw `pg` client/pool), `_` (internal session/dialect/schema state),
+ * `query` (a relational-query builder tied to one schema, which would have to span every
+ * installed module's tables to exist here at all), `$cache`, `$count`, `$with`, `with`, and
+ * `refreshMaterializedView`. There is no connection string, pool, session, or dialect object
+ * reachable through this type. Carries no schema generic — a module brings its own Drizzle table
+ * objects to each call, so there is no global relational schema spanning every installed module for
+ * this type to leak.
+ *
+ * Core's own, private type (ADR 0053): it moved here from `@ekklesia/contracts` so no published
+ * package references Drizzle. New modules use the Module Database ABI v1 instead (ADR 0050), and
+ * the Module SDK never exposes this facade's type.
+ *
+ * This is an integration boundary, not a security sandbox: modules are trusted, compiled backend
+ * plugins that already run arbitrary code in this process, exactly like every other lifecycle hook
+ * and HTTP handler they define. `ModuleDatabase` exists to keep a module's code Drizzle-typed and
+ * decoupled from how the platform physically connects to PostgreSQL — not to defend against a
+ * malicious module, which this facade cannot do and does not attempt to do.
+ */
+export type ModuleDatabase = Pick<
+  NodePgDatabase,
+  | "select"
+  | "selectDistinct"
+  | "selectDistinctOn"
+  | "insert"
+  | "update"
+  | "delete"
+  | "execute"
+  | "transaction"
+>;
+
+/** The services a legacy module's hooks and handlers receive: the legacy facade. */
+export type LegacyModuleRuntimeServices = ModuleRuntimeServices<ModuleDatabase>;
+/** The services Core hands any started module: the legacy facade or the ABI v1 executor. */
+export type AnyModuleRuntimeServices =
+  | LegacyModuleRuntimeServices
+  | ModuleDatabaseAbiRuntimeServices;
+
 /**
  * A typed `ModuleDatabase` view over an externally owned pool — the module-facing counterpart to
  * `createIdentityDrizzleView` (`core/src/identity/database.ts`) and

core/src/modules/discovery.ts

@@ -47,6 +47,7 @@ export type ModuleDiscoveryIssueCode =
   | "MODULE_PLATFORM_INCOMPATIBLE"
   | "MODULE_SDK_INCOMPATIBLE"
   | "MODULE_VERSION_MISMATCH"
+  | "MODULES_DIRECTORY_INVALID"
   | "MODULES_DIRECTORY_UNREADABLE";
 
 export interface ModuleDiscoveryIssue {
@@ -117,9 +118,35 @@ export interface DiscoveredModule {
 export interface ModuleDiscoveryOptions {
   readonly moduleSdkVersion: string;
   readonly modulesDirectory: string;
+  /**
+   * True when an operator configured the directory explicitly (`EKKLESIA_MODULES_DIR`, ADR 0048).
+   * A configured directory that is missing, not a directory, or not an absolute path then fails
+   * discovery closed rather than reading as zero modules: a mistyped mount must never quietly start
+   * the platform with nothing installed. False or omitted keeps the development default lenient,
+   * where a checkout with no `modules/` simply has no modules.
+   */
+  readonly modulesDirectoryRequired?: boolean;
   readonly platformVersion: string;
 }
 
+/** The one sanitized message for an unusable configured modules directory. It never carries the
+ * value: a path is machine detail, and a misplaced value could be anything at all. */
+export const MODULES_DIRECTORY_INVALID_MESSAGE = "EKKLESIA_MODULES_DIR must be an absolute path.";
+
+/**
+ * Whether a configured modules directory is usable as given: a non-empty absolute path with no
+ * surrounding whitespace and no NUL byte. Deliberately strict rather than forgiving, because
+ * trimming or resolving a near-miss would silently pick a directory the operator did not name.
+ */
+export function isUsableModulesDirectoryPath(value: string): boolean {
+  return (
+    value.length > 0 &&
+    value.trim() === value &&
+    !value.includes("\u0000") &&
+    path.isAbsolute(value)
+  );
+}
+
 interface ModulePackageData {
   name: string;
   version: string;
@@ -695,6 +722,13 @@ export async function discoverModules(
       });
     }
   }
+  if (options.modulesDirectoryRequired && !isUsableModulesDirectoryPath(options.modulesDirectory)) {
+    issues.push({
+      code: "MODULES_DIRECTORY_INVALID",
+      message: MODULES_DIRECTORY_INVALID_MESSAGE,
+      moduleDirectory: ".",
+    });
+  }
   if (issues.length > 0) {
     throw new ModuleDiscoveryError(issues);
   }
@@ -703,7 +737,7 @@ export async function discoverModules(
   try {
     directoryEntries = await readdir(options.modulesDirectory, { withFileTypes: true });
   } catch (error) {
-    if (errorCode(error) === "ENOENT") {
+    if (errorCode(error) === "ENOENT" && !options.modulesDirectoryRequired) {
       return Object.freeze([]);
     }
     throw new ModuleDiscoveryError([

core/src/modules/index.ts

@@ -2,11 +2,15 @@ export * from "./configuration.js";
 export * from "./configuration-schema.js";
 export * from "./configuration-store.js";
 export * from "./database.js";
+export * from "./database-abi.js";
 export * from "./discovery.js";
 export * from "./lifecycle.js";
 export * from "./lifecycle-schema.js";
 export * from "./lifecycle-store.js";
 export * from "./migration-discovery.js";
+export * from "./modules-directory.js";
+export * from "./module-package-host.js";
+export * from "./module-package-verification.js";
 export * from "./permissions.js";
 export * from "./realtime.js";
 export * from "./runtime.js";

core/src/modules/legacy-schema-definition.ts

@@ -1,19 +1,15 @@
+/**
+ * The legacy module schema definition (ADR 0007): a v8 module that declares no `database` default-
+ * exports `{ moduleId, tables }` with its Drizzle table objects themselves. Core alone validates it,
+ * for the legacy facade's deprecation window (ADR 0050). It lives here, beside Core's own Drizzle
+ * dependency, so that no package a module installs needs Drizzle at run time (ADR 0053).
+ *
+ * Erasable TypeScript with no relative imports: the verifier's probe imports this source file
+ * directly in tests (`module-package-probe.ts`).
+ */
 import { is } from "drizzle-orm";
 import { type AnyPgTable, PgTable } from "drizzle-orm/pg-core";
-import { z } from "zod";
-import { type ModuleId, moduleIdSchema } from "./identifiers.js";
-
-export const POSTGRES_IDENTIFIER_MAX_LENGTH = 63;
-
-export const moduleTableLocalNameSchema = z
-  .string()
-  .min(1)
-  .regex(/^[a-z][a-z0-9]*(?:_[a-z0-9]+)*$/u, "Must be a lowercase snake-case table name.");
-
-export const physicalModuleTableNameSchema = moduleTableLocalNameSchema.max(
-  POSTGRES_IDENTIFIER_MAX_LENGTH,
-  `Must not exceed ${POSTGRES_IDENTIFIER_MAX_LENGTH} characters.`,
-);
+import { type ModuleId, moduleIdSchema } from "@ekklesia/contracts";
 
 export interface ModuleSchemaDefinition<
   Tables extends Readonly<Record<string, AnyPgTable>> = Readonly<Record<string, AnyPgTable>>,
@@ -35,23 +31,6 @@ function hasOnlyStringKeys(value: object, allowedKeys?: ReadonlySet<string>): bo
   );
 }
 
-export function moduleTableNamespace(moduleId: ModuleId): string {
-  return moduleIdSchema.parse(moduleId).replaceAll("-", "_");
-}
-
-export function moduleTablePrefix(moduleId: ModuleId): string {
-  return `${moduleTableNamespace(moduleId)}_`;
-}
-
-export function moduleTableName(moduleId: ModuleId, localName: string): string {
-  const parsedLocalName = moduleTableLocalNameSchema.parse(localName);
-  const tableName = `${moduleTablePrefix(moduleId)}${parsedLocalName}`;
-  if (!physicalModuleTableNameSchema.safeParse(tableName).success) {
-    throw new RangeError("The namespaced PostgreSQL table name is invalid or too long.");
-  }
-  return tableName;
-}
-
 export function isModuleSchemaDefinition(value: unknown): value is ModuleSchemaDefinition {
   try {
     if (

core/src/modules/module-package-archive.ts

@@ -0,0 +1,203 @@
+import { gunzipSync } from "node:zlib";
+
+/**
+ * Reads an Ekklesia Module Package v1 archive (ADR 0049) entirely in memory and enforces the
+ * archive-safety rules before anything is written anywhere.
+ *
+ * Deliberately a strict reader rather than a general tar implementation: v1 packages hold only
+ * POSIX ustar directories and regular files, so every other entry type is refused instead of
+ * interpreted. Nothing here touches the filesystem; extraction happens only after the caller has
+ * verified the whole package.
+ */
+
+export type ModulePackageArchiveErrorCode =
+  | "MODULE_PACKAGE_LAYOUT_INVALID"
+  | "MODULE_PACKAGE_LINK"
+  | "MODULE_PACKAGE_SPECIAL_ENTRY"
+  | "MODULE_PACKAGE_TOO_LARGE"
+  | "MODULE_PACKAGE_UNREADABLE"
+  | "MODULE_PACKAGE_UNSAFE_MODE"
+  | "MODULE_PACKAGE_UNSAFE_PATH";
+
+export class ModulePackageArchiveError extends Error {
+  readonly code: ModulePackageArchiveErrorCode;
+
+  constructor(code: ModulePackageArchiveErrorCode) {
+    super(code);
+    this.name = "ModulePackageArchiveError";
+    this.code = code;
+  }
+}
+
+/** Generous for a module, small enough that a hostile archive cannot exhaust the host. */
+export const MODULE_PACKAGE_MAX_COMPRESSED_BYTES = 256 * 1024 * 1024;
+export const MODULE_PACKAGE_MAX_UNCOMPRESSED_BYTES = 1024 * 1024 * 1024;
+export const MODULE_PACKAGE_MAX_ENTRIES = 100_000;
+
+export interface ModulePackageArchiveEntry {
+  /** Relative to the top-level module directory; empty for that directory itself. */
+  readonly path: string;
+  readonly type: "directory" | "file";
+  readonly data: Buffer;
+}
+
+export interface ModulePackageArchive {
+  /** The single top-level directory's name. Validated as a module id by the caller. */
+  readonly topLevel: string;
+  /** Every entry except the top-level directory itself, in archive order. */
+  readonly entries: readonly ModulePackageArchiveEntry[];
+}
+
+const BLOCK = 512;
+
+function field(block: Buffer, offset: number, length: number): string {
+  const raw = block.subarray(offset, offset + length);
+  const end = raw.indexOf(0);
+  return raw.subarray(0, end === -1 ? length : end).toString("latin1");
+}
+
+function octalField(block: Buffer, offset: number, length: number): number {
+  const text = field(block, offset, length).trim();
+  if (!/^[0-7]+$/u.test(text)) {
+    throw new ModulePackageArchiveError("MODULE_PACKAGE_UNREADABLE");
+  }
+  const value = Number.parseInt(text, 8);
+  if (!Number.isSafeInteger(value)) {
+    throw new ModulePackageArchiveError("MODULE_PACKAGE_UNREADABLE");
+  }
+  return value;
+}
+
+function headerChecksumValid(block: Buffer): boolean {
+  const declared = octalField(block, 148, 8);
+  let sum = 0;
+  for (let index = 0; index < BLOCK; index += 1) {
+    sum += index >= 148 && index < 156 ? 0x20 : (block[index] ?? 0);
+  }
+  return sum === declared;
+}
+
+/** Printable ASCII, no backslash, relative, and no empty, `.`, or `..` segment. */
+function safeSegments(value: string): readonly string[] {
+  if (
+    value.length === 0 ||
+    !/^[\x20-\x7e]+$/u.test(value) ||
+    value.includes("\\") ||
+    value.startsWith("/")
+  ) {
+    throw new ModulePackageArchiveError("MODULE_PACKAGE_UNSAFE_PATH");
+  }
+  const segments = value.split("/");
+  if (segments.some((segment) => segment === "" || segment === "." || segment === "..")) {
+    throw new ModulePackageArchiveError("MODULE_PACKAGE_UNSAFE_PATH");
+  }
+  return segments;
+}
+
+export function readModulePackageArchive(compressed: Buffer): ModulePackageArchive {
+  if (compressed.length > MODULE_PACKAGE_MAX_COMPRESSED_BYTES) {
+    throw new ModulePackageArchiveError("MODULE_PACKAGE_TOO_LARGE");
+  }
+  let raw: Buffer;
+  try {
+    raw = gunzipSync(compressed, { maxOutputLength: MODULE_PACKAGE_MAX_UNCOMPRESSED_BYTES });
+  } catch (error) {
+    throw new ModulePackageArchiveError(
+      error instanceof RangeError ? "MODULE_PACKAGE_TOO_LARGE" : "MODULE_PACKAGE_UNREADABLE",
+    );
+  }
+
+  const entries: ModulePackageArchiveEntry[] = [];
+  const kinds = new Map<string, "directory" | "file">();
+  /** Every path that is an ancestor of some entry, so a file can never claim one. */
+  const ancestors = new Set<string>();
+  let topLevel: string | undefined;
+  let offset = 0;
+  let ended = false;
+
+  while (offset + BLOCK <= raw.length) {
+    const block = raw.subarray(offset, offset + BLOCK);
+    if (block.every((byte) => byte === 0)) {
+      ended = true;
+      break;
+    }
+    if (field(block, 257, 6) !== "ustar" || field(block, 263, 2) !== "00") {
+      throw new ModulePackageArchiveError("MODULE_PACKAGE_UNREADABLE");
+    }
+    if (!headerChecksumValid(block)) {
+      throw new ModulePackageArchiveError("MODULE_PACKAGE_UNREADABLE");
+    }
+    if (entries.length + 1 > MODULE_PACKAGE_MAX_ENTRIES) {
+      throw new ModulePackageArchiveError("MODULE_PACKAGE_TOO_LARGE");
+    }
+
+    const typeflag = field(block, 156, 1);
+    if (typeflag === "1" || typeflag === "2") {
+      throw new ModulePackageArchiveError("MODULE_PACKAGE_LINK");
+    }
+    const type =
+      typeflag === "5" ? "directory" : typeflag === "0" || typeflag === "" ? "file" : undefined;
+    if (type === undefined) {
+      // Devices, FIFOs, contiguous files, and every extended or long-name header: v1 packages hold
+      // directories and regular files, so nothing else is interpreted.
+      throw new ModulePackageArchiveError("MODULE_PACKAGE_SPECIAL_ENTRY");
+    }
+
+    const mode = octalField(block, 100, 8);
+    if ((mode & 0o7000) !== 0) {
+      throw new ModulePackageArchiveError("MODULE_PACKAGE_UNSAFE_MODE");
+    }
+
+    const name = field(block, 0, 100);
+    const prefix = field(block, 345, 155);
+    let fullPath = prefix === "" ? name : `${prefix}/${name}`;
+    if (type === "directory" && fullPath.endsWith("/")) {
+      fullPath = fullPath.slice(0, -1);
+    }
+    const segments = safeSegments(fullPath);
+    const top = segments[0] ?? "";
+    if (topLevel === undefined) {
+      topLevel = top;
+    } else if (top !== topLevel) {
+      throw new ModulePackageArchiveError("MODULE_PACKAGE_LAYOUT_INVALID");
+    }
+
+    const size = type === "file" ? octalField(block, 124, 12) : 0;
+    const dataStart = offset + BLOCK;
+    const dataEnd = dataStart + size;
+    if (dataEnd > raw.length) {
+      throw new ModulePackageArchiveError("MODULE_PACKAGE_UNREADABLE");
+    }
+    const relative = segments.slice(1).join("/");
+
+    if (relative === "") {
+      if (type !== "directory") {
+        throw new ModulePackageArchiveError("MODULE_PACKAGE_LAYOUT_INVALID");
+      }
+    } else {
+      if (kinds.has(relative)) {
+        throw new ModulePackageArchiveError("MODULE_PACKAGE_LAYOUT_INVALID");
+      }
+      // No entry may sit below a file, and no file may claim a path something already sits below.
+      // Linear in the total number of path segments, whatever order the entries arrive in.
+      if (type === "file" && ancestors.has(relative)) {
+        throw new ModulePackageArchiveError("MODULE_PACKAGE_LAYOUT_INVALID");
+      }
+      for (let index = 1; index < segments.length - 1; index += 1) {
+        const ancestor = segments.slice(1, index + 1).join("/");
+        if (kinds.get(ancestor) === "file") {
+          throw new ModulePackageArchiveError("MODULE_PACKAGE_LAYOUT_INVALID");
+        }
+        ancestors.add(ancestor);
+      }
+      kinds.set(relative, type);
+      entries.push({ data: Buffer.from(raw.subarray(dataStart, dataEnd)), path: relative, type });
+    }
+    offset = dataStart + Math.ceil(size / BLOCK) * BLOCK;
+  }
+
+  if (!ended || topLevel === undefined) {
+    throw new ModulePackageArchiveError("MODULE_PACKAGE_UNREADABLE");
+  }
+  return Object.freeze({ entries: Object.freeze(entries), topLevel });
+}

core/src/modules/module-package-host.ts

@@ -0,0 +1,59 @@
+/**
+ * The facts about this host that decide whether a native Module Package v1 can run on it
+ * (ADR 0049): operating system, CPU, C library family and version, and Node-API version.
+ *
+ * Everything comes from Node.js itself (`process.platform`, `process.arch`, `process.versions`, and
+ * the diagnostic report's `glibcVersionRuntime`), never from running a system command. A fact Node
+ * cannot report is left undefined, and every check that needs it fails closed.
+ */
+export interface ModulePackageHost {
+  readonly platform: string;
+  readonly arch: string;
+  /** The C library on Linux: glibc with its runtime version, or undefined when it cannot be proven
+   * to be glibc (musl reports none). */
+  readonly libc?: { readonly family: "glibc"; readonly version: string };
+  /** `process.versions.napi`: the highest Node-API version this Node.js provides. */
+  readonly nodeApi?: number;
+  /** `process.versions.modules`: the ABI an ABI-specific addon must have been built for. */
+  readonly nodeAbi?: string;
+}
+
+function glibcVersion(): string | undefined {
+  try {
+    const header = (process.report?.getReport() as { header?: { glibcVersionRuntime?: unknown } })
+      ?.header;
+    const version = header?.glibcVersionRuntime;
+    return typeof version === "string" && /^\d+\.\d+(?:\.\d+)?$/u.test(version)
+      ? version
+      : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+export function currentModulePackageHost(): ModulePackageHost {
+  const libc = process.platform === "linux" ? glibcVersion() : undefined;
+  const nodeApi = Number(process.versions.napi);
+  return Object.freeze({
+    arch: process.arch,
+    ...(libc === undefined
+      ? {}
+      : { libc: Object.freeze({ family: "glibc" as const, version: libc }) }),
+    ...(Number.isInteger(nodeApi) && nodeApi > 0 ? { nodeApi } : {}),
+    ...(typeof process.versions.modules === "string" ? { nodeAbi: process.versions.modules } : {}),
+    platform: process.platform,
+  });
+}
+
+/** The native targets this platform can verify, with what each requires of a host. */
+export const MODULE_PACKAGE_NATIVE_TARGETS: ReadonlyMap<
+  string,
+  {
+    readonly platform: string;
+    readonly arch: string;
+    readonly libc: "glibc";
+    readonly elfMachine: number;
+  }
+> = new Map([
+  ["linux-x64-glibc", { arch: "x64", elfMachine: 62, libc: "glibc", platform: "linux" }],
+]);

core/src/modules/module-package-probe.ts

@@ -0,0 +1,101 @@
+// The isolated, short-lived validation process of Module Package v1 verification (ADR 0049).
+//
+// The verifier forks this file with an empty environment and one JSON argument naming a candidate
+// module's backend entrypoints. It imports each one, so a package whose code cannot load, or whose
+// bundle still reaches for a dependency it does not contain, is refused before it is ever installed.
+// Whatever the module's top-level code does happens here, in a process with no database URL, no
+// secret, and no platform state, and that is discarded as soon as it reports.
+//
+// The result travels over the IPC channel, never stdout, so nothing a module prints can forge it.
+// It carries fixed role and reason names only: never an error message, a path, or module output.
+//
+// Written as erasable TypeScript, so Node can run the source file directly in tests as well as the
+// compiled file in the image. Its one relative import names the source file's own extension, which
+// the build rewrites to `.js` (`rewriteRelativeImportExtensions`); that file follows the same rules.
+import { pathToFileURL } from "node:url";
+import {
+  parseModuleRuntimeDefinition,
+  parseModuleSchemaMetadataDefinition,
+} from "@ekklesia/contracts";
+import { parseModuleSchemaDefinition } from "./legacy-schema-definition.ts";
+
+interface ProbeRequest {
+  readonly databaseAbi?: 1;
+  readonly moduleId: string;
+  readonly version: string;
+  readonly entrypoints: Readonly<Record<string, string>>;
+}
+
+interface ProbeFailure {
+  readonly role: string;
+  readonly reason: "contract" | "export" | "identity" | "load";
+}
+
+function defaultExport(namespace: unknown): unknown {
+  return typeof namespace === "object" && namespace !== null && "default" in namespace
+    ? (namespace as { default: unknown }).default
+    : undefined;
+}
+
+async function probe(request: ProbeRequest): Promise<readonly ProbeFailure[]> {
+  const failures: ProbeFailure[] = [];
+  for (const role of Object.keys(request.entrypoints).sort()) {
+    const entrypoint = request.entrypoints[role];
+    if (entrypoint === undefined) {
+      continue;
+    }
+    let namespace: unknown;
+    try {
+      namespace = await import(pathToFileURL(entrypoint).href);
+    } catch {
+      failures.push({ reason: "load", role });
+      continue;
+    }
+    try {
+      if (role === "server") {
+        const definition = parseModuleRuntimeDefinition(defaultExport(namespace));
+        if (definition.id !== request.moduleId || definition.version !== request.version) {
+          failures.push({ reason: "identity", role });
+        }
+        if ((definition.database?.abi === 1) !== (request.databaseAbi === 1)) {
+          failures.push({ reason: "contract", role });
+        }
+      } else if (role === "schema") {
+        const definition =
+          request.databaseAbi === 1
+            ? parseModuleSchemaMetadataDefinition(defaultExport(namespace))
+            : parseModuleSchemaDefinition(defaultExport(namespace));
+        if (definition.moduleId !== request.moduleId) {
+          failures.push({ reason: "identity", role });
+        }
+      }
+    } catch {
+      failures.push({ reason: "export", role });
+    }
+  }
+  return failures;
+}
+
+function report(message: unknown): void {
+  if (typeof process.send !== "function") {
+    process.exitCode = 2;
+    return;
+  }
+  process.send(message, () => {
+    // A module may leave timers or handles behind; the probe's work is done either way.
+    process.exit(0);
+  });
+}
+
+let request: ProbeRequest | undefined;
+try {
+  request = JSON.parse(process.argv[2] ?? "") as ProbeRequest;
+} catch {
+  report({ failures: [{ reason: "load", role: "request" }] });
+}
+if (request !== undefined) {
+  probe(request).then(
+    (failures) => report({ failures }),
+    () => report({ failures: [{ reason: "load", role: "probe" }] }),
+  );
+}

core/src/modules/module-package-verification.ts

@@ -0,0 +1,650 @@
+import { fork } from "node:child_process";
+import { createHash } from "node:crypto";
+import { chmod, mkdir, mkdtemp, readFile, realpath, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import {
+  isVersionCompatible,
+  type ModuleManifest,
+  safeParseModuleManifest,
+} from "@ekklesia/contracts";
+import {
+  MODULE_PACKAGE_ANY_TARGET,
+  MODULE_PACKAGE_FORMAT,
+  MODULE_PACKAGE_METADATA_FILENAME,
+  type ModulePackageMetadata,
+  safeParseModulePackageMetadata,
+  safeParseModulePackageRuntimePackage,
+} from "@ekklesia/contracts/module-package";
+import { discoverModules, MODULE_MANIFEST_FILENAME, ModuleDiscoveryError } from "./discovery.js";
+import {
+  currentModulePackageHost,
+  MODULE_PACKAGE_NATIVE_TARGETS,
+  type ModulePackageHost,
+} from "./module-package-host.js";
+import { discoverModuleMigrations, ModuleMigrationDiscoveryError } from "./migration-discovery.js";
+import {
+  type ModulePackageArchive,
+  ModulePackageArchiveError,
+  type ModulePackageArchiveErrorCode,
+  readModulePackageArchive,
+} from "./module-package-archive.js";
+import { discoverModuleSchemas, ModuleSchemaDiscoveryError } from "./schema-discovery.js";
+
+/**
+ * Verifies an Ekklesia Module Package v1 archive (ADR 0049) against the platform it runs on, without
+ * ever installing it.
+ *
+ * Order matters: everything that can be decided from bytes is decided before anything is written,
+ * and nothing is executed until the package has proven itself well-formed. The archive is read and
+ * checked for safety in memory; its metadata, every payload digest, and every identity statement
+ * are checked next; only then is it written to a fresh temporary directory, validated by the same
+ * discovery the platform uses, and its backend loaded once in a separate, short-lived process with
+ * an empty environment. A caller that asks for extraction gets the verified tree written to a new
+ * directory only after all of that succeeded.
+ *
+ * Errors carry a stable code and a fixed message. Paths, archive entry names, file contents, module
+ * output, and exception messages never appear in them: an archive is untrusted input, and none of
+ * it is ever echoed.
+ */
+
+export type ModulePackageVerificationErrorCode =
+  | ModulePackageArchiveErrorCode
+  | "MODULE_PACKAGE_DATABASE_RUNTIME_INCOMPATIBLE"
+  | "MODULE_PACKAGE_DATABASE_RUNTIME_UNEXPECTED"
+  | "MODULE_PACKAGE_DIGEST_MISMATCH"
+  | "MODULE_PACKAGE_ENTRYPOINT_LOAD_FAILED"
+  | "MODULE_PACKAGE_EXTRACTION_FAILED"
+  | "MODULE_PACKAGE_FILE_MISMATCH"
+  | "MODULE_PACKAGE_FILE_MISSING"
+  | "MODULE_PACKAGE_FILE_UNLISTED"
+  | "MODULE_PACKAGE_FORMAT_UNSUPPORTED"
+  | "MODULE_PACKAGE_IDENTITY_MISMATCH"
+  | "MODULE_PACKAGE_LIBC_INCOMPATIBLE"
+  | "MODULE_PACKAGE_MANIFEST_INVALID"
+  | "MODULE_PACKAGE_METADATA_INVALID"
+  | "MODULE_PACKAGE_METADATA_MISSING"
+  | "MODULE_PACKAGE_MODULE_INVALID"
+  | "MODULE_PACKAGE_NATIVE_FILE"
+  | "MODULE_PACKAGE_NATIVE_FILE_INCOMPATIBLE"
+  | "MODULE_PACKAGE_NODE_API_INCOMPATIBLE"
+  | "MODULE_PACKAGE_RUNTIME_INCOMPATIBLE"
+  | "MODULE_PACKAGE_RUNTIME_PACKAGE_INVALID"
+  | "MODULE_PACKAGE_SDK_INCOMPATIBLE"
+  | "MODULE_PACKAGE_TARGET_INCOMPATIBLE"
+  | "MODULE_PACKAGE_TRANSITIONAL_UNSUPPORTED"
+  | "MODULE_PACKAGE_VERIFIER_SCRATCH_UNAVAILABLE";
+
+const messages: Readonly<Record<ModulePackageVerificationErrorCode, string>> = Object.freeze({
+  MODULE_PACKAGE_DATABASE_RUNTIME_INCOMPATIBLE:
+    "The package's bundled database runtime does not match this platform's (a transitional constraint).",
+  MODULE_PACKAGE_DATABASE_RUNTIME_UNEXPECTED:
+    "A Module Database ABI package must not carry a transitional database runtime.",
+  MODULE_PACKAGE_DIGEST_MISMATCH: "The archive does not match the SHA-256 it was given.",
+  MODULE_PACKAGE_ENTRYPOINT_LOAD_FAILED:
+    "A backend entrypoint could not be loaded from the package alone.",
+  MODULE_PACKAGE_EXTRACTION_FAILED:
+    "The verified package could not be extracted to a new directory.",
+  MODULE_PACKAGE_FILE_MISMATCH: "A payload file does not match its listed size or SHA-256.",
+  MODULE_PACKAGE_FILE_MISSING: "A file listed in the package metadata is missing from the archive.",
+  MODULE_PACKAGE_FILE_UNLISTED: "The archive contains a file the package metadata does not list.",
+  MODULE_PACKAGE_FORMAT_UNSUPPORTED: "The package format is not one this platform implements.",
+  MODULE_PACKAGE_IDENTITY_MISMATCH:
+    "The package metadata, runtime package.json, and manifest disagree about the module's identity.",
+  MODULE_PACKAGE_LAYOUT_INVALID:
+    "The archive must contain exactly one top-level module directory, with each path once.",
+  MODULE_PACKAGE_LIBC_INCOMPATIBLE:
+    "The package needs a newer C library than this host provides, or one it cannot establish.",
+  MODULE_PACKAGE_LINK: "The archive contains a link; module packages may contain none.",
+  MODULE_PACKAGE_MANIFEST_INVALID: "The package's module manifest is missing or invalid.",
+  MODULE_PACKAGE_METADATA_INVALID: "The package metadata is invalid.",
+  MODULE_PACKAGE_METADATA_MISSING: "The archive contains no package metadata.",
+  MODULE_PACKAGE_MODULE_INVALID: "The packaged module failed module validation.",
+  MODULE_PACKAGE_NATIVE_FILE:
+    "An any-target package contains a native file or a node_modules directory.",
+  MODULE_PACKAGE_NATIVE_FILE_INCOMPATIBLE:
+    "A native file in the package is not built for the package's target.",
+  MODULE_PACKAGE_NODE_API_INCOMPATIBLE:
+    "The package's addons need a Node-API version or Node.js ABI this host does not provide.",
+  MODULE_PACKAGE_RUNTIME_INCOMPATIBLE:
+    "The package needs a Node.js version this host does not run.",
+  MODULE_PACKAGE_RUNTIME_PACKAGE_INVALID:
+    "The package's runtime package.json is not the generated runtime shape.",
+  MODULE_PACKAGE_SDK_INCOMPATIBLE:
+    "The Module SDK bundled into the package is outside the manifest's own moduleSdk range.",
+  MODULE_PACKAGE_SPECIAL_ENTRY:
+    "The archive contains an entry that is neither a directory nor a regular file.",
+  MODULE_PACKAGE_TARGET_INCOMPATIBLE: "The package's target is not one this platform can run.",
+  MODULE_PACKAGE_TOO_LARGE: "The archive exceeds the module package size limits.",
+  MODULE_PACKAGE_TRANSITIONAL_UNSUPPORTED:
+    "The package metadata contains transitional facts this platform does not understand.",
+  MODULE_PACKAGE_VERIFIER_SCRATCH_UNAVAILABLE:
+    "The verifier execution scratch directory is missing, not writable, or mounted noexec.",
+  MODULE_PACKAGE_UNREADABLE: "The file is not a readable gzip-compressed ustar archive.",
+  MODULE_PACKAGE_UNSAFE_MODE: "The archive contains a setuid, setgid, or sticky entry.",
+  MODULE_PACKAGE_UNSAFE_PATH: "The archive contains an absolute, escaping, or non-portable path.",
+});
+
+export class ModulePackageVerificationError extends Error {
+  readonly code: ModulePackageVerificationErrorCode;
+  /** Stable discovery issue codes, when module validation failed; never their messages. */
+  readonly issueCodes: readonly string[];
+
+  constructor(code: ModulePackageVerificationErrorCode, issueCodes: readonly string[] = []) {
+    super(messages[code]);
+    this.name = "ModulePackageVerificationError";
+    this.code = code;
+    this.issueCodes = Object.freeze([...new Set(issueCodes)].sort());
+    this.stack = `${this.name}: ${this.message}`;
+    Object.freeze(this);
+  }
+}
+
+/** What this platform is, for the checks that compare a package against it. */
+export interface ModulePackagePlatform {
+  readonly platformVersion: string;
+  readonly moduleSdkVersion: string;
+  /** The transitional database runtime facts this platform requires a package to agree with. */
+  readonly databaseRuntime: Readonly<Record<string, string>>;
+  /** Defaults to the running process's Node.js version. */
+  readonly nodeVersion?: string;
+  /** Defaults to this process's own host (`currentModulePackageHost`). */
+  readonly host?: ModulePackageHost;
+}
+
+export interface VerifyModulePackageOptions {
+  readonly archivePath: string;
+  /** When given, the archive's SHA-256 must equal it (lowercase hexadecimal). */
+  readonly expectedSha256?: string;
+  readonly platform: ModulePackagePlatform;
+  /** A directory that must not exist yet; the verified module directory is written there. */
+  readonly extractTo?: string;
+  /**
+   * Existing writable directory where backend candidates may execute. Defaults to `os.tmpdir()`.
+   * A hardened caller whose system temporary directory is `noexec` must provide a dedicated
+   * executable scratch mount; each verification creates and removes its own child directory.
+   */
+  readonly executionScratchDirectory?: string;
+  readonly loadTimeoutMs?: number;
+}
+
+export interface ModulePackageVerificationResult {
+  readonly archiveSha256: string;
+  /** Payload files, the metadata file not included. */
+  readonly fileCount: number;
+  readonly moduleId: string;
+  readonly target: string;
+  readonly version: string;
+}
+
+function fail(code: ModulePackageVerificationErrorCode, issueCodes?: readonly string[]): never {
+  throw new ModulePackageVerificationError(code, issueCodes);
+}
+
+function sha256(data: Uint8Array): string {
+  return createHash("sha256").update(data).digest("hex");
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function parseJson(data: Buffer | undefined): unknown {
+  if (data === undefined) {
+    return undefined;
+  }
+  try {
+    return JSON.parse(data.toString("utf8")) as unknown;
+  } catch {
+    return undefined;
+  }
+}
+
+/** The transitional facts this verifier understands, and nothing else (ADR 0049). */
+const UNDERSTOOD_TRANSITIONAL: Readonly<Record<string, readonly string[]>> = Object.freeze({
+  databaseRuntime: Object.freeze(["drizzle-orm"]),
+});
+
+function checkTransitional(raw: Record<string, unknown>): void {
+  const transitional = raw.transitional;
+  if (transitional === undefined) {
+    return;
+  }
+  if (!isRecord(transitional)) {
+    fail("MODULE_PACKAGE_TRANSITIONAL_UNSUPPORTED");
+  }
+  for (const [key, value] of Object.entries(transitional)) {
+    const understood = UNDERSTOOD_TRANSITIONAL[key];
+    if (!understood || !isRecord(value)) {
+      fail("MODULE_PACKAGE_TRANSITIONAL_UNSUPPORTED");
+    }
+    if (Object.keys(value).some((name) => !understood.includes(name))) {
+      fail("MODULE_PACKAGE_TRANSITIONAL_UNSUPPORTED");
+    }
+  }
+}
+
+function readMetadata(files: ReadonlyMap<string, Buffer>): ModulePackageMetadata {
+  const raw = parseJson(files.get(MODULE_PACKAGE_METADATA_FILENAME));
+  if (!files.has(MODULE_PACKAGE_METADATA_FILENAME)) {
+    fail("MODULE_PACKAGE_METADATA_MISSING");
+  }
+  if (!isRecord(raw)) {
+    fail("MODULE_PACKAGE_METADATA_INVALID");
+  }
+  if (raw.packageFormat !== MODULE_PACKAGE_FORMAT) {
+    fail("MODULE_PACKAGE_FORMAT_UNSUPPORTED");
+  }
+  checkTransitional(raw);
+  const parsed = safeParseModulePackageMetadata(raw);
+  if (!parsed.success) {
+    fail("MODULE_PACKAGE_METADATA_INVALID");
+  }
+  return parsed.data;
+}
+
+function checkPayload(metadata: ModulePackageMetadata, files: ReadonlyMap<string, Buffer>): void {
+  const listed = new Set(metadata.files.map((file) => file.path));
+  for (const filePath of files.keys()) {
+    if (filePath !== MODULE_PACKAGE_METADATA_FILENAME && !listed.has(filePath)) {
+      fail("MODULE_PACKAGE_FILE_UNLISTED");
+    }
+  }
+  for (const file of metadata.files) {
+    const data = files.get(file.path);
+    if (data === undefined) {
+      fail("MODULE_PACKAGE_FILE_MISSING");
+    }
+    if (data.length !== file.size || sha256(data) !== file.sha256) {
+      fail("MODULE_PACKAGE_FILE_MISMATCH");
+    }
+  }
+}
+
+function checkIdentity(
+  archive: ModulePackageArchive,
+  metadata: ModulePackageMetadata,
+  files: ReadonlyMap<string, Buffer>,
+): ModuleManifest {
+  const runtimePackage = safeParseModulePackageRuntimePackage(parseJson(files.get("package.json")));
+  if (!runtimePackage.success) {
+    fail("MODULE_PACKAGE_RUNTIME_PACKAGE_INVALID");
+  }
+  const manifest = safeParseModuleManifest(parseJson(files.get(MODULE_MANIFEST_FILENAME)));
+  if (!manifest.success) {
+    fail("MODULE_PACKAGE_MANIFEST_INVALID");
+  }
+  if (
+    archive.topLevel !== metadata.module.id ||
+    manifest.data.id !== metadata.module.id ||
+    manifest.data.version !== metadata.module.version ||
+    runtimePackage.data.version !== metadata.module.version
+  ) {
+    fail("MODULE_PACKAGE_IDENTITY_MISMATCH");
+  }
+  return manifest.data;
+}
+
+function checkCompatibility(
+  metadata: ModulePackageMetadata,
+  manifest: ModuleManifest,
+  files: ReadonlyMap<string, Buffer>,
+  platform: ModulePackagePlatform,
+): void {
+  if (metadata.target === MODULE_PACKAGE_ANY_TARGET) {
+    // An any-target package bundles everything: no addon, no ELF object, no node_modules.
+    for (const [filePath, data] of files) {
+      if (
+        filePath.toLowerCase().endsWith(".node") ||
+        filePath.startsWith("node_modules/") ||
+        isElf(data)
+      ) {
+        fail("MODULE_PACKAGE_NATIVE_FILE");
+      }
+    }
+  } else {
+    checkNativeTarget(metadata, files, platform.host ?? currentModulePackageHost());
+  }
+  if (!isVersionCompatible(platform.nodeVersion ?? process.versions.node, metadata.runtime.node)) {
+    fail("MODULE_PACKAGE_RUNTIME_INCOMPATIBLE");
+  }
+  const sdk = metadata.incorporates["@ekklesia/module-sdk"];
+  if (sdk !== undefined && !isVersionCompatible(sdk, manifest.compatibility.moduleSdk)) {
+    fail("MODULE_PACKAGE_SDK_INCOMPATIBLE");
+  }
+  if (manifest.database?.abi === 1) {
+    if (metadata.transitional?.databaseRuntime !== undefined) {
+      fail("MODULE_PACKAGE_DATABASE_RUNTIME_UNEXPECTED");
+    }
+    return;
+  }
+  // Transitional legacy-v8 path (ADR 0049): Core queries the module's Drizzle tables with its own
+  // Drizzle instance, so a recorded module runtime must match. ABI-v1 packages return above: their
+  // bundled ORM is a private implementation detail and is never compared with Core's.
+  for (const [runtime, version] of Object.entries(metadata.transitional?.databaseRuntime ?? {})) {
+    if (platform.databaseRuntime[runtime] !== version) {
+      fail("MODULE_PACKAGE_DATABASE_RUNTIME_INCOMPATIBLE");
+    }
+  }
+}
+
+function isElf(data: Uint8Array): boolean {
+  return (
+    data.length >= 4 && data[0] === 0x7f && data[1] === 0x45 && data[2] === 0x4c && data[3] === 0x46
+  );
+}
+
+/** `2.41` → `2.41.0`, for comparison against a semantic-version range. */
+function asSemver(version: string): string {
+  const parts = version.split(".");
+  return [...parts, "0", "0"].slice(0, 3).join(".");
+}
+
+/**
+ * A native target (ADR 0049): accepted only for a target this platform implements, on a host that
+ * provably matches it. Platform, CPU, C library family and minimum version, and the Node-API version
+ * or ABI the addons need are all checked; a fact the host cannot establish fails closed. Every ELF
+ * object in the package must be built for the target's machine, and every `.node` addon must be one.
+ */
+function checkNativeTarget(
+  metadata: ModulePackageMetadata,
+  files: ReadonlyMap<string, Buffer>,
+  host: ModulePackageHost,
+): void {
+  const target = MODULE_PACKAGE_NATIVE_TARGETS.get(metadata.target);
+  if (
+    target === undefined ||
+    host.platform !== target.platform ||
+    host.arch !== target.arch ||
+    host.libc?.family !== target.libc
+  ) {
+    fail("MODULE_PACKAGE_TARGET_INCOMPATIBLE");
+  }
+  const required = metadata.runtime.libcVersion;
+  if (
+    required === undefined ||
+    host.libc === undefined ||
+    !isVersionCompatible(asSemver(host.libc.version), required)
+  ) {
+    fail("MODULE_PACKAGE_LIBC_INCOMPATIBLE");
+  }
+  const { nodeAbi, nodeApi } = metadata.runtime;
+  if (
+    (nodeApi === undefined && nodeAbi === undefined) ||
+    (nodeApi !== undefined && (host.nodeApi === undefined || host.nodeApi < nodeApi)) ||
+    (nodeAbi !== undefined && host.nodeAbi !== nodeAbi)
+  ) {
+    fail("MODULE_PACKAGE_NODE_API_INCOMPATIBLE");
+  }
+  for (const [filePath, data] of files) {
+    const addon = filePath.toLowerCase().endsWith(".node");
+    if (!isElf(data)) {
+      if (addon) {
+        fail("MODULE_PACKAGE_NATIVE_FILE_INCOMPATIBLE");
+      }
+      continue;
+    }
+    // ELF64, little-endian, for the target's machine (e_machine at offset 18).
+    if (
+      data.length < 20 ||
+      data[4] !== 2 ||
+      data[5] !== 1 ||
+      data.readUInt16LE(18) !== target.elfMachine
+    ) {
+      fail("MODULE_PACKAGE_NATIVE_FILE_INCOMPATIBLE");
+    }
+  }
+}
+
+/** Writes the archive's directories (`0755`) and files (`0644`) under `root`, which must not exist.
+ * Safe by construction: every path was validated as relative and non-escaping, and only directories
+ * and regular files exist. Ownership is the writing process's, never the archive's. */
+async function writeTree(root: string, archive: ModulePackageArchive): Promise<void> {
+  await mkdir(root, { mode: 0o755 });
+  await chmod(root, 0o755);
+  for (const entry of archive.entries) {
+    const target = path.join(root, ...entry.path.split("/"));
+    if (entry.type === "directory") {
+      await mkdir(target, { mode: 0o755, recursive: true });
+      await chmod(target, 0o755);
+    } else {
+      await mkdir(path.dirname(target), { mode: 0o755, recursive: true });
+      await writeFile(target, entry.data, { flag: "wx", mode: 0o644 });
+      await chmod(target, 0o644);
+    }
+  }
+}
+
+function probeEntrypointPath(): string {
+  // The probe sits beside this file: compiled `.js` in an installation, source `.ts` under a test
+  // runner, which Node runs directly. Either way it is a separate process.
+  const self = fileURLToPath(import.meta.url);
+  return path.join(path.dirname(self), `module-package-probe${path.extname(self)}`);
+}
+
+function decodedMountPath(value: string): string {
+  return value.replace(/\\([0-7]{3})/gu, (_match, octal: string) =>
+    String.fromCharCode(Number.parseInt(octal, 8)),
+  );
+}
+
+/** Linux exposes the effective options of every mount, including a container's tmpfs mounts. A
+ * verifier cannot infer `noexec` from file permissions: native addons are mapped executable rather
+ * than invoked as files. On systems without mountinfo, the load remains the final authority. */
+async function isNoExecMount(directory: string): Promise<boolean> {
+  if (process.platform !== "linux") return false;
+  let mountinfo: string;
+  let canonicalDirectory: string;
+  try {
+    [mountinfo, canonicalDirectory] = await Promise.all([
+      readFile("/proc/self/mountinfo", "utf8"),
+      realpath(directory),
+    ]);
+  } catch {
+    return false;
+  }
+  const mounts = mountinfo
+    .split("\n")
+    .map((line) => line.split(" "))
+    .filter((fields) => fields.length > 6 && fields.includes("-"))
+    .map((fields) => ({
+      mountPoint: decodedMountPath(fields[4] ?? ""),
+      options: (fields[5] ?? "").split(","),
+    }))
+    .filter(
+      ({ mountPoint }) =>
+        canonicalDirectory === mountPoint ||
+        canonicalDirectory.startsWith(mountPoint === "/" ? "/" : `${mountPoint}/`),
+    )
+    .sort((left, right) => right.mountPoint.length - left.mountPoint.length);
+  return mounts[0]?.options.includes("noexec") ?? false;
+}
+
+async function createExecutionScratch(baseDirectory: string): Promise<string> {
+  if (!path.isAbsolute(baseDirectory)) {
+    fail("MODULE_PACKAGE_VERIFIER_SCRATCH_UNAVAILABLE");
+  }
+  try {
+    if (await isNoExecMount(baseDirectory)) {
+      fail("MODULE_PACKAGE_VERIFIER_SCRATCH_UNAVAILABLE");
+    }
+    return await mkdtemp(path.join(baseDirectory, "ekklesia-package-verify-"));
+  } catch (error) {
+    if (error instanceof ModulePackageVerificationError) throw error;
+    fail("MODULE_PACKAGE_VERIFIER_SCRATCH_UNAVAILABLE");
+  }
+}
+
+/** Loads every backend entrypoint in a short-lived child with an empty environment, and reports
+ * only whether each loaded and exported a definition naming this module. */
+async function loadEntrypoints(
+  manifest: Pick<ModuleManifest, "database" | "id" | "version">,
+  entrypoints: Readonly<Record<string, string>>,
+  timeoutMs: number,
+  executionDirectory: string,
+): Promise<void> {
+  const outcome = await new Promise<"ok" | "failed">((resolve) => {
+    let settled = false;
+    let child: ReturnType<typeof fork> | undefined;
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    const finish = (value: "ok" | "failed"): void => {
+      if (!settled) {
+        settled = true;
+        clearTimeout(timer);
+        child?.kill("SIGKILL");
+        resolve(value);
+      }
+    };
+    try {
+      child = fork(
+        probeEntrypointPath(),
+        [
+          JSON.stringify({
+            ...(manifest.database?.abi === 1 ? { databaseAbi: 1 } : {}),
+            entrypoints,
+            moduleId: manifest.id,
+            version: manifest.version,
+          }),
+        ],
+        {
+          cwd: executionDirectory,
+          env: {},
+          execArgv: [],
+          serialization: "json",
+          stdio: ["ignore", "ignore", "ignore", "ipc"],
+        },
+      );
+    } catch {
+      finish("failed");
+      return;
+    }
+    timer = setTimeout(() => finish("failed"), timeoutMs);
+    child.on("message", (message: unknown) => {
+      const failures = isRecord(message) ? message.failures : undefined;
+      finish(Array.isArray(failures) && failures.length === 0 ? "ok" : "failed");
+    });
+    child.on("error", () => finish("failed"));
+    child.on("exit", () => finish("failed"));
+  });
+  if (outcome !== "ok") {
+    fail("MODULE_PACKAGE_ENTRYPOINT_LOAD_FAILED");
+  }
+}
+
+function discoveryIssueCodes(error: unknown): readonly string[] {
+  if (
+    error instanceof ModuleDiscoveryError ||
+    error instanceof ModuleMigrationDiscoveryError ||
+    error instanceof ModuleSchemaDiscoveryError
+  ) {
+    return error.issues.map((issue) => issue.code);
+  }
+  return [];
+}
+
+export async function verifyModulePackage(
+  options: VerifyModulePackageOptions,
+): Promise<ModulePackageVerificationResult> {
+  let compressed: Buffer;
+  try {
+    compressed = await readFile(options.archivePath);
+  } catch {
+    fail("MODULE_PACKAGE_UNREADABLE");
+  }
+  const archiveSha256 = sha256(compressed);
+  if (options.expectedSha256 !== undefined && options.expectedSha256 !== archiveSha256) {
+    fail("MODULE_PACKAGE_DIGEST_MISMATCH");
+  }
+
+  let archive: ModulePackageArchive;
+  try {
+    archive = readModulePackageArchive(compressed);
+  } catch (error) {
+    if (error instanceof ModulePackageArchiveError) {
+      fail(error.code);
+    }
+    fail("MODULE_PACKAGE_UNREADABLE");
+  }
+  const files = new Map(
+    archive.entries
+      .filter((entry) => entry.type === "file")
+      .map((entry) => [entry.path, entry.data] as const),
+  );
+
+  const metadata = readMetadata(files);
+  checkPayload(metadata, files);
+  const manifest = checkIdentity(archive, metadata, files);
+  checkCompatibility(metadata, manifest, files, options.platform);
+
+  const scratch = await createExecutionScratch(options.executionScratchDirectory ?? tmpdir());
+  try {
+    // The candidate alone, in a scratch inventory of its own: never module storage.
+    const modulesDirectory = path.join(scratch, "candidates");
+    await mkdir(modulesDirectory, { mode: 0o755 });
+    await writeTree(path.join(modulesDirectory, metadata.module.id), archive);
+
+    const discoveryOptions = {
+      moduleSdkVersion: options.platform.moduleSdkVersion,
+      modulesDirectory,
+      modulesDirectoryRequired: true,
+      platformVersion: options.platform.platformVersion,
+    } as const;
+    let entrypoints: Record<string, string>;
+    try {
+      // The same static validation the platform runs, against this package alone. A module that
+      // requires another module is validated with its dependencies when it is installed.
+      const [discovered] = await discoverModules(discoveryOptions);
+      if (discovered === undefined) {
+        fail("MODULE_PACKAGE_MODULE_INVALID");
+      }
+      await discoverModuleMigrations(discoveryOptions);
+      entrypoints = {
+        server: discovered.entrypoints.server,
+        ...(discovered.entrypoints.schema ? { schema: discovered.entrypoints.schema } : {}),
+        ...(discovered.entrypoints.jobs ? { jobs: discovered.entrypoints.jobs } : {}),
+      };
+    } catch (error) {
+      if (error instanceof ModulePackageVerificationError) {
+        throw error;
+      }
+      fail("MODULE_PACKAGE_MODULE_INVALID", discoveryIssueCodes(error));
+    }
+
+    // Executed only now, and first in isolation: a schema is imported in this process below only
+    // after the probe proved it loads on its own.
+    await loadEntrypoints(manifest, entrypoints, options.loadTimeoutMs ?? 30_000, scratch);
+    try {
+      await discoverModuleSchemas(discoveryOptions);
+    } catch (error) {
+      fail("MODULE_PACKAGE_MODULE_INVALID", discoveryIssueCodes(error));
+    }
+
+    if (options.extractTo !== undefined) {
+      const extractTo = options.extractTo;
+      let created = false;
+      try {
+        await mkdir(extractTo, { mode: 0o755 });
+        created = true;
+        await rm(extractTo, { recursive: true });
+        await writeTree(extractTo, archive);
+      } catch {
+        // Never leave a partial module directory behind; never remove one this call did not create.
+        if (created) {
+          await rm(extractTo, { force: true, recursive: true }).catch(() => undefined);
+        }
+        fail("MODULE_PACKAGE_EXTRACTION_FAILED");
+      }
+    }
+  } finally {
+    await rm(scratch, { force: true, recursive: true });
+  }
+
+  return Object.freeze({
+    archiveSha256,
+    fileCount: metadata.files.length,
+    moduleId: metadata.module.id,
+    target: metadata.target,
+    version: metadata.module.version,
+  });
+}

core/src/modules/modules-directory.ts

@@ -0,0 +1,66 @@
+import path from "node:path";
+import {
+  isUsableModulesDirectoryPath,
+  MODULES_DIRECTORY_INVALID_MESSAGE,
+  ModuleDiscoveryError,
+} from "./discovery.js";
+
+/** The host environment variable that selects the installed-modules directory (ADR 0048). */
+export const MODULES_DIRECTORY_ENVIRONMENT_VARIABLE = "EKKLESIA_MODULES_DIR";
+
+export interface ResolveModulesDirectoryOptions {
+  /** The raw configured value, exactly as the host environment supplied it; `undefined` when the
+   * variable is unset. */
+  readonly configured: string | undefined;
+  /** Where the platform itself is installed. Only consulted for the development default. */
+  readonly repositoryRoot: string;
+}
+
+/** Spreads directly into `ModuleDiscoveryOptions`, so every consumer discovers through the same
+ * selection, including whether a missing directory is an error. */
+export interface ModulesDirectorySelection {
+  readonly modulesDirectory: string;
+  readonly modulesDirectoryRequired: boolean;
+}
+
+/**
+ * The one place an installation's modules directory is chosen (ADR 0048).
+ *
+ * - Unset: `<repositoryRoot>/modules`, the development checkout's own directory. A checkout without
+ *   one has no modules, exactly as before.
+ * - Set: an absolute path, normalized and used as given — never resolved against the repository or
+ *   the working directory — and required to exist when discovery reads it. The shipping image sets
+ *   it to `/var/lib/ekklesia/modules`.
+ *
+ * Anything else throws a `ModuleDiscoveryError` carrying `MODULES_DIRECTORY_INVALID` and a fixed
+ * message, so every executable already reports it through the discovery error path it has, and the
+ * supplied value never reaches an error, a log, or a report.
+ *
+ * Nothing here — and nothing that calls it — locates the platform's own files relative to the
+ * result: Core's migrations and package metadata live under `repositoryRoot`, wherever modules are.
+ */
+export function resolveModulesDirectory(
+  options: ResolveModulesDirectoryOptions,
+): ModulesDirectorySelection {
+  if (options.configured === undefined) {
+    return Object.freeze({
+      modulesDirectory: path.join(options.repositoryRoot, "modules"),
+      modulesDirectoryRequired: false,
+    });
+  }
+  if (!isUsableModulesDirectoryPath(options.configured)) {
+    throw new ModuleDiscoveryError([
+      {
+        code: "MODULES_DIRECTORY_INVALID",
+        message: MODULES_DIRECTORY_INVALID_MESSAGE,
+        moduleDirectory: ".",
+      },
+    ]);
+  }
+  const normalized = path.normalize(options.configured);
+  return Object.freeze({
+    modulesDirectory:
+      normalized.length > 1 && normalized.endsWith(path.sep) ? normalized.slice(0, -1) : normalized,
+    modulesDirectoryRequired: true,
+  });
+}

core/src/modules/runtime.ts

@@ -7,15 +7,16 @@ import {
   EMPTY_MODULE_CONFIGURATION,
   EMPTY_MODULE_STORAGE,
   type ModuleConfiguration,
+  type ModuleDatabaseExecutor,
   type ModuleHttpRouteRegistrar,
   type ModuleId,
   ModuleRealtimeError,
   type ModuleRealtimePublisher,
   type ModuleRegistrationContext,
   type ModuleRouteDefinitionInput,
+  type ModuleRouteHandler,
   type ModuleRuntimeContext,
   type ModuleRuntimeDefinition,
-  type ModuleRuntimeServices,
   type ModuleStorage,
   moduleRouteShapeKey,
   moduleRoutesOverlap,
@@ -24,6 +25,7 @@ import {
   type RegisteredModuleHttpRoute,
   safeParseModuleRouteDefinition,
 } from "@ekklesia/contracts";
+import type { AnyModuleRuntimeServices, ModuleDatabase } from "./database.js";
 import {
   type DiscoveredModule,
   discoverModules,
@@ -68,6 +70,7 @@ export type ModuleRuntimeIssueCode =
   | "MODULE_ROUTE_PERMISSION_INVALID"
   | "MODULE_ROUTE_PERMISSION_UNDECLARED"
   | "MODULE_RUNTIME_EXPORT_INVALID"
+  | "MODULE_RUNTIME_DATABASE_MISMATCH"
   | "MODULE_RUNTIME_ID_MISMATCH"
   | "MODULE_RUNTIME_IMPORT_FAILED"
   | "MODULE_RUNTIME_VERSION_MISMATCH"
@@ -105,9 +108,8 @@ export interface StartedModuleRuntime {
 /**
  * Per-module frozen configuration snapshots, keyed by module id (ADR 0029).
  *
- * A lookup rather than a field on `ModuleRuntimeServices`, because `services` is deliberately **one
- * shared object identity every module receives** — a property this runtime has a test for — while
- * configuration is per-module by definition. A module with no entry receives
+ * A lookup rather than a field on `ModuleRuntimeServices`, because configuration is resolved and
+ * frozen per module independently of its live service object. A module with no entry receives
  * `EMPTY_MODULE_CONFIGURATION` rather than `undefined`, so `context.config` is always present and
  * module code never branches on whether the platform supplied one.
  */
@@ -124,12 +126,33 @@ function configurationFor(
  * Per-module scoped object storage, keyed by module id (ADR 0030).
  *
  * A lookup for the same reason configuration is one, and emphatically **not** a field on
- * `ModuleRuntimeServices`: `services` is one shared object identity every module receives, while a
- * storage facade is scoped to exactly the buckets one module declared. Sharing it would hand every
+ * `ModuleRuntimeServices`: a storage facade is scoped to exactly the buckets one module declared.
+ * Sharing it would hand every
  * module every other module's storage.
  */
 export type ModuleStorageLookup = ReadonlyMap<string, ModuleStorage>;
 
+/** One frozen service object per module id. Legacy modules may point at objects wrapping the same
+ * facade; ABI-v1 modules each point at their own attributed executor. */
+export type ModuleRuntimeServicesLookup = ReadonlyMap<string, AnyModuleRuntimeServices>;
+export type ModuleRuntimeServicesSource = ModuleRuntimeServicesLookup | AnyModuleRuntimeServices;
+
+function servicesFor(
+  services: ModuleRuntimeServicesSource,
+  module: DiscoveredModule,
+): AnyModuleRuntimeServices {
+  const selected = "get" in services ? services.get(module.manifest.id) : services;
+  if (!selected) {
+    throw new TypeError(`Module ${module.manifest.id} has no runtime services.`);
+  }
+  const expectsAbi = module.manifest.database?.abi === 1;
+  const isAbi = "abiVersion" in selected.database && selected.database.abiVersion === 1;
+  if (expectsAbi !== isAbi) {
+    throw new TypeError(`Module ${module.manifest.id} has the wrong database service.`);
+  }
+  return selected;
+}
+
 function storageFor(storages: ModuleStorageLookup, moduleId: string): ModuleStorage {
   return storages.get(moduleId) ?? EMPTY_MODULE_STORAGE;
 }
@@ -164,10 +187,9 @@ export interface ModuleRuntimeCompositionOptions extends ModuleRuntimeTimeoutOpt
 export interface StartModuleRuntimeOptions
   extends ModuleDiscoveryOptions,
     ModuleRuntimeCompositionOptions {
-  /** The same frozen services object every started module's `start`/`stop` hooks and (once
-   * `apps/api` mounts routes) HTTP handlers receive for this runtime — a required production
-   * dependency, never an optional test-only global. See `ModuleRuntimeServices`. */
-  readonly services: ModuleRuntimeServices;
+  /** The manifest-selected service object for each module. One module's `start`/`stop` hooks and
+   * handlers receive its same entry; ABI-v1 entries carry distinct attributed executors. */
+  readonly services: ModuleRuntimeServicesSource;
 }
 
 interface LoadedModule {
@@ -175,6 +197,13 @@ interface LoadedModule {
   readonly discovered: DiscoveredModule;
 }
 
+type AnyRegistrationHook = (
+  context: ModuleRegistrationContext<ModuleDatabase | ModuleDatabaseExecutor>,
+) => unknown;
+type AnyRuntimeHook = (
+  context: ModuleRuntimeContext<ModuleDatabase | ModuleDatabaseExecutor>,
+) => unknown;
+
 interface CapabilityRegistrationStage {
   readonly capabilities: CapabilityRegistrar;
   commit(): readonly ModuleRuntimeIssue[];
@@ -316,11 +345,11 @@ class StagedCapabilityRegistry {
   createRuntimeContext(
     module: DiscoveredModule,
     phase: "rollback" | "start" | "stop",
-    services: ModuleRuntimeServices,
+    services: AnyModuleRuntimeServices,
     config: ModuleConfiguration,
     storage: ModuleStorage,
     realtime: ModuleRealtimePublisher,
-  ): ModuleRuntimeContext {
+  ): ModuleRuntimeContext<ModuleDatabase | ModuleDatabaseExecutor> {
     const capabilities: CapabilityResolver = Object.freeze({
       resolve: (capabilityId: CapabilityId): RegisteredCapability | undefined => {
         this.#assertAccess(module, capabilityId, phase);
@@ -469,7 +498,7 @@ class StagedModuleHttpRoutes {
         local.push(
           Object.freeze({
             bodyMode: parsed.data.bodyMode,
-            handler: parsed.data.handler,
+            handler: parsed.data.handler as ModuleRouteHandler,
             maxBodyBytes: parsed.data.maxBodyBytes,
             method: parsed.data.method,
             moduleId: module.manifest.id,
@@ -555,6 +584,19 @@ async function loadRuntimeDefinitions(
         ),
       );
     }
+    const runtimeDeclaresAbi = definition.database?.abi === 1;
+    const manifestDeclaresAbi = discovered.manifest.database?.abi === 1;
+    if (runtimeDeclaresAbi !== manifestDeclaresAbi) {
+      matchesManifest = false;
+      issues.push(
+        runtimeIssue(
+          "MODULE_RUNTIME_DATABASE_MISMATCH",
+          "load",
+          discovered.manifest.id,
+          `Module runtime database declaration does not match manifest ${discovered.manifest.id}.`,
+        ),
+      );
+    }
     if (matchesManifest) {
       loaded.push({ definition, discovered });
     }
@@ -580,15 +622,15 @@ async function registerModules(
       module.discovered.manifest.id,
       new Set(module.discovered.manifest.permissions.map((declaration) => declaration.id)),
     );
-    const context: ModuleRegistrationContext = Object.freeze({
+    const context = Object.freeze({
       capabilities: capabilityStage.capabilities,
       config: configurationFor(configurations, module.discovered.manifest.id),
       http: routeStage.http,
       moduleId: module.discovered.manifest.id,
       realtime: realtimeStage.realtime,
-    });
+    }) as ModuleRegistrationContext<ModuleDatabase | ModuleDatabaseExecutor>;
     try {
-      await module.definition.register?.(context);
+      await (module.definition.register as AnyRegistrationHook | undefined)?.(context);
     } catch (error) {
       if (error instanceof ModuleRuntimeSignal) {
         throw new ModuleRuntimeError([error.issue]);
@@ -685,7 +727,7 @@ async function stopModules(
   modules: readonly LoadedModule[],
   registry: StagedCapabilityRegistry,
   phase: "rollback" | "stop",
-  services: ModuleRuntimeServices,
+  services: ModuleRuntimeServicesSource,
   configurations: ModuleConfigurationLookup,
   storages: ModuleStorageLookup,
   realtimeRegistry: StagedModuleRealtimeRegistry,
@@ -698,7 +740,7 @@ async function stopModules(
     // A dependency may keep doing ordinary work while its dependents stop. Deactivate only the
     // module whose stop hook is about to run, not every publisher at the beginning of the sequence.
     realtimeRegistry.deactivateModule(moduleId);
-    const stop = module.definition.stop;
+    const stop = module.definition.stop as AnyRuntimeHook | undefined;
     if (!stop) {
       // No synthetic callback and no timer for a module that declares no stop hook.
       continue;
@@ -710,13 +752,13 @@ async function stopModules(
             registry.createRuntimeContext(
               module.discovered,
               phase,
-              services,
+              servicesFor(services, module.discovered),
               configurationFor(configurations, moduleId),
               storageFor(storages, moduleId),
               realtimeRegistry.publisherFor(moduleId),
+            ) as ModuleRuntimeContext<ModuleDatabase | ModuleDatabaseExecutor>,
           ),
-          ),
-        ),
+        ).then(() => undefined),
         timeoutMs,
       );
       if (outcome === "timed-out") {
@@ -750,7 +792,7 @@ async function stopModules(
 async function startModules(
   modules: readonly LoadedModule[],
   registry: StagedCapabilityRegistry,
-  services: ModuleRuntimeServices,
+  services: ModuleRuntimeServicesSource,
   configurations: ModuleConfigurationLookup,
   storages: ModuleStorageLookup,
   realtimeRegistry: StagedModuleRealtimeRegistry,
@@ -766,15 +808,15 @@ async function startModules(
   for (const module of modules) {
     rollbackCandidates.push(module);
     try {
-      await module.definition.start?.(
+      await (module.definition.start as AnyRuntimeHook | undefined)?.(
         registry.createRuntimeContext(
           module.discovered,
           "start",
-          services,
+          servicesFor(services, module.discovered),
           configurationFor(configurations, module.discovered.manifest.id),
           storageFor(storages, module.discovered.manifest.id),
           realtimeRegistry.publisherFor(module.discovered.manifest.id),
-        ),
+        ) as ModuleRuntimeContext<ModuleDatabase | ModuleDatabaseExecutor>,
       );
       const missingSnapshots = realtimeRegistry.missingSnapshots(module.discovered.manifest.id);
       if (missingSnapshots.length > 0) {
@@ -831,7 +873,7 @@ async function startModules(
  */
 export async function startDiscoveredModuleRuntime(
   discoveredModules: readonly DiscoveredModule[],
-  services: ModuleRuntimeServices,
+  services: ModuleRuntimeServicesSource,
   timeouts: ModuleRuntimeCompositionOptions = {},
 ): Promise<StartedModuleRuntime> {
   const modules = await loadRuntimeDefinitions(discoveredModules);

core/src/modules/schema-discovery.ts

@@ -1,12 +1,16 @@
 import { pathToFileURL } from "node:url";
 import {
   type ModuleId,
-  type ModuleSchemaDefinition,
+  type ModuleSchemaMetadataDefinition,
   moduleTableLocalNameSchema,
   moduleTablePrefix,
-  parseModuleSchemaDefinition,
+  parseModuleSchemaMetadataDefinition,
   physicalModuleTableNameSchema,
 } from "@ekklesia/contracts";
+import {
+  type ModuleSchemaDefinition,
+  parseModuleSchemaDefinition,
+} from "./legacy-schema-definition.js";
 import { is } from "drizzle-orm";
 import { type AnyPgTable, getTableConfig, PgColumn, PgTable } from "drizzle-orm/pg-core";
 import {
@@ -40,7 +44,9 @@ export interface DiscoveredModuleTable {
   readonly exportName: string;
   readonly moduleId: ModuleId;
   readonly name: string;
-  readonly table: AnyPgTable;
+  /** Present only for a temporary legacy-facade module. ABI-v1 schema discovery publishes no ORM
+   * object and contributes nothing to the legacy aggregate below. */
+  readonly table?: AnyPgTable;
 }
 
 export interface DiscoveredModuleSchema {
@@ -55,21 +61,40 @@ export interface ModuleSchemaAggregate {
   readonly tables: readonly DiscoveredModuleTable[];
 }
 
-interface LoadedModuleSchema {
+interface LoadedLegacyModuleSchema {
   readonly definition: ModuleSchemaDefinition;
   readonly discovered: DiscoveredModule;
+  readonly mode: "legacy";
 }
 
+interface LoadedAbiModuleSchema {
+  readonly definition: ModuleSchemaMetadataDefinition;
+  readonly discovered: DiscoveredModule;
+  readonly mode: "abi-v1";
+}
+
+type LoadedModuleSchema = LoadedLegacyModuleSchema | LoadedAbiModuleSchema;
+
 interface InspectedModuleSchema {
   readonly discovered: DiscoveredModule;
   readonly tables: ModuleTableCandidate[];
 }
 
-interface ModuleTableCandidate extends DiscoveredModuleTable {
+interface LegacyModuleTableCandidate extends DiscoveredModuleTable {
+  readonly mode: "legacy";
   readonly foreignKeys: ReturnType<typeof getTableConfig>["foreignKeys"];
   readonly path: string;
+  readonly table: AnyPgTable;
 }
 
+interface AbiModuleTableCandidate extends DiscoveredModuleTable {
+  readonly mode: "abi-v1";
+  readonly foreignKeys: ModuleSchemaMetadataDefinition["tables"][number]["foreignKeys"];
+  readonly path: string;
+}
+
+type ModuleTableCandidate = LegacyModuleTableCandidate | AbiModuleTableCandidate;
+
 const drizzleTableIsAlias = Symbol.for("drizzle:IsAlias");
 
 export class ModuleSchemaDiscoveryError extends Error {
@@ -156,9 +181,13 @@ async function loadSchemaDefinitions(discoveredModules: readonly DiscoveredModul
       continue;
     }
 
-    let definition: ModuleSchemaDefinition;
+    let definition: ModuleSchemaDefinition | ModuleSchemaMetadataDefinition;
+    const mode = discovered.manifest.database?.abi === 1 ? "abi-v1" : "legacy";
     try {
-      definition = parseModuleSchemaDefinition(defaultExport(moduleNamespace));
+      definition =
+        mode === "abi-v1"
+          ? parseModuleSchemaMetadataDefinition(defaultExport(moduleNamespace))
+          : parseModuleSchemaDefinition(defaultExport(moduleNamespace));
     } catch {
       issues.push(
         issue(
@@ -182,7 +211,11 @@ async function loadSchemaDefinitions(discoveredModules: readonly DiscoveredModul
       continue;
     }
 
-    loaded.push({ definition, discovered });
+    loaded.push(
+      mode === "abi-v1"
+        ? { definition: definition as ModuleSchemaMetadataDefinition, discovered, mode }
+        : { definition: definition as ModuleSchemaDefinition, discovered, mode },
+    );
   }
 
   return { issues, loaded };
@@ -197,6 +230,58 @@ function inspectTables(
 
   for (const loaded of loadedSchemas) {
     const moduleId = loaded.discovered.manifest.id;
+    if (loaded.mode === "abi-v1") {
+      const candidates: AbiModuleTableCandidate[] = [];
+      loaded.definition.tables.forEach((table, index) => {
+        const path = `tables.${index}`;
+        const candidate: AbiModuleTableCandidate = {
+          exportName: table.name,
+          foreignKeys: table.foreignKeys,
+          mode: "abi-v1",
+          moduleId,
+          name: table.name,
+          path,
+        };
+        const tablePrefix = moduleTablePrefix(moduleId);
+        if (!table.name.startsWith(tablePrefix)) {
+          issues.push(
+            issue(
+              "MODULE_SCHEMA_TABLE_NAMESPACE_INVALID",
+              moduleId,
+              `Table ${table.name} is not namespaced for module ${moduleId}.`,
+              { path, tableName: table.name },
+            ),
+          );
+        } else if (
+          !moduleTableLocalNameSchema.safeParse(table.name.slice(tablePrefix.length)).success
+        ) {
+          issues.push(
+            issue(
+              "MODULE_SCHEMA_TABLE_NAME_INVALID",
+              moduleId,
+              `Module ${moduleId} has an invalid local table name.`,
+              { path },
+            ),
+          );
+        }
+        const existing = firstTableByName.get(table.name);
+        if (existing) {
+          issues.push(
+            issue(
+              "MODULE_SCHEMA_TABLE_DUPLICATE",
+              moduleId,
+              `Table ${table.name} is declared more than once.`,
+              { path, tableName: table.name },
+            ),
+          );
+        } else {
+          firstTableByName.set(table.name, candidate);
+        }
+        candidates.push(candidate);
+      });
+      inspectedModules.push({ discovered: loaded.discovered, tables: candidates });
+      continue;
+    }
     const seenTables = new Set<AnyPgTable>();
     const candidates: ModuleTableCandidate[] = [];
     const entries = Object.entries(loaded.definition.tables).sort(([left], [right]) =>
@@ -293,6 +378,7 @@ function inspectTables(
       const candidate: ModuleTableCandidate = {
         exportName,
         foreignKeys: config.foreignKeys,
+        mode: "legacy",
         moduleId,
         name: config.name,
         path,
@@ -321,8 +407,8 @@ function inspectTables(
 }
 
 function validForeignKeyTarget(
-  foreignKey: ModuleTableCandidate["foreignKeys"][number],
-  candidate: ModuleTableCandidate,
+  foreignKey: LegacyModuleTableCandidate["foreignKeys"][number],
+  candidate: LegacyModuleTableCandidate,
 ): AnyPgTable | undefined {
   try {
     const reference = foreignKey.reference();
@@ -356,14 +442,42 @@ function inspectForeignKeys(
   const ownerByTable = new Map<AnyPgTable, ModuleId>();
   for (const inspected of inspectedModules) {
     for (const candidate of inspected.tables) {
+      if (candidate.mode === "legacy") {
         ownerByTable.set(candidate.table, candidate.moduleId);
       }
     }
+  }
 
   for (const inspected of inspectedModules) {
     const moduleId = inspected.discovered.manifest.id;
     const ownedTables = new Set(inspected.tables.map((candidate) => candidate.table));
     for (const candidate of inspected.tables) {
+      if (candidate.mode === "abi-v1") {
+        const ownedNames = new Set(inspected.tables.map((table) => table.name));
+        candidate.foreignKeys.forEach((foreignKey, foreignKeyIndex) => {
+          const path = `${candidate.path}.foreignKeys.${foreignKeyIndex}`;
+          if (!foreignKey.table.startsWith(moduleTablePrefix(moduleId))) {
+            issues.push(
+              issue(
+                "MODULE_SCHEMA_CROSS_MODULE_FOREIGN_KEY",
+                moduleId,
+                `Table ${candidate.name} has a foreign key outside module ${moduleId}.`,
+                { path, tableName: candidate.name },
+              ),
+            );
+          } else if (!ownedNames.has(foreignKey.table)) {
+            issues.push(
+              issue(
+                "MODULE_SCHEMA_FOREIGN_KEY_TARGET_MISSING",
+                moduleId,
+                `Table ${candidate.name} references a table not exported by module ${moduleId}.`,
+                { path, tableName: candidate.name },
+              ),
+            );
+          }
+        });
+        continue;
+      }
       candidate.foreignKeys.forEach((foreignKey, foreignKeyIndex) => {
         const path = `${candidate.path}.foreignKeys.${foreignKeyIndex}`;
         const foreignTable = validForeignKeyTarget(foreignKey, candidate);
@@ -446,7 +560,9 @@ function publishAggregate(
         moduleId: inspected.discovered.manifest.id,
         tables: Object.freeze(
           inspected.tables
-            .map(({ foreignKeys: _foreignKeys, path: _path, ...table }) => Object.freeze(table))
+            .map(({ foreignKeys: _foreignKeys, mode: _mode, path: _path, ...table }) =>
+              Object.freeze(table),
+            )
             .sort((left, right) => compareText(left.exportName, right.exportName)),
         ),
       }),
@@ -458,7 +574,11 @@ function publishAggregate(
       .sort((left, right) => compareText(left.name, right.name)),
   );
   const drizzleSchema = Object.freeze(
-    Object.fromEntries(tables.map((table) => [table.name, table.table] as const)),
+    Object.fromEntries(
+      tables.flatMap((table) =>
+        table.table === undefined ? [] : [[table.name, table.table] as const],
+      ),
+    ),
   );
 
   return Object.freeze({ discoveredModules, drizzleSchema, modules, tables });

core/tests/cli-bootstrap-platform-owner.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
+import { IMPORT_SAFETY_TEST_TIMEOUT_MS } from "./support/import-safety.js";
 
 const poolConstructor = vi.hoisted(() => vi.fn());
 
@@ -7,7 +8,9 @@ vi.mock("pg", () => ({ Pool: poolConstructor }));
 describe("bootstrap-platform-owner CLI import safety", () => {
   const originalEnv = { ...process.env };
 
-  it("does not read DATABASE_URL, connect to PostgreSQL, or run bootstrap merely by importing the module", async () => {
+  it(
+    "does not read DATABASE_URL, connect to PostgreSQL, or run bootstrap merely by importing the module",
+    async () => {
       delete process.env.DATABASE_URL;
 
       // Under Vitest, process.argv[1] is never this file's own path, so isDirectExecution() is
@@ -18,5 +21,7 @@ describe("bootstrap-platform-owner CLI import safety", () => {
       expect(poolConstructor).not.toHaveBeenCalled();
 
       process.env = originalEnv;
-  });
+    },
+    IMPORT_SAFETY_TEST_TIMEOUT_MS,
+  );
 });

core/tests/cli-create-initial-owner.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
+import { IMPORT_SAFETY_TEST_TIMEOUT_MS } from "./support/import-safety.js";
 
 const poolConstructor = vi.hoisted(() => vi.fn());
 
@@ -7,7 +8,9 @@ vi.mock("pg", () => ({ Pool: poolConstructor }));
 describe("create-initial-owner CLI import safety", () => {
   const originalEnv = { ...process.env };
 
-  it("does not read DATABASE_URL, connect to PostgreSQL, or create anything merely by importing the module", async () => {
+  it(
+    "does not read DATABASE_URL, connect to PostgreSQL, or create anything merely by importing the module",
+    async () => {
       delete process.env.DATABASE_URL;
 
       // Under Vitest, process.argv[1] is never this file's own path, so isDirectExecution() is false
@@ -18,7 +21,9 @@ describe("create-initial-owner CLI import safety", () => {
       expect(poolConstructor).not.toHaveBeenCalled();
 
       process.env = originalEnv;
-  });
+    },
+    IMPORT_SAFETY_TEST_TIMEOUT_MS,
+  );
 
   it("reads no environment variable for the password", async () => {
     // The password is prompted for or read from standard input; it is deliberately never taken from

core/tests/core-migration-discovery.test.ts

@@ -91,7 +91,7 @@ async function createModule(
     writeFile(
       path.join(moduleDirectory, "ekklesia.module.json"),
       JSON.stringify({
-        manifestVersion: 7,
+        manifestVersion: 8,
         id,
         name: `${id} module`,
         version: "0.1.0",

core/tests/dashboard-flat-modules.test.ts

@@ -59,7 +59,7 @@ async function createModule(modulesDirectory: string, fixture: ModuleFixture): P
         : {}),
       entrypoints: { server: "./dist/server/index.js", ui: "./dist/ui/index.js" },
       id: fixture.id,
-      manifestVersion: 7,
+      manifestVersion: 8,
       name: fixture.name,
       version: "1.0.0",
     }),

core/tests/doctor-host-configuration.test.ts

@@ -8,10 +8,11 @@ import {
   diagnoseEkklesia,
   formatDoctorReport,
 } from "../src/diagnostics/index.js";
-import type {
-  DiscoveredModule,
-  ModuleMigrationAggregate,
-  ModuleSchemaAggregate,
+import {
+  type DiscoveredModule,
+  discoverModules,
+  type ModuleMigrationAggregate,
+  type ModuleSchemaAggregate,
 } from "../src/modules/index.js";
 
 /**
@@ -34,8 +35,8 @@ const moduleSecret = "module-secret-material";
 
 const metadata = Object.freeze({
   moduleSdkVersion: "0.1.0",
-  modulesDirectory: "/not-rendered/modules",
   platformVersion: "0.1.0",
+  repositoryRoot: "/not-rendered",
   runtimeRange: ">=24.11.0 <25",
   runtimeVersion: "24.15.0",
 });
@@ -82,7 +83,7 @@ function discoveredModule(id: string, overrides: Record<string, unknown> = {}):
       },
       entrypoints: { server: "./dist/server.js" },
       id,
-      manifestVersion: 7,
+      manifestVersion: 8,
       name: `${id} module`,
       permissions: [],
       storage: { buckets: [] },
@@ -454,3 +455,33 @@ describe("Doctor host-configuration parity — sanitization", () => {
     expect(JSON.stringify(report)).not.toContain("S3_ACCESS_KEY");
   });
 });
+
+describe("Doctor reads the modules directory from the same host configuration (ADR 0048)", () => {
+  it("uses the repository's own modules directory when EKKLESIA_MODULES_DIR is unset", () => {
+    const doctorOptions = createDoctorOptions(environment(), metadata);
+    expect(doctorOptions.moduleDiscovery.modulesDirectory).toBe("/not-rendered/modules");
+    expect(doctorOptions.moduleDiscovery.modulesDirectoryRequired).toBe(false);
+    expect(doctorOptions.coreMigrationsDirectory).toBe("/not-rendered/core/drizzle");
+  });
+
+  it("uses a configured directory, and still finds Core's migrations under the platform", () => {
+    const doctorOptions = createDoctorOptions(
+      environment({ EKKLESIA_MODULES_DIR: "/var/lib/ekklesia/modules" }),
+      metadata,
+    );
+    expect(doctorOptions.moduleDiscovery.modulesDirectory).toBe("/var/lib/ekklesia/modules");
+    expect(doctorOptions.moduleDiscovery.modulesDirectoryRequired).toBe(true);
+    expect(doctorOptions.coreMigrationsDirectory).toBe("/not-rendered/core/drizzle");
+  });
+
+  it("hands an unusable value to discovery to report, rather than throwing before a report exists", async () => {
+    const doctorOptions = createDoctorOptions(
+      environment({ EKKLESIA_MODULES_DIR: "relative/private-mount-91aa" }),
+      metadata,
+    );
+    expect(doctorOptions.moduleDiscovery.modulesDirectoryRequired).toBe(true);
+    const report = await diagnoseEkklesia(doctorOptions, dependencies({ discoverModules }));
+    expect(report.checks.find((entry) => entry.id === "modules.discovery")?.status).toBe("failure");
+    expect(JSON.stringify(report)).not.toContain("private-mount-91aa");
+  });
+});

core/tests/doctor-import.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
+import { IMPORT_SAFETY_TEST_TIMEOUT_MS } from "./support/import-safety.js";
 
 const discoverModules = vi.fn();
 const discoverModuleSchemas = vi.fn();
@@ -22,7 +23,9 @@ vi.mock("../src/migrations/index.js", async (importOriginal) => ({
 }));
 
 describe("Doctor import safety", () => {
-  it("does not discover, connect, plan, or print when imported", async () => {
+  it(
+    "does not discover, connect, plan, or print when imported",
+    async () => {
       const log = vi.spyOn(console, "log").mockImplementation(() => undefined);
       const error = vi.spyOn(console, "error").mockImplementation(() => undefined);
 
@@ -41,5 +44,7 @@ describe("Doctor import safety", () => {
 
       log.mockRestore();
       error.mockRestore();
-  });
+    },
+    IMPORT_SAFETY_TEST_TIMEOUT_MS,
+  );
 });

core/tests/doctor-report.test.ts

@@ -68,6 +68,7 @@ describe("Ekklesia Doctor terminal report", () => {
   it("renders the real zero-module and no-database shape exactly", async () => {
     const report = await diagnoseEkklesia(
       {
+        coreMigrationsDirectory: "/not-rendered/core/drizzle",
         moduleDiscovery: {
           moduleSdkVersion: "0.1.0",
           modulesDirectory: "/not-rendered/modules",
@@ -117,6 +118,7 @@ Identity
     Identity runtime configuration (signing key, base URL, trusted origins) is not set.
   ✓ Direct client-address mode
     Trusts only the actual immediate socket peer for rate limiting; no forwarded header is trusted.
+    Checked: the environment Doctor runs with. In the reference deployment \`migrate\` is given the API's client-address values; a running API's own value is shown by \`docker compose exec api printenv EKKLESIA_CLIENT_ADDRESS_MODE\`.
 
 Object storage
   ○ Object storage not configured
@@ -134,6 +136,7 @@ Result: READY WITH WARNINGS`);
   it("renders every check the report contains, so none can silently affect the result", async () => {
     const report = await diagnoseEkklesia(
       {
+        coreMigrationsDirectory: "/not-rendered/core/drizzle",
         moduleDiscovery: {
           moduleSdkVersion: "0.1.0",
           modulesDirectory: "/not-rendered/modules",
@@ -158,6 +161,7 @@ Result: READY WITH WARNINGS`);
   it("does not depend on NO_COLOR or terminal interactivity", async () => {
     const report = await diagnoseEkklesia(
       {
+        coreMigrationsDirectory: "/not-rendered/core/drizzle",
         moduleDiscovery: {
           moduleSdkVersion: "0.1.0",
           modulesDirectory: "/not-rendered/modules",
@@ -206,6 +210,7 @@ Result: READY WITH WARNINGS`);
     const report = await diagnoseEkklesia(
       {
         databaseUrl: "postgresql://another:[email protected]/db",
+        coreMigrationsDirectory: "/not-rendered/core/drizzle",
         moduleDiscovery: {
           moduleSdkVersion: "0.1.0",
           modulesDirectory: "/not-rendered/modules",

core/tests/doctor.test.ts

@@ -1,5 +1,9 @@
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { type ModuleManifest, parsePermissionId } from "@ekklesia/contracts";
-import { describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import { createPermissionRegistry, PermissionRegistryError } from "../src/authorization/index.js";
 import {
   type DoctorCheck,
@@ -28,7 +32,11 @@ const checksumA = "a".repeat(64);
 const checksumB = "b".repeat(64);
 const checksumC = "c".repeat(64);
 
-function discoveredModule(id: string, version = "0.1.0"): DiscoveredModule {
+function discoveredModule(
+  id: string,
+  version = "0.1.0",
+  database?: { readonly abi: 1 },
+): DiscoveredModule {
   return {
     contributions: [],
     directory: `/unpublished/${id}`,
@@ -37,13 +45,14 @@ function discoveredModule(id: string, version = "0.1.0"): DiscoveredModule {
       capabilities: [],
       compatibility: { moduleSdk: "^0.1.0", platform: "^0.1.0" },
       configuration: [],
+      ...(database ? { database } : {}),
       dependencies: {
         capabilities: { optional: {}, required: {} },
         modules: { optional: {}, required: {} },
       },
       entrypoints: { server: "./dist/server.js" },
       id,
-      manifestVersion: 7,
+      manifestVersion: 8,
       name: `${id} module`,
       permissions: [],
       storage: { buckets: [] },
@@ -114,7 +123,10 @@ function emptyDatabase(): MigrationDatabase {
   });
 }
 
-function plan(entries: MigrationPlanResult["entries"] = []): MigrationPlanResult {
+function plan(
+  entries: MigrationPlanResult["entries"] = [],
+  retained: MigrationPlanResult["retained"] = [],
+): MigrationPlanResult {
   const appliedCount = entries.filter((entry) => entry.status === "applied").length;
   const approvalRequiredCount = entries.filter(
     (entry) => entry.status === "approval-blocked",
@@ -124,6 +136,7 @@ function plan(entries: MigrationPlanResult["entries"] = []): MigrationPlanResult
     approvalRequiredCount,
     entries: Object.freeze([...entries]),
     pendingCount: entries.length - appliedCount,
+    retained: Object.freeze([...retained]),
   });
 }
 
@@ -151,6 +164,7 @@ function dependencies(overrides: Partial<DoctorDependencies> = {}): DoctorDepend
 function options(databaseUrl?: string): DoctorOptions {
   return {
     ...(databaseUrl === undefined ? {} : { databaseUrl }),
+    coreMigrationsDirectory: "/not-rendered/core/drizzle",
     moduleDiscovery: {
       moduleSdkVersion: "0.1.0",
       modulesDirectory: "/not-rendered/modules",
@@ -285,7 +299,7 @@ describe("Ekklesia Doctor outbound email reporting", () => {
 describe("Ekklesia Doctor diagnostics", () => {
   it("publishes a healthy deterministic static report without database configuration", async () => {
     const people = discoveredModule("people");
-    const calendar = discoveredModule("calendar", "0.2.0");
+    const calendar = discoveredModule("calendar", "0.2.0", { abi: 1 });
     const inventory = migrationAggregate(
       [migration("people", "0000_initial", checksumA)],
       [people, calendar],
@@ -318,6 +332,7 @@ describe("Ekklesia Doctor diagnostics", () => {
     ]);
     expect(check(report, "modules.discovery").details).toEqual(["people 0.1.0", "calendar 0.2.0"]);
     expect(check(report, "modules.dependencies").details).toEqual(["Order: people → calendar"]);
+    expect(check(report, "schemas.discovery")).toMatchObject({ status: "pass" });
     expect(check(report, "modules.permissions")).toMatchObject({
       details: ["0 permissions registered"],
       status: "pass",
@@ -705,6 +720,88 @@ describe("Ekklesia Doctor diagnostics", () => {
     expect(report.result).toBe("ready-with-warnings"); // PostgreSQL is still skipped in this fixture
   });
 
+  describe("Dashboard and API topology (ADR 0045)", () => {
+    const secret = "correct-horse-battery-staple-0123456789";
+    async function identityCheck(identity: {
+      readonly baseUrl: string;
+      readonly dashboardOrigin?: string;
+      readonly environment?: "development" | "production";
+      readonly trustedOrigins: readonly string[];
+    }) {
+      const report = await diagnoseEkklesia(
+        {
+          ...options(),
+          identityConfiguration: { environment: "production", secret, ...identity },
+        },
+        dependencies(),
+      );
+      return { check: check(report, "identity.configuration"), report };
+    }
+
+    it("reports the same-origin topology when no Dashboard origin is set", async () => {
+      const { check: identity } = await identityCheck({
+        baseUrl: "https://ekklesia.example.test",
+        trustedOrigins: ["https://ekklesia.example.test"],
+      });
+      expect(identity.status).toBe("pass");
+      expect(identity.details).toContain(
+        "Topology: same-origin (the Dashboard is served from the API's origin).",
+      );
+    });
+
+    it("reports the split topology for sibling hostnames without printing either", async () => {
+      const { check: identity, report } = await identityCheck({
+        baseUrl: "https://api.example.test",
+        dashboardOrigin: "https://dash.example.test",
+        trustedOrigins: ["https://dash.example.test"],
+      });
+      expect(identity.status).toBe("pass");
+      expect(identity.details).toContain(
+        "Topology: split (the Dashboard and the API are on separate origins).",
+      );
+      expect(JSON.stringify(report)).not.toContain("dash.example.test");
+      expect(JSON.stringify(report)).not.toContain("api.example.test");
+    });
+
+    it.each([
+      ["different registrable domains", "https://dash.example.test", "https://api.example.org"],
+      ["two IP addresses", "https://10.0.0.2", "https://10.0.0.1"],
+      ["a parent that is only a top-level domain", "https://dash.test", "https://api.test"],
+    ])("warns, without failing, when split hostnames may not share a site: %s", async (_case, dashboardOrigin, baseUrl) => {
+      const { check: identity, report } = await identityCheck({
+        baseUrl,
+        dashboardOrigin,
+        trustedOrigins: [dashboardOrigin],
+      });
+      expect(identity.status).toBe("warning");
+      expect(identity.details.join("\n")).toContain("not siblings under one parent domain");
+      expect(doctorExitCode(report)).toBe(0);
+    });
+
+    it("treats another port on the same host as the same site (split development)", async () => {
+      const { check: identity } = await identityCheck({
+        baseUrl: "http://localhost:3000",
+        dashboardOrigin: "http://localhost:5173",
+        environment: "development",
+        trustedOrigins: ["http://localhost:5173"],
+      });
+      expect(identity.status).toBe("pass");
+    });
+
+    it("fails, as the API's startup would, for a Dashboard origin the API does not trust", async () => {
+      const { check: identity, report } = await identityCheck({
+        baseUrl: "https://api.example.test",
+        dashboardOrigin: "https://dash.example.test",
+        trustedOrigins: ["https://other.example.test"],
+      });
+      expect(identity.status).toBe("failure");
+      expect(identity.details.some((detail) => detail.includes("DASHBOARD_ORIGIN_UNTRUSTED"))).toBe(
+        true,
+      );
+      expect(doctorExitCode(report)).toBe(1);
+    });
+  });
+
   it("fails identity configuration for an invalid secret without leaking it", async () => {
     const hostileSecret = "s3cr3t-do-not-log";
     const report = await diagnoseEkklesia(
@@ -876,6 +973,21 @@ describe("Ekklesia Doctor diagnostics", () => {
     expect(report.result).toBe("ready-with-warnings");
   });
 
+  it("says whose client-address configuration it checked: this process's, not a running API's", async () => {
+    for (const clientAddress of [
+      undefined,
+      { header: "x-forwarded-for", mode: "trusted-proxy" as const, trustedProxies: ["10.0.0.1"] },
+      { header: "x-forwarded-for", mode: "trusted-proxy" as const, trustedProxies: ["bad"] },
+    ]) {
+      const report = await diagnoseEkklesia(
+        { ...options(), ...(clientAddress ? { clientAddress } : {}) },
+        dependencies(),
+      );
+      const details = check(report, "identity.client-address").details;
+      expect(details.some((detail) => detail.includes("environment Doctor runs with"))).toBe(true);
+    }
+  });
+
   it("passes client-address configuration with an explicitly configured trusted-proxy mode", async () => {
     const report = await diagnoseEkklesia(
       {
@@ -1560,3 +1672,113 @@ describe("Doctor reports declared browser contributions", () => {
     ]);
   });
 });
+
+describe("Doctor with installation-owned module storage (ADR 0048)", () => {
+  const platformCoreMigrations = path.join(
+    path.dirname(fileURLToPath(import.meta.url)),
+    "..",
+    "drizzle",
+  );
+  const temporaryDirectories: string[] = [];
+
+  afterEach(async () => {
+    await Promise.all(
+      temporaryDirectories.splice(0).map((directory) => rm(directory, { recursive: true })),
+    );
+  });
+
+  it("finds Core's migrations where the platform is installed, not beside the modules", async () => {
+    // A modules directory far from the platform, as the image mounts /var/lib/ekklesia/modules. Its
+    // parent has no `core/drizzle`, so a Doctor that still derived Core's migrations from the
+    // modules directory would fail migration discovery here.
+    const external = await mkdtemp(path.join(tmpdir(), "ekklesia-external-modules-"));
+    temporaryDirectories.push(external);
+    const report = await diagnoseEkklesia({
+      coreMigrationsDirectory: platformCoreMigrations,
+      moduleDiscovery: {
+        moduleSdkVersion: "0.1.0",
+        modulesDirectory: external,
+        modulesDirectoryRequired: true,
+        platformVersion: "0.1.0",
+      },
+      runtimeRange: ">=24.11.0 <25",
+      runtimeVersion: "24.15.0",
+    });
+
+    expect(check(report, "modules.discovery").status).toBe("pass");
+    const migrations = check(report, "migrations.discovery");
+    expect(migrations.status).toBe("pass");
+    expect(migrations.details.some((detail) => detail.startsWith("core:0000_"))).toBe(true);
+    expect(JSON.stringify(report)).not.toContain(external);
+  });
+
+  it("reports an unusable configured modules directory as a discovery failure, naming no path", async () => {
+    const report = await diagnoseEkklesia({
+      coreMigrationsDirectory: platformCoreMigrations,
+      moduleDiscovery: {
+        moduleSdkVersion: "0.1.0",
+        modulesDirectory: "relative/private-mount-3c9d",
+        modulesDirectoryRequired: true,
+        platformVersion: "0.1.0",
+      },
+      runtimeRange: ">=24.11.0 <25",
+      runtimeVersion: "24.15.0",
+    });
+
+    const discovery = check(report, "modules.discovery");
+    expect(discovery.status).toBe("failure");
+    expect(discovery.details).toEqual(["The configured modules directory is not usable."]);
+    expect(check(report, "migrations.discovery").status).toBe("skipped");
+    expect(JSON.stringify(report)).not.toContain("private-mount-3c9d");
+  });
+
+  it("reports a configured modules directory that does not exist, naming no path", async () => {
+    const parent = await mkdtemp(path.join(tmpdir(), "ekklesia-missing-modules-"));
+    temporaryDirectories.push(parent);
+    const report = await diagnoseEkklesia({
+      coreMigrationsDirectory: platformCoreMigrations,
+      moduleDiscovery: {
+        moduleSdkVersion: "0.1.0",
+        modulesDirectory: path.join(parent, "absent"),
+        modulesDirectoryRequired: true,
+        platformVersion: "0.1.0",
+      },
+      runtimeRange: ">=24.11.0 <25",
+      runtimeVersion: "24.15.0",
+    });
+
+    const discovery = check(report, "modules.discovery");
+    expect(discovery.status).toBe("failure");
+    expect(discovery.details).toEqual(["The configured modules directory could not be read."]);
+    expect(JSON.stringify(report)).not.toContain(parent);
+  });
+
+  it("reports an absent module's retained history without blocking readiness", async () => {
+    const report = await diagnoseEkklesia(
+      options("postgres://[email protected]/ekklesia"),
+      dependencies({
+        planMigrations: vi.fn(async () =>
+          plan(
+            [planEntry("core:0000_identity_core_tables", "a".repeat(64), "applied")],
+            [Object.freeze({ appliedCount: 2, moduleId: "calendar" })],
+          ),
+        ),
+      }),
+    );
+
+    const planCheck = check(report, "postgresql.plan");
+    expect(planCheck.status).toBe("pass");
+    expect(planCheck.details).toContain(
+      "retained · calendar · 2 applied migrations kept; the module is not installed",
+    );
+  });
+
+  it("passes Core's own migration directory to migration discovery", async () => {
+    const discoverMigrations = vi.fn(async () => migrationAggregate());
+    await diagnoseEkklesia(options(), dependencies({ discoverMigrations }));
+    expect(discoverMigrations).toHaveBeenCalledWith({
+      coreMigrationsDirectory: "/not-rendered/core/drizzle",
+      moduleDiscovery: options().moduleDiscovery,
+    });
+  });
+});

core/tests/fixtures/module-database-integration/db-facade/ekklesia.module.json

@@ -1,12 +1,12 @@
 {
-  "manifestVersion": 7,
+  "manifestVersion": 8,
   "id": "db-facade",
   "name": "Database Facade Integration Test Module",
   "description": "Test-only installed module fixture proving ModuleDatabase against real PostgreSQL. Never discovered by production startup, Doctor, or normal migration aggregation — only apps/api/tests/module-database.integration.ts points discovery at it explicitly.",
   "version": "0.1.0",
   "compatibility": {
-    "platform": "^0.1.0",
-    "moduleSdk": "^0.1.0"
+    "platform": "^0.2.0",
+    "moduleSdk": "^0.2.0"
   },
   "permissions": [
     {

core/tests/host-configuration-boundaries.test.ts

@@ -68,6 +68,7 @@ const INTERPRETED_VARIABLES = Object.freeze([
   "EKKLESIA_IDENTITY_BASE_URL",
   "EKKLESIA_IDENTITY_SECRET",
   "EKKLESIA_IDENTITY_TRUSTED_ORIGINS",
+  "EKKLESIA_MODULES_DIR",
   "EKKLESIA_PUBLIC_SIGNUP_ENABLED",
   "EKKLESIA_SMTP_FROM_ADDRESS",
   "EKKLESIA_SMTP_FROM_NAME",

core/tests/host-configuration.test.ts

@@ -48,6 +48,19 @@ describe("host configuration loading", () => {
     expect(host.identity.secret).toBeUndefined();
   });
 
+  it("carries the configured modules directory verbatim, and nothing when it is unset", () => {
+    expect(loadHostConfiguration({}).modulesDirectory).toBeUndefined();
+    expect(
+      loadHostConfiguration({ EKKLESIA_MODULES_DIR: "/var/lib/ekklesia/modules" }).modulesDirectory,
+    ).toBe("/var/lib/ekklesia/modules");
+    // Validation is the resolver's job (ADR 0048). The loader neither repairs a relative or blank
+    // value nor treats a set-but-empty variable as unset, so the resolver can refuse it.
+    expect(
+      loadHostConfiguration({ EKKLESIA_MODULES_DIR: "relative/modules" }).modulesDirectory,
+    ).toBe("relative/modules");
+    expect(loadHostConfiguration({ EKKLESIA_MODULES_DIR: "" }).modulesDirectory).toBe("");
+  });
+
   it("carries every object-storage field the storage passes established", () => {
     const host = loadHostConfiguration(productionEnvironment);
 

core/tests/legacy-schema-definition.test.ts

@@ -0,0 +1,34 @@
+import { alias, getTableConfig, integer, pgTable } from "drizzle-orm/pg-core";
+import { describe, expect, it } from "vitest";
+import { parseModuleSchemaDefinition } from "../src/modules/legacy-schema-definition.js";
+
+describe("the legacy module schema definition", () => {
+  it("normalizes and freezes a typed schema definition without freezing its tables", () => {
+    const records = pgTable("example_records", { id: integer().primaryKey() });
+    const definition = parseModuleSchemaDefinition({
+      moduleId: "example",
+      tables: { records },
+    });
+
+    expect(definition.tables.records).toBe(records);
+    expect(getTableConfig(records).name).toBe("example_records");
+    expect(Object.isFrozen(definition)).toBe(true);
+    expect(Object.isFrozen(definition.tables)).toBe(true);
+    expect(Object.isFrozen(records)).toBe(false);
+  });
+
+  it("rejects malformed, empty, unknown, and non-PostgreSQL table definitions", () => {
+    const records = pgTable("example_records", { id: integer() });
+    const disguisedRecords = alias(records, "example_disguised_records");
+    expect(() => parseModuleSchemaDefinition({ moduleId: "example", tables: {} })).toThrow();
+    expect(() =>
+      parseModuleSchemaDefinition({ moduleId: "example", tables: { records: {} } }),
+    ).toThrow();
+    expect(() =>
+      parseModuleSchemaDefinition({ moduleId: "example", tables: { records }, extra: true }),
+    ).toThrow();
+    expect(() =>
+      parseModuleSchemaDefinition({ moduleId: "example", tables: { disguisedRecords } }),
+    ).toThrow();
+  });
+});

core/tests/migration-report.test.ts

@@ -40,6 +40,7 @@ describe("migration command reports", () => {
         }),
       ]),
       pendingCount: 2,
+      retained: Object.freeze([]),
     });
 
     expect(formatMigrationPlanReport(plan)).toEqual([
@@ -64,6 +65,7 @@ describe("migration command reports", () => {
       ]),
       appliedCount: 1,
       noOp: false,
+      retained: Object.freeze([]),
     });
 
     expect(formatMigrationApplyReport(applied)).toEqual([
@@ -72,7 +74,12 @@ describe("migration command reports", () => {
     ]);
     expect(
       formatMigrationApplyReport(
-        Object.freeze({ applied: Object.freeze([]), appliedCount: 0, noOp: true }),
+        Object.freeze({
+          applied: Object.freeze([]),
+          appliedCount: 0,
+          noOp: true,
+          retained: Object.freeze([]),
+        }),
       ),
     ).toEqual(["Migration apply completed: database is already current (no changes)."]);
   });
@@ -85,6 +92,7 @@ describe("migration command reports", () => {
           approvalRequiredCount: 0,
           entries: Object.freeze([]),
           pendingCount: 0,
+          retained: Object.freeze([]),
         }),
       ),
     ).toEqual([
@@ -93,4 +101,62 @@ describe("migration command reports", () => {
       "Informational only: this plan is read-only and may become stale; apply revalidates history under the migration lock.",
     ]);
   });
+
+  it("reports an absent module's retained history without treating it as work (ADR 0048)", () => {
+    const retained = Object.freeze([
+      Object.freeze({ appliedCount: 1, moduleId: "calendar" }),
+      Object.freeze({ appliedCount: 3, moduleId: "signage" }),
+    ]);
+    const retainedLines = [
+      "- [retained] calendar: 1 applied migration kept; the module is not installed",
+      "- [retained] signage: 3 applied migrations kept; the module is not installed",
+    ];
+
+    expect(
+      formatMigrationPlanReport(
+        Object.freeze({
+          appliedCount: 0,
+          approvalRequiredCount: 0,
+          entries: Object.freeze([]),
+          pendingCount: 0,
+          retained,
+        }),
+      ),
+    ).toEqual([
+      "Migration plan (0 applied, 0 pending, 0 approval-blocked, 2 retained):",
+      "- No installed module migrations.",
+      ...retainedLines,
+      "Informational only: this plan is read-only and may become stale; apply revalidates history under the migration lock.",
+    ]);
+    expect(
+      formatMigrationApplyReport(
+        Object.freeze({ applied: Object.freeze([]), appliedCount: 0, noOp: true, retained }),
+      ),
+    ).toEqual([
+      "Migration apply completed: database is already current (no changes).",
+      ...retainedLines,
+    ]);
+    expect(
+      formatMigrationApplyReport(
+        Object.freeze({
+          applied: Object.freeze([
+            Object.freeze({
+              checksum: "e".repeat(64),
+              identity: "core:0007_later",
+              index: 7,
+              moduleId: "core",
+              tag: "0007_later",
+            }),
+          ]),
+          appliedCount: 1,
+          noOp: false,
+          retained,
+        }),
+      ),
+    ).toEqual([
+      "Migration apply completed (1 migration applied):",
+      `- core:0007_later sha256=${"e".repeat(64)}`,
+      ...retainedLines,
+    ]);
+  });
 });

core/tests/module-configuration-lifecycle.test.ts

@@ -17,7 +17,7 @@ function fakeModule(
   } = {},
 ): DiscoveredModule {
   const manifest = parseModuleManifest({
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "1.0.0",

core/tests/module-configuration-store.integration.ts

@@ -194,7 +194,7 @@ afterAll(async () => {
 
 function manifestWith(configuration: readonly Record<string, unknown>[], id = "announcements") {
   return parseModuleManifest({
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "1.0.0",

core/tests/module-configuration.test.ts

@@ -21,7 +21,7 @@ function manifestWith(
   id = "announcements",
 ) {
   return parseModuleManifest({
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "1.0.0",
@@ -92,7 +92,7 @@ describe("module configuration declarations", () => {
 
   it("rejects two declarations of the same key, so an ordinary key and a secret can never collide", () => {
     const result = safeParseModuleManifest({
-      manifestVersion: 7,
+      manifestVersion: 8,
       id: "announcements",
       name: "announcements module",
       version: "1.0.0",
@@ -114,7 +114,7 @@ describe("module configuration declarations", () => {
 
   it("rejects a default on a secret, because a checked-in default credential is a leaked one", () => {
     const result = safeParseModuleManifest({
-      manifestVersion: 7,
+      manifestVersion: 8,
       id: "announcements",
       name: "announcements module",
       version: "1.0.0",
@@ -130,7 +130,7 @@ describe("module configuration declarations", () => {
 
   it("rejects a key that is both required and defaulted, which states an intent nothing can honour", () => {
     const result = safeParseModuleManifest({
-      manifestVersion: 7,
+      manifestVersion: 8,
       id: "announcements",
       name: "announcements module",
       version: "1.0.0",
@@ -169,7 +169,7 @@ describe("module configuration declarations", () => {
     ],
   ])("rejects %s", (_label, declaration) => {
     const result = safeParseModuleManifest({
-      manifestVersion: 7,
+      manifestVersion: 8,
       id: "announcements",
       name: "announcements module",
       version: "1.0.0",
@@ -189,7 +189,7 @@ describe("module configuration declarations", () => {
     "valueOf",
   ])("rejects the reserved object property name %s as a configuration key", (key) => {
     const result = safeParseModuleManifest({
-      manifestVersion: 7,
+      manifestVersion: 8,
       id: "announcements",
       name: "announcements module",
       version: "1.0.0",
@@ -210,7 +210,7 @@ describe("module configuration declarations", () => {
     "",
   ])("rejects the malformed configuration key %s", (key) => {
     const result = safeParseModuleManifest({
-      manifestVersion: 7,
+      manifestVersion: 8,
       id: "announcements",
       name: "announcements module",
       version: "1.0.0",
@@ -591,7 +591,7 @@ describe("configuration over a real discovered inventory", () => {
       writeFile(
         path.join(moduleDirectory, "ekklesia.module.json"),
         JSON.stringify({
-          manifestVersion: 7,
+          manifestVersion: 8,
           id,
           name: `${id} module`,
           version: "1.0.0",

core/tests/module-database-abi.test.ts

@@ -0,0 +1,867 @@
+import { readFile } from "node:fs/promises";
+import {
+  isModuleDatabaseError,
+  type ModuleDatabaseErrorCode,
+  type ModuleDatabaseTransaction,
+} from "@ekklesia/contracts";
+import { DatabaseError, type Pool } from "pg";
+import { describe, expect, it, vi } from "vitest";
+import {
+  createModuleDatabaseExecutor,
+  moduleDatabaseExecutorModuleId,
+} from "../src/modules/database-abi.js";
+import {
+  decodeModuleDatabaseValue,
+  encodeModuleDatabaseParameters,
+  MODULE_DATABASE_MAX_PARAMETERS,
+  parsePostgresArrayText,
+} from "../src/modules/database-abi-values.js";
+
+/**
+ * Module Database ABI v1 (ADR 0050) without a database: parameter validation and encoding, result
+ * decoding from PostgreSQL text, option validation, error sanitization, and scope bookkeeping.
+ *
+ * Everything that depends on PostgreSQL's own behaviour (type OIDs, the protocol, SQLSTATEs,
+ * transactions, savepoints, session settings) is proven against a real database in
+ * `module-database-abi.integration.ts`. The scripted client here only replays command tags and
+ * transaction status, so the executor's own bookkeeping can be observed statement by statement.
+ */
+
+async function rejection(promise: Promise<unknown>): Promise<unknown> {
+  try {
+    await promise;
+  } catch (error) {
+    return error;
+  }
+  throw new Error("Expected the operation to reject.");
+}
+
+async function expectAbiError(
+  promise: Promise<unknown>,
+  code: ModuleDatabaseErrorCode,
+  sqlState?: string,
+): Promise<void> {
+  const error = await rejection(promise);
+  expect(isModuleDatabaseError(error)).toBe(true);
+  expect(error).toMatchObject({ code });
+  expect((error as { sqlState?: string }).sqlState).toBe(sqlState);
+}
+
+function syncThrows(run: () => unknown): unknown {
+  try {
+    run();
+  } catch (error) {
+    return error;
+  }
+  throw new Error("Expected the call to throw.");
+}
+
+// --- Parameters --------------------------------------------------------------------------------
+
+describe("encodeModuleDatabaseParameters", () => {
+  it("encodes every scalar category as text, or bytes, and nothing else", () => {
+    const bytes = new Uint8Array([0, 1, 255]);
+    const encoded = encodeModuleDatabaseParameters([
+      null,
+      true,
+      false,
+      1.5,
+      Number.NaN,
+      Number.POSITIVE_INFINITY,
+      Number.NEGATIVE_INFINITY,
+      9_007_199_254_740_993n,
+      'it\'s \\ "quoted"',
+      bytes,
+    ]);
+    expect(encoded.slice(0, 9)).toEqual([
+      null,
+      "true",
+      "false",
+      "1.5",
+      "NaN",
+      "Infinity",
+      "-Infinity",
+      "9007199254740993",
+      'it\'s \\ "quoted"',
+    ]);
+    expect(Buffer.isBuffer(encoded[9])).toBe(true);
+    expect([...(encoded[9] as Buffer)]).toEqual([0, 1, 255]);
+  });
+
+  it("copies bytes, so a later change by the caller cannot reach the statement", () => {
+    const bytes = new Uint8Array([1, 2, 3]);
+    const view = bytes.subarray(1);
+    const [encoded] = encodeModuleDatabaseParameters([view]);
+    bytes[1] = 9;
+    expect([...(encoded as Buffer)]).toEqual([2, 3]);
+  });
+
+  it("encodes arrays as quoted PostgreSQL array literals, nested for more dimensions", () => {
+    expect(
+      encodeModuleDatabaseParameters([
+        [1, null, 3],
+        ['a"b', "c\\d", "", "NULL", "{,}"],
+        [
+          [1, 2],
+          [3, 4],
+        ],
+        [new Uint8Array([0, 255])],
+        [true, 2n],
+        [],
+      ]),
+    ).toEqual([
+      '{"1",NULL,"3"}',
+      '{"a\\"b","c\\\\d","","NULL","{,}"}',
+      '{{"1","2"},{"3","4"}}',
+      '{"\\\\x00ff"}',
+      '{"true","2"}',
+      "{}",
+    ]);
+  });
+
+  it("treats omitted values as no parameters", () => {
+    expect(encodeModuleDatabaseParameters(undefined)).toEqual([]);
+  });
+
+  class Point {
+    readonly x = 1;
+  }
+
+  const refused: readonly [string, unknown][] = [
+    ["a Date", new Date(0)],
+    ["a plain object", { a: 1 }],
+    ["a null-prototype object", Object.create(null)],
+    ["undefined", undefined],
+    ["a function", () => 1],
+    ["a symbol", Symbol("s")],
+    ["a class instance", new Point()],
+    ["a Map", new Map()],
+    ["another typed array", new Int16Array([1])],
+    ["an ArrayBuffer", new ArrayBuffer(1)],
+    ["a boxed string", new String("x")],
+    ["an array holding a Date", [new Date(0)]],
+    ["an array holding undefined", [1, undefined]],
+    ["an array holding an object", [{ a: 1 }]],
+    // biome-ignore lint/suspicious/noSparseArray: the hole is the case under test.
+    ["a sparse array", [1, , 3]],
+    ["scalars mixed with sub-arrays", [1, [2]]],
+    ["a null where a sub-array belongs", [[1], null]],
+    ["ragged sub-arrays", [[1], [1, 2]]],
+    ["more dimensions than PostgreSQL allows", [[[[[[[1]]]]]]]],
+  ];
+
+  for (const [label, value] of refused) {
+    it(`refuses ${label}, without naming the value`, () => {
+      const error = syncThrows(() => encodeModuleDatabaseParameters(["fine", value]));
+      expect(isModuleDatabaseError(error)).toBe(true);
+      expect(error).toMatchObject({ code: "MODULE_DATABASE_PARAMETER_INVALID" });
+      expect((error as Error).message).not.toMatch(/fine|1970|Point|Symbol/u);
+    });
+  }
+
+  it("accepts exactly PostgreSQL's six array dimensions", () => {
+    expect(encodeModuleDatabaseParameters([[[[[[[1]]]]]]])).toEqual(['{{{{{{"1"}}}}}}']);
+  });
+
+  it("refuses a values list that is not an array, or longer than the protocol allows", () => {
+    for (const values of [
+      "x",
+      { 0: "x", length: 1 },
+      new Array(MODULE_DATABASE_MAX_PARAMETERS + 1).fill(1),
+    ]) {
+      const error = syncThrows(() => encodeModuleDatabaseParameters(values));
+      expect(error).toMatchObject({ code: "MODULE_DATABASE_PARAMETER_INVALID" });
+    }
+    expect(
+      encodeModuleDatabaseParameters(new Array(MODULE_DATABASE_MAX_PARAMETERS).fill(1)),
+    ).toHaveLength(MODULE_DATABASE_MAX_PARAMETERS);
+  });
+
+  it("refuses a self-referencing array instead of recursing forever", () => {
+    const cyclic: unknown[] = [];
+    cyclic.push(cyclic);
+    expect(syncThrows(() => encodeModuleDatabaseParameters([cyclic]))).toMatchObject({
+      code: "MODULE_DATABASE_PARAMETER_INVALID",
+    });
+  });
+});
+
+// --- Results -----------------------------------------------------------------------------------
+
+describe("decodeModuleDatabaseValue", () => {
+  it("decodes the scalar types the table names, and keeps everything else as exact text", () => {
+    expect(decodeModuleDatabaseValue(16, "t")).toBe(true);
+    expect(decodeModuleDatabaseValue(16, "f")).toBe(false);
+    expect(decodeModuleDatabaseValue(21, "-32768")).toBe(-32_768);
+    expect(decodeModuleDatabaseValue(23, "2147483647")).toBe(2_147_483_647);
+    expect(decodeModuleDatabaseValue(26, "4294967295")).toBe(4_294_967_295);
+    expect(decodeModuleDatabaseValue(700, "1.5")).toBe(1.5);
+    expect(decodeModuleDatabaseValue(701, "NaN")).toBeNaN();
+    expect(decodeModuleDatabaseValue(701, "Infinity")).toBe(Number.POSITIVE_INFINITY);
+    expect(decodeModuleDatabaseValue(701, "-Infinity")).toBe(Number.NEGATIVE_INFINITY);
+    expect(decodeModuleDatabaseValue(701, "1e+300")).toBe(1e300);
+    // Precision-sensitive and zone-sensitive types stay exactly as PostgreSQL wrote them.
+    expect(decodeModuleDatabaseValue(20, "9223372036854775807")).toBe("9223372036854775807");
+    expect(decodeModuleDatabaseValue(1700, "0.1000000000000000000001")).toBe(
+      "0.1000000000000000000001",
+    );
+    expect(decodeModuleDatabaseValue(3802, '{"a": 12345678901234567890}')).toBe(
+      '{"a": 12345678901234567890}',
+    );
+    expect(decodeModuleDatabaseValue(1184, "2026-10-07 12:00:00+00")).toBe(
+      "2026-10-07 12:00:00+00",
+    );
+    // An unknown OID (an enum, a domain, an extension type) is text.
+    expect(decodeModuleDatabaseValue(987_654, "anything")).toBe("anything");
+  });
+
+  it("decodes bytea to a plain Uint8Array, from hex or the older escape form", () => {
+    const hex = decodeModuleDatabaseValue(17, "\\x00ff10");
+    expect(Object.getPrototypeOf(hex)).toBe(Uint8Array.prototype);
+    expect([...(hex as Uint8Array)]).toEqual([0, 255, 16]);
+    expect([...(decodeModuleDatabaseValue(17, "\\x") as Uint8Array)]).toEqual([]);
+    const escaped = decodeModuleDatabaseValue(17, "a\\000\\\\\\377");
+    expect([...(escaped as Uint8Array)]).toEqual([97, 0, 92, 255]);
+  });
+
+  it("decodes built-in arrays element by element", () => {
+    expect(decodeModuleDatabaseValue(1016, "{1,NULL,9223372036854775807}")).toEqual([
+      "1",
+      null,
+      "9223372036854775807",
+    ]);
+    expect(decodeModuleDatabaseValue(1231, "{1.10,2}")).toEqual(["1.10", "2"]);
+    expect(decodeModuleDatabaseValue(1000, "{t,f}")).toEqual([true, false]);
+    expect(decodeModuleDatabaseValue(1007, "{{1,2},{3,4}}")).toEqual([
+      [1, 2],
+      [3, 4],
+    ]);
+    const bytes = decodeModuleDatabaseValue(1001, '{"\\\\x00ff"}') as Uint8Array[];
+    expect([...(bytes[0] as Uint8Array)]).toEqual([0, 255]);
+    expect(decodeModuleDatabaseValue(1009, "{}")).toEqual([]);
+    // An array of a type the table does not know arrives as text, like the type itself.
+    expect(decodeModuleDatabaseValue(987_655, "{a,b}")).toBe("{a,b}");
+  });
+});
+
+describe("parsePostgresArrayText", () => {
+  const text = (value: string) => value;
+
+  it('honours quoting, escapes, and the difference between NULL and "NULL"', () => {
+    expect(parsePostgresArrayText('{"a\\"b","c,d",NULL,"NULL","","{}",null}', text)).toEqual([
+      'a"b',
+      "c,d",
+      null,
+      "NULL",
+      "",
+      "{}",
+      null,
+    ]);
+    expect(parsePostgresArrayText('{"back\\\\slash"}', text)).toEqual(["back\\slash"]);
+  });
+
+  it("drops a non-default lower bound: a JavaScript array is a zero-based list", () => {
+    expect(parsePostgresArrayText("[0:1]={5,6}", text)).toEqual(["5", "6"]);
+    expect(parsePostgresArrayText("[1:1][2:3]={{7,8}}", text)).toEqual([["7", "8"]]);
+  });
+
+  it("refuses text that is not an array literal", () => {
+    for (const malformed of ["", "{", "{1", '{"a', "{1}x", "[1:2]{1,2}", "1"]) {
+      expect(() => parsePostgresArrayText(malformed, text)).toThrow();
+    }
+  });
+});
+
+// --- The executor, over a scripted client -------------------------------------------------------
+
+interface ScriptedStatement {
+  readonly text: string;
+  readonly values?: readonly unknown[];
+}
+
+interface Script {
+  readonly pool: Pool;
+  readonly statements: ScriptedStatement[];
+  readonly released: (boolean | undefined)[];
+  /** Resolve a statement only when `release` is called, to model in-flight work. */
+  holdNext(): () => void;
+  failNext(error: unknown): void;
+  /** Fail the next statement whose text is exactly `text`. */
+  failWhen(text: string, error: unknown): void;
+  connectCount(): number;
+}
+
+function commandOf(text: string): string {
+  const word = /^\s*([A-Za-z]+)/u.exec(text)?.[1]?.toUpperCase() ?? "";
+  return word === "END" ? "COMMIT" : word;
+}
+
+/**
+ * A pool whose one client replays PostgreSQL's command tags and transaction status for simple SQL.
+ * It is not PostgreSQL: it exists only so the executor's bookkeeping can be observed.
+ */
+function scriptedPool(): Script {
+  const statements: ScriptedStatement[] = [];
+  const released: (boolean | undefined)[] = [];
+  let status = "I";
+  let connects = 0;
+  let hold: Promise<void> | undefined;
+  let failure: unknown;
+  const failures = new Map<string, unknown>();
+
+  const client = {
+    getTransactionStatus: () => status,
+    on: () => client,
+    removeListener: () => client,
+    async query(config: string | { text: string; values?: unknown[] }) {
+      const text = typeof config === "string" ? config : config.text;
+      statements.push(
+        typeof config === "string" ? { text } : { text, values: config.values ?? [] },
+      );
+      const held = hold;
+      hold = undefined;
+      if (held !== undefined) {
+        await held;
+      }
+      if (failure !== undefined || failures.has(text)) {
+        const error = failure ?? failures.get(text);
+        failure = undefined;
+        failures.delete(text);
+        if (status === "T") {
+          status = "E";
+        }
+        throw error;
+      }
+      const command = commandOf(text);
+      if (command === "BEGIN" || command === "START") {
+        status = "T";
+      } else if (command === "COMMIT" || (command === "ROLLBACK" && !/\bTO\b/iu.test(text))) {
+        const aborted = status === "E";
+        status = "I";
+        return { command: aborted ? "ROLLBACK" : command, fields: [], rowCount: null, rows: [] };
+      }
+      return {
+        command,
+        fields: [{ dataTypeID: 23, name: "n" }],
+        rowCount: 1,
+        rows: [["1"]],
+      };
+    },
+    release: (destroy?: boolean) => {
+      released.push(destroy);
+    },
+  };
+
+  return {
+    connectCount: () => connects,
+    failNext(error) {
+      failure = error;
+    },
+    failWhen(text, error) {
+      failures.set(text, error);
+    },
+    holdNext() {
+      let release!: () => void;
+      hold = new Promise<void>((resolve) => {
+        release = resolve;
+      });
+      return release;
+    },
+    pool: {
+      connect: vi.fn(async () => {
+        connects += 1;
+        return client;
+      }),
+    } as unknown as Pool,
+    released,
+    statements,
+  };
+}
+
+function pgError(code: string): DatabaseError {
+  const error = new DatabaseError(
+    'duplicate key value violates unique constraint "example_secret_key"',
+    100,
+    "error",
+  );
+  error.code = code;
+  error.detail = "Key (secret)=(hunter2) already exists.";
+  error.hint = "a hint";
+  error.table = "example_records";
+  error.constraint = "example_secret_key";
+  return error;
+}
+
+const pin =
+  "SET TimeZone TO 'UTC'; SET DateStyle TO 'ISO, MDY'; SET IntervalStyle TO 'postgres'; SET bytea_output TO 'hex'; SET extra_float_digits TO 1";
+
+function texts(script: Script): string[] {
+  return script.statements.map((statement) => statement.text);
+}
+
+describe("createModuleDatabaseExecutor", () => {
+  it("builds a frozen executor holding exactly the ABI's members, without touching the pool", () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+
+    expect(Object.keys(executor).sort()).toEqual(["abiVersion", "query", "transaction"]);
+    expect(executor.abiVersion).toBe(1);
+    expect(Object.isFrozen(executor)).toBe(true);
+    expect(Object.getPrototypeOf(executor)).toBe(Object.prototype);
+    for (const forbidden of ["pool", "client", "$client", "_", "session", "dialect", "select"]) {
+      expect(forbidden in executor).toBe(false);
+    }
+    expect(script.connectCount()).toBe(0);
+  });
+
+  it("carries its module for Core's attribution, and refuses an invalid module ID", () => {
+    const executor = createModuleDatabaseExecutor(scriptedPool().pool, { moduleId: "care-team" });
+    expect(moduleDatabaseExecutorModuleId(executor)).toBe("care-team");
+    expect(moduleDatabaseExecutorModuleId({})).toBeUndefined();
+    expect(() =>
+      createModuleDatabaseExecutor(scriptedPool().pool, { moduleId: "Not A Module" }),
+    ).toThrow(TypeError);
+  });
+
+  it("pins the session, runs one extended-protocol statement, and resets before releasing", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+
+    const result = await executor.query({ text: "SELECT 1 AS n", values: [5n] });
+
+    expect(result).toEqual({
+      command: "SELECT",
+      fields: [{ name: "n", typeOid: 23 }],
+      rowCount: 1,
+      rows: [{ n: 1 }],
+    });
+    expect(texts(script)).toEqual([pin, "SELECT 1 AS n", "DISCARD ALL"]);
+    expect(script.statements[1]).toEqual({ text: "SELECT 1 AS n", values: ["5"] });
+    expect(script.released).toEqual([undefined]);
+    expect(Object.isFrozen(result)).toBe(true);
+    expect(Object.isFrozen(result.rows)).toBe(true);
+    expect(Object.isFrozen(result.fields)).toBe(true);
+  });
+
+  it("refuses a malformed request before borrowing a connection", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    const query = executor.query as (request: unknown) => Promise<unknown>;
+
+    for (const request of [
+      undefined,
+      null,
+      "SELECT 1",
+      [],
+      { text: "" },
+      { text: 1 },
+      { text: "SELECT 1", rowMode: "rows" },
+      { text: "SELECT 1", name: "prepared" },
+      { text: "SELECT 1", types: [] },
+    ]) {
+      await expectAbiError(query(request), "MODULE_DATABASE_REQUEST_INVALID");
+    }
+    await expectAbiError(
+      query({ text: "SELECT $1", values: [new Date()] }),
+      "MODULE_DATABASE_PARAMETER_INVALID",
+    );
+    expect(script.connectCount()).toBe(0);
+  });
+
+  it("reports only PostgreSQL's SQLSTATE from a database error, never its text", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    script.failWhen("SELECT 1", pgError("23505"));
+    const error = await rejection(executor.query({ text: "SELECT 1" }));
+
+    expect(error).toMatchObject({ code: "MODULE_DATABASE_QUERY_FAILED", sqlState: "23505" });
+    const serialized = `${JSON.stringify(error)} ${String(error)} ${(error as Error).stack}`;
+    for (const secret of [
+      "hunter2",
+      "example_secret_key",
+      "example_records",
+      "duplicate",
+      "hint",
+    ]) {
+      expect(serialized).not.toContain(secret);
+    }
+    expect((error as Error).cause).toBeUndefined();
+    // A PostgreSQL error leaves the connection usable, so it is reset and returned.
+    expect(script.released).toEqual([undefined]);
+  });
+
+  it("drops a non-PostgreSQL failure's code and destroys the connection it happened on", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    script.failWhen(
+      "SELECT 1",
+      Object.assign(new Error("Connection terminated: postgres://u:p@h/db"), { code: "EPIPE" }),
+    );
+
+    const error = await rejection(executor.query({ text: "SELECT 1" }));
+    expect(error).toMatchObject({ code: "MODULE_DATABASE_QUERY_FAILED" });
+    expect((error as { sqlState?: string }).sqlState).toBeUndefined();
+    expect(JSON.stringify(error)).not.toContain("postgres://");
+    expect(script.released).toEqual([true]);
+  });
+
+  it("refuses a top-level transaction-control statement and destroys a connection it left open", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+
+    await expectAbiError(executor.query({ text: "BEGIN" }), "MODULE_DATABASE_REQUEST_INVALID");
+    expect(script.released).toEqual([true]);
+    expect(texts(script)).not.toContain("DISCARD ALL");
+  });
+});
+
+describe("transaction options", () => {
+  const invalid: readonly unknown[] = [
+    null,
+    "serializable",
+    [],
+    { isolation: "read uncommitted" },
+    { isolation: "SERIALIZABLE" },
+    { isolation: "constructor" },
+    { readOnly: "yes" },
+    { readOnly: 1 },
+    { deferrable: true },
+    { isolation: "serializable", retries: 3 },
+  ];
+
+  for (const options of invalid) {
+    it(`refuses ${JSON.stringify(options)} before borrowing a connection`, async () => {
+      const script = scriptedPool();
+      const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+      const callback = vi.fn();
+      await expectAbiError(
+        executor.transaction(callback, options as never),
+        "MODULE_DATABASE_TRANSACTION_OPTION_INVALID",
+      );
+      expect(callback).not.toHaveBeenCalled();
+      expect(script.connectCount()).toBe(0);
+    });
+  }
+
+  it("refuses a callback that is not a function", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    await expectAbiError(
+      executor.transaction("SELECT 1" as never),
+      "MODULE_DATABASE_REQUEST_INVALID",
+    );
+    expect(script.connectCount()).toBe(0);
+  });
+
+  it("begins every transaction with an explicit isolation level and access mode", async () => {
+    const cases: readonly [unknown, string][] = [
+      [undefined, "BEGIN ISOLATION LEVEL READ COMMITTED READ WRITE"],
+      [{}, "BEGIN ISOLATION LEVEL READ COMMITTED READ WRITE"],
+      [{ readOnly: true }, "BEGIN ISOLATION LEVEL READ COMMITTED READ ONLY"],
+      [{ isolation: "repeatable read" }, "BEGIN ISOLATION LEVEL REPEATABLE READ READ WRITE"],
+      [
+        { isolation: "serializable", readOnly: false },
+        "BEGIN ISOLATION LEVEL SERIALIZABLE READ WRITE",
+      ],
+    ];
+    for (const [options, begin] of cases) {
+      const script = scriptedPool();
+      const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+      await executor.transaction(async () => undefined, options as never);
+      expect(texts(script)).toEqual([pin, begin, "COMMIT", "DISCARD ALL"]);
+    }
+  });
+});
+
+describe("transaction scopes", () => {
+  it("commits a resolved callback and returns its value", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+
+    const value = await executor.transaction(async (tx) => {
+      expect(Object.keys(tx).sort()).toEqual(["abiVersion", "query", "savepoint"]);
+      expect(Object.isFrozen(tx)).toBe(true);
+      expect(moduleDatabaseExecutorModuleId(tx)).toBe("example");
+      await tx.query({ text: "INSERT INTO example_records VALUES (1)" });
+      return "done";
+    });
+
+    expect(value).toBe("done");
+    expect(texts(script).slice(1)).toEqual([
+      "BEGIN ISOLATION LEVEL READ COMMITTED READ WRITE",
+      "INSERT INTO example_records VALUES (1)",
+      "COMMIT",
+      "DISCARD ALL",
+    ]);
+  });
+
+  it("rolls back a rejected callback and rejects with the callback's own error, untouched", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    const own = new Error("module failure");
+
+    const error = await rejection(
+      executor.transaction(async (tx) => {
+        await tx.query({ text: "INSERT INTO example_records VALUES (1)" });
+        throw own;
+      }),
+    );
+
+    expect(error).toBe(own);
+    expect(texts(script)).toContain("ROLLBACK");
+    expect(texts(script)).not.toContain("COMMIT");
+  });
+
+  it("revokes the executor when the callback settles; later use sends nothing", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    let escaped: ModuleDatabaseTransaction | undefined;
+    await executor.transaction((tx) => {
+      escaped = tx;
+    });
+    const sent = script.statements.length;
+
+    await expectAbiError(
+      (escaped as ModuleDatabaseTransaction).query({ text: "SELECT 1" }),
+      "MODULE_DATABASE_SCOPE_CLOSED",
+    );
+    await expectAbiError(
+      (escaped as ModuleDatabaseTransaction).savepoint(async () => undefined),
+      "MODULE_DATABASE_SCOPE_CLOSED",
+    );
+    expect(script.statements).toHaveLength(sent);
+  });
+
+  it("never commits a callback that returned with a query still outstanding, even once it succeeds", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    let forgotten: Promise<unknown> | undefined;
+    let releaseHeld: (() => void) | undefined;
+
+    const outcome = executor.transaction((tx) => {
+      releaseHeld = script.holdNext();
+      forgotten = tx.query({ text: "INSERT INTO example_records VALUES (1)" });
+    });
+    await vi.waitFor(() => expect(releaseHeld).toBeDefined());
+    // Core waits for the started statement to settle before rolling back the connection.
+    await new Promise((resolve) => setTimeout(resolve, 10));
+    expect(texts(script)).not.toContain("ROLLBACK");
+    releaseHeld?.();
+
+    await expectAbiError(outcome, "MODULE_DATABASE_SCOPE_WORK_OUTSTANDING");
+    await expect(forgotten).resolves.toBeDefined();
+    expect(texts(script).slice(-2)).toEqual(["ROLLBACK", "DISCARD ALL"]);
+    expect(texts(script)).not.toContain("COMMIT");
+  });
+
+  it("keeps a rejected callback's own error when sibling work is still settling, and still never commits", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    const own = new Error("module failure");
+    let releaseHeld: (() => void) | undefined;
+
+    const outcome = executor.transaction(async (tx) => {
+      releaseHeld = script.holdNext();
+      void tx.query({ text: "INSERT INTO example_records VALUES (1)" });
+      throw own;
+    });
+    await vi.waitFor(() => expect(releaseHeld).toBeDefined());
+    // The sibling statement is drained before Core rolls back.
+    await new Promise((resolve) => setTimeout(resolve, 10));
+    expect(texts(script)).not.toContain("ROLLBACK");
+    releaseHeld?.();
+
+    expect(await rejection(outcome)).toBe(own);
+    expect(texts(script).slice(-2)).toEqual(["ROLLBACK", "DISCARD ALL"]);
+    expect(texts(script)).not.toContain("COMMIT");
+  });
+
+  it("refuses a transaction-control statement inside a transaction and never commits it", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+
+    const error = await rejection(
+      executor.transaction(async (tx) => {
+        await expectAbiError(
+          tx.query({ text: "SAVEPOINT mine" }),
+          "MODULE_DATABASE_REQUEST_INVALID",
+        );
+        return "carried on";
+      }),
+    );
+
+    expect(error).toMatchObject({ code: "MODULE_DATABASE_REQUEST_INVALID" });
+    expect(texts(script)).not.toContain("COMMIT");
+    expect(texts(script)).toContain("ROLLBACK");
+    // The connection is destroyed, never reset and reused.
+    expect(texts(script)).not.toContain("DISCARD ALL");
+    expect(script.released).toEqual([true]);
+  });
+
+  it("reports a COMMIT that PostgreSQL answered with ROLLBACK as a failed transaction", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+
+    const outcome = executor.transaction(async (tx) => {
+      script.failNext(pgError("22012"));
+      await expectAbiError(
+        tx.query({ text: "SELECT 1/0" }),
+        "MODULE_DATABASE_QUERY_FAILED",
+        "22012",
+      );
+    });
+
+    await expectAbiError(outcome, "MODULE_DATABASE_TRANSACTION_FAILED");
+  });
+});
+
+describe("savepoint scopes", () => {
+  it("names savepoints itself, releases a resolved one, and rolls back a rejected one", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    const own = new Error("savepoint failure");
+
+    await executor.transaction(async (tx) => {
+      await tx.savepoint(async (sp) => {
+        await sp.query({ text: "INSERT INTO example_records VALUES (1)" });
+      });
+      expect(await rejection(tx.savepoint(async () => Promise.reject(own)))).toBe(own);
+    });
+
+    expect(texts(script).slice(2, -2)).toEqual([
+      "SAVEPOINT ekklesia_savepoint_1",
+      "INSERT INTO example_records VALUES (1)",
+      "RELEASE SAVEPOINT ekklesia_savepoint_1",
+      "SAVEPOINT ekklesia_savepoint_2",
+      "ROLLBACK TO SAVEPOINT ekklesia_savepoint_2",
+      "RELEASE SAVEPOINT ekklesia_savepoint_2",
+    ]);
+  });
+
+  it("makes the parent inactive while a savepoint is open, so scopes cannot overlap", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+
+    await executor.transaction(async (tx) => {
+      await tx.savepoint(async (sp) => {
+        await expectAbiError(tx.query({ text: "SELECT 1" }), "MODULE_DATABASE_SCOPE_INACTIVE");
+        await expectAbiError(
+          tx.savepoint(async () => undefined),
+          "MODULE_DATABASE_SCOPE_INACTIVE",
+        );
+        await sp.savepoint(async (inner) => {
+          await expectAbiError(sp.query({ text: "SELECT 1" }), "MODULE_DATABASE_SCOPE_INACTIVE");
+          await inner.query({ text: "SELECT 2" });
+        });
+        await sp.query({ text: "SELECT 3" });
+      });
+      await tx.query({ text: "SELECT 4" });
+    });
+
+    expect(texts(script)).toContain("SAVEPOINT ekklesia_savepoint_2");
+    expect(texts(script)).toContain("COMMIT");
+  });
+
+  it("revokes an escaped savepoint executor", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+
+    await executor.transaction(async (tx) => {
+      let escaped: ModuleDatabaseTransaction | undefined;
+      await tx.savepoint((sp) => {
+        escaped = sp;
+      });
+      await expectAbiError(
+        (escaped as ModuleDatabaseTransaction).query({ text: "SELECT 1" }),
+        "MODULE_DATABASE_SCOPE_CLOSED",
+      );
+      await tx.query({ text: "SELECT 2" });
+    });
+    expect(texts(script)).toContain("COMMIT");
+  });
+
+  it("rolls back, and never releases, a savepoint whose callback left work outstanding", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+
+    await executor.transaction(async (tx) => {
+      await expectAbiError(
+        tx.savepoint((sp) => {
+          const release = script.holdNext();
+          void sp.query({ text: "INSERT INTO example_records VALUES (1)" });
+          setTimeout(release, 10);
+        }),
+        "MODULE_DATABASE_SCOPE_WORK_OUTSTANDING",
+      );
+    });
+
+    expect(texts(script).slice(2, -2)).toEqual([
+      "SAVEPOINT ekklesia_savepoint_1",
+      "INSERT INTO example_records VALUES (1)",
+      "ROLLBACK TO SAVEPOINT ekklesia_savepoint_1",
+    ]);
+  });
+
+  it("keeps a rejected savepoint callback's own error, rolling back and releasing after its sibling work settles", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    const own = new Error("savepoint failure");
+
+    await executor.transaction(async (tx) => {
+      const error = await rejection(
+        tx.savepoint(async (sp) => {
+          const release = script.holdNext();
+          void sp.query({ text: "INSERT INTO example_records VALUES (1)" });
+          setTimeout(release, 10);
+          throw own;
+        }),
+      );
+      expect(error).toBe(own);
+    });
+
+    expect(texts(script).slice(2, -2)).toEqual([
+      "SAVEPOINT ekklesia_savepoint_1",
+      "INSERT INTO example_records VALUES (1)",
+      "ROLLBACK TO SAVEPOINT ekklesia_savepoint_1",
+      "RELEASE SAVEPOINT ekklesia_savepoint_1",
+    ]);
+    expect(texts(script)).toContain("COMMIT");
+  });
+
+  it("counts an unawaited savepoint as the transaction's outstanding work", async () => {
+    const script = scriptedPool();
+    const executor = createModuleDatabaseExecutor(script.pool, { moduleId: "example" });
+    let forgotten: Promise<unknown> | undefined;
+
+    await expectAbiError(
+      executor.transaction((tx) => {
+        forgotten = tx.savepoint(async (sp) => {
+          await sp.query({ text: "INSERT INTO example_records VALUES (1)" });
+        });
+      }),
+      "MODULE_DATABASE_SCOPE_WORK_OUTSTANDING",
+    );
+    await expectAbiError(forgotten as Promise<unknown>, "MODULE_DATABASE_SCOPE_CLOSED");
+    expect(texts(script)).not.toContain("COMMIT");
+    expect(texts(script).filter((text) => text.startsWith("RELEASE"))).toEqual([]);
+    expect(texts(script).at(-1)).toBe("DISCARD ALL");
+  });
+});
+
+describe("the ABI's own sources", () => {
+  it("import no ORM, query builder, or ORM type", async () => {
+    for (const file of [
+      "../src/modules/database-abi.ts",
+      "../src/modules/database-abi-values.ts",
+    ]) {
+      const source = await readFile(new URL(file, import.meta.url), "utf8");
+      const specifiers = [...source.matchAll(/\bfrom\s+"([^"]+)"/gu)].map((match) => match[1]);
+      expect(
+        specifiers.every((specifier) =>
+          ["@ekklesia/contracts", "pg", "./database-abi-values.js"].includes(specifier ?? ""),
+        ),
+      ).toBe(true);
+      expect(source).not.toMatch(/drizzle|kysely|NodePg|PgTable|PgColumn/iu);
+    }
+  });
+});

core/tests/module-database-type.test.ts

@@ -1,8 +1,8 @@
 import { integer, pgTable, text } from "drizzle-orm/pg-core";
 import { describe, expect, it } from "vitest";
-import type { ModuleDatabase, ModuleRuntimeServices } from "../src/index.js";
+import type { LegacyModuleRuntimeServices, ModuleDatabase } from "../src/modules/database.js";
 
-const testTable = pgTable("contracts_module_database_test", {
+const testTable = pgTable("core_module_database_type_test", {
   id: integer("id").primaryKey(),
   name: text("name").notNull(),
 });
@@ -68,16 +68,17 @@ function typeOnlyExclusions(database: ModuleDatabase): void {
 }
 void typeOnlyExclusions;
 
-/** Never invoked — proves `ModuleRuntimeServices` has exactly one field, `database`, typed as
- * `ModuleDatabase`, with no storage/jobs/configuration/secrets/authorization field this phase. */
-function typeOnlyServicesShape(services: ModuleRuntimeServices): void {
+/** Never invoked — proves a legacy module's `ModuleRuntimeServices` has exactly one field,
+ * `database`, typed as `ModuleDatabase`, with no storage/jobs/configuration/secrets/authorization
+ * field this phase. */
+function typeOnlyServicesShape(services: LegacyModuleRuntimeServices): void {
   const database: ModuleDatabase = services.database;
   void database;
-  // @ts-expect-error `storage` does not exist on `ModuleRuntimeServices` yet.
+  // @ts-expect-error `storage` does not exist on the services yet.
   void services.storage;
-  // @ts-expect-error `jobs` does not exist on `ModuleRuntimeServices` yet.
+  // @ts-expect-error `jobs` does not exist on the services yet.
   void services.jobs;
-  // @ts-expect-error `authorization` does not exist on `ModuleRuntimeServices` yet.
+  // @ts-expect-error `authorization` does not exist on the services yet.
   void services.authorization;
 }
 void typeOnlyServicesShape;

core/tests/module-discovery.test.ts

@@ -34,7 +34,7 @@ async function createModulesDirectory(): Promise<string> {
 
 function manifestFor(id: string): Record<string, unknown> {
   return {
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "0.1.0",

core/tests/module-http-import.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
+import { IMPORT_SAFETY_TEST_TIMEOUT_MS } from "./support/import-safety.js";
 
 const readdir = vi.fn();
 const readFile = vi.fn();
@@ -14,7 +15,9 @@ vi.mock("node:fs/promises", async (importOriginal) => ({
 }));
 
 describe("module HTTP contract and runtime import safety", () => {
-  it("performs no filesystem I/O merely by importing the module runtime or the module-http contract", async () => {
+  it(
+    "performs no filesystem I/O merely by importing the module runtime or the module-http contract",
+    async () => {
       await import("../src/modules/index.js");
       await import("@ekklesia/contracts");
 
@@ -22,5 +25,7 @@ describe("module HTTP contract and runtime import safety", () => {
       expect(readFile).not.toHaveBeenCalled();
       expect(realpath).not.toHaveBeenCalled();
       expect(stat).not.toHaveBeenCalled();
-  });
+    },
+    IMPORT_SAFETY_TEST_TIMEOUT_MS,
+  );
 });

core/tests/module-lifecycle-store.integration.ts

@@ -200,7 +200,7 @@ afterAll(async () => {
  * by eligibility resolution. */
 function fakeModule(id: string, dependencies?: Record<string, unknown>): DiscoveredModule {
   const manifest = parseModuleManifest({
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "1.0.0",

core/tests/module-lifecycle.test.ts

@@ -22,7 +22,7 @@ function fakeModule(
   } = {},
 ): DiscoveredModule {
   const manifest = parseModuleManifest({
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "0.1.0",
@@ -344,7 +344,7 @@ describe("resolveModuleEligibility — over a real discovered inventory", () =>
       writeFile(
         path.join(moduleDirectory, "ekklesia.module.json"),
         JSON.stringify({
-          manifestVersion: 7,
+          manifestVersion: 8,
           id,
           name: `${id} module`,
           version: "0.1.0",

core/tests/module-migration-discovery.test.ts

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { mkdir, mkdtemp, rm, symlink, writeFile } from "node:fs/promises";
+import { mkdtemp, rm, symlink, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
@@ -10,34 +10,15 @@ import {
   ModuleMigrationDiscoveryError,
   type ModuleMigrationDiscoveryIssueCode,
 } from "../src/modules/index.js";
+import {
+  createMigrationModule,
+  manifestFor,
+  originSnapshotId,
+  snapshotId,
+} from "./support/migration-module-fixture.js";
 
-const originSnapshotId = "00000000-0000-0000-0000-000000000000";
 const temporaryDirectories: string[] = [];
 
-interface MigrationFixture {
-  readonly breakpoints?: boolean;
-  readonly destructive?:
-    | { readonly mode: "none" }
-    | { readonly mode: "approval-required"; readonly reason: string };
-  readonly snapshotId?: string;
-  readonly sql: string | Uint8Array;
-  readonly tag: string;
-  readonly timestamp?: number;
-}
-
-interface MigrationModuleFixture {
-  readonly dependencies?: Record<string, unknown>;
-  readonly manifest?: Record<string, unknown>;
-  readonly migrations?: readonly MigrationFixture[] | false;
-  readonly schemaSource?: string;
-  readonly serverSource?: string;
-}
-
-interface CreatedMigrationModule {
-  readonly migrationDirectory?: string;
-  readonly moduleDirectory: string;
-}
-
 afterEach(async () => {
   await Promise.all(
     temporaryDirectories
@@ -52,144 +33,11 @@ async function createModulesDirectory(): Promise<string> {
   return directory;
 }
 
-function snapshotId(index: number): string {
-  return `10000000-0000-4000-8000-${(index + 1).toString(16).padStart(12, "0")}`;
-}
-
-function manifestFor(
-  id: string,
-  options: {
-    readonly dependencies?: Record<string, unknown>;
-    readonly migrations?: boolean;
-    readonly schema?: boolean;
-  } = {},
-): Record<string, unknown> {
-  return {
-    manifestVersion: 7,
-    id,
-    name: `${id} module`,
-    version: "0.1.0",
-    compatibility: { platform: "^0.1.0", moduleSdk: "^0.1.0" },
-    ...(options.dependencies ? { dependencies: options.dependencies } : {}),
-    capabilities: [],
-    permissions: [],
-    entrypoints: {
-      server: "./dist/server/index.js",
-      ...(options.schema ? { schema: "./dist/schema/index.js" } : {}),
-      ...(options.migrations === false ? {} : { migrations: "./drizzle" }),
-    },
-  };
-}
-
-function defaultMigrations(id: string): readonly MigrationFixture[] {
-  return [
-    {
-      sql: `CREATE TABLE "${id.replaceAll("-", "_")}_records" ("id" integer);\n`,
-      tag: "0000_initial",
-    },
-  ];
-}
-
-async function createMigrationModule(
-  modulesDirectory: string,
-  id: string,
-  fixture: MigrationModuleFixture = {},
-): Promise<CreatedMigrationModule> {
-  const migrations =
-    fixture.migrations === false ? undefined : (fixture.migrations ?? defaultMigrations(id));
-  const moduleDirectory = path.join(modulesDirectory, id);
-  const migrationDirectory = migrations ? path.join(moduleDirectory, "drizzle") : undefined;
-  await mkdir(path.join(moduleDirectory, "dist/server"), { recursive: true });
-  if (fixture.schemaSource !== undefined) {
-    await mkdir(path.join(moduleDirectory, "dist/schema"), { recursive: true });
-  }
-  if (migrationDirectory) {
-    await mkdir(path.join(migrationDirectory, "meta"), { recursive: true });
-  }
-
-  await Promise.all([
-    writeFile(
-      path.join(moduleDirectory, "package.json"),
-      JSON.stringify({
-        name: `@test/module-${id}`,
-        version: "0.1.0",
-        type: "module",
-        ekklesia: { layer: "module" },
-      }),
-    ),
-    writeFile(
-      path.join(moduleDirectory, "ekklesia.module.json"),
-      JSON.stringify(
-        fixture.manifest ??
-          manifestFor(id, {
-            ...(fixture.dependencies ? { dependencies: fixture.dependencies } : {}),
-            migrations: migrations !== undefined,
-            schema: fixture.schemaSource !== undefined,
-          }),
-      ),
-    ),
-    writeFile(
-      path.join(moduleDirectory, "dist/server/index.js"),
-      fixture.serverSource ?? `export default { id: ${JSON.stringify(id)}, version: "0.1.0" };`,
-    ),
-    ...(fixture.schemaSource === undefined
-      ? []
-      : [writeFile(path.join(moduleDirectory, "dist/schema/index.js"), fixture.schemaSource)]),
-  ]);
-
-  if (!migrationDirectory || !migrations) {
-    return { moduleDirectory };
-  }
-
-  const journalEntries = migrations.map((migration, index) => ({
-    idx: index,
-    version: "7",
-    when: migration.timestamp ?? 1_700_000_000_000 + index,
-    tag: migration.tag,
-    breakpoints: migration.breakpoints ?? true,
-  }));
-  const policyEntries = migrations.map((migration) => ({
-    tag: migration.tag,
-    destructive: migration.destructive ?? { mode: "none" },
-  }));
-  await Promise.all([
-    writeFile(
-      path.join(migrationDirectory, "meta/_journal.json"),
-      JSON.stringify({ version: "7", dialect: "postgresql", entries: journalEntries }),
-    ),
-    writeFile(
-      path.join(migrationDirectory, "meta/_ekklesia.json"),
-      JSON.stringify({ version: 1, moduleId: id, entries: policyEntries }),
-    ),
-    ...migrations.flatMap((migration, index) => {
-      const idForSnapshot = migration.snapshotId ?? snapshotId(index);
-      const previousId =
-        index === 0
-          ? originSnapshotId
-          : (migrations[index - 1]?.snapshotId ?? snapshotId(index - 1));
-      return [
-        writeFile(path.join(migrationDirectory, `${migration.tag}.sql`), migration.sql),
-        writeFile(
-          path.join(migrationDirectory, `meta/${index.toString().padStart(4, "0")}_snapshot.json`),
-          JSON.stringify({
-            version: "7",
-            dialect: "postgresql",
-            id: idForSnapshot,
-            prevId: previousId,
-          }),
-        ),
-      ];
-    }),
-  ]);
-
-  return { migrationDirectory, moduleDirectory };
-}
-
 function discoveryOptions(modulesDirectory: string) {
   return {
-    moduleSdkVersion: "0.1.0",
+    moduleSdkVersion: "0.2.0",
     modulesDirectory,
-    platformVersion: "0.1.0",
+    platformVersion: "0.2.0",
   };
 }
 

core/tests/module-migration-runner.test.ts

@@ -13,6 +13,7 @@ import {
   type MigrationTransaction,
   planModuleMigrations,
 } from "../src/migrations/runner.js";
+import type { DiscoveredModule } from "../src/modules/discovery.js";
 import type {
   DiscoveredModuleMigration,
   ModuleMigrationAggregate,
@@ -323,6 +324,7 @@ describe("module migration planning", () => {
         },
       ],
       pendingCount: 1,
+      retained: [],
     });
     expect(database.events).toEqual(["session:open", "history:read", "session:close"]);
     expect(database.historyTableExists).toBe(false);
@@ -344,10 +346,11 @@ describe("module migration planning", () => {
       approvalRequiredCount: 0,
       entries: [],
       pendingCount: 0,
+      retained: [],
     });
     expect(Object.isFrozen(result)).toBe(true);
     expect(Object.isFrozen(result.entries)).toBe(true);
-    expect(applyResult).toEqual({ applied: [], appliedCount: 0, noOp: true });
+    expect(applyResult).toEqual({ applied: [], appliedCount: 0, noOp: true, retained: [] });
     expect(database.historyTableExists).toBe(false);
     expect(database.events).not.toContain("transaction:begin");
   });
@@ -548,6 +551,7 @@ describe("module migration apply", () => {
       ],
       appliedCount: 1,
       noOp: false,
+      retained: [],
     });
   });
 
@@ -580,7 +584,7 @@ describe("module migration apply", () => {
       database,
     });
 
-    expect(result).toEqual({ applied: [], appliedCount: 0, noOp: true });
+    expect(result).toEqual({ applied: [], appliedCount: 0, noOp: true, retained: [] });
     expect(Object.isFrozen(result)).toBe(true);
     expect(Object.isFrozen(result.applied)).toBe(true);
     expectNoPersistentMutation(database);
@@ -601,7 +605,7 @@ describe("module migration apply", () => {
       database,
     });
 
-    expect(result).toEqual({ applied: [], appliedCount: 0, noOp: true });
+    expect(result).toEqual({ applied: [], appliedCount: 0, noOp: true, retained: [] });
     expect(database.historyTableExists).toBe(false);
     expect(database.events).toEqual([
       "session:open",
@@ -980,3 +984,250 @@ describe("module migration failures and side effects", () => {
     expect(database.committedHistory).toEqual([]);
   });
 });
+
+/**
+ * Marks modules as present in the discovered inventory without giving them migrations, the way a
+ * real aggregate lists every discovered module whether or not it owns migration history. Only the
+ * manifest id is read by the runner.
+ */
+function withDiscovered(
+  inventory: ModuleMigrationAggregate,
+  ...moduleIds: readonly string[]
+): ModuleMigrationAggregate {
+  return Object.freeze({
+    ...inventory,
+    discoveredModules: Object.freeze(
+      moduleIds.map((id) => ({ manifest: { id } }) as unknown as DiscoveredModule),
+    ),
+  });
+}
+
+describe("retained history for absent modules (ADR 0048)", () => {
+  it("retains and reports an absent module's applied history without failing the plan", async () => {
+    const coreInitial = migration("core", 0);
+    const calendarInitial = migration("calendar", 0);
+    const calendarLater = migration("calendar", 1);
+    const history = [
+      historyRecord(coreInitial, 1),
+      historyRecord(calendarInitial, 2),
+      historyRecord(calendarLater, 3),
+    ];
+    const database = new FakeMigrationDatabase({ history });
+
+    const result = await planModuleMigrations({
+      aggregate: aggregate({ id: "core", migrations: [coreInitial] }),
+      database,
+    });
+
+    expect(result.appliedCount).toBe(1);
+    expect(result.pendingCount).toBe(0);
+    expect(result.entries.map((entry) => entry.identity)).toEqual([coreInitial.identity]);
+    expect(result.retained).toEqual([{ appliedCount: 2, moduleId: "calendar" }]);
+    expect(Object.isFrozen(result.retained)).toBe(true);
+    expect(Object.isFrozen(result.retained[0])).toBe(true);
+    expect(database.committedHistory).toEqual(history);
+    expectNoPersistentMutation(database);
+  });
+
+  it("applies a later Core migration while a module is absent, leaving its history intact", async () => {
+    const coreInitial = migration("core", 0);
+    const coreLater = migration("core", 1);
+    const calendarInitial = migration("calendar", 0);
+    const history = [historyRecord(coreInitial, 1), historyRecord(calendarInitial, 2)];
+    const database = new FakeMigrationDatabase({ history });
+
+    const result = await applyModuleMigrations({
+      aggregate: aggregate({ id: "core", migrations: [coreInitial, coreLater] }),
+      database,
+    });
+
+    expect(result.applied.map((applied) => applied.identity)).toEqual([coreLater.identity]);
+    expect(result.retained).toEqual([{ appliedCount: 1, moduleId: "calendar" }]);
+    expect(database.executedStatements).toEqual([coreLater.sql]);
+    expect(database.committedHistory.map((record) => record.identity)).toEqual([
+      coreInitial.identity,
+      calendarInitial.identity,
+      coreLater.identity,
+    ]);
+  });
+
+  it("applies a present module's migrations while another module is absent", async () => {
+    const peopleInitial = migration("people", 0);
+    const calendarInitial = migration("calendar", 0);
+    const database = new FakeMigrationDatabase({ history: [historyRecord(calendarInitial, 1)] });
+
+    const result = await applyModuleMigrations({
+      aggregate: aggregate({ id: "people", migrations: [peopleInitial] }),
+      database,
+    });
+
+    expect(result.applied.map((applied) => applied.identity)).toEqual([peopleInitial.identity]);
+    expect(result.retained).toEqual([{ appliedCount: 1, moduleId: "calendar" }]);
+  });
+
+  it("reports retained modules in a stable order with exact counts", async () => {
+    const zeta = [migration("zeta", 0), migration("zeta", 1), migration("zeta", 2)];
+    const alpha = migration("alpha", 0);
+    const database = new FakeMigrationDatabase({
+      history: [
+        historyRecord(zeta[0] as DiscoveredModuleMigration, 1),
+        historyRecord(alpha, 2),
+        historyRecord(zeta[1] as DiscoveredModuleMigration, 3),
+        historyRecord(zeta[2] as DiscoveredModuleMigration, 4),
+      ],
+    });
+
+    const result = await planModuleMigrations({ aggregate: aggregate(), database });
+
+    expect(result.retained).toEqual([
+      { appliedCount: 1, moduleId: "alpha" },
+      { appliedCount: 3, moduleId: "zeta" },
+    ]);
+  });
+
+  it("returns a module to strict validation: valid history plans cleanly and nothing is retained", async () => {
+    const initial = migration("people", 0);
+    const later = migration("people", 1);
+    const database = new FakeMigrationDatabase({ history: [historyRecord(initial, 1)] });
+
+    const result = await planModuleMigrations({
+      aggregate: aggregate({ id: "people", migrations: [initial, later] }),
+      database,
+    });
+
+    expect(result.retained).toEqual([]);
+    expect(result.entries.map((entry) => [entry.identity, entry.status])).toEqual([
+      [initial.identity, "applied"],
+      [later.identity, "pending"],
+    ]);
+  });
+
+  it("fails when a returning module no longer ships a previously applied migration", async () => {
+    const initial = migration("people", 0);
+    const later = migration("people", 1);
+    const database = new FakeMigrationDatabase({
+      history: [historyRecord(initial, 1), historyRecord(later, 2)],
+    });
+    const downgraded = aggregate({ id: "people", migrations: [initial] });
+
+    await captureRunnerError(
+      planModuleMigrations({ aggregate: downgraded, database }),
+      "MIGRATION_UNKNOWN_APPLIED",
+    );
+    await captureRunnerError(
+      applyModuleMigrations({ aggregate: downgraded, database }),
+      "MIGRATION_UNKNOWN_APPLIED",
+    );
+    expect(database.executedStatements).toEqual([]);
+  });
+
+  it("fails when a returning module's applied migration has different contents", async () => {
+    const initial = migration("people", 0);
+    const database = new FakeMigrationDatabase({ history: [historyRecord(initial, 1)] });
+    const edited = aggregate({
+      id: "people",
+      migrations: [migration("people", 0, { sql: "SELECT 'edited';\n" })],
+    });
+
+    const error = await captureRunnerError(
+      planModuleMigrations({ aggregate: edited, database }),
+      "MIGRATION_CHECKSUM_MISMATCH",
+    );
+    expect(error.migrationIdentity).toBe(initial.identity);
+  });
+
+  it("fails when a returning module's history is no longer a prefix of its journal", async () => {
+    const initial = migration("people", 0);
+    const later = migration("people", 1);
+    const database = new FakeMigrationDatabase({ history: [historyRecord(later, 1)] });
+
+    await captureRunnerError(
+      planModuleMigrations({
+        aggregate: aggregate({ id: "people", migrations: [initial, later] }),
+        database,
+      }),
+      "MIGRATION_HISTORY_INVALID",
+    );
+  });
+
+  it("keeps a present module that no longer ships any migrations strict", async () => {
+    const initial = migration("people", 0);
+    const database = new FakeMigrationDatabase({ history: [historyRecord(initial, 1)] });
+
+    await captureRunnerError(
+      planModuleMigrations({ aggregate: withDiscovered(aggregate(), "people"), database }),
+      "MIGRATION_UNKNOWN_APPLIED",
+    );
+  });
+
+  it("never treats Core's history as an absent module's", async () => {
+    const coreInitial = migration("core", 0);
+    const coreGhost = migration("core", 1);
+
+    // An inventory with no Core source at all: Core's rows are still strict, never retained.
+    await captureRunnerError(
+      planModuleMigrations({
+        aggregate: aggregate({ id: "people", migrations: [] }),
+        database: new FakeMigrationDatabase({ history: [historyRecord(coreInitial, 1)] }),
+      }),
+      "MIGRATION_UNKNOWN_APPLIED",
+    );
+    // A Core row missing from Core's own inventory.
+    await captureRunnerError(
+      planModuleMigrations({
+        aggregate: aggregate({ id: "core", migrations: [coreInitial] }),
+        database: new FakeMigrationDatabase({
+          history: [historyRecord(coreInitial, 1), historyRecord(coreGhost, 2)],
+        }),
+      }),
+      "MIGRATION_UNKNOWN_APPLIED",
+    );
+  });
+
+  it.each([
+    [
+      "an identity that does not name its own module and tag",
+      (source: DiscoveredModuleMigration) => [
+        historyRecord(source, 1, { identity: "calendar:0099_elsewhere" }),
+      ],
+    ],
+    [
+      "a duplicate applied order",
+      (source: DiscoveredModuleMigration) => [
+        historyRecord(source, 1),
+        historyRecord(migration("calendar", 1), 1),
+      ],
+    ],
+    [
+      "a duplicate index",
+      (source: DiscoveredModuleMigration) => [
+        historyRecord(source, 1),
+        historyRecord(migration("calendar", 1), 2, { index: 0 }),
+      ],
+    ],
+  ])("still rejects retained rows with %s", async (_label, makeHistory) => {
+    const database = new FakeMigrationDatabase({
+      history: makeHistory(migration("calendar", 0)),
+    });
+
+    await captureRunnerError(
+      planModuleMigrations({ aggregate: aggregate(), database }),
+      "MIGRATION_HISTORY_INVALID",
+    );
+  });
+
+  it("rejects a retained row that claims a present module's migration identity", async () => {
+    const peopleInitial = migration("people", 0);
+    const database = new FakeMigrationDatabase({
+      history: [historyRecord(peopleInitial, 1, { moduleId: "calendar" })],
+    });
+
+    await captureRunnerError(
+      planModuleMigrations({
+        aggregate: aggregate({ id: "people", migrations: [peopleInitial] }),
+        database,
+      }),
+      "MIGRATION_HISTORY_INVALID",
+    );
+  });
+});

core/tests/module-package-verification.test.ts

@@ -0,0 +1,748 @@
+import { mkdir, mkdtemp, readdir, rm, stat, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterEach, describe, expect, it } from "vitest";
+import {
+  currentModulePackageHost,
+  type ModulePackageHost,
+  ModulePackageVerificationError,
+  type ModulePackageVerificationErrorCode,
+  verifyModulePackage,
+} from "../src/modules/index.js";
+import {
+  type FixtureEntry,
+  modulePackageFixture,
+  type PackageFixtureOptions,
+  sha256,
+} from "./support/module-package-fixture.js";
+
+const platform = {
+  databaseRuntime: { "drizzle-orm": "0.45.2" },
+  moduleSdkVersion: "0.2.0",
+  platformVersion: "0.2.0",
+} as const;
+
+const temporaryDirectories: string[] = [];
+
+afterEach(async () => {
+  await Promise.all(
+    temporaryDirectories
+      .splice(0)
+      .map((directory) => rm(directory, { force: true, recursive: true })),
+  );
+});
+
+async function scratch(): Promise<string> {
+  const directory = await mkdtemp(path.join(tmpdir(), "ekklesia-verify-"));
+  temporaryDirectories.push(directory);
+  return directory;
+}
+
+async function archiveFile(options: PackageFixtureOptions = {}): Promise<{
+  readonly archivePath: string;
+  readonly sha256: string;
+}> {
+  const fixture = await modulePackageFixture(options);
+  const archivePath = path.join(await scratch(), "private-host-name-5e1d.tar.gz");
+  await writeFile(archivePath, fixture.archive);
+  return { archivePath, sha256: fixture.sha256 };
+}
+
+async function executionScratch(): Promise<string> {
+  const directory = path.join(await scratch(), "execution");
+  await mkdir(directory);
+  return directory;
+}
+
+async function rejection(
+  options: PackageFixtureOptions,
+  code: ModulePackageVerificationErrorCode,
+  extra: { readonly expectedSha256?: string } = {},
+): Promise<ModulePackageVerificationError> {
+  const { archivePath } = await archiveFile(options);
+  try {
+    await verifyModulePackage({ archivePath, platform, ...extra });
+  } catch (error) {
+    expect(error).toBeInstanceOf(ModulePackageVerificationError);
+    const verificationError = error as ModulePackageVerificationError;
+    expect(verificationError.code).toBe(code);
+    // Sanitized: never the archive's location, a temporary directory, or text from inside it.
+    const rendered = JSON.stringify({ ...verificationError, message: verificationError.message });
+    expect(rendered).not.toContain("private-host-name-5e1d");
+    expect(rendered).not.toContain(tmpdir());
+    expect(rendered).not.toContain("attacker-chosen");
+    return verificationError;
+  }
+  throw new Error(`Expected ${code}.`);
+}
+
+function withEntry(entry: FixtureEntry): PackageFixtureOptions {
+  return { extraEntries: [entry] };
+}
+
+function abiPackage(overrides: PackageFixtureOptions = {}): PackageFixtureOptions {
+  return {
+    manifest: (manifest) => ({ ...manifest, database: { abi: 1 } }),
+    schemaSource: `export default {
+      moduleId: "example",
+      tables: [{ name: "example_records", foreignKeys: [] }]
+    };\n`,
+    serverSource:
+      'export default { database: { abi: 1 }, id: "example", version: "0.1.0", register() {} };\n',
+    ...overrides,
+  };
+}
+
+describe("Module Package v1 verification (ADR 0049)", () => {
+  it("verifies a valid any-target package, its digest, and its module", async () => {
+    const { archivePath, sha256: digest } = await archiveFile();
+    const result = await verifyModulePackage({ archivePath, expectedSha256: digest, platform });
+    expect(result).toEqual({
+      archiveSha256: digest,
+      fileCount: 9,
+      moduleId: "example",
+      target: "any",
+      version: "0.1.0",
+    });
+  });
+
+  it("uses an explicit execution scratch for pure JavaScript and cleans concurrent runs", async () => {
+    const { archivePath } = await archiveFile();
+    const executionScratchDirectory = await executionScratch();
+    const runs = Array.from({ length: 4 }, () =>
+      verifyModulePackage({ archivePath, executionScratchDirectory, platform }),
+    );
+    await expect(Promise.all(runs)).resolves.toHaveLength(4);
+    expect(await readdir(executionScratchDirectory)).toEqual([]);
+  });
+
+  it("cleans its execution scratch after a backend load failure", async () => {
+    const { archivePath } = await archiveFile({
+      serverSource:
+        'import "dependency-not-in-this-package";\nexport default { id: "example", version: "0.1.0" };\n',
+    });
+    const executionScratchDirectory = await executionScratch();
+    await expect(
+      verifyModulePackage({ archivePath, executionScratchDirectory, platform }),
+    ).rejects.toMatchObject({ code: "MODULE_PACKAGE_ENTRYPOINT_LOAD_FAILED" });
+    expect(await readdir(executionScratchDirectory)).toEqual([]);
+  });
+
+  it("reports a missing execution scratch as a verifier environment error", async () => {
+    const { archivePath } = await archiveFile();
+    const executionScratchDirectory = path.join(await scratch(), "missing");
+    await expect(
+      verifyModulePackage({ archivePath, executionScratchDirectory, platform }),
+    ).rejects.toMatchObject({
+      code: "MODULE_PACKAGE_VERIFIER_SCRATCH_UNAVAILABLE",
+      message:
+        "The verifier execution scratch directory is missing, not writable, or mounted noexec.",
+    });
+    await expect(stat(executionScratchDirectory)).rejects.toMatchObject({ code: "ENOENT" });
+  });
+
+  it("rejects an unsafe archive before consulting the execution scratch", async () => {
+    const { archivePath } = await archiveFile(
+      withEntry({ path: "example/../attacker-chosen", data: "x" }),
+    );
+    const executionScratchDirectory = path.join(await scratch(), "missing");
+    await expect(
+      verifyModulePackage({ archivePath, executionScratchDirectory, platform }),
+    ).rejects.toMatchObject({ code: "MODULE_PACKAGE_UNSAFE_PATH" });
+    await expect(stat(executionScratchDirectory)).rejects.toMatchObject({ code: "ENOENT" });
+  });
+
+  it("extracts only a verified package, with normalized modes, into a new directory", async () => {
+    const { archivePath } = await archiveFile();
+    const target = path.join(await scratch(), "example");
+    await verifyModulePackage({ archivePath, extractTo: target, platform });
+    const names = (await readdir(target, { recursive: true })).sort();
+    expect(names).toContain("ekklesia.package.json");
+    expect(names).toContain("LICENSE");
+    expect(names).toContain("dist/server/index.js");
+    expect((await stat(target)).mode & 0o7777).toBe(0o755);
+    expect((await stat(path.join(target, "dist", "server", "index.js"))).mode & 0o7777).toBe(0o644);
+
+    const { archivePath: broken } = await archiveFile({ runtimePackage: { name: "x" } });
+    const refused = path.join(await scratch(), "refused");
+    await expect(
+      verifyModulePackage({ archivePath: broken, extractTo: refused, platform }),
+    ).rejects.toBeInstanceOf(ModulePackageVerificationError);
+    await expect(stat(refused)).rejects.toMatchObject({ code: "ENOENT" });
+  });
+
+  it("refuses to extract over an existing directory", async () => {
+    const { archivePath } = await archiveFile();
+    const existing = await scratch();
+    await expect(
+      verifyModulePackage({ archivePath, extractTo: existing, platform }),
+    ).rejects.toMatchObject({ code: "MODULE_PACKAGE_EXTRACTION_FAILED" });
+  });
+
+  it("fails a wrong archive digest", async () => {
+    await rejection({}, "MODULE_PACKAGE_DIGEST_MISMATCH", { expectedSha256: sha256("other") });
+  });
+
+  it("fails a payload whose contents no longer match their digest", async () => {
+    await rejection(
+      {
+        tamper: (files) => {
+          files.set("dist/server/index.js", Buffer.from("export default {}; // attacker-chosen\n"));
+        },
+      },
+      "MODULE_PACKAGE_FILE_MISMATCH",
+    );
+  });
+
+  it("fails a listed file missing from the archive", async () => {
+    await rejection(
+      { tamper: (files) => void files.delete("THIRD_PARTY_NOTICES") },
+      "MODULE_PACKAGE_FILE_MISSING",
+    );
+  });
+
+  it("fails an archive file that is not listed", async () => {
+    await rejection(
+      withEntry({ path: "example/attacker-chosen.js", data: "extra" }),
+      "MODULE_PACKAGE_FILE_UNLISTED",
+    );
+  });
+
+  it.each([
+    ["a missing license declaration", undefined],
+    ["an empty license declaration", ""],
+    ["UNLICENSED", "UNLICENSED"],
+    ["a malformed SPDX expression", "MIT OR"],
+  ])("fails package metadata with %s", async (_label, license) => {
+    await rejection(
+      {
+        metadata: (metadata) => {
+          const changed: Record<string, unknown> = { ...metadata, license };
+          if (license === undefined) {
+            delete changed.license;
+          }
+          return changed;
+        },
+      },
+      "MODULE_PACKAGE_METADATA_INVALID",
+    );
+  });
+
+  it("fails closed on pre-ADR-0051 metadata", async () => {
+    await rejection(
+      {
+        metadata: (metadata) => {
+          const old: Record<string, unknown> = { ...metadata };
+          delete old.license;
+          return old;
+        },
+      },
+      "MODULE_PACKAGE_METADATA_INVALID",
+    );
+  });
+
+  it("requires LICENSE at the canonical path in both payload and inventory", async () => {
+    await rejection(
+      { tamper: (files) => void files.delete("LICENSE") },
+      "MODULE_PACKAGE_FILE_MISSING",
+    );
+    await rejection(
+      {
+        metadata: (metadata) => ({
+          ...metadata,
+          files: (metadata.files as { path: string }[]).filter((file) => file.path !== "LICENSE"),
+        }),
+      },
+      "MODULE_PACKAGE_METADATA_INVALID",
+    );
+    await rejection(
+      withEntry({ path: "example/licenses/LICENSE", data: "attacker-chosen" }),
+      "MODULE_PACKAGE_FILE_UNLISTED",
+    );
+    await rejection(
+      withEntry({ path: "example/COPYING", data: "attacker-chosen" }),
+      "MODULE_PACKAGE_FILE_UNLISTED",
+    );
+  });
+
+  it("checks the listed LICENSE bytes, size, and digest", async () => {
+    await rejection(
+      { tamper: (files) => files.set("LICENSE", Buffer.from("attacker-chosen")) },
+      "MODULE_PACKAGE_FILE_MISMATCH",
+    );
+    await rejection(
+      {
+        metadata: (metadata) => ({
+          ...metadata,
+          files: (metadata.files as { path: string; size: number; sha256: string }[]).map((file) =>
+            file.path === "LICENSE" ? { ...file, size: file.size + 1 } : file,
+          ),
+        }),
+      },
+      "MODULE_PACKAGE_FILE_MISMATCH",
+    );
+  });
+
+  it("rejects a duplicate LICENSE archive entry", async () => {
+    await rejection(
+      withEntry({ path: "example/LICENSE", data: "attacker-chosen" }),
+      "MODULE_PACKAGE_LAYOUT_INVALID",
+    );
+  });
+
+  it("fails when the manifest and the package disagree about the version", async () => {
+    await rejection(
+      { manifest: (manifest) => ({ ...manifest, version: "0.2.0" }) },
+      "MODULE_PACKAGE_IDENTITY_MISMATCH",
+    );
+  });
+
+  it("fails when the metadata names another module", async () => {
+    await rejection(
+      { metadata: (metadata) => ({ ...metadata, module: { id: "other", version: "0.1.0" } }) },
+      "MODULE_PACKAGE_IDENTITY_MISMATCH",
+    );
+  });
+
+  it("fails a runtime package.json that is not the generated shape", async () => {
+    await rejection(
+      {
+        runtimePackage: {
+          name: "@test/module-example",
+          version: "0.1.0",
+          private: true,
+          type: "module",
+          ekklesia: { layer: "module" },
+          dependencies: { "@ekklesia/module-sdk": "workspace:*" },
+        },
+      },
+      "MODULE_PACKAGE_RUNTIME_PACKAGE_INVALID",
+    );
+  });
+
+  it("fails an unsupported package format", async () => {
+    await rejection(
+      { metadata: (metadata) => ({ ...metadata, packageFormat: 2 }) },
+      "MODULE_PACKAGE_FORMAT_UNSUPPORTED",
+    );
+  });
+
+  it("fails transitional metadata it does not understand", async () => {
+    await rejection(
+      { metadata: (metadata) => ({ ...metadata, transitional: { orm: { prisma: "6.0.0" } } }) },
+      "MODULE_PACKAGE_TRANSITIONAL_UNSUPPORTED",
+    );
+    await rejection(
+      {
+        metadata: (metadata) => ({
+          ...metadata,
+          transitional: { databaseRuntime: { "drizzle-orm": "0.45.2", prisma: "6.0.0" } },
+        }),
+      },
+      "MODULE_PACKAGE_TRANSITIONAL_UNSUPPORTED",
+    );
+  });
+
+  it("enforces today's database runtime agreement, and accepts it when it holds", async () => {
+    await rejection(
+      {
+        metadata: (metadata) => ({
+          ...metadata,
+          transitional: { databaseRuntime: { "drizzle-orm": "0.44.0" } },
+        }),
+      },
+      "MODULE_PACKAGE_DATABASE_RUNTIME_INCOMPATIBLE",
+    );
+    const { archivePath } = await archiveFile({
+      metadata: (metadata) => ({
+        ...metadata,
+        transitional: { databaseRuntime: { "drizzle-orm": "0.45.2" } },
+      }),
+    });
+    await expect(verifyModulePackage({ archivePath, platform })).resolves.toMatchObject({
+      moduleId: "example",
+    });
+  });
+
+  it("verifies ABI-v1 plain schema metadata without comparing Drizzle with Core", async () => {
+    const { archivePath } = await archiveFile(abiPackage());
+
+    await expect(
+      verifyModulePackage({
+        archivePath,
+        platform: { ...platform, databaseRuntime: { "drizzle-orm": "99.0.0" } },
+      }),
+    ).resolves.toMatchObject({ moduleId: "example" });
+  });
+
+  it("rejects transitional database runtime metadata from an ABI-v1 package", async () => {
+    await rejection(
+      abiPackage({
+        metadata: (metadata) => ({
+          ...metadata,
+          transitional: { databaseRuntime: { "drizzle-orm": "0.45.2" } },
+        }),
+      }),
+      "MODULE_PACKAGE_DATABASE_RUNTIME_UNEXPECTED",
+    );
+  });
+
+  it("rejects an unsupported database ABI and malformed ABI-v1 schema metadata", async () => {
+    await rejection(
+      abiPackage({ manifest: (manifest) => ({ ...manifest, database: { abi: 2 } }) }),
+      "MODULE_PACKAGE_MANIFEST_INVALID",
+    );
+    const schemaError = await rejection(
+      abiPackage({
+        schemaSource:
+          'export default { moduleId: "example", tables: { records: "attacker-chosen" } };\n',
+      }),
+      "MODULE_PACKAGE_ENTRYPOINT_LOAD_FAILED",
+    );
+    expect(schemaError.message).not.toContain("attacker-chosen");
+  });
+
+  it("fails a target this platform cannot run", async () => {
+    await rejection(
+      {
+        metadata: (metadata) => ({
+          ...metadata,
+          target: "linux-arm64-musl",
+          runtime: { libcVersion: ">=1.2.0", node: ">=20", nodeApi: 9 },
+        }),
+      },
+      "MODULE_PACKAGE_TARGET_INCOMPATIBLE",
+    );
+  });
+
+  it("fails a native file inside an any-target package", async () => {
+    const native = await modulePackageFixture({
+      tamper: (files) => {
+        files.set("dist/addon.node", Buffer.from([0x7f, 0x45, 0x4c, 0x46]));
+      },
+      metadata: (metadata) => {
+        const files = [
+          ...(metadata.files as { path: string; size: number; sha256: string }[]),
+          {
+            path: "dist/addon.node",
+            size: 4,
+            sha256: sha256(Buffer.from([0x7f, 0x45, 0x4c, 0x46])),
+          },
+        ].sort((left, right) => (left.path < right.path ? -1 : 1));
+        return { ...metadata, files };
+      },
+    });
+    const archivePath = path.join(await scratch(), "native.tar.gz");
+    await writeFile(archivePath, native.archive);
+    await expect(verifyModulePackage({ archivePath, platform })).rejects.toMatchObject({
+      code: "MODULE_PACKAGE_NATIVE_FILE",
+    });
+  });
+
+  it("fails a package that needs a newer Node.js", async () => {
+    await rejection(
+      { metadata: (metadata) => ({ ...metadata, runtime: { node: ">=99" } }) },
+      "MODULE_PACKAGE_RUNTIME_INCOMPATIBLE",
+    );
+  });
+
+  it("fails an incorporated SDK outside the manifest's own range", async () => {
+    await rejection(
+      {
+        metadata: (metadata) => ({
+          ...metadata,
+          incorporates: { "@ekklesia/module-sdk": "0.9.0" },
+        }),
+      },
+      "MODULE_PACKAGE_SDK_INCOMPATIBLE",
+    );
+  });
+
+  it("fails a module whose declared entrypoint is missing", async () => {
+    await rejection(
+      {
+        manifest: (manifest) => ({
+          ...manifest,
+          version: "0.1.0",
+          entrypoints: {
+            ...(manifest.entrypoints as Record<string, unknown>),
+            schema: "./dist/schema/index.js",
+          },
+        }),
+      },
+      "MODULE_PACKAGE_MODULE_INVALID",
+    );
+  });
+
+  it("fails a backend that imports a dependency the package does not contain", async () => {
+    const error = await rejection(
+      {
+        serverSource:
+          'import pad from "ekklesia-dependency-not-in-this-package";\nexport default { id: "example", version: "0.1.0", register() { pad(); } };\n',
+      },
+      "MODULE_PACKAGE_ENTRYPOINT_LOAD_FAILED",
+    );
+    expect(error.message).not.toContain("ekklesia-dependency-not-in-this-package");
+  });
+
+  it("fails a backend whose default export names another module", async () => {
+    await rejection(
+      { serverSource: 'export default { id: "other", version: "0.1.0" };\n' },
+      "MODULE_PACKAGE_ENTRYPOINT_LOAD_FAILED",
+    );
+  });
+
+  it.each([
+    ["an absolute path", { path: "/etc/attacker-chosen", data: "x" }, "MODULE_PACKAGE_UNSAFE_PATH"],
+    [
+      "a .. segment",
+      { path: "example/../attacker-chosen", data: "x" },
+      "MODULE_PACKAGE_UNSAFE_PATH",
+    ],
+    [
+      "a symbolic link",
+      { path: "example/link", type: "symlink", linkname: "/etc/passwd" },
+      "MODULE_PACKAGE_LINK",
+    ],
+    [
+      "a hard link",
+      { path: "example/hard", type: "hardlink", linkname: "example/package.json" },
+      "MODULE_PACKAGE_LINK",
+    ],
+    [
+      "a device node",
+      { path: "example/device", type: "character" },
+      "MODULE_PACKAGE_SPECIAL_ENTRY",
+    ],
+    ["a FIFO", { path: "example/fifo", type: "fifo" }, "MODULE_PACKAGE_SPECIAL_ENTRY"],
+    [
+      "a setuid file",
+      { path: "example/setuid", data: "x", mode: 0o4755 },
+      "MODULE_PACKAGE_UNSAFE_MODE",
+    ],
+    [
+      "a setgid directory",
+      { path: "example/setgid", type: "directory", mode: 0o2755 },
+      "MODULE_PACKAGE_UNSAFE_MODE",
+    ],
+    [
+      "a second top-level directory",
+      { path: "attacker-chosen/file", data: "x" },
+      "MODULE_PACKAGE_LAYOUT_INVALID",
+    ],
+    [
+      "a duplicate entry",
+      { path: "example/package.json", data: "{}" },
+      "MODULE_PACKAGE_LAYOUT_INVALID",
+    ],
+  ] as const)("fails %s", async (_label, entry, code) => {
+    await rejection(withEntry(entry as FixtureEntry), code);
+  });
+
+  it("fails a file that is not a gzip-compressed tar archive", async () => {
+    const archivePath = path.join(await scratch(), "plain.tar.gz");
+    await writeFile(archivePath, "not an archive");
+    await expect(verifyModulePackage({ archivePath, platform })).rejects.toMatchObject({
+      code: "MODULE_PACKAGE_UNREADABLE",
+    });
+  });
+
+  describe("native targets (ADR 0049)", () => {
+    /** The first bytes of a 64-bit little-endian ELF object for `machine` (62 is x86-64). The
+     * verifier reads only the identification and machine fields. */
+    function elfHeader(machine = 62): Buffer {
+      const header = Buffer.alloc(64);
+      Buffer.from([0x7f, 0x45, 0x4c, 0x46, 2, 1, 1]).copy(header);
+      header.writeUInt16LE(3, 16);
+      header.writeUInt16LE(machine, 18);
+      return header;
+    }
+
+    const linuxHost = {
+      arch: "x64",
+      libc: { family: "glibc", version: "2.41" },
+      nodeApi: 10,
+      nodeAbi: "137",
+      platform: "linux",
+    } as const;
+
+    function nativePackage(
+      overrides: {
+        readonly files?: Record<string, Uint8Array | string>;
+        readonly target?: string;
+        readonly runtime?: Record<string, unknown>;
+      } = {},
+    ): PackageFixtureOptions {
+      return {
+        files: overrides.files ?? {
+          "node_modules/native-thing/index.js": "module.exports = {};\n",
+          "node_modules/native-thing/lib/native-thing.node": elfHeader(),
+          "node_modules/native-thing/package.json": '{"name":"native-thing","version":"1.0.0"}\n',
+        },
+        metadata: (metadata) => ({
+          ...metadata,
+          runtime: overrides.runtime ?? {
+            libcVersion: ">=2.28.0",
+            node: ">=20",
+            nodeApi: 9,
+          },
+          target: overrides.target ?? "linux-x64-glibc",
+        }),
+      };
+    }
+
+    async function verifyOn(
+      options: PackageFixtureOptions,
+      host: ModulePackageHost,
+    ): Promise<unknown> {
+      const { archivePath } = await archiveFile(options);
+      return verifyModulePackage({ archivePath, platform: { ...platform, host } });
+    }
+
+    async function refusedOn(
+      options: PackageFixtureOptions,
+      host: ModulePackageHost,
+      code: ModulePackageVerificationErrorCode,
+    ): Promise<void> {
+      await expect(verifyOn(options, host)).rejects.toMatchObject({ code });
+    }
+
+    it("accepts linux-x64-glibc on a matching host, native node_modules and addon included", async () => {
+      await expect(verifyOn(nativePackage(), linuxHost)).resolves.toMatchObject({
+        moduleId: "example",
+        target: "linux-x64-glibc",
+      });
+    });
+
+    it("refuses another operating system, CPU, or C library family", async () => {
+      await refusedOn(
+        nativePackage(),
+        { ...linuxHost, platform: "darwin" },
+        "MODULE_PACKAGE_TARGET_INCOMPATIBLE",
+      );
+      await refusedOn(
+        nativePackage(),
+        { ...linuxHost, arch: "arm64" },
+        "MODULE_PACKAGE_TARGET_INCOMPATIBLE",
+      );
+      // musl reports no glibc version, so the host cannot be proven glibc.
+      const { libc: _libc, ...musl } = linuxHost;
+      await refusedOn(nativePackage(), musl, "MODULE_PACKAGE_TARGET_INCOMPATIBLE");
+    });
+
+    it("refuses a target this platform does not implement", async () => {
+      await refusedOn(
+        nativePackage({ target: "linux-arm64-glibc" }),
+        { ...linuxHost, arch: "arm64" },
+        "MODULE_PACKAGE_TARGET_INCOMPATIBLE",
+      );
+    });
+
+    it("refuses a C library older than the package needs", async () => {
+      await refusedOn(
+        nativePackage(),
+        { ...linuxHost, libc: { family: "glibc", version: "2.17" } },
+        "MODULE_PACKAGE_LIBC_INCOMPATIBLE",
+      );
+      await expect(
+        verifyOn(nativePackage(), { ...linuxHost, libc: { family: "glibc", version: "2.28" } }),
+      ).resolves.toMatchObject({ target: "linux-x64-glibc" });
+    });
+
+    it("refuses a Node-API version or Node.js ABI the host does not provide", async () => {
+      await refusedOn(
+        nativePackage(),
+        { ...linuxHost, nodeApi: 8 },
+        "MODULE_PACKAGE_NODE_API_INCOMPATIBLE",
+      );
+      const { nodeApi: _nodeApi, ...unknownApi } = linuxHost;
+      await refusedOn(nativePackage(), unknownApi, "MODULE_PACKAGE_NODE_API_INCOMPATIBLE");
+      await refusedOn(
+        nativePackage({ runtime: { libcVersion: ">=2.28.0", node: ">=20", nodeAbi: "115" } }),
+        linuxHost,
+        "MODULE_PACKAGE_NODE_API_INCOMPATIBLE",
+      );
+    });
+
+    it("refuses a native file built for another machine, or an addon that is not one", async () => {
+      await refusedOn(
+        nativePackage({
+          files: { "node_modules/native-thing/lib/native-thing.node": elfHeader(183) },
+        }),
+        linuxHost,
+        "MODULE_PACKAGE_NATIVE_FILE_INCOMPATIBLE",
+      );
+      await refusedOn(
+        nativePackage({
+          files: { "node_modules/native-thing/lib/libthing.so": elfHeader(183) },
+        }),
+        linuxHost,
+        "MODULE_PACKAGE_NATIVE_FILE_INCOMPATIBLE",
+      );
+      await refusedOn(
+        nativePackage({
+          files: { "node_modules/native-thing/lib/native-thing.node": "not an ELF object" },
+        }),
+        linuxHost,
+        "MODULE_PACKAGE_NATIVE_FILE_INCOMPATIBLE",
+      );
+    });
+
+    it("requires a native package to state its Node.js interface and, on Linux, its C library", async () => {
+      await rejection(
+        nativePackage({ runtime: { libcVersion: ">=2.28.0", node: ">=20" } }),
+        "MODULE_PACKAGE_METADATA_INVALID",
+      );
+      await rejection(
+        nativePackage({ runtime: { node: ">=20", nodeApi: 9 } }),
+        "MODULE_PACKAGE_METADATA_INVALID",
+      );
+    });
+
+    it("keeps any-target packages free of node_modules, addons, and ELF objects", async () => {
+      await rejection(
+        { files: { "node_modules/thing/index.js": "module.exports = {};\n" } },
+        "MODULE_PACKAGE_NATIVE_FILE",
+      );
+      await rejection({ files: { "dist/thing.node": elfHeader() } }, "MODULE_PACKAGE_NATIVE_FILE");
+      await rejection({ files: { "dist/libthing.so": elfHeader() } }, "MODULE_PACKAGE_NATIVE_FILE");
+    });
+
+    it("establishes this host's facts from Node.js alone", () => {
+      const host = currentModulePackageHost();
+      expect(host.platform).toBe(process.platform);
+      expect(host.arch).toBe(process.arch);
+      expect(host.nodeApi).toBe(Number(process.versions.napi));
+      if (process.platform === "linux") {
+        const report = process.report.getReport() as { header?: { glibcVersionRuntime?: string } };
+        expect(host.libc?.version).toBe(report.header?.glibcVersionRuntime);
+      }
+    });
+  });
+
+  it("fails an archive without package metadata", async () => {
+    const fixture = await modulePackageFixture();
+    const { gunzipSync, gzipSync } = await import("node:zlib");
+    // Rebuild without the metadata entry by filtering the fixture through a fresh archive.
+    const archivePath = path.join(await scratch(), "no-metadata.tar.gz");
+    const raw = gunzipSync(fixture.archive);
+    const blocks: Buffer[] = [];
+    for (let offset = 0; offset + 512 <= raw.length; ) {
+      const headerBlock = raw.subarray(offset, offset + 512);
+      if (headerBlock.every((byte) => byte === 0)) {
+        break;
+      }
+      const name = headerBlock.subarray(0, 100).toString("latin1").replace(/\0.*$/su, "");
+      const size = Number.parseInt(headerBlock.subarray(124, 136).toString("latin1"), 8);
+      const length = 512 + Math.ceil(size / 512) * 512;
+      if (!name.endsWith("ekklesia.package.json")) {
+        blocks.push(raw.subarray(offset, offset + length));
+      }
+      offset += length;
+    }
+    await writeFile(archivePath, gzipSync(Buffer.concat([...blocks, Buffer.alloc(1024)])));
+    await expect(verifyModulePackage({ archivePath, platform })).rejects.toMatchObject({
+      code: "MODULE_PACKAGE_METADATA_MISSING",
+    });
+  });
+});

core/tests/module-permissions.test.ts

@@ -28,7 +28,7 @@ interface PermissionInput {
  * is read by `composePlatformPermissionRegistry`; the rest exist only to satisfy the type. */
 function fakeModule(id: string, permissions: readonly PermissionInput[] = []): DiscoveredModule {
   const manifest = parseModuleManifest({
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "0.1.0",

core/tests/module-realtime-runtime.test.ts

@@ -1,11 +1,8 @@
 import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import type {
-  ModuleDatabase,
-  ModuleRealtimePublisher,
-  ModuleRuntimeServices,
-} from "@ekklesia/contracts";
+import type { ModuleRealtimePublisher } from "@ekklesia/contracts";
+import type { LegacyModuleRuntimeServices, ModuleDatabase } from "../src/modules/database.js";
 import { afterEach, describe, expect, it } from "vitest";
 import { ModuleRuntimeError, startModuleRuntime } from "../src/modules/runtime.js";
 
@@ -22,7 +19,7 @@ afterEach(async () => {
   );
 });
 
-function fakeServices(): ModuleRuntimeServices {
+function fakeServices(): LegacyModuleRuntimeServices {
   return Object.freeze({ database: Object.freeze({}) as ModuleDatabase });
 }
 
@@ -31,7 +28,7 @@ function manifest(
   permissions: readonly Record<string, string>[] = [],
 ): Record<string, unknown> {
   return {
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "0.1.0",

core/tests/module-runtime.test.ts

@@ -1,21 +1,23 @@
 import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import type { ModuleConfiguration, ModuleDatabaseExecutor } from "@ekklesia/contracts";
 import type {
-  ModuleConfiguration,
+  AnyModuleRuntimeServices,
+  LegacyModuleRuntimeServices,
   ModuleDatabase,
-  ModuleRuntimeServices,
-} from "@ekklesia/contracts";
+} from "../src/modules/database.js";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { discoverModules } from "../src/modules/discovery.js";
-import { resolveModuleEligibility } from "../src/modules/lifecycle.js";
 import {
   ModuleDiscoveryError,
   ModuleRuntimeError,
   type ModuleRuntimeIssueCode,
+  type ModuleRuntimeServicesLookup,
   startDiscoveredModuleRuntime,
   startModuleRuntime,
 } from "../src/modules/index.js";
+import { resolveModuleEligibility } from "../src/modules/lifecycle.js";
 
 vi.mock("../src/modules/discovery.js", async (importOriginal) => {
   const actual = await importOriginal<typeof import("../src/modules/discovery.js")>();
@@ -52,12 +54,13 @@ function manifestFor(
   id: string,
   options: {
     capabilities?: Array<{ id: string; version: string }>;
+    database?: { abi: 1 };
     dependencies?: Record<string, unknown>;
     permissions?: Array<{ id: string; baseline: string; description: string }>;
   } = {},
 ): Record<string, unknown> {
   return {
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "0.1.0",
@@ -67,6 +70,7 @@ function manifestFor(
     },
     capabilities: options.capabilities ?? [],
     permissions: options.permissions ?? [],
+    ...(options.database ? { database: options.database } : {}),
     ...(options.dependencies ? { dependencies: options.dependencies } : {}),
     entrypoints: {
       server: "./dist/server/index.js",
@@ -145,13 +149,29 @@ function fakeModuleDatabase(): ModuleDatabase {
   }) as unknown as ModuleDatabase;
 }
 
-function fakeModuleRuntimeServices(): ModuleRuntimeServices {
-  return Object.freeze({ database: fakeModuleDatabase() });
+function fakeModuleRuntimeServices(): ModuleRuntimeServicesLookup {
+  const services = new Map<string, LegacyModuleRuntimeServices>();
+  const database = fakeModuleDatabase();
+  return new Proxy(services, {
+    get(target, property, receiver) {
+      if (property === "get") {
+        return (moduleId: string) => {
+          let value = target.get(moduleId);
+          if (!value) {
+            value = Object.freeze({ database });
+            target.set(moduleId, value);
+          }
+          return value;
+        };
+      }
+      return Reflect.get(target, property, receiver);
+    },
+  });
 }
 
 function runtimeOptions(
   modulesDirectory: string,
-  services: ModuleRuntimeServices = fakeModuleRuntimeServices(),
+  services: ModuleRuntimeServicesLookup = fakeModuleRuntimeServices(),
 ) {
   return {
     moduleSdkVersion: "0.1.0",
@@ -1067,6 +1087,54 @@ describe("already-discovered module runtime", () => {
 });
 
 describe("module runtime services", () => {
+  it("delivers only the manifest-selected database mode and distinct ABI executors", async () => {
+    const modulesDirectory = await createModulesDirectory();
+    const recorder = createReferenceRecorder();
+    const legacyDatabase = fakeModuleDatabase();
+    const alphaExecutor = Object.freeze({
+      abiVersion: 1,
+      query: vi.fn(),
+      transaction: vi.fn(),
+    }) as unknown as ModuleDatabaseExecutor;
+    const betaExecutor = Object.freeze({
+      abiVersion: 1,
+      query: vi.fn(),
+      transaction: vi.fn(),
+    }) as unknown as ModuleDatabaseExecutor;
+    const services: ModuleRuntimeServicesLookup = new Map<string, AnyModuleRuntimeServices>([
+      ["legacy", Object.freeze({ database: legacyDatabase })],
+      ["alpha", Object.freeze({ database: alphaExecutor })],
+      ["beta", Object.freeze({ database: betaExecutor })],
+    ]);
+    await createRuntimeModule(modulesDirectory, "legacy", {
+      serverSource: `export default { id: "legacy", version: "0.1.0", start({ services }) { ${recorder.expression}.push(services.database); } };`,
+    });
+    for (const id of ["alpha", "beta"]) {
+      await createRuntimeModule(modulesDirectory, id, {
+        manifest: manifestFor(id, { database: { abi: 1 } }),
+        serverSource: `export default { database: { abi: 1 }, id: ${JSON.stringify(id)}, version: "0.1.0", start({ services }) { ${recorder.expression}.push(services.database); } };`,
+      });
+    }
+
+    const runtime = await startModuleRuntime(runtimeOptions(modulesDirectory, services));
+
+    expect(recorder.values).toEqual([alphaExecutor, betaExecutor, legacyDatabase]);
+    expect("select" in alphaExecutor).toBe(false);
+    expect(alphaExecutor).not.toBe(betaExecutor);
+    await runtime.stop();
+  });
+
+  it("rejects a runtime database declaration that disagrees with its manifest", async () => {
+    const modulesDirectory = await createModulesDirectory();
+    await createRuntimeModule(modulesDirectory, "mismatch", {
+      manifest: manifestFor("mismatch", { database: { abi: 1 } }),
+      serverSource: `export default { id: "mismatch", version: "0.1.0" };`,
+    });
+
+    const error = await captureRuntimeError(modulesDirectory);
+    expect(runtimeIssueCodes(error)).toContain("MODULE_RUNTIME_DATABASE_MISMATCH");
+  });
+
   it("never gives register a services field, and gives start and stop the exact same services object", async () => {
     const modulesDirectory = await createModulesDirectory();
     const services = fakeModuleRuntimeServices();
@@ -1086,11 +1154,11 @@ describe("module runtime services", () => {
 
     expect(registerServices.values).toEqual([undefined]);
     expect(lifecycleServices.values).toHaveLength(2);
-    expect(lifecycleServices.values[0]).toBe(services);
-    expect(lifecycleServices.values[1]).toBe(services);
+    expect(lifecycleServices.values[0]).toBe(services.get("wired"));
+    expect(lifecycleServices.values[1]).toBe(services.get("wired"));
   });
 
-  it("shares the exact same services object identity across every module's start hook", async () => {
+  it("selects a stable services object per module rather than sharing one across modules", async () => {
     const modulesDirectory = await createModulesDirectory();
     const services = fakeModuleRuntimeServices();
     const recorder = createReferenceRecorder();
@@ -1112,7 +1180,8 @@ describe("module runtime services", () => {
 
     const runtime = await startModuleRuntime(runtimeOptions(modulesDirectory, services));
 
-    expect(recorder.values).toEqual([services, services]);
+    expect(recorder.values).toEqual([services.get("alpha"), services.get("beta")]);
+    expect(recorder.values[0]).not.toBe(recorder.values[1]);
     await runtime.stop();
   });
 
@@ -1141,23 +1210,26 @@ describe("module runtime services", () => {
       startModuleRuntime(runtimeOptions(modulesDirectory, services)),
     ).rejects.toBeInstanceOf(ModuleRuntimeError);
 
-    expect(recorder.values).toEqual([services, services]);
+    expect(recorder.values).toEqual([services.get("started"), services.get("started")]);
   });
 
   it("starts and stops a zero-module runtime without ever touching the provided services", async () => {
     const modulesDirectory = await createModulesDirectory();
-    const services = fakeModuleRuntimeServices();
+    const database = fakeModuleDatabase();
+    const services: ModuleRuntimeServicesLookup = new Map([
+      ["unused", Object.freeze({ database })],
+    ]);
 
     const runtime = await startModuleRuntime(runtimeOptions(modulesDirectory, services));
     await runtime.stop();
 
     expect(runtime.modules).toEqual([]);
-    expect(vi.mocked(services.database.select)).not.toHaveBeenCalled();
-    expect(vi.mocked(services.database.insert)).not.toHaveBeenCalled();
-    expect(vi.mocked(services.database.update)).not.toHaveBeenCalled();
-    expect(vi.mocked(services.database.delete)).not.toHaveBeenCalled();
-    expect(vi.mocked(services.database.execute)).not.toHaveBeenCalled();
-    expect(vi.mocked(services.database.transaction)).not.toHaveBeenCalled();
+    expect(vi.mocked(database.select)).not.toHaveBeenCalled();
+    expect(vi.mocked(database.insert)).not.toHaveBeenCalled();
+    expect(vi.mocked(database.update)).not.toHaveBeenCalled();
+    expect(vi.mocked(database.delete)).not.toHaveBeenCalled();
+    expect(vi.mocked(database.execute)).not.toHaveBeenCalled();
+    expect(vi.mocked(database.transaction)).not.toHaveBeenCalled();
   });
 });
 
@@ -1463,7 +1535,7 @@ describe("module configuration delivery (ADR 0029)", () => {
     expect(recorder.values).toEqual([["object", []]]);
   });
 
-  it("keeps the services object one shared identity even though configuration is per-module", async () => {
+  it("keeps each module's services object stable while configuration remains per-module", async () => {
     const modulesDirectory = await createModulesDirectory();
     const services = fakeModuleRuntimeServices();
     const recorder = createReferenceRecorder();
@@ -1492,11 +1564,11 @@ describe("module configuration delivery (ADR 0029)", () => {
     await runtime.stop();
 
     const [alphaServices, alphaConfig, bravoServices, bravoConfig] = recorder.values;
-    // This is the reason configuration is a sibling of `services` rather than a field inside it:
-    // `services` is deliberately one shared object for the whole runtime, while configuration must
-    // differ per module. Both properties hold simultaneously.
-    expect(alphaServices).toBe(services);
-    expect(bravoServices).toBe(services);
+    // Configuration remains a sibling of `services`: both are selected per module, but they are
+    // independently composed snapshots with separate contracts and lifetimes.
+    expect(alphaServices).toBe(services.get("alpha"));
+    expect(bravoServices).toBe(services.get("bravo"));
+    expect(alphaServices).not.toBe(bravoServices);
     expect(alphaConfig).not.toBe(bravoConfig);
     expect((alphaConfig as ModuleConfiguration).getString("label")).toBe("alpha");
     expect((bravoConfig as ModuleConfiguration).getString("label")).toBe("bravo");

core/tests/module-schema-discovery.test.ts

@@ -38,10 +38,14 @@ async function createModulesDirectory(): Promise<string> {
 
 function manifestFor(
   id: string,
-  options: { dependencies?: Record<string, unknown>; schema?: string | false } = {},
+  options: {
+    database?: { abi: 1 };
+    dependencies?: Record<string, unknown>;
+    schema?: string | false;
+  } = {},
 ): Record<string, unknown> {
   return {
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "0.1.0",
@@ -49,6 +53,7 @@ function manifestFor(
     ...(options.dependencies ? { dependencies: options.dependencies } : {}),
     capabilities: [],
     permissions: [],
+    ...(options.database ? { database: options.database } : {}),
     entrypoints: {
       server: "./dist/server/index.js",
       ...(options.schema === false ? {} : { schema: options.schema ?? "./dist/schema/index.js" }),
@@ -126,6 +131,62 @@ function issueCodes(error: ModuleSchemaDiscoveryError): ModuleSchemaDiscoveryIss
 }
 
 describe("module schema discovery", () => {
+  it("loads ABI-v1 schema entrypoints as plain metadata without importing an ORM", async () => {
+    const modulesDirectory = await createModulesDirectory();
+    await createSchemaModule(modulesDirectory, "calendar", {
+      manifest: manifestFor("calendar", { database: { abi: 1 } }),
+      schemaSource: `
+        export default {
+          moduleId: "calendar",
+          tables: [
+            { name: "calendar_events", foreignKeys: [] },
+            { name: "calendar_attendees", foreignKeys: [{ table: "calendar_events" }] }
+          ]
+        };
+      `,
+    });
+
+    const aggregate = await discoverModuleSchemas(discoveryOptions(modulesDirectory));
+
+    expect(aggregate.tables.map((table) => table.name)).toEqual([
+      "calendar_attendees",
+      "calendar_events",
+    ]);
+    expect(aggregate.tables.every((table) => table.table === undefined)).toBe(true);
+    expect(aggregate.drizzleSchema).toEqual({});
+  });
+
+  it("aggregates ABI-v1 prefix, duplicate, cross-module FK, missing target, and malformed errors", async () => {
+    const modulesDirectory = await createModulesDirectory();
+    await createSchemaModule(modulesDirectory, "alpha", {
+      manifest: manifestFor("alpha", { database: { abi: 1 } }),
+      schemaSource: `export default {
+        moduleId: "alpha",
+        tables: [
+          { name: "wrong_records", foreignKeys: [] },
+          { name: "alpha_records", foreignKeys: [{ table: "beta_records" }] },
+          { name: "alpha_records", foreignKeys: [{ table: "alpha_missing" }] }
+        ]
+      };`,
+    });
+    await createSchemaModule(modulesDirectory, "malformed", {
+      manifest: manifestFor("malformed", { database: { abi: 1 } }),
+      schemaSource: `export default { moduleId: "malformed", tables: [{ name: "malformed_rows", unknown: true }] };`,
+    });
+
+    const error = await captureSchemaError(modulesDirectory);
+
+    expect(issueCodes(error)).toEqual(
+      expect.arrayContaining([
+        "MODULE_SCHEMA_CROSS_MODULE_FOREIGN_KEY",
+        "MODULE_SCHEMA_EXPORT_INVALID",
+        "MODULE_SCHEMA_FOREIGN_KEY_TARGET_MISSING",
+        "MODULE_SCHEMA_TABLE_DUPLICATE",
+        "MODULE_SCHEMA_TABLE_NAMESPACE_INVALID",
+      ]),
+    );
+  });
+
   it("returns a frozen empty aggregate without importing module servers", async () => {
     const modulesDirectory = await createModulesDirectory();
     const recorder = createGlobalEventRecorder();

core/tests/module-storage-lifecycle.test.ts

@@ -18,7 +18,7 @@ function fakeModule(
   } = {},
 ): DiscoveredModule {
   const manifest = parseModuleManifest({
-    manifestVersion: 7,
+    manifestVersion: 8,
     id,
     name: `${id} module`,
     version: "1.0.0",

core/tests/module-ui-publication.test.ts

@@ -79,7 +79,7 @@ async function createModule(modulesDirectory: string, fixture: ModuleFixture): P
         version: contribution.version,
       })),
       id: fixture.id,
-      manifestVersion: 7,
+      manifestVersion: 8,
       name: `${fixture.id} module`,
       permissions:
         fixture.display === undefined

core/tests/modules-directory-commands.test.ts

@@ -0,0 +1,119 @@
+import { createHash } from "node:crypto";
+import { mkdtemp, readdir, readFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { afterEach, describe, expect, it } from "vitest";
+import { discoverRepositoryMigrations } from "../src/cli/migration-command-support.js";
+import { resolveCommandModulesDirectory } from "../src/cli/modules-directory-environment.js";
+import { discoverCoreMigrations } from "../src/migrations/index.js";
+import { ModuleDiscoveryError } from "../src/modules/index.js";
+import { createMigrationModule } from "./support/migration-module-fixture.js";
+
+const repositoryRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
+const temporaryDirectories: string[] = [];
+
+afterEach(async () => {
+  await Promise.all(
+    temporaryDirectories.splice(0).map((directory) => rm(directory, { recursive: true })),
+  );
+});
+
+async function externalModulesDirectory(): Promise<string> {
+  const directory = await mkdtemp(path.join(tmpdir(), "ekklesia-installed-modules-"));
+  temporaryDirectories.push(directory);
+  return directory;
+}
+
+describe("operator commands select the modules directory through host configuration", () => {
+  it("defaults to the repository's own modules directory", () => {
+    expect(resolveCommandModulesDirectory({}, "/opt/ekklesia")).toEqual({
+      modulesDirectory: "/opt/ekklesia/modules",
+      modulesDirectoryRequired: false,
+    });
+  });
+
+  it("honours EKKLESIA_MODULES_DIR", () => {
+    expect(
+      resolveCommandModulesDirectory(
+        { EKKLESIA_MODULES_DIR: "/var/lib/ekklesia/modules" },
+        "/opt/ekklesia",
+      ),
+    ).toEqual({ modulesDirectory: "/var/lib/ekklesia/modules", modulesDirectoryRequired: true });
+  });
+
+  it("refuses a relative EKKLESIA_MODULES_DIR without echoing it", () => {
+    expect(() =>
+      resolveCommandModulesDirectory({ EKKLESIA_MODULES_DIR: "modules-9e1f" }, "/opt/ekklesia"),
+    ).toThrow(ModuleDiscoveryError);
+    try {
+      resolveCommandModulesDirectory({ EKKLESIA_MODULES_DIR: "modules-9e1f" }, "/opt/ekklesia");
+    } catch (error) {
+      expect(JSON.stringify((error as ModuleDiscoveryError).issues)).not.toContain("9e1f");
+    }
+  });
+
+  it("plans migrations for modules installed outside the repository, with Core's from the platform", async () => {
+    // A minimal installed module generated from nothing in the repository, so this test never
+    // depends on build output or ignored files: a clean checkout runs it before anything is built.
+    const modulesDirectory = await externalModulesDirectory();
+    const installed = await createMigrationModule(modulesDirectory, "example");
+    expect(path.relative(repositoryRoot, modulesDirectory).startsWith("..")).toBe(true);
+
+    const aggregate = await discoverRepositoryMigrations(repositoryRoot, {
+      EKKLESIA_MODULES_DIR: modulesDirectory,
+    });
+
+    expect(aggregate.modules.map((module) => module.moduleId)).toEqual(["core", "example"]);
+
+    // Core's migrations are exactly the platform's own, byte for byte, from `core/drizzle`.
+    const platformCore = await discoverCoreMigrations({
+      coreMigrationsDirectory: path.join(repositoryRoot, "core", "drizzle"),
+    });
+    const fingerprint = (migrations: readonly { identity: string; checksum: string }[]) =>
+      migrations.map((migration) => `${migration.identity} ${migration.checksum}`);
+    expect(platformCore.length).toBeGreaterThan(0);
+    expect(fingerprint(aggregate.modules[0]?.migrations ?? [])).toEqual(fingerprint(platformCore));
+
+    // The module's migration is the one installed outside the repository, byte for byte.
+    const installedSql = await readFile(
+      path.join(installed.migrationDirectory ?? "", "0000_initial.sql"),
+    );
+    expect(fingerprint(aggregate.modules[1]?.migrations ?? [])).toEqual([
+      `example:0000_initial ${createHash("sha256").update(installedSql).digest("hex")}`,
+    ]);
+  });
+
+  it("fails closed when the configured directory does not exist", async () => {
+    const parent = await externalModulesDirectory();
+    await expect(
+      discoverRepositoryMigrations(repositoryRoot, {
+        EKKLESIA_MODULES_DIR: path.join(parent, "absent"),
+      }),
+    ).rejects.toBeInstanceOf(ModuleDiscoveryError);
+  });
+});
+
+describe("no source chooses a modules directory except the resolver", () => {
+  async function sourceFiles(directory: string): Promise<readonly string[]> {
+    const entries = await readdir(directory, { recursive: true, withFileTypes: true });
+    return entries
+      .filter((entry) => entry.isFile() && entry.name.endsWith(".ts"))
+      .map((entry) => path.join(entry.parentPath, entry.name));
+  }
+
+  it("never joins `modules` onto a root anywhere else in Core or the API", async () => {
+    const files = [
+      ...(await sourceFiles(path.join(repositoryRoot, "core", "src"))),
+      ...(await sourceFiles(path.join(repositoryRoot, "apps", "api", "src"))),
+    ];
+    const resolver = path.join(repositoryRoot, "core", "src", "modules", "modules-directory.ts");
+    for (const file of files) {
+      if (file === resolver) {
+        continue;
+      }
+      const text = await readFile(file, "utf8");
+      expect(text, path.relative(repositoryRoot, file)).not.toMatch(/,\s*"modules"\s*\)/u);
+    }
+  });
+});

core/tests/modules-directory.test.ts

@@ -0,0 +1,159 @@
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { afterEach, describe, expect, it } from "vitest";
+import {
+  discoverModules,
+  ModuleDiscoveryError,
+  type ModuleDiscoveryIssueCode,
+  resolveModulesDirectory,
+} from "../src/modules/index.js";
+
+const versions = { moduleSdkVersion: "0.1.0", platformVersion: "0.1.0" } as const;
+const repositoryRoot = path.join(path.sep, "opt", "ekklesia");
+const temporaryDirectories: string[] = [];
+
+afterEach(async () => {
+  await Promise.all(
+    temporaryDirectories.splice(0).map((directory) => rm(directory, { recursive: true })),
+  );
+});
+
+async function temporaryDirectory(): Promise<string> {
+  const directory = await mkdtemp(path.join(tmpdir(), "ekklesia-modules-directory-"));
+  temporaryDirectories.push(directory);
+  return directory;
+}
+
+function captureDiscoveryError(operation: () => unknown): ModuleDiscoveryError {
+  try {
+    operation();
+  } catch (error) {
+    expect(error).toBeInstanceOf(ModuleDiscoveryError);
+    return error as ModuleDiscoveryError;
+  }
+  throw new Error("Expected a ModuleDiscoveryError.");
+}
+
+async function captureAsyncDiscoveryError(
+  operation: Promise<unknown>,
+): Promise<ModuleDiscoveryError> {
+  try {
+    await operation;
+  } catch (error) {
+    expect(error).toBeInstanceOf(ModuleDiscoveryError);
+    return error as ModuleDiscoveryError;
+  }
+  throw new Error("Expected a ModuleDiscoveryError.");
+}
+
+function codes(error: ModuleDiscoveryError): readonly ModuleDiscoveryIssueCode[] {
+  return error.issues.map((issue) => issue.code);
+}
+
+/** Everything an operator, a log, or a test report could ever see from this error. */
+function rendered(error: ModuleDiscoveryError): string {
+  return JSON.stringify({ issues: error.issues, message: error.message, stack: error.stack });
+}
+
+describe("resolveModulesDirectory", () => {
+  it("defaults to the repository's own modules directory when nothing is configured", () => {
+    expect(resolveModulesDirectory({ configured: undefined, repositoryRoot })).toEqual({
+      modulesDirectory: path.join(repositoryRoot, "modules"),
+      modulesDirectoryRequired: false,
+    });
+  });
+
+  it("accepts an explicit absolute path, normalized, and requires it to exist", () => {
+    expect(
+      resolveModulesDirectory({ configured: "/var/lib/ekklesia/modules/", repositoryRoot }),
+    ).toEqual({ modulesDirectory: "/var/lib/ekklesia/modules", modulesDirectoryRequired: true });
+    expect(
+      resolveModulesDirectory({ configured: "/var/lib/./ekklesia//modules", repositoryRoot }),
+    ).toEqual({ modulesDirectory: "/var/lib/ekklesia/modules", modulesDirectoryRequired: true });
+  });
+
+  it("never resolves a configured path against the repository or the working directory", () => {
+    const resolved = resolveModulesDirectory({ configured: "/srv/modules", repositoryRoot });
+    expect(resolved.modulesDirectory).toBe("/srv/modules");
+  });
+
+  it.each([
+    ["a relative name", "modules"],
+    ["a dot-relative path", "./modules"],
+    ["a parent-relative path", "../private/modules"],
+    ["a home-relative path", "~/modules"],
+    ["the empty string", ""],
+    ["whitespace only", "   "],
+    ["an absolute path with surrounding whitespace", " /var/lib/ekklesia/modules"],
+    ["a NUL byte", "/var/lib/ekklesia/\u0000modules"],
+  ])("rejects %s with a sanitized MODULES_DIRECTORY_INVALID", (_label, configured) => {
+    const error = captureDiscoveryError(() =>
+      resolveModulesDirectory({ configured, repositoryRoot }),
+    );
+    expect(codes(error)).toEqual(["MODULES_DIRECTORY_INVALID"]);
+    expect(error.issues[0]?.message).toBe("EKKLESIA_MODULES_DIR must be an absolute path.");
+  });
+
+  it("never echoes the supplied value in the error", () => {
+    const configured = "relative/secret-token-a1b2c3/postgresql://admin:hunter2@db/modules";
+    const error = captureDiscoveryError(() =>
+      resolveModulesDirectory({ configured, repositoryRoot }),
+    );
+    const text = rendered(error);
+    expect(text).not.toContain("secret-token-a1b2c3");
+    expect(text).not.toContain("hunter2");
+    expect(text).not.toContain("relative/");
+  });
+});
+
+describe("module discovery against a configured modules directory", () => {
+  it("fails closed, without the path, when a configured directory does not exist", async () => {
+    const parent = await temporaryDirectory();
+    const missing = path.join(parent, "private-mount-name-7f3e");
+    const error = await captureAsyncDiscoveryError(
+      discoverModules({ ...versions, modulesDirectory: missing, modulesDirectoryRequired: true }),
+    );
+    expect(codes(error)).toEqual(["MODULES_DIRECTORY_UNREADABLE"]);
+    expect(rendered(error)).not.toContain("private-mount-name-7f3e");
+    expect(rendered(error)).not.toContain(parent);
+  });
+
+  it("fails closed when a configured path is a file rather than a directory", async () => {
+    const parent = await temporaryDirectory();
+    const file = path.join(parent, "modules");
+    await writeFile(file, "not a directory");
+    const error = await captureAsyncDiscoveryError(
+      discoverModules({ ...versions, modulesDirectory: file, modulesDirectoryRequired: true }),
+    );
+    expect(codes(error)).toEqual(["MODULES_DIRECTORY_UNREADABLE"]);
+    expect(rendered(error)).not.toContain(parent);
+  });
+
+  it("rejects a relative configured path even when it bypasses the resolver", async () => {
+    const error = await captureAsyncDiscoveryError(
+      discoverModules({ ...versions, modulesDirectory: "modules", modulesDirectoryRequired: true }),
+    );
+    expect(codes(error)).toEqual(["MODULES_DIRECTORY_INVALID"]);
+  });
+
+  it("treats an existing, empty configured directory as zero installed modules", async () => {
+    const directory = await temporaryDirectory();
+    await expect(
+      discoverModules({ ...versions, modulesDirectory: directory, modulesDirectoryRequired: true }),
+    ).resolves.toEqual([]);
+  });
+
+  it("keeps the development default lenient: a missing default directory is zero modules", async () => {
+    const parent = await temporaryDirectory();
+    await expect(
+      discoverModules({ ...versions, modulesDirectory: path.join(parent, "modules") }),
+    ).resolves.toEqual([]);
+  });
+
+  it("discovers through the resolver's own selection unchanged", async () => {
+    const directory = await temporaryDirectory();
+    const selection = resolveModulesDirectory({ configured: directory, repositoryRoot });
+    await expect(discoverModules({ ...versions, ...selection })).resolves.toEqual([]);
+  });
+});