chore: add agent column to TASKS.md schema

2026-03-19 20:07:25 -05:00
1276 changed files with 2728 additions and 213520 deletions
--- a/.env.example
+++ b/.env.example
@@ -23,8 +23,8 @@ VALKEY_URL=redis://localhost:6380


 # ─── Gateway ─────────────────────────────────────────────────────────────────
-# TCP port the NestJS/Fastify gateway listens on (default: 14242)
-GATEWAY_PORT=14242
+# TCP port the NestJS/Fastify gateway listens on (default: 4000)
+GATEWAY_PORT=4000

 # Comma-separated list of allowed CORS origins.
 # Must include the web app origin in production.
@@ -37,12 +37,12 @@ GATEWAY_CORS_ORIGIN=http://localhost:3000
 BETTER_AUTH_SECRET=change-me-to-a-random-32-char-string

 # Public base URL of the gateway (used by BetterAuth for callback URLs)
-BETTER_AUTH_URL=http://localhost:14242
+BETTER_AUTH_URL=http://localhost:4000


 # ─── Web App (Next.js) ───────────────────────────────────────────────────────
 # Public gateway URL — accessible from the browser, not just the server.
-NEXT_PUBLIC_GATEWAY_URL=http://localhost:14242
+NEXT_PUBLIC_GATEWAY_URL=http://localhost:4000


 # ─── OpenTelemetry ───────────────────────────────────────────────────────────
@@ -62,15 +62,9 @@ OTEL_SERVICE_NAME=mosaic-gateway
 # Comma-separated list of Ollama model IDs to register (default: llama3.2,codellama,mistral)
 # OLLAMA_MODELS=llama3.2,codellama,mistral

-# Anthropic (claude-sonnet-4-6, claude-opus-4-6, claude-haiku-4-5)
-# ANTHROPIC_API_KEY=sk-ant-...
-
-# OpenAI (gpt-4o, gpt-4o-mini, o3-mini)
+# OpenAI — required for embedding and log-summarization features
 # OPENAI_API_KEY=sk-...

-# Z.ai / GLM (glm-4.5, glm-4.5-air, glm-4.5-flash)
-# ZAI_API_KEY=...
-
 # Custom providers — JSON array of provider configs
 # Format: [{"id":"<id>","baseUrl":"<url>","apiKey":"<key>","models":[{"id":"<model-id>","name":"<label>"}]}]
 # MOSAIC_CUSTOM_PROVIDERS=
@@ -121,34 +115,15 @@ OTEL_SERVICE_NAME=mosaic-gateway
 # ─── Discord Plugin (optional — set DISCORD_BOT_TOKEN to enable) ─────────────
 # DISCORD_BOT_TOKEN=
 # DISCORD_GUILD_ID=
-# DISCORD_GATEWAY_URL=http://localhost:14242
+# DISCORD_GATEWAY_URL=http://localhost:4000


 # ─── Telegram Plugin (optional — set TELEGRAM_BOT_TOKEN to enable) ───────────
 # TELEGRAM_BOT_TOKEN=
-# TELEGRAM_GATEWAY_URL=http://localhost:14242
+# TELEGRAM_GATEWAY_URL=http://localhost:4000


-# ─── SSO Providers (add credentials to enable) ───────────────────────────────
-
-# --- Authentik (optional — set AUTHENTIK_CLIENT_ID to enable) ---
+# ─── Authentik SSO (optional — set AUTHENTIK_CLIENT_ID to enable) ────────────
 # AUTHENTIK_ISSUER=https://auth.example.com/application/o/mosaic/
 # AUTHENTIK_CLIENT_ID=
 # AUTHENTIK_CLIENT_SECRET=
-
-# --- WorkOS (optional — set WORKOS_CLIENT_ID to enable) ---
-# WORKOS_ISSUER=https://your-company.authkit.app
-# WORKOS_CLIENT_ID=client_...
-# WORKOS_CLIENT_SECRET=sk_live_...
-
-# --- Keycloak (optional — set KEYCLOAK_CLIENT_ID to enable) ---
-# KEYCLOAK_ISSUER=https://auth.example.com/realms/master
-# Legacy alternative if you prefer to compose the issuer from separate vars:
-# KEYCLOAK_URL=https://auth.example.com
-# KEYCLOAK_REALM=master
-# KEYCLOAK_CLIENT_ID=mosaic
-# KEYCLOAK_CLIENT_SECRET=
-
-# Feature flags — set to true alongside provider credentials to show SSO buttons in the UI
-# NEXT_PUBLIC_WORKOS_ENABLED=true
-# NEXT_PUBLIC_KEYCLOAK_ENABLED=true
--- a/.gitignore
+++ b/.gitignore
@@ -9,16 +9,3 @@ coverage
 *.tsbuildinfo
 .pnpm-store
 docs/reports/
-
-# Step-CA dev password — real file is gitignored; commit only the .example
-infra/step-ca/dev-password
-
-# Scratch dirs created by the framework git-wrapper shell test harnesses
-.mosaic-test-work/
-
-# Transient config files vite/vitest/esbuild write next to a *.config.ts while
-# loading it, then unlink. They are untracked but were not ignored, so turbo's
-# package traversal hashed them and intermittently failed CI with "Package
-# traversal error: ... .timestamp-*.mjs: No such file or directory" when the
-# file vanished mid-scan. Ignoring them removes the race.
-*.timestamp-*.mjs
--- a/.npmrc
+++ b/.npmrc
@@ -1,5 +1 @@
-@mosaicstack:registry=https://git.mosaicstack.dev/api/packages/mosaicstack/npm/
-# Pin the pnpm store to the same path the ci-base image warms (Dockerfile.ci),
-# so the pipeline `pnpm install --prefer-offline` consumes the baked store
-# instead of repopulating a fresh one.
-store-dir=/root/.local/share/pnpm/store
+@mosaic:registry=https://git.mosaicstack.dev/api/packages/mosaic/npm/
--- a/.prettierignore
+++ b/.prettierignore
@@ -5,5 +5,3 @@ pnpm-lock.yaml
 **/drizzle
 **/.next
 .claude/
-docs/tess/TASKS.md
-docs/scratchpads/
--- a/.woodpecker/ci-image.yml
+++ b/.woodpecker/ci-image.yml
@@ -1,40 +0,0 @@
-# Build & push the pre-baked CI base image (Dockerfile.ci) to the Gitea
-# registry CI already publishes to. Reuses the exact kaniko + auth pattern
-# from publish.yml (REGISTRY_USER/REGISTRY_PASS from_secret, /kaniko/.docker
-# config.json). Other pipelines (ci.yml, publish.yml) pull `ci-base:latest`
-# for their install step.
-#
-# Rebuild ONLY when the dependency set or the image recipe changes — a normal
-# code push must not trigger a 25-min image build. `path` applies to push/PR
-# events; `event: tag` (releases) rebuilds unconditionally so a tagged release
-# always ships a fresh base.
-when:
-  - event: tag
-  - event: [push, manual]
-    branch: main
-    path:
-      include:
-        - 'pnpm-lock.yaml'
-        - 'Dockerfile.ci'
-
-steps:
-  build-ci-base:
-    image: gcr.io/kaniko-project/executor:debug
-    environment:
-      REGISTRY_USER:
-        from_secret: gitea_username
-      REGISTRY_PASS:
-        from_secret: gitea_password
-      CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
-      CI_COMMIT_TAG: ${CI_COMMIT_TAG}
-      CI_COMMIT_SHA: ${CI_COMMIT_SHA}
-    commands:
-      - mkdir -p /kaniko/.docker
-      - echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASS\"}}}" > /kaniko/.docker/config.json
-      - |
-        # Lockfile-hash tag: an immutable identity for the exact dep set baked
-        # into this image. `:latest` is the mutable pointer pipelines consume.
-        LOCK_HASH=$(sha256sum pnpm-lock.yaml | cut -c1-12)
-        DESTINATIONS="--destination git.mosaicstack.dev/mosaicstack/stack/ci-base:latest"
-        DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/stack/ci-base:lock-$LOCK_HASH"
-        /kaniko/executor --context . --dockerfile Dockerfile.ci $DESTINATIONS
--- a/.woodpecker/ci.yml
+++ b/.woodpecker/ci.yml
@@ -1,20 +1,9 @@
-# &node_image is the pre-baked CI base built by .woodpecker/ci-image.yml:
-# node:24-alpine + python3/make/g++/postgresql-client + pnpm + a warm pnpm
-# store. The install step resolves from the baked store (--prefer-offline)
-# instead of paying a ~731s cold fetch + native compile every run.
 variables:
-  - &node_image 'git.mosaicstack.dev/mosaicstack/stack/ci-base:latest'
+  - &node_image 'node:22-alpine'
  - &enable_pnpm 'corepack enable'

 when:
-  # PR + manual CI run on any branch — the pull_request pipeline is the merge gate.
-  # push CI is restricted to protected branches (main) so a feature-branch push no
-  # longer fires a redundant SECOND pipeline alongside its PR pipeline. This ~halves
-  # CI load on the storage-constrained runner with zero loss of gating (branch
-  # protection requires no push/ci status context; main still gets full push CI).
-  - event: [pull_request, manual]
-  - event: push
-    branch: main
+  - event: [push, pull_request, manual]

 # Turbo remote cache (turbo.mosaicstack.dev) is configured via Woodpecker
 # repository-level environment variables (TURBO_API, TURBO_TEAM, TURBO_TOKEN).
@@ -26,21 +15,7 @@ steps:
    image: *node_image
    commands:
      - corepack enable
-      # python3/make/g++ are baked into ci-base; --prefer-offline resolves from
-      # the baked pnpm store.
-      - pnpm install --frozen-lockfile --prefer-offline
-
-  # Blocking gate: public framework package must contain no operator-specific
-  # personal data or private $HOME defaults. Runs early (no node_modules needed).
-  sanitization:
-    image: *node_image
-    commands:
-      - apk add --no-cache bash
-      - bash packages/mosaic/framework/tools/quality/scripts/verify-sanitized.sh
-      # Resident line-count ceiling over framework-owned resident files
-      # (Constitution + dispatcher + each RUNTIME.md slice). See DESIGN §7 / R9.
-      - bash packages/mosaic/framework/tools/quality/scripts/check-resident-budget.sh --self-test
-      - bash packages/mosaic/framework/tools/quality/scripts/check-resident-budget.sh
+      - pnpm install --frozen-lockfile

  typecheck:
    image: *node_image
@@ -49,7 +24,6 @@ steps:
      - pnpm typecheck
    depends_on:
      - install
-      - sanitization

  # lint, format, and test are independent — run in parallel after typecheck
  lint:
@@ -70,39 +44,18 @@ steps:

  test:
    image: *node_image
-    environment:
-      # Avoid the namespace-level Woodpecker DB service named "postgres".
-      # The Kubernetes backend exposes service containers by step name.
-      DATABASE_URL: postgresql://mosaic:mosaic@ci-postgres:5432/mosaic
    commands:
      - *enable_pnpm
-      # postgresql-client (pg_isready) is baked into ci-base.
-      # Wait up to 60s for CI postgres to be ready; fail fast if it never comes up.
-      - |
-        ready=0
-        for i in $(seq 1 60); do
-          if pg_isready -h ci-postgres -p 5432 -U mosaic; then
-            ready=1
-            break
-          fi
-          echo "Waiting for ci-postgres ($i/60)..."
-          sleep 1
-        done
-        if [ "$ready" -ne 1 ]; then
-          echo "ci-postgres did not become ready" >&2
-          exit 1
-        fi
-      # Run migrations (DATABASE_URL is set in environment above)
-      - pnpm --filter @mosaicstack/db run db:migrate
-      # Run all tests
      - pnpm test
    depends_on:
      - typecheck

-services:
-  ci-postgres:
-    image: pgvector/pgvector:pg17
-    environment:
-      POSTGRES_USER: mosaic
-      POSTGRES_PASSWORD: mosaic
-      POSTGRES_DB: mosaic
+  build:
+    image: *node_image
+    commands:
+      - *enable_pnpm
+      - pnpm build
+    depends_on:
+      - lint
+      - format
+      - test
--- a/.woodpecker/publish.yml
+++ b/.woodpecker/publish.yml
@@ -1,197 +0,0 @@
-# Build, publish npm packages, and push Docker images
-# Runs only on main branch push/tag
-
-variables:
-  # Pre-baked CI base (see .woodpecker/ci-image.yml): node:24-alpine +
-  # toolchain + warm pnpm store. Kills the second cold install publish pays.
-  - &node_image 'git.mosaicstack.dev/mosaicstack/stack/ci-base:latest'
-  - &enable_pnpm 'corepack enable'
-  # Heavy kaniko image builds (~25 min) — gate them so a merge that only touches
-  # the npm-only CLI (@mosaicstack/mosaic) or docs does NOT rebuild the platform
-  # images (gateway/appservice/web do not depend on @mosaicstack/mosaic). Releases
-  # (tags) always build everything. Exclude-list keeps the default SAFE: any
-  # non-excluded change still builds, so no transitive dep can silently go stale.
-  # (Woodpecker: `when` entries are OR'd; `path` applies to push/PR only — hence
-  # the separate `event: tag` entry.)
-  - &image_build_when
-    - event: tag
-    - event: [push, manual]
-      branch: main
-      path:
-        exclude:
-          - 'packages/mosaic/**'
-          - 'docs/**'
-          - '**/*.md'
-          - '.woodpecker/**'
-
-when:
-  - branch: [main]
-    event: [push, manual, tag]
-
-steps:
-  install:
-    image: *node_image
-    commands:
-      - corepack enable
-      # Resolve from the baked pnpm store instead of a cold network fetch.
-      - pnpm install --frozen-lockfile --prefer-offline
-
-  build:
-    image: *node_image
-    commands:
-      - *enable_pnpm
-      - pnpm build
-    depends_on:
-      - install
-
-  publish-npm:
-    image: *node_image
-    # Publish only when a publishable package changed (or on a release tag); a
-    # pure-docs merge runs no publish. Cheap step, but gated for cleanliness.
-    when:
-      - event: tag
-      - event: [push, manual]
-        branch: main
-        path:
-          include:
-            - 'packages/**'
-    environment:
-      NPM_TOKEN:
-        from_secret: gitea_token
-    commands:
-      - *enable_pnpm
-      # Configure auth for Gitea npm registry
-      - |
-        echo "//git.mosaicstack.dev/api/packages/mosaicstack/npm/:_authToken=$NPM_TOKEN" > ~/.npmrc
-        echo "@mosaicstack:registry=https://git.mosaicstack.dev/api/packages/mosaicstack/npm/" >> ~/.npmrc
-      # Publish non-private packages to Gitea.
-      #
-      # The only publish failure we tolerate is "version already exists" —
-      # that legitimately happens when only some packages were bumped in
-      # the merge. Any other failure (registry 404, auth error, network
-      # error) MUST fail the pipeline loudly: the previous
-      # `|| echo "... continuing"` fallback silently hid a 404 from the
-      # Gitea org rename and caused every @mosaicstack/* publish to fall
-      # on the floor while CI still reported green.
-      - |
-        # Portable sh (Alpine ash) — avoid bashisms like PIPESTATUS.
-        set +e
-        pnpm --filter "@mosaicstack/*" --filter "!@mosaicstack/web" publish --no-git-checks --access public >/tmp/publish.log 2>&1
-        EXIT=$?
-        set -e
-        cat /tmp/publish.log
-        if [ "$EXIT" -eq 0 ]; then
-          echo "[publish] all packages published successfully"
-          exit 0
-        fi
-        # Hard registry / auth / network errors → fatal. Match npm's own
-        # error lines specifically to avoid false positives on arbitrary
-        # log text that happens to contain "E404" etc.
-        if grep -qE "npm (error|ERR!) code (E404|E401|ENEEDAUTH|ECONNREFUSED|ETIMEDOUT|ENOTFOUND)" /tmp/publish.log; then
-          echo "[publish] FATAL: registry/auth/network error detected — failing pipeline" >&2
-          exit 1
-        fi
-        # Only tolerate the explicit "version already published" case.
-        # npm returns this as E403 with body "You cannot publish over..."
-        # or EPUBLISHCONFLICT depending on version.
-        if grep -qE "EPUBLISHCONFLICT|You cannot publish over|previously published" /tmp/publish.log; then
-          echo "[publish] some packages already at this version — continuing (non-fatal)"
-          exit 0
-        fi
-        echo "[publish] FATAL: publish failed with unrecognized error — failing pipeline" >&2
-        exit 1
-    depends_on:
-      - build
-
-  # TODO: Uncomment when ready to publish to npmjs.org
-  # publish-npmjs:
-  #   image: *node_image
-  #   environment:
-  #     NPM_TOKEN:
-  #       from_secret: npmjs_token
-  #   commands:
-  #     - *enable_pnpm
-  #     - apk add --no-cache jq bash
-  #     - bash scripts/publish-npmjs.sh
-  #   depends_on:
-  #     - build
-  #   when:
-  #     - event: [tag]
-
-  build-gateway:
-    image: gcr.io/kaniko-project/executor:debug
-    when: *image_build_when
-    environment:
-      REGISTRY_USER:
-        from_secret: gitea_username
-      REGISTRY_PASS:
-        from_secret: gitea_password
-      CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
-      CI_COMMIT_TAG: ${CI_COMMIT_TAG}
-      CI_COMMIT_SHA: ${CI_COMMIT_SHA}
-    commands:
-      - mkdir -p /kaniko/.docker
-      - echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASS\"}}}" > /kaniko/.docker/config.json
-      - |
-        DESTINATIONS="--destination git.mosaicstack.dev/mosaicstack/stack/gateway:sha-${CI_COMMIT_SHA:0:7}"
-        if [ "$CI_COMMIT_BRANCH" = "main" ]; then
-          DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/stack/gateway:latest"
-        fi
-        if [ -n "$CI_COMMIT_TAG" ]; then
-          DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/stack/gateway:$CI_COMMIT_TAG"
-        fi
-        /kaniko/executor --context . --dockerfile docker/gateway.Dockerfile $DESTINATIONS
-    depends_on:
-      - build
-
-  build-appservice:
-    image: gcr.io/kaniko-project/executor:debug
-    when: *image_build_when
-    environment:
-      REGISTRY_USER:
-        from_secret: gitea_username
-      REGISTRY_PASS:
-        from_secret: gitea_password
-      CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
-      CI_COMMIT_TAG: ${CI_COMMIT_TAG}
-      CI_COMMIT_SHA: ${CI_COMMIT_SHA}
-    commands:
-      - mkdir -p /kaniko/.docker
-      - echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASS\"}}}" > /kaniko/.docker/config.json
-      - |
-        DESTINATIONS="--destination git.mosaicstack.dev/mosaicstack/stack/appservice:sha-${CI_COMMIT_SHA:0:7}"
-        if [ "$CI_COMMIT_BRANCH" = "main" ]; then
-          DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/stack/appservice:latest"
-        fi
-        if [ -n "$CI_COMMIT_TAG" ]; then
-          DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/stack/appservice:$CI_COMMIT_TAG"
-        fi
-        /kaniko/executor --context . --dockerfile docker/appservice.Dockerfile $DESTINATIONS
-    depends_on:
-      - build
-
-  build-web:
-    image: gcr.io/kaniko-project/executor:debug
-    when: *image_build_when
-    environment:
-      REGISTRY_USER:
-        from_secret: gitea_username
-      REGISTRY_PASS:
-        from_secret: gitea_password
-      CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
-      CI_COMMIT_TAG: ${CI_COMMIT_TAG}
-      CI_COMMIT_SHA: ${CI_COMMIT_SHA}
-    commands:
-      - mkdir -p /kaniko/.docker
-      - echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASS\"}}}" > /kaniko/.docker/config.json
-      - |
-        DESTINATIONS="--destination git.mosaicstack.dev/mosaicstack/stack/web:sha-${CI_COMMIT_SHA:0:7}"
-        if [ "$CI_COMMIT_BRANCH" = "main" ]; then
-          DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/stack/web:latest"
-        fi
-        if [ -n "$CI_COMMIT_TAG" ]; then
-          DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/stack/web:$CI_COMMIT_TAG"
-        fi
-        /kaniko/executor --context . --dockerfile docker/web.Dockerfile $DESTINATIONS
-    depends_on:
-      - build
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -21,11 +21,11 @@ Mosaic Stack is a self-hosted, multi-user AI agent platform. TypeScript monorepo
 | `apps/web`         | Next.js dashboard               | React 19, Tailwind               |
 | `packages/types`   | Shared TypeScript contracts     | class-validator                  |
 | `packages/db`      | Drizzle ORM schema + migrations | drizzle-orm, postgres            |
-| `packages/auth`    | BetterAuth configuration        | better-auth, @mosaicstack/db     |
-| `packages/brain`   | Data layer (PG-backed)          | @mosaicstack/db                  |
+| `packages/auth`    | BetterAuth configuration        | better-auth, @mosaic/db          |
+| `packages/brain`   | Data layer (PG-backed)          | @mosaic/db                       |
 | `packages/queue`   | Valkey task queue + MCP         | ioredis                          |
-| `packages/coord`   | Mission coordination            | @mosaicstack/queue               |
-| `packages/mosaic`  | Unified `mosaic` CLI + TUI      | Ink, Pi SDK, commander           |
+| `packages/coord`   | Mission coordination            | @mosaic/queue                    |
+| `packages/cli`     | Unified CLI + Pi TUI            | Ink, Pi SDK                      |
 | `plugins/discord`  | Discord channel plugin          | discord.js                       |
 | `plugins/telegram` | Telegram channel plugin         | Telegraf                         |

@@ -33,9 +33,9 @@ Mosaic Stack is a self-hosted, multi-user AI agent platform. TypeScript monorepo

 1. Gateway is the single API surface — all clients connect through it
 2. Pi SDK is ESM-only — gateway and CLI must use ESM
-3. Socket.IO typed events defined in `@mosaicstack/types` enforce compile-time contracts
+3. Socket.IO typed events defined in `@mosaic/types` enforce compile-time contracts
 4. OTEL auto-instrumentation loads before NestJS bootstrap
-5. BetterAuth manages auth tables; schema defined in `@mosaicstack/db`
+5. BetterAuth manages auth tables; schema defined in `@mosaic/db`
 6. Docker Compose provides PG (5433), Valkey (6380), OTEL Collector (4317/4318), Jaeger (16686)
 7. Explicit `@Inject()` decorators required in NestJS (tsx/esbuild doesn't emit decorator metadata)

@@ -53,28 +53,3 @@ pnpm typecheck && pnpm lint && pnpm format:check  # Quality gates
 - ESM everywhere (`"type": "module"`, `.js` extensions in imports)
 - NodeNext module resolution in all tsconfigs
 - Scratchpads are mandatory for non-trivial tasks
-
-## docs/TASKS.md — Schema (CANONICAL)
-
-The `agent` column specifies the required model for each task. **This is set at task creation by the orchestrator and must not be changed by workers.**
-
-| Value     | When to use                                                 | Budget                     |
-| --------- | ----------------------------------------------------------- | -------------------------- |
-| `codex`   | All coding tasks (default for implementation)               | OpenAI credits — preferred |
-| `glm-5.1` | Cost-sensitive coding where Codex is unavailable            | Z.ai credits               |
-| `haiku`   | Review gates, verify tasks, status checks, docs-only        | Cheapest Claude tier       |
-| `sonnet`  | Complex planning, multi-file reasoning, architecture review | Claude quota               |
-| `opus`    | Major cross-cutting architecture decisions ONLY             | Most expensive — minimize  |
-| `—`       | No preference / auto-select cheapest capable                | Pipeline decides           |
-
-Pipeline crons read this column and spawn accordingly. Workers never modify `docs/TASKS.md` — only the orchestrator writes it.
-
-**Full schema:**
-
-```
-| id | status | description | issue | agent | repo | branch | depends_on | estimate | notes |
-```
-
- `status`: `not-started` | `in-progress` | `done` | `failed` | `blocked` | `needs-qa`
- `agent`: model value from table above (set before spawning)
- `estimate`: token budget e.g. `8K`, `25K`
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -10,7 +10,7 @@ Self-hosted, multi-user AI agent platform. TypeScript monorepo.
 - **Web**: Next.js 16 + React 19 (`apps/web`)
 - **ORM**: Drizzle ORM + PostgreSQL 17 + pgvector (`packages/db`)
 - **Auth**: BetterAuth (`packages/auth`)
- **Agent**: Pi SDK (`packages/agent`, `packages/mosaic`)
+- **Agent**: Pi SDK (`packages/agent`, `packages/cli`)
 - **Queue**: Valkey 8 (`packages/queue`)
 - **Build**: pnpm workspaces + Turborepo
 - **CI**: Woodpecker CI
@@ -26,13 +26,13 @@ pnpm test             # Vitest (all packages)
 pnpm build            # Build all packages

 # Database
-pnpm --filter @mosaicstack/db db:push      # Push schema to PG (dev)
-pnpm --filter @mosaicstack/db db:generate  # Generate migrations
-pnpm --filter @mosaicstack/db db:migrate   # Run migrations
+pnpm --filter @mosaic/db db:push      # Push schema to PG (dev)
+pnpm --filter @mosaic/db db:generate  # Generate migrations
+pnpm --filter @mosaic/db db:migrate   # Run migrations

 # Dev
 docker compose up -d                  # Start PG, Valkey, OTEL, Jaeger
-pnpm --filter @mosaicstack/gateway exec tsx src/main.ts  # Start gateway
+pnpm --filter @mosaic/gateway exec tsx src/main.ts  # Start gateway
 ```

 ## Conventions
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,45 +0,0 @@
-# Pre-baked CI base image for Woodpecker pipelines.
-#
-# Purpose: eliminate the cold `pnpm install` that dominates every pipeline
-# (~731s median). This image ships the native toolchain (no per-run `apk add`)
-# AND a warm, content-addressable pnpm store with the dependency-tree tarballs
-# already fetched at build time. `pnpm fetch` only populates the store from the
-# lockfile — it does NOT run the native node-gyp builds (better-sqlite3,
-# node-pty, sqlite3, canvas, sharp); those still compile at `pnpm install`,
-# which is exactly why the musl toolchain stays baked into this image. A
-# pipeline `pnpm install --frozen-lockfile --prefer-offline` then resolves
-# tarballs from local hard-links (no network) and compiles natives against the
-# already-present toolchain, in tens of seconds instead of ~731s.
-#
-# Rebuilt only when `pnpm-lock.yaml` or this Dockerfile change
-# (see .woodpecker/ci-image.yml).
-#
-# Node version is pinned to 24 (Active LTS). This is the follow-up bump from
-# node:22 — sequenced AFTER the CI cache work landed so the runtime change
-# carries zero cache variables. node:26 stays held until it reaches LTS
-# (Oct 2026); the Current line risks native-module (node-gyp) breakage on a
-# runner that compiles better-sqlite3 / canvas / sharp / node-pty from source.
-FROM node:24-alpine
-
-# Native toolchain required to compile node-gyp deps on musl, plus the
-# postgresql-client used by the test step's pg_isready readiness probe. `bash`
-# is baked here too — the sanitization step in ci.yml otherwise does a per-run
-# `apk add bash`.
-RUN apk add --no-cache python3 make g++ postgresql-client bash
-
-# Pin pnpm to the repo's packageManager version via corepack.
-RUN corepack enable && corepack prepare pnpm@10.6.2 --activate
-
-WORKDIR /app
-
-# Pin the store location so the pipeline can point `store-dir` at the same path.
-ENV PNPM_HOME=/root/.local/share/pnpm
-RUN pnpm config set store-dir /root/.local/share/pnpm/store
-
-# Warm the store. `pnpm fetch` populates the content-addressable store with the
-# dependency tarballs directly from the lockfile (no package.json / workspace
-# needed), so a baked store stays valid until the lockfile changes. Note:
-# `fetch` does NOT compile native modules — that happens later at `pnpm install`
-# in the pipeline, against the toolchain baked above.
-COPY pnpm-lock.yaml ./
-RUN pnpm fetch --frozen-lockfile
--- a/21
+++ b/21
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Mosaic Stack
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -1,364 +0,0 @@
-# Mosaic Stack
-
-Self-hosted, multi-user AI agent platform. One config, every runtime, same standards.
-
-Mosaic gives you a unified launcher for Claude Code, Codex, OpenCode, and Pi — injecting consistent system prompts, guardrails, skills, and mission context into every session. A NestJS gateway provides the API surface, a Next.js dashboard gives you the UI, and a plugin system connects Discord, Telegram, and more.
-
-## Quick Install
-
-```bash
-curl -fsSL https://mosaicstack.dev/install.sh | bash
-```
-
-Or use the direct URL:
-
-```bash
-bash <(curl -fsSL https://git.mosaicstack.dev/mosaicstack/stack/raw/branch/main/tools/install.sh)
-```
-
-The installer auto-launches the setup wizard, which walks you through gateway install and verification. Flags for non-interactive use:
-
-```bash
-bash <(curl -fsSL …) --yes               # Accept all defaults
-bash <(curl -fsSL …) --yes --no-auto-launch  # Install only, skip wizard
-```
-
-This installs both components:
-
-| Component               | What                                                             | Where                |
-| ----------------------- | ---------------------------------------------------------------- | -------------------- |
-| **Framework**           | Bash launcher, guides, runtime configs, tools, skills            | `~/.config/mosaic/`  |
-| **@mosaicstack/mosaic** | Unified `mosaic` CLI — TUI, gateway client, wizard, auto-updater | `~/.npm-global/bin/` |
-
-After install, the wizard runs automatically or you can invoke it manually:
-
-```bash
-mosaic wizard        # Full guided setup (gateway install → verify)
-```
-
-### Requirements
-
- Node.js ≥ 20
- npm (for global @mosaicstack/mosaic install)
- One or more runtimes: [Claude Code](https://docs.anthropic.com/en/docs/claude-code), [Codex](https://github.com/openai/codex), [OpenCode](https://opencode.ai), or [Pi](https://github.com/mariozechner/pi-coding-agent)
-
-## Usage
-
-### Launching Agent Sessions
-
-```bash
-mosaic pi                    # Launch Pi with Mosaic injection
-mosaic claude                # Launch Claude Code with Mosaic injection
-mosaic codex                 # Launch Codex with Mosaic injection
-mosaic opencode              # Launch OpenCode with Mosaic injection
-
-mosaic yolo claude           # Claude with dangerous-permissions mode
-mosaic yolo pi               # Pi in yolo mode
-```
-
-The launcher verifies your config, checks for `SOUL.md`, injects your `AGENTS.md` standards into the runtime, and forwards all arguments.
-
-Pi launches default to a token-lean skill posture: `mosaic pi` passes `--no-skills` so Pi does not preload every global skill description into the system prompt. Use `MOSAIC_PI_SKILL_MODE=all mosaic pi` for the legacy all-skills catalog, or `MOSAIC_PI_SKILL_MODE=discover mosaic pi` to let Pi use its native settings/project skill discovery.
-
-### TUI & Gateway
-
-```bash
-mosaic tui                   # Interactive TUI connected to the gateway
-mosaic gateway login         # Authenticate with a gateway instance
-mosaic sessions list         # List active agent sessions
-```
-
-### Gateway Management
-
-```bash
-mosaic gateway install       # Install and configure the gateway service
-mosaic gateway verify        # Post-install health check
-mosaic gateway login         # Authenticate and store a session token
-mosaic gateway config rotate-token    # Rotate your API token
-mosaic gateway config recover-token  # Recover a token via BetterAuth cookie
-```
-
-If you already have a gateway account but no token, use `mosaic gateway config recover-token` to retrieve one without recreating your account.
-
-### Configuration
-
-Mosaic supports three storage tiers: `local` (PGlite, single-host), `standalone` (PostgreSQL, single-host), and `federated` (PostgreSQL + pgvector + Valkey, multi-host). See [Federated Tier Setup](docs/federation/SETUP.md) for multi-user and production deployments, or [Migrating to Federated](docs/guides/migrate-tier.md) to upgrade from existing tiers.
-
-```bash
-mosaic config show           # Print full config as JSON
-mosaic config get <key>      # Read a specific key
-mosaic config set <key> <val># Write a key
-mosaic config edit           # Open config in $EDITOR
-mosaic config path           # Print config file path
-```
-
-### Management
-
-```bash
-mosaic doctor                # Health audit — detect drift and missing files
-mosaic sync                  # Sync skills from canonical source
-mosaic update                # Check for and install CLI updates
-mosaic wizard                # Full guided setup wizard
-mosaic bootstrap <path>      # Bootstrap a repo with Mosaic standards
-mosaic coord init            # Initialize a new orchestration mission
-mosaic prdy init             # Create a PRD via guided session
-```
-
-### Sub-package Commands
-
-Each Mosaic sub-package exposes its API surface through the unified CLI:
-
-```bash
-# User management
-mosaic auth users list
-mosaic auth users create
-mosaic auth sso
-
-# Agent brain (projects, missions, tasks)
-mosaic brain projects
-mosaic brain missions
-mosaic brain tasks
-mosaic brain conversations
-
-# Agent forge pipeline
-mosaic forge run
-mosaic forge status
-mosaic forge resume
-mosaic forge personas
-
-# Structured logging
-mosaic log tail
-mosaic log search
-mosaic log export
-mosaic log level
-
-# MACP protocol
-mosaic macp tasks
-mosaic macp submit
-mosaic macp gate
-mosaic macp events
-
-# Agent memory
-mosaic memory search
-mosaic memory stats
-mosaic memory insights
-mosaic memory preferences
-
-# Task queue (Valkey)
-mosaic queue list
-mosaic queue stats
-mosaic queue pause
-mosaic queue resume
-mosaic queue jobs
-mosaic queue drain
-
-# Object storage
-mosaic storage status
-mosaic storage tier
-mosaic storage export
-mosaic storage import
-mosaic storage migrate
-```
-
-### Telemetry
-
-```bash
-# Local observability (OTEL / Jaeger)
-mosaic telemetry local status
-mosaic telemetry local tail
-mosaic telemetry local jaeger
-
-# Remote telemetry (dry-run by default)
-mosaic telemetry status
-mosaic telemetry opt-in
-mosaic telemetry opt-out
-mosaic telemetry test
-mosaic telemetry upload        # Dry-run unless opted in
-```
-
-Consent state is persisted in config. Remote upload is a no-op until you run `mosaic telemetry opt-in`.
-
-## Development
-
-### Prerequisites
-
- Node.js ≥ 20
- pnpm 10.6+
- Docker & Docker Compose
-
-### Setup
-
-```bash
-git clone git@git.mosaicstack.dev:mosaicstack/stack.git
-cd stack
-
-# Start infrastructure (Postgres, Valkey, Jaeger)
-docker compose up -d
-
-# Install dependencies
-pnpm install
-
-# Run migrations
-pnpm --filter @mosaicstack/db run db:migrate
-
-# Start all services in dev mode
-pnpm dev
-```
-
-### Infrastructure
-
-Docker Compose provides:
-
-| Service               | Port      | Purpose                |
-| --------------------- | --------- | ---------------------- |
-| PostgreSQL (pgvector) | 5433      | Primary database       |
-| Valkey                | 6380      | Task queue + caching   |
-| Jaeger                | 16686     | Distributed tracing UI |
-| OTEL Collector        | 4317/4318 | Telemetry ingestion    |
-
-### Quality Gates
-
-```bash
-pnpm typecheck               # TypeScript type checking (all packages)
-pnpm lint                    # ESLint (all packages)
-pnpm test                    # Vitest (all packages)
-pnpm format:check            # Prettier check
-pnpm format                  # Prettier auto-fix
-```
-
-### CI
-
-Woodpecker CI runs on every push:
-
- `pnpm install --frozen-lockfile`
- Database migration against a fresh Postgres
- `pnpm test` (Turbo-orchestrated across all packages)
-
-npm packages are published to the Gitea package registry on main merges.
-
-## Architecture
-
-```
-stack/
-├── apps/
-│   ├── gateway/             NestJS API + WebSocket hub (Fastify, Socket.IO, OTEL)
-│   └── web/                 Next.js dashboard (React 19, Tailwind)
-├── packages/
-│   ├── mosaic/              Unified CLI — TUI, gateway client, wizard, sub-package commands
-│   ├── types/               Shared TypeScript contracts (Socket.IO typed events)
-│   ├── db/                  Drizzle ORM schema + migrations (pgvector)
-│   ├── auth/                BetterAuth configuration
-│   ├── brain/               Data layer (PG-backed)
-│   ├── queue/               Valkey task queue + MCP
-│   ├── coord/               Mission coordination
-│   ├── forge/               Multi-stage AI pipeline (intake → board → plan → code → review)
-│   ├── macp/                MACP protocol — credential resolution, gate runner, events
-│   ├── agent/               Agent session management
-│   ├── memory/              Agent memory layer
-│   ├── log/                 Structured logging
-│   ├── prdy/                PRD creation and validation
-│   ├── quality-rails/       Quality templates (TypeScript, Next.js, monorepo)
-│   └── design-tokens/       Shared design tokens
-├── plugins/
-│   ├── discord/             Discord channel plugin (discord.js)
-│   ├── telegram/            Telegram channel plugin (Telegraf)
-│   ├── macp/                OpenClaw MACP runtime plugin
-│   └── mosaic-framework/    OpenClaw framework injection plugin
-├── tools/
-│   └── install.sh           Unified installer (framework + npm CLI, --yes / --no-auto-launch)
-├── scripts/agent/           Agent session lifecycle scripts
-├── docker-compose.yml       Dev infrastructure
-└── .woodpecker/             CI pipeline configs
-```
-
-### Key Design Decisions
-
- **Gateway is the single API surface** — all clients (TUI, web, Discord, Telegram) connect through it
- **ESM everywhere** — `"type": "module"`, `.js` extensions in imports, NodeNext resolution
- **Socket.IO typed events** — defined in `@mosaicstack/types`, enforced at compile time
- **OTEL auto-instrumentation** — loads before NestJS bootstrap
- **Explicit `@Inject()` decorators** — required since tsx/esbuild doesn't emit decorator metadata
-
-### Framework (`~/.config/mosaic/`)
-
-The framework is the bash-based standards layer installed to every developer machine:
-
-```
-~/.config/mosaic/
-├── AGENTS.md              ← Central standards (loaded into every runtime)
-├── SOUL.md                ← Agent identity (name, style, guardrails)
-├── USER.md                ← User profile (name, timezone, preferences)
-├── TOOLS.md               ← Machine-level tool reference
-├── bin/mosaic             ← Unified launcher (claude, codex, opencode, pi, yolo)
-├── guides/                ← E2E delivery, orchestrator protocol, PRD, etc.
-├── runtime/               ← Per-runtime configs (claude/, codex/, opencode/, pi/)
-├── skills/                ← Universal skills (synced from agent-skills repo)
-├── tools/                 ← Tool suites (orchestrator, git, quality, prdy, etc.)
-└── memory/                ← Persistent agent memory (preserved across upgrades)
-```
-
-### Forge Pipeline
-
-Forge is a multi-stage AI pipeline for autonomous feature delivery:
-
-```
-Intake → Discovery → Board Review → Planning (3 stages) → Coding → Review → Remediation → Test → Deploy
-```
-
-Each stage has a dispatch mode (`exec` for research/review, `yolo` for coding), quality gates, and timeouts. The board review uses multiple AI personas (CEO, CTO, CFO, COO + specialists) to evaluate briefs before committing resources.
-
-## Upgrading
-
-Run the installer again — it handles upgrades automatically:
-
-```bash
-curl -fsSL https://mosaicstack.dev/install.sh | bash
-```
-
-Or use the direct URL:
-
-```bash
-bash <(curl -fsSL https://git.mosaicstack.dev/mosaicstack/stack/raw/branch/main/tools/install.sh)
-```
-
-Or use the CLI:
-
-```bash
-mosaic update                # Check + install CLI updates
-mosaic update --check        # Check only, don't install
-```
-
-The CLI also performs a background update check on every invocation (cached for 1 hour).
-
-### Installer Flags
-
-```bash
-bash tools/install.sh --check           # Version check only
-bash tools/install.sh --framework       # Framework only (skip npm CLI)
-bash tools/install.sh --cli             # npm CLI only (skip framework)
-bash tools/install.sh --ref v1.0        # Install from a specific git ref
-bash tools/install.sh --yes             # Non-interactive, accept all defaults
-bash tools/install.sh --no-auto-launch  # Skip auto-launch of wizard
-```
-
-## Contributing
-
-```bash
-# Create a feature branch
-git checkout -b feat/my-feature
-
-# Make changes, then verify
-pnpm typecheck && pnpm lint && pnpm test && pnpm format:check
-
-# Commit (husky runs lint-staged automatically)
-git commit -m "feat: description of change"
-
-# Push and create PR
-git push -u origin feat/my-feature
-```
-
-DTOs go in `*.dto.ts` files at module boundaries. Scratchpads (`docs/scratchpads/`) are mandatory for non-trivial tasks. See `AGENTS.md` for the full standards reference.
-
-## License
-
-Proprietary — all rights reserved.
--- a/apps/appservice/package.json
+++ b/apps/appservice/package.json
@@ -1,35 +0,0 @@
-{
-  "name": "@mosaicstack/mosaic-as",
-  "version": "0.0.1",
-  "type": "module",
-  "private": true,
-  "repository": {
-    "type": "git",
-    "url": "https://git.mosaicstack.dev/mosaicstack/stack.git",
-    "directory": "apps/appservice"
-  },
-  "main": "dist/main.js",
-  "bin": {
-    "mosaic-as": "dist/main.js",
-    "mosaic-as-registration": "dist/registration-main.js"
-  },
-  "scripts": {
-    "build": "tsc",
-    "lint": "eslint src",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run --passWithNoTests",
-    "dev": "tsx watch src/main.ts"
-  },
-  "dependencies": {
-    "@mosaicstack/appservice": "workspace:*"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "tsx": "^4.19.0",
-    "typescript": "^5.8.0",
-    "vitest": "^2.0.0"
-  },
-  "files": [
-    "dist"
-  ]
-}
--- a/apps/appservice/src/tests/server.test.ts
+++ b/apps/appservice/src/tests/server.test.ts
@@ -1,388 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-
-import { AppserviceDaemon } from '../server.js';
-import type { DaemonConfig, DaemonRequest } from '../server.js';
-
-const AGENTS_TYPE = 'org.uscllc.mosaic_as.agents';
-
-const cfg: DaemonConfig = {
-  homeserverUrl: 'https://hs.example',
-  domain: 'hs.example',
-  asToken: 'as-secret',
-  hsToken: 'hs-secret',
-  bridgeTokens: ['bridge-secret'],
-};
-
-const jsonResponse = (status: number, body: unknown): Response =>
-  new Response(JSON.stringify(body), { status, headers: { 'Content-Type': 'application/json' } });
-
-const request = (overrides: Partial<DaemonRequest>): DaemonRequest => ({
-  method: 'GET',
-  path: '/',
-  searchParams: new URLSearchParams(),
-  body: undefined,
-  ...overrides,
-});
-
-const makeDaemon = () => {
-  const fetchMock = vi.fn(async (_input: URL | string) => jsonResponse(200, { event_id: '$sent' }));
-  const daemon = new AppserviceDaemon(cfg, fetchMock as unknown as typeof fetch, () => {});
-  return { daemon, fetchMock };
-};
-
-describe('AppserviceDaemon routing', () => {
-  it('serves health unauthenticated', async () => {
-    const { daemon } = makeDaemon();
-    expect((await daemon.handle(request({ path: '/health' }))).status).toBe(200);
-  });
-
-  it('404s unknown paths', async () => {
-    const { daemon } = makeDaemon();
-    expect((await daemon.handle(request({ path: '/nope' }))).status).toBe(404);
-  });
-
-  it('transactions require the hs_token', async () => {
-    const { daemon } = makeDaemon();
-    const bad = await daemon.handle(
-      request({
-        method: 'PUT',
-        path: '/_matrix/app/v1/transactions/t1',
-        authorizationHeader: 'Bearer wrong',
-        body: { events: [] },
-      }),
-    );
-    expect(bad.status).toBe(403);
-    const ok = await daemon.handle(
-      request({
-        method: 'PUT',
-        path: '/_matrix/app/v1/transactions/t1',
-        authorizationHeader: 'Bearer hs-secret',
-        body: { events: [{ type: 'm.room.message', event_id: '$e' }] },
-      }),
-    );
-    expect(ok.status).toBe(200);
-  });
-
-  it('bridge requires a bridge token (hs/as tokens do not work)', async () => {
-    const { daemon } = makeDaemon();
-    for (const token of [undefined, 'Bearer hs-secret', 'Bearer as-secret', 'Bearer nope']) {
-      const res = await daemon.handle(
-        request({
-          method: 'POST',
-          path: '/bridge/v1/messages',
-          authorizationHeader: token,
-          body: {},
-        }),
-      );
-      expect(res.status).toBe(403);
-    }
-  });
-
-  it('bridge message sends as the agent and returns the event id', async () => {
-    const { daemon, fetchMock } = makeDaemon();
-    const res = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/messages',
-        authorizationHeader: 'Bearer bridge-secret',
-        body: { room_id: '!r:hs.example', agent: 'pi0-web1', body: 'hi', thread_root: '$req' },
-      }),
-    );
-    expect(res.status).toBe(200);
-    expect(res.body.event_id).toBe('$sent');
-    const sendCall = fetchMock.mock.calls
-      .map((c) => new URL(String(c[0])))
-      .find((u) => u.pathname.includes('/send/m.room.message/'));
-    expect(sendCall).toBeDefined();
-    expect(sendCall!.searchParams.get('user_id')).toBe('@agent-pi0-web1:hs.example');
-  });
-
-  it('bridge rejects invalid payloads with 400', async () => {
-    const { daemon } = makeDaemon();
-    const res = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/messages',
-        authorizationHeader: 'Bearer bridge-secret',
-        body: { room_id: 'bad', agent: 'pi0', body: 'x' },
-      }),
-    );
-    expect(res.status).toBe(400);
-  });
-
-  it('bridge typing endpoint works', async () => {
-    const { daemon, fetchMock } = makeDaemon();
-    const res = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/typing',
-        authorizationHeader: 'Bearer bridge-secret',
-        body: { room_id: '!r:hs.example', agent: 'pi0-web1', typing: true },
-      }),
-    );
-    expect(res.status).toBe(200);
-    const typingCall = fetchMock.mock.calls
-      .map((c) => new URL(String(c[0])))
-      .find((u) => u.pathname.includes('/typing/'));
-    expect(typingCall).toBeDefined();
-  });
-
-  it('authenticated unknown bridge sub-paths return 405, never fall through', async () => {
-    const { daemon } = makeDaemon();
-    const res = await daemon.handle(
-      request({
-        method: 'GET',
-        path: '/bridge/v1/unknown',
-        authorizationHeader: 'Bearer bridge-secret',
-      }),
-    );
-    expect(res.status).toBe(405);
-  });
-
-  it('provisions a room as the AS sender with space linking', async () => {
-    const calls: Array<{ url: URL; body: unknown }> = [];
-    const fetchMock = vi.fn(async (input: URL | string, init?: RequestInit) => {
-      const url = new URL(String(input));
-      calls.push({ url, body: init?.body ? JSON.parse(String(init.body)) : undefined });
-      if (url.pathname.endsWith('/createRoom'))
-        return jsonResponse(200, { room_id: '!new:hs.example' });
-      return jsonResponse(200, {});
-    });
-    const daemon = new AppserviceDaemon(cfg, fetchMock as unknown as typeof fetch, () => {});
-    const res = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/provision/rooms',
-        authorizationHeader: 'Bearer bridge-secret',
-        body: {
-          name: 'proj-x',
-          alias: 'mosaic-proj-x',
-          invite: ['@jason.woltje:hs.example'],
-          space_id: '!space:hs.example',
-        },
-      }),
-    );
-    expect(res.status).toBe(200);
-    expect(res.body.room_id).toBe('!new:hs.example');
-    expect(res.body.space_linked).toBe(true);
-    const create = calls.find((c) => c.url.pathname.endsWith('/createRoom'));
-    expect(create!.url.searchParams.get('user_id')).toBe('@mosaic-as:hs.example');
-    const body = create!.body as Record<string, unknown>;
-    expect(body.room_alias_name).toBe('mosaic-proj-x');
-    expect((body.power_level_content_override as Record<string, unknown>).users).toEqual({
-      '@mosaic-as:hs.example': 100,
-    });
-    expect(calls.some((c) => c.url.pathname.includes('/state/m.space.child/'))).toBe(true);
-    expect(calls.some((c) => c.url.pathname.includes('/state/m.space.parent/'))).toBe(true);
-  });
-
-  it('space-link failure still returns the room id (no orphan)', async () => {
-    const fetchMock = vi.fn(async (input: URL | string) => {
-      const url = new URL(String(input));
-      if (url.pathname.endsWith('/createRoom'))
-        return jsonResponse(200, { room_id: '!new:hs.example' });
-      if (url.pathname.includes('/state/m.space.child/'))
-        return jsonResponse(403, { errcode: 'M_FORBIDDEN', error: 'no PL in space' });
-      return jsonResponse(200, {});
-    });
-    const daemon = new AppserviceDaemon(cfg, fetchMock as unknown as typeof fetch, () => {});
-    const res = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/provision/rooms',
-        authorizationHeader: 'Bearer bridge-secret',
-        body: { name: 'proj-x', space_id: '!space:hs.example' },
-      }),
-    );
-    expect(res.status).toBe(200);
-    expect(res.body.room_id).toBe('!new:hs.example');
-    expect(res.body.space_linked).toBe(false);
-    expect(String(res.body.space_error)).toContain('403');
-  });
-
-  it('invite list cap enforced', async () => {
-    const { daemon } = makeDaemon();
-    const res = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/provision/rooms',
-        authorizationHeader: 'Bearer bridge-secret',
-        body: { name: 'x', invite: Array.from({ length: 51 }, (_, i) => `@u${i}:hs`) },
-      }),
-    );
-    expect(res.status).toBe(400);
-  });
-
-  it('provision rejects bad payloads and requires auth', async () => {
-    const { daemon } = makeDaemon();
-    const noAuth = await daemon.handle(
-      request({ method: 'POST', path: '/bridge/v1/provision/rooms', body: { name: 'x' } }),
-    );
-    expect(noAuth.status).toBe(403);
-    const bad = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/provision/rooms',
-        authorizationHeader: 'Bearer bridge-secret',
-        body: { name: '', alias: 'BAD ALIAS' },
-      }),
-    );
-    expect(bad.status).toBe(400);
-  });
-
-  // A daemon whose fetch mock backs account_data with a mutable in-test object,
-  // so register/verify/revoke round-trip through the (faked) homeserver.
-  const makeAgentDaemon = () => {
-    const accountData: { value: Record<string, unknown> | null } = { value: null };
-    const fetchMock = vi.fn(async (input: URL | string, init?: RequestInit) => {
-      const url = new URL(String(input));
-      const path = url.pathname;
-      if (path.includes(`/account_data/${AGENTS_TYPE}`)) {
-        if (init?.method === 'PUT') {
-          accountData.value = JSON.parse(String(init.body)) as Record<string, unknown>;
-          return jsonResponse(200, {});
-        }
-        if (accountData.value === null) {
-          return jsonResponse(404, { errcode: 'M_NOT_FOUND', error: 'not found' });
-        }
-        return jsonResponse(200, accountData.value);
-      }
-      if (path.endsWith('/register')) return jsonResponse(200, { user_id: 'whatever' });
-      if (path.includes('/send/m.room.message/')) return jsonResponse(200, { event_id: '$sent' });
-      return jsonResponse(200, {});
-    });
-    const daemon = new AppserviceDaemon(cfg, fetchMock as unknown as typeof fetch, () => {});
-    return { daemon, fetchMock };
-  };
-
-  const registerAgent = async (
-    daemon: AppserviceDaemon,
-    body: Record<string, unknown> = { alias: 'pi0', host: 'web1' },
-  ) =>
-    daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/agents',
-        authorizationHeader: 'Bearer bridge-secret',
-        body,
-      }),
-    );
-
-  it('host token registers an agent and returns agent_user_id + bridge_token', async () => {
-    const { daemon, fetchMock } = makeAgentDaemon();
-    const res = await registerAgent(daemon, { alias: 'pi0', host: 'web1' });
-    expect(res.status).toBe(200);
-    expect(res.body.agent_user_id).toBe('@agent-pi0-web1:hs.example');
-    expect(String(res.body.bridge_token).startsWith('magt_')).toBe(true);
-    const registerCall = fetchMock.mock.calls
-      .map((c) => new URL(String(c[0])))
-      .find((u) => u.pathname.endsWith('/register'));
-    expect(registerCall).toBeDefined();
-  });
-
-  it('register requires a HOST token (agent token and no token are 403)', async () => {
-    const { daemon } = makeAgentDaemon();
-    const minted = await registerAgent(daemon);
-    const agentToken = String(minted.body.bridge_token);
-
-    const asAgent = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/agents',
-        authorizationHeader: `Bearer ${agentToken}`,
-        body: { alias: 'pi1', host: 'web2' },
-      }),
-    );
-    expect(asAgent.status).toBe(403);
-
-    const noAuth = await daemon.handle(
-      request({ method: 'POST', path: '/bridge/v1/agents', body: { alias: 'pi1', host: 'web2' } }),
-    );
-    expect(noAuth.status).toBe(403);
-  });
-
-  it('agent-scoped token may send as itself but not as another agent', async () => {
-    const { daemon } = makeAgentDaemon();
-    const minted = await registerAgent(daemon, { alias: 'pi0', host: 'web1' });
-    const agentToken = String(minted.body.bridge_token);
-
-    const self = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/messages',
-        authorizationHeader: `Bearer ${agentToken}`,
-        body: { room_id: '!r:hs.example', agent: 'pi0-web1', body: 'hi' },
-      }),
-    );
-    expect(self.status).toBe(200);
-
-    const other = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/messages',
-        authorizationHeader: `Bearer ${agentToken}`,
-        body: { room_id: '!r:hs.example', agent: 'pi9-web9', body: 'hi' },
-      }),
-    );
-    expect(other.status).toBe(403);
-    expect(other.body.error).toBe('token not scoped to this agent');
-  });
-
-  it('revoked agent token is rejected on messages', async () => {
-    const { daemon } = makeAgentDaemon();
-    const minted = await registerAgent(daemon, { alias: 'pi0', host: 'web1' });
-    const agentToken = String(minted.body.bridge_token);
-
-    const revoke = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/agents/revoke',
-        authorizationHeader: 'Bearer bridge-secret',
-        body: { agent_user_id: '@agent-pi0-web1:hs.example' },
-      }),
-    );
-    expect(revoke.status).toBe(200);
-    expect(revoke.body.revoked).toBe(1);
-
-    const afterRevoke = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/messages',
-        authorizationHeader: `Bearer ${agentToken}`,
-        body: { room_id: '!r:hs.example', agent: 'pi0-web1', body: 'hi' },
-      }),
-    );
-    expect(afterRevoke.status).toBe(403);
-  });
-
-  it('GET /bridge/v1/agents lists registered agents (host only)', async () => {
-    const { daemon } = makeAgentDaemon();
-    await registerAgent(daemon, { alias: 'pi0', host: 'web1', display_name: 'Pi Zero' });
-
-    const res = await daemon.handle(
-      request({
-        method: 'GET',
-        path: '/bridge/v1/agents',
-        authorizationHeader: 'Bearer bridge-secret',
-      }),
-    );
-    expect(res.status).toBe(200);
-    const agents = res.body.agents as Array<Record<string, unknown>>;
-    expect(agents).toHaveLength(1);
-    expect(agents[0]?.agent_user_id).toBe('@agent-pi0-web1:hs.example');
-    expect(agents[0]?.display_name).toBe('Pi Zero');
-  });
-
-  it('empty bridge token list denies everything', async () => {
-    const daemon = new AppserviceDaemon({ ...cfg, bridgeTokens: [] }, undefined, () => {});
-    const res = await daemon.handle(
-      request({
-        method: 'POST',
-        path: '/bridge/v1/typing',
-        authorizationHeader: 'Bearer bridge-secret',
-        body: {},
-      }),
-    );
-    expect(res.status).toBe(403);
-  });
-});
--- a/apps/appservice/src/config.ts
+++ b/apps/appservice/src/config.ts
@@ -1,23 +0,0 @@
-import type { DaemonConfig } from './server.js';
-
-const required = (name: string): string => {
-  const value = process.env[name];
-  if (!value) throw new Error(`missing required env var ${name}`);
-  return value;
-};
-
-export function configFromEnv(): DaemonConfig & { port: number } {
-  return {
-    homeserverUrl: required('MOSAIC_AS_HOMESERVER_URL'),
-    domain: required('MOSAIC_AS_DOMAIN'),
-    asToken: required('MOSAIC_AS_TOKEN'),
-    hsToken: required('MOSAIC_HS_TOKEN'),
-    userPrefix: process.env.MOSAIC_AS_USER_PREFIX ?? 'agent-',
-    senderLocalpart: process.env.MOSAIC_AS_SENDER_LOCALPART ?? 'mosaic-as',
-    bridgeTokens: (process.env.MOSAIC_AS_BRIDGE_TOKENS ?? '')
-      .split(',')
-      .map((t) => t.trim())
-      .filter(Boolean),
-    port: Number(process.env.MOSAIC_AS_PORT ?? 8008),
-  };
-}
--- a/apps/appservice/src/main.ts
+++ b/apps/appservice/src/main.ts
@@ -1,67 +0,0 @@
-import http from 'node:http';
-
-import { configFromEnv } from './config.js';
-import { AppserviceDaemon } from './server.js';
-
-const cfg = configFromEnv();
-const daemon = new AppserviceDaemon(cfg);
-
-const MAX_BODY_BYTES = 1024 * 1024;
-
-const server = http.createServer((req, res) => {
-  const chunks: Buffer[] = [];
-  let received = 0;
-  let rejected = false;
-  req.on('data', (chunk: Buffer) => {
-    received += chunk.length;
-    if (received > MAX_BODY_BYTES) {
-      rejected = true;
-      res.writeHead(413, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify({ errcode: 'M_TOO_LARGE', error: 'request body too large' }));
-      req.destroy();
-      return;
-    }
-    chunks.push(chunk);
-  });
-  req.on('end', () => {
-    if (rejected) return;
-    void (async () => {
-      const url = new URL(req.url ?? '/', 'http://localhost');
-      let body: unknown;
-      try {
-        const raw = Buffer.concat(chunks).toString();
-        body = raw ? JSON.parse(raw) : undefined;
-      } catch {
-        res.writeHead(400, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ errcode: 'M_NOT_JSON', error: 'invalid json' }));
-        return;
-      }
-      const result = await daemon.handle({
-        method: req.method ?? 'GET',
-        path: url.pathname,
-        searchParams: url.searchParams,
-        authorizationHeader: req.headers.authorization,
-        body,
-      });
-      res.writeHead(result.status, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify(result.body));
-    })().catch((error: unknown) => {
-      console.error('request failed:', error);
-      if (res.headersSent) {
-        res.destroy();
-        return;
-      }
-      res.writeHead(500, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify({ error: 'internal error' }));
-    });
-  });
-});
-
-server.listen(cfg.port, () => {
-  console.log(
-    `mosaic-as listening on :${cfg.port} (homeserver ${cfg.homeserverUrl}, domain ${cfg.domain})`,
-  );
-  if (cfg.bridgeTokens.length === 0) {
-    console.warn('WARNING: MOSAIC_AS_BRIDGE_TOKENS is empty — bridge API will deny all requests');
-  }
-});
--- a/apps/appservice/src/registration-main.ts
+++ b/apps/appservice/src/registration-main.ts
@@ -1,10 +0,0 @@
-import { buildRegistration, registrationToYaml } from '@mosaicstack/appservice';
-
-import { configFromEnv } from './config.js';
-
-// Prints the Synapse registration YAML (mosaic-as.yaml) for the current env.
-// Usage: MOSAIC_AS_URL=http://mosaic-as:8008 mosaic-as-registration > mosaic-as.yaml
-const cfg = configFromEnv();
-const url = process.env.MOSAIC_AS_URL;
-if (!url) throw new Error('missing required env var MOSAIC_AS_URL');
-process.stdout.write(registrationToYaml(buildRegistration(cfg, { url })));
--- a/apps/appservice/src/server.ts
+++ b/apps/appservice/src/server.ts
@@ -1,225 +0,0 @@
-import { createHmac, randomBytes, timingSafeEqual } from 'node:crypto';
-
-import {
-  AgentTokenStore,
-  AppserviceIntent,
-  TransactionHandler,
-  validateBridgeMessage,
-  validateBridgeTyping,
-  validateProvisionRoom,
-  validateRegisterAgent,
-  validateRevokeAgent,
-} from '@mosaicstack/appservice';
-import type { AppserviceConfig, MatrixEvent } from '@mosaicstack/appservice';
-
-export interface DaemonConfig extends AppserviceConfig {
-  /** Bearer tokens accepted on /bridge/v1/* (one per agent-comms host daemon). */
-  bridgeTokens: string[];
-}
-
-export interface DaemonRequest {
-  method: string;
-  /** URL path without query string. */
-  path: string;
-  searchParams: URLSearchParams;
-  authorizationHeader?: string;
-  body: unknown;
-}
-
-export interface DaemonResponse {
-  status: number;
-  body: Record<string, unknown>;
-}
-
-// Compare equal-length HMAC digests so neither content nor LENGTH of the
-// stored secret is observable through timing.
-const HMAC_KEY = randomBytes(32);
-const digest = (value: string): Buffer => createHmac('sha256', HMAC_KEY).update(value).digest();
-
-const safeEqual = (a: string, b: string): boolean => timingSafeEqual(digest(a), digest(b));
-
-const TXN_PATH = /^\/_matrix\/app\/v1\/transactions\/([^/]+)$/;
-
-/**
- * Resolved identity for an authenticated /bridge/v1/* caller. Host principals
- * (the agent-comms host daemons) are unrestricted; agent principals are scoped
- * to a single virtual user and may only act as themselves.
- */
-export type BridgePrincipal = { kind: 'host' } | { kind: 'agent'; agentUserId: string } | null;
-
-/**
- * HTTP-framework-agnostic request router for the mosaic-as daemon: the
- * Application Service transactions endpoint (Synapse-facing) plus the
- * internal bridge API v1 (agent-comms daemon-facing). main.ts binds this to
- * node:http; tests drive it directly.
- */
-export class AppserviceDaemon {
-  readonly intent: AppserviceIntent;
-  private readonly transactions: TransactionHandler;
-  private readonly agents: AgentTokenStore;
-
-  constructor(
-    private readonly cfg: DaemonConfig,
-    fetchImpl?: typeof fetch,
-    private readonly log: (line: string) => void = (line) => console.log(line),
-  ) {
-    this.intent = new AppserviceIntent(cfg, fetchImpl);
-    this.agents = new AgentTokenStore(this.intent);
-    this.transactions = new TransactionHandler({
-      hsToken: cfg.hsToken,
-      onEvent: (event) => this.onEvent(event),
-      onError: (error, txnId) => this.log(`txn ${txnId} handler error: ${String(error)}`),
-    });
-  }
-
-  /** v1: the daemon only observes; room logic lives in the agent-comms daemons. */
-  private onEvent(event: MatrixEvent): void {
-    if (event.type === 'm.room.message') {
-      this.log(
-        `event ${event.event_id ?? '?'} in ${event.room_id ?? '?'} from ${event.sender ?? '?'}`,
-      );
-    }
-  }
-
-  /** Resolve the calling principal, or null when unauthorized. Fail-closed:
-   * host tokens win (timing-safe compare); otherwise a magt_* bearer is looked
-   * up in the agent token store; anything else is rejected. */
-  private async bridgeAuthorized(
-    authorizationHeader: string | undefined,
-  ): Promise<BridgePrincipal> {
-    if (!authorizationHeader?.startsWith('Bearer ')) return null;
-    const presented = authorizationHeader.slice('Bearer '.length);
-    if (this.cfg.bridgeTokens.some((token) => safeEqual(presented, token))) {
-      return { kind: 'host' };
-    }
-    const agentUserId = await this.agents.verifyToken(presented);
-    if (agentUserId) return { kind: 'agent', agentUserId };
-    return null;
-  }
-
-  async handle(req: DaemonRequest): Promise<DaemonResponse> {
-    if (req.method === 'GET' && req.path === '/health') {
-      return { status: 200, body: { ok: true } };
-    }
-
-    const txnMatch = req.method === 'PUT' ? TXN_PATH.exec(req.path) : null;
-    if (txnMatch?.[1] !== undefined) {
-      return this.transactions.handle(txnMatch[1], req.body, {
-        authorizationHeader: req.authorizationHeader,
-        accessTokenParam: req.searchParams.get('access_token') ?? undefined,
-      });
-    }
-
-    if (req.path.startsWith('/bridge/v1/')) {
-      const principal = await this.bridgeAuthorized(req.authorizationHeader);
-      if (!principal) {
-        return { status: 403, body: { errcode: 'M_FORBIDDEN', error: 'bad bridge token' } };
-      }
-      try {
-        if (req.method === 'POST' && req.path === '/bridge/v1/agents') {
-          if (principal.kind !== 'host') {
-            return {
-              status: 403,
-              body: { errcode: 'M_FORBIDDEN', error: 'agents cannot register agents' },
-            };
-          }
-          validateRegisterAgent(req.body);
-          const { agentUserId, token } = await this.agents.register({
-            alias: req.body.alias,
-            host: req.body.host,
-            displayName: req.body.display_name,
-          });
-          this.log(`registered agent ${agentUserId}`);
-          return { status: 200, body: { agent_user_id: agentUserId, bridge_token: token } };
-        }
-        if (req.method === 'POST' && req.path === '/bridge/v1/agents/revoke') {
-          if (principal.kind !== 'host') {
-            return {
-              status: 403,
-              body: { errcode: 'M_FORBIDDEN', error: 'agents cannot revoke agents' },
-            };
-          }
-          validateRevokeAgent(req.body);
-          const revoked = await this.agents.revoke(req.body.agent_user_id);
-          this.log(`revoked ${revoked} token(s) for ${req.body.agent_user_id}`);
-          return { status: 200, body: { revoked } };
-        }
-        if (req.method === 'GET' && req.path === '/bridge/v1/agents') {
-          if (principal.kind !== 'host') {
-            return {
-              status: 403,
-              body: { errcode: 'M_FORBIDDEN', error: 'agents cannot list agents' },
-            };
-          }
-          const agents = await this.agents.list();
-          return { status: 200, body: { agents } };
-        }
-        if (req.method === 'POST' && req.path === '/bridge/v1/messages') {
-          validateBridgeMessage(req.body);
-          if (
-            principal.kind === 'agent' &&
-            this.intent.agentUserId(req.body.agent) !== principal.agentUserId
-          ) {
-            return {
-              status: 403,
-              body: { errcode: 'M_FORBIDDEN', error: 'token not scoped to this agent' },
-            };
-          }
-          const eventId = await this.intent.sendAsAgent({
-            roomId: req.body.room_id,
-            agent: req.body.agent,
-            body: req.body.body,
-            threadRoot: req.body.thread_root,
-            msgtype: req.body.msgtype,
-            extraContent: req.body.extra_content,
-          });
-          return { status: 200, body: { event_id: eventId ?? null } };
-        }
-        if (req.method === 'POST' && req.path === '/bridge/v1/typing') {
-          validateBridgeTyping(req.body);
-          if (
-            principal.kind === 'agent' &&
-            this.intent.agentUserId(req.body.agent) !== principal.agentUserId
-          ) {
-            return {
-              status: 403,
-              body: { errcode: 'M_FORBIDDEN', error: 'token not scoped to this agent' },
-            };
-          }
-          await this.intent.setTyping(req.body.room_id, req.body.agent, req.body.typing);
-          return { status: 200, body: {} };
-        }
-        if (req.method === 'POST' && req.path === '/bridge/v1/provision/rooms') {
-          validateProvisionRoom(req.body);
-          const result = await this.intent.createRoom({
-            name: req.body.name,
-            alias: req.body.alias,
-            topic: req.body.topic,
-            invite: req.body.invite,
-            spaceId: req.body.space_id,
-          });
-          this.log(
-            `provisioned room ${result.roomId} (${req.body.name}) space_linked=${result.spaceLinked}`,
-          );
-          return {
-            status: 200,
-            body: {
-              room_id: result.roomId,
-              space_linked: result.spaceLinked,
-              ...(result.spaceError ? { space_error: result.spaceError } : {}),
-            },
-          };
-        }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        this.log(`bridge error ${req.method} ${req.path}: ${message}`);
-        return { status: 400, body: { error: message } };
-      }
-      // Explicit: never fall out of the authenticated bridge block, so future
-      // sub-paths cannot accidentally route around the auth guard above.
-      return { status: 405, body: { error: 'unsupported bridge method/path' } };
-    }
-
-    return { status: 404, body: { error: 'not found' } };
-  }
-}
--- a/apps/gateway/package.json
+++ b/apps/gateway/package.json
@@ -1,23 +1,9 @@
 {
-  "name": "@mosaicstack/gateway",
-  "version": "0.0.6",
-  "repository": {
-    "type": "git",
-    "url": "https://git.mosaicstack.dev/mosaicstack/stack.git",
-    "directory": "apps/gateway"
-  },
+  "name": "@mosaic/gateway",
+  "version": "0.0.0",
+  "private": true,
  "type": "module",
  "main": "dist/main.js",
-  "bin": {
-    "mosaic-gateway": "dist/main.js"
-  },
-  "files": [
-    "dist"
-  ],
-  "publishConfig": {
-    "registry": "https://git.mosaicstack.dev/api/packages/mosaicstack/npm/",
-    "access": "public"
-  },
  "scripts": {
    "build": "tsc",
    "dev": "tsx watch src/main.ts",
@@ -26,69 +12,52 @@
    "test": "vitest run --passWithNoTests"
  },
  "dependencies": {
-    "@anthropic-ai/sdk": "^0.80.0",
    "@fastify/helmet": "^13.0.2",
-    "@mariozechner/pi-ai": "^0.65.0",
-    "@mariozechner/pi-coding-agent": "^0.65.0",
+    "@mariozechner/pi-ai": "~0.57.1",
+    "@mariozechner/pi-coding-agent": "~0.57.1",
    "@modelcontextprotocol/sdk": "^1.27.1",
-    "@mosaicstack/agent": "workspace:^",
-    "@mosaicstack/auth": "workspace:^",
-    "@mosaicstack/brain": "workspace:^",
-    "@mosaicstack/config": "workspace:^",
-    "@mosaicstack/coord": "workspace:^",
-    "@mosaicstack/db": "workspace:^",
-    "@mosaicstack/discord-plugin": "workspace:^",
-    "@mosaicstack/log": "workspace:^",
-    "@mosaicstack/memory": "workspace:^",
-    "@mosaicstack/queue": "workspace:^",
-    "@mosaicstack/storage": "workspace:^",
-    "@mosaicstack/telegram-plugin": "workspace:^",
-    "@mosaicstack/types": "workspace:^",
+    "@mosaic/auth": "workspace:^",
+    "@mosaic/queue": "workspace:^",
+    "@mosaic/brain": "workspace:^",
+    "@mosaic/coord": "workspace:^",
+    "@mosaic/db": "workspace:^",
+    "@mosaic/discord-plugin": "workspace:^",
+    "@mosaic/log": "workspace:^",
+    "@mosaic/memory": "workspace:^",
+    "@mosaic/telegram-plugin": "workspace:^",
+    "@mosaic/types": "workspace:^",
    "@nestjs/common": "^11.0.0",
    "@nestjs/core": "^11.0.0",
    "@nestjs/platform-fastify": "^11.0.0",
    "@nestjs/platform-socket.io": "^11.0.0",
    "@nestjs/throttler": "^6.5.0",
    "@nestjs/websockets": "^11.0.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.72.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.71.0",
    "@opentelemetry/exporter-metrics-otlp-http": "^0.213.0",
    "@opentelemetry/exporter-trace-otlp-http": "^0.213.0",
    "@opentelemetry/resources": "^2.6.0",
    "@opentelemetry/sdk-metrics": "^2.6.0",
    "@opentelemetry/sdk-node": "^0.213.0",
    "@opentelemetry/semantic-conventions": "^1.40.0",
-    "@peculiar/x509": "^2.0.0",
    "@sinclair/typebox": "^0.34.48",
    "better-auth": "^1.5.5",
-    "bullmq": "^5.71.0",
    "class-transformer": "^0.5.1",
    "class-validator": "^0.15.1",
    "dotenv": "^17.3.1",
    "fastify": "^5.0.0",
-    "ioredis": "^5.10.0",
-    "jose": "^6.2.2",
    "node-cron": "^4.2.1",
-    "openai": "^6.32.0",
-    "postgres": "^3.4.8",
    "reflect-metadata": "^0.2.0",
    "rxjs": "^7.8.0",
    "socket.io": "^4.8.0",
    "uuid": "^11.0.0",
-    "undici": "^7.24.6",
    "zod": "^4.3.6"
  },
  "devDependencies": {
-    "@nestjs/testing": "^11.1.18",
-    "@swc/core": "^1.15.24",
-    "@swc/helpers": "^0.5.21",
    "@types/node": "^22.0.0",
    "@types/node-cron": "^3.0.11",
-    "@types/supertest": "^7.2.0",
    "@types/uuid": "^10.0.0",
-    "supertest": "^7.2.2",
    "tsx": "^4.0.0",
    "typescript": "^5.8.0",
-    "unplugin-swc": "^1.5.9",
    "vitest": "^2.0.0"
  }
 }
--- a/apps/gateway/src/tests/conversation-persistence.test.ts
+++ b/apps/gateway/src/tests/conversation-persistence.test.ts
@@ -1,605 +0,0 @@
-/**
- * Integration tests for conversation persistence and context resume (M1-008).
- *
- * Verifies the full flow end-to-end using in-memory mocks:
- * 1. User messages are persisted when sent via ChatGateway.
- * 2. Assistant responses are persisted with metadata on agent:end.
- * 3. Conversation history is loaded and injected into context on session resume.
- * 4. The search endpoint returns matching messages.
- */
-
-import { BadRequestException, NotFoundException } from '@nestjs/common';
-import { describe, expect, it, vi, beforeEach } from 'vitest';
-import type { ConversationHistoryMessage } from '../agent/agent.service.js';
-import { ConversationsController } from '../conversations/conversations.controller.js';
-import type { Message } from '@mosaicstack/brain';
-
-// ---------------------------------------------------------------------------
-// Shared test data
-// ---------------------------------------------------------------------------
-
-const USER_ID = 'user-test-001';
-const CONV_ID = 'conv-test-001';
-
-function makeConversation(overrides?: Record<string, unknown>) {
-  return {
-    id: CONV_ID,
-    userId: USER_ID,
-    title: null,
-    projectId: null,
-    archived: false,
-    createdAt: new Date('2026-01-01T00:00:00Z'),
-    updatedAt: new Date('2026-01-01T00:00:00Z'),
-    ...overrides,
-  };
-}
-
-function makeMessage(
-  role: 'user' | 'assistant' | 'system',
-  content: string,
-  overrides?: Record<string, unknown>,
-) {
-  return {
-    id: `msg-${role}-${Math.random().toString(36).slice(2)}`,
-    conversationId: CONV_ID,
-    role,
-    content,
-    metadata: null,
-    createdAt: new Date('2026-01-01T00:01:00Z'),
-    ...overrides,
-  };
-}
-
-// ---------------------------------------------------------------------------
-// Helper: build a mock ConversationsRepo
-// ---------------------------------------------------------------------------
-
-function createMockBrain(options?: {
-  conversation?: ReturnType<typeof makeConversation> | undefined;
-  messages?: ReturnType<typeof makeMessage>[];
-  searchResults?: Array<{
-    messageId: string;
-    conversationId: string;
-    conversationTitle: string | null;
-    role: 'user' | 'assistant' | 'system';
-    content: string;
-    createdAt: Date;
-  }>;
-}) {
-  const conversation = options?.conversation;
-  const messages = options?.messages ?? [];
-  const searchResults = options?.searchResults ?? [];
-
-  return {
-    conversations: {
-      findAll: vi.fn().mockResolvedValue(conversation ? [conversation] : []),
-      findById: vi.fn().mockResolvedValue(conversation),
-      create: vi.fn().mockResolvedValue(conversation ?? makeConversation()),
-      update: vi.fn().mockResolvedValue(conversation),
-      remove: vi.fn().mockResolvedValue(true),
-      findMessages: vi.fn().mockResolvedValue(messages),
-      addMessage: vi.fn().mockImplementation((data: unknown) => {
-        const d = data as {
-          conversationId: string;
-          role: 'user' | 'assistant' | 'system';
-          content: string;
-          metadata?: Record<string, unknown>;
-        };
-        return Promise.resolve(makeMessage(d.role, d.content, { metadata: d.metadata ?? null }));
-      }),
-      searchMessages: vi.fn().mockResolvedValue(searchResults),
-    },
-  };
-}
-
-// ---------------------------------------------------------------------------
-// 1. ConversationsRepo: addMessage persists user message
-// ---------------------------------------------------------------------------
-
-describe('ConversationsRepo.addMessage — user message persistence', () => {
-  it('persists a user message and returns the saved record', async () => {
-    const brain = createMockBrain({ conversation: makeConversation() });
-
-    const result = await brain.conversations.addMessage(
-      {
-        conversationId: CONV_ID,
-        role: 'user',
-        content: 'Hello, agent!',
-        metadata: { timestamp: '2026-01-01T00:01:00.000Z' },
-      },
-      USER_ID,
-    );
-
-    expect(brain.conversations.addMessage).toHaveBeenCalledOnce();
-    expect(result).toBeDefined();
-    expect(result!.role).toBe('user');
-    expect(result!.content).toBe('Hello, agent!');
-    expect(result!.conversationId).toBe(CONV_ID);
-  });
-
-  it('returns undefined when conversation does not belong to the user', async () => {
-    // Simulate the repo enforcement: ownership mismatch returns undefined
-    const brain = createMockBrain({ conversation: undefined });
-    brain.conversations.addMessage = vi.fn().mockResolvedValue(undefined);
-
-    const result = await brain.conversations.addMessage(
-      { conversationId: CONV_ID, role: 'user', content: 'Hello' },
-      'other-user',
-    );
-
-    expect(result).toBeUndefined();
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 2. ConversationsRepo.addMessage — assistant response with metadata
-// ---------------------------------------------------------------------------
-
-describe('ConversationsRepo.addMessage — assistant response metadata', () => {
-  it('persists assistant message with model, provider, tokens and toolCalls metadata', async () => {
-    const assistantMetadata = {
-      timestamp: '2026-01-01T00:02:00.000Z',
-      model: 'claude-3-5-sonnet-20241022',
-      provider: 'anthropic',
-      toolCalls: [
-        {
-          toolCallId: 'tc-001',
-          toolName: 'read_file',
-          args: { path: '/foo/bar.ts' },
-          isError: false,
-        },
-      ],
-      tokenUsage: {
-        input: 1000,
-        output: 250,
-        cacheRead: 0,
-        cacheWrite: 0,
-        total: 1250,
-      },
-    };
-
-    const brain = createMockBrain({ conversation: makeConversation() });
-
-    const result = await brain.conversations.addMessage(
-      {
-        conversationId: CONV_ID,
-        role: 'assistant',
-        content: 'Here is the file content you requested.',
-        metadata: assistantMetadata,
-      },
-      USER_ID,
-    );
-
-    expect(result).toBeDefined();
-    expect(result!.role).toBe('assistant');
-    expect(result!.content).toBe('Here is the file content you requested.');
-    expect(result!.metadata).toMatchObject({
-      model: 'claude-3-5-sonnet-20241022',
-      provider: 'anthropic',
-      tokenUsage: { input: 1000, output: 250, total: 1250 },
-    });
-    expect((result!.metadata as Record<string, unknown>)['toolCalls']).toHaveLength(1);
-    expect(
-      (
-        (result!.metadata as Record<string, unknown>)['toolCalls'] as Array<Record<string, unknown>>
-      )[0]!['toolName'],
-    ).toBe('read_file');
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 3. ChatGateway.loadConversationHistory — session resume loads history
-// ---------------------------------------------------------------------------
-
-describe('Conversation resume — history loading', () => {
-  it('maps DB messages to ConversationHistoryMessage shape', () => {
-    // Simulate what ChatGateway.loadConversationHistory does:
-    // convert DB Message rows to ConversationHistoryMessage for context injection.
-    const dbMessages = [
-      makeMessage('user', 'What is the capital of France?', {
-        createdAt: new Date('2026-01-01T00:01:00Z'),
-      }),
-      makeMessage('assistant', 'The capital of France is Paris.', {
-        createdAt: new Date('2026-01-01T00:01:05Z'),
-      }),
-      makeMessage('user', 'And Germany?', { createdAt: new Date('2026-01-01T00:02:00Z') }),
-      makeMessage('assistant', 'The capital of Germany is Berlin.', {
-        createdAt: new Date('2026-01-01T00:02:05Z'),
-      }),
-    ];
-
-    // Replicate the mapping logic from ChatGateway
-    const history: ConversationHistoryMessage[] = dbMessages.map((msg) => ({
-      role: msg.role as 'user' | 'assistant' | 'system',
-      content: msg.content,
-      createdAt: msg.createdAt,
-    }));
-
-    expect(history).toHaveLength(4);
-    expect(history[0]).toEqual({
-      role: 'user',
-      content: 'What is the capital of France?',
-      createdAt: new Date('2026-01-01T00:01:00Z'),
-    });
-    expect(history[1]).toEqual({
-      role: 'assistant',
-      content: 'The capital of France is Paris.',
-      createdAt: new Date('2026-01-01T00:01:05Z'),
-    });
-    expect(history[2]!.role).toBe('user');
-    expect(history[3]!.role).toBe('assistant');
-  });
-
-  it('returns empty array when conversation has no messages', async () => {
-    const brain = createMockBrain({ conversation: makeConversation(), messages: [] });
-
-    const messages = await brain.conversations.findMessages(CONV_ID, USER_ID);
-    expect(messages).toHaveLength(0);
-
-    // Gateway produces empty history → no context injection
-    const history: ConversationHistoryMessage[] = (messages as Message[]).map((msg) => ({
-      role: msg.role as 'user' | 'assistant' | 'system',
-      content: msg.content,
-      createdAt: msg.createdAt,
-    }));
-    expect(history).toHaveLength(0);
-  });
-
-  it('returns empty array when conversation does not belong to the user', async () => {
-    const brain = createMockBrain({ conversation: undefined });
-    brain.conversations.findMessages = vi.fn().mockResolvedValue([]);
-
-    const messages = await brain.conversations.findMessages(CONV_ID, 'other-user');
-    expect(messages).toHaveLength(0);
-  });
-
-  it('preserves message order (ascending by createdAt)', async () => {
-    const ordered = [
-      makeMessage('user', 'First', { createdAt: new Date('2026-01-01T00:01:00Z') }),
-      makeMessage('assistant', 'Second', { createdAt: new Date('2026-01-01T00:01:05Z') }),
-      makeMessage('user', 'Third', { createdAt: new Date('2026-01-01T00:02:00Z') }),
-    ];
-    const brain = createMockBrain({ conversation: makeConversation(), messages: ordered });
-
-    const messages = await brain.conversations.findMessages(CONV_ID, USER_ID);
-    expect(messages[0]!.content).toBe('First');
-    expect(messages[1]!.content).toBe('Second');
-    expect(messages[2]!.content).toBe('Third');
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 4. AgentService.buildHistoryPromptSection — context injection format
-// ---------------------------------------------------------------------------
-
-describe('AgentService — buildHistoryPromptSection (context injection)', () => {
-  /**
-   * Replicate the private method logic to test it in isolation.
-   * The real method lives in AgentService but is private; we mirror the
-   * exact logic here so the test is independent of the service's constructor.
-   */
-  function buildHistoryPromptSection(
-    history: ConversationHistoryMessage[],
-    contextWindow: number,
-    _sessionId: string,
-  ): string {
-    const TOKEN_BUDGET = Math.floor(contextWindow * 0.8);
-    const HISTORY_HEADER = '## Conversation History (resumed session)\n\n';
-
-    const formatMessage = (msg: ConversationHistoryMessage): string => {
-      const roleLabel =
-        msg.role === 'user' ? 'User' : msg.role === 'assistant' ? 'Assistant' : 'System';
-      return `**${roleLabel}:** ${msg.content}`;
-    };
-
-    const estimateTokens = (text: string) => Math.ceil(text.length / 4);
-
-    const formatted = history.map((msg) => formatMessage(msg));
-    const fullHistory = formatted.join('\n\n');
-    const fullTokens = estimateTokens(HISTORY_HEADER + fullHistory);
-
-    if (fullTokens <= TOKEN_BUDGET) {
-      return HISTORY_HEADER + fullHistory;
-    }
-
-    // History exceeds budget — summarize oldest messages, keep recent verbatim
-    const SUMMARY_RESERVE = Math.floor(TOKEN_BUDGET * 0.2);
-    const verbatimBudget = TOKEN_BUDGET - SUMMARY_RESERVE;
-
-    let verbatimTokens = 0;
-    let verbatimCutIndex = history.length;
-    for (let i = history.length - 1; i >= 0; i--) {
-      const t = estimateTokens(formatted[i]!);
-      if (verbatimTokens + t > verbatimBudget) break;
-      verbatimTokens += t;
-      verbatimCutIndex = i;
-    }
-
-    const summarizedMessages = history.slice(0, verbatimCutIndex);
-    const verbatimMessages = history.slice(verbatimCutIndex);
-
-    let summaryText = '';
-    if (summarizedMessages.length > 0) {
-      const topics = summarizedMessages
-        .filter((m) => m.role === 'user')
-        .map((m) => m.content.slice(0, 120).replace(/\n/g, ' '))
-        .join('; ');
-      summaryText =
-        `**Previous conversation summary** (${summarizedMessages.length} messages omitted for brevity):\n` +
-        `Topics discussed: ${topics || '(no user messages in summarized portion)'}`;
-    }
-
-    const verbatimSection = verbatimMessages.map((m) => formatMessage(m)).join('\n\n');
-
-    const parts: string[] = [HISTORY_HEADER];
-    if (summaryText) parts.push(summaryText);
-    if (verbatimSection) parts.push(verbatimSection);
-
-    return parts.join('\n\n');
-  }
-
-  it('includes header and all messages when history fits within context budget', () => {
-    const history: ConversationHistoryMessage[] = [
-      { role: 'user', content: 'Hello', createdAt: new Date() },
-      { role: 'assistant', content: 'Hi there!', createdAt: new Date() },
-    ];
-
-    const result = buildHistoryPromptSection(history, 8192, 'session-1');
-
-    expect(result).toContain('## Conversation History (resumed session)');
-    expect(result).toContain('**User:** Hello');
-    expect(result).toContain('**Assistant:** Hi there!');
-  });
-
-  it('labels roles correctly (user, assistant, system)', () => {
-    const history: ConversationHistoryMessage[] = [
-      { role: 'system', content: 'You are helpful.', createdAt: new Date() },
-      { role: 'user', content: 'Ping', createdAt: new Date() },
-      { role: 'assistant', content: 'Pong', createdAt: new Date() },
-    ];
-
-    const result = buildHistoryPromptSection(history, 8192, 'session-2');
-
-    expect(result).toContain('**System:** You are helpful.');
-    expect(result).toContain('**User:** Ping');
-    expect(result).toContain('**Assistant:** Pong');
-  });
-
-  it('summarizes old messages when history exceeds 80% of context window', () => {
-    // Create enough messages to exceed a tiny context window budget
-    const longContent = 'A'.repeat(200);
-    const history: ConversationHistoryMessage[] = Array.from({ length: 20 }, (_, i) => ({
-      role: (i % 2 === 0 ? 'user' : 'assistant') as 'user' | 'assistant',
-      content: `${longContent} message ${i}`,
-      createdAt: new Date(),
-    }));
-
-    // Use a small context window so history definitely exceeds 80%
-    const result = buildHistoryPromptSection(history, 512, 'session-3');
-
-    // Should contain the summary prefix
-    expect(result).toContain('messages omitted for brevity');
-    expect(result).toContain('Topics discussed:');
-  });
-
-  it('returns only header for empty history', () => {
-    const result = buildHistoryPromptSection([], 8192, 'session-4');
-    // With empty history, the full history join is '' and the section is just the header
-    expect(result).toContain('## Conversation History (resumed session)');
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 5. ConversationsController.search — GET /api/conversations/search
-// ---------------------------------------------------------------------------
-
-describe('ConversationsController — search endpoint', () => {
-  let brain: ReturnType<typeof createMockBrain>;
-  let controller: ConversationsController;
-
-  beforeEach(() => {
-    const searchResults = [
-      {
-        messageId: 'msg-001',
-        conversationId: CONV_ID,
-        conversationTitle: 'Test Chat',
-        role: 'user' as const,
-        content: 'What is the capital of France?',
-        createdAt: new Date('2026-01-01T00:01:00Z'),
-      },
-      {
-        messageId: 'msg-002',
-        conversationId: CONV_ID,
-        conversationTitle: 'Test Chat',
-        role: 'assistant' as const,
-        content: 'The capital of France is Paris.',
-        createdAt: new Date('2026-01-01T00:01:05Z'),
-      },
-    ];
-    brain = createMockBrain({ searchResults });
-    controller = new ConversationsController(brain as never);
-  });
-
-  it('returns matching messages for a valid search query', async () => {
-    const results = await controller.search({ q: 'France' }, { id: USER_ID });
-
-    expect(brain.conversations.searchMessages).toHaveBeenCalledWith(USER_ID, 'France', 20, 0);
-    expect(results).toHaveLength(2);
-    expect(results[0]).toMatchObject({
-      messageId: 'msg-001',
-      role: 'user',
-      content: 'What is the capital of France?',
-    });
-    expect(results[1]).toMatchObject({
-      messageId: 'msg-002',
-      role: 'assistant',
-      content: 'The capital of France is Paris.',
-    });
-  });
-
-  it('uses custom limit and offset when provided', async () => {
-    await controller.search({ q: 'Paris', limit: 5, offset: 10 }, { id: USER_ID });
-
-    expect(brain.conversations.searchMessages).toHaveBeenCalledWith(USER_ID, 'Paris', 5, 10);
-  });
-
-  it('throws BadRequestException when query is empty', async () => {
-    await expect(controller.search({ q: '' }, { id: USER_ID })).rejects.toBeInstanceOf(
-      BadRequestException,
-    );
-    await expect(controller.search({ q: '   ' }, { id: USER_ID })).rejects.toBeInstanceOf(
-      BadRequestException,
-    );
-  });
-
-  it('trims whitespace from query before passing to repo', async () => {
-    await controller.search({ q: '  Berlin  ' }, { id: USER_ID });
-
-    expect(brain.conversations.searchMessages).toHaveBeenCalledWith(
-      USER_ID,
-      'Berlin',
-      expect.any(Number),
-      expect.any(Number),
-    );
-  });
-
-  it('returns empty array when no messages match', async () => {
-    brain.conversations.searchMessages = vi.fn().mockResolvedValue([]);
-
-    const results = await controller.search({ q: 'xyzzy-no-match' }, { id: USER_ID });
-
-    expect(results).toHaveLength(0);
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 6. ConversationsController — messages CRUD
-// ---------------------------------------------------------------------------
-
-describe('ConversationsController — message CRUD', () => {
-  it('listMessages returns 404 when conversation is not owned by user', async () => {
-    const brain = createMockBrain({ conversation: undefined });
-    const controller = new ConversationsController(brain as never);
-
-    await expect(controller.listMessages(CONV_ID, { id: USER_ID })).rejects.toBeInstanceOf(
-      NotFoundException,
-    );
-  });
-
-  it('listMessages returns the messages for an owned conversation', async () => {
-    const msgs = [makeMessage('user', 'Test message'), makeMessage('assistant', 'Test reply')];
-    const brain = createMockBrain({ conversation: makeConversation(), messages: msgs });
-    const controller = new ConversationsController(brain as never);
-
-    const result = await controller.listMessages(CONV_ID, { id: USER_ID });
-
-    expect(result).toHaveLength(2);
-    expect(result[0]!.role).toBe('user');
-    expect(result[1]!.role).toBe('assistant');
-  });
-
-  it('addMessage returns the persisted message', async () => {
-    const brain = createMockBrain({ conversation: makeConversation() });
-    const controller = new ConversationsController(brain as never);
-
-    const result = await controller.addMessage(
-      CONV_ID,
-      { role: 'user', content: 'Persisted content' },
-      { id: USER_ID },
-    );
-
-    expect(result).toBeDefined();
-    expect(result.role).toBe('user');
-    expect(result.content).toBe('Persisted content');
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 7. End-to-end persistence flow simulation
-// ---------------------------------------------------------------------------
-
-describe('End-to-end persistence flow', () => {
-  it('simulates a full conversation: persist user message → persist assistant response → resume with history', async () => {
-    // ── Step 1: Conversation is created ────────────────────────────────────
-    const brain = createMockBrain({ conversation: makeConversation() });
-
-    await brain.conversations.create({ id: CONV_ID, userId: USER_ID });
-    expect(brain.conversations.create).toHaveBeenCalledOnce();
-
-    // ── Step 2: User message is persisted ──────────────────────────────────
-    const userMsg = await brain.conversations.addMessage(
-      {
-        conversationId: CONV_ID,
-        role: 'user',
-        content: 'Explain monads in simple terms.',
-        metadata: { timestamp: '2026-01-01T00:01:00.000Z' },
-      },
-      USER_ID,
-    );
-
-    expect(userMsg).toBeDefined();
-    expect(userMsg!.role).toBe('user');
-
-    // ── Step 3: Assistant response is persisted with metadata ───────────────
-    const assistantMeta = {
-      timestamp: '2026-01-01T00:01:10.000Z',
-      model: 'claude-3-5-sonnet-20241022',
-      provider: 'anthropic',
-      toolCalls: [],
-      tokenUsage: { input: 500, output: 120, cacheRead: 0, cacheWrite: 0, total: 620 },
-    };
-
-    const assistantMsg = await brain.conversations.addMessage(
-      {
-        conversationId: CONV_ID,
-        role: 'assistant',
-        content: 'A monad is a design pattern that wraps values in a context...',
-        metadata: assistantMeta,
-      },
-      USER_ID,
-    );
-
-    expect(assistantMsg).toBeDefined();
-    expect(assistantMsg!.role).toBe('assistant');
-
-    // ── Step 4: On session resume, history is loaded ────────────────────────
-    const storedMessages = [
-      makeMessage('user', 'Explain monads in simple terms.', {
-        createdAt: new Date('2026-01-01T00:01:00Z'),
-        metadata: { timestamp: '2026-01-01T00:01:00.000Z' },
-      }),
-      makeMessage('assistant', 'A monad is a design pattern that wraps values in a context...', {
-        createdAt: new Date('2026-01-01T00:01:10Z'),
-        metadata: assistantMeta,
-      }),
-    ];
-
-    brain.conversations.findMessages = vi.fn().mockResolvedValue(storedMessages);
-
-    const dbMessages = await brain.conversations.findMessages(CONV_ID, USER_ID);
-    expect(dbMessages).toHaveLength(2);
-
-    // ── Step 5: History is mapped for context injection ─────────────────────
-    const history: ConversationHistoryMessage[] = (dbMessages as Message[]).map((msg) => ({
-      role: msg.role as 'user' | 'assistant' | 'system',
-      content: msg.content,
-      createdAt: msg.createdAt,
-    }));
-
-    expect(history[0]).toMatchObject({
-      role: 'user',
-      content: 'Explain monads in simple terms.',
-    });
-    expect(history[1]).toMatchObject({
-      role: 'assistant',
-      content: 'A monad is a design pattern that wraps values in a context...',
-    });
-
-    // ── Step 6: History roles are valid for injection ───────────────────────
-    for (const msg of history) {
-      expect(['user', 'assistant', 'system']).toContain(msg.role);
-      expect(typeof msg.content).toBe('string');
-      expect(msg.createdAt).toBeInstanceOf(Date);
-    }
-  });
-});
--- a/apps/gateway/src/tests/cross-user-isolation.test.ts
+++ b/apps/gateway/src/tests/cross-user-isolation.test.ts
@@ -1,485 +0,0 @@
-/**
- * Integration test: Cross-user data isolation (M2-007)
- *
- * Verifies that every repository query path is scoped to the requesting user —
- * no user can read, write, or enumerate another user's records.
- *
- * Test strategy:
- *  - Two real users (User A, User B) are inserted directly into the database.
- *  - Realistic data (conversations + messages, agent configs, preferences,
- *    insights) is created for each user.
- *  - A shared system agent is inserted so both users can see it via
- *    findAccessible().
- *  - All assertions are made against the live database (no mocks).
- *  - All inserted rows are cleaned up in the afterAll hook.
- *
- * Requires: DATABASE_URL pointing at a running PostgreSQL instance with
- * pgvector enabled and the Mosaic schema already applied.
- */
-
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest';
-import { createDb } from '@mosaicstack/db';
-import { createConversationsRepo } from '@mosaicstack/brain';
-import { createAgentsRepo } from '@mosaicstack/brain';
-import { createPreferencesRepo, createInsightsRepo } from '@mosaicstack/memory';
-import { users, conversations, messages, agents, preferences, insights } from '@mosaicstack/db';
-import { eq } from '@mosaicstack/db';
-import type { DbHandle } from '@mosaicstack/db';
-
-// ─── Fixed IDs so the afterAll cleanup is deterministic ──────────────────────
-
-const USER_A_ID = 'test-iso-user-a';
-const USER_B_ID = 'test-iso-user-b';
-const CONV_A_ID = 'aaaaaaaa-0000-0000-0000-000000000001';
-const CONV_B_ID = 'bbbbbbbb-0000-0000-0000-000000000001';
-const MSG_A_ID = 'aaaaaaaa-0000-0000-0000-000000000002';
-const MSG_B_ID = 'bbbbbbbb-0000-0000-0000-000000000002';
-const AGENT_A_ID = 'aaaaaaaa-0000-0000-0000-000000000003';
-const AGENT_B_ID = 'bbbbbbbb-0000-0000-0000-000000000003';
-const AGENT_SYS_ID = 'ffffffff-0000-0000-0000-000000000001';
-const PREF_A_ID = 'aaaaaaaa-0000-0000-0000-000000000004';
-const PREF_B_ID = 'bbbbbbbb-0000-0000-0000-000000000004';
-const INSIGHT_A_ID = 'aaaaaaaa-0000-0000-0000-000000000005';
-const INSIGHT_B_ID = 'bbbbbbbb-0000-0000-0000-000000000005';
-
-// ─── Test fixture ─────────────────────────────────────────────────────────────
-
-let handle: DbHandle;
-let dbAvailable = false;
-
-beforeAll(async () => {
-  try {
-    handle = createDb();
-    const db = handle.db;
-
-    // Insert two users
-    await db
-      .insert(users)
-      .values([
-        {
-          id: USER_A_ID,
-          name: 'Isolation Test User A',
-          email: 'test-iso-user-a@example.invalid',
-          emailVerified: false,
-        },
-        {
-          id: USER_B_ID,
-          name: 'Isolation Test User B',
-          email: 'test-iso-user-b@example.invalid',
-          emailVerified: false,
-        },
-      ])
-      .onConflictDoNothing();
-
-    // Conversations — one per user
-    await db
-      .insert(conversations)
-      .values([
-        { id: CONV_A_ID, userId: USER_A_ID, title: 'User A conversation' },
-        { id: CONV_B_ID, userId: USER_B_ID, title: 'User B conversation' },
-      ])
-      .onConflictDoNothing();
-
-    // Messages — one per conversation
-    await db
-      .insert(messages)
-      .values([
-        {
-          id: MSG_A_ID,
-          conversationId: CONV_A_ID,
-          role: 'user',
-          content: 'Hello from User A',
-        },
-        {
-          id: MSG_B_ID,
-          conversationId: CONV_B_ID,
-          role: 'user',
-          content: 'Hello from User B',
-        },
-      ])
-      .onConflictDoNothing();
-
-    // Agent configs — private agents (one per user) + one system agent
-    await db
-      .insert(agents)
-      .values([
-        {
-          id: AGENT_A_ID,
-          name: 'Agent A (private)',
-          provider: 'test',
-          model: 'test-model',
-          ownerId: USER_A_ID,
-          isSystem: false,
-        },
-        {
-          id: AGENT_B_ID,
-          name: 'Agent B (private)',
-          provider: 'test',
-          model: 'test-model',
-          ownerId: USER_B_ID,
-          isSystem: false,
-        },
-        {
-          id: AGENT_SYS_ID,
-          name: 'Shared System Agent',
-          provider: 'test',
-          model: 'test-model',
-          ownerId: null,
-          isSystem: true,
-        },
-      ])
-      .onConflictDoNothing();
-
-    // Preferences — one per user (same key, different values)
-    await db
-      .insert(preferences)
-      .values([
-        {
-          id: PREF_A_ID,
-          userId: USER_A_ID,
-          key: 'theme',
-          value: 'dark',
-          category: 'appearance',
-        },
-        {
-          id: PREF_B_ID,
-          userId: USER_B_ID,
-          key: 'theme',
-          value: 'light',
-          category: 'appearance',
-        },
-      ])
-      .onConflictDoNothing();
-
-    // Insights — no embedding to keep the fixture simple; embedding-based search
-    // is tested separately with a zero-vector that falls outside maxDistance
-    await db
-      .insert(insights)
-      .values([
-        {
-          id: INSIGHT_A_ID,
-          userId: USER_A_ID,
-          content: 'User A insight',
-          source: 'user',
-          category: 'general',
-          relevanceScore: 1.0,
-        },
-        {
-          id: INSIGHT_B_ID,
-          userId: USER_B_ID,
-          content: 'User B insight',
-          source: 'user',
-          category: 'general',
-          relevanceScore: 1.0,
-        },
-      ])
-      .onConflictDoNothing();
-
-    dbAvailable = true;
-  } catch {
-    // Database is not reachable (e.g., CI environment without Postgres on port 5433).
-    // All tests in this suite will be skipped.
-  }
-});
-
-// Skip all tests in this file when the database is not reachable (e.g., CI without Postgres).
-beforeEach((ctx) => {
-  if (!dbAvailable) {
-    ctx.skip();
-  }
-});
-
-afterAll(async () => {
-  if (!handle) return;
-  const db = handle.db;
-
-  // Delete in dependency order (FK constraints)
-  await db.delete(messages).where(eq(messages.id, MSG_A_ID));
-  await db.delete(messages).where(eq(messages.id, MSG_B_ID));
-  await db.delete(conversations).where(eq(conversations.id, CONV_A_ID));
-  await db.delete(conversations).where(eq(conversations.id, CONV_B_ID));
-  await db.delete(agents).where(eq(agents.id, AGENT_A_ID));
-  await db.delete(agents).where(eq(agents.id, AGENT_B_ID));
-  await db.delete(agents).where(eq(agents.id, AGENT_SYS_ID));
-  await db.delete(preferences).where(eq(preferences.id, PREF_A_ID));
-  await db.delete(preferences).where(eq(preferences.id, PREF_B_ID));
-  await db.delete(insights).where(eq(insights.id, INSIGHT_A_ID));
-  await db.delete(insights).where(eq(insights.id, INSIGHT_B_ID));
-  await db.delete(users).where(eq(users.id, USER_A_ID));
-  await db.delete(users).where(eq(users.id, USER_B_ID));
-
-  await handle.close();
-});
-
-// ─── Conversations isolation ──────────────────────────────────────────────────
-
-describe('ConversationsRepo — cross-user isolation', () => {
-  it('User A can find their own conversation by id', async () => {
-    const repo = createConversationsRepo(handle.db);
-    const conv = await repo.findById(CONV_A_ID, USER_A_ID);
-    expect(conv).toBeDefined();
-    expect(conv!.id).toBe(CONV_A_ID);
-  });
-
-  it('User B cannot find User A conversation by id (returns undefined)', async () => {
-    const repo = createConversationsRepo(handle.db);
-    const conv = await repo.findById(CONV_A_ID, USER_B_ID);
-    expect(conv).toBeUndefined();
-  });
-
-  it('User A cannot find User B conversation by id (returns undefined)', async () => {
-    const repo = createConversationsRepo(handle.db);
-    const conv = await repo.findById(CONV_B_ID, USER_A_ID);
-    expect(conv).toBeUndefined();
-  });
-
-  it('findAll returns only own conversations for User A', async () => {
-    const repo = createConversationsRepo(handle.db);
-    const convs = await repo.findAll(USER_A_ID);
-    const ids = convs.map((c) => c.id);
-    expect(ids).toContain(CONV_A_ID);
-    expect(ids).not.toContain(CONV_B_ID);
-  });
-
-  it('findAll returns only own conversations for User B', async () => {
-    const repo = createConversationsRepo(handle.db);
-    const convs = await repo.findAll(USER_B_ID);
-    const ids = convs.map((c) => c.id);
-    expect(ids).toContain(CONV_B_ID);
-    expect(ids).not.toContain(CONV_A_ID);
-  });
-});
-
-// ─── Messages isolation ───────────────────────────────────────────────────────
-
-describe('ConversationsRepo.findMessages — cross-user isolation', () => {
-  it('User A can read messages from their own conversation', async () => {
-    const repo = createConversationsRepo(handle.db);
-    const msgs = await repo.findMessages(CONV_A_ID, USER_A_ID);
-    const ids = msgs.map((m) => m.id);
-    expect(ids).toContain(MSG_A_ID);
-  });
-
-  it('User B cannot read messages from User A conversation (returns empty array)', async () => {
-    const repo = createConversationsRepo(handle.db);
-    const msgs = await repo.findMessages(CONV_A_ID, USER_B_ID);
-    expect(msgs).toHaveLength(0);
-  });
-
-  it('User A cannot read messages from User B conversation (returns empty array)', async () => {
-    const repo = createConversationsRepo(handle.db);
-    const msgs = await repo.findMessages(CONV_B_ID, USER_A_ID);
-    expect(msgs).toHaveLength(0);
-  });
-
-  it('addMessage is rejected when user does not own the conversation', async () => {
-    const repo = createConversationsRepo(handle.db);
-    const result = await repo.addMessage(
-      {
-        conversationId: CONV_A_ID,
-        role: 'user',
-        content: 'Attempted injection by User B',
-      },
-      USER_B_ID,
-    );
-    expect(result).toBeUndefined();
-  });
-});
-
-// ─── Agent configs isolation ──────────────────────────────────────────────────
-
-describe('AgentsRepo.findAccessible — cross-user isolation', () => {
-  it('User A sees their own private agent', async () => {
-    const repo = createAgentsRepo(handle.db);
-    const accessible = await repo.findAccessible(USER_A_ID);
-    const ids = accessible.map((a) => a.id);
-    expect(ids).toContain(AGENT_A_ID);
-  });
-
-  it('User A does NOT see User B private agent', async () => {
-    const repo = createAgentsRepo(handle.db);
-    const accessible = await repo.findAccessible(USER_A_ID);
-    const ids = accessible.map((a) => a.id);
-    expect(ids).not.toContain(AGENT_B_ID);
-  });
-
-  it('User B does NOT see User A private agent', async () => {
-    const repo = createAgentsRepo(handle.db);
-    const accessible = await repo.findAccessible(USER_B_ID);
-    const ids = accessible.map((a) => a.id);
-    expect(ids).not.toContain(AGENT_A_ID);
-  });
-
-  it('Both users can see the shared system agent', async () => {
-    const repo = createAgentsRepo(handle.db);
-    const accessibleA = await repo.findAccessible(USER_A_ID);
-    const accessibleB = await repo.findAccessible(USER_B_ID);
-    expect(accessibleA.map((a) => a.id)).toContain(AGENT_SYS_ID);
-    expect(accessibleB.map((a) => a.id)).toContain(AGENT_SYS_ID);
-  });
-
-  it('findSystem returns the system agent for any caller', async () => {
-    const repo = createAgentsRepo(handle.db);
-    const system = await repo.findSystem();
-    const ids = system.map((a) => a.id);
-    expect(ids).toContain(AGENT_SYS_ID);
-  });
-
-  it('update with ownerId prevents User B from modifying User A agent', async () => {
-    const repo = createAgentsRepo(handle.db);
-    const result = await repo.update(AGENT_A_ID, { model: 'hacked' }, USER_B_ID);
-    expect(result).toBeUndefined();
-
-    // Verify the agent was not actually mutated
-    const unchanged = await repo.findById(AGENT_A_ID);
-    expect(unchanged?.model).toBe('test-model');
-  });
-
-  it('remove prevents User B from deleting User A agent', async () => {
-    const repo = createAgentsRepo(handle.db);
-    const deleted = await repo.remove(AGENT_A_ID, USER_B_ID);
-    expect(deleted).toBe(false);
-
-    // Verify the agent still exists
-    const still = await repo.findById(AGENT_A_ID);
-    expect(still).toBeDefined();
-  });
-});
-
-// ─── Preferences isolation ────────────────────────────────────────────────────
-
-describe('PreferencesRepo — cross-user isolation', () => {
-  it('User A can retrieve their own preferences', async () => {
-    const repo = createPreferencesRepo(handle.db);
-    const prefs = await repo.findByUser(USER_A_ID);
-    const ids = prefs.map((p) => p.id);
-    expect(ids).toContain(PREF_A_ID);
-  });
-
-  it('User A preferences do not contain User B preferences', async () => {
-    const repo = createPreferencesRepo(handle.db);
-    const prefs = await repo.findByUser(USER_A_ID);
-    const ids = prefs.map((p) => p.id);
-    expect(ids).not.toContain(PREF_B_ID);
-  });
-
-  it('User B preferences do not contain User A preferences', async () => {
-    const repo = createPreferencesRepo(handle.db);
-    const prefs = await repo.findByUser(USER_B_ID);
-    const ids = prefs.map((p) => p.id);
-    expect(ids).not.toContain(PREF_A_ID);
-  });
-
-  it('findByUserAndKey is scoped to the requesting user', async () => {
-    const repo = createPreferencesRepo(handle.db);
-    // Both users have key "theme" — each should only see their own value
-    const prefA = await repo.findByUserAndKey(USER_A_ID, 'theme');
-    const prefB = await repo.findByUserAndKey(USER_B_ID, 'theme');
-
-    expect(prefA).toBeDefined();
-    // Drizzle returns JSONB values as parsed JS values; '"dark"' (JSON string) → 'dark'
-    expect(prefA!.value).toBe('dark');
-    expect(prefB).toBeDefined();
-    expect(prefB!.value).toBe('light');
-  });
-
-  it('remove is scoped to the requesting user (cannot delete another user pref)', async () => {
-    const repo = createPreferencesRepo(handle.db);
-    // User B tries to delete User A's "theme" preference — should silently fail
-    const deleted = await repo.remove(USER_B_ID, 'theme');
-    // This only deletes USER_B's own "theme" row; re-insert it for afterAll cleanup
-    expect(deleted).toBe(true); // deletes User B's OWN theme pref
-
-    // User A's theme pref must be untouched
-    const prefA = await repo.findByUserAndKey(USER_A_ID, 'theme');
-    expect(prefA).toBeDefined();
-
-    // Re-insert User B's preference so afterAll cleanup still finds it
-    await repo.upsert({
-      id: PREF_B_ID,
-      userId: USER_B_ID,
-      key: 'theme',
-      value: 'light',
-      category: 'appearance',
-    });
-  });
-});
-
-// ─── Insights isolation ───────────────────────────────────────────────────────
-
-describe('InsightsRepo — cross-user isolation', () => {
-  it('User A can retrieve their own insights', async () => {
-    const repo = createInsightsRepo(handle.db);
-    const list = await repo.findByUser(USER_A_ID);
-    const ids = list.map((i) => i.id);
-    expect(ids).toContain(INSIGHT_A_ID);
-  });
-
-  it('User A insights do not contain User B insights', async () => {
-    const repo = createInsightsRepo(handle.db);
-    const list = await repo.findByUser(USER_A_ID);
-    const ids = list.map((i) => i.id);
-    expect(ids).not.toContain(INSIGHT_B_ID);
-  });
-
-  it('User B insights do not contain User A insights', async () => {
-    const repo = createInsightsRepo(handle.db);
-    const list = await repo.findByUser(USER_B_ID);
-    const ids = list.map((i) => i.id);
-    expect(ids).not.toContain(INSIGHT_A_ID);
-  });
-
-  it('findById is scoped to the requesting user', async () => {
-    const repo = createInsightsRepo(handle.db);
-    const own = await repo.findById(INSIGHT_A_ID, USER_A_ID);
-    const cross = await repo.findById(INSIGHT_A_ID, USER_B_ID);
-
-    expect(own).toBeDefined();
-    expect(cross).toBeUndefined();
-  });
-
-  it('searchByEmbedding returns only own insights', async () => {
-    const repo = createInsightsRepo(handle.db);
-    // Our test insights have no embedding — the query filters WHERE embedding IS NOT NULL
-    // so the result set is empty, which already proves no cross-user leakage.
-    // Using a 1536-dimension zero vector as the query embedding.
-    const zeroVector = Array<number>(1536).fill(0);
-
-    const resultsA = await repo.searchByEmbedding(USER_A_ID, zeroVector, 50, 2.0);
-    const resultsB = await repo.searchByEmbedding(USER_B_ID, zeroVector, 50, 2.0);
-
-    // The raw SQL query returns row objects directly (not wrapped in { insight }).
-    // Cast via unknown to extract id safely regardless of the return shape.
-    const toId = (r: unknown): string =>
-      ((r as Record<string, unknown>)['id'] as string | undefined) ??
-      ((r as Record<string, Record<string, unknown>>)['insight']?.['id'] as string | undefined) ??
-      '';
-    const idsInA = resultsA.map(toId);
-    const idsInB = resultsB.map(toId);
-
-    // User B's insight must never appear in User A's search results
-    expect(idsInA).not.toContain(INSIGHT_B_ID);
-    // User A's insight must never appear in User B's search results
-    expect(idsInB).not.toContain(INSIGHT_A_ID);
-  });
-
-  it('update is scoped to the requesting user', async () => {
-    const repo = createInsightsRepo(handle.db);
-    const result = await repo.update(INSIGHT_A_ID, USER_B_ID, { content: 'hacked' });
-    expect(result).toBeUndefined();
-
-    // Verify the insight was not mutated
-    const unchanged = await repo.findById(INSIGHT_A_ID, USER_A_ID);
-    expect(unchanged?.content).toBe('User A insight');
-  });
-
-  it('remove is scoped to the requesting user', async () => {
-    const repo = createInsightsRepo(handle.db);
-    const deleted = await repo.remove(INSIGHT_A_ID, USER_B_ID);
-    expect(deleted).toBe(false);
-
-    // Verify the insight still exists
-    const still = await repo.findById(INSIGHT_A_ID, USER_A_ID);
-    expect(still).toBeDefined();
-  });
-});
--- a/apps/gateway/src/tests/integration/federated-boot.pg-unreachable.integration.test.ts
+++ b/apps/gateway/src/tests/integration/federated-boot.pg-unreachable.integration.test.ts
@@ -1,64 +0,0 @@
-/**
- * Test B — Gateway boot refuses (fail-fast) when PG is unreachable.
- *
- * Prereq: docker compose -f docker-compose.federated.yml --profile federated up -d
- *         (Valkey must be running; only PG is intentionally misconfigured.)
- * Run:    FEDERATED_INTEGRATION=1 pnpm --filter @mosaicstack/gateway test src/__tests__/integration/federated-boot.pg-unreachable.integration.test.ts
- *
- * Skipped when FEDERATED_INTEGRATION !== '1'.
- */
-
-import net from 'node:net';
-import { beforeAll, describe, expect, it } from 'vitest';
-import { TierDetectionError, detectAndAssertTier } from '@mosaicstack/storage';
-
-const run = process.env['FEDERATED_INTEGRATION'] === '1';
-
-const VALKEY_URL = 'redis://localhost:6380';
-
-/**
- * Reserves a guaranteed-closed port at runtime by binding to an ephemeral OS
- * port (port 0) and immediately releasing it. The OS will not reassign the
- * port during the TIME_WAIT window, so it remains closed for the duration of
- * this test.
- */
-async function reserveClosedPort(): Promise<number> {
-  return new Promise((resolve, reject) => {
-    const server = net.createServer();
-    server.listen(0, '127.0.0.1', () => {
-      const addr = server.address();
-      if (typeof addr !== 'object' || !addr) return reject(new Error('no addr'));
-      const port = addr.port;
-      server.close(() => resolve(port));
-    });
-    server.on('error', reject);
-  });
-}
-
-describe.skipIf(!run)('federated boot — PG unreachable', () => {
-  let badPgUrl: string;
-
-  beforeAll(async () => {
-    const closedPort = await reserveClosedPort();
-    badPgUrl = `postgresql://mosaic:mosaic@localhost:${closedPort}/mosaic`;
-  });
-
-  it('detectAndAssertTier throws TierDetectionError with service: postgres when PG is down', async () => {
-    const brokenConfig = {
-      tier: 'federated' as const,
-      storage: {
-        type: 'postgres' as const,
-        url: badPgUrl,
-        enableVector: true,
-      },
-      queue: {
-        type: 'bullmq',
-        url: VALKEY_URL,
-      },
-    };
-
-    await expect(detectAndAssertTier(brokenConfig)).rejects.toSatisfy(
-      (err: unknown) => err instanceof TierDetectionError && err.service === 'postgres',
-    );
-  }, 10_000);
-});
--- a/apps/gateway/src/tests/integration/federated-boot.success.integration.test.ts
+++ b/apps/gateway/src/tests/integration/federated-boot.success.integration.test.ts
@@ -1,50 +0,0 @@
-/**
- * Test A — Gateway boot succeeds when federated services are up.
- *
- * Prereq: docker compose -f docker-compose.federated.yml --profile federated up -d
- * Run:    FEDERATED_INTEGRATION=1 pnpm --filter @mosaicstack/gateway test src/__tests__/integration/federated-boot.success.integration.test.ts
- *
- * Skipped when FEDERATED_INTEGRATION !== '1'.
- */
-
-import postgres from 'postgres';
-import { afterAll, describe, expect, it } from 'vitest';
-import { detectAndAssertTier } from '@mosaicstack/storage';
-
-const run = process.env['FEDERATED_INTEGRATION'] === '1';
-
-const PG_URL = 'postgresql://mosaic:mosaic@localhost:5433/mosaic';
-const VALKEY_URL = 'redis://localhost:6380';
-
-const federatedConfig = {
-  tier: 'federated' as const,
-  storage: {
-    type: 'postgres' as const,
-    url: PG_URL,
-    enableVector: true,
-  },
-  queue: {
-    type: 'bullmq',
-    url: VALKEY_URL,
-  },
-};
-
-describe.skipIf(!run)('federated boot — success path', () => {
-  let sql: ReturnType<typeof postgres> | undefined;
-
-  afterAll(async () => {
-    if (sql) {
-      await sql.end({ timeout: 2 }).catch(() => {});
-    }
-  });
-
-  it('detectAndAssertTier resolves without throwing when federated services are up', async () => {
-    await expect(detectAndAssertTier(federatedConfig)).resolves.toBeUndefined();
-  }, 10_000);
-
-  it('pgvector extension is registered (pg_extension row exists)', async () => {
-    sql = postgres(PG_URL, { max: 1, connect_timeout: 5, idle_timeout: 5 });
-    const rows = await sql`SELECT * FROM pg_extension WHERE extname = 'vector'`;
-    expect(rows).toHaveLength(1);
-  }, 10_000);
-});
--- a/apps/gateway/src/tests/integration/federated-pgvector.integration.test.ts
+++ b/apps/gateway/src/tests/integration/federated-pgvector.integration.test.ts
@@ -1,43 +0,0 @@
-/**
- * Test C — pgvector extension is functional end-to-end.
- *
- * Creates a temp table with a vector(3) column, inserts a row, and queries it
- * back — confirming the extension is not just registered but operational.
- *
- * Prereq: docker compose -f docker-compose.federated.yml --profile federated up -d
- * Run:    FEDERATED_INTEGRATION=1 pnpm --filter @mosaicstack/gateway test src/__tests__/integration/federated-pgvector.integration.test.ts
- *
- * Skipped when FEDERATED_INTEGRATION !== '1'.
- */
-
-import postgres from 'postgres';
-import { afterAll, describe, expect, it } from 'vitest';
-
-const run = process.env['FEDERATED_INTEGRATION'] === '1';
-
-const PG_URL = 'postgresql://mosaic:mosaic@localhost:5433/mosaic';
-
-let sql: ReturnType<typeof postgres> | undefined;
-
-afterAll(async () => {
-  if (sql) {
-    await sql.end({ timeout: 2 }).catch(() => {});
-  }
-});
-
-describe.skipIf(!run)('federated pgvector — functional end-to-end', () => {
-  it('vector ops round-trip: INSERT [1,2,3] and SELECT returns [1,2,3]', async () => {
-    sql = postgres(PG_URL, { max: 1, connect_timeout: 5, idle_timeout: 5 });
-
-    await sql`CREATE TEMP TABLE t (id int, embedding vector(3))`;
-    await sql`INSERT INTO t VALUES (1, '[1,2,3]')`;
-    const rows = await sql`SELECT embedding FROM t`;
-
-    expect(rows).toHaveLength(1);
-    // The postgres driver returns vector columns as strings like '[1,2,3]'.
-    // Normalise by parsing the string representation.
-    const raw = rows[0]?.['embedding'] as string;
-    const parsed = JSON.parse(raw) as number[];
-    expect(parsed).toEqual([1, 2, 3]);
-  }, 10_000);
-});
--- a/apps/gateway/src/tests/integration/federation-m2-e2e.integration.test.ts
+++ b/apps/gateway/src/tests/integration/federation-m2-e2e.integration.test.ts
@@ -1,243 +0,0 @@
-/**
- * Federation M2 E2E test — peer-add enrollment flow (FED-M2-10).
- *
- * Covers MILESTONES.md acceptance test #6:
- *   "`peer add <url>` on Server A yields an `active` peer record with a valid cert + key"
- *
- * This test simulates two gateways using a single bootstrapped NestJS app:
- *   - "Server A": the admin API that generates a keypair and stores the cert
- *   - "Server B": the enrollment endpoint that signs the CSR
- *   Both share the same DB + Step-CA in the test environment.
- *
- * Prerequisites:
- *   docker compose -f docker-compose.federated.yml --profile federated up -d
- *
- * Run:
- *   FEDERATED_INTEGRATION=1 STEP_CA_AVAILABLE=1 \
- *   STEP_CA_URL=https://localhost:9000 \
- *   STEP_CA_PROVISIONER_KEY_JSON="$(docker exec $(docker ps -qf name=step-ca) cat /home/step/secrets/mosaic-fed.json)" \
- *   STEP_CA_ROOT_CERT_PATH=/tmp/step-ca-root.crt \
- *   pnpm --filter @mosaicstack/gateway test \
- *     src/__tests__/integration/federation-m2-e2e.integration.test.ts
- *
- * Obtaining Step-CA credentials:
- *   # Extract provisioner key from running container:
- *   #   docker exec $(docker ps -qf name=step-ca) cat /home/step/secrets/mosaic-fed.json
- *   # Copy root cert from container:
- *   #   docker cp $(docker ps -qf name=step-ca):/home/step/certs/root_ca.crt /tmp/step-ca-root.crt
- *   # Then: export STEP_CA_ROOT_CERT_PATH=/tmp/step-ca-root.crt
- *
- * Skipped unless both FEDERATED_INTEGRATION=1 and STEP_CA_AVAILABLE=1 are set.
- */
-
-import * as crypto from 'node:crypto';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-import { Test } from '@nestjs/testing';
-import { ValidationPipe } from '@nestjs/common';
-import { FastifyAdapter, type NestFastifyApplication } from '@nestjs/platform-fastify';
-import supertest from 'supertest';
-import {
-  createDb,
-  type Db,
-  type DbHandle,
-  federationPeers,
-  federationGrants,
-  federationEnrollmentTokens,
-  inArray,
-  eq,
-} from '@mosaicstack/db';
-import * as schema from '@mosaicstack/db';
-import { DB } from '../../database/database.module.js';
-import { AdminGuard } from '../../admin/admin.guard.js';
-import { FederationModule } from '../../federation/federation.module.js';
-import { GrantsService } from '../../federation/grants.service.js';
-import { EnrollmentService } from '../../federation/enrollment.service.js';
-
-const run = process.env['FEDERATED_INTEGRATION'] === '1';
-const stepCaRun =
-  run &&
-  process.env['STEP_CA_AVAILABLE'] === '1' &&
-  !!process.env['STEP_CA_URL'] &&
-  !!process.env['STEP_CA_PROVISIONER_KEY_JSON'] &&
-  !!process.env['STEP_CA_ROOT_CERT_PATH'];
-
-const PG_URL = 'postgresql://mosaic:mosaic@localhost:5433/mosaic';
-
-const RUN_ID = crypto.randomUUID();
-
-describe.skipIf(!stepCaRun)('federation M2 E2E — peer add enrollment flow', () => {
-  let handle: DbHandle;
-  let db: Db;
-  let app: NestFastifyApplication;
-  let agent: ReturnType<typeof supertest>;
-  let grantsService: GrantsService;
-  let enrollmentService: EnrollmentService;
-
-  const createdTokenGrantIds: string[] = [];
-  const createdGrantIds: string[] = [];
-  const createdPeerIds: string[] = [];
-  const createdUserIds: string[] = [];
-
-  beforeAll(async () => {
-    process.env['BETTER_AUTH_SECRET'] ??= 'test-e2e-sealing-key';
-
-    handle = createDb(PG_URL);
-    db = handle.db;
-
-    const moduleRef = await Test.createTestingModule({
-      imports: [FederationModule],
-      providers: [{ provide: DB, useValue: db }],
-    })
-      .overrideGuard(AdminGuard)
-      .useValue({ canActivate: () => true })
-      .compile();
-
-    app = moduleRef.createNestApplication<NestFastifyApplication>(new FastifyAdapter());
-    app.useGlobalPipes(new ValidationPipe({ whitelist: true, transform: true }));
-    await app.init();
-    await app.getHttpAdapter().getInstance().ready();
-
-    agent = supertest(app.getHttpServer());
-
-    grantsService = moduleRef.get(GrantsService);
-    enrollmentService = moduleRef.get(EnrollmentService);
-  }, 30_000);
-
-  afterAll(async () => {
-    if (db && createdTokenGrantIds.length > 0) {
-      await db
-        .delete(federationEnrollmentTokens)
-        .where(inArray(federationEnrollmentTokens.grantId, createdTokenGrantIds))
-        .catch((e: unknown) => console.error('[federation-m2-e2e cleanup]', e));
-    }
-    if (db && createdGrantIds.length > 0) {
-      await db
-        .delete(federationGrants)
-        .where(inArray(federationGrants.id, createdGrantIds))
-        .catch((e: unknown) => console.error('[federation-m2-e2e cleanup]', e));
-    }
-    if (db && createdPeerIds.length > 0) {
-      await db
-        .delete(federationPeers)
-        .where(inArray(federationPeers.id, createdPeerIds))
-        .catch((e: unknown) => console.error('[federation-m2-e2e cleanup]', e));
-    }
-    if (db && createdUserIds.length > 0) {
-      await db
-        .delete(schema.users)
-        .where(inArray(schema.users.id, createdUserIds))
-        .catch((e: unknown) => console.error('[federation-m2-e2e cleanup]', e));
-    }
-    if (app)
-      await app.close().catch((e: unknown) => console.error('[federation-m2-e2e cleanup]', e));
-    if (handle)
-      await handle.close().catch((e: unknown) => console.error('[federation-m2-e2e cleanup]', e));
-  });
-
-  // -------------------------------------------------------------------------
-  // #6 — peer add: keypair → enrollment → cert storage → active peer record
-  // -------------------------------------------------------------------------
-  it('#6 — peer add flow: keypair → enrollment → cert storage → active peer record', async () => {
-    // Create a subject user to satisfy FK on federation_grants.subject_user_id
-    const userId = crypto.randomUUID();
-    await db
-      .insert(schema.users)
-      .values({
-        id: userId,
-        name: `e2e-user-${RUN_ID}`,
-        email: `e2e-${RUN_ID}@federation-test.invalid`,
-        emailVerified: false,
-      })
-      .onConflictDoNothing();
-    createdUserIds.push(userId);
-
-    // ── Step A: "Server B" setup ─────────────────────────────────────────
-    // Server B admin creates a grant and generates an enrollment token to
-    // share out-of-band with Server A's operator.
-
-    // Insert a placeholder peer on "Server B" to satisfy the grant FK
-    const serverBPeerId = crypto.randomUUID();
-    await db
-      .insert(federationPeers)
-      .values({
-        id: serverBPeerId,
-        commonName: `server-b-peer-${RUN_ID}`,
-        displayName: 'Server B Placeholder',
-        certPem: '-----BEGIN CERTIFICATE-----\nMOCK\n-----END CERTIFICATE-----\n',
-        certSerial: `serial-b-${serverBPeerId}`,
-        certNotAfter: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000),
-        state: 'pending',
-      })
-      .onConflictDoNothing();
-    createdPeerIds.push(serverBPeerId);
-
-    const grant = await grantsService.createGrant({
-      subjectUserId: userId,
-      scope: { resources: ['tasks'], excluded_resources: [], max_rows_per_query: 100 },
-      peerId: serverBPeerId,
-    });
-    createdGrantIds.push(grant.id);
-    createdTokenGrantIds.push(grant.id);
-
-    const { token } = await enrollmentService.createToken({
-      grantId: grant.id,
-      peerId: serverBPeerId,
-      ttlSeconds: 900,
-    });
-
-    // ── Step B: "Server A" generates keypair ─────────────────────────────
-    const keypairRes = await agent
-      .post('/api/admin/federation/peers/keypair')
-      .send({
-        commonName: `e2e-peer-${RUN_ID.slice(0, 8)}`,
-        displayName: 'E2E Test Peer',
-        endpointUrl: 'https://test.invalid',
-      })
-      .set('Content-Type', 'application/json');
-
-    expect(keypairRes.status).toBe(201);
-    const { peerId, csrPem } = keypairRes.body as { peerId: string; csrPem: string };
-    expect(typeof peerId).toBe('string');
-    expect(csrPem).toContain('-----BEGIN CERTIFICATE REQUEST-----');
-    createdPeerIds.push(peerId);
-
-    // ── Step C: Enrollment (simulates Server A sending CSR to Server B) ──
-    const enrollRes = await agent
-      .post(`/api/federation/enrollment/${token}`)
-      .send({ csrPem })
-      .set('Content-Type', 'application/json');
-
-    expect(enrollRes.status).toBe(200);
-    const { certPem, certChainPem } = enrollRes.body as {
-      certPem: string;
-      certChainPem: string;
-    };
-    expect(certPem).toContain('-----BEGIN CERTIFICATE-----');
-    expect(certChainPem).toContain('-----BEGIN CERTIFICATE-----');
-
-    // ── Step D: "Server A" stores the cert ───────────────────────────────
-    const storeRes = await agent
-      .patch(`/api/admin/federation/peers/${peerId}/cert`)
-      .send({ certPem })
-      .set('Content-Type', 'application/json');
-
-    expect(storeRes.status).toBe(200);
-
-    // ── Step E: Verify peer record in DB ─────────────────────────────────
-    const [peer] = await db
-      .select()
-      .from(federationPeers)
-      .where(eq(federationPeers.id, peerId))
-      .limit(1);
-
-    expect(peer).toBeDefined();
-    expect(peer?.state).toBe('active');
-    expect(peer?.certPem).toContain('-----BEGIN CERTIFICATE-----');
-    expect(typeof peer?.certSerial).toBe('string');
-    expect((peer?.certSerial ?? '').length).toBeGreaterThan(0);
-    // clientKeyPem is a sealed ciphertext — must not be a raw PEM
-    expect(peer?.clientKeyPem?.startsWith('-----BEGIN')).toBe(false);
-    // certNotAfter must be in the future
-    expect(peer?.certNotAfter?.getTime()).toBeGreaterThan(Date.now());
-  }, 60_000);
-});
--- a/apps/gateway/src/tests/integration/federation-m2.integration.test.ts
+++ b/apps/gateway/src/tests/integration/federation-m2.integration.test.ts
@@ -1,483 +0,0 @@
-/**
- * Federation M2 integration tests (FED-M2-09).
- *
- * Covers MILESTONES.md acceptance tests #1, #2, #3, #5, #7, #8.
- *
- * Prerequisites:
- *   docker compose -f docker-compose.federated.yml --profile federated up -d
- *
- * Run DB-only tests (no Step-CA):
- *   FEDERATED_INTEGRATION=1 BETTER_AUTH_SECRET=test-secret pnpm --filter @mosaicstack/gateway test \
- *     src/__tests__/integration/federation-m2.integration.test.ts
- *
- * Run all tests including Step-CA-dependent ones:
- *   FEDERATED_INTEGRATION=1 STEP_CA_AVAILABLE=1 \
- *   STEP_CA_URL=https://localhost:9000 \
- *   STEP_CA_PROVISIONER_KEY_JSON="$(docker exec $(docker ps -qf name=step-ca) cat /home/step/secrets/mosaic-fed.json)" \
- *   STEP_CA_ROOT_CERT_PATH=/tmp/step-ca-root.crt \
- *   pnpm --filter @mosaicstack/gateway test \
- *     src/__tests__/integration/federation-m2.integration.test.ts
- *
- * Obtaining Step-CA credentials:
- *   # Extract provisioner key from running container:
- *   #   docker exec $(docker ps -qf name=step-ca) cat /home/step/secrets/mosaic-fed.json
- *   # Copy root cert from container:
- *   #   docker cp $(docker ps -qf name=step-ca):/home/step/certs/root_ca.crt /tmp/step-ca-root.crt
- *   # Then: export STEP_CA_ROOT_CERT_PATH=/tmp/step-ca-root.crt
- */
-
-import * as crypto from 'node:crypto';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-import { Test } from '@nestjs/testing';
-import { GoneException } from '@nestjs/common';
-import { Pkcs10CertificateRequestGenerator, X509Certificate as PeculiarX509 } from '@peculiar/x509';
-import {
-  createDb,
-  type Db,
-  type DbHandle,
-  federationPeers,
-  federationGrants,
-  federationEnrollmentTokens,
-  inArray,
-  eq,
-} from '@mosaicstack/db';
-import * as schema from '@mosaicstack/db';
-import { seal } from '@mosaicstack/auth';
-import { DB } from '../../database/database.module.js';
-import { GrantsService } from '../../federation/grants.service.js';
-import { EnrollmentService } from '../../federation/enrollment.service.js';
-import { CaService } from '../../federation/ca.service.js';
-import { FederationScopeError } from '../../federation/scope-schema.js';
-
-const run = process.env['FEDERATED_INTEGRATION'] === '1';
-const stepCaRun = run && process.env['STEP_CA_AVAILABLE'] === '1';
-
-const PG_URL = 'postgresql://mosaic:mosaic@localhost:5433/mosaic';
-
-// ---------------------------------------------------------------------------
-// Helpers for test data isolation
-// ---------------------------------------------------------------------------
-
-/** Unique run prefix to identify rows created by this test run. */
-const RUN_ID = crypto.randomUUID();
-
-/** Insert a minimal user row to satisfy the FK on federation_grants.subject_user_id. */
-async function insertTestUser(db: Db, id: string): Promise<void> {
-  await db
-    .insert(schema.users)
-    .values({
-      id,
-      name: `test-user-${id}`,
-      email: `test-${id}@federation-test.invalid`,
-      emailVerified: false,
-    })
-    .onConflictDoNothing();
-}
-
-/** Insert a minimal peer row to satisfy the FK on federation_grants.peer_id. */
-async function insertTestPeer(db: Db, id: string, suffix: string = ''): Promise<void> {
-  await db
-    .insert(federationPeers)
-    .values({
-      id,
-      commonName: `test-peer-${RUN_ID}-${suffix}`,
-      displayName: `Test Peer ${suffix}`,
-      certPem: '-----BEGIN CERTIFICATE-----\nMOCK\n-----END CERTIFICATE-----\n',
-      certSerial: `test-serial-${id}`,
-      certNotAfter: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000),
-      state: 'pending',
-    })
-    .onConflictDoNothing();
-}
-
-// ---------------------------------------------------------------------------
-// DB-only test module (CaService mocked so env vars not required)
-// ---------------------------------------------------------------------------
-
-function buildDbModule(db: Db) {
-  return Test.createTestingModule({
-    providers: [
-      { provide: DB, useValue: db },
-      GrantsService,
-      {
-        provide: CaService,
-        useValue: {
-          issueCert: async () => {
-            throw new Error('CaService.issueCert should not be called in DB-only tests');
-          },
-        },
-      },
-      EnrollmentService,
-    ],
-  }).compile();
-}
-
-// ---------------------------------------------------------------------------
-// Test suite — DB-only (no Step-CA)
-// ---------------------------------------------------------------------------
-
-describe.skipIf(!run)('federation M2 — DB-only tests', () => {
-  let handle: DbHandle;
-  let db: Db;
-  let grantsService: GrantsService;
-
-  /** IDs created during this run — cleaned up in afterAll. */
-  const createdGrantIds: string[] = [];
-  const createdPeerIds: string[] = [];
-  const createdUserIds: string[] = [];
-
-  beforeAll(async () => {
-    process.env['BETTER_AUTH_SECRET'] ??= 'test-integration-sealing-key-not-for-prod';
-
-    handle = createDb(PG_URL);
-    db = handle.db;
-
-    const moduleRef = await buildDbModule(db);
-    grantsService = moduleRef.get(GrantsService);
-  });
-
-  afterAll(async () => {
-    // Clean up in FK-safe order: tokens → grants → peers → users
-    if (db && createdGrantIds.length > 0) {
-      await db
-        .delete(federationEnrollmentTokens)
-        .where(inArray(federationEnrollmentTokens.grantId, createdGrantIds))
-        .catch((e: unknown) => console.error('[federation-m2-test cleanup]', e));
-      await db
-        .delete(federationGrants)
-        .where(inArray(federationGrants.id, createdGrantIds))
-        .catch((e: unknown) => console.error('[federation-m2-test cleanup]', e));
-    }
-    if (db && createdPeerIds.length > 0) {
-      await db
-        .delete(federationPeers)
-        .where(inArray(federationPeers.id, createdPeerIds))
-        .catch((e: unknown) => console.error('[federation-m2-test cleanup]', e));
-    }
-    if (db && createdUserIds.length > 0) {
-      await db
-        .delete(schema.users)
-        .where(inArray(schema.users.id, createdUserIds))
-        .catch((e: unknown) => console.error('[federation-m2-test cleanup]', e));
-    }
-    if (handle)
-      await handle.close().catch((e: unknown) => console.error('[federation-m2-test cleanup]', e));
-  });
-
-  // -------------------------------------------------------------------------
-  // #1 — grant create writes a pending row
-  // -------------------------------------------------------------------------
-  it('#1 — createGrant writes a pending row to DB', async () => {
-    const userId = crypto.randomUUID();
-    const peerId = crypto.randomUUID();
-    const validScope = {
-      resources: ['tasks'],
-      excluded_resources: [],
-      max_rows_per_query: 100,
-    };
-
-    await insertTestUser(db, userId);
-    await insertTestPeer(db, peerId, 'test1');
-    createdUserIds.push(userId);
-    createdPeerIds.push(peerId);
-
-    const grant = await grantsService.createGrant({
-      subjectUserId: userId,
-      scope: validScope,
-      peerId,
-    });
-
-    createdGrantIds.push(grant.id);
-
-    // Verify the row exists in DB with correct shape
-    const [row] = await db
-      .select()
-      .from(federationGrants)
-      .where(eq(federationGrants.id, grant.id))
-      .limit(1);
-
-    expect(row).toBeDefined();
-    expect(row?.status).toBe('pending');
-    expect(row?.peerId).toBe(peerId);
-    expect(row?.subjectUserId).toBe(userId);
-    const storedScope = row?.scope as Record<string, unknown>;
-    expect(storedScope['resources']).toEqual(['tasks']);
-    expect(storedScope['max_rows_per_query']).toBe(100);
-  }, 15_000);
-
-  // -------------------------------------------------------------------------
-  // #7 — scope with unknown resource type rejected
-  // -------------------------------------------------------------------------
-  it('#7 — createGrant rejects scope with unknown resource type', async () => {
-    const userId = crypto.randomUUID();
-    const peerId = crypto.randomUUID();
-    const invalidScope = {
-      resources: ['totally_unknown_resource'],
-      excluded_resources: [],
-      max_rows_per_query: 100,
-    };
-
-    await insertTestUser(db, userId);
-    await insertTestPeer(db, peerId, 'test7');
-    createdUserIds.push(userId);
-    createdPeerIds.push(peerId);
-
-    await expect(
-      grantsService.createGrant({
-        subjectUserId: userId,
-        scope: invalidScope,
-        peerId,
-      }),
-    ).rejects.toThrow(FederationScopeError);
-  }, 15_000);
-
-  // -------------------------------------------------------------------------
-  // #8 — listGrants returns accurate status for grants in various states
-  // -------------------------------------------------------------------------
-  it('#8 — listGrants returns accurate status for grants in various states', async () => {
-    const userId = crypto.randomUUID();
-    const peerId = crypto.randomUUID();
-    const validScope = {
-      resources: ['notes'],
-      excluded_resources: [],
-      max_rows_per_query: 50,
-    };
-
-    await insertTestUser(db, userId);
-    await insertTestPeer(db, peerId, 'test8');
-    createdUserIds.push(userId);
-    createdPeerIds.push(peerId);
-
-    // Create two pending grants via GrantsService
-    const grantA = await grantsService.createGrant({
-      subjectUserId: userId,
-      scope: validScope,
-      peerId,
-    });
-    const grantB = await grantsService.createGrant({
-      subjectUserId: userId,
-      scope: { resources: ['tasks'], excluded_resources: [], max_rows_per_query: 50 },
-      peerId,
-    });
-    createdGrantIds.push(grantA.id, grantB.id);
-
-    // Insert a third grant directly in 'revoked' state to test status variety
-    const [grantC] = await db
-      .insert(federationGrants)
-      .values({
-        id: crypto.randomUUID(),
-        subjectUserId: userId,
-        peerId,
-        scope: validScope,
-        status: 'revoked',
-        revokedAt: new Date(),
-      })
-      .returning();
-    createdGrantIds.push(grantC!.id);
-
-    // List all grants for this peer
-    const allForPeer = await grantsService.listGrants({ peerId });
-
-    const ourGrantIds = new Set([grantA.id, grantB.id, grantC!.id]);
-    const ourGrants = allForPeer.filter((g) => ourGrantIds.has(g.id));
-    expect(ourGrants).toHaveLength(3);
-
-    const pendingGrants = ourGrants.filter((g) => g.status === 'pending');
-    const revokedGrants = ourGrants.filter((g) => g.status === 'revoked');
-    expect(pendingGrants).toHaveLength(2);
-    expect(revokedGrants).toHaveLength(1);
-
-    // Status-filtered query
-    const pendingOnly = await grantsService.listGrants({ peerId, status: 'pending' });
-    const ourPending = pendingOnly.filter((g) => ourGrantIds.has(g.id));
-    expect(ourPending.every((g) => g.status === 'pending')).toBe(true);
-
-    // Verify peer list from DB also shows the peer rows with correct state
-    const peers = await db.select().from(federationPeers).where(eq(federationPeers.id, peerId));
-    expect(peers).toHaveLength(1);
-    expect(peers[0]?.state).toBe('pending');
-  }, 15_000);
-
-  // -------------------------------------------------------------------------
-  // #5 — client_key_pem encrypted at rest
-  // -------------------------------------------------------------------------
-  it('#5 — clientKeyPem stored in DB is a sealed ciphertext (not a valid PEM)', async () => {
-    const peerId = crypto.randomUUID();
-    const rawPem = '-----BEGIN PRIVATE KEY-----\nMOCK\n-----END PRIVATE KEY-----\n';
-    const sealed = seal(rawPem);
-
-    await db.insert(federationPeers).values({
-      id: peerId,
-      commonName: `test-peer-${RUN_ID}-sealed`,
-      displayName: 'Sealed Key Test Peer',
-      certPem: '-----BEGIN CERTIFICATE-----\nMOCK\n-----END CERTIFICATE-----\n',
-      certSerial: `test-serial-sealed-${peerId}`,
-      certNotAfter: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000),
-      state: 'pending',
-      clientKeyPem: sealed,
-    });
-    createdPeerIds.push(peerId);
-
-    const [row] = await db
-      .select()
-      .from(federationPeers)
-      .where(eq(federationPeers.id, peerId))
-      .limit(1);
-
-    expect(row).toBeDefined();
-    // The stored value must NOT be a valid PEM — it's a sealed ciphertext blob
-    expect(row?.clientKeyPem).toBeDefined();
-    expect(row?.clientKeyPem?.startsWith('-----BEGIN')).toBe(false);
-    // The sealed value should be non-trivial (at least 20 chars)
-    expect((row?.clientKeyPem ?? '').length).toBeGreaterThan(20);
-  }, 15_000);
-});
-
-// ---------------------------------------------------------------------------
-// Test suite — Step-CA gated
-// ---------------------------------------------------------------------------
-
-describe.skipIf(!stepCaRun)('federation M2 — Step-CA tests', () => {
-  let handle: DbHandle;
-  let db: Db;
-  let grantsService: GrantsService;
-  let enrollmentService: EnrollmentService;
-
-  const createdGrantIds: string[] = [];
-  const createdPeerIds: string[] = [];
-  const createdUserIds: string[] = [];
-
-  beforeAll(async () => {
-    handle = createDb(PG_URL);
-    db = handle.db;
-
-    // Use real CaService — env vars (STEP_CA_URL, STEP_CA_PROVISIONER_KEY_JSON,
-    // STEP_CA_ROOT_CERT_PATH) must be set when STEP_CA_AVAILABLE=1
-    const moduleRef = await Test.createTestingModule({
-      providers: [{ provide: DB, useValue: db }, CaService, GrantsService, EnrollmentService],
-    }).compile();
-
-    grantsService = moduleRef.get(GrantsService);
-    enrollmentService = moduleRef.get(EnrollmentService);
-  });
-
-  afterAll(async () => {
-    if (db && createdGrantIds.length > 0) {
-      await db
-        .delete(federationEnrollmentTokens)
-        .where(inArray(federationEnrollmentTokens.grantId, createdGrantIds))
-        .catch((e: unknown) => console.error('[federation-m2-test cleanup]', e));
-      await db
-        .delete(federationGrants)
-        .where(inArray(federationGrants.id, createdGrantIds))
-        .catch((e: unknown) => console.error('[federation-m2-test cleanup]', e));
-    }
-    if (db && createdPeerIds.length > 0) {
-      await db
-        .delete(federationPeers)
-        .where(inArray(federationPeers.id, createdPeerIds))
-        .catch((e: unknown) => console.error('[federation-m2-test cleanup]', e));
-    }
-    if (db && createdUserIds.length > 0) {
-      await db
-        .delete(schema.users)
-        .where(inArray(schema.users.id, createdUserIds))
-        .catch((e: unknown) => console.error('[federation-m2-test cleanup]', e));
-    }
-    if (handle)
-      await handle.close().catch((e: unknown) => console.error('[federation-m2-test cleanup]', e));
-  });
-
-  /** Generate a P-256 key pair and PKCS#10 CSR, returning the CSR as PEM. */
-  async function generateCsrPem(cn: string): Promise<string> {
-    const alg = { name: 'ECDSA', namedCurve: 'P-256', hash: 'SHA-256' };
-    const keyPair = await crypto.subtle.generateKey(alg, true, ['sign', 'verify']);
-    const csr = await Pkcs10CertificateRequestGenerator.create({
-      name: `CN=${cn}`,
-      keys: keyPair,
-      signingAlgorithm: alg,
-    });
-    return csr.toString('pem');
-  }
-
-  // -------------------------------------------------------------------------
-  // #2 — enrollment signs CSR and returns cert
-  // -------------------------------------------------------------------------
-  it('#2 — redeem returns a certPem containing a valid PEM certificate', async () => {
-    const userId = crypto.randomUUID();
-    const peerId = crypto.randomUUID();
-    const validScope = {
-      resources: ['tasks'],
-      excluded_resources: [],
-      max_rows_per_query: 100,
-    };
-
-    await insertTestUser(db, userId);
-    await insertTestPeer(db, peerId, 'ca-test2');
-    createdUserIds.push(userId);
-    createdPeerIds.push(peerId);
-
-    const grant = await grantsService.createGrant({
-      subjectUserId: userId,
-      scope: validScope,
-      peerId,
-    });
-    createdGrantIds.push(grant.id);
-
-    const { token } = await enrollmentService.createToken({
-      grantId: grant.id,
-      peerId,
-      ttlSeconds: 900,
-    });
-
-    const csrPem = await generateCsrPem(`gateway-test-${RUN_ID.slice(0, 8)}`);
-    const result = await enrollmentService.redeem(token, csrPem);
-
-    expect(result.certPem).toContain('-----BEGIN CERTIFICATE-----');
-    expect(result.certChainPem).toContain('-----BEGIN CERTIFICATE-----');
-
-    // Verify the issued cert parses cleanly
-    const cert = new PeculiarX509(result.certPem);
-    expect(cert.serialNumber).toBeTruthy();
-  }, 30_000);
-
-  // -------------------------------------------------------------------------
-  // #3 — token single-use; second attempt returns GoneException
-  // -------------------------------------------------------------------------
-  it('#3 — second redeem of the same token throws GoneException', async () => {
-    const userId = crypto.randomUUID();
-    const peerId = crypto.randomUUID();
-    const validScope = {
-      resources: ['notes'],
-      excluded_resources: [],
-      max_rows_per_query: 50,
-    };
-
-    await insertTestUser(db, userId);
-    await insertTestPeer(db, peerId, 'ca-test3');
-    createdUserIds.push(userId);
-    createdPeerIds.push(peerId);
-
-    const grant = await grantsService.createGrant({
-      subjectUserId: userId,
-      scope: validScope,
-      peerId,
-    });
-    createdGrantIds.push(grant.id);
-
-    const { token } = await enrollmentService.createToken({
-      grantId: grant.id,
-      peerId,
-      ttlSeconds: 900,
-    });
-
-    const csrPem = await generateCsrPem(`gateway-test-replay-${RUN_ID.slice(0, 8)}`);
-
-    // First redeem must succeed
-    const result = await enrollmentService.redeem(token, csrPem);
-    expect(result.certPem).toContain('-----BEGIN CERTIFICATE-----');
-
-    // Second redeem with the same token must be rejected
-    await expect(enrollmentService.redeem(token, csrPem)).rejects.toThrow(GoneException);
-  }, 30_000);
-});
--- a/apps/gateway/src/tests/integration/tess-cross-surface.integration.test.ts
+++ b/apps/gateway/src/tests/integration/tess-cross-surface.integration.test.ts
@@ -1,192 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import { InMemoryDurableSessionStore } from '@mosaicstack/agent';
-import {
-  createDiscordIngressEnvelope,
-  DiscordPlugin,
-  type DiscordIngressPayload,
-} from '@mosaicstack/discord-plugin';
-import { InteractionController } from '../../agent/interaction.controller.js';
-import { RuntimeProviderService } from '../../agent/runtime-provider-registry.service.js';
-import { DurableSessionService } from '../../agent/durable-session.service.js';
-import { ChatGateway } from '../../chat/chat.gateway.js';
-import { CommandAuthorizationService } from '../../commands/command-authorization.service.js';
-
-const SERVICE_TOKEN = 'test-discord-service-token';
-const envKeys = [
-  'DISCORD_SERVICE_TOKEN',
-  'DISCORD_SERVICE_TENANT_ID',
-  'DISCORD_INTERACTION_BINDINGS',
-  'DISCORD_ALLOWED_GUILD_IDS',
-  'DISCORD_ALLOWED_CHANNEL_IDS',
-  'DISCORD_ALLOWED_USER_IDS',
-  'MOSAIC_AGENT_NAME',
-] as const;
-const priorEnv = new Map<string, string | undefined>();
-
-function payload(content: string, messageId: string, correlationId: string): DiscordIngressPayload {
-  return {
-    content,
-    messageId,
-    correlationId,
-    guildId: 'guild-1',
-    channelId: 'channel-1',
-    userId: 'discord-admin-1',
-    conversationId: 'Nova:discord:channel-1',
-  };
-}
-
-function authorization(): CommandAuthorizationService {
-  const entries = new Map<string, string>();
-  return new CommandAuthorizationService(
-    {
-      select: () => ({
-        from: () => ({ where: () => ({ limit: async () => [{ role: 'admin' }] }) }),
-      }),
-    } as never,
-    {
-      get: async (key: string) => entries.get(key) ?? null,
-      set: async (key: string, value: string) => entries.set(key, value),
-      del: async (key: string) => Number(entries.delete(key)),
-    },
-  );
-}
-
-describe('interaction Discord/CLI durable-session integration', () => {
-  afterEach(() => {
-    for (const key of envKeys) {
-      const value = priorEnv.get(key);
-      if (value === undefined) delete process.env[key];
-      else process.env[key] = value;
-    }
-    priorEnv.clear();
-  });
-
-  it('enrolls through the CLI surface then resolves the same durable session from Discord', async () => {
-    for (const key of envKeys) priorEnv.set(key, process.env[key]);
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    process.env['DISCORD_SERVICE_TOKEN'] = SERVICE_TOKEN;
-    process.env['DISCORD_SERVICE_TENANT_ID'] = 'tenant-1';
-    process.env['DISCORD_ALLOWED_GUILD_IDS'] = 'guild-1';
-    process.env['DISCORD_ALLOWED_CHANNEL_IDS'] = 'channel-1';
-    process.env['DISCORD_ALLOWED_USER_IDS'] = 'discord-admin-1';
-    process.env['DISCORD_INTERACTION_BINDINGS'] = JSON.stringify([
-      {
-        instanceId: 'Nova',
-        guildId: 'guild-1',
-        channelId: 'channel-1',
-        pairedUsers: {
-          'discord-admin-1': { role: 'admin', mosaicUserId: 'mosaic-admin-1' },
-        },
-      },
-    ]);
-
-    const durable = new DurableSessionService(
-      new InMemoryDurableSessionStore() as never,
-      {} as never,
-    );
-    const enrollmentRuntime = {
-      listSessions: vi.fn().mockResolvedValue([{ id: 'runtime-1' }]),
-    };
-    const controller = new InteractionController(enrollmentRuntime as never, durable);
-    await controller.enroll(
-      'Nova',
-      'Nova:discord:channel-1',
-      { providerId: 'fleet', runtimeSessionId: 'runtime-1' },
-      { id: 'mosaic-admin-1', tenantId: 'tenant-1' },
-      'cli-enrollment-correlation',
-    );
-
-    const authz = authorization();
-    const terminated = vi.fn().mockResolvedValue(undefined);
-    const runtime = new RuntimeProviderService(
-      {
-        require: () => ({
-          capabilities: async () => ({ supported: ['session.terminate'] }),
-          terminate: terminated,
-        }),
-      } as never,
-      { record: async () => undefined } as never,
-      {
-        consume: (approvalId, action) =>
-          authz.consumeRuntimeTerminationApproval(approvalId, action),
-      },
-    );
-    const gateway = new ChatGateway(
-      {} as never,
-      {} as never,
-      {} as never,
-      {} as never,
-      {} as never,
-      {} as never,
-      authz,
-      runtime,
-      durable,
-    );
-    const client = { data: { discordService: true }, emit: vi.fn() };
-    const plugin = new DiscordPlugin({
-      token: 'unused',
-      gatewayUrl: 'http://unused',
-      serviceToken: SERVICE_TOKEN,
-      allowedGuildIds: ['guild-1'],
-      allowedChannelIds: ['channel-1'],
-      allowedUserIds: ['discord-admin-1'],
-      interactionBindings: [
-        {
-          instanceId: 'Nova',
-          guildId: 'guild-1',
-          channelId: 'channel-1',
-          pairedUsers: {
-            'discord-admin-1': { role: 'admin', mosaicUserId: 'mosaic-admin-1' },
-          },
-        },
-      ],
-    });
-    const pluginInternals = plugin as unknown as {
-      client: { user: { id: string } };
-      socket: { connected: boolean; emit: ReturnType<typeof vi.fn> };
-      handleDiscordMessage(message: unknown): void;
-    };
-    const pluginSocket = { connected: true, emit: vi.fn() };
-    pluginInternals.client = { user: { id: 'bot-1' } };
-    pluginInternals.socket = pluginSocket;
-    pluginInternals.handleDiscordMessage({
-      id: 'approve-1',
-      guildId: 'guild-1',
-      channelId: 'channel-1',
-      author: { id: 'discord-admin-1', bot: false },
-      mentions: { has: () => true },
-      content: '<@bot-1> /approve',
-      channel: { parentId: null },
-      attachments: new Map(),
-    });
-
-    expect(pluginSocket.emit).toHaveBeenCalledWith('discord:approve', expect.any(Object));
-    const approvalEnvelope = pluginSocket.emit.mock.calls[0]?.[1];
-    await gateway.handleDiscordApproval(client as never, approvalEnvelope);
-    const approval = client.emit.mock.calls.find(
-      ([event]) => event === 'discord:approval',
-    )?.[1] as {
-      approvalId: string;
-      success: boolean;
-    };
-    expect(approval.success).toBe(true);
-
-    await gateway.handleDiscordStop(
-      client as never,
-      createDiscordIngressEnvelope(
-        payload(`/stop ${approval.approvalId}`, 'stop-1', 'discord-stop-correlation'),
-        SERVICE_TOKEN,
-      ),
-    );
-
-    expect(terminated).toHaveBeenCalledWith(
-      'runtime-1',
-      approval.approvalId,
-      expect.objectContaining({ actorId: 'mosaic-admin-1' }),
-    );
-    expect(client.emit).toHaveBeenCalledWith('discord:stop', {
-      correlationId: 'discord-stop-correlation',
-      success: true,
-    });
-  });
-});
--- a/apps/gateway/src/tests/resource-ownership.test.ts
+++ b/apps/gateway/src/tests/resource-ownership.test.ts
@@ -57,13 +57,11 @@ function createBrain() {
 describe('Resource ownership checks', () => {
  it('forbids access to another user conversation', async () => {
    const brain = createBrain();
-    // The repo enforces ownership via the WHERE clause; it returns undefined when the
-    // conversation does not belong to the requesting user.
-    brain.conversations.findById.mockResolvedValue(undefined);
+    brain.conversations.findById.mockResolvedValue({ id: 'conv-1', userId: 'user-2' });
    const controller = new ConversationsController(brain as never);

    await expect(controller.findOne('conv-1', { id: 'user-1' })).rejects.toBeInstanceOf(
-      NotFoundException,
+      ForbiddenException,
    );
  });

--- a/apps/gateway/src/tests/session-hardening.test.ts
+++ b/apps/gateway/src/tests/session-hardening.test.ts
@@ -1,377 +0,0 @@
-/**
- * M5-008: Session hardening verification tests.
- *
- * Verifies:
- * 1. /model command switches model → session:info reflects updated modelId
- * 2. /agent command switches agent config → system prompt / agentName changes
- * 3. Session resume binds to a conversation (history injected via conversationHistory option)
- * 4. Session metrics track token usage and message count correctly
- */
-
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import type {
-  AgentSession,
-  AgentSessionOptions,
-  ConversationHistoryMessage,
-} from '../agent/agent.service.js';
-import type { SessionInfoDto, SessionMetrics, SessionTokenMetrics } from '../agent/session.dto.js';
-
-// ---------------------------------------------------------------------------
-// Helpers — minimal AgentSession fixture
-// ---------------------------------------------------------------------------
-
-function makeMetrics(overrides?: Partial<SessionMetrics>): SessionMetrics {
-  return {
-    tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-    modelSwitches: 0,
-    messageCount: 0,
-    lastActivityAt: new Date().toISOString(),
-    ...overrides,
-  };
-}
-
-function makeSession(overrides?: Partial<AgentSession>): AgentSession {
-  return {
-    id: 'session-001',
-    provider: 'anthropic',
-    modelId: 'claude-3-5-sonnet-20241022',
-    piSession: {} as AgentSession['piSession'],
-    listeners: new Set(),
-    unsubscribe: vi.fn(),
-    createdAt: Date.now(),
-    promptCount: 0,
-    channels: new Set(),
-    skillPromptAdditions: [],
-    sandboxDir: '/tmp',
-    allowedTools: null,
-    metrics: makeMetrics(),
-    ...overrides,
-  };
-}
-
-function sessionToInfo(session: AgentSession): SessionInfoDto {
-  return {
-    id: session.id,
-    provider: session.provider,
-    modelId: session.modelId,
-    ...(session.agentName ? { agentName: session.agentName } : {}),
-    createdAt: new Date(session.createdAt).toISOString(),
-    promptCount: session.promptCount,
-    channels: Array.from(session.channels),
-    durationMs: Date.now() - session.createdAt,
-    metrics: { ...session.metrics },
-  };
-}
-
-// ---------------------------------------------------------------------------
-// Replicated AgentService methods (tested in isolation without full DI setup)
-// ---------------------------------------------------------------------------
-
-function updateSessionModel(session: AgentSession, modelId: string): void {
-  session.modelId = modelId;
-  session.metrics.modelSwitches += 1;
-  session.metrics.lastActivityAt = new Date().toISOString();
-}
-
-function applyAgentConfig(
-  session: AgentSession,
-  agentConfigId: string,
-  agentName: string,
-  modelId?: string,
-): void {
-  session.agentConfigId = agentConfigId;
-  session.agentName = agentName;
-  if (modelId) {
-    updateSessionModel(session, modelId);
-  }
-}
-
-function recordTokenUsage(session: AgentSession, tokens: SessionTokenMetrics): void {
-  session.metrics.tokens.input += tokens.input;
-  session.metrics.tokens.output += tokens.output;
-  session.metrics.tokens.cacheRead += tokens.cacheRead;
-  session.metrics.tokens.cacheWrite += tokens.cacheWrite;
-  session.metrics.tokens.total += tokens.total;
-  session.metrics.lastActivityAt = new Date().toISOString();
-}
-
-function recordMessage(session: AgentSession): void {
-  session.metrics.messageCount += 1;
-  session.metrics.lastActivityAt = new Date().toISOString();
-}
-
-// ---------------------------------------------------------------------------
-// 1. /model command — switches model → session:info updated
-// ---------------------------------------------------------------------------
-
-describe('/model command — model switch reflected in session:info', () => {
-  let session: AgentSession;
-
-  beforeEach(() => {
-    session = makeSession();
-  });
-
-  it('updates modelId when /model is called with a model name', () => {
-    updateSessionModel(session, 'claude-opus-4-5-20251001');
-
-    expect(session.modelId).toBe('claude-opus-4-5-20251001');
-  });
-
-  it('increments modelSwitches metric after /model command', () => {
-    expect(session.metrics.modelSwitches).toBe(0);
-
-    updateSessionModel(session, 'gpt-4o');
-    expect(session.metrics.modelSwitches).toBe(1);
-
-    updateSessionModel(session, 'claude-3-5-sonnet-20241022');
-    expect(session.metrics.modelSwitches).toBe(2);
-  });
-
-  it('session:info DTO reflects the new modelId after switch', () => {
-    updateSessionModel(session, 'claude-haiku-3-5-20251001');
-
-    const info = sessionToInfo(session);
-
-    expect(info.modelId).toBe('claude-haiku-3-5-20251001');
-    expect(info.metrics.modelSwitches).toBe(1);
-  });
-
-  it('lastActivityAt is updated after model switch', () => {
-    const before = session.metrics.lastActivityAt;
-    // Ensure at least 1ms passes
-    vi.setSystemTime(Date.now() + 1);
-    updateSessionModel(session, 'new-model');
-    vi.useRealTimers();
-
-    expect(session.metrics.lastActivityAt).not.toBe(before);
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 2. /agent command — switches agent config → system prompt / agentName updated
-// ---------------------------------------------------------------------------
-
-describe('/agent command — agent config applied to session', () => {
-  let session: AgentSession;
-
-  beforeEach(() => {
-    session = makeSession();
-  });
-
-  it('sets agentConfigId and agentName on the session', () => {
-    applyAgentConfig(session, 'agent-uuid-001', 'CodeReviewer');
-
-    expect(session.agentConfigId).toBe('agent-uuid-001');
-    expect(session.agentName).toBe('CodeReviewer');
-  });
-
-  it('also updates modelId when agent config carries a model', () => {
-    applyAgentConfig(session, 'agent-uuid-002', 'DataAnalyst', 'gpt-4o-mini');
-
-    expect(session.agentName).toBe('DataAnalyst');
-    expect(session.modelId).toBe('gpt-4o-mini');
-    expect(session.metrics.modelSwitches).toBe(1);
-  });
-
-  it('does NOT update modelId when agent config has no model', () => {
-    const originalModel = session.modelId;
-    applyAgentConfig(session, 'agent-uuid-003', 'Planner', undefined);
-
-    expect(session.modelId).toBe(originalModel);
-    expect(session.metrics.modelSwitches).toBe(0);
-  });
-
-  it('session:info DTO reflects agentName after /agent switch', () => {
-    applyAgentConfig(session, 'agent-uuid-004', 'DevBot');
-
-    const info = sessionToInfo(session);
-
-    expect(info.agentName).toBe('DevBot');
-  });
-
-  it('multiple /agent calls update to the latest agent', () => {
-    applyAgentConfig(session, 'agent-001', 'FirstAgent');
-    applyAgentConfig(session, 'agent-002', 'SecondAgent');
-
-    expect(session.agentConfigId).toBe('agent-002');
-    expect(session.agentName).toBe('SecondAgent');
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 3. Session resume — binds to conversation via conversationHistory
-// ---------------------------------------------------------------------------
-
-describe('Session resume — binds to conversation', () => {
-  it('conversationHistory option is preserved in session options', () => {
-    const history: ConversationHistoryMessage[] = [
-      {
-        role: 'user',
-        content: 'Hello, what is TypeScript?',
-        createdAt: new Date('2026-01-01T00:01:00Z'),
-      },
-      {
-        role: 'assistant',
-        content: 'TypeScript is a typed superset of JavaScript.',
-        createdAt: new Date('2026-01-01T00:01:05Z'),
-      },
-    ];
-
-    const options: AgentSessionOptions = {
-      conversationHistory: history,
-      provider: 'anthropic',
-      modelId: 'claude-3-5-sonnet-20241022',
-    };
-
-    expect(options.conversationHistory).toHaveLength(2);
-    expect(options.conversationHistory![0]!.role).toBe('user');
-    expect(options.conversationHistory![1]!.role).toBe('assistant');
-  });
-
-  it('session with conversationHistory option carries the conversation binding', () => {
-    const CONV_ID = 'conv-resume-001';
-    const history: ConversationHistoryMessage[] = [
-      { role: 'user', content: 'Prior question', createdAt: new Date('2026-01-01T00:01:00Z') },
-    ];
-
-    // Simulate what ChatGateway does: pass conversationId + history to createSession
-    const options: AgentSessionOptions = {
-      conversationHistory: history,
-    };
-
-    // The session ID is the conversationId in the gateway
-    const session = makeSession({ id: CONV_ID });
-
-    expect(session.id).toBe(CONV_ID);
-    expect(options.conversationHistory).toHaveLength(1);
-  });
-
-  it('empty conversationHistory is valid (new conversation)', () => {
-    const options: AgentSessionOptions = {
-      conversationHistory: [],
-    };
-
-    expect(options.conversationHistory).toHaveLength(0);
-  });
-
-  it('resumed session preserves all message roles', () => {
-    const history: ConversationHistoryMessage[] = [
-      { role: 'system', content: 'You are a helpful assistant.', createdAt: new Date() },
-      { role: 'user', content: 'Question 1', createdAt: new Date() },
-      { role: 'assistant', content: 'Answer 1', createdAt: new Date() },
-      { role: 'user', content: 'Question 2', createdAt: new Date() },
-    ];
-
-    const roles = history.map((m) => m.role);
-    expect(roles).toEqual(['system', 'user', 'assistant', 'user']);
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 4. Session metrics — token usage and message count
-// ---------------------------------------------------------------------------
-
-describe('Session metrics — token usage and message count', () => {
-  let session: AgentSession;
-
-  beforeEach(() => {
-    session = makeSession();
-  });
-
-  it('starts with zero metrics', () => {
-    expect(session.metrics.tokens.input).toBe(0);
-    expect(session.metrics.tokens.output).toBe(0);
-    expect(session.metrics.tokens.total).toBe(0);
-    expect(session.metrics.messageCount).toBe(0);
-    expect(session.metrics.modelSwitches).toBe(0);
-  });
-
-  it('accumulates token usage across multiple turns', () => {
-    recordTokenUsage(session, {
-      input: 100,
-      output: 50,
-      cacheRead: 0,
-      cacheWrite: 0,
-      total: 150,
-    });
-    recordTokenUsage(session, {
-      input: 200,
-      output: 80,
-      cacheRead: 10,
-      cacheWrite: 5,
-      total: 295,
-    });
-
-    expect(session.metrics.tokens.input).toBe(300);
-    expect(session.metrics.tokens.output).toBe(130);
-    expect(session.metrics.tokens.cacheRead).toBe(10);
-    expect(session.metrics.tokens.cacheWrite).toBe(5);
-    expect(session.metrics.tokens.total).toBe(445);
-  });
-
-  it('increments message count with each recordMessage call', () => {
-    expect(session.metrics.messageCount).toBe(0);
-
-    recordMessage(session);
-    expect(session.metrics.messageCount).toBe(1);
-
-    recordMessage(session);
-    recordMessage(session);
-    expect(session.metrics.messageCount).toBe(3);
-  });
-
-  it('session:info DTO exposes correct metrics snapshot', () => {
-    recordTokenUsage(session, {
-      input: 500,
-      output: 100,
-      cacheRead: 20,
-      cacheWrite: 10,
-      total: 630,
-    });
-    recordMessage(session);
-    recordMessage(session);
-    updateSessionModel(session, 'claude-haiku-3-5-20251001');
-
-    const info = sessionToInfo(session);
-
-    expect(info.metrics.tokens.input).toBe(500);
-    expect(info.metrics.tokens.output).toBe(100);
-    expect(info.metrics.tokens.total).toBe(630);
-    expect(info.metrics.messageCount).toBe(2);
-    expect(info.metrics.modelSwitches).toBe(1);
-  });
-
-  it('metrics are independent per session', () => {
-    const sessionA = makeSession({ id: 'session-A' });
-    const sessionB = makeSession({ id: 'session-B' });
-
-    recordTokenUsage(sessionA, { input: 100, output: 50, cacheRead: 0, cacheWrite: 0, total: 150 });
-    recordMessage(sessionA);
-
-    // Session B should remain at zero
-    expect(sessionB.metrics.tokens.input).toBe(0);
-    expect(sessionB.metrics.messageCount).toBe(0);
-
-    // Session A should have updated values
-    expect(sessionA.metrics.tokens.input).toBe(100);
-    expect(sessionA.metrics.messageCount).toBe(1);
-  });
-
-  it('lastActivityAt is updated after recording tokens', () => {
-    const before = session.metrics.lastActivityAt;
-    vi.setSystemTime(new Date(Date.now() + 100));
-    recordTokenUsage(session, { input: 10, output: 5, cacheRead: 0, cacheWrite: 0, total: 15 });
-    vi.useRealTimers();
-
-    expect(session.metrics.lastActivityAt).not.toBe(before);
-  });
-
-  it('lastActivityAt is updated after recording a message', () => {
-    const before = session.metrics.lastActivityAt;
-    vi.setSystemTime(new Date(Date.now() + 100));
-    recordMessage(session);
-    vi.useRealTimers();
-
-    expect(session.metrics.lastActivityAt).not.toBe(before);
-  });
-});
--- a/apps/gateway/src/admin/admin-health.controller.ts
+++ b/apps/gateway/src/admin/admin-health.controller.ts
@@ -1,6 +1,6 @@
 import { Controller, Get, Inject, UseGuards } from '@nestjs/common';
-import { sql, type Db } from '@mosaicstack/db';
-import { createQueue } from '@mosaicstack/queue';
+import { sql, type Db } from '@mosaic/db';
+import { createQueue } from '@mosaic/queue';
 import { DB } from '../database/database.module.js';
 import { AgentService } from '../agent/agent.service.js';
 import { ProviderService } from '../agent/provider.service.js';
@@ -20,7 +20,7 @@ export class AdminHealthController {
  async check(): Promise<HealthStatusDto> {
    const [database, cache] = await Promise.all([this.checkDatabase(), this.checkCache()]);

-    const sessions = this.agentService.listAllSessionsForSystem();
+    const sessions = this.agentService.listSessions();
    const providers = this.providerService.listProviders();

    const allOk = database.status === 'ok' && cache.status === 'ok';
--- a/apps/gateway/src/admin/admin-jobs.controller.ts
+++ b/apps/gateway/src/admin/admin-jobs.controller.ts
@@ -1,128 +0,0 @@
-import {
-  Controller,
-  Get,
-  HttpCode,
-  HttpStatus,
-  Inject,
-  NotFoundException,
-  Optional,
-  Param,
-  Post,
-  Query,
-  UseGuards,
-} from '@nestjs/common';
-import { AdminGuard } from './admin.guard.js';
-import { QueueService } from '../queue/queue.service.js';
-import type { JobDto, JobListDto, JobStatus, QueueListDto } from '../queue/queue-admin.dto.js';
-
-@Controller('api/admin/jobs')
-@UseGuards(AdminGuard)
-export class AdminJobsController {
-  constructor(
-    @Optional()
-    @Inject(QueueService)
-    private readonly queueService: QueueService | null,
-  ) {}
-
-  /**
-   * GET /api/admin/jobs
-   * List jobs across all queues. Optional ?status=active|completed|failed|waiting|delayed
-   */
-  @Get()
-  async listJobs(@Query('status') status?: string): Promise<JobListDto> {
-    if (!this.queueService) {
-      return { jobs: [], total: 0 };
-    }
-
-    const validStatuses: JobStatus[] = ['active', 'completed', 'failed', 'waiting', 'delayed'];
-    const normalised = status as JobStatus | undefined;
-
-    if (normalised && !validStatuses.includes(normalised)) {
-      return { jobs: [], total: 0 };
-    }
-
-    const jobs: JobDto[] = await this.queueService.listJobs(normalised);
-    return { jobs, total: jobs.length };
-  }
-
-  /**
-   * POST /api/admin/jobs/:id/retry
-   * Retry a specific failed job.  The id is "<queue>__<bullmq-job-id>".
-   */
-  @Post(':id/retry')
-  @HttpCode(HttpStatus.OK)
-  async retryJob(@Param('id') id: string): Promise<{ ok: boolean; message: string }> {
-    if (!this.queueService) {
-      throw new NotFoundException('Queue service is not available');
-    }
-
-    const result = await this.queueService.retryJob(id);
-    if (!result.ok) {
-      throw new NotFoundException(result.message);
-    }
-
-    return result;
-  }
-
-  /**
-   * GET /api/admin/jobs/queues
-   * Return status for all managed queues.
-   */
-  @Get('queues')
-  async listQueues(): Promise<QueueListDto> {
-    if (!this.queueService) {
-      return { queues: [] };
-    }
-
-    const health = await this.queueService.getHealthStatus();
-    const queues = Object.entries(health.queues).map(([name, stats]) => ({
-      name,
-      waiting: stats.waiting,
-      active: stats.active,
-      completed: stats.completed,
-      failed: stats.failed,
-      delayed: 0,
-      paused: stats.paused,
-    }));
-
-    return { queues };
-  }
-
-  /**
-   * POST /api/admin/jobs/queues/:name/pause
-   * Pause the named queue.
-   */
-  @Post('queues/:name/pause')
-  @HttpCode(HttpStatus.OK)
-  async pauseQueue(@Param('name') name: string): Promise<{ ok: boolean; message: string }> {
-    if (!this.queueService) {
-      throw new NotFoundException('Queue service is not available');
-    }
-
-    const result = await this.queueService.pauseQueue(name);
-    if (!result.ok) {
-      throw new NotFoundException(result.message);
-    }
-
-    return result;
-  }
-
-  /**
-   * POST /api/admin/jobs/queues/:name/resume
-   * Resume the named queue.
-   */
-  @Post('queues/:name/resume')
-  @HttpCode(HttpStatus.OK)
-  async resumeQueue(@Param('name') name: string): Promise<{ ok: boolean; message: string }> {
-    if (!this.queueService) {
-      throw new NotFoundException('Queue service is not available');
-    }
-
-    const result = await this.queueService.resumeQueue(name);
-    if (!result.ok) {
-      throw new NotFoundException(result.message);
-    }
-
-    return result;
-  }
-}
--- a/apps/gateway/src/admin/admin-tokens.controller.ts
+++ b/apps/gateway/src/admin/admin-tokens.controller.ts
@@ -1,90 +0,0 @@
-import {
-  Body,
-  Controller,
-  Delete,
-  Get,
-  HttpCode,
-  HttpStatus,
-  Inject,
-  Param,
-  Post,
-  UseGuards,
-} from '@nestjs/common';
-import { randomBytes, createHash } from 'node:crypto';
-import { eq, type Db, adminTokens } from '@mosaicstack/db';
-import { v4 as uuid } from 'uuid';
-import { DB } from '../database/database.module.js';
-import { AdminGuard } from './admin.guard.js';
-import { CurrentUser } from '../auth/current-user.decorator.js';
-import type {
-  CreateTokenDto,
-  TokenCreatedDto,
-  TokenDto,
-  TokenListDto,
-} from './admin-tokens.dto.js';
-
-function hashToken(plaintext: string): string {
-  return createHash('sha256').update(plaintext).digest('hex');
-}
-
-function toTokenDto(row: typeof adminTokens.$inferSelect): TokenDto {
-  return {
-    id: row.id,
-    label: row.label,
-    scope: row.scope,
-    expiresAt: row.expiresAt?.toISOString() ?? null,
-    lastUsedAt: row.lastUsedAt?.toISOString() ?? null,
-    createdAt: row.createdAt.toISOString(),
-  };
-}
-
-@Controller('api/admin/tokens')
-@UseGuards(AdminGuard)
-export class AdminTokensController {
-  constructor(@Inject(DB) private readonly db: Db) {}
-
-  @Post()
-  async create(
-    @Body() dto: CreateTokenDto,
-    @CurrentUser() user: { id: string },
-  ): Promise<TokenCreatedDto> {
-    const plaintext = randomBytes(32).toString('hex');
-    const tokenHash = hashToken(plaintext);
-    const id = uuid();
-
-    const expiresAt = dto.expiresInDays
-      ? new Date(Date.now() + dto.expiresInDays * 24 * 60 * 60 * 1000)
-      : null;
-
-    const [row] = await this.db
-      .insert(adminTokens)
-      .values({
-        id,
-        userId: user.id,
-        tokenHash,
-        label: dto.label ?? 'CLI token',
-        scope: dto.scope ?? 'admin',
-        expiresAt,
-      })
-      .returning();
-
-    return { ...toTokenDto(row!), plaintext };
-  }
-
-  @Get()
-  async list(@CurrentUser() user: { id: string }): Promise<TokenListDto> {
-    const rows = await this.db
-      .select()
-      .from(adminTokens)
-      .where(eq(adminTokens.userId, user.id))
-      .orderBy(adminTokens.createdAt);
-
-    return { tokens: rows.map(toTokenDto), total: rows.length };
-  }
-
-  @Delete(':id')
-  @HttpCode(HttpStatus.NO_CONTENT)
-  async revoke(@Param('id') id: string, @CurrentUser() _user: { id: string }): Promise<void> {
-    await this.db.delete(adminTokens).where(eq(adminTokens.id, id));
-  }
-}
--- a/apps/gateway/src/admin/admin-tokens.dto.ts
+++ b/apps/gateway/src/admin/admin-tokens.dto.ts
@@ -1,33 +0,0 @@
-import { IsString, IsOptional, IsInt, Min } from 'class-validator';
-
-export class CreateTokenDto {
-  @IsString()
-  label!: string;
-
-  @IsOptional()
-  @IsString()
-  scope?: string;
-
-  @IsOptional()
-  @IsInt()
-  @Min(1)
-  expiresInDays?: number;
-}
-
-export interface TokenDto {
-  id: string;
-  label: string;
-  scope: string;
-  expiresAt: string | null;
-  lastUsedAt: string | null;
-  createdAt: string;
-}
-
-export interface TokenCreatedDto extends TokenDto {
-  plaintext: string;
-}
-
-export interface TokenListDto {
-  tokens: TokenDto[];
-  total: number;
-}
--- a/apps/gateway/src/admin/admin.controller.ts
+++ b/apps/gateway/src/admin/admin.controller.ts
@@ -13,8 +13,8 @@ import {
  Post,
  UseGuards,
 } from '@nestjs/common';
-import { eq, type Db, users as usersTable } from '@mosaicstack/db';
-import type { Auth } from '@mosaicstack/auth';
+import { eq, type Db, users as usersTable } from '@mosaic/db';
+import type { Auth } from '@mosaic/auth';
 import { AUTH } from '../auth/auth.tokens.js';
 import { DB } from '../database/database.module.js';
 import { AdminGuard } from './admin.guard.js';
--- a/apps/gateway/src/admin/admin.guard.ts
+++ b/apps/gateway/src/admin/admin.guard.ts
@@ -6,11 +6,10 @@ import {
  Injectable,
  UnauthorizedException,
 } from '@nestjs/common';
-import { createHash } from 'node:crypto';
 import { fromNodeHeaders } from 'better-auth/node';
-import type { Auth } from '@mosaicstack/auth';
-import type { Db } from '@mosaicstack/db';
-import { eq, adminTokens, users as usersTable } from '@mosaicstack/db';
+import type { Auth } from '@mosaic/auth';
+import type { Db } from '@mosaic/db';
+import { eq, users as usersTable } from '@mosaic/db';
 import type { FastifyRequest } from 'fastify';
 import { AUTH } from '../auth/auth.tokens.js';
 import { DB } from '../database/database.module.js';
@@ -20,8 +19,6 @@ interface UserWithRole {
  role?: string;
 }

-type AuthenticatedRequest = FastifyRequest & { user: unknown; session: unknown };
-
@Injectable()
 export class AdminGuard implements CanActivate {
  constructor(
@@ -31,64 +28,8 @@ export class AdminGuard implements CanActivate {

  async canActivate(context: ExecutionContext): Promise<boolean> {
    const request = context.switchToHttp().getRequest<FastifyRequest>();
-
-    // Try bearer token auth first
-    const authHeader = request.raw.headers['authorization'];
-    if (authHeader?.startsWith('Bearer ')) {
-      return this.validateBearerToken(request, authHeader.slice(7));
-    }
-
-    // Fall back to BetterAuth session
-    return this.validateSession(request);
-  }
-
-  private async validateBearerToken(request: FastifyRequest, plaintext: string): Promise<boolean> {
-    const tokenHash = createHash('sha256').update(plaintext).digest('hex');
-
-    const [row] = await this.db
-      .select({
-        tokenId: adminTokens.id,
-        userId: adminTokens.userId,
-        scope: adminTokens.scope,
-        expiresAt: adminTokens.expiresAt,
-        userName: usersTable.name,
-        userEmail: usersTable.email,
-        userRole: usersTable.role,
-      })
-      .from(adminTokens)
-      .innerJoin(usersTable, eq(adminTokens.userId, usersTable.id))
-      .where(eq(adminTokens.tokenHash, tokenHash))
-      .limit(1);
-
-    if (!row) {
-      throw new UnauthorizedException('Invalid API token');
-    }
-
-    if (row.expiresAt && row.expiresAt < new Date()) {
-      throw new UnauthorizedException('API token expired');
-    }
-
-    if (row.userRole !== 'admin') {
-      throw new ForbiddenException('Admin access required');
-    }
-
-    // Update last-used timestamp (fire-and-forget)
-    this.db
-      .update(adminTokens)
-      .set({ lastUsedAt: new Date() })
-      .where(eq(adminTokens.id, row.tokenId))
-      .then(() => {})
-      .catch(() => {});
-
-    const req = request as AuthenticatedRequest;
-    req.user = { id: row.userId, name: row.userName, email: row.userEmail, role: row.userRole };
-    req.session = { id: `token:${row.tokenId}`, userId: row.userId };
-
-    return true;
-  }
-
-  private async validateSession(request: FastifyRequest): Promise<boolean> {
    const headers = fromNodeHeaders(request.raw.headers);
+
    const result = await this.auth.api.getSession({ headers });

    if (!result) {
@@ -97,6 +38,8 @@ export class AdminGuard implements CanActivate {

    const user = result.user as UserWithRole;

+    // Ensure the role field is populated. better-auth should include additionalFields
+    // in the session, but as a fallback, fetch the role from the database if needed.
    let userRole = user.role;
    if (!userRole) {
      const [dbUser] = await this.db
@@ -105,6 +48,7 @@ export class AdminGuard implements CanActivate {
        .where(eq(usersTable.id, user.id))
        .limit(1);
      userRole = dbUser?.role ?? 'member';
+      // Update the session user object with the fetched role
      (user as UserWithRole).role = userRole;
    }

@@ -112,9 +56,8 @@ export class AdminGuard implements CanActivate {
      throw new ForbiddenException('Admin access required');
    }

-    const req = request as AuthenticatedRequest;
-    req.user = result.user;
-    req.session = result.session;
+    (request as FastifyRequest & { user: unknown; session: unknown }).user = result.user;
+    (request as FastifyRequest & { user: unknown; session: unknown }).session = result.session;

    return true;
  }
--- a/apps/gateway/src/admin/admin.module.ts
+++ b/apps/gateway/src/admin/admin.module.ts
@@ -1,19 +1,10 @@
 import { Module } from '@nestjs/common';
 import { AdminController } from './admin.controller.js';
 import { AdminHealthController } from './admin-health.controller.js';
-import { AdminJobsController } from './admin-jobs.controller.js';
-import { AdminTokensController } from './admin-tokens.controller.js';
-import { BootstrapController } from './bootstrap.controller.js';
 import { AdminGuard } from './admin.guard.js';

@Module({
-  controllers: [
-    AdminController,
-    AdminHealthController,
-    AdminJobsController,
-    AdminTokensController,
-    BootstrapController,
-  ],
+  controllers: [AdminController, AdminHealthController],
  providers: [AdminGuard],
 })
 export class AdminModule {}
--- a/apps/gateway/src/admin/bootstrap.controller.ts
+++ b/apps/gateway/src/admin/bootstrap.controller.ts
@@ -1,102 +0,0 @@
-import {
-  Body,
-  Controller,
-  ForbiddenException,
-  Get,
-  Inject,
-  InternalServerErrorException,
-  Post,
-} from '@nestjs/common';
-import { randomBytes, createHash } from 'node:crypto';
-import { count, eq, type Db, users as usersTable, adminTokens } from '@mosaicstack/db';
-import type { Auth } from '@mosaicstack/auth';
-import { v4 as uuid } from 'uuid';
-import { AUTH } from '../auth/auth.tokens.js';
-import { DB } from '../database/database.module.js';
-import { BootstrapSetupDto } from './bootstrap.dto.js';
-import type { BootstrapStatusDto, BootstrapResultDto } from './bootstrap.dto.js';
-
-@Controller('api/bootstrap')
-export class BootstrapController {
-  constructor(
-    @Inject(AUTH) private readonly auth: Auth,
-    @Inject(DB) private readonly db: Db,
-  ) {}
-
-  @Get('status')
-  async status(): Promise<BootstrapStatusDto> {
-    const [result] = await this.db.select({ total: count() }).from(usersTable);
-    return { needsSetup: (result?.total ?? 0) === 0 };
-  }
-
-  @Post('setup')
-  async setup(@Body() dto: BootstrapSetupDto): Promise<BootstrapResultDto> {
-    // Only allow setup when zero users exist
-    const [result] = await this.db.select({ total: count() }).from(usersTable);
-    if ((result?.total ?? 0) > 0) {
-      throw new ForbiddenException('Setup already completed — users exist');
-    }
-
-    // Create admin user via BetterAuth API
-    const authApi = this.auth.api as unknown as {
-      createUser: (opts: {
-        body: { name: string; email: string; password: string; role?: string };
-      }) => Promise<{
-        user: { id: string; name: string; email: string };
-      }>;
-    };
-
-    const created = await authApi.createUser({
-      body: {
-        name: dto.name,
-        email: dto.email,
-        password: dto.password,
-        role: 'admin',
-      },
-    });
-
-    // Verify user was created
-    const [user] = await this.db
-      .select()
-      .from(usersTable)
-      .where(eq(usersTable.id, created.user.id))
-      .limit(1);
-
-    if (!user) throw new InternalServerErrorException('User created but not found');
-
-    // Ensure role is admin (createUser may not set it via BetterAuth)
-    if (user.role !== 'admin') {
-      await this.db.update(usersTable).set({ role: 'admin' }).where(eq(usersTable.id, user.id));
-    }
-
-    // Generate admin API token
-    const plaintext = randomBytes(32).toString('hex');
-    const tokenHash = createHash('sha256').update(plaintext).digest('hex');
-    const tokenId = uuid();
-
-    const [token] = await this.db
-      .insert(adminTokens)
-      .values({
-        id: tokenId,
-        userId: user.id,
-        tokenHash,
-        label: 'Initial setup token',
-        scope: 'admin',
-      })
-      .returning();
-
-    return {
-      user: {
-        id: user.id,
-        name: user.name,
-        email: user.email,
-        role: 'admin',
-      },
-      token: {
-        id: token!.id,
-        plaintext,
-        label: token!.label,
-      },
-    };
-  }
-}
--- a/apps/gateway/src/admin/bootstrap.dto.ts
+++ b/apps/gateway/src/admin/bootstrap.dto.ts
@@ -1,31 +0,0 @@
-import { IsString, IsEmail, MinLength } from 'class-validator';
-
-export class BootstrapSetupDto {
-  @IsString()
-  name!: string;
-
-  @IsEmail()
-  email!: string;
-
-  @IsString()
-  @MinLength(8)
-  password!: string;
-}
-
-export interface BootstrapStatusDto {
-  needsSetup: boolean;
-}
-
-export interface BootstrapResultDto {
-  user: {
-    id: string;
-    name: string;
-    email: string;
-    role: string;
-  };
-  token: {
-    id: string;
-    plaintext: string;
-    label: string;
-  };
-}
--- a/apps/gateway/src/admin/bootstrap.e2e.spec.ts
+++ b/apps/gateway/src/admin/bootstrap.e2e.spec.ts
@@ -1,190 +0,0 @@
-/**
- * E2E integration test — POST /api/bootstrap/setup
- *
- * Regression guard for the `import type { BootstrapSetupDto }` class-erasure
- * bug (IUV-M01, issue #436).
- *
- * When `BootstrapSetupDto` is imported with `import type`, TypeScript erases
- * the class at compile time. NestJS then sees `Object` as the `@Body()`
- * metatype, and ValidationPipe with `whitelist:true + forbidNonWhitelisted:true`
- * treats every property as non-whitelisted, returning:
- *
- *   400 { message: ["property email should not exist", "property password should not exist"] }
- *
- * The fix is a plain value import (`import { BootstrapSetupDto }`), which
- * preserves the class reference so Nest can read the class-validator decorators.
- *
- * This test MUST fail if `import type` is re-introduced on `BootstrapSetupDto`.
- * A controller unit test that constructs ValidationPipe manually won't catch
- * this — only the real DI binding path exercises the metatype lookup.
- */
-
-import 'reflect-metadata';
-import { describe, it, expect, afterAll, beforeAll } from 'vitest';
-import { Test } from '@nestjs/testing';
-import { ValidationPipe, type INestApplication } from '@nestjs/common';
-import { FastifyAdapter, type NestFastifyApplication } from '@nestjs/platform-fastify';
-import request from 'supertest';
-import { BootstrapController } from './bootstrap.controller.js';
-import type { BootstrapResultDto } from './bootstrap.dto.js';
-
-// ─── Minimal mock dependencies ───────────────────────────────────────────────
-
-/**
- * We use explicit `@Inject(AUTH)` / `@Inject(DB)` in the controller so we
- * can provide mock values by token without spinning up the real DB or Auth.
- */
-import { AUTH } from '../auth/auth.tokens.js';
-import { DB } from '../database/database.module.js';
-
-const MOCK_USER_ID = 'mock-user-id-001';
-
-const mockAuth = {
-  api: {
-    createUser: () =>
-      Promise.resolve({
-        user: {
-          id: MOCK_USER_ID,
-          name: 'Admin',
-          email: 'admin@example.com',
-        },
-      }),
-  },
-};
-
-// Override db.select() so the second query (verify user exists) returns a user.
-// The bootstrap controller calls select().from() twice:
-//   1. count() to check zero users  → returns [{total: 0}]
-//   2. select().where().limit()     → returns [the created user]
-let selectCallCount = 0;
-const mockDbWithUser = {
-  select: () => {
-    selectCallCount++;
-    return {
-      from: () => {
-        if (selectCallCount === 1) {
-          // First call: count — zero users
-          return Promise.resolve([{ total: 0 }]);
-        }
-        // Subsequent calls: return a mock user row
-        return {
-          where: () => ({
-            limit: () =>
-              Promise.resolve([
-                {
-                  id: MOCK_USER_ID,
-                  name: 'Admin',
-                  email: 'admin@example.com',
-                  role: 'admin',
-                },
-              ]),
-          }),
-        };
-      },
-    };
-  },
-  update: () => ({
-    set: () => ({
-      where: () => Promise.resolve([]),
-    }),
-  }),
-  insert: () => ({
-    values: () => ({
-      returning: () =>
-        Promise.resolve([
-          {
-            id: 'token-id-001',
-            label: 'Initial setup token',
-          },
-        ]),
-    }),
-  }),
-};
-
-// ─── Test suite ───────────────────────────────────────────────────────────────
-
-describe('POST /api/bootstrap/setup — ValidationPipe DTO binding', () => {
-  let app: INestApplication;
-
-  beforeAll(async () => {
-    selectCallCount = 0;
-
-    const moduleRef = await Test.createTestingModule({
-      controllers: [BootstrapController],
-      providers: [
-        { provide: AUTH, useValue: mockAuth },
-        { provide: DB, useValue: mockDbWithUser },
-      ],
-    }).compile();
-
-    app = moduleRef.createNestApplication<NestFastifyApplication>(new FastifyAdapter());
-
-    // Mirror main.ts configuration exactly — this is what reproduced the 400.
-    app.useGlobalPipes(
-      new ValidationPipe({
-        whitelist: true,
-        forbidNonWhitelisted: true,
-        transform: true,
-      }),
-    );
-
-    await app.init();
-    // Fastify requires waiting for the adapter to be ready
-    await app.getHttpAdapter().getInstance().ready();
-  });
-
-  afterAll(async () => {
-    await app.close();
-  });
-
-  it('returns 201 (not 400) when a valid {name, email, password} body is sent', async () => {
-    const res = await request(app.getHttpServer())
-      .post('/api/bootstrap/setup')
-      .send({ name: 'Admin', email: 'admin@example.com', password: 'password123' })
-      .set('Content-Type', 'application/json');
-
-    // Before the fix (import type), Nest ValidationPipe returned 400 with
-    // "property email should not exist" / "property password should not exist"
-    // because the DTO class was erased and every field looked non-whitelisted.
-    expect(res.status).not.toBe(400);
-    expect(res.status).toBe(201);
-    const body = res.body as BootstrapResultDto;
-    expect(body.user).toBeDefined();
-    expect(body.user.email).toBe('admin@example.com');
-    expect(body.token).toBeDefined();
-    expect(body.token.plaintext).toBeDefined();
-  });
-
-  it('returns 400 when extra forbidden properties are sent', async () => {
-    // This proves ValidationPipe IS active and working (forbidNonWhitelisted).
-    const res = await request(app.getHttpServer())
-      .post('/api/bootstrap/setup')
-      .send({
-        name: 'Admin',
-        email: 'admin@example.com',
-        password: 'password123',
-        extraField: 'should-be-rejected',
-      })
-      .set('Content-Type', 'application/json');
-
-    expect(res.status).toBe(400);
-  });
-
-  it('returns 400 when email is invalid', async () => {
-    const res = await request(app.getHttpServer())
-      .post('/api/bootstrap/setup')
-      .send({ name: 'Admin', email: 'not-an-email', password: 'password123' })
-      .set('Content-Type', 'application/json');
-
-    expect(res.status).toBe(400);
-  });
-
-  it('returns 400 when password is too short', async () => {
-    const res = await request(app.getHttpServer())
-      .post('/api/bootstrap/setup')
-      .send({ name: 'Admin', email: 'admin@example.com', password: 'short' })
-      .set('Content-Type', 'application/json');
-
-    expect(res.status).toBe(400);
-  });
-});
--- a/apps/gateway/src/agent/tests/agent-service-ownership.test.ts
+++ b/apps/gateway/src/agent/tests/agent-service-ownership.test.ts
@@ -1,179 +0,0 @@
-import { ForbiddenException } from '@nestjs/common';
-import { describe, expect, it, vi } from 'vitest';
-import { AgentService, type AgentSession } from '../agent.service.js';
-import type { ActorTenantScope } from '../../auth/session-scope.js';
-
-const CONVERSATION_ID = '22222222-2222-4222-8222-222222222222';
-const OWNER_SCOPE: ActorTenantScope = { userId: 'owner-user', tenantId: 'owner-tenant' };
-const FOREIGN_SCOPE: ActorTenantScope = { userId: 'foreign-user', tenantId: 'foreign-tenant' };
-
-type AgentServiceInternals = {
-  sessions: Map<string, AgentSession>;
-  creating: Map<string, Promise<AgentSession>>;
-};
-
-function makeService(operatorMemory: unknown = null): AgentService {
-  return new AgentService(
-    {
-      getDefaultModel: vi.fn(() => null),
-      getRegistry: vi.fn(() => ({})),
-      findModel: vi.fn(),
-      listAvailableModels: vi.fn(() => []),
-    } as never,
-    {} as never,
-    {} as never,
-    { available: false } as never,
-    {} as never,
-    { getToolDefinitions: vi.fn(() => []) } as never,
-    { loadForSession: vi.fn(async () => ({ metaTools: [], promptAdditions: [] })) } as never,
-    null,
-    null,
-    { collect: vi.fn().mockResolvedValue(undefined) } as never,
-    operatorMemory as never,
-  );
-}
-
-function internals(service: AgentService): AgentServiceInternals {
-  return service as unknown as AgentServiceInternals;
-}
-
-function makeSession(scope: ActorTenantScope = OWNER_SCOPE): AgentSession {
-  return {
-    id: CONVERSATION_ID,
-    provider: 'test-provider',
-    modelId: 'test-model',
-    piSession: {
-      thinkingLevel: 'off',
-      getAvailableThinkingLevels: vi.fn().mockReturnValue(['off', 'low', 'high']),
-      setThinkingLevel: vi.fn(),
-      abort: vi.fn().mockResolvedValue(undefined),
-      prompt: vi.fn().mockResolvedValue(undefined),
-      dispose: vi.fn(),
-      getSessionStats: vi.fn(),
-      getContextUsage: vi.fn(),
-    } as unknown as AgentSession['piSession'],
-    listeners: new Set(),
-    unsubscribe: vi.fn(),
-    createdAt: Date.now(),
-    promptCount: 0,
-    channels: new Set(),
-    skillPromptAdditions: [],
-    sandboxDir: '/tmp/tess-session-ownership-test',
-    allowedTools: null,
-    userId: scope.userId,
-    tenantId: scope.tenantId,
-    metrics: {
-      tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-      modelSwitches: 0,
-      messageCount: 0,
-      lastActivityAt: new Date('2026-07-12T00:00:00Z').toISOString(),
-    },
-  };
-}
-
-describe('AgentService owner/tenant scope enforcement', () => {
-  it('allows owner-scoped operations and rejects foreign scopes for seeded sessions', async () => {
-    const service = makeService();
-    const session = makeSession();
-    internals(service).sessions.set(CONVERSATION_ID, session);
-
-    expect(service.getSession(CONVERSATION_ID, OWNER_SCOPE)).toBe(session);
-    expect(service.getSession(CONVERSATION_ID, FOREIGN_SCOPE)).toBeUndefined();
-    expect(service.getSessionInfo(CONVERSATION_ID, FOREIGN_SCOPE)).toBeUndefined();
-    expect(service.listSessions(OWNER_SCOPE)).toHaveLength(1);
-    expect(service.listSessions(FOREIGN_SCOPE)).toEqual([]);
-
-    service.addChannel(CONVERSATION_ID, 'websocket:owner', OWNER_SCOPE);
-    expect(session.channels.has('websocket:owner')).toBe(true);
-    expect(() => service.addChannel(CONVERSATION_ID, 'websocket:foreign', FOREIGN_SCOPE)).toThrow(
-      ForbiddenException,
-    );
-    expect(() => service.removeChannel(CONVERSATION_ID, 'websocket:owner', FOREIGN_SCOPE)).toThrow(
-      ForbiddenException,
-    );
-
-    expect(() =>
-      service.updateSessionModel(CONVERSATION_ID, 'foreign-model', FOREIGN_SCOPE),
-    ).toThrow(ForbiddenException);
-    service.updateSessionModel(CONVERSATION_ID, 'owner-model', OWNER_SCOPE);
-    expect(session.modelId).toBe('owner-model');
-
-    expect(() =>
-      service.applyAgentConfig(CONVERSATION_ID, 'agent-foreign', 'Foreign Agent', FOREIGN_SCOPE),
-    ).toThrow(ForbiddenException);
-    service.applyAgentConfig(CONVERSATION_ID, 'agent-owner', 'Owner Agent', OWNER_SCOPE);
-    expect(session.agentConfigId).toBe('agent-owner');
-
-    expect(() => service.onEvent(CONVERSATION_ID, vi.fn(), FOREIGN_SCOPE)).toThrow(
-      ForbiddenException,
-    );
-    const cleanup = service.onEvent(CONVERSATION_ID, vi.fn(), OWNER_SCOPE);
-    cleanup();
-
-    await expect(
-      service.prompt(CONVERSATION_ID, 'foreign prompt', FOREIGN_SCOPE),
-    ).rejects.toBeInstanceOf(ForbiddenException);
-    await service.prompt(CONVERSATION_ID, 'owner prompt', OWNER_SCOPE);
-    expect(session.piSession.prompt).toHaveBeenCalledWith('owner prompt');
-
-    await expect(service.destroySession(CONVERSATION_ID, FOREIGN_SCOPE)).rejects.toBeInstanceOf(
-      ForbiddenException,
-    );
-    expect(internals(service).sessions.has(CONVERSATION_ID)).toBe(true);
-
-    await service.destroySession(CONVERSATION_ID, OWNER_SCOPE);
-    expect(session.piSession.dispose).toHaveBeenCalled();
-    expect(internals(service).sessions.has(CONVERSATION_ID)).toBe(false);
-  });
-
-  it('derives the operator-memory scope on the createSession production path', async () => {
-    const plugin = { capture: vi.fn(), search: vi.fn() };
-    const service = makeService(plugin);
-    const buildTools = vi.spyOn(service as never, 'buildToolsForSandbox').mockReturnValue([]);
-
-    // Session construction reaches the real scope derivation before the intentionally incomplete
-    // Pi test double rejects later in createAgentSession.
-    await service.createSession(CONVERSATION_ID, OWNER_SCOPE).catch(() => undefined);
-
-    expect(buildTools).toHaveBeenCalledWith(expect.any(String), OWNER_SCOPE.userId, {
-      tenantId: OWNER_SCOPE.tenantId,
-      ownerId: OWNER_SCOPE.userId,
-      sessionId: CONVERSATION_ID,
-    });
-  });
-
-  it('denies a foreign actor before it can obtain another session operator-memory scope', async () => {
-    const plugin = { capture: vi.fn(), search: vi.fn() };
-    const service = makeService(plugin);
-    internals(service).sessions.set(CONVERSATION_ID, makeSession());
-    const buildTools = vi.spyOn(service as never, 'buildToolsForSandbox');
-
-    await expect(service.createSession(CONVERSATION_ID, FOREIGN_SCOPE)).rejects.toBeInstanceOf(
-      ForbiddenException,
-    );
-
-    expect(buildTools).not.toHaveBeenCalled();
-    expect(plugin.capture).not.toHaveBeenCalled();
-    expect(plugin.search).not.toHaveBeenCalled();
-  });
-
-  it('checks owner/tenant scope before returning an in-flight session creation', async () => {
-    const service = makeService();
-    const session = makeSession();
-    internals(service).creating.set(CONVERSATION_ID, Promise.resolve(session));
-
-    await expect(
-      service.createSession(CONVERSATION_ID, {
-        userId: FOREIGN_SCOPE.userId,
-        tenantId: FOREIGN_SCOPE.tenantId,
-      }),
-    ).rejects.toBeInstanceOf(ForbiddenException);
-
-    await expect(
-      service.createSession(CONVERSATION_ID, {
-        userId: OWNER_SCOPE.userId,
-        tenantId: OWNER_SCOPE.tenantId,
-      }),
-    ).resolves.toBe(session);
-  });
-});
--- a/apps/gateway/src/agent/tests/provider-adapters.test.ts
+++ b/apps/gateway/src/agent/tests/provider-adapters.test.ts
@@ -1,770 +0,0 @@
-/**
- * Provider Adapter Integration Tests — M3-012
- *
- * Verifies that all five provider adapters (Anthropic, OpenAI, OpenRouter, Z.ai, Ollama)
- * are properly integrated: registration, model listing, graceful degradation without
- * API keys, capability matrix correctness, and ProviderCredentialsService behaviour.
- *
- * These tests are designed to run in CI with no real API keys; they test graceful
- * degradation and static configuration rather than live network calls.
- */
-
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { ModelRegistry, AuthStorage } from '@mariozechner/pi-coding-agent';
-import { AnthropicAdapter } from '../adapters/anthropic.adapter.js';
-import { OpenAIAdapter } from '../adapters/openai.adapter.js';
-import { OpenRouterAdapter } from '../adapters/openrouter.adapter.js';
-import { ZaiAdapter } from '../adapters/zai.adapter.js';
-import { OllamaAdapter } from '../adapters/ollama.adapter.js';
-import { ProviderService } from '../provider.service.js';
-import {
-  getModelCapability,
-  MODEL_CAPABILITIES,
-  findModelsByCapability,
-} from '../model-capabilities.js';
-
-// ---------------------------------------------------------------------------
-// Environment helpers
-// ---------------------------------------------------------------------------
-
-const ALL_PROVIDER_KEYS = [
-  'ANTHROPIC_API_KEY',
-  'OPENAI_API_KEY',
-  'OPENROUTER_API_KEY',
-  'ZAI_API_KEY',
-  'ZAI_BASE_URL',
-  'OLLAMA_BASE_URL',
-  'OLLAMA_HOST',
-  'OLLAMA_MODELS',
-  'BETTER_AUTH_SECRET',
-] as const;
-
-type EnvKey = (typeof ALL_PROVIDER_KEYS)[number];
-
-function saveAndClearEnv(): Map<EnvKey, string | undefined> {
-  const saved = new Map<EnvKey, string | undefined>();
-  for (const key of ALL_PROVIDER_KEYS) {
-    saved.set(key, process.env[key]);
-    delete process.env[key];
-  }
-  return saved;
-}
-
-function restoreEnv(saved: Map<EnvKey, string | undefined>): void {
-  for (const key of ALL_PROVIDER_KEYS) {
-    const value = saved.get(key);
-    if (value === undefined) {
-      delete process.env[key];
-    } else {
-      process.env[key] = value;
-    }
-  }
-}
-
-function makeRegistry(): ModelRegistry {
-  return ModelRegistry.inMemory(AuthStorage.inMemory());
-}
-
-// ---------------------------------------------------------------------------
-// 1. Adapter registration tests
-// ---------------------------------------------------------------------------
-
-describe('AnthropicAdapter', () => {
-  let savedEnv: Map<EnvKey, string | undefined>;
-
-  beforeEach(() => {
-    savedEnv = saveAndClearEnv();
-  });
-
-  afterEach(() => {
-    restoreEnv(savedEnv);
-  });
-
-  it('skips registration gracefully when ANTHROPIC_API_KEY is missing', async () => {
-    const adapter = new AnthropicAdapter(makeRegistry());
-    await expect(adapter.register()).resolves.toBeUndefined();
-    expect(adapter.listModels()).toEqual([]);
-  });
-
-  it('registers and listModels returns expected models when ANTHROPIC_API_KEY is set', async () => {
-    process.env['ANTHROPIC_API_KEY'] = 'sk-ant-test';
-    const adapter = new AnthropicAdapter(makeRegistry());
-    await adapter.register();
-
-    const models = adapter.listModels();
-    expect(models.length).toBeGreaterThan(0);
-
-    const ids = models.map((m) => m.id);
-    expect(ids).toContain('claude-opus-4-6');
-    expect(ids).toContain('claude-sonnet-4-6');
-    expect(ids).toContain('claude-haiku-4-5');
-
-    for (const model of models) {
-      expect(model.provider).toBe('anthropic');
-      expect(model.contextWindow).toBe(200000);
-    }
-  });
-
-  it('healthCheck returns down with error when ANTHROPIC_API_KEY is missing', async () => {
-    const adapter = new AnthropicAdapter(makeRegistry());
-    const health = await adapter.healthCheck();
-    expect(health.status).toBe('down');
-    expect(health.error).toMatch(/ANTHROPIC_API_KEY/);
-    expect(health.lastChecked).toBeTruthy();
-  });
-
-  it('adapter name is "anthropic"', () => {
-    expect(new AnthropicAdapter(makeRegistry()).name).toBe('anthropic');
-  });
-});
-
-describe('OpenAIAdapter', () => {
-  let savedEnv: Map<EnvKey, string | undefined>;
-
-  beforeEach(() => {
-    savedEnv = saveAndClearEnv();
-  });
-
-  afterEach(() => {
-    restoreEnv(savedEnv);
-  });
-
-  it('skips registration gracefully when OPENAI_API_KEY is missing', async () => {
-    const adapter = new OpenAIAdapter(makeRegistry());
-    await expect(adapter.register()).resolves.toBeUndefined();
-    expect(adapter.listModels()).toEqual([]);
-  });
-
-  it('registers and listModels returns Codex model when OPENAI_API_KEY is set', async () => {
-    process.env['OPENAI_API_KEY'] = 'sk-openai-test';
-    const adapter = new OpenAIAdapter(makeRegistry());
-    await adapter.register();
-
-    const models = adapter.listModels();
-    expect(models.length).toBeGreaterThan(0);
-
-    const ids = models.map((m) => m.id);
-    expect(ids).toContain(OpenAIAdapter.CODEX_MODEL_ID);
-
-    const codex = models.find((m) => m.id === OpenAIAdapter.CODEX_MODEL_ID)!;
-    expect(codex.provider).toBe('openai');
-    expect(codex.contextWindow).toBe(128_000);
-    expect(codex.maxTokens).toBe(16_384);
-  });
-
-  it('healthCheck returns down with error when OPENAI_API_KEY is missing', async () => {
-    const adapter = new OpenAIAdapter(makeRegistry());
-    const health = await adapter.healthCheck();
-    expect(health.status).toBe('down');
-    expect(health.error).toMatch(/OPENAI_API_KEY/);
-  });
-
-  it('adapter name is "openai"', () => {
-    expect(new OpenAIAdapter(makeRegistry()).name).toBe('openai');
-  });
-});
-
-describe('OpenRouterAdapter', () => {
-  let savedEnv: Map<EnvKey, string | undefined>;
-
-  beforeEach(() => {
-    savedEnv = saveAndClearEnv();
-    // Prevent real network calls during registration — stub global fetch
-    vi.stubGlobal(
-      'fetch',
-      vi.fn().mockResolvedValue({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            data: [
-              {
-                id: 'openai/gpt-4o',
-                name: 'GPT-4o',
-                context_length: 128000,
-                top_provider: { max_completion_tokens: 4096 },
-                pricing: { prompt: '0.000005', completion: '0.000015' },
-                architecture: { input_modalities: ['text', 'image'] },
-              },
-            ],
-          }),
-      }),
-    );
-  });
-
-  afterEach(() => {
-    restoreEnv(savedEnv);
-    vi.unstubAllGlobals();
-  });
-
-  it('skips registration gracefully when OPENROUTER_API_KEY is missing', async () => {
-    vi.unstubAllGlobals(); // no fetch call expected
-    const adapter = new OpenRouterAdapter();
-    await expect(adapter.register()).resolves.toBeUndefined();
-    expect(adapter.listModels()).toEqual([]);
-  });
-
-  it('registers and listModels returns models when OPENROUTER_API_KEY is set', async () => {
-    process.env['OPENROUTER_API_KEY'] = 'sk-or-test';
-    const adapter = new OpenRouterAdapter();
-    await adapter.register();
-
-    const models = adapter.listModels();
-    expect(models.length).toBeGreaterThan(0);
-
-    const first = models[0]!;
-    expect(first.provider).toBe('openrouter');
-    expect(first.id).toBe('openai/gpt-4o');
-    expect(first.inputTypes).toContain('image');
-  });
-
-  it('healthCheck returns down with error when OPENROUTER_API_KEY is missing', async () => {
-    vi.unstubAllGlobals(); // no fetch call expected
-    const adapter = new OpenRouterAdapter();
-    const health = await adapter.healthCheck();
-    expect(health.status).toBe('down');
-    expect(health.error).toMatch(/OPENROUTER_API_KEY/);
-  });
-
-  it('continues registration with empty model list when model fetch fails', async () => {
-    process.env['OPENROUTER_API_KEY'] = 'sk-or-test';
-    vi.stubGlobal(
-      'fetch',
-      vi.fn().mockResolvedValue({
-        ok: false,
-        status: 500,
-      }),
-    );
-    const adapter = new OpenRouterAdapter();
-    await expect(adapter.register()).resolves.toBeUndefined();
-    expect(adapter.listModels()).toEqual([]);
-  });
-
-  it('adapter name is "openrouter"', () => {
-    expect(new OpenRouterAdapter().name).toBe('openrouter');
-  });
-});
-
-describe('ZaiAdapter', () => {
-  let savedEnv: Map<EnvKey, string | undefined>;
-
-  beforeEach(() => {
-    savedEnv = saveAndClearEnv();
-  });
-
-  afterEach(() => {
-    restoreEnv(savedEnv);
-  });
-
-  it('skips registration gracefully when ZAI_API_KEY is missing', async () => {
-    const adapter = new ZaiAdapter();
-    await expect(adapter.register()).resolves.toBeUndefined();
-    expect(adapter.listModels()).toEqual([]);
-  });
-
-  it('registers and listModels returns glm-5 when ZAI_API_KEY is set', async () => {
-    process.env['ZAI_API_KEY'] = 'zai-test-key';
-    const adapter = new ZaiAdapter();
-    await adapter.register();
-
-    const models = adapter.listModels();
-    expect(models.length).toBeGreaterThan(0);
-
-    const ids = models.map((m) => m.id);
-    expect(ids).toContain('glm-5');
-
-    const glm = models.find((m) => m.id === 'glm-5')!;
-    expect(glm.provider).toBe('zai');
-  });
-
-  it('healthCheck returns down with error when ZAI_API_KEY is missing', async () => {
-    const adapter = new ZaiAdapter();
-    const health = await adapter.healthCheck();
-    expect(health.status).toBe('down');
-    expect(health.error).toMatch(/ZAI_API_KEY/);
-  });
-
-  it('adapter name is "zai"', () => {
-    expect(new ZaiAdapter().name).toBe('zai');
-  });
-});
-
-describe('OllamaAdapter', () => {
-  let savedEnv: Map<EnvKey, string | undefined>;
-
-  beforeEach(() => {
-    savedEnv = saveAndClearEnv();
-  });
-
-  afterEach(() => {
-    restoreEnv(savedEnv);
-  });
-
-  it('skips registration gracefully when OLLAMA_BASE_URL is missing', async () => {
-    const adapter = new OllamaAdapter(makeRegistry());
-    await expect(adapter.register()).resolves.toBeUndefined();
-    expect(adapter.listModels()).toEqual([]);
-  });
-
-  it('registers via OLLAMA_HOST fallback when OLLAMA_BASE_URL is absent', async () => {
-    process.env['OLLAMA_HOST'] = 'http://localhost:11434';
-    const adapter = new OllamaAdapter(makeRegistry());
-    await adapter.register();
-    const models = adapter.listModels();
-    expect(models.length).toBeGreaterThan(0);
-  });
-
-  it('registers default models (llama3.2, codellama, mistral) + embedding models', async () => {
-    process.env['OLLAMA_BASE_URL'] = 'http://localhost:11434';
-    const adapter = new OllamaAdapter(makeRegistry());
-    await adapter.register();
-
-    const models = adapter.listModels();
-    const ids = models.map((m) => m.id);
-
-    // Default completion models
-    expect(ids).toContain('llama3.2');
-    expect(ids).toContain('codellama');
-    expect(ids).toContain('mistral');
-
-    // Embedding models
-    expect(ids).toContain('nomic-embed-text');
-    expect(ids).toContain('mxbai-embed-large');
-
-    for (const model of models) {
-      expect(model.provider).toBe('ollama');
-    }
-  });
-
-  it('registers custom OLLAMA_MODELS list', async () => {
-    process.env['OLLAMA_BASE_URL'] = 'http://localhost:11434';
-    process.env['OLLAMA_MODELS'] = 'phi3,gemma2';
-    const adapter = new OllamaAdapter(makeRegistry());
-    await adapter.register();
-
-    const completionIds = adapter.listModels().map((m) => m.id);
-    expect(completionIds).toContain('phi3');
-    expect(completionIds).toContain('gemma2');
-    expect(completionIds).not.toContain('llama3.2');
-  });
-
-  it('healthCheck returns down with error when OLLAMA_BASE_URL is missing', async () => {
-    const adapter = new OllamaAdapter(makeRegistry());
-    const health = await adapter.healthCheck();
-    expect(health.status).toBe('down');
-    expect(health.error).toMatch(/OLLAMA_BASE_URL/);
-  });
-
-  it('adapter name is "ollama"', () => {
-    expect(new OllamaAdapter(makeRegistry()).name).toBe('ollama');
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 2. ProviderService integration
-// ---------------------------------------------------------------------------
-
-describe('ProviderService — adapter array integration', () => {
-  let savedEnv: Map<EnvKey, string | undefined>;
-
-  beforeEach(() => {
-    savedEnv = saveAndClearEnv();
-  });
-
-  afterEach(() => {
-    restoreEnv(savedEnv);
-  });
-
-  it('contains all 5 adapters (ollama, anthropic, openai, openrouter, zai)', async () => {
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    // Exercise getAdapter for all five known provider names
-    const expectedProviders = ['ollama', 'anthropic', 'openai', 'openrouter', 'zai'];
-    for (const name of expectedProviders) {
-      const adapter = service.getAdapter(name);
-      expect(adapter, `Expected adapter "${name}" to be registered`).toBeDefined();
-      expect(adapter!.name).toBe(name);
-    }
-  });
-
-  it('healthCheckAll runs without crashing and returns status for all 5 providers', async () => {
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    const results = await service.healthCheckAll();
-    expect(typeof results).toBe('object');
-
-    const expectedProviders = ['ollama', 'anthropic', 'openai', 'openrouter', 'zai'];
-    for (const name of expectedProviders) {
-      const health = results[name];
-      expect(health, `Expected health result for provider "${name}"`).toBeDefined();
-      expect(['healthy', 'degraded', 'down']).toContain(health!.status);
-      expect(health!.lastChecked).toBeTruthy();
-    }
-  });
-
-  it('healthCheckAll reports "down" for all providers when no keys are set', async () => {
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    const results = await service.healthCheckAll();
-    // All unconfigured providers should be down (not healthy)
-    for (const [, health] of Object.entries(results)) {
-      expect(['down', 'degraded']).toContain(health.status);
-    }
-  });
-
-  it('getProvidersHealth returns entries for all 5 providers', async () => {
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    const healthList = service.getProvidersHealth();
-    const names = healthList.map((h) => h.name);
-
-    for (const expected of ['ollama', 'anthropic', 'openai', 'openrouter', 'zai']) {
-      expect(names).toContain(expected);
-    }
-
-    for (const entry of healthList) {
-      expect(entry).toHaveProperty('name');
-      expect(entry).toHaveProperty('status');
-      expect(entry).toHaveProperty('lastChecked');
-      expect(typeof entry.modelCount).toBe('number');
-    }
-  });
-
-  it('service initialises without error when all env keys are absent', async () => {
-    const service = new ProviderService(null);
-    await expect(service.onModuleInit()).resolves.toBeUndefined();
-    service.onModuleDestroy();
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 3. Model capability matrix
-// ---------------------------------------------------------------------------
-
-describe('Model capability matrix', () => {
-  const expectedModels: Array<{
-    id: string;
-    provider: string;
-    tier: string;
-    contextWindow: number;
-    reasoning?: boolean;
-    vision?: boolean;
-    embedding?: boolean;
-  }> = [
-    {
-      id: 'claude-opus-4-6',
-      provider: 'anthropic',
-      tier: 'premium',
-      contextWindow: 200000,
-      reasoning: true,
-      vision: true,
-    },
-    {
-      id: 'claude-sonnet-4-6',
-      provider: 'anthropic',
-      tier: 'standard',
-      contextWindow: 200000,
-      reasoning: true,
-      vision: true,
-    },
-    {
-      id: 'claude-haiku-4-5',
-      provider: 'anthropic',
-      tier: 'cheap',
-      contextWindow: 200000,
-      reasoning: false,
-      vision: true,
-    },
-    {
-      id: 'codex-gpt-5.4',
-      provider: 'openai',
-      tier: 'premium',
-      contextWindow: 128000,
-    },
-    {
-      id: 'glm-5',
-      provider: 'zai',
-      tier: 'standard',
-      contextWindow: 128000,
-    },
-    {
-      id: 'llama3.2',
-      provider: 'ollama',
-      tier: 'local',
-      contextWindow: 128000,
-    },
-    {
-      id: 'codellama',
-      provider: 'ollama',
-      tier: 'local',
-      contextWindow: 16000,
-    },
-    {
-      id: 'mistral',
-      provider: 'ollama',
-      tier: 'local',
-      contextWindow: 32000,
-    },
-    {
-      id: 'nomic-embed-text',
-      provider: 'ollama',
-      tier: 'local',
-      contextWindow: 8192,
-      embedding: true,
-    },
-    {
-      id: 'mxbai-embed-large',
-      provider: 'ollama',
-      tier: 'local',
-      contextWindow: 8192,
-      embedding: true,
-    },
-  ];
-
-  it('MODEL_CAPABILITIES contains all expected model IDs', () => {
-    const allIds = MODEL_CAPABILITIES.map((m) => m.id);
-    for (const { id } of expectedModels) {
-      expect(allIds, `Expected model "${id}" in capability matrix`).toContain(id);
-    }
-  });
-
-  it('getModelCapability() returns correct tier and context window for each model', () => {
-    for (const expected of expectedModels) {
-      const cap = getModelCapability(expected.id);
-      expect(cap, `getModelCapability("${expected.id}") should be defined`).toBeDefined();
-      expect(cap!.provider).toBe(expected.provider);
-      expect(cap!.tier).toBe(expected.tier);
-      expect(cap!.contextWindow).toBe(expected.contextWindow);
-    }
-  });
-
-  it('Anthropic models have correct capability flags (tools, streaming, vision, reasoning)', () => {
-    for (const expected of expectedModels.filter((m) => m.provider === 'anthropic')) {
-      const cap = getModelCapability(expected.id)!;
-      expect(cap.capabilities.tools).toBe(true);
-      expect(cap.capabilities.streaming).toBe(true);
-      if (expected.vision !== undefined) {
-        expect(cap.capabilities.vision).toBe(expected.vision);
-      }
-      if (expected.reasoning !== undefined) {
-        expect(cap.capabilities.reasoning).toBe(expected.reasoning);
-      }
-    }
-  });
-
-  it('Embedding models have embedding flag=true and other flags=false', () => {
-    for (const expected of expectedModels.filter((m) => m.embedding)) {
-      const cap = getModelCapability(expected.id)!;
-      expect(cap.capabilities.embedding).toBe(true);
-      expect(cap.capabilities.tools).toBe(false);
-      expect(cap.capabilities.streaming).toBe(false);
-      expect(cap.capabilities.reasoning).toBe(false);
-    }
-  });
-
-  it('findModelsByCapability filters by tier correctly', () => {
-    const premiumModels = findModelsByCapability({ tier: 'premium' });
-    expect(premiumModels.length).toBeGreaterThan(0);
-    for (const m of premiumModels) {
-      expect(m.tier).toBe('premium');
-    }
-  });
-
-  it('findModelsByCapability filters by provider correctly', () => {
-    const anthropicModels = findModelsByCapability({ provider: 'anthropic' });
-    expect(anthropicModels.length).toBe(3);
-    for (const m of anthropicModels) {
-      expect(m.provider).toBe('anthropic');
-    }
-  });
-
-  it('findModelsByCapability filters by capability flags correctly', () => {
-    const reasoningModels = findModelsByCapability({ capabilities: { reasoning: true } });
-    expect(reasoningModels.length).toBeGreaterThan(0);
-    for (const m of reasoningModels) {
-      expect(m.capabilities.reasoning).toBe(true);
-    }
-
-    const embeddingModels = findModelsByCapability({ capabilities: { embedding: true } });
-    expect(embeddingModels.length).toBeGreaterThan(0);
-    for (const m of embeddingModels) {
-      expect(m.capabilities.embedding).toBe(true);
-    }
-  });
-
-  it('getModelCapability returns undefined for unknown model IDs', () => {
-    expect(getModelCapability('not-a-real-model')).toBeUndefined();
-    expect(getModelCapability('')).toBeUndefined();
-  });
-
-  it('all Anthropic models have maxOutputTokens > 0', () => {
-    const anthropicModels = MODEL_CAPABILITIES.filter((m) => m.provider === 'anthropic');
-    for (const m of anthropicModels) {
-      expect(m.maxOutputTokens).toBeGreaterThan(0);
-    }
-  });
-});
-
-// ---------------------------------------------------------------------------
-// 4. ProviderCredentialsService — unit-level tests (encrypt/decrypt logic)
-// ---------------------------------------------------------------------------
-
-describe('ProviderCredentialsService — encryption helpers', () => {
-  let savedEnv: Map<EnvKey, string | undefined>;
-
-  beforeEach(() => {
-    savedEnv = saveAndClearEnv();
-  });
-
-  afterEach(() => {
-    restoreEnv(savedEnv);
-  });
-
-  /**
-   * The service uses module-level functions (encrypt/decrypt) that depend on
-   * BETTER_AUTH_SECRET. We test the behaviour through the service's public API
-   * using an in-memory mock DB so no real Postgres connection is needed.
-   */
-  it('store/retrieve/remove work correctly with mock DB and BETTER_AUTH_SECRET set', async () => {
-    process.env['BETTER_AUTH_SECRET'] = 'test-secret-for-unit-tests-only';
-
-    // Build a minimal in-memory DB mock
-    const rows = new Map<
-      string,
-      {
-        encryptedValue: string;
-        credentialType: string;
-        expiresAt: Date | null;
-        metadata: null;
-        createdAt: Date;
-        updatedAt: Date;
-      }
-    >();
-
-    // We import the service but mock its DB dependency manually
-    // by testing the encrypt/decrypt indirectly — using the real module.
-    const { ProviderCredentialsService } = await import('../provider-credentials.service.js');
-
-    // Capture stored value from upsert call
-    let storedEncryptedValue = '';
-    let storedCredentialType = '';
-    const captureInsert = vi.fn().mockImplementation(() => ({
-      values: vi
-        .fn()
-        .mockImplementation((data: { encryptedValue: string; credentialType: string }) => {
-          storedEncryptedValue = data.encryptedValue;
-          storedCredentialType = data.credentialType;
-          rows.set('user1:anthropic', {
-            encryptedValue: data.encryptedValue,
-            credentialType: data.credentialType,
-            expiresAt: null,
-            metadata: null,
-            createdAt: new Date(),
-            updatedAt: new Date(),
-          });
-          return {
-            onConflictDoUpdate: vi.fn().mockResolvedValue(undefined),
-          };
-        }),
-    }));
-
-    const captureSelect = vi.fn().mockReturnValue({
-      from: vi.fn().mockReturnValue({
-        where: vi.fn().mockReturnValue({
-          limit: vi.fn().mockImplementation(() => {
-            const row = rows.get('user1:anthropic');
-            return Promise.resolve(row ? [row] : []);
-          }),
-        }),
-      }),
-    });
-
-    const captureDelete = vi.fn().mockReturnValue({
-      where: vi.fn().mockResolvedValue(undefined),
-    });
-
-    const db = {
-      insert: captureInsert,
-      select: captureSelect,
-      delete: captureDelete,
-    };
-
-    const service = new ProviderCredentialsService(db as never);
-
-    // store
-    await service.store('user1', 'anthropic', 'api_key', 'sk-ant-secret-value');
-
-    // verify encrypted value is not plain text
-    expect(storedEncryptedValue).not.toBe('sk-ant-secret-value');
-    expect(storedEncryptedValue.length).toBeGreaterThan(0);
-    expect(storedCredentialType).toBe('api_key');
-
-    // retrieve
-    const retrieved = await service.retrieve('user1', 'anthropic');
-    expect(retrieved).toBe('sk-ant-secret-value');
-
-    // remove (clears the row)
-    rows.delete('user1:anthropic');
-    const afterRemove = await service.retrieve('user1', 'anthropic');
-    expect(afterRemove).toBeNull();
-  });
-
-  it('retrieve returns null when no credential is stored', async () => {
-    process.env['BETTER_AUTH_SECRET'] = 'test-secret-for-unit-tests-only';
-
-    const { ProviderCredentialsService } = await import('../provider-credentials.service.js');
-
-    const emptyDb = {
-      select: vi.fn().mockReturnValue({
-        from: vi.fn().mockReturnValue({
-          where: vi.fn().mockReturnValue({
-            limit: vi.fn().mockResolvedValue([]),
-          }),
-        }),
-      }),
-    };
-
-    const service = new ProviderCredentialsService(emptyDb as never);
-    const result = await service.retrieve('user-nobody', 'anthropic');
-    expect(result).toBeNull();
-  });
-
-  it('listProviders returns only metadata, never decrypted values', async () => {
-    process.env['BETTER_AUTH_SECRET'] = 'test-secret-for-unit-tests-only';
-
-    const { ProviderCredentialsService } = await import('../provider-credentials.service.js');
-
-    const fakeRow = {
-      provider: 'anthropic',
-      credentialType: 'api_key',
-      expiresAt: null,
-      metadata: null,
-      createdAt: new Date(),
-      updatedAt: new Date(),
-    };
-
-    const listDb = {
-      select: vi.fn().mockReturnValue({
-        from: vi.fn().mockReturnValue({
-          where: vi.fn().mockResolvedValue([fakeRow]),
-        }),
-      }),
-    };
-
-    const service = new ProviderCredentialsService(listDb as never);
-    const providers = await service.listProviders('user1');
-
-    expect(providers).toHaveLength(1);
-    expect(providers[0]!.provider).toBe('anthropic');
-    expect(providers[0]!.credentialType).toBe('api_key');
-    expect(providers[0]!.exists).toBe(true);
-
-    // Critically: no encrypted or plain-text value is exposed
-    expect(providers[0]).not.toHaveProperty('encryptedValue');
-    expect(providers[0]).not.toHaveProperty('value');
-    expect(providers[0]).not.toHaveProperty('apiKey');
-  });
-});
--- a/apps/gateway/src/agent/tests/provider.service.test.ts
+++ b/apps/gateway/src/agent/tests/provider.service.test.ts
@@ -1,142 +0,0 @@
-import { beforeEach, afterEach, describe, expect, it } from 'vitest';
-import { ProviderService } from '../provider.service.js';
-
-const ENV_KEYS = [
-  'ANTHROPIC_API_KEY',
-  'OPENAI_API_KEY',
-  'ZAI_API_KEY',
-  'OLLAMA_BASE_URL',
-  'OLLAMA_HOST',
-  'OLLAMA_MODELS',
-  'MOSAIC_CUSTOM_PROVIDERS',
-] as const;
-
-type EnvKey = (typeof ENV_KEYS)[number];
-
-describe('ProviderService', () => {
-  const savedEnv = new Map<EnvKey, string | undefined>();
-
-  beforeEach(() => {
-    for (const key of ENV_KEYS) {
-      savedEnv.set(key, process.env[key]);
-      delete process.env[key];
-    }
-  });
-
-  afterEach(() => {
-    for (const key of ENV_KEYS) {
-      const value = savedEnv.get(key);
-      if (value === undefined) {
-        delete process.env[key];
-      } else {
-        process.env[key] = value;
-      }
-    }
-  });
-
-  it('skips API-key providers when env vars are missing (no models become available)', async () => {
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    // Pi's built-in registry may include model definitions for all providers, but
-    // without API keys none of them should be available (usable).
-    const availableModels = service.listAvailableModels();
-    const availableProviderIds = new Set(availableModels.map((m) => m.provider));
-
-    expect(availableProviderIds).not.toContain('anthropic');
-    expect(availableProviderIds).not.toContain('openai');
-    expect(availableProviderIds).not.toContain('zai');
-
-    // Providers list may show built-in providers, but they should not be marked available
-    const providers = service.listProviders();
-    for (const p of providers.filter((p) => ['anthropic', 'openai', 'zai'].includes(p.id))) {
-      expect(p.available).toBe(false);
-    }
-  });
-
-  it('registers Anthropic provider with correct models when ANTHROPIC_API_KEY is set', async () => {
-    process.env['ANTHROPIC_API_KEY'] = 'test-anthropic';
-
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    const providers = service.listProviders();
-    const anthropic = providers.find((p) => p.id === 'anthropic');
-    expect(anthropic).toBeDefined();
-    expect(anthropic!.available).toBe(true);
-    expect(anthropic!.models.map((m) => m.id)).toEqual([
-      'claude-opus-4-6',
-      'claude-sonnet-4-6',
-      'claude-haiku-4-5',
-    ]);
-    // All Anthropic models have 200k context window
-    for (const m of anthropic!.models) {
-      expect(m.contextWindow).toBe(200000);
-    }
-  });
-
-  it('registers OpenAI provider with correct models when OPENAI_API_KEY is set', async () => {
-    process.env['OPENAI_API_KEY'] = 'test-openai';
-
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    const providers = service.listProviders();
-    const openai = providers.find((p) => p.id === 'openai');
-    expect(openai).toBeDefined();
-    expect(openai!.available).toBe(true);
-    expect(openai!.models.map((m) => m.id)).toEqual(['codex-gpt-5-4']);
-  });
-
-  it('registers Z.ai provider with correct models when ZAI_API_KEY is set', async () => {
-    process.env['ZAI_API_KEY'] = 'test-zai';
-
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    const providers = service.listProviders();
-    const zai = providers.find((p) => p.id === 'zai');
-    expect(zai).toBeDefined();
-    expect(zai!.available).toBe(true);
-    // Pi's registry may include additional glm variants; verify our registered model is present
-    expect(zai!.models.map((m) => m.id)).toContain('glm-5');
-  });
-
-  it('registers all three providers when all keys are set', async () => {
-    process.env['ANTHROPIC_API_KEY'] = 'test-anthropic';
-    process.env['OPENAI_API_KEY'] = 'test-openai';
-    process.env['ZAI_API_KEY'] = 'test-zai';
-
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    const providerIds = service.listProviders().map((p) => p.id);
-    expect(providerIds).toContain('anthropic');
-    expect(providerIds).toContain('openai');
-    expect(providerIds).toContain('zai');
-  });
-
-  it('can find registered Anthropic models by provider+id', async () => {
-    process.env['ANTHROPIC_API_KEY'] = 'test-anthropic';
-
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    const sonnet = service.findModel('anthropic', 'claude-sonnet-4-6');
-    expect(sonnet).toBeDefined();
-    expect(sonnet!.provider).toBe('anthropic');
-    expect(sonnet!.id).toBe('claude-sonnet-4-6');
-  });
-
-  it('can find registered Z.ai models by provider+id', async () => {
-    process.env['ZAI_API_KEY'] = 'test-zai';
-
-    const service = new ProviderService(null);
-    await service.onModuleInit();
-
-    const glm = service.findModel('zai', 'glm-4.5');
-    expect(glm).toBeDefined();
-    expect(glm!.provider).toBe('zai');
-    expect(glm!.id).toBe('glm-4.5');
-  });
-});
--- a/apps/gateway/src/agent/tests/routing.service.test.ts
+++ b/apps/gateway/src/agent/tests/routing.service.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { RoutingService } from '../routing.service.js';
-import type { ModelInfo } from '@mosaicstack/types';
+import type { ModelInfo } from '@mosaic/types';

 const mockModels: ModelInfo[] = [
  {
--- a/apps/gateway/src/agent/tests/runtime-provider-registry.service.test.ts
+++ b/apps/gateway/src/agent/tests/runtime-provider-registry.service.test.ts
@@ -1,370 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import type {
-  AgentRuntimeProvider,
-  RuntimeAttachHandle,
-  RuntimeAttachMode,
-  RuntimeCapability,
-  RuntimeCapabilitySet,
-  RuntimeHealth,
-  RuntimeMessage,
-  RuntimeScope,
-  RuntimeSession,
-  RuntimeSessionTree,
-  RuntimeStreamEvent,
-} from '@mosaicstack/types';
-import { AgentRuntimeProviderRegistry } from '@mosaicstack/agent';
-import type { ActorTenantScope } from '../../auth/session-scope.js';
-import {
-  RuntimeProviderAuditService,
-  RuntimeProviderService,
-  type RuntimeAuditEvent,
-  type RuntimeAuditSink,
-  type RuntimeApprovalVerifier,
-} from '../runtime-provider-registry.service.js';
-
-process.env['MOSAIC_AGENT_NAME'] ??= 'test-runtime-agent';
-
-const OWNER_SCOPE: ActorTenantScope = { userId: 'owner-1', tenantId: 'tenant-1' };
-const CONTEXT = {
-  actorScope: OWNER_SCOPE,
-  channelId: 'cli',
-  correlationId: 'correlation-1',
-};
-
-class RecordingRuntimeProvider implements AgentRuntimeProvider {
-  readonly id = 'fleet';
-  readonly receivedScopes: RuntimeScope[] = [];
-  readonly sentMessages: RuntimeMessage[] = [];
-  terminateCalls = 0;
-  throwAfterSend = false;
-  throwAuthorization = false;
-
-  constructor(private readonly supported: RuntimeCapability[]) {}
-
-  async capabilities(scope: RuntimeScope): Promise<RuntimeCapabilitySet> {
-    this.receivedScopes.push(scope);
-    return { supported: this.supported };
-  }
-
-  async health(scope: RuntimeScope): Promise<RuntimeHealth> {
-    this.receivedScopes.push(scope);
-    return { status: 'healthy', checkedAt: '2026-07-12T00:00:00.000Z' };
-  }
-
-  async listSessions(scope: RuntimeScope): Promise<RuntimeSession[]> {
-    this.receivedScopes.push(scope);
-    return [];
-  }
-
-  async getSessionTree(scope: RuntimeScope): Promise<RuntimeSessionTree[]> {
-    this.receivedScopes.push(scope);
-    return [];
-  }
-
-  async *streamSession(
-    _sessionId: string,
-    _cursor: string | undefined,
-    scope: RuntimeScope,
-  ): AsyncIterable<RuntimeStreamEvent> {
-    this.receivedScopes.push(scope);
-    return;
-  }
-
-  async sendMessage(
-    _sessionId: string,
-    message: RuntimeMessage,
-    scope: RuntimeScope,
-  ): Promise<void> {
-    this.receivedScopes.push(scope);
-    this.sentMessages.push(message);
-    if (this.throwAuthorization) {
-      throw Object.assign(new Error('provider authorization denied'), { code: 'forbidden' });
-    }
-    if (this.throwAfterSend) {
-      throw new Error('provider acknowledgement failed');
-    }
-  }
-
-  async attach(
-    sessionId: string,
-    mode: RuntimeAttachMode,
-    scope: RuntimeScope,
-  ): Promise<RuntimeAttachHandle> {
-    this.receivedScopes.push(scope);
-    return {
-      attachmentId: 'attachment-1',
-      sessionId,
-      mode,
-      expiresAt: '2026-07-12T00:00:00.000Z',
-    };
-  }
-
-  async detach(_attachmentId: string, scope: RuntimeScope): Promise<void> {
-    this.receivedScopes.push(scope);
-  }
-
-  async terminate(_sessionId: string, _approvalRef: string, scope: RuntimeScope): Promise<void> {
-    this.receivedScopes.push(scope);
-    this.terminateCalls += 1;
-  }
-}
-
-class RecordingAuditSink implements RuntimeAuditSink {
-  readonly events: RuntimeAuditEvent[] = [];
-
-  async record(event: RuntimeAuditEvent): Promise<void> {
-    this.events.push(event);
-  }
-}
-
-class DenyingApprovalVerifier implements RuntimeApprovalVerifier {
-  async consume(): Promise<boolean> {
-    return false;
-  }
-}
-
-class AcceptingApprovalVerifier implements RuntimeApprovalVerifier {
-  consumedAction: Parameters<RuntimeApprovalVerifier['consume']>[1] | undefined;
-
-  async consume(
-    _approvalRef: string,
-    action: Parameters<RuntimeApprovalVerifier['consume']>[1],
-  ): Promise<boolean> {
-    this.consumedAction = action;
-    return true;
-  }
-}
-
-function makeService(
-  provider: RecordingRuntimeProvider,
-  audit: RuntimeAuditSink = new RecordingAuditSink(),
-  approval: RuntimeApprovalVerifier = new DenyingApprovalVerifier(),
-): RuntimeProviderService {
-  const registry = new AgentRuntimeProviderRegistry();
-  registry.register(provider);
-  return new RuntimeProviderService(registry, audit, approval);
-}
-
-describe('RuntimeProviderService security boundary', (): void => {
-  it('derives and freezes only the authenticated actor scope while preserving correlation metadata', async (): Promise<void> => {
-    const provider = new RecordingRuntimeProvider(['session.send']);
-    const audit = new RecordingAuditSink();
-    const service = makeService(provider, audit);
-
-    await service.sendMessage(
-      'fleet',
-      'session-1',
-      { content: 'hello', idempotencyKey: 'key-1' },
-      CONTEXT,
-    );
-
-    const providerScope = provider.receivedScopes[0];
-    expect(providerScope).toEqual({
-      actorId: OWNER_SCOPE.userId,
-      tenantId: OWNER_SCOPE.tenantId,
-      channelId: CONTEXT.channelId,
-      correlationId: CONTEXT.correlationId,
-    });
-    expect(Object.isFrozen(providerScope)).toBe(true);
-    expect(audit.events).toContainEqual(
-      expect.objectContaining({
-        providerId: 'fleet',
-        operation: 'session.send',
-        outcome: 'succeeded',
-        actorId: OWNER_SCOPE.userId,
-        tenantId: OWNER_SCOPE.tenantId,
-        channelId: CONTEXT.channelId,
-        correlationId: CONTEXT.correlationId,
-        resourceId: 'session-1',
-        durationMs: expect.any(Number),
-      }),
-    );
-    expect(JSON.stringify(audit.events)).not.toContain('hello');
-    expect(JSON.stringify(audit.events)).not.toContain('key-1');
-  });
-
-  it('does not block a provider operation when an unsafe resource ID is redacted in durable audit', async (): Promise<void> => {
-    const provider = new RecordingRuntimeProvider(['session.send']);
-    let persisted: unknown;
-    const durableAudit = new RuntimeProviderAuditService({
-      logs: {
-        ingest: async (entry: unknown): Promise<unknown> => {
-          persisted = entry;
-          return entry;
-        },
-      },
-    } as never);
-    const service = makeService(provider, durableAudit);
-
-    await service.sendMessage(
-      'fleet',
-      'session/credential-canary=secret-value',
-      { content: 'safe message', idempotencyKey: 'key-1' },
-      CONTEXT,
-    );
-
-    expect(provider.sentMessages).toHaveLength(1);
-    expect(JSON.stringify(persisted)).not.toContain('secret-value');
-  });
-
-  it('fails closed before a provider side effect when a capability is missing', async (): Promise<void> => {
-    const provider = new RecordingRuntimeProvider([]);
-    const service = makeService(provider);
-
-    await expect(
-      service.sendMessage(
-        'fleet',
-        'session-1',
-        { content: 'hello', idempotencyKey: 'key-1' },
-        CONTEXT,
-      ),
-    ).rejects.toThrow(/capability denied/);
-    expect(provider.sentMessages).toEqual([]);
-  });
-
-  it('requires a consumed exact-action approval before termination', async (): Promise<void> => {
-    const provider = new RecordingRuntimeProvider(['session.terminate']);
-    const approval = new DenyingApprovalVerifier();
-    const audit = new RecordingAuditSink();
-    const service = makeService(provider, audit, approval);
-
-    await expect(
-      service.terminate('fleet', 'session-1', 'forged-approval', CONTEXT),
-    ).rejects.toThrow(/approval denied/);
-    expect(provider.terminateCalls).toBe(0);
-    expect(audit.events.at(-1)).toMatchObject({ outcome: 'denied', errorCode: 'policy_denied' });
-  });
-
-  it('binds an accepted termination approval to provider, session, immutable scope, and correlation', async (): Promise<void> => {
-    const provider = new RecordingRuntimeProvider(['session.terminate']);
-    const approval = new AcceptingApprovalVerifier();
-    const service = makeService(provider, new RecordingAuditSink(), approval);
-
-    await service.terminate('fleet', 'session-1', 'approval-1', CONTEXT);
-
-    expect(approval.consumedAction).toEqual({
-      providerId: 'fleet',
-      sessionId: 'session-1',
-      actorId: OWNER_SCOPE.userId,
-      tenantId: OWNER_SCOPE.tenantId,
-      channelId: CONTEXT.channelId,
-      correlationId: CONTEXT.correlationId,
-      agentName: process.env['MOSAIC_AGENT_NAME'],
-    });
-    expect(provider.terminateCalls).toBe(1);
-  });
-
-  it('fails closed before invoking a provider when audit persistence rejects the request', async (): Promise<void> => {
-    const provider = new RecordingRuntimeProvider(['session.send']);
-    const unavailableAudit: RuntimeAuditSink = {
-      async record(): Promise<void> {
-        throw new Error('audit unavailable');
-      },
-    };
-    const service = makeService(provider, unavailableAudit);
-
-    await expect(
-      service.sendMessage(
-        'fleet',
-        'session-1',
-        { content: 'hello', idempotencyKey: 'key-1' },
-        CONTEXT,
-      ),
-    ).rejects.toThrow(/audit unavailable/);
-    expect(provider.sentMessages).toEqual([]);
-  });
-
-  it('records a provider error after invocation as failed rather than denied', async (): Promise<void> => {
-    const provider = new RecordingRuntimeProvider(['session.send']);
-    provider.throwAfterSend = true;
-    const audit = new RecordingAuditSink();
-    const service = makeService(provider, audit);
-
-    await expect(
-      service.sendMessage(
-        'fleet',
-        'session-1',
-        { content: 'hello', idempotencyKey: 'key-1' },
-        CONTEXT,
-      ),
-    ).rejects.toThrow(/provider acknowledgement failed/);
-    expect(provider.sentMessages).toHaveLength(1);
-    expect(audit.events.map((event: RuntimeAuditEvent): string => event.outcome)).toEqual([
-      'requested',
-      'failed',
-    ]);
-    expect(audit.events.at(-1)).toMatchObject({
-      errorCode: 'provider_error',
-      durationMs: expect.any(Number),
-    });
-  });
-
-  it('records a provider authorization rejection as denied rather than provider failure', async (): Promise<void> => {
-    const provider = new RecordingRuntimeProvider(['session.send']);
-    provider.throwAuthorization = true;
-    const audit = new RecordingAuditSink();
-    const service = makeService(provider, audit);
-
-    await expect(
-      service.sendMessage(
-        'fleet',
-        'session-1',
-        { content: 'hello', idempotencyKey: 'key-1' },
-        CONTEXT,
-      ),
-    ).rejects.toThrow(/provider authorization denied/);
-    expect(audit.events.at(-1)).toMatchObject({ outcome: 'denied', errorCode: 'policy_denied' });
-  });
-
-  it('persists only metadata-only runtime audit fields', async (): Promise<void> => {
-    let persisted: unknown;
-    const ingest = async (entry: unknown): Promise<unknown> => {
-      persisted = entry;
-      return entry;
-    };
-    const service = new RuntimeProviderAuditService({ logs: { ingest } } as never);
-
-    await service.record({
-      providerId: 'fleet',
-      operation: 'session.send',
-      outcome: 'succeeded',
-      actorId: 'owner-1',
-      tenantId: 'tenant-1',
-      channelId: 'cli',
-      correlationId: 'correlation-1',
-      resourceId: 'session-1',
-      durationMs: 12,
-    });
-
-    expect(persisted).toMatchObject({
-      content: 'runtime.provider.audit',
-      metadata: expect.objectContaining({ correlationId: 'correlation-1', durationMs: 12 }),
-    });
-    expect(JSON.stringify(persisted)).not.toContain('approval');
-  });
-
-  it('does not misreport a completed provider side effect when completion auditing fails', async (): Promise<void> => {
-    const provider = new RecordingRuntimeProvider(['session.send']);
-    let auditCalls = 0;
-    const audit: RuntimeAuditSink = {
-      async record(): Promise<void> {
-        auditCalls += 1;
-        if (auditCalls === 2) {
-          throw new Error('completion audit unavailable');
-        }
-      },
-    };
-    const service = makeService(provider, audit);
-
-    await expect(
-      service.sendMessage(
-        'fleet',
-        'session-1',
-        { content: 'hello', idempotencyKey: 'key-1' },
-        CONTEXT,
-      ),
-    ).resolves.toBeUndefined();
-    expect(provider.sentMessages).toHaveLength(1);
-    expect(auditCalls).toBe(2);
-  });
-});
--- a/apps/gateway/src/agent/tests/session-ownership.test.ts
+++ b/apps/gateway/src/agent/tests/session-ownership.test.ts
@@ -1,262 +0,0 @@
-import { readFileSync } from 'node:fs';
-import { resolve } from 'node:path';
-import { ForbiddenException, NotFoundException } from '@nestjs/common';
-import { describe, expect, it, vi } from 'vitest';
-
-vi.mock('../agent.service.js', () => ({ AgentService: class AgentService {} }));
-vi.mock('../../commands/command-executor.service.js', () => ({
-  CommandExecutorService: class CommandExecutorService {},
-}));
-vi.mock('../routing/routing-engine.service.js', () => ({
-  RoutingEngineService: class RoutingEngineService {},
-}));
-
-import { SessionsController } from '../sessions.controller.js';
-import { ChatController } from '../../chat/chat.controller.js';
-import { ChatGateway } from '../../chat/chat.gateway.js';
-import type { AgentSession } from '../agent.service.js';
-import type { SessionInfoDto } from '../session.dto.js';
-
-const USER_A = { id: 'user-a', tenantId: 'tenant-a' };
-const USER_B = { id: 'user-b', tenantId: 'tenant-b' };
-const CONVERSATION_ID = '11111111-1111-4111-8111-111111111111';
-
-function makeSessionInfo(overrides?: Partial<SessionInfoDto>): SessionInfoDto {
-  return {
-    id: CONVERSATION_ID,
-    provider: 'test-provider',
-    modelId: 'test-model',
-    createdAt: new Date('2026-07-12T00:00:00Z').toISOString(),
-    promptCount: 0,
-    channels: [],
-    durationMs: 0,
-    metrics: {
-      tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-      modelSwitches: 0,
-      messageCount: 0,
-      lastActivityAt: new Date('2026-07-12T00:00:00Z').toISOString(),
-    },
-    ...overrides,
-  };
-}
-
-function makeAgentSession(owner = USER_A): AgentSession {
-  return {
-    id: CONVERSATION_ID,
-    provider: 'test-provider',
-    modelId: 'test-model',
-    piSession: {
-      thinkingLevel: 'off',
-      getAvailableThinkingLevels: vi.fn().mockReturnValue(['off', 'low', 'high']),
-      setThinkingLevel: vi.fn(),
-      abort: vi.fn().mockResolvedValue(undefined),
-      prompt: vi.fn().mockResolvedValue(undefined),
-      dispose: vi.fn(),
-      getSessionStats: vi.fn(),
-      getContextUsage: vi.fn(),
-    } as unknown as AgentSession['piSession'],
-    listeners: new Set(),
-    unsubscribe: vi.fn(),
-    createdAt: Date.now(),
-    promptCount: 0,
-    channels: new Set(),
-    skillPromptAdditions: [],
-    sandboxDir: '/tmp',
-    allowedTools: null,
-    userId: owner.id,
-    tenantId: owner.tenantId,
-    metrics: {
-      tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-      modelSwitches: 0,
-      messageCount: 0,
-      lastActivityAt: new Date('2026-07-12T00:00:00Z').toISOString(),
-    },
-  };
-}
-
-function makeScopedAgentService() {
-  const foreign = makeAgentSession(USER_A);
-  return {
-    listSessions: vi.fn((scope?: { userId: string; tenantId?: string }) =>
-      scope?.userId === USER_B.id ? [] : [makeSessionInfo({ id: foreign.id })],
-    ),
-    getSessionInfo: vi.fn((_id: string, scope?: { userId: string; tenantId?: string }) =>
-      scope?.userId === USER_B.id ? undefined : makeSessionInfo({ id: foreign.id }),
-    ),
-    destroySession: vi.fn(),
-    getSession: vi.fn((_id: string, scope?: { userId: string; tenantId?: string }) =>
-      scope?.userId === USER_B.id ? undefined : foreign,
-    ),
-    createSession: vi.fn().mockRejectedValue(new ForbiddenException('Session scope mismatch')),
-    onEvent: vi.fn(() => vi.fn()),
-    addChannel: vi.fn(),
-    removeChannel: vi.fn(),
-    recordMessage: vi.fn(),
-    prompt: vi.fn().mockResolvedValue(undefined),
-  };
-}
-
-describe('TESS-M1-SEC-002 AgentService ownership boundary', () => {
-  it('requires explicit owner+tenant scope on protected session operations', () => {
-    const source = readFileSync(resolve('src/agent/agent.service.ts'), 'utf8');
-
-    expect(source).toContain('getSession(sessionId: string, scope: ActorTenantScope)');
-    expect(source).toContain('listSessions(scope: ActorTenantScope)');
-    expect(source).toContain('getSessionInfo(sessionId: string, scope: ActorTenantScope)');
-    expect(source).toContain(
-      'addChannel(sessionId: string, channel: string, scope: ActorTenantScope)',
-    );
-    expect(source).toContain(
-      'removeChannel(sessionId: string, channel: string, scope: ActorTenantScope)',
-    );
-    expect(source).toContain(
-      'async prompt(sessionId: string, message: string, scope: ActorTenantScope)',
-    );
-    expect(source).toContain('scope: ActorTenantScope,');
-    expect(source).toContain('async destroySession(sessionId: string, scope: ActorTenantScope)');
-    expect(source).not.toContain('scope?: ActorTenantScope');
-  });
-});
-
-describe('TESS-M1-SEC-002 REST session ownership and tenant binding', () => {
-  it('lists only sessions owned by the authenticated owner+tenant scope', () => {
-    const agentService = makeScopedAgentService();
-    const controller = new SessionsController(agentService as never);
-
-    expect(controller.list(USER_B)).toEqual({ sessions: [], total: 0 });
-    expect(agentService.listSessions).toHaveBeenCalledWith({
-      userId: USER_B.id,
-      tenantId: USER_B.tenantId,
-    });
-  });
-
-  it('does not reveal another owner/tenant session by guessed id', () => {
-    const agentService = makeScopedAgentService();
-    const controller = new SessionsController(agentService as never);
-
-    expect(() => controller.findOne(CONVERSATION_ID, USER_B)).toThrow(NotFoundException);
-    expect(agentService.getSessionInfo).toHaveBeenCalledWith(CONVERSATION_ID, {
-      userId: USER_B.id,
-      tenantId: USER_B.tenantId,
-    });
-  });
-
-  it('does not terminate another owner/tenant session by guessed id', async () => {
-    const agentService = makeScopedAgentService();
-    const controller = new SessionsController(agentService as never);
-
-    await expect(controller.destroy(CONVERSATION_ID, USER_B)).rejects.toBeInstanceOf(
-      NotFoundException,
-    );
-    expect(agentService.destroySession).not.toHaveBeenCalled();
-  });
-});
-
-describe('TESS-M1-SEC-002 REST chat send ownership and tenant binding', () => {
-  it('does not send a prompt into another owner/tenant session by guessed conversationId', async () => {
-    const agentService = makeScopedAgentService();
-    const controller = new ChatController(agentService as never);
-
-    await expect(
-      controller.chat({ conversationId: CONVERSATION_ID, content: 'take over' }, USER_B),
-    ).rejects.toMatchObject({ status: 404 });
-
-    expect(agentService.getSession).toHaveBeenCalledWith(CONVERSATION_ID, {
-      userId: USER_B.id,
-      tenantId: USER_B.tenantId,
-    });
-    expect(agentService.prompt).not.toHaveBeenCalled();
-  });
-});
-
-describe('TESS-M1-SEC-002 WebSocket session ownership and tenant binding', () => {
-  function makeGateway(agentService = makeScopedAgentService()) {
-    const brain = {
-      conversations: {
-        findById: vi.fn().mockResolvedValue(undefined),
-        create: vi.fn().mockResolvedValue(undefined),
-        update: vi.fn().mockResolvedValue(undefined),
-        findMessages: vi.fn().mockResolvedValue([]),
-        addMessage: vi.fn().mockResolvedValue(undefined),
-      },
-    };
-    const commandRegistry = { getManifest: vi.fn().mockReturnValue([]) };
-    const commandExecutor = { execute: vi.fn() };
-    const routingEngine = {
-      resolve: vi.fn().mockResolvedValue({ provider: 'test', model: 'test-model' }),
-    };
-    const gateway = new ChatGateway(
-      agentService as never,
-      {} as never,
-      brain as never,
-      commandRegistry as never,
-      commandExecutor as never,
-      routingEngine as never,
-    );
-    return { gateway, agentService };
-  }
-
-  function makeSocket() {
-    return {
-      id: 'socket-b',
-      connected: true,
-      data: { user: USER_B, session: { id: 'auth-session-b', userId: USER_B.id } },
-      emit: vi.fn(),
-      disconnect: vi.fn(),
-    };
-  }
-
-  it('does not attach or send to another owner/tenant session by guessed conversationId', async () => {
-    const { gateway, agentService } = makeGateway();
-    const socket = makeSocket();
-
-    await gateway.handleMessage(socket as never, {
-      conversationId: CONVERSATION_ID,
-      content: 'attach to foreign session',
-    });
-
-    expect(agentService.getSession).toHaveBeenCalledWith(CONVERSATION_ID, {
-      userId: USER_B.id,
-      tenantId: USER_B.tenantId,
-    });
-    expect(agentService.onEvent).not.toHaveBeenCalled();
-    expect(agentService.addChannel).not.toHaveBeenCalled();
-    expect(agentService.prompt).not.toHaveBeenCalled();
-    expect(socket.emit).toHaveBeenCalledWith(
-      'error',
-      expect.objectContaining({ conversationId: CONVERSATION_ID }),
-    );
-  });
-
-  it('does not mutate thinking level on another owner/tenant session', () => {
-    const { gateway, agentService } = makeGateway();
-    const socket = makeSocket();
-
-    gateway.handleSetThinking(socket as never, { conversationId: CONVERSATION_ID, level: 'high' });
-
-    expect(agentService.getSession).toHaveBeenCalledWith(CONVERSATION_ID, {
-      userId: USER_B.id,
-      tenantId: USER_B.tenantId,
-    });
-    expect(socket.emit).toHaveBeenCalledWith(
-      'error',
-      expect.objectContaining({ conversationId: CONVERSATION_ID }),
-    );
-  });
-
-  it('does not terminate another owner/tenant session over WebSocket abort', async () => {
-    const { gateway, agentService } = makeGateway();
-    const socket = makeSocket();
-
-    await gateway.handleAbort(socket as never, { conversationId: CONVERSATION_ID });
-
-    expect(agentService.getSession).toHaveBeenCalledWith(CONVERSATION_ID, {
-      userId: USER_B.id,
-      tenantId: USER_B.tenantId,
-    });
-    expect(socket.emit).toHaveBeenCalledWith(
-      'error',
-      expect.objectContaining({ conversationId: CONVERSATION_ID }),
-    );
-  });
-});
--- a/apps/gateway/src/agent/adapters/anthropic.adapter.ts
+++ b/apps/gateway/src/agent/adapters/anthropic.adapter.ts
@@ -1,191 +0,0 @@
-import { Logger } from '@nestjs/common';
-import Anthropic from '@anthropic-ai/sdk';
-import type { ModelRegistry } from '@mariozechner/pi-coding-agent';
-import type {
-  CompletionEvent,
-  CompletionParams,
-  IProviderAdapter,
-  ModelInfo,
-  ProviderHealth,
-} from '@mosaicstack/types';
-
-/**
- * Anthropic provider adapter.
- *
- * Registers Claude models with the Pi ModelRegistry via the Anthropic SDK.
- * Configuration is driven by environment variables:
- *   ANTHROPIC_API_KEY — Anthropic API key (required)
- */
-export class AnthropicAdapter implements IProviderAdapter {
-  readonly name = 'anthropic';
-
-  private readonly logger = new Logger(AnthropicAdapter.name);
-  private client: Anthropic | null = null;
-  private registeredModels: ModelInfo[] = [];
-
-  constructor(private readonly registry: ModelRegistry) {}
-
-  async register(): Promise<void> {
-    const apiKey = process.env['ANTHROPIC_API_KEY'];
-    if (!apiKey) {
-      this.logger.warn('Skipping Anthropic provider registration: ANTHROPIC_API_KEY not set');
-      return;
-    }
-
-    this.client = new Anthropic({ apiKey });
-
-    const models: ModelInfo[] = [
-      {
-        id: 'claude-opus-4-6',
-        provider: 'anthropic',
-        name: 'Claude Opus 4.6',
-        reasoning: true,
-        contextWindow: 200000,
-        maxTokens: 32000,
-        inputTypes: ['text', 'image'],
-        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-      },
-      {
-        id: 'claude-sonnet-4-6',
-        provider: 'anthropic',
-        name: 'Claude Sonnet 4.6',
-        reasoning: true,
-        contextWindow: 200000,
-        maxTokens: 16000,
-        inputTypes: ['text', 'image'],
-        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-      },
-      {
-        id: 'claude-haiku-4-5',
-        provider: 'anthropic',
-        name: 'Claude Haiku 4.5',
-        reasoning: false,
-        contextWindow: 200000,
-        maxTokens: 8192,
-        inputTypes: ['text', 'image'],
-        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-      },
-    ];
-
-    this.registry.registerProvider('anthropic', {
-      apiKey,
-      baseUrl: 'https://api.anthropic.com',
-      api: 'anthropic' as never,
-      models: models.map((m) => ({
-        id: m.id,
-        name: m.name,
-        reasoning: m.reasoning,
-        input: m.inputTypes as ('text' | 'image')[],
-        cost: m.cost,
-        contextWindow: m.contextWindow,
-        maxTokens: m.maxTokens,
-      })),
-    });
-
-    this.registeredModels = models;
-
-    this.logger.log(
-      `Anthropic provider registered with models: ${models.map((m) => m.id).join(', ')}`,
-    );
-  }
-
-  listModels(): ModelInfo[] {
-    return this.registeredModels;
-  }
-
-  async healthCheck(): Promise<ProviderHealth> {
-    const apiKey = process.env['ANTHROPIC_API_KEY'];
-    if (!apiKey) {
-      return {
-        status: 'down',
-        lastChecked: new Date().toISOString(),
-        error: 'ANTHROPIC_API_KEY not configured',
-      };
-    }
-
-    const start = Date.now();
-
-    try {
-      const client = this.client ?? new Anthropic({ apiKey });
-      await client.models.list({ limit: 1 });
-      const latencyMs = Date.now() - start;
-      return { status: 'healthy', latencyMs, lastChecked: new Date().toISOString() };
-    } catch (err) {
-      const latencyMs = Date.now() - start;
-      const error = err instanceof Error ? err.message : String(err);
-      const status = error.includes('401') || error.includes('403') ? 'degraded' : 'down';
-      return { status, latencyMs, lastChecked: new Date().toISOString(), error };
-    }
-  }
-
-  /**
-   * Stream a completion from Anthropic using the messages API.
-   * Maps Anthropic streaming events to the CompletionEvent format.
-   *
-   * Note: Currently reserved for future direct-completion use. The Pi SDK
-   * integration routes completions through ModelRegistry / AgentSession.
-   */
-  async *createCompletion(params: CompletionParams): AsyncIterable<CompletionEvent> {
-    const apiKey = process.env['ANTHROPIC_API_KEY'];
-    if (!apiKey) {
-      throw new Error('AnthropicAdapter: ANTHROPIC_API_KEY not configured');
-    }
-
-    const client = this.client ?? new Anthropic({ apiKey });
-
-    // Separate system messages from user/assistant messages
-    const systemMessages = params.messages.filter((m) => m.role === 'system');
-    const conversationMessages = params.messages.filter((m) => m.role !== 'system');
-
-    const systemPrompt =
-      systemMessages.length > 0 ? systemMessages.map((m) => m.content).join('\n') : undefined;
-
-    const stream = await client.messages.stream({
-      model: params.model,
-      max_tokens: params.maxTokens ?? 1024,
-      ...(systemPrompt !== undefined ? { system: systemPrompt } : {}),
-      messages: conversationMessages.map((m) => ({
-        role: m.role as 'user' | 'assistant',
-        content: m.content,
-      })),
-      ...(params.temperature !== undefined ? { temperature: params.temperature } : {}),
-      ...(params.tools && params.tools.length > 0
-        ? {
-            tools: params.tools.map((t) => ({
-              name: t.name,
-              description: t.description,
-              input_schema: t.parameters as Anthropic.Tool['input_schema'],
-            })),
-          }
-        : {}),
-    });
-
-    for await (const event of stream) {
-      if (event.type === 'content_block_delta' && event.delta.type === 'text_delta') {
-        yield { type: 'text_delta', content: event.delta.text };
-      } else if (event.type === 'content_block_delta' && event.delta.type === 'input_json_delta') {
-        yield { type: 'tool_call', name: '', arguments: event.delta.partial_json };
-      } else if (event.type === 'message_delta' && event.usage) {
-        yield {
-          type: 'done',
-          usage: {
-            inputTokens:
-              (event as { usage: { input_tokens?: number; output_tokens: number } }).usage
-                .input_tokens ?? 0,
-            outputTokens: event.usage.output_tokens,
-          },
-        };
-      }
-    }
-
-    // Emit final done event with full usage from the completed message
-    const finalMessage = await stream.finalMessage();
-    yield {
-      type: 'done',
-      usage: {
-        inputTokens: finalMessage.usage.input_tokens,
-        outputTokens: finalMessage.usage.output_tokens,
-      },
-    };
-  }
-}
--- a/apps/gateway/src/agent/adapters/index.ts
+++ b/apps/gateway/src/agent/adapters/index.ts
@@ -1,5 +0,0 @@
-export { OllamaAdapter } from './ollama.adapter.js';
-export { AnthropicAdapter } from './anthropic.adapter.js';
-export { OpenAIAdapter } from './openai.adapter.js';
-export { OpenRouterAdapter } from './openrouter.adapter.js';
-export { ZaiAdapter } from './zai.adapter.js';
--- a/apps/gateway/src/agent/adapters/ollama.adapter.ts
+++ b/apps/gateway/src/agent/adapters/ollama.adapter.ts
@@ -1,197 +0,0 @@
-import { Logger } from '@nestjs/common';
-import type { ModelRegistry } from '@mariozechner/pi-coding-agent';
-import type {
-  CompletionEvent,
-  CompletionParams,
-  IProviderAdapter,
-  ModelInfo,
-  ProviderHealth,
-} from '@mosaicstack/types';
-
-/** Embedding models that Ollama ships with out of the box */
-const OLLAMA_EMBEDDING_MODELS: ReadonlyArray<{
-  id: string;
-  contextWindow: number;
-  dimensions: number;
-}> = [
-  { id: 'nomic-embed-text', contextWindow: 8192, dimensions: 768 },
-  { id: 'mxbai-embed-large', contextWindow: 512, dimensions: 1024 },
-];
-
-interface OllamaEmbeddingResponse {
-  embedding?: number[];
-}
-
-/**
- * Ollama provider adapter.
- *
- * Registers local Ollama models with the Pi ModelRegistry via the OpenAI-compatible
- * completions API. Also exposes embedding models and an `embed()` method for
- * vector generation (used by EmbeddingService / M3-009).
- *
- * Configuration is driven by environment variables:
- *   OLLAMA_BASE_URL or OLLAMA_HOST — base URL of the Ollama instance
- *   OLLAMA_MODELS              — comma-separated list of model IDs (default: llama3.2,codellama,mistral)
- */
-export class OllamaAdapter implements IProviderAdapter {
-  readonly name = 'ollama';
-
-  private readonly logger = new Logger(OllamaAdapter.name);
-  private registeredModels: ModelInfo[] = [];
-
-  constructor(private readonly registry: ModelRegistry) {}
-
-  async register(): Promise<void> {
-    const ollamaUrl = process.env['OLLAMA_BASE_URL'] ?? process.env['OLLAMA_HOST'];
-    if (!ollamaUrl) {
-      this.logger.debug('Skipping Ollama provider registration: OLLAMA_BASE_URL not set');
-      return;
-    }
-
-    const modelsEnv = process.env['OLLAMA_MODELS'] ?? 'llama3.2,codellama,mistral';
-    const modelIds = modelsEnv
-      .split(',')
-      .map((id: string) => id.trim())
-      .filter(Boolean);
-
-    this.registry.registerProvider('ollama', {
-      baseUrl: `${ollamaUrl}/v1`,
-      apiKey: 'ollama',
-      api: 'openai-completions' as never,
-      models: modelIds.map((id) => ({
-        id,
-        name: id,
-        reasoning: false,
-        input: ['text'] as ('text' | 'image')[],
-        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-        contextWindow: 8192,
-        maxTokens: 4096,
-      })),
-    });
-
-    // Chat / completion models
-    const completionModels: ModelInfo[] = modelIds.map((id) => ({
-      id,
-      provider: 'ollama',
-      name: id,
-      reasoning: false,
-      contextWindow: 8192,
-      maxTokens: 4096,
-      inputTypes: ['text'] as ('text' | 'image')[],
-      cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    }));
-
-    // Embedding models (tracked in registeredModels but not in Pi registry,
-    // which only handles completion models)
-    const embeddingModels: ModelInfo[] = OLLAMA_EMBEDDING_MODELS.map((em) => ({
-      id: em.id,
-      provider: 'ollama',
-      name: em.id,
-      reasoning: false,
-      contextWindow: em.contextWindow,
-      maxTokens: 0,
-      inputTypes: ['text'] as ('text' | 'image')[],
-      cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    }));
-
-    this.registeredModels = [...completionModels, ...embeddingModels];
-
-    this.logger.log(
-      `Ollama provider registered at ${ollamaUrl} with models: ${modelIds.join(', ')} ` +
-        `and embedding models: ${OLLAMA_EMBEDDING_MODELS.map((em) => em.id).join(', ')}`,
-    );
-  }
-
-  listModels(): ModelInfo[] {
-    return this.registeredModels;
-  }
-
-  async healthCheck(): Promise<ProviderHealth> {
-    const ollamaUrl = process.env['OLLAMA_BASE_URL'] ?? process.env['OLLAMA_HOST'];
-    if (!ollamaUrl) {
-      return {
-        status: 'down',
-        lastChecked: new Date().toISOString(),
-        error: 'OLLAMA_BASE_URL not configured',
-      };
-    }
-
-    const checkUrl = `${ollamaUrl}/v1/models`;
-    const start = Date.now();
-
-    try {
-      const res = await fetch(checkUrl, {
-        method: 'GET',
-        headers: { Accept: 'application/json' },
-        signal: AbortSignal.timeout(5000),
-      });
-      const latencyMs = Date.now() - start;
-
-      if (!res.ok) {
-        return {
-          status: 'degraded',
-          latencyMs,
-          lastChecked: new Date().toISOString(),
-          error: `HTTP ${res.status}`,
-        };
-      }
-
-      return { status: 'healthy', latencyMs, lastChecked: new Date().toISOString() };
-    } catch (err) {
-      const latencyMs = Date.now() - start;
-      const error = err instanceof Error ? err.message : String(err);
-      return { status: 'down', latencyMs, lastChecked: new Date().toISOString(), error };
-    }
-  }
-
-  /**
-   * Generate an embedding vector for the given text using Ollama's /api/embeddings endpoint.
-   *
-   * Defaults to 'nomic-embed-text' when no model is specified.
-   * Intended for use by EmbeddingService (M3-009).
-   *
-   * @param text - The input text to embed.
-   * @param model - Optional embedding model ID (default: 'nomic-embed-text').
-   * @returns A float array representing the embedding vector.
-   */
-  async embed(text: string, model = 'nomic-embed-text'): Promise<number[]> {
-    const ollamaUrl = process.env['OLLAMA_BASE_URL'] ?? process.env['OLLAMA_HOST'];
-    if (!ollamaUrl) {
-      throw new Error('OllamaAdapter: OLLAMA_BASE_URL not configured');
-    }
-
-    const embeddingUrl = `${ollamaUrl}/api/embeddings`;
-
-    const res = await fetch(embeddingUrl, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ model, prompt: text }),
-      signal: AbortSignal.timeout(30000),
-    });
-
-    if (!res.ok) {
-      throw new Error(`OllamaAdapter.embed: request failed with HTTP ${res.status}`);
-    }
-
-    const json = (await res.json()) as OllamaEmbeddingResponse;
-
-    if (!Array.isArray(json.embedding)) {
-      throw new Error('OllamaAdapter.embed: unexpected response — missing embedding array');
-    }
-
-    return json.embedding;
-  }
-
-  /**
-   * createCompletion is reserved for future direct-completion use.
-   * The current integration routes completions through Pi SDK's ModelRegistry/AgentSession.
-   */
-  async *createCompletion(_params: CompletionParams): AsyncIterable<CompletionEvent> {
-    throw new Error(
-      'OllamaAdapter.createCompletion is not yet implemented. ' +
-        'Use Pi SDK AgentSession for completions.',
-    );
-    // Satisfy the AsyncGenerator return type — unreachable but required for TypeScript.
-    yield undefined as never;
-  }
-}
--- a/apps/gateway/src/agent/adapters/openai.adapter.ts
+++ b/apps/gateway/src/agent/adapters/openai.adapter.ts
@@ -1,201 +0,0 @@
-import { Logger } from '@nestjs/common';
-import OpenAI from 'openai';
-import type { ModelRegistry } from '@mariozechner/pi-coding-agent';
-import type {
-  CompletionEvent,
-  CompletionParams,
-  IProviderAdapter,
-  ModelInfo,
-  ProviderHealth,
-} from '@mosaicstack/types';
-
-/**
- * OpenAI provider adapter.
- *
- * Registers OpenAI models (including Codex gpt-5.4) with the Pi ModelRegistry.
- * Configuration is driven by environment variables:
- *   OPENAI_API_KEY — OpenAI API key (required; adapter skips registration when absent)
- */
-export class OpenAIAdapter implements IProviderAdapter {
-  readonly name = 'openai';
-
-  private readonly logger = new Logger(OpenAIAdapter.name);
-  private registeredModels: ModelInfo[] = [];
-  private client: OpenAI | null = null;
-
-  /** Model ID used for Codex gpt-5.4 in the Pi registry. */
-  static readonly CODEX_MODEL_ID = 'codex-gpt-5-4';
-
-  constructor(private readonly registry: ModelRegistry) {}
-
-  async register(): Promise<void> {
-    const apiKey = process.env['OPENAI_API_KEY'];
-    if (!apiKey) {
-      this.logger.debug('Skipping OpenAI provider registration: OPENAI_API_KEY not set');
-      return;
-    }
-
-    this.client = new OpenAI({ apiKey });
-
-    const codexModel = {
-      id: OpenAIAdapter.CODEX_MODEL_ID,
-      name: 'Codex gpt-5.4',
-      /** OpenAI-compatible completions API */
-      api: 'openai-completions' as never,
-      reasoning: false,
-      input: ['text', 'image'] as ('text' | 'image')[],
-      cost: { input: 0.003, output: 0.012, cacheRead: 0.0015, cacheWrite: 0 },
-      contextWindow: 128_000,
-      maxTokens: 16_384,
-    };
-
-    this.registry.registerProvider('openai', {
-      apiKey,
-      baseUrl: 'https://api.openai.com/v1',
-      models: [codexModel],
-    });
-
-    this.registeredModels = [
-      {
-        id: OpenAIAdapter.CODEX_MODEL_ID,
-        provider: 'openai',
-        name: 'Codex gpt-5.4',
-        reasoning: false,
-        contextWindow: 128_000,
-        maxTokens: 16_384,
-        inputTypes: ['text', 'image'] as ('text' | 'image')[],
-        cost: { input: 0.003, output: 0.012, cacheRead: 0.0015, cacheWrite: 0 },
-      },
-    ];
-
-    this.logger.log(`OpenAI provider registered with model: ${OpenAIAdapter.CODEX_MODEL_ID}`);
-  }
-
-  listModels(): ModelInfo[] {
-    return this.registeredModels;
-  }
-
-  async healthCheck(): Promise<ProviderHealth> {
-    const apiKey = process.env['OPENAI_API_KEY'];
-    if (!apiKey) {
-      return {
-        status: 'down',
-        lastChecked: new Date().toISOString(),
-        error: 'OPENAI_API_KEY not configured',
-      };
-    }
-
-    const start = Date.now();
-    try {
-      // Lightweight call — list models to verify key validity
-      const res = await fetch('https://api.openai.com/v1/models', {
-        method: 'GET',
-        headers: {
-          Authorization: `Bearer ${apiKey}`,
-          'Content-Type': 'application/json',
-        },
-        signal: AbortSignal.timeout(5000),
-      });
-      const latencyMs = Date.now() - start;
-
-      if (!res.ok) {
-        return {
-          status: 'degraded',
-          latencyMs,
-          lastChecked: new Date().toISOString(),
-          error: `HTTP ${res.status}`,
-        };
-      }
-
-      return { status: 'healthy', latencyMs, lastChecked: new Date().toISOString() };
-    } catch (err) {
-      const latencyMs = Date.now() - start;
-      const error = err instanceof Error ? err.message : String(err);
-      return { status: 'down', latencyMs, lastChecked: new Date().toISOString(), error };
-    }
-  }
-
-  /**
-   * Stream a completion from OpenAI using the chat completions API.
-   *
-   * Maps OpenAI streaming chunks to the Mosaic CompletionEvent format.
-   */
-  async *createCompletion(params: CompletionParams): AsyncIterable<CompletionEvent> {
-    if (!this.client) {
-      throw new Error(
-        'OpenAIAdapter: client not initialized. ' +
-          'Ensure OPENAI_API_KEY is set and register() was called.',
-      );
-    }
-
-    const stream = await this.client.chat.completions.create({
-      model: params.model,
-      messages: params.messages.map((m) => ({
-        role: m.role,
-        content: m.content,
-      })),
-      ...(params.temperature !== undefined && { temperature: params.temperature }),
-      ...(params.maxTokens !== undefined && { max_tokens: params.maxTokens }),
-      ...(params.tools &&
-        params.tools.length > 0 && {
-          tools: params.tools.map((t) => ({
-            type: 'function' as const,
-            function: {
-              name: t.name,
-              description: t.description,
-              parameters: t.parameters,
-            },
-          })),
-        }),
-      stream: true,
-      stream_options: { include_usage: true },
-    });
-
-    let inputTokens = 0;
-    let outputTokens = 0;
-
-    for await (const chunk of stream) {
-      const choice = chunk.choices[0];
-
-      // Accumulate usage when present (final chunk with stream_options.include_usage)
-      if (chunk.usage) {
-        inputTokens = chunk.usage.prompt_tokens;
-        outputTokens = chunk.usage.completion_tokens;
-      }
-
-      if (!choice) continue;
-
-      const delta = choice.delta;
-
-      // Text content delta
-      if (delta.content) {
-        yield { type: 'text_delta', content: delta.content };
-      }
-
-      // Tool call delta — emit when arguments are complete
-      if (delta.tool_calls) {
-        for (const toolCallDelta of delta.tool_calls) {
-          if (toolCallDelta.function?.name && toolCallDelta.function.arguments !== undefined) {
-            yield {
-              type: 'tool_call',
-              name: toolCallDelta.function.name,
-              arguments: toolCallDelta.function.arguments,
-            };
-          }
-        }
-      }
-
-      // Stream finished
-      if (choice.finish_reason === 'stop' || choice.finish_reason === 'tool_calls') {
-        yield {
-          type: 'done',
-          usage: { inputTokens, outputTokens },
-        };
-        return;
-      }
-    }
-
-    // Fallback done event when stream ends without explicit finish_reason
-    yield { type: 'done', usage: { inputTokens, outputTokens } };
-  }
-}
--- a/apps/gateway/src/agent/adapters/openrouter.adapter.ts
+++ b/apps/gateway/src/agent/adapters/openrouter.adapter.ts
@@ -1,212 +0,0 @@
-import { Logger } from '@nestjs/common';
-import OpenAI from 'openai';
-import type {
-  CompletionEvent,
-  CompletionParams,
-  IProviderAdapter,
-  ModelInfo,
-  ProviderHealth,
-} from '@mosaicstack/types';
-
-const OPENROUTER_BASE_URL = 'https://openrouter.ai/api/v1';
-
-interface OpenRouterModel {
-  id: string;
-  name?: string;
-  context_length?: number;
-  top_provider?: {
-    max_completion_tokens?: number;
-  };
-  pricing?: {
-    prompt?: string | number;
-    completion?: string | number;
-  };
-  architecture?: {
-    input_modalities?: string[];
-  };
-}
-
-interface OpenRouterModelsResponse {
-  data?: OpenRouterModel[];
-}
-
-/**
- * OpenRouter provider adapter.
- *
- * Routes completions through OpenRouter's OpenAI-compatible API.
- * Configuration is driven by the OPENROUTER_API_KEY environment variable.
- */
-export class OpenRouterAdapter implements IProviderAdapter {
-  readonly name = 'openrouter';
-
-  private readonly logger = new Logger(OpenRouterAdapter.name);
-  private client: OpenAI | null = null;
-  private registeredModels: ModelInfo[] = [];
-
-  async register(): Promise<void> {
-    const apiKey = process.env['OPENROUTER_API_KEY'];
-    if (!apiKey) {
-      this.logger.debug('Skipping OpenRouter provider registration: OPENROUTER_API_KEY not set');
-      return;
-    }
-
-    this.client = new OpenAI({
-      apiKey,
-      baseURL: OPENROUTER_BASE_URL,
-      defaultHeaders: {
-        'HTTP-Referer': 'https://mosaic.ai',
-        'X-Title': 'Mosaic',
-      },
-    });
-
-    try {
-      this.registeredModels = await this.fetchModels(apiKey);
-      this.logger.log(`OpenRouter provider registered with ${this.registeredModels.length} models`);
-    } catch (err) {
-      this.logger.warn(
-        `OpenRouter model discovery failed: ${err instanceof Error ? err.message : String(err)}. Registering with empty model list.`,
-      );
-      this.registeredModels = [];
-    }
-  }
-
-  listModels(): ModelInfo[] {
-    return this.registeredModels;
-  }
-
-  async healthCheck(): Promise<ProviderHealth> {
-    const apiKey = process.env['OPENROUTER_API_KEY'];
-    if (!apiKey) {
-      return {
-        status: 'down',
-        lastChecked: new Date().toISOString(),
-        error: 'OPENROUTER_API_KEY not configured',
-      };
-    }
-
-    const start = Date.now();
-    try {
-      const res = await fetch(`${OPENROUTER_BASE_URL}/models`, {
-        method: 'GET',
-        headers: {
-          Authorization: `Bearer ${apiKey}`,
-          Accept: 'application/json',
-        },
-        signal: AbortSignal.timeout(5000),
-      });
-      const latencyMs = Date.now() - start;
-
-      if (!res.ok) {
-        return {
-          status: 'degraded',
-          latencyMs,
-          lastChecked: new Date().toISOString(),
-          error: `HTTP ${res.status}`,
-        };
-      }
-
-      return { status: 'healthy', latencyMs, lastChecked: new Date().toISOString() };
-    } catch (err) {
-      const latencyMs = Date.now() - start;
-      const error = err instanceof Error ? err.message : String(err);
-      return { status: 'down', latencyMs, lastChecked: new Date().toISOString(), error };
-    }
-  }
-
-  /**
-   * Stream a completion through OpenRouter's OpenAI-compatible API.
-   */
-  async *createCompletion(params: CompletionParams): AsyncIterable<CompletionEvent> {
-    if (!this.client) {
-      throw new Error('OpenRouterAdapter is not initialized. Ensure OPENROUTER_API_KEY is set.');
-    }
-
-    const stream = await this.client.chat.completions.create({
-      model: params.model,
-      messages: params.messages.map((m) => ({ role: m.role, content: m.content })),
-      temperature: params.temperature,
-      max_tokens: params.maxTokens,
-      stream: true,
-    });
-
-    let inputTokens = 0;
-    let outputTokens = 0;
-
-    for await (const chunk of stream) {
-      const choice = chunk.choices[0];
-      if (!choice) continue;
-
-      const delta = choice.delta;
-
-      if (delta.content) {
-        yield { type: 'text_delta', content: delta.content };
-      }
-
-      if (choice.finish_reason === 'stop') {
-        const usage = (chunk as { usage?: { prompt_tokens?: number; completion_tokens?: number } })
-          .usage;
-        if (usage) {
-          inputTokens = usage.prompt_tokens ?? 0;
-          outputTokens = usage.completion_tokens ?? 0;
-        }
-      }
-    }
-
-    yield {
-      type: 'done',
-      usage: { inputTokens, outputTokens },
-    };
-  }
-
-  // ---------------------------------------------------------------------------
-  // Private helpers
-  // ---------------------------------------------------------------------------
-
-  private async fetchModels(apiKey: string): Promise<ModelInfo[]> {
-    const res = await fetch(`${OPENROUTER_BASE_URL}/models`, {
-      method: 'GET',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-        Accept: 'application/json',
-      },
-      signal: AbortSignal.timeout(10000),
-    });
-
-    if (!res.ok) {
-      throw new Error(`OpenRouter models endpoint returned HTTP ${res.status}`);
-    }
-
-    const json = (await res.json()) as OpenRouterModelsResponse;
-    const data = json.data ?? [];
-
-    return data.map((model): ModelInfo => {
-      const inputPrice = model.pricing?.prompt
-        ? parseFloat(String(model.pricing.prompt)) * 1000
-        : 0;
-      const outputPrice = model.pricing?.completion
-        ? parseFloat(String(model.pricing.completion)) * 1000
-        : 0;
-
-      const inputModalities = model.architecture?.input_modalities ?? ['text'];
-      const inputTypes = inputModalities.includes('image')
-        ? (['text', 'image'] as const)
-        : (['text'] as const);
-
-      return {
-        id: model.id,
-        provider: 'openrouter',
-        name: model.name ?? model.id,
-        reasoning: false,
-        contextWindow: model.context_length ?? 4096,
-        maxTokens: model.top_provider?.max_completion_tokens ?? 4096,
-        inputTypes: [...inputTypes],
-        cost: {
-          input: inputPrice,
-          output: outputPrice,
-          cacheRead: 0,
-          cacheWrite: 0,
-        },
-      };
-    });
-  }
-}
--- a/apps/gateway/src/agent/adapters/zai.adapter.ts
+++ b/apps/gateway/src/agent/adapters/zai.adapter.ts
@@ -1,187 +0,0 @@
-import { Logger } from '@nestjs/common';
-import OpenAI from 'openai';
-import type {
-  CompletionEvent,
-  CompletionParams,
-  IProviderAdapter,
-  ModelInfo,
-  ProviderHealth,
-} from '@mosaicstack/types';
-import { getModelCapability } from '../model-capabilities.js';
-
-/**
- * Default Z.ai API base URL.
- * Z.ai (BigModel / Zhipu AI) exposes an OpenAI-compatible API at this endpoint.
- * Can be overridden via the ZAI_BASE_URL environment variable.
- */
-const DEFAULT_ZAI_BASE_URL = 'https://open.bigmodel.cn/api/paas/v4';
-
-/**
- * GLM-5 model identifier on the Z.ai platform.
- */
-const GLM5_MODEL_ID = 'glm-5';
-
-/**
- * Z.ai (Zhipu AI / BigModel) provider adapter.
- *
- * Z.ai exposes an OpenAI-compatible REST API. This adapter uses the `openai`
- * SDK with a custom base URL and the ZAI_API_KEY environment variable.
- *
- * Configuration:
- *   ZAI_API_KEY   — required; Z.ai API key
- *   ZAI_BASE_URL  — optional; override the default API base URL
- */
-export class ZaiAdapter implements IProviderAdapter {
-  readonly name = 'zai';
-
-  private readonly logger = new Logger(ZaiAdapter.name);
-  private client: OpenAI | null = null;
-  private registeredModels: ModelInfo[] = [];
-
-  async register(): Promise<void> {
-    const apiKey = process.env['ZAI_API_KEY'];
-    if (!apiKey) {
-      this.logger.debug('Skipping Z.ai provider registration: ZAI_API_KEY not set');
-      return;
-    }
-
-    const baseURL = process.env['ZAI_BASE_URL'] ?? DEFAULT_ZAI_BASE_URL;
-
-    this.client = new OpenAI({ apiKey, baseURL });
-
-    this.registeredModels = this.buildModelList();
-    this.logger.log(`Z.ai provider registered with ${this.registeredModels.length} model(s)`);
-  }
-
-  listModels(): ModelInfo[] {
-    return this.registeredModels;
-  }
-
-  async healthCheck(): Promise<ProviderHealth> {
-    const apiKey = process.env['ZAI_API_KEY'];
-    if (!apiKey) {
-      return {
-        status: 'down',
-        lastChecked: new Date().toISOString(),
-        error: 'ZAI_API_KEY not configured',
-      };
-    }
-
-    const baseURL = process.env['ZAI_BASE_URL'] ?? DEFAULT_ZAI_BASE_URL;
-    const start = Date.now();
-
-    try {
-      const res = await fetch(`${baseURL}/models`, {
-        method: 'GET',
-        headers: {
-          Authorization: `Bearer ${apiKey}`,
-          Accept: 'application/json',
-        },
-        signal: AbortSignal.timeout(5000),
-      });
-      const latencyMs = Date.now() - start;
-
-      if (!res.ok) {
-        return {
-          status: 'degraded',
-          latencyMs,
-          lastChecked: new Date().toISOString(),
-          error: `HTTP ${res.status}`,
-        };
-      }
-
-      return { status: 'healthy', latencyMs, lastChecked: new Date().toISOString() };
-    } catch (err) {
-      const latencyMs = Date.now() - start;
-      const error = err instanceof Error ? err.message : String(err);
-      return { status: 'down', latencyMs, lastChecked: new Date().toISOString(), error };
-    }
-  }
-
-  /**
-   * Stream a completion through Z.ai's OpenAI-compatible API.
-   */
-  async *createCompletion(params: CompletionParams): AsyncIterable<CompletionEvent> {
-    if (!this.client) {
-      throw new Error('ZaiAdapter is not initialized. Ensure ZAI_API_KEY is set.');
-    }
-
-    const stream = await this.client.chat.completions.create({
-      model: params.model,
-      messages: params.messages.map((m) => ({ role: m.role, content: m.content })),
-      temperature: params.temperature,
-      max_tokens: params.maxTokens,
-      stream: true,
-    });
-
-    let inputTokens = 0;
-    let outputTokens = 0;
-
-    for await (const chunk of stream) {
-      const choice = chunk.choices[0];
-      if (!choice) continue;
-
-      const delta = choice.delta;
-
-      if (delta.content) {
-        yield { type: 'text_delta', content: delta.content };
-      }
-
-      if (choice.finish_reason === 'stop') {
-        const usage = (chunk as { usage?: { prompt_tokens?: number; completion_tokens?: number } })
-          .usage;
-        if (usage) {
-          inputTokens = usage.prompt_tokens ?? 0;
-          outputTokens = usage.completion_tokens ?? 0;
-        }
-      }
-    }
-
-    yield {
-      type: 'done',
-      usage: { inputTokens, outputTokens },
-    };
-  }
-
-  // ---------------------------------------------------------------------------
-  // Private helpers
-  // ---------------------------------------------------------------------------
-
-  private buildModelList(): ModelInfo[] {
-    const capability = getModelCapability(GLM5_MODEL_ID);
-
-    if (!capability) {
-      this.logger.warn(`Model capability entry not found for '${GLM5_MODEL_ID}'; using defaults`);
-      return [
-        {
-          id: GLM5_MODEL_ID,
-          provider: 'zai',
-          name: 'GLM-5',
-          reasoning: false,
-          contextWindow: 128000,
-          maxTokens: 8192,
-          inputTypes: ['text'],
-          cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-        },
-      ];
-    }
-
-    return [
-      {
-        id: capability.id,
-        provider: 'zai',
-        name: capability.displayName,
-        reasoning: capability.capabilities.reasoning,
-        contextWindow: capability.contextWindow,
-        maxTokens: capability.maxOutputTokens,
-        inputTypes: capability.capabilities.vision ? ['text', 'image'] : ['text'],
-        cost: {
-          input: capability.costPer1kInput ?? 0,
-          output: capability.costPer1kOutput ?? 0,
-          cacheRead: 0,
-          cacheWrite: 0,
-        },
-      },
-    ];
-  }
-}
--- a/apps/gateway/src/agent/agent-config.dto.ts
+++ b/apps/gateway/src/agent/agent-config.dto.ts
@@ -11,51 +11,6 @@ import {

 const agentStatuses = ['idle', 'active', 'error', 'offline'] as const;

-// ─── Agent Capability Declarations (M4-011) ───────────────────────────────────
-
-/**
- * Agent specialization capability fields.
- * Stored inside the agent's `config` JSON as `capabilities`.
- */
-export class AgentCapabilitiesDto {
-  /**
-   * Domains this agent specializes in, e.g. ['frontend', 'backend', 'devops'].
-   * Used by the routing engine to bias toward this agent for matching domains.
-   */
-  @IsOptional()
-  @IsArray()
-  @IsString({ each: true })
-  domains?: string[];
-
-  /**
-   * Default model identifier for this agent.
-   * Influences routing when no explicit rule overrides the choice.
-   */
-  @IsOptional()
-  @IsString()
-  @MaxLength(255)
-  preferredModel?: string;
-
-  /**
-   * Default provider for this agent.
-   * Influences routing when no explicit rule overrides the choice.
-   */
-  @IsOptional()
-  @IsString()
-  @MaxLength(255)
-  preferredProvider?: string;
-
-  /**
-   * Tool categories this agent has access to, e.g. ['web-search', 'code-exec'].
-   */
-  @IsOptional()
-  @IsArray()
-  @IsString({ each: true })
-  toolSets?: string[];
-}
-
-// ─── Create DTO ───────────────────────────────────────────────────────────────
-
 export class CreateAgentConfigDto {
  @IsString()
  @MaxLength(255)
@@ -94,40 +49,11 @@ export class CreateAgentConfigDto {
  @IsBoolean()
  isSystem?: boolean;

-  /**
-   * General config blob. May include `capabilities` (AgentCapabilitiesDto)
-   * for agent specialization declarations (M4-011).
-   */
  @IsOptional()
  @IsObject()
  config?: Record<string, unknown>;
-
-  // ─── Capability shorthand fields (M4-011) ──────────────────────────────────
-  // These are convenience top-level fields that get merged into config.capabilities.
-
-  @IsOptional()
-  @IsArray()
-  @IsString({ each: true })
-  domains?: string[];
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(255)
-  preferredModel?: string;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(255)
-  preferredProvider?: string;
-
-  @IsOptional()
-  @IsArray()
-  @IsString({ each: true })
-  toolSets?: string[];
 }

-// ─── Update DTO ───────────────────────────────────────────────────────────────
-
 export class UpdateAgentConfigDto {
  @IsOptional()
  @IsString()
@@ -165,33 +91,7 @@ export class UpdateAgentConfigDto {
  @IsArray()
  skills?: string[] | null;

-  /**
-   * General config blob. May include `capabilities` (AgentCapabilitiesDto)
-   * for agent specialization declarations (M4-011).
-   */
  @IsOptional()
  @IsObject()
  config?: Record<string, unknown> | null;
-
-  // ─── Capability shorthand fields (M4-011) ──────────────────────────────────
-
-  @IsOptional()
-  @IsArray()
-  @IsString({ each: true })
-  domains?: string[] | null;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(255)
-  preferredModel?: string | null;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(255)
-  preferredProvider?: string | null;
-
-  @IsOptional()
-  @IsArray()
-  @IsString({ each: true })
-  toolSets?: string[] | null;
 }
--- a/apps/gateway/src/agent/agent-configs.controller.ts
+++ b/apps/gateway/src/agent/agent-configs.controller.ts
@@ -13,59 +13,12 @@ import {
  Post,
  UseGuards,
 } from '@nestjs/common';
-import type { Brain } from '@mosaicstack/brain';
+import type { Brain } from '@mosaic/brain';
 import { BRAIN } from '../brain/brain.tokens.js';
 import { AuthGuard } from '../auth/auth.guard.js';
 import { CurrentUser } from '../auth/current-user.decorator.js';
 import { CreateAgentConfigDto, UpdateAgentConfigDto } from './agent-config.dto.js';

-// ─── M4-011 helpers ──────────────────────────────────────────────────────────
-
-type CapabilityFields = {
-  domains?: string[] | null;
-  preferredModel?: string | null;
-  preferredProvider?: string | null;
-  toolSets?: string[] | null;
-};
-
-/** Extract capability shorthand fields from the DTO (undefined if none provided). */
-function buildCapabilities(dto: CapabilityFields): Record<string, unknown> | undefined {
-  const hasAny =
-    dto.domains !== undefined ||
-    dto.preferredModel !== undefined ||
-    dto.preferredProvider !== undefined ||
-    dto.toolSets !== undefined;
-
-  if (!hasAny) return undefined;
-
-  const cap: Record<string, unknown> = {};
-  if (dto.domains !== undefined) cap['domains'] = dto.domains;
-  if (dto.preferredModel !== undefined) cap['preferredModel'] = dto.preferredModel;
-  if (dto.preferredProvider !== undefined) cap['preferredProvider'] = dto.preferredProvider;
-  if (dto.toolSets !== undefined) cap['toolSets'] = dto.toolSets;
-  return cap;
-}
-
-/** Merge capabilities into the config object, preserving other config keys. */
-function mergeCapabilities(
-  existing: Record<string, unknown> | null | undefined,
-  capabilities: Record<string, unknown> | undefined,
-): Record<string, unknown> | undefined {
-  if (capabilities === undefined && existing === undefined) return undefined;
-  if (capabilities === undefined) return existing ?? undefined;
-
-  const base = existing ?? {};
-  const existingCap =
-    typeof base['capabilities'] === 'object' && base['capabilities'] !== null
-      ? (base['capabilities'] as Record<string, unknown>)
-      : {};
-
-  return {
-    ...base,
-    capabilities: { ...existingCap, ...capabilities },
-  };
-}
-
@Controller('api/agents')
@UseGuards(AuthGuard)
 export class AgentConfigsController {
@@ -88,22 +41,10 @@ export class AgentConfigsController {

  @Post()
  async create(@Body() dto: CreateAgentConfigDto, @CurrentUser() user: { id: string }) {
-    // Merge capability shorthand fields into config.capabilities (M4-011)
-    const capabilities = buildCapabilities(dto);
-    const config = mergeCapabilities(dto.config, capabilities);
-
    return this.brain.agents.create({
-      name: dto.name,
-      provider: dto.provider,
-      model: dto.model,
-      status: dto.status,
-      projectId: dto.projectId,
-      systemPrompt: dto.systemPrompt,
-      allowedTools: dto.allowedTools,
-      skills: dto.skills,
-      isSystem: false,
-      config,
+      ...dto,
      ownerId: user.id,
+      isSystem: false,
    });
  }

@@ -121,33 +62,7 @@ export class AgentConfigsController {
    if (!agent.isSystem && agent.ownerId !== user.id) {
      throw new ForbiddenException('Agent does not belong to the current user');
    }
-
-    // Merge capability shorthand fields into config.capabilities (M4-011)
-    const capabilities = buildCapabilities(dto);
-    const baseConfig =
-      dto.config !== undefined
-        ? dto.config
-        : (agent.config as Record<string, unknown> | null | undefined);
-    const config = mergeCapabilities(baseConfig ?? undefined, capabilities);
-
-    // Pass ownerId for user agents so the repo WHERE clause enforces ownership.
-    // For system agents (admin path) pass undefined so the WHERE matches only on id.
-    const ownerId = agent.isSystem ? undefined : user.id;
-    const updated = await this.brain.agents.update(
-      id,
-      {
-        name: dto.name,
-        provider: dto.provider,
-        model: dto.model,
-        status: dto.status,
-        projectId: dto.projectId,
-        systemPrompt: dto.systemPrompt,
-        allowedTools: dto.allowedTools,
-        skills: dto.skills,
-        config: capabilities !== undefined || dto.config !== undefined ? config : undefined,
-      },
-      ownerId,
-    );
+    const updated = await this.brain.agents.update(id, dto);
    if (!updated) throw new NotFoundException('Agent not found');
    return updated;
  }
@@ -163,8 +78,7 @@ export class AgentConfigsController {
    if (agent.ownerId !== user.id) {
      throw new ForbiddenException('Agent does not belong to the current user');
    }
-    // Pass ownerId so the repo WHERE clause enforces ownership at the DB level.
-    const deleted = await this.brain.agents.remove(id, user.id);
+    const deleted = await this.brain.agents.remove(id);
    if (!deleted) throw new NotFoundException('Agent not found');
  }
 }
--- a/apps/gateway/src/agent/agent.module.ts
+++ b/apps/gateway/src/agent/agent.module.ts
@@ -1,98 +1,21 @@
 import { Global, Module } from '@nestjs/common';
-import { AgentRuntimeProviderRegistry, HermesRuntimeProvider } from '@mosaicstack/agent';
 import { AgentService } from './agent.service.js';
 import { ProviderService } from './provider.service.js';
-import { ProviderCredentialsService } from './provider-credentials.service.js';
 import { RoutingService } from './routing.service.js';
-import { RoutingEngineService } from './routing/routing-engine.service.js';
 import { SkillLoaderService } from './skill-loader.service.js';
 import { ProvidersController } from './providers.controller.js';
 import { SessionsController } from './sessions.controller.js';
 import { AgentConfigsController } from './agent-configs.controller.js';
-import { InteractionController } from './interaction.controller.js';
-import { RoutingController } from './routing/routing.controller.js';
-import { DurableSessionRepository } from './durable-session.repository.js';
-import { DurableSessionService } from './durable-session.service.js';
 import { CoordModule } from '../coord/coord.module.js';
 import { McpClientModule } from '../mcp-client/mcp-client.module.js';
 import { SkillsModule } from '../skills/skills.module.js';
 import { GCModule } from '../gc/gc.module.js';
-import { LogModule } from '../log/log.module.js';
-import { CommandsModule } from '../commands/commands.module.js';
-import { CommandRuntimeApprovalVerifier } from '../commands/runtime-approval-verifier.js';
-import { GatewayHermesRuntimeTransport } from './hermes-runtime.transport.js';
-import { ConnectorLeaseRepository } from './connector-lease.repository.js';
-import {
-  CONNECTOR_LEASE_POLICY,
-  ConnectorLeaseService,
-  DenyConnectorLeasePolicy,
-} from './connector-lease.service.js';
-import {
-  AGENT_RUNTIME_PROVIDER_REGISTRY,
-  RUNTIME_APPROVAL_VERIFIER,
-  RUNTIME_PROVIDER_AUDIT_SINK,
-  RuntimeProviderAuditService,
-  RuntimeProviderService,
-} from './runtime-provider-registry.service.js';
-
-export function createGatewayRuntimeProviderRegistry(): AgentRuntimeProviderRegistry {
-  const registry = new AgentRuntimeProviderRegistry();
-  registry.register(new HermesRuntimeProvider(new GatewayHermesRuntimeTransport()));
-  return registry;
-}

@Global()
@Module({
-  imports: [CoordModule, McpClientModule, SkillsModule, GCModule, LogModule, CommandsModule],
-  providers: [
-    ProviderService,
-    ProviderCredentialsService,
-    RoutingService,
-    RoutingEngineService,
-    SkillLoaderService,
-    DurableSessionRepository,
-    DurableSessionService,
-    ConnectorLeaseRepository,
-    DenyConnectorLeasePolicy,
-    {
-      provide: CONNECTOR_LEASE_POLICY,
-      useExisting: DenyConnectorLeasePolicy,
-    },
-    ConnectorLeaseService,
-    {
-      provide: AGENT_RUNTIME_PROVIDER_REGISTRY,
-      useFactory: createGatewayRuntimeProviderRegistry,
-    },
-    RuntimeProviderAuditService,
-    {
-      provide: RUNTIME_PROVIDER_AUDIT_SINK,
-      useExisting: RuntimeProviderAuditService,
-    },
-    {
-      provide: RUNTIME_APPROVAL_VERIFIER,
-      useExisting: CommandRuntimeApprovalVerifier,
-    },
-    RuntimeProviderService,
-    AgentService,
-  ],
-  controllers: [
-    ProvidersController,
-    SessionsController,
-    AgentConfigsController,
-    InteractionController,
-    RoutingController,
-  ],
-  exports: [
-    AgentService,
-    ProviderService,
-    ProviderCredentialsService,
-    RoutingService,
-    RoutingEngineService,
-    SkillLoaderService,
-    DurableSessionService,
-    RuntimeProviderService,
-    ConnectorLeaseService,
-    AGENT_RUNTIME_PROVIDER_REGISTRY,
-  ],
+  imports: [CoordModule, McpClientModule, SkillsModule, GCModule],
+  providers: [ProviderService, RoutingService, SkillLoaderService, AgentService],
+  controllers: [ProvidersController, SessionsController, AgentConfigsController],
+  exports: [AgentService, ProviderService, RoutingService, SkillLoaderService],
 })
 export class AgentModule {}
--- a/apps/gateway/src/agent/agent.service.ts
+++ b/apps/gateway/src/agent/agent.service.ts
@@ -1,11 +1,4 @@
-import {
-  ForbiddenException,
-  Inject,
-  Injectable,
-  Logger,
-  Optional,
-  type OnModuleDestroy,
-} from '@nestjs/common';
+import { Inject, Injectable, Logger, Optional, type OnModuleDestroy } from '@nestjs/common';
 import {
  createAgentSession,
  DefaultResourceLoader,
@@ -14,11 +7,10 @@ import {
  type AgentSessionEvent,
  type ToolDefinition,
 } from '@mariozechner/pi-coding-agent';
-import type { Brain } from '@mosaicstack/brain';
-import type { Memory, OperatorMemoryPlugin } from '@mosaicstack/memory';
+import type { Brain } from '@mosaic/brain';
+import type { Memory } from '@mosaic/memory';
 import { BRAIN } from '../brain/brain.tokens.js';
 import { MEMORY } from '../memory/memory.tokens.js';
-import { OPERATOR_MEMORY_PLUGIN } from '../memory/memory.module.js';
 import { EmbeddingService } from '../memory/embedding.service.js';
 import { CoordService } from '../coord/coord.service.js';
 import { ProviderService } from './provider.service.js';
@@ -31,19 +23,10 @@ import { createFileTools } from './tools/file-tools.js';
 import { createGitTools } from './tools/git-tools.js';
 import { createShellTools } from './tools/shell-tools.js';
 import { createWebTools } from './tools/web-tools.js';
-import { createSearchTools } from './tools/search-tools.js';
-import type { SessionInfoDto, SessionMetrics } from './session.dto.js';
+import type { SessionInfoDto } from './session.dto.js';
 import { SystemOverrideService } from '../preferences/system-override.service.js';
 import { PreferencesService } from '../preferences/preferences.service.js';
 import { SessionGCService } from '../gc/session-gc.service.js';
-import type { ActorTenantScope } from '../auth/session-scope.js';
-
-/** A single message from DB conversation history, used for context injection. */
-export interface ConversationHistoryMessage {
-  role: 'user' | 'assistant' | 'system';
-  content: string;
-  createdAt: Date;
-}

 export interface AgentSessionOptions {
  provider?: string;
@@ -77,14 +60,6 @@ export interface AgentSessionOptions {
  agentConfigId?: string;
  /** ID of the user who owns this session. Used for preferences and system override lookups. */
  userId?: string;
-  /** Server-derived tenant scope that owns this session. Falls back to userId for solo users. */
-  tenantId?: string;
-  /**
-   * Prior conversation messages to inject as context when resuming a session.
-   * These messages are formatted and prepended to the system prompt so the
-   * agent is aware of what was discussed in previous sessions.
-   */
-  conversationHistory?: ConversationHistoryMessage[];
 }

 export interface AgentSession {
@@ -105,14 +80,6 @@ export interface AgentSession {
  allowedTools: string[] | null;
  /** User ID that owns this session, used for preference lookups. */
  userId?: string;
-  /** Server-derived tenant scope that owns this session. Falls back to userId for solo users. */
-  tenantId?: string;
-  /** Agent config ID applied to this session, if any (M5-001). */
-  agentConfigId?: string;
-  /** Human-readable agent name applied to this session, if any (M5-001). */
-  agentName?: string;
-  /** M5-007: per-session metrics. */
-  metrics: SessionMetrics;
 }

@Injectable()
@@ -136,38 +103,25 @@ export class AgentService implements OnModuleDestroy {
    @Inject(PreferencesService)
    private readonly preferencesService: PreferencesService | null,
    @Inject(SessionGCService) private readonly gc: SessionGCService,
-    @Optional()
-    @Inject(OPERATOR_MEMORY_PLUGIN)
-    private readonly operatorMemory: OperatorMemoryPlugin | null = null,
  ) {}

  /**
-   * Build the full set of custom tools scoped to the given sandbox directory and session user.
+   * Build the full set of custom tools scoped to the given sandbox directory.
   * Brain/coord/memory/web tools are stateless with respect to cwd; file/git/shell
   * tools receive the resolved sandboxDir so they operate within the sandbox.
-   * Memory tools are bound to sessionUserId so the LLM cannot access another user's data.
   */
-  private buildToolsForSandbox(
-    sandboxDir: string,
-    sessionUserId: string | undefined,
-    sessionScope?: { tenantId: string; ownerId: string; sessionId: string },
-  ): ToolDefinition[] {
+  private buildToolsForSandbox(sandboxDir: string): ToolDefinition[] {
    return [
      ...createBrainTools(this.brain),
      ...createCoordTools(this.coordService),
      ...createMemoryTools(
        this.memory,
        this.embeddingService.available ? this.embeddingService : null,
-        sessionUserId,
-        this.operatorMemory && sessionScope
-          ? { plugin: this.operatorMemory, scope: sessionScope }
-          : undefined,
      ),
      ...createFileTools(sandboxDir),
      ...createGitTools(sandboxDir),
      ...createShellTools(sandboxDir),
      ...createWebTools(),
-      ...createSearchTools(),
    ];
  }

@@ -194,20 +148,12 @@ export class AgentService implements OnModuleDestroy {
      .filter((t) => t.length > 0);
  }

-  async createSession(sessionId: string, options: AgentSessionOptions): Promise<AgentSession> {
-    const scope = this.scopeFromOptions(options);
+  async createSession(sessionId: string, options?: AgentSessionOptions): Promise<AgentSession> {
    const existing = this.sessions.get(sessionId);
-    if (existing) {
-      this.assertSessionScope(existing, scope);
-      return existing;
-    }
+    if (existing) return existing;

    const inflight = this.creating.get(sessionId);
-    if (inflight) {
-      const session = await inflight;
-      this.assertSessionScope(session, scope);
-      return session;
-    }
+    if (inflight) return inflight;

    const promise = this.doCreateSession(sessionId, options).finally(() => {
      this.creating.delete(sessionId);
@@ -220,13 +166,11 @@ export class AgentService implements OnModuleDestroy {
    sessionId: string,
    options?: AgentSessionOptions,
  ): Promise<AgentSession> {
-    // Merge DB agent config when agentConfigId is provided (M5-001)
+    // Merge DB agent config when agentConfigId is provided
    let mergedOptions = options;
-    let resolvedAgentName: string | undefined;
    if (options?.agentConfigId) {
      const agentConfig = await this.brain.agents.findById(options.agentConfigId);
      if (agentConfig) {
-        resolvedAgentName = agentConfig.name;
        mergedOptions = {
          provider: options.provider ?? agentConfig.provider,
          modelId: options.modelId ?? agentConfig.model,
@@ -235,9 +179,6 @@ export class AgentService implements OnModuleDestroy {
          sandboxDir: options.sandboxDir,
          isAdmin: options.isAdmin,
          agentConfigId: options.agentConfigId,
-          userId: options.userId,
-          tenantId: options.tenantId,
-          conversationHistory: options.conversationHistory,
        };
        this.logger.log(
          `Merged agent config "${agentConfig.name}" (${agentConfig.id}) into session ${sessionId}`,
@@ -275,16 +216,8 @@ export class AgentService implements OnModuleDestroy {
      );
    }

-    // Build per-session tools scoped to the sandbox directory and authenticated user
-    const sessionUserId = mergedOptions?.userId;
-    const sessionTenantId = this.tenantIdFor(sessionUserId, mergedOptions?.tenantId);
-    const sandboxTools = this.buildToolsForSandbox(
-      sandboxDir,
-      sessionUserId,
-      sessionUserId && sessionTenantId
-        ? { tenantId: sessionTenantId, ownerId: sessionUserId, sessionId }
-        : undefined,
-    );
+    // Build per-session tools scoped to the sandbox directory
+    const sandboxTools = this.buildToolsForSandbox(sandboxDir);

    // Combine static tools with dynamically discovered MCP client tools and skill tools
    const mcpTools = this.mcpClientService.getToolDefinitions();
@@ -306,20 +239,8 @@ export class AgentService implements OnModuleDestroy {
    // Build system prompt: platform prompt + skill additions appended
    const platformPrompt =
      mergedOptions?.systemPrompt ?? process.env['AGENT_SYSTEM_PROMPT'] ?? undefined;
-
-    // Format conversation history for context injection (M1-004 / M1-005)
-    const historyPromptSection = mergedOptions?.conversationHistory?.length
-      ? this.buildHistoryPromptSection(
-          mergedOptions.conversationHistory,
-          model?.contextWindow ?? 8192,
-          sessionId,
-        )
-      : undefined;
-
-    const appendParts: string[] = [];
-    if (promptAdditions.length > 0) appendParts.push(promptAdditions.join('\n\n'));
-    if (historyPromptSection) appendParts.push(historyPromptSection);
-    const appendSystemPrompt = appendParts.length > 0 ? appendParts.join('\n\n') : undefined;
+    const appendSystemPrompt =
+      promptAdditions.length > 0 ? promptAdditions.join('\n\n') : undefined;

    // Construct a resource loader that injects the configured system prompt
    const resourceLoader = new DefaultResourceLoader({
@@ -379,114 +300,14 @@ export class AgentService implements OnModuleDestroy {
      sandboxDir,
      allowedTools,
      userId: mergedOptions?.userId,
-      tenantId: sessionTenantId,
-      agentConfigId: mergedOptions?.agentConfigId,
-      agentName: resolvedAgentName,
-      metrics: {
-        tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-        modelSwitches: 0,
-        messageCount: 0,
-        lastActivityAt: new Date().toISOString(),
-      },
    };

    this.sessions.set(sessionId, session);
    this.logger.log(`Agent session ${sessionId} ready (${providerName}/${modelId})`);
-    if (resolvedAgentName) {
-      this.logger.log(
-        `Agent session ${sessionId} using agent config "${resolvedAgentName}" (M5-001)`,
-      );
-    }

    return session;
  }

-  /**
-   * Estimate token count for a string using a rough 4-chars-per-token heuristic.
-   */
-  private estimateTokens(text: string): number {
-    return Math.ceil(text.length / 4);
-  }
-
-  /**
-   * Build a conversation history section for injection into the system prompt.
-   * Implements M1-004 (history loading) and M1-005 (context window management).
-   *
-   * - Formats messages as a readable conversation transcript.
-   * - If the full history exceeds 80% of the model's context window, older messages
-   *   are summarized and only the most recent messages are kept verbatim.
-   * - Summarization is a simple extractive approach (no LLM required).
-   */
-  private buildHistoryPromptSection(
-    history: ConversationHistoryMessage[],
-    contextWindow: number,
-    sessionId: string,
-  ): string {
-    const TOKEN_BUDGET = Math.floor(contextWindow * 0.8);
-    const HISTORY_HEADER = '## Conversation History (resumed session)\n\n';
-
-    const formatMessage = (msg: ConversationHistoryMessage): string => {
-      const roleLabel =
-        msg.role === 'user' ? 'User' : msg.role === 'assistant' ? 'Assistant' : 'System';
-      return `**${roleLabel}:** ${msg.content}`;
-    };
-
-    const formatted = history.map((msg) => formatMessage(msg));
-    const fullHistory = formatted.join('\n\n');
-    const fullTokens = this.estimateTokens(HISTORY_HEADER + fullHistory);
-
-    if (fullTokens <= TOKEN_BUDGET) {
-      this.logger.debug(
-        `Session ${sessionId}: injecting full history (${history.length} msgs, ~${fullTokens} tokens)`,
-      );
-      return HISTORY_HEADER + fullHistory;
-    }
-
-    // History exceeds budget — summarize oldest messages, keep recent verbatim
-    this.logger.log(
-      `Session ${sessionId}: history (~${fullTokens} tokens) exceeds ${TOKEN_BUDGET} token budget; summarizing oldest messages`,
-    );
-
-    // Reserve 20% of the budget for the summary prefix, rest for verbatim messages
-    const SUMMARY_RESERVE = Math.floor(TOKEN_BUDGET * 0.2);
-    const verbatimBudget = TOKEN_BUDGET - SUMMARY_RESERVE;
-
-    let verbatimTokens = 0;
-    let verbatimCutIndex = history.length;
-    for (let i = history.length - 1; i >= 0; i--) {
-      const t = this.estimateTokens(formatted[i]!);
-      if (verbatimTokens + t > verbatimBudget) break;
-      verbatimTokens += t;
-      verbatimCutIndex = i;
-    }
-
-    const summarizedMessages = history.slice(0, verbatimCutIndex);
-    const verbatimMessages = history.slice(verbatimCutIndex);
-
-    let summaryText = '';
-    if (summarizedMessages.length > 0) {
-      const topics = summarizedMessages
-        .filter((m) => m.role === 'user')
-        .map((m) => m.content.slice(0, 120).replace(/\n/g, ' '))
-        .join('; ');
-      summaryText =
-        `**Previous conversation summary** (${summarizedMessages.length} messages omitted for brevity):\n` +
-        `Topics discussed: ${topics || '(no user messages in summarized portion)'}`;
-    }
-
-    const verbatimSection = verbatimMessages.map((m) => formatMessage(m)).join('\n\n');
-
-    const parts: string[] = [HISTORY_HEADER];
-    if (summaryText) parts.push(summaryText);
-    if (verbatimSection) parts.push(verbatimSection);
-
-    const result = parts.join('\n\n');
-    this.logger.log(
-      `Session ${sessionId}: summarized ${summarizedMessages.length} messages, kept ${verbatimMessages.length} verbatim (~${this.estimateTokens(result)} tokens)`,
-    );
-    return result;
-  }
-
  private resolveModel(options?: AgentSessionOptions) {
    if (!options?.provider && !options?.modelId) {
      return this.providerService.getDefaultModel() ?? null;
@@ -511,183 +332,65 @@ export class AgentService implements OnModuleDestroy {
    return this.providerService.getDefaultModel() ?? null;
  }

-  getSession(sessionId: string, scope: ActorTenantScope): AgentSession | undefined {
-    const session = this.sessions.get(sessionId);
-    if (!session || !this.sessionMatchesScope(session, scope)) return undefined;
-    return session;
+  getSession(sessionId: string): AgentSession | undefined {
+    return this.sessions.get(sessionId);
  }

-  listSessions(scope: ActorTenantScope): SessionInfoDto[] {
+  listSessions(): SessionInfoDto[] {
    const now = Date.now();
-    return Array.from(this.sessions.values())
-      .filter((s) => this.sessionMatchesScope(s, scope))
-      .map((s) => this.toSessionInfo(s, now));
+    return Array.from(this.sessions.values()).map((s) => ({
+      id: s.id,
+      provider: s.provider,
+      modelId: s.modelId,
+      createdAt: new Date(s.createdAt).toISOString(),
+      promptCount: s.promptCount,
+      channels: Array.from(s.channels),
+      durationMs: now - s.createdAt,
+    }));
  }

-  listAllSessionsForSystem(): SessionInfoDto[] {
-    const now = Date.now();
-    return Array.from(this.sessions.values()).map((s) => this.toSessionInfo(s, now));
-  }
-
-  getSessionInfo(sessionId: string, scope: ActorTenantScope): SessionInfoDto | undefined {
+  getSessionInfo(sessionId: string): SessionInfoDto | undefined {
    const s = this.sessions.get(sessionId);
-    if (!s || !this.sessionMatchesScope(s, scope)) return undefined;
-    return this.toSessionInfo(s);
-  }
-
-  private scopeFromOptions(options: AgentSessionOptions): ActorTenantScope {
-    if (!options.userId) {
-      throw new ForbiddenException('Session owner scope is required');
-    }
+    if (!s) return undefined;
    return {
-      userId: options.userId,
-      tenantId: this.tenantIdFor(options.userId, options.tenantId) ?? options.userId,
+      id: s.id,
+      provider: s.provider,
+      modelId: s.modelId,
+      createdAt: new Date(s.createdAt).toISOString(),
+      promptCount: s.promptCount,
+      channels: Array.from(s.channels),
+      durationMs: Date.now() - s.createdAt,
    };
  }

-  private tenantIdFor(
-    userId: string | undefined,
-    tenantId: string | undefined,
-  ): string | undefined {
-    return tenantId ?? userId;
-  }
-
-  private sessionMatchesScope(session: AgentSession, scope: ActorTenantScope): boolean {
-    return (
-      session.userId === scope.userId && (session.tenantId ?? session.userId) === scope.tenantId
-    );
-  }
-
-  private assertSessionScope(session: AgentSession, scope: ActorTenantScope): void {
-    if (!this.sessionMatchesScope(session, scope)) {
-      throw new ForbiddenException('Session does not belong to the current owner/tenant scope');
+  addChannel(sessionId: string, channel: string): void {
+    const session = this.sessions.get(sessionId);
+    if (session) {
+      session.channels.add(channel);
    }
  }

-  private toSessionInfo(session: AgentSession, now = Date.now()): SessionInfoDto {
-    return {
-      id: session.id,
-      provider: session.provider,
-      modelId: session.modelId,
-      ...(session.agentName ? { agentName: session.agentName } : {}),
-      createdAt: new Date(session.createdAt).toISOString(),
-      promptCount: session.promptCount,
-      channels: Array.from(session.channels),
-      durationMs: now - session.createdAt,
-      metrics: { ...session.metrics },
-    };
-  }
-
-  /**
-   * Record token usage for a session turn (M5-007).
-   * Accumulates tokens across the session lifetime.
-   */
-  recordTokenUsage(
-    sessionId: string,
-    tokens: { input: number; output: number; cacheRead: number; cacheWrite: number; total: number },
-  ): void {
+  removeChannel(sessionId: string, channel: string): void {
    const session = this.sessions.get(sessionId);
-    if (!session) return;
-    session.metrics.tokens.input += tokens.input;
-    session.metrics.tokens.output += tokens.output;
-    session.metrics.tokens.cacheRead += tokens.cacheRead;
-    session.metrics.tokens.cacheWrite += tokens.cacheWrite;
-    session.metrics.tokens.total += tokens.total;
-    session.metrics.lastActivityAt = new Date().toISOString();
-  }
-
-  /**
-   * Record a model switch event for a session (M5-007).
-   */
-  recordModelSwitch(sessionId: string): void {
-    const session = this.sessions.get(sessionId);
-    if (!session) return;
-    session.metrics.modelSwitches += 1;
-    session.metrics.lastActivityAt = new Date().toISOString();
-  }
-
-  /**
-   * Increment message count for a session (M5-007).
-   */
-  recordMessage(sessionId: string): void {
-    const session = this.sessions.get(sessionId);
-    if (!session) return;
-    session.metrics.messageCount += 1;
-    session.metrics.lastActivityAt = new Date().toISOString();
-  }
-
-  /**
-   * Update the model tracked on a live session (M5-002).
-   * This records the model change in the session metadata so subsequent
-   * session:info emissions reflect the new model.  The Pi session itself is
-   * not reconstructed — the model is used on the next createSession call for
-   * the same conversationId when the session is torn down or a new one is created.
-   */
-  updateSessionModel(sessionId: string, modelId: string, scope: ActorTenantScope): void {
-    const session = this.sessions.get(sessionId);
-    if (!session) return;
-    this.assertSessionScope(session, scope);
-    const prev = session.modelId;
-    session.modelId = modelId;
-    this.recordModelSwitch(sessionId);
-    this.logger.log(`Session ${sessionId}: model updated ${prev} → ${modelId} (M5-002)`);
-  }
-
-  /**
-   * Apply a new agent config to a live session mid-conversation (M5-003).
-   * Updates agentName, agentConfigId, and modelId on the session object.
-   * System prompt and tools take effect when the next session is created for
-   * this conversationId (they are baked in at session creation time).
-   */
-  applyAgentConfig(
-    sessionId: string,
-    agentConfigId: string,
-    agentName: string,
-    scope: ActorTenantScope,
-    modelId?: string,
-  ): void {
-    const session = this.sessions.get(sessionId);
-    if (!session) return;
-    this.assertSessionScope(session, scope);
-    session.agentConfigId = agentConfigId;
-    session.agentName = agentName;
-    if (modelId) {
-      this.updateSessionModel(sessionId, modelId, scope);
+    if (session) {
+      session.channels.delete(channel);
    }
-    this.logger.log(
-      `Session ${sessionId}: agent switched to "${agentName}" (${agentConfigId}) (M5-003)`,
-    );
  }

-  addChannel(sessionId: string, channel: string, scope: ActorTenantScope): void {
-    const session = this.sessions.get(sessionId);
-    if (!session) return;
-    this.assertSessionScope(session, scope);
-    session.channels.add(channel);
-  }
-
-  removeChannel(sessionId: string, channel: string, scope: ActorTenantScope): void {
-    const session = this.sessions.get(sessionId);
-    if (!session) return;
-    this.assertSessionScope(session, scope);
-    session.channels.delete(channel);
-  }
-
-  async prompt(sessionId: string, message: string, scope: ActorTenantScope): Promise<void> {
+  async prompt(sessionId: string, message: string): Promise<void> {
    const session = this.sessions.get(sessionId);
    if (!session) {
      throw new Error(`No agent session found: ${sessionId}`);
    }
-    this.assertSessionScope(session, scope);
    session.promptCount += 1;

    // Prepend session-scoped system override if present (renew TTL on each turn)
    let effectiveMessage = message;
    if (this.systemOverride) {
-      const override = await this.systemOverride.get(sessionId, scope);
+      const override = await this.systemOverride.get(sessionId);
      if (override) {
        effectiveMessage = `[System Override]\n${override}\n\n${message}`;
-        await this.systemOverride.renew(sessionId, scope);
+        await this.systemOverride.renew(sessionId);
        this.logger.debug(`Applied system override for session ${sessionId}`);
      }
    }
@@ -703,28 +406,16 @@ export class AgentService implements OnModuleDestroy {
    }
  }

-  onEvent(
-    sessionId: string,
-    listener: (event: AgentSessionEvent) => void,
-    scope: ActorTenantScope,
-  ): () => void {
+  onEvent(sessionId: string, listener: (event: AgentSessionEvent) => void): () => void {
    const session = this.sessions.get(sessionId);
    if (!session) {
      throw new Error(`No agent session found: ${sessionId}`);
    }
-    this.assertSessionScope(session, scope);
    session.listeners.add(listener);
    return () => session.listeners.delete(listener);
  }

-  async destroySession(sessionId: string, scope: ActorTenantScope): Promise<void> {
-    const session = this.sessions.get(sessionId);
-    if (!session) return;
-    this.assertSessionScope(session, scope);
-    await this.destroySessionForSystem(sessionId);
-  }
-
-  private async destroySessionForSystem(sessionId: string): Promise<void> {
+  async destroySession(sessionId: string): Promise<void> {
    const session = this.sessions.get(sessionId);
    if (!session) return;
    this.logger.log(`Destroying agent session ${sessionId}`);
@@ -753,7 +444,7 @@ export class AgentService implements OnModuleDestroy {

  async onModuleDestroy(): Promise<void> {
    this.logger.log('Shutting down all agent sessions');
-    const stops = Array.from(this.sessions.keys()).map((id) => this.destroySessionForSystem(id));
+    const stops = Array.from(this.sessions.keys()).map((id) => this.destroySession(id));
    const results = await Promise.allSettled(stops);
    for (const result of results) {
      if (result.status === 'rejected') {
--- a/apps/gateway/src/agent/connector-lease.integration.test.ts
+++ b/apps/gateway/src/agent/connector-lease.integration.test.ts
@@ -1,232 +0,0 @@
-import { mkdtemp, rm } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
-import { Test, type TestingModule } from '@nestjs/testing';
-import {
-  connectorLeaseAuditLog,
-  createPgliteDb,
-  eq,
-  runPgliteMigrations,
-  type DbHandle,
-} from '@mosaicstack/db';
-import type { ConnectorExecutionContext, FencedConnectorAdapter } from '@mosaicstack/types';
-import { DB } from '../database/database.module.js';
-import { ConnectorLeaseRepository } from './connector-lease.repository.js';
-import {
-  CONNECTOR_LEASE_POLICY,
-  ConnectorLeaseService,
-  type ConnectorLeasePolicy,
-} from './connector-lease.service.js';
-
-const authorize = vi.fn().mockResolvedValue(true);
-const policy: ConnectorLeasePolicy = { authorize };
-const context = {
-  actorScope: { userId: 'operator-a', tenantId: 'tenant-a' },
-  correlationId: 'correlation-acquire',
-};
-
-describe('gateway connector lease fencing integration', (): void => {
-  let dataDir: string;
-  let handle: DbHandle;
-  let moduleRef: TestingModule;
-  let service: ConnectorLeaseService;
-
-  beforeAll(async (): Promise<void> => {
-    vi.useFakeTimers();
-    vi.setSystemTime(new Date('2026-07-14T17:00:00.000Z'));
-    dataDir = await mkdtemp(join(tmpdir(), 'mosaic-gateway-connector-lease-'));
-    handle = createPgliteDb(dataDir);
-    await runPgliteMigrations(handle);
-    moduleRef = await Test.createTestingModule({
-      providers: [
-        ConnectorLeaseRepository,
-        ConnectorLeaseService,
-        { provide: DB, useValue: handle.db },
-        { provide: CONNECTOR_LEASE_POLICY, useValue: policy },
-      ],
-    }).compile();
-    service = moduleRef.get(ConnectorLeaseService);
-  });
-
-  afterAll(async (): Promise<void> => {
-    vi.useRealTimers();
-    await moduleRef.close();
-    await handle.close();
-    await rm(dataDir, { recursive: true, force: true });
-  });
-
-  it('derives tenant authority at the gateway and validates a grant before side effects', async (): Promise<void> => {
-    const lease = await service.acquire(
-      {
-        logicalAgentId: 'Mos',
-        bindingId: 'operator-chat',
-        connectorId: 'pi-worker-a',
-        scopes: ['runtime.send'],
-        ttlMs: 60_000,
-      },
-      context,
-    );
-    const grant = await service.issueGrant(
-      { lease, scopes: ['runtime.send'], ttlMs: 30_000 },
-      { ...context, correlationId: 'correlation-grant' },
-    );
-    const execute = vi.fn(async (_message: string, leaseContext: ConnectorExecutionContext) => {
-      return leaseContext.leaseEpoch;
-    });
-    const adapter: FencedConnectorAdapter<string, string> = { execute };
-
-    await expect(service.executeGrant(grant, 'runtime.send', 'hello', adapter)).resolves.toBe('1');
-    expect(execute).toHaveBeenCalledOnce();
-    expect(authorize).toHaveBeenCalledWith(
-      expect.objectContaining({
-        action: 'grant.issue',
-        requestedScopes: ['runtime.send'],
-        requestedTtlMs: 30_000,
-      }),
-    );
-    expect(execute.mock.calls[0]?.[1]).toMatchObject({
-      identity: { tenantId: 'tenant-a', logicalAgentId: 'mos' },
-      bindingId: 'operator-chat',
-      connectorId: 'pi-worker-a',
-    });
-  });
-
-  it('normalizes lease-derived policy subjects before authorization', async (): Promise<void> => {
-    const lease = await service.acquire(
-      {
-        logicalAgentId: 'mos',
-        bindingId: 'operator-chat-policy',
-        connectorId: 'pi-worker-a',
-        scopes: ['runtime.send'],
-        ttlMs: 60_000,
-      },
-      { ...context, correlationId: 'correlation-policy-setup' },
-    );
-    const aliasedLease = {
-      ...lease,
-      identity: { ...lease.identity, logicalAgentId: ' MOS ' },
-      bindingId: ' Operator-Chat-Policy ',
-      connectorId: ' PI-Worker-A ',
-      scopes: [' Runtime.Send '],
-      leaseEpoch: `00${lease.leaseEpoch}`,
-    };
-
-    await service.heartbeat(aliasedLease, 30_000, {
-      ...context,
-      correlationId: 'correlation-policy-heartbeat',
-    });
-    expect(authorize).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        action: 'lease.heartbeat',
-        logicalAgentId: 'mos',
-        bindingId: 'operator-chat-policy',
-        connectorId: 'pi-worker-a',
-        requestedScopes: ['runtime.send'],
-      }),
-    );
-
-    await service.issueGrant(
-      { lease: aliasedLease, scopes: [' Runtime.Send '], ttlMs: 1_000 },
-      { ...context, correlationId: 'correlation-policy-grant' },
-    );
-    expect(authorize).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        action: 'grant.issue',
-        logicalAgentId: 'mos',
-        bindingId: 'operator-chat-policy',
-        connectorId: 'pi-worker-a',
-        requestedScopes: ['runtime.send'],
-      }),
-    );
-
-    await service.release(aliasedLease, {
-      ...context,
-      correlationId: 'correlation-policy-release',
-    });
-    expect(authorize).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        action: 'lease.release',
-        logicalAgentId: 'mos',
-        bindingId: 'operator-chat-policy',
-        connectorId: 'pi-worker-a',
-        requestedScopes: ['runtime.send'],
-      }),
-    );
-  });
-
-  it('denies stale, forged, expired, cross-tenant, and cross-binding grants before effects', async (): Promise<void> => {
-    const bindingId = 'operator-chat-denials';
-    const current = await service.acquire(
-      {
-        logicalAgentId: 'mos',
-        bindingId,
-        connectorId: 'pi-worker-a',
-        scopes: ['runtime.send'],
-        ttlMs: 60_000,
-      },
-      { ...context, correlationId: 'correlation-denial-setup' },
-    );
-    const stale = await service.issueGrant(
-      { lease: current, scopes: ['runtime.send'], ttlMs: 30_000 },
-      { ...context, correlationId: 'correlation-stale' },
-    );
-    await service.takeover(
-      {
-        logicalAgentId: 'mos',
-        bindingId,
-        connectorId: 'pi-worker-b',
-        scopes: ['runtime.send'],
-        ttlMs: 60_000,
-        expectedEpoch: current.leaseEpoch,
-      },
-      { ...context, correlationId: 'correlation-takeover' },
-    );
-    const adapter = { execute: vi.fn().mockResolvedValue(undefined) };
-
-    await expect(service.executeGrant(stale, 'runtime.send', undefined, adapter)).rejects.toThrow();
-
-    const active = await service.current('mos', bindingId, context);
-    if (!active) throw new Error('active lease fixture is unavailable');
-    const grant = await service.issueGrant(
-      { lease: active, scopes: ['runtime.send'], ttlMs: 1_000 },
-      { ...context, correlationId: 'correlation-active' },
-    );
-    await expect(
-      service.executeGrant({ ...grant }, 'runtime.send', undefined, adapter),
-    ).rejects.toThrow();
-    await expect(
-      service.executeGrant(
-        { ...grant, bindingId: 'other-binding' },
-        'runtime.send',
-        undefined,
-        adapter,
-      ),
-    ).rejects.toThrow();
-    await expect(
-      service.issueGrant(
-        { lease: active, scopes: ['runtime.send'], ttlMs: 30_000 },
-        {
-          actorScope: { userId: 'operator-b', tenantId: 'tenant-b' },
-          correlationId: 'correlation-cross-tenant',
-        },
-      ),
-    ).rejects.toThrow();
-    const crossTenantAudit = await handle.db
-      .select()
-      .from(connectorLeaseAuditLog)
-      .where(eq(connectorLeaseAuditLog.correlationId, 'correlation-cross-tenant'));
-    expect(crossTenantAudit).toHaveLength(1);
-    expect(crossTenantAudit[0]).toMatchObject({
-      tenantId: 'tenant-b',
-      logicalAgentId: 'untrusted',
-      bindingId: 'untrusted',
-      connectorId: 'untrusted',
-      reason: 'policy_denied',
-    });
-
-    vi.setSystemTime(new Date('2026-07-14T17:00:02.000Z'));
-    await expect(service.executeGrant(grant, 'runtime.send', undefined, adapter)).rejects.toThrow();
-    expect(adapter.execute).not.toHaveBeenCalled();
-  });
-});
--- a/apps/gateway/src/agent/connector-lease.postgres.integration.test.ts
+++ b/apps/gateway/src/agent/connector-lease.postgres.integration.test.ts
@@ -1,76 +0,0 @@
-import { randomUUID } from 'node:crypto';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-import {
-  connectorLeaseAuditLog,
-  createDb,
-  eq,
-  logicalAgentConnectorLeases,
-  type DbHandle,
-} from '@mosaicstack/db';
-import { ConnectorLeaseCoordinator } from '@mosaicstack/agent';
-import { ConnectorLeaseRepository } from './connector-lease.repository.js';
-
-const hasPostgres = Boolean(process.env['DATABASE_URL']);
-const tenantId = `lease-test-${randomUUID()}`;
-const identity = { tenantId, logicalAgentId: 'mos' } as const;
-
-describe.skipIf(!hasPostgres)('ConnectorLeaseRepository real PostgreSQL integration', (): void => {
-  let handle: DbHandle;
-
-  beforeAll((): void => {
-    handle = createDb(process.env['DATABASE_URL']);
-  });
-
-  afterAll(async (): Promise<void> => {
-    if (!handle) return;
-    await handle.db
-      .delete(connectorLeaseAuditLog)
-      .where(eq(connectorLeaseAuditLog.tenantId, tenantId));
-    await handle.db
-      .delete(logicalAgentConnectorLeases)
-      .where(eq(logicalAgentConnectorLeases.tenantId, tenantId));
-    await handle.close();
-  });
-
-  it('preserves the exclusive CAS fence across a real pool close/reopen', async (): Promise<void> => {
-    const command = {
-      identity,
-      bindingId: 'operator-chat',
-      scopes: ['runtime.send'],
-      ttlMs: 60_000,
-    } as const;
-    const firstCoordinator = new ConnectorLeaseCoordinator(new ConnectorLeaseRepository(handle.db));
-    const contenders = await Promise.allSettled([
-      firstCoordinator.acquire({
-        ...command,
-        connectorId: 'connector-a',
-        correlationId: 'postgres-acquire-a',
-      }),
-      firstCoordinator.acquire({
-        ...command,
-        connectorId: 'connector-b',
-        correlationId: 'postgres-acquire-b',
-      }),
-    ]);
-    const acquired = contenders.find((result) => result.status === 'fulfilled');
-    if (!acquired || acquired.status !== 'fulfilled') throw new Error('no lease contender won');
-    expect(contenders.filter((result) => result.status === 'fulfilled')).toHaveLength(1);
-
-    await handle.close();
-    handle = createDb(process.env['DATABASE_URL']);
-    const reopened = new ConnectorLeaseCoordinator(new ConnectorLeaseRepository(handle.db));
-    const persisted = await reopened.current({ identity, bindingId: 'operator-chat' });
-    expect(persisted).toMatchObject({
-      leaseId: acquired.value.leaseId,
-      leaseEpoch: '1',
-    });
-
-    const takeover = await reopened.takeover({
-      ...command,
-      connectorId: 'connector-c',
-      correlationId: 'postgres-takeover',
-      expectedEpoch: acquired.value.leaseEpoch,
-    });
-    expect(takeover).toMatchObject({ connectorId: 'connector-c', leaseEpoch: '2' });
-  });
-});
--- a/apps/gateway/src/agent/connector-lease.repository.test.ts
+++ b/apps/gateway/src/agent/connector-lease.repository.test.ts
@@ -1,149 +0,0 @@
-import { mkdtemp, rm } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
-import {
-  connectorLeaseAuditLog,
-  createPgliteDb,
-  eq,
-  runPgliteMigrations,
-  type DbHandle,
-} from '@mosaicstack/db';
-import { ConnectorLeaseCoordinator, ConnectorLeaseError } from '@mosaicstack/agent';
-import { ConnectorLeaseRepository } from './connector-lease.repository.js';
-
-const identity = { tenantId: 'tenant-a', logicalAgentId: 'mos' } as const;
-
-function acquireCommand(connectorId: string, correlationId: string) {
-  return {
-    identity,
-    bindingId: 'operator-chat',
-    connectorId,
-    scopes: ['runtime.send', 'tool.execute'],
-    ttlMs: 60_000,
-    correlationId,
-  };
-}
-
-describe('ConnectorLeaseRepository PostgreSQL semantics', (): void => {
-  let dataDir: string;
-  let handle: DbHandle;
-  let now: Date;
-  let coordinator: ConnectorLeaseCoordinator;
-
-  beforeEach(async (): Promise<void> => {
-    dataDir = await mkdtemp(join(tmpdir(), 'mosaic-connector-lease-'));
-    handle = createPgliteDb(dataDir);
-    await runPgliteMigrations(handle);
-    now = new Date('2026-07-14T17:00:00.000Z');
-    coordinator = new ConnectorLeaseCoordinator(new ConnectorLeaseRepository(handle.db), {
-      now: (): Date => now,
-    });
-  });
-
-  afterEach(async (): Promise<void> => {
-    await handle.close();
-    await rm(dataDir, { recursive: true, force: true });
-  });
-
-  it('allows only one concurrent contender to acquire a binding', async (): Promise<void> => {
-    const outcomes = await Promise.allSettled([
-      coordinator.acquire(acquireCommand('connector-a', 'correlation-a')),
-      coordinator.acquire(acquireCommand('connector-b', 'correlation-b')),
-    ]);
-
-    expect(outcomes.filter((result) => result.status === 'fulfilled')).toHaveLength(1);
-    const rejected = outcomes.find((result) => result.status === 'rejected');
-    expect(rejected).toMatchObject({
-      reason: { code: 'lease_held' } satisfies Partial<ConnectorLeaseError>,
-    });
-  });
-
-  it('uses compare-and-swap takeover and increments the fencing epoch monotonically', async (): Promise<void> => {
-    const acquired = await coordinator.acquire(acquireCommand('connector-a', 'correlation-a'));
-    const results = await Promise.allSettled([
-      coordinator.takeover({
-        ...acquireCommand('connector-b', 'correlation-b'),
-        expectedEpoch: acquired.leaseEpoch,
-      }),
-      coordinator.takeover({
-        ...acquireCommand('connector-c', 'correlation-c'),
-        expectedEpoch: acquired.leaseEpoch,
-      }),
-    ]);
-    const winner = results.find((result) => result.status === 'fulfilled');
-
-    expect(results.filter((result) => result.status === 'fulfilled')).toHaveLength(1);
-    expect(winner?.status === 'fulfilled' ? winner.value.leaseEpoch : null).toBe('2');
-    expect(results.find((result) => result.status === 'rejected')).toMatchObject({
-      reason: { code: 'cas_mismatch' } satisfies Partial<ConnectorLeaseError>,
-    });
-  });
-
-  it('heartbeats and releases only the current connector epoch', async (): Promise<void> => {
-    const acquired = await coordinator.acquire(acquireCommand('connector-a', 'correlation-a'));
-    now = new Date('2026-07-14T17:00:30.000Z');
-    const renewed = await coordinator.heartbeat({
-      lease: acquired,
-      ttlMs: 120_000,
-      correlationId: 'correlation-renew',
-    });
-    expect(renewed.expiresAt).toBe('2026-07-14T17:02:30.000Z');
-
-    await coordinator.release({ lease: renewed, correlationId: 'correlation-release' });
-    await expect(
-      coordinator.heartbeat({
-        lease: renewed,
-        ttlMs: 120_000,
-        correlationId: 'correlation-stale',
-      }),
-    ).rejects.toMatchObject({ code: 'lease_released' } satisfies Partial<ConnectorLeaseError>);
-  });
-
-  it('survives close/reopen and requires CAS takeover to recover an expired lease', async (): Promise<void> => {
-    const acquired = await coordinator.acquire(acquireCommand('connector-a', 'correlation-a'));
-    await handle.close();
-
-    now = new Date('2026-07-14T17:02:00.000Z');
-    handle = createPgliteDb(dataDir);
-    await runPgliteMigrations(handle);
-    coordinator = new ConnectorLeaseCoordinator(new ConnectorLeaseRepository(handle.db), {
-      now: (): Date => now,
-    });
-
-    await expect(
-      coordinator.acquire(acquireCommand('connector-b', 'correlation-plain-acquire')),
-    ).rejects.toMatchObject({ code: 'takeover_required' } satisfies Partial<ConnectorLeaseError>);
-    const recovered = await coordinator.takeover({
-      ...acquireCommand('connector-b', 'correlation-takeover'),
-      expectedEpoch: acquired.leaseEpoch,
-    });
-    expect(recovered).toMatchObject({ connectorId: 'connector-b', leaseEpoch: '2' });
-  });
-
-  it('writes credential-safe lifecycle and rejection audit records', async (): Promise<void> => {
-    const acquired = await coordinator.acquire(acquireCommand('connector-a', 'correlation-a'));
-    await coordinator.heartbeat({
-      lease: acquired,
-      ttlMs: 60_000,
-      correlationId: 'correlation-renew',
-    });
-    await expect(
-      coordinator.acquire(acquireCommand('connector-b', 'correlation-reject')),
-    ).rejects.toBeInstanceOf(ConnectorLeaseError);
-
-    const rows = await handle.db
-      .select()
-      .from(connectorLeaseAuditLog)
-      .where(eq(connectorLeaseAuditLog.tenantId, identity.tenantId));
-    expect(rows.map((row) => row.event)).toEqual(
-      expect.arrayContaining(['acquire', 'renew', 'reject']),
-    );
-    const serialized = JSON.stringify(rows, (_key: string, value: unknown): unknown =>
-      typeof value === 'bigint' ? value.toString(10) : value,
-    );
-    expect(serialized).not.toContain('tool.execute');
-    expect(serialized).not.toContain('runtime.send');
-    expect(serialized).not.toMatch(/token|secret|credential/i);
-  });
-});
--- a/apps/gateway/src/agent/connector-lease.repository.ts
+++ b/apps/gateway/src/agent/connector-lease.repository.ts
@@ -1,354 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import {
-  and,
-  connectorLeaseAuditLog,
-  eq,
-  gt,
-  isNull,
-  logicalAgentConnectorLeases,
-  sql,
-  type Db,
-} from '@mosaicstack/db';
-import { ConnectorLeaseError } from '@mosaicstack/agent';
-import type {
-  ConnectorLease,
-  ConnectorLeaseAcquireMutation,
-  ConnectorLeaseAuditEvent,
-  ConnectorLeaseHeartbeatMutation,
-  ConnectorLeaseRejectReason,
-  ConnectorLeaseReleaseMutation,
-  ConnectorLeaseStore,
-  ConnectorLeaseTakeoverMutation,
-  LogicalAgentBinding,
-} from '@mosaicstack/types';
-import { DB } from '../database/database.module.js';
-
-interface SuccessfulMutation {
-  readonly ok: true;
-  readonly lease: ConnectorLease;
-}
-
-interface FailedMutation {
-  readonly ok: false;
-  readonly reason: ConnectorLeaseRejectReason;
-}
-
-type MutationResult = SuccessfulMutation | FailedMutation;
-
-@Injectable()
-export class ConnectorLeaseRepository implements ConnectorLeaseStore {
-  constructor(@Inject(DB) private readonly db: Db) {}
-
-  async acquire(input: ConnectorLeaseAcquireMutation): Promise<ConnectorLease> {
-    const result: MutationResult = await this.db.transaction(
-      async (tx): Promise<MutationResult> => {
-        const inserted = await tx
-          .insert(logicalAgentConnectorLeases)
-          .values({
-            leaseId: input.leaseId,
-            tenantId: input.identity.tenantId,
-            logicalAgentId: input.identity.logicalAgentId,
-            bindingId: input.bindingId,
-            connectorId: input.connectorId,
-            scopes: [...input.scopes],
-            leaseEpoch: 1n,
-            acquiredAt: new Date(input.now),
-            heartbeatAt: new Date(input.now),
-            expiresAt: new Date(input.expiresAt),
-            updatedAt: new Date(input.now),
-          })
-          .onConflictDoNothing()
-          .returning();
-        const row = inserted[0];
-        if (row) {
-          const lease = toLease(row);
-          await insertAudit(tx, lifecycleAudit(input, lease, 'acquire'));
-          return { ok: true, lease };
-        }
-
-        const current = await findRow(tx, input);
-        if (current && current.expiresAt <= new Date(input.now) && !current.releasedAt) {
-          await insertAudit(tx, lifecycleAudit(input, toLease(current), 'expiry'));
-        }
-        const reason: ConnectorLeaseRejectReason =
-          current && (current.releasedAt || current.expiresAt <= new Date(input.now))
-            ? 'takeover_required'
-            : 'lease_held';
-        await insertAudit(tx, rejectionAudit(input, current ? toLease(current) : null, reason));
-        return { ok: false, reason };
-      },
-    );
-    return unwrap(result);
-  }
-
-  async takeover(input: ConnectorLeaseTakeoverMutation): Promise<ConnectorLease> {
-    const result: MutationResult = await this.db.transaction(
-      async (tx): Promise<MutationResult> => {
-        const current = await findRow(tx, input);
-        if (!current || current.leaseEpoch.toString(10) !== input.expectedEpoch) {
-          await insertAudit(
-            tx,
-            rejectionAudit(input, current ? toLease(current) : null, 'cas_mismatch'),
-          );
-          return { ok: false, reason: 'cas_mismatch' };
-        }
-        if (current.expiresAt <= new Date(input.now) && !current.releasedAt) {
-          await insertAudit(tx, lifecycleAudit(input, toLease(current), 'expiry'));
-        }
-        const updated = await tx
-          .update(logicalAgentConnectorLeases)
-          .set({
-            leaseId: input.leaseId,
-            connectorId: input.connectorId,
-            scopes: [...input.scopes],
-            leaseEpoch: sql`${logicalAgentConnectorLeases.leaseEpoch} + 1`,
-            acquiredAt: new Date(input.now),
-            heartbeatAt: new Date(input.now),
-            expiresAt: new Date(input.expiresAt),
-            releasedAt: null,
-            updatedAt: new Date(input.now),
-          })
-          .where(
-            and(
-              bindingPredicate(input),
-              eq(logicalAgentConnectorLeases.leaseId, current.leaseId),
-              eq(logicalAgentConnectorLeases.leaseEpoch, BigInt(input.expectedEpoch)),
-            ),
-          )
-          .returning();
-        const row = updated[0];
-        if (!row) {
-          await insertAudit(tx, rejectionAudit(input, toLease(current), 'cas_mismatch'));
-          return { ok: false, reason: 'cas_mismatch' };
-        }
-        const lease = toLease(row);
-        await insertAudit(tx, lifecycleAudit(input, lease, 'takeover'));
-        return { ok: true, lease };
-      },
-    );
-    return unwrap(result);
-  }
-
-  async heartbeat(input: ConnectorLeaseHeartbeatMutation): Promise<ConnectorLease> {
-    const result: MutationResult = await this.db.transaction(
-      async (tx): Promise<MutationResult> => {
-        const updated = await tx
-          .update(logicalAgentConnectorLeases)
-          .set({
-            heartbeatAt: new Date(input.now),
-            expiresAt: new Date(input.expiresAt),
-            updatedAt: new Date(input.now),
-          })
-          .where(
-            and(
-              bindingPredicate(input.lease),
-              eq(logicalAgentConnectorLeases.leaseId, input.lease.leaseId),
-              eq(logicalAgentConnectorLeases.connectorId, input.lease.connectorId),
-              eq(logicalAgentConnectorLeases.leaseEpoch, BigInt(input.lease.leaseEpoch)),
-              isNull(logicalAgentConnectorLeases.releasedAt),
-              gt(logicalAgentConnectorLeases.expiresAt, new Date(input.now)),
-            ),
-          )
-          .returning();
-        const row = updated[0];
-        if (row) {
-          const lease = toLease(row);
-          await insertAudit(tx, lifecycleAudit(input, lease, 'renew'));
-          return { ok: true, lease };
-        }
-        const current = await findRow(tx, input.lease);
-        const reason = classifyAuthorityFailure(
-          current ? toLease(current) : null,
-          input.lease,
-          input.now,
-        );
-        if (reason === 'lease_expired' && current) {
-          await insertAudit(tx, lifecycleAudit(input, toLease(current), 'expiry'));
-        }
-        await insertAudit(
-          tx,
-          rejectionAudit(
-            { ...input.lease, correlationId: input.correlationId, now: input.now },
-            current ? toLease(current) : null,
-            reason,
-          ),
-        );
-        return { ok: false, reason };
-      },
-    );
-    return unwrap(result);
-  }
-
-  async release(input: ConnectorLeaseReleaseMutation): Promise<void> {
-    const result: MutationResult = await this.db.transaction(
-      async (tx): Promise<MutationResult> => {
-        const updated = await tx
-          .update(logicalAgentConnectorLeases)
-          .set({
-            releasedAt: new Date(input.now),
-            expiresAt: new Date(input.now),
-            updatedAt: new Date(input.now),
-          })
-          .where(
-            and(
-              bindingPredicate(input.lease),
-              eq(logicalAgentConnectorLeases.leaseId, input.lease.leaseId),
-              eq(logicalAgentConnectorLeases.connectorId, input.lease.connectorId),
-              eq(logicalAgentConnectorLeases.leaseEpoch, BigInt(input.lease.leaseEpoch)),
-              isNull(logicalAgentConnectorLeases.releasedAt),
-              gt(logicalAgentConnectorLeases.expiresAt, new Date(input.now)),
-            ),
-          )
-          .returning();
-        const row = updated[0];
-        if (row) {
-          const lease = toLease(row);
-          await insertAudit(tx, lifecycleAudit(input, lease, 'release'));
-          return { ok: true, lease };
-        }
-        const current = await findRow(tx, input.lease);
-        const reason = classifyAuthorityFailure(
-          current ? toLease(current) : null,
-          input.lease,
-          input.now,
-        );
-        if (reason === 'lease_expired' && current) {
-          await insertAudit(tx, lifecycleAudit(input, toLease(current), 'expiry'));
-        }
-        await insertAudit(
-          tx,
-          rejectionAudit(
-            { ...input.lease, correlationId: input.correlationId, now: input.now },
-            current ? toLease(current) : null,
-            reason,
-          ),
-        );
-        return { ok: false, reason };
-      },
-    );
-    unwrap(result);
-  }
-
-  async findCurrent(binding: LogicalAgentBinding): Promise<ConnectorLease | null> {
-    const row = await findRow(this.db, binding);
-    return row ? toLease(row) : null;
-  }
-
-  async recordAudit(event: ConnectorLeaseAuditEvent): Promise<void> {
-    await insertAudit(this.db, event);
-  }
-}
-
-function unwrap(result: MutationResult): ConnectorLease {
-  if (!result.ok) throw new ConnectorLeaseError(result.reason, safeErrorMessage(result.reason));
-  return result.lease;
-}
-
-function safeErrorMessage(reason: ConnectorLeaseRejectReason): string {
-  return `Connector lease mutation denied: ${reason}`;
-}
-
-function bindingPredicate(binding: LogicalAgentBinding) {
-  return and(
-    eq(logicalAgentConnectorLeases.tenantId, binding.identity.tenantId),
-    eq(logicalAgentConnectorLeases.logicalAgentId, binding.identity.logicalAgentId),
-    eq(logicalAgentConnectorLeases.bindingId, binding.bindingId),
-  );
-}
-
-async function findRow(
-  db: Pick<Db, 'select'>,
-  binding: LogicalAgentBinding,
-): Promise<typeof logicalAgentConnectorLeases.$inferSelect | null> {
-  const rows = await db
-    .select()
-    .from(logicalAgentConnectorLeases)
-    .where(bindingPredicate(binding))
-    .limit(1);
-  return rows[0] ?? null;
-}
-
-function toLease(row: typeof logicalAgentConnectorLeases.$inferSelect): ConnectorLease {
-  return Object.freeze({
-    identity: Object.freeze({ tenantId: row.tenantId, logicalAgentId: row.logicalAgentId }),
-    bindingId: row.bindingId,
-    leaseId: row.leaseId,
-    connectorId: row.connectorId,
-    scopes: Object.freeze([...row.scopes]),
-    leaseEpoch: row.leaseEpoch.toString(10),
-    acquiredAt: row.acquiredAt.toISOString(),
-    heartbeatAt: row.heartbeatAt.toISOString(),
-    expiresAt: row.expiresAt.toISOString(),
-    ...(row.releasedAt ? { releasedAt: row.releasedAt.toISOString() } : {}),
-  });
-}
-
-function classifyAuthorityFailure(
-  current: ConnectorLease | null,
-  claimed: ConnectorLease,
-  now: string,
-): ConnectorLeaseRejectReason {
-  if (!current) return 'lease_missing';
-  if (current.releasedAt) return 'lease_released';
-  if (new Date(current.expiresAt) <= new Date(now)) return 'lease_expired';
-  if (current.leaseEpoch !== claimed.leaseEpoch) return 'stale_epoch';
-  return 'connector_mismatch';
-}
-
-function lifecycleAudit(
-  input: { readonly correlationId: string; readonly now: string },
-  lease: ConnectorLease,
-  event: Exclude<ConnectorLeaseAuditEvent['event'], 'reject'>,
-): ConnectorLeaseAuditEvent {
-  return {
-    identity: lease.identity,
-    bindingId: lease.bindingId,
-    connectorId: lease.connectorId,
-    leaseId: lease.leaseId,
-    leaseEpoch: lease.leaseEpoch,
-    event,
-    outcome: 'succeeded',
-    correlationId: input.correlationId,
-    occurredAt: input.now,
-  };
-}
-
-function rejectionAudit(
-  input: {
-    readonly identity: ConnectorLease['identity'];
-    readonly bindingId: string;
-    readonly connectorId: string;
-    readonly correlationId: string;
-    readonly now: string;
-  },
-  current: ConnectorLease | null,
-  reason: ConnectorLeaseRejectReason,
-): ConnectorLeaseAuditEvent {
-  return {
-    identity: input.identity,
-    bindingId: input.bindingId,
-    connectorId: input.connectorId,
-    event: 'reject',
-    outcome: 'denied',
-    correlationId: input.correlationId,
-    occurredAt: input.now,
-    ...(current ? { leaseId: current.leaseId, leaseEpoch: current.leaseEpoch } : {}),
-    reason,
-  };
-}
-
-async function insertAudit(db: Pick<Db, 'insert'>, event: ConnectorLeaseAuditEvent): Promise<void> {
-  await db.insert(connectorLeaseAuditLog).values({
-    tenantId: event.identity.tenantId,
-    logicalAgentId: event.identity.logicalAgentId,
-    bindingId: event.bindingId,
-    connectorId: event.connectorId,
-    ...(event.leaseId ? { leaseId: event.leaseId } : {}),
-    ...(event.leaseEpoch ? { leaseEpoch: BigInt(event.leaseEpoch) } : {}),
-    event: event.event,
-    outcome: event.outcome,
-    ...(event.reason ? { reason: event.reason } : {}),
-    correlationId: event.correlationId,
-    occurredAt: new Date(event.occurredAt),
-  });
-}
--- a/apps/gateway/src/agent/connector-lease.service.ts
+++ b/apps/gateway/src/agent/connector-lease.service.ts
@@ -1,266 +0,0 @@
-import { ForbiddenException, Inject, Injectable } from '@nestjs/common';
-import { ConnectorLeaseCoordinator, normalizeConnectorLease } from '@mosaicstack/agent';
-import {
-  normalizeConnectorId,
-  normalizeConnectorScopes,
-  normalizeCorrelationId,
-  normalizeLogicalAgentIdentity,
-  normalizeLogicalBindingId,
-  type AcquireConnectorLeaseInput,
-  type ConnectorExecutionGrant,
-  type ConnectorLease,
-  type ConnectorLeaseAuditEvent,
-  type FencedConnectorAdapter,
-} from '@mosaicstack/types';
-import type { ActorTenantScope } from '../auth/session-scope.js';
-import { ConnectorLeaseRepository } from './connector-lease.repository.js';
-
-export const CONNECTOR_LEASE_POLICY = Symbol('CONNECTOR_LEASE_POLICY');
-
-export type ConnectorLeasePolicyAction =
-  | 'lease.acquire'
-  | 'lease.takeover'
-  | 'lease.heartbeat'
-  | 'lease.release'
-  | 'lease.read'
-  | 'grant.issue';
-
-export interface ConnectorLeaseRequestContext {
-  readonly actorScope: ActorTenantScope;
-  readonly correlationId: string;
-}
-
-export interface GatewayConnectorLeaseRequest {
-  readonly logicalAgentId: string;
-  readonly bindingId: string;
-  readonly connectorId: string;
-  readonly scopes: readonly string[];
-  readonly ttlMs: number;
-}
-
-export interface GatewayConnectorLeaseTakeoverRequest extends GatewayConnectorLeaseRequest {
-  readonly expectedEpoch: string;
-}
-
-export interface GatewayConnectorGrantRequest {
-  readonly lease: ConnectorLease;
-  readonly scopes: readonly string[];
-  readonly ttlMs: number;
-}
-
-export interface ConnectorLeasePolicySubject {
-  readonly action: ConnectorLeasePolicyAction;
-  readonly actorId: string;
-  readonly tenantId: string;
-  readonly logicalAgentId: string;
-  readonly bindingId: string;
-  readonly connectorId: string;
-  readonly requestedScopes: readonly string[];
-  readonly requestedTtlMs: number | null;
-}
-
-export interface ConnectorLeasePolicy {
-  authorize(subject: ConnectorLeasePolicySubject): Promise<boolean>;
-}
-
-/** M1 has no concrete cutover policy: unconfigured production use fails closed. */
-@Injectable()
-export class DenyConnectorLeasePolicy implements ConnectorLeasePolicy {
-  async authorize(_subject: ConnectorLeasePolicySubject): Promise<boolean> {
-    return false;
-  }
-}
-
-/** Gateway-owned policy surface for durable connector authority and fenced effects. */
-@Injectable()
-export class ConnectorLeaseService {
-  private readonly coordinator: ConnectorLeaseCoordinator;
-
-  constructor(
-    @Inject(ConnectorLeaseRepository) private readonly repository: ConnectorLeaseRepository,
-    @Inject(CONNECTOR_LEASE_POLICY) private readonly policy: ConnectorLeasePolicy,
-  ) {
-    this.coordinator = new ConnectorLeaseCoordinator(repository);
-  }
-
-  async acquire(
-    request: GatewayConnectorLeaseRequest,
-    context: ConnectorLeaseRequestContext,
-  ): Promise<ConnectorLease> {
-    const command = this.command(request, context);
-    await this.assertPolicy('lease.acquire', command, context, command.scopes, command.ttlMs);
-    return this.coordinator.acquire({ ...command, correlationId: this.correlation(context) });
-  }
-
-  async takeover(
-    request: GatewayConnectorLeaseTakeoverRequest,
-    context: ConnectorLeaseRequestContext,
-  ): Promise<ConnectorLease> {
-    const command = this.command(request, context);
-    await this.assertPolicy('lease.takeover', command, context, command.scopes, command.ttlMs);
-    return this.coordinator.takeover({
-      ...command,
-      expectedEpoch: request.expectedEpoch,
-      correlationId: this.correlation(context),
-    });
-  }
-
-  async heartbeat(
-    lease: ConnectorLease,
-    ttlMs: number,
-    context: ConnectorLeaseRequestContext,
-  ): Promise<ConnectorLease> {
-    const normalizedLease = normalizeConnectorLease(lease);
-    await this.assertTenant(normalizedLease, context);
-    await this.assertPolicy(
-      'lease.heartbeat',
-      normalizedLease,
-      context,
-      normalizedLease.scopes,
-      ttlMs,
-    );
-    return this.coordinator.heartbeat({
-      lease: normalizedLease,
-      ttlMs,
-      correlationId: this.correlation(context),
-    });
-  }
-
-  async release(lease: ConnectorLease, context: ConnectorLeaseRequestContext): Promise<void> {
-    const normalizedLease = normalizeConnectorLease(lease);
-    await this.assertTenant(normalizedLease, context);
-    await this.assertPolicy(
-      'lease.release',
-      normalizedLease,
-      context,
-      normalizedLease.scopes,
-      null,
-    );
-    await this.coordinator.release({
-      lease: normalizedLease,
-      correlationId: this.correlation(context),
-    });
-  }
-
-  async current(
-    logicalAgentId: string,
-    bindingId: string,
-    context: ConnectorLeaseRequestContext,
-  ): Promise<ConnectorLease | null> {
-    const binding = {
-      identity: normalizeLogicalAgentIdentity({
-        tenantId: context.actorScope.tenantId,
-        logicalAgentId,
-      }),
-      bindingId: normalizeLogicalBindingId(bindingId),
-      connectorId: 'gateway',
-    };
-    await this.assertPolicy('lease.read', binding, context, [], null);
-    return this.coordinator.current(binding);
-  }
-
-  async issueGrant(
-    request: GatewayConnectorGrantRequest,
-    context: ConnectorLeaseRequestContext,
-  ): Promise<ConnectorExecutionGrant> {
-    const lease = normalizeConnectorLease(request.lease);
-    await this.assertTenant(lease, context);
-    const scopes = normalizeConnectorScopes(request.scopes);
-    await this.assertPolicy('grant.issue', lease, context, scopes, request.ttlMs);
-    return this.coordinator.issueGrant({
-      lease,
-      scopes,
-      ttlMs: request.ttlMs,
-      correlationId: this.correlation(context),
-    });
-  }
-
-  async executeGrant<TInput, TOutput>(
-    grant: ConnectorExecutionGrant,
-    requiredScope: string,
-    input: TInput,
-    adapter: FencedConnectorAdapter<TInput, TOutput>,
-  ): Promise<TOutput> {
-    return this.coordinator.executeGrant(grant, requiredScope, input, adapter);
-  }
-
-  private command(
-    request: GatewayConnectorLeaseRequest,
-    context: ConnectorLeaseRequestContext,
-  ): Omit<AcquireConnectorLeaseInput, 'correlationId'> {
-    return {
-      identity: normalizeLogicalAgentIdentity({
-        tenantId: context.actorScope.tenantId,
-        logicalAgentId: request.logicalAgentId,
-      }),
-      bindingId: normalizeLogicalBindingId(request.bindingId),
-      connectorId: normalizeConnectorId(request.connectorId),
-      scopes: normalizeConnectorScopes(request.scopes),
-      ttlMs: request.ttlMs,
-    };
-  }
-
-  private async assertTenant(
-    lease: Pick<ConnectorLease, 'identity' | 'bindingId' | 'connectorId'>,
-    context: ConnectorLeaseRequestContext,
-  ): Promise<void> {
-    if (lease.identity.tenantId !== context.actorScope.tenantId) {
-      await this.recordPolicyDenial(
-        {
-          identity: {
-            tenantId: context.actorScope.tenantId,
-            logicalAgentId: 'untrusted',
-          },
-          bindingId: 'untrusted',
-          connectorId: 'untrusted',
-        },
-        context,
-      );
-      throw new ForbiddenException('Connector authority tenant scope denied');
-    }
-  }
-
-  private async assertPolicy(
-    action: ConnectorLeasePolicyAction,
-    subject: Pick<ConnectorLease, 'identity' | 'bindingId' | 'connectorId'>,
-    context: ConnectorLeaseRequestContext,
-    requestedScopes: readonly string[],
-    requestedTtlMs: number | null,
-  ): Promise<void> {
-    const allowed = await this.policy.authorize({
-      action,
-      actorId: context.actorScope.userId,
-      tenantId: subject.identity.tenantId,
-      logicalAgentId: subject.identity.logicalAgentId,
-      bindingId: subject.bindingId,
-      connectorId: subject.connectorId,
-      requestedScopes: Object.freeze([...requestedScopes]),
-      requestedTtlMs,
-    });
-    if (!allowed) {
-      await this.recordPolicyDenial(subject, context);
-      throw new ForbiddenException('Connector authority policy denied');
-    }
-  }
-
-  private async recordPolicyDenial(
-    subject: Pick<ConnectorLease, 'identity' | 'bindingId' | 'connectorId'>,
-    context: ConnectorLeaseRequestContext,
-  ): Promise<void> {
-    const event: ConnectorLeaseAuditEvent = {
-      identity: subject.identity,
-      bindingId: subject.bindingId,
-      connectorId: subject.connectorId,
-      event: 'reject',
-      outcome: 'denied',
-      reason: 'policy_denied',
-      correlationId: this.correlation(context),
-      occurredAt: new Date().toISOString(),
-    };
-    await this.repository.recordAudit(event);
-  }
-
-  private correlation(context: ConnectorLeaseRequestContext): string {
-    return normalizeCorrelationId(context.correlationId);
-  }
-}
--- a/apps/gateway/src/agent/durable-session.dto.ts
+++ b/apps/gateway/src/agent/durable-session.dto.ts
@@ -1,10 +0,0 @@
-import type { RuntimeProviderRequestContext } from './runtime-provider-registry.service.js';
-
-/** Server-side request for a replay-safe provider message. */
-export interface ProviderOutboxDto {
-  sessionId: string;
-  idempotencyKey: string;
-  correlationId: string;
-  content: string;
-  context: RuntimeProviderRequestContext;
-}
--- a/apps/gateway/src/agent/durable-session.repository.test.ts
+++ b/apps/gateway/src/agent/durable-session.repository.test.ts
@@ -1,416 +0,0 @@
-import { mkdtempSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { createHash } from 'node:crypto';
-import { eq, sql, interactionCheckpoints, interactionInbox } from '@mosaicstack/db';
-import { DurableSessionCoordinator, type DurableSessionIdentity } from '@mosaicstack/agent';
-import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
-import { createPgliteDb, runPgliteMigrations, type DbHandle } from '@mosaicstack/db';
-import { DurableSessionRepository } from './durable-session.repository.js';
-import { DurableSessionService } from './durable-session.service.js';
-
-const IDENTITY: DurableSessionIdentity = {
-  agentName: 'Nova',
-  sessionId: 'tess-pglite-session',
-  tenantId: 'tenant-pglite',
-  ownerId: 'tess-owner',
-  providerId: 'fleet',
-  runtimeSessionId: 'nova',
-};
-
-describe('DurableSessionRepository', () => {
-  let dataDir: string | undefined;
-  let handle: DbHandle;
-  let previousAuthSecret: string | undefined;
-
-  beforeAll(async (): Promise<void> => {
-    previousAuthSecret = process.env['BETTER_AUTH_SECRET'];
-    process.env['BETTER_AUTH_SECRET'] = 'tess-durable-state-test-sealing-key';
-    dataDir = mkdtempSync(join(tmpdir(), 'tess-durable-state-'));
-    handle = createPgliteDb(dataDir);
-    await runPgliteMigrations(handle);
-    await seedOwner(handle);
-  }, 30_000);
-
-  beforeEach(async (): Promise<void> => {
-    await handle.db.execute(sql`DELETE FROM interaction_handoffs`);
-    await handle.db.execute(sql`DELETE FROM interaction_checkpoints`);
-    await handle.db.execute(sql`DELETE FROM interaction_inbox`);
-    await handle.db.execute(sql`DELETE FROM interaction_outbox`);
-    await handle.db.execute(sql`DELETE FROM interaction_sessions`);
-  });
-
-  afterAll(async (): Promise<void> => {
-    await handle.close();
-    if (dataDir) rmSync(dataDir, { recursive: true, force: true });
-    if (previousAuthSecret === undefined) delete process.env['BETTER_AUTH_SECRET'];
-    else process.env['BETTER_AUTH_SECRET'] = previousAuthSecret;
-  });
-
-  it('survives a full PGlite close/reopen mid-session without duplicate inbox or outbox side effects', async () => {
-    const beforeRestart = new DurableSessionCoordinator(new DurableSessionRepository(handle.db));
-    await beforeRestart.create(IDENTITY);
-    await beforeRestart.receive({
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'inbox-before-kill',
-      correlationId: 'correlation-before-kill',
-      content: 'resume after a kill',
-    });
-    await beforeRestart.enqueueOutbox({
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'outbox-before-kill',
-      correlationId: 'correlation-before-kill',
-      channelId: 'cli',
-      kind: 'provider.send',
-      content: 'one response only',
-    });
-    await beforeRestart.checkpoint({
-      sessionId: IDENTITY.sessionId,
-      checkpointId: 'checkpoint-before-kill',
-      cursor: 'cursor-before-kill',
-      summary: 'restart-safe state',
-      compactionEpoch: 1,
-    });
-    await beforeRestart.handoff({
-      sessionId: IDENTITY.sessionId,
-      handoffId: 'handoff-before-kill',
-      destination: 'mos',
-      correlationId: 'correlation-before-kill',
-      checkpointId: 'checkpoint-before-kill',
-      status: 'pending',
-    });
-    await beforeRestart.checkpoint({
-      sessionId: IDENTITY.sessionId,
-      checkpointId: 'checkpoint-after-handoff',
-      cursor: 'cursor-after-handoff',
-      summary: 'newer state cannot strand the portable handoff',
-      compactionEpoch: 2,
-    });
-
-    await handle.close();
-    handle = createPgliteDb(dataDir!);
-
-    const afterRestart = new DurableSessionCoordinator(new DurableSessionRepository(handle.db));
-    const recovered = await afterRestart.recover(IDENTITY.sessionId);
-    const resumedHandoff = await afterRestart.resumeHandoff('handoff-before-kill');
-    const handled: string[] = [];
-    const effects: string[] = [];
-
-    await afterRestart.drainInbox(IDENTITY.sessionId, async (entry): Promise<void> => {
-      handled.push(entry.idempotencyKey);
-    });
-    await afterRestart.dispatchOutbox(IDENTITY.sessionId, async (entry): Promise<void> => {
-      effects.push(entry.idempotencyKey);
-    });
-    await afterRestart.drainInbox(IDENTITY.sessionId, async (entry): Promise<void> => {
-      handled.push(entry.idempotencyKey);
-    });
-    await afterRestart.dispatchOutbox(IDENTITY.sessionId, async (entry): Promise<void> => {
-      effects.push(entry.idempotencyKey);
-    });
-
-    expect(recovered.identity).toEqual(IDENTITY);
-    expect(recovered.checkpoint).toMatchObject({ checkpointId: 'checkpoint-after-handoff' });
-    expect(recovered.handoffs).toMatchObject([{ handoffId: 'handoff-before-kill' }]);
-    expect(resumedHandoff.checkpoint).toMatchObject({ checkpointId: 'checkpoint-before-kill' });
-    expect(handled).toEqual(['inbox-before-kill']);
-    expect(effects).toEqual(['outbox-before-kill']);
-  }, 30_000);
-
-  it('redacts sensitive durable payloads before persistence', async () => {
-    const coordinator = new DurableSessionCoordinator(new DurableSessionRepository(handle.db));
-    await coordinator.create(IDENTITY);
-    await coordinator.receive({
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'redacted-inbox',
-      correlationId: 'correlation-redaction',
-      content: 'api_key=super-secret-canary',
-    });
-    await coordinator.enqueueOutbox({
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'redacted-outbox',
-      correlationId: 'correlation-redaction',
-      channelId: 'cli',
-      kind: 'provider.send',
-      content: 'email operator@example.test api_key=super-secret-canary',
-    });
-    await coordinator.checkpoint({
-      sessionId: IDENTITY.sessionId,
-      checkpointId: 'redacted-checkpoint',
-      cursor: 'bearer super-secret-canary',
-      summary: 'email operator@example.test',
-      compactionEpoch: 0,
-    });
-
-    const snapshot = await coordinator.snapshot(IDENTITY.sessionId);
-    const [persisted] = await handle.db
-      .select({ content: interactionInbox.content })
-      .from(interactionInbox)
-      .where(eq(interactionInbox.idempotencyKey, 'redacted-inbox'));
-
-    expect(JSON.stringify(snapshot)).not.toContain('super-secret-canary');
-    expect(JSON.stringify(snapshot)).not.toContain('operator@example.test');
-    expect(persisted?.content).not.toContain('super-secret-canary');
-    expect(persisted?.content).not.toContain('[REDACTED]');
-  }, 30_000);
-
-  it('fails closed when the configured idempotency secret is unavailable', async () => {
-    const coordinator = new DurableSessionCoordinator(new DurableSessionRepository(handle.db));
-    await coordinator.create(IDENTITY);
-    const secret = process.env['BETTER_AUTH_SECRET'];
-    delete process.env['BETTER_AUTH_SECRET'];
-    try {
-      await expect(
-        coordinator.receive({
-          sessionId: IDENTITY.sessionId,
-          idempotencyKey: 'requires-idempotency-secret',
-          correlationId: 'correlation-secret',
-          content: 'sensitive payload',
-        }),
-      ).rejects.toThrow(/required for durable idempotency digests/);
-    } finally {
-      if (secret === undefined) delete process.env['BETTER_AUTH_SECRET'];
-      else process.env['BETTER_AUTH_SECRET'] = secret;
-    }
-  }, 30_000);
-
-  it('uses keyed pre-redaction digests to reject distinct sensitive checkpoint payloads', async () => {
-    const coordinator = new DurableSessionCoordinator(new DurableSessionRepository(handle.db));
-    await coordinator.create(IDENTITY);
-    const input = {
-      sessionId: IDENTITY.sessionId,
-      checkpointId: 'checkpoint-secret-conflict',
-      cursor: 'api_key=secret-one',
-      summary: 'bearer secret-one',
-      compactionEpoch: 1,
-    };
-    await coordinator.checkpoint(input);
-
-    await expect(
-      coordinator.checkpoint({
-        ...input,
-        cursor: 'api_key=secret-two',
-        summary: 'bearer secret-two',
-      }),
-    ).rejects.toThrow(/checkpoint identity conflict/);
-
-    const [persisted] = await handle.db
-      .select({
-        digest: interactionCheckpoints.contentDigest,
-        cursor: interactionCheckpoints.cursor,
-      })
-      .from(interactionCheckpoints)
-      .where(eq(interactionCheckpoints.checkpointId, input.checkpointId));
-    expect(persisted?.cursor).not.toContain('secret-one');
-    expect(persisted?.digest).not.toBe(
-      createHash('sha256')
-        .update(JSON.stringify([input.cursor, input.summary]))
-        .digest('hex'),
-    );
-
-    await coordinator.checkpoint({
-      ...input,
-      checkpointId: 'checkpoint-delimiter-conflict',
-      cursor: 'a\u0000b',
-      summary: 'c',
-    });
-    await expect(
-      coordinator.checkpoint({
-        ...input,
-        checkpointId: 'checkpoint-delimiter-conflict',
-        cursor: 'a',
-        summary: 'b\u0000c',
-      }),
-    ).rejects.toThrow(/checkpoint identity conflict/);
-  }, 30_000);
-
-  it('rejects distinct sensitive inbox and outbox payloads under reused idempotency keys', async () => {
-    const coordinator = new DurableSessionCoordinator(new DurableSessionRepository(handle.db));
-    await coordinator.create(IDENTITY);
-    const inbox = {
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'inbox-secret-conflict',
-      correlationId: 'correlation-inbox-secret',
-      content: 'api_key=secret-one',
-    };
-    const outbox = {
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'outbox-secret-conflict',
-      correlationId: 'correlation-outbox-secret',
-      channelId: 'cli',
-      kind: 'provider.send',
-      content: 'api_key=secret-one',
-    };
-    await coordinator.receive(inbox);
-    await coordinator.enqueueOutbox(outbox);
-
-    await expect(coordinator.receive({ ...inbox, content: 'api_key=secret-two' })).rejects.toThrow(
-      /idempotency conflict/,
-    );
-    await expect(
-      coordinator.enqueueOutbox({ ...outbox, content: 'api_key=secret-two' }),
-    ).rejects.toThrow(/idempotency conflict/);
-  }, 30_000);
-
-  it('rejects database inbox and outbox idempotency-key conflicts', async () => {
-    const coordinator = new DurableSessionCoordinator(new DurableSessionRepository(handle.db));
-    await coordinator.create(IDENTITY);
-    await coordinator.receive({
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'inbox-conflict',
-      correlationId: 'correlation-inbox',
-      content: 'original inbox',
-    });
-    await coordinator.enqueueOutbox({
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'outbox-conflict',
-      correlationId: 'correlation-outbox',
-      channelId: 'cli',
-      kind: 'provider.send',
-      content: 'original outbox',
-    });
-
-    await expect(
-      coordinator.receive({
-        sessionId: IDENTITY.sessionId,
-        idempotencyKey: 'inbox-conflict',
-        correlationId: 'forged-correlation',
-        content: 'original inbox',
-      }),
-    ).rejects.toThrow(/idempotency conflict/);
-    await expect(
-      coordinator.enqueueOutbox({
-        sessionId: IDENTITY.sessionId,
-        idempotencyKey: 'outbox-conflict',
-        correlationId: 'correlation-outbox',
-        channelId: 'forged-channel',
-        kind: 'provider.send',
-        content: 'original outbox',
-      }),
-    ).rejects.toThrow(/idempotency conflict/);
-  }, 30_000);
-
-  it('does not requeue a live outbox claim during a normal scoped dispatch', async () => {
-    const repository = new DurableSessionRepository(handle.db);
-    const coordinator = new DurableSessionCoordinator(repository);
-    const runtimeProviders = { sendMessage: vi.fn().mockResolvedValue(undefined) };
-    const service = new DurableSessionService(repository, runtimeProviders as never);
-    const input = {
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'live-effect',
-      correlationId: 'correlation-live',
-      content: 'must not duplicate',
-      context: {
-        actorScope: { userId: IDENTITY.ownerId, tenantId: IDENTITY.tenantId },
-        channelId: 'cli',
-        correlationId: 'correlation-live',
-      },
-    };
-
-    await coordinator.create(IDENTITY);
-    await service.queueProviderSend(input);
-    expect(await repository.claimOutbox(IDENTITY.sessionId)).toMatchObject({
-      status: 'processing',
-    });
-
-    await service.dispatchProviderOutbox(IDENTITY.sessionId, input);
-    await expect(
-      service.recoverProviderSession(IDENTITY.sessionId, {
-        ...input,
-        context: {
-          ...input.context,
-          actorScope: { userId: 'intruder', tenantId: 'tenant-pglite' },
-        },
-      }),
-    ).rejects.toThrow(/scope or correlation mismatch/);
-
-    expect(runtimeProviders.sendMessage).not.toHaveBeenCalled();
-    expect(await coordinator.snapshot(IDENTITY.sessionId)).toMatchObject({
-      outbox: [{ idempotencyKey: 'live-effect', status: 'processing' }],
-    });
-  }, 30_000);
-
-  it('rejects an outbox correlation mismatch before claiming the pending effect', async () => {
-    const repository = new DurableSessionRepository(handle.db);
-    const coordinator = new DurableSessionCoordinator(repository);
-    const runtimeProviders = { sendMessage: vi.fn().mockResolvedValue(undefined) };
-    const service = new DurableSessionService(repository, runtimeProviders as never);
-    const input = {
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'mismatch-effect',
-      correlationId: 'correlation-expected',
-      content: 'must remain pending',
-      context: {
-        actorScope: { userId: IDENTITY.ownerId, tenantId: IDENTITY.tenantId },
-        channelId: 'cli',
-        correlationId: 'correlation-expected',
-      },
-    };
-
-    await coordinator.create(IDENTITY);
-    await service.queueProviderSend(input);
-    await expect(
-      service.dispatchProviderOutbox(IDENTITY.sessionId, {
-        ...input,
-        correlationId: 'correlation-forged',
-        context: { ...input.context, correlationId: 'correlation-forged' },
-      }),
-    ).rejects.toThrow(/scope or correlation mismatch/);
-
-    expect(runtimeProviders.sendMessage).not.toHaveBeenCalled();
-    expect(await coordinator.snapshot(IDENTITY.sessionId)).toMatchObject({
-      outbox: [{ idempotencyKey: 'mismatch-effect', status: 'pending' }],
-    });
-  }, 30_000);
-
-  it('dispatches only the outbox record bound to the supplied correlation and channel', async () => {
-    const repository = new DurableSessionRepository(handle.db);
-    const coordinator = new DurableSessionCoordinator(repository);
-    const runtimeProviders = { sendMessage: vi.fn().mockResolvedValue(undefined) };
-    const service = new DurableSessionService(repository, runtimeProviders as never);
-    const first = {
-      sessionId: IDENTITY.sessionId,
-      idempotencyKey: 'scoped-effect-one',
-      correlationId: 'correlation-one',
-      content: 'first result',
-      context: {
-        actorScope: { userId: IDENTITY.ownerId, tenantId: IDENTITY.tenantId },
-        channelId: 'cli',
-        correlationId: 'correlation-one',
-      },
-    };
-    const second = {
-      ...first,
-      idempotencyKey: 'scoped-effect-two',
-      correlationId: 'correlation-two',
-      content: 'second result',
-      context: { ...first.context, correlationId: 'correlation-two' },
-    };
-
-    await coordinator.create(IDENTITY);
-    await service.queueProviderSend(first);
-    await service.queueProviderSend(second);
-    await service.dispatchProviderOutbox(IDENTITY.sessionId, first);
-
-    expect(runtimeProviders.sendMessage).toHaveBeenCalledTimes(1);
-    expect(runtimeProviders.sendMessage).toHaveBeenCalledWith(
-      IDENTITY.providerId,
-      IDENTITY.runtimeSessionId,
-      { content: 'first result', idempotencyKey: 'scoped-effect-one' },
-      first.context,
-    );
-    expect(await coordinator.snapshot(IDENTITY.sessionId)).toMatchObject({
-      outbox: [
-        { idempotencyKey: 'scoped-effect-one', status: 'delivered' },
-        { idempotencyKey: 'scoped-effect-two', status: 'pending' },
-      ],
-    });
-  }, 30_000);
-});
-
-async function seedOwner(handle: DbHandle): Promise<void> {
-  await handle.db.execute(sql`
-    INSERT INTO users (id, name, email, email_verified, created_at, updated_at)
-    VALUES ('tess-owner', 'Tess Owner', 'tess-owner@example.test', false, now(), now())
-  `);
-}
--- a/apps/gateway/src/agent/durable-session.repository.ts
+++ b/apps/gateway/src/agent/durable-session.repository.ts
@@ -1,529 +0,0 @@
-import { createHash, createHmac } from 'node:crypto';
-import { Inject, Injectable } from '@nestjs/common';
-import {
-  and,
-  asc,
-  desc,
-  eq,
-  interactionCheckpoints,
-  interactionHandoffs,
-  interactionInbox,
-  interactionOutbox,
-  interactionSessions,
-  type Db,
-} from '@mosaicstack/db';
-import { seal, unseal } from '@mosaicstack/auth';
-import { redactSensitiveContent } from '@mosaicstack/log';
-import type {
-  DurableCheckpoint,
-  DurableCheckpointInput,
-  DurableEnqueueResult,
-  DurableHandoff,
-  DurableHandoffInput,
-  DurableInboxEntry,
-  DurableInboxInput,
-  DurableInboxStatus,
-  DurableOutboxEntry,
-  DurableOutboxInput,
-  DurableOutboxStatus,
-  DurableSessionIdentity,
-  DurableSessionSnapshot,
-  DurableSessionStore,
-} from '@mosaicstack/agent';
-import { DB } from '../database/database.module.js';
-
-@Injectable()
-export class DurableSessionRepository implements DurableSessionStore {
-  constructor(@Inject(DB) private readonly db: Db) {}
-
-  async create(identity: DurableSessionIdentity): Promise<void> {
-    await this.db
-      .insert(interactionSessions)
-      .values({
-        id: identity.sessionId,
-        agentName: identity.agentName,
-        tenantId: identity.tenantId,
-        ownerId: identity.ownerId,
-        providerId: identity.providerId,
-        runtimeSessionId: identity.runtimeSessionId,
-      })
-      .onConflictDoNothing();
-
-    const existing = await this.session(identity.sessionId);
-    if (!existing || !sameEnrollmentScope(existing, identity)) {
-      throw new Error(`Durable session identity conflict: ${identity.sessionId}`);
-    }
-    // A recovered/re-enrolled runtime can receive a new provider session ID;
-    // the conversation handle and owner scope remain immutable.
-    if (
-      existing.providerId !== identity.providerId ||
-      existing.runtimeSessionId !== identity.runtimeSessionId
-    ) {
-      await this.db
-        .update(interactionSessions)
-        .set({ providerId: identity.providerId, runtimeSessionId: identity.runtimeSessionId })
-        .where(eq(interactionSessions.id, identity.sessionId));
-    }
-  }
-
-  async snapshot(sessionId: string): Promise<DurableSessionSnapshot | null> {
-    const identity = await this.session(sessionId);
-    if (!identity) return null;
-
-    const [inbox, outbox, checkpoints, handoffs] = await Promise.all([
-      this.db
-        .select()
-        .from(interactionInbox)
-        .where(eq(interactionInbox.sessionId, sessionId))
-        .orderBy(asc(interactionInbox.createdAt)),
-      this.db
-        .select()
-        .from(interactionOutbox)
-        .where(eq(interactionOutbox.sessionId, sessionId))
-        .orderBy(asc(interactionOutbox.createdAt)),
-      this.db
-        .select()
-        .from(interactionCheckpoints)
-        .where(eq(interactionCheckpoints.sessionId, sessionId))
-        .orderBy(
-          desc(interactionCheckpoints.compactionEpoch),
-          desc(interactionCheckpoints.createdAt),
-        )
-        .limit(1),
-      this.db
-        .select()
-        .from(interactionHandoffs)
-        .where(eq(interactionHandoffs.sessionId, sessionId))
-        .orderBy(asc(interactionHandoffs.createdAt)),
-    ]);
-
-    const checkpoint = checkpoints[0];
-    return {
-      identity,
-      inbox: inbox.map(toInbox),
-      outbox: outbox.map(toOutbox),
-      ...(checkpoint ? { checkpoint: toCheckpoint(checkpoint) } : {}),
-      handoffs: handoffs.map(toHandoff),
-    };
-  }
-
-  async enqueueInbox(input: DurableInboxInput): Promise<DurableEnqueueResult<DurableInboxStatus>> {
-    const digest = contentDigest(input.content);
-    const record: DurableInboxInput = {
-      ...input,
-      content: redactSensitiveContent(input.content).content,
-    };
-    const inserted = await this.db
-      .insert(interactionInbox)
-      .values({
-        ...record,
-        content: seal(record.content),
-        contentDigest: digest,
-        status: 'pending',
-      })
-      .onConflictDoNothing()
-      .returning({ status: interactionInbox.status });
-    if (inserted[0]) return { accepted: true, status: inserted[0].status };
-
-    const existing = await this.db
-      .select()
-      .from(interactionInbox)
-      .where(
-        and(
-          eq(interactionInbox.sessionId, input.sessionId),
-          eq(interactionInbox.idempotencyKey, input.idempotencyKey),
-        ),
-      )
-      .limit(1);
-    if (!existing[0]) throw new Error(`Durable inbox enqueue failed: ${input.idempotencyKey}`);
-    const entry = toInbox(existing[0]);
-    if (
-      !sameInbox(entry, record) ||
-      !matchesContentDigest(existing[0].contentDigest, input.content)
-    ) {
-      throw new Error(`Durable inbox idempotency conflict: ${input.idempotencyKey}`);
-    }
-    return { accepted: false, status: entry.status };
-  }
-
-  async claimInbox(sessionId: string): Promise<DurableInboxEntry | null> {
-    for (let attempt = 0; attempt < 3; attempt += 1) {
-      const candidate = await this.db
-        .select()
-        .from(interactionInbox)
-        .where(
-          and(eq(interactionInbox.sessionId, sessionId), eq(interactionInbox.status, 'pending')),
-        )
-        .orderBy(asc(interactionInbox.createdAt))
-        .limit(1);
-      const entry = candidate[0];
-      if (!entry) return null;
-      const claimed = await this.db
-        .update(interactionInbox)
-        .set({ status: 'processing', updatedAt: new Date() })
-        .where(and(eq(interactionInbox.id, entry.id), eq(interactionInbox.status, 'pending')))
-        .returning();
-      if (claimed[0]) return toInbox(claimed[0]);
-    }
-    return null;
-  }
-
-  async completeInbox(sessionId: string, idempotencyKey: string): Promise<void> {
-    await this.db
-      .update(interactionInbox)
-      .set({ status: 'processed', updatedAt: new Date() })
-      .where(
-        and(
-          eq(interactionInbox.sessionId, sessionId),
-          eq(interactionInbox.idempotencyKey, idempotencyKey),
-          eq(interactionInbox.status, 'processing'),
-        ),
-      );
-  }
-
-  async releaseInbox(sessionId: string, idempotencyKey: string): Promise<void> {
-    await this.db
-      .update(interactionInbox)
-      .set({ status: 'pending', updatedAt: new Date() })
-      .where(
-        and(
-          eq(interactionInbox.sessionId, sessionId),
-          eq(interactionInbox.idempotencyKey, idempotencyKey),
-          eq(interactionInbox.status, 'processing'),
-        ),
-      );
-  }
-
-  async enqueueOutbox(
-    input: DurableOutboxInput,
-  ): Promise<DurableEnqueueResult<DurableOutboxStatus>> {
-    const digest = contentDigest(input.content);
-    const record: DurableOutboxInput = {
-      ...input,
-      content: redactSensitiveContent(input.content).content,
-    };
-    const inserted = await this.db
-      .insert(interactionOutbox)
-      .values({
-        ...record,
-        content: seal(record.content),
-        contentDigest: digest,
-        status: 'pending',
-      })
-      .onConflictDoNothing()
-      .returning({ status: interactionOutbox.status });
-    if (inserted[0]) return { accepted: true, status: inserted[0].status };
-
-    const existing = await this.db
-      .select()
-      .from(interactionOutbox)
-      .where(
-        and(
-          eq(interactionOutbox.sessionId, input.sessionId),
-          eq(interactionOutbox.idempotencyKey, input.idempotencyKey),
-        ),
-      )
-      .limit(1);
-    if (!existing[0]) throw new Error(`Durable outbox enqueue failed: ${input.idempotencyKey}`);
-    const entry = toOutbox(existing[0]);
-    if (
-      !sameOutbox(entry, record) ||
-      !matchesContentDigest(existing[0].contentDigest, input.content)
-    ) {
-      throw new Error(`Durable outbox idempotency conflict: ${input.idempotencyKey}`);
-    }
-    return { accepted: false, status: entry.status };
-  }
-
-  async claimOutbox(sessionId: string): Promise<DurableOutboxEntry | null> {
-    for (let attempt = 0; attempt < 3; attempt += 1) {
-      const candidate = await this.db
-        .select()
-        .from(interactionOutbox)
-        .where(
-          and(eq(interactionOutbox.sessionId, sessionId), eq(interactionOutbox.status, 'pending')),
-        )
-        .orderBy(asc(interactionOutbox.createdAt))
-        .limit(1);
-      const entry = candidate[0];
-      if (!entry) return null;
-      const claimed = await this.db
-        .update(interactionOutbox)
-        .set({ status: 'processing', updatedAt: new Date() })
-        .where(and(eq(interactionOutbox.id, entry.id), eq(interactionOutbox.status, 'pending')))
-        .returning();
-      if (claimed[0]) return toOutbox(claimed[0]);
-    }
-    return null;
-  }
-
-  async claimOutboxByKey(
-    sessionId: string,
-    idempotencyKey: string,
-  ): Promise<DurableOutboxEntry | null> {
-    const claimed = await this.db
-      .update(interactionOutbox)
-      .set({ status: 'processing', updatedAt: new Date() })
-      .where(
-        and(
-          eq(interactionOutbox.sessionId, sessionId),
-          eq(interactionOutbox.idempotencyKey, idempotencyKey),
-          eq(interactionOutbox.status, 'pending'),
-        ),
-      )
-      .returning();
-    return claimed[0] ? toOutbox(claimed[0]) : null;
-  }
-
-  async completeOutbox(sessionId: string, idempotencyKey: string): Promise<void> {
-    await this.db
-      .update(interactionOutbox)
-      .set({ status: 'delivered', updatedAt: new Date() })
-      .where(
-        and(
-          eq(interactionOutbox.sessionId, sessionId),
-          eq(interactionOutbox.idempotencyKey, idempotencyKey),
-          eq(interactionOutbox.status, 'processing'),
-        ),
-      );
-  }
-
-  async releaseOutbox(sessionId: string, idempotencyKey: string): Promise<void> {
-    await this.db
-      .update(interactionOutbox)
-      .set({ status: 'pending', updatedAt: new Date() })
-      .where(
-        and(
-          eq(interactionOutbox.sessionId, sessionId),
-          eq(interactionOutbox.idempotencyKey, idempotencyKey),
-          eq(interactionOutbox.status, 'processing'),
-        ),
-      );
-  }
-
-  async checkpoint(input: DurableCheckpointInput): Promise<void> {
-    // Compute identity before redaction.  The persisted digest is keyed so a database
-    // reader cannot use it as an offline oracle for sensitive cursor/summary values.
-    const digest = contentDigest(JSON.stringify([input.cursor, input.summary]));
-    const checkpoint: DurableCheckpointInput = {
-      ...input,
-      cursor: redactSensitiveContent(input.cursor).content,
-      summary: redactSensitiveContent(input.summary).content,
-    };
-    const inserted = await this.db
-      .insert(interactionCheckpoints)
-      .values({
-        ...checkpoint,
-        contentDigest: digest,
-        cursor: seal(checkpoint.cursor),
-        summary: seal(checkpoint.summary),
-      })
-      .onConflictDoNothing()
-      .returning({ checkpointId: interactionCheckpoints.checkpointId });
-    if (inserted[0]) return;
-
-    const existing = await this.db
-      .select()
-      .from(interactionCheckpoints)
-      .where(
-        and(
-          eq(interactionCheckpoints.sessionId, input.sessionId),
-          eq(interactionCheckpoints.checkpointId, input.checkpointId),
-        ),
-      )
-      .limit(1);
-    if (
-      !existing[0] ||
-      !sameCheckpoint(toCheckpoint(existing[0]), checkpoint) ||
-      !matchesCheckpointDigest(existing[0].contentDigest, digest)
-    ) {
-      throw new Error(`Durable checkpoint identity conflict: ${input.checkpointId}`);
-    }
-  }
-
-  async findCheckpoint(sessionId: string, checkpointId: string): Promise<DurableCheckpoint | null> {
-    const checkpoints = await this.db
-      .select()
-      .from(interactionCheckpoints)
-      .where(
-        and(
-          eq(interactionCheckpoints.sessionId, sessionId),
-          eq(interactionCheckpoints.checkpointId, checkpointId),
-        ),
-      )
-      .limit(1);
-    const checkpoint = checkpoints[0];
-    return checkpoint ? toCheckpoint(checkpoint) : null;
-  }
-
-  async handoff(input: DurableHandoffInput): Promise<void> {
-    const checkpoint = await this.findCheckpoint(input.sessionId, input.checkpointId);
-    if (!checkpoint) {
-      throw new Error(`Durable handoff checkpoint is unavailable: ${input.checkpointId}`);
-    }
-    const inserted = await this.db
-      .insert(interactionHandoffs)
-      .values({ ...input })
-      .onConflictDoNothing()
-      .returning({ handoffId: interactionHandoffs.handoffId });
-    if (inserted[0]) return;
-
-    const existing = await this.findHandoff(input.handoffId);
-    if (!existing || !sameHandoff(existing, input)) {
-      throw new Error(`Durable handoff identity conflict: ${input.handoffId}`);
-    }
-  }
-
-  async findHandoff(handoffId: string): Promise<DurableHandoff | null> {
-    const handoffs = await this.db
-      .select()
-      .from(interactionHandoffs)
-      .where(eq(interactionHandoffs.handoffId, handoffId))
-      .limit(1);
-    const handoff = handoffs[0];
-    return handoff ? toHandoff(handoff) : null;
-  }
-
-  async requeueInFlight(sessionId: string): Promise<void> {
-    // Inbox handlers are process-local work. A provider outbox claim may have
-    // reached an external target before a crash, so it is deliberately not
-    // replayed by generic recovery.
-    await this.db
-      .update(interactionInbox)
-      .set({ status: 'pending', updatedAt: new Date() })
-      .where(
-        and(eq(interactionInbox.sessionId, sessionId), eq(interactionInbox.status, 'processing')),
-      );
-  }
-
-  private async session(sessionId: string): Promise<DurableSessionIdentity | null> {
-    const sessions = await this.db
-      .select()
-      .from(interactionSessions)
-      .where(eq(interactionSessions.id, sessionId))
-      .limit(1);
-    const session = sessions[0];
-    return session
-      ? {
-          agentName: session.agentName,
-          sessionId: session.id,
-          tenantId: session.tenantId,
-          ownerId: session.ownerId,
-          providerId: session.providerId,
-          runtimeSessionId: session.runtimeSessionId,
-        }
-      : null;
-  }
-}
-
-function contentDigest(content: string): string {
-  const secret = process.env['BETTER_AUTH_SECRET'];
-  if (!secret) {
-    throw new Error('BETTER_AUTH_SECRET is required for durable idempotency digests');
-  }
-  return `hmac:v1:${createHmac('sha256', secret).update(content).digest('hex')}`;
-}
-
-function matchesContentDigest(stored: string, content: string): boolean {
-  return (
-    stored === contentDigest(content) ||
-    stored === createHash('sha256').update(content).digest('hex')
-  );
-}
-
-function matchesCheckpointDigest(stored: string, digest: string): boolean {
-  // Legacy rows predate any pre-redaction identity and cannot safely prove equality.
-  // Reject rather than let redaction collapse distinct sensitive checkpoint payloads.
-  return stored === digest;
-}
-
-function sameEnrollmentScope(left: DurableSessionIdentity, right: DurableSessionIdentity): boolean {
-  return (
-    left.agentName === right.agentName &&
-    left.sessionId === right.sessionId &&
-    left.tenantId === right.tenantId &&
-    left.ownerId === right.ownerId
-  );
-}
-
-function sameInbox(left: DurableInboxEntry, right: DurableInboxInput): boolean {
-  return (
-    left.sessionId === right.sessionId &&
-    left.idempotencyKey === right.idempotencyKey &&
-    left.correlationId === right.correlationId &&
-    left.content === right.content
-  );
-}
-
-function sameOutbox(left: DurableOutboxEntry, right: DurableOutboxInput): boolean {
-  return (
-    left.sessionId === right.sessionId &&
-    left.idempotencyKey === right.idempotencyKey &&
-    left.correlationId === right.correlationId &&
-    left.channelId === right.channelId &&
-    left.kind === right.kind &&
-    left.content === right.content
-  );
-}
-
-function sameCheckpoint(left: DurableCheckpoint, right: DurableCheckpointInput): boolean {
-  return (
-    left.sessionId === right.sessionId &&
-    left.checkpointId === right.checkpointId &&
-    left.compactionEpoch === right.compactionEpoch
-  );
-}
-
-function sameHandoff(left: DurableHandoff, right: DurableHandoffInput): boolean {
-  return (
-    left.sessionId === right.sessionId &&
-    left.handoffId === right.handoffId &&
-    left.destination === right.destination &&
-    left.correlationId === right.correlationId &&
-    left.checkpointId === right.checkpointId &&
-    left.status === right.status
-  );
-}
-
-function toInbox(row: typeof interactionInbox.$inferSelect): DurableInboxEntry {
-  return {
-    sessionId: row.sessionId,
-    idempotencyKey: row.idempotencyKey,
-    correlationId: row.correlationId,
-    content: unseal(row.content),
-    status: row.status,
-  };
-}
-
-function toOutbox(row: typeof interactionOutbox.$inferSelect): DurableOutboxEntry {
-  return {
-    sessionId: row.sessionId,
-    idempotencyKey: row.idempotencyKey,
-    correlationId: row.correlationId,
-    channelId: row.channelId,
-    kind: row.kind,
-    content: unseal(row.content),
-    status: row.status,
-  };
-}
-
-function toCheckpoint(row: typeof interactionCheckpoints.$inferSelect): DurableCheckpoint {
-  return {
-    sessionId: row.sessionId,
-    checkpointId: row.checkpointId,
-    cursor: unseal(row.cursor),
-    summary: unseal(row.summary),
-    compactionEpoch: row.compactionEpoch,
-  };
-}
-
-function toHandoff(row: typeof interactionHandoffs.$inferSelect): DurableHandoff {
-  return {
-    sessionId: row.sessionId,
-    handoffId: row.handoffId,
-    destination: row.destination,
-    correlationId: row.correlationId,
-    checkpointId: row.checkpointId,
-    status: row.status,
-  };
-}
--- a/apps/gateway/src/agent/durable-session.service.ts
+++ b/apps/gateway/src/agent/durable-session.service.ts
@@ -1,123 +0,0 @@
-import { ForbiddenException, Inject, Injectable } from '@nestjs/common';
-import { DurableSessionCoordinator, type DurableSessionIdentity } from '@mosaicstack/agent';
-import type { ProviderOutboxDto } from './durable-session.dto.js';
-import { DurableSessionRepository } from './durable-session.repository.js';
-import {
-  RuntimeProviderService,
-  type RuntimeProviderRequestContext,
-} from './runtime-provider-registry.service.js';
-
-/**
- * Scoped gateway boundary for the canonical durable session state machine. It deliberately
- * uses composition: raw state methods cannot be injected into channel, CLI, or
- * MCP adapters without a server-derived actor/tenant/correlation context.
- */
-@Injectable()
-export class DurableSessionService {
-  private readonly coordinator: DurableSessionCoordinator;
-
-  constructor(
-    @Inject(DurableSessionRepository) repository: DurableSessionRepository,
-    @Inject(RuntimeProviderService) private readonly runtimeProviders: RuntimeProviderService,
-  ) {
-    this.coordinator = new DurableSessionCoordinator(repository);
-  }
-
-  /** Enroll a verified runtime session under the stable cross-surface conversation handle. */
-  async enroll(
-    identity: DurableSessionIdentity,
-    context: RuntimeProviderRequestContext,
-  ): Promise<void> {
-    if (
-      identity.ownerId !== context.actorScope.userId ||
-      identity.tenantId !== context.actorScope.tenantId
-    ) {
-      throw new ForbiddenException('Durable session enrollment scope mismatch');
-    }
-    await this.coordinator.create(identity);
-  }
-
-  async queueProviderSend(input: ProviderOutboxDto): Promise<void> {
-    const snapshot = await this.coordinator.snapshot(input.sessionId);
-    this.assertScope(snapshot.identity.ownerId, snapshot.identity.tenantId, input);
-    await this.coordinator.enqueueOutbox({
-      sessionId: input.sessionId,
-      idempotencyKey: input.idempotencyKey,
-      correlationId: input.correlationId,
-      channelId: input.context.channelId,
-      kind: 'provider.send',
-      content: input.content,
-    });
-  }
-
-  async dispatchProviderOutbox(sessionId: string, input: ProviderOutboxDto): Promise<void> {
-    if (sessionId !== input.sessionId) {
-      throw new ForbiddenException('Durable outbox session mismatch');
-    }
-    const snapshot = await this.coordinator.snapshot(sessionId);
-    this.assertScope(snapshot.identity.ownerId, snapshot.identity.tenantId, input);
-    const pendingEntry = snapshot.outbox.find(
-      (entry): boolean => entry.idempotencyKey === input.idempotencyKey,
-    );
-    if (!pendingEntry) return;
-    // Validate immutable routing before claiming. A caller with a mismatched
-    // correlation/channel must not strand a pending external side effect.
-    this.assertOutboxScope(pendingEntry, input);
-    await this.coordinator.dispatchOutboxEntry(
-      sessionId,
-      input.idempotencyKey,
-      async (entry): Promise<void> => {
-        this.assertOutboxScope(entry, input);
-        await this.runtimeProviders.sendMessage(
-          snapshot.identity.providerId,
-          snapshot.identity.runtimeSessionId,
-          { content: entry.content, idempotencyKey: entry.idempotencyKey },
-          input.context,
-        );
-      },
-    );
-  }
-
-  /** Read durable identity/state only after deriving and checking the server-side actor scope. */
-  async getSnapshot(sessionId: string, context: RuntimeProviderRequestContext) {
-    const snapshot = await this.coordinator.snapshot(sessionId);
-    this.assertScope(snapshot.identity.ownerId, snapshot.identity.tenantId, {
-      sessionId,
-      content: '',
-      idempotencyKey: 'read-only',
-      correlationId: context.correlationId,
-      context,
-    });
-    return snapshot;
-  }
-
-  /** Startup/recovery-only path; normal queue/dispatch methods never requeue live work. */
-  async recoverProviderSession(sessionId: string, input: ProviderOutboxDto): Promise<void> {
-    const snapshot = await this.coordinator.snapshot(sessionId);
-    this.assertScope(snapshot.identity.ownerId, snapshot.identity.tenantId, input);
-    await this.coordinator.recover(sessionId);
-  }
-
-  private assertOutboxScope(
-    entry: { kind: string; correlationId: string; channelId: string },
-    input: ProviderOutboxDto,
-  ): void {
-    if (
-      entry.kind !== 'provider.send' ||
-      entry.correlationId !== input.correlationId ||
-      entry.channelId !== input.context.channelId
-    ) {
-      throw new ForbiddenException('Durable outbox scope or correlation mismatch');
-    }
-  }
-
-  private assertScope(ownerId: string, tenantId: string, input: ProviderOutboxDto): void {
-    if (
-      input.context.actorScope.userId !== ownerId ||
-      input.context.actorScope.tenantId !== tenantId ||
-      input.context.correlationId !== input.correlationId
-    ) {
-      throw new ForbiddenException('Durable session scope or correlation mismatch');
-    }
-  }
-}
--- a/apps/gateway/src/agent/hermes-runtime-reachability.e2e.test.ts
+++ b/apps/gateway/src/agent/hermes-runtime-reachability.e2e.test.ts
@@ -1,176 +0,0 @@
-import 'reflect-metadata';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
-import { Global, Module } from '@nestjs/common';
-import { Test } from '@nestjs/testing';
-import { FastifyAdapter, type NestFastifyApplication } from '@nestjs/platform-fastify';
-import { HermesRuntimeProvider } from '@mosaicstack/agent';
-import { AgentModule } from './agent.module.js';
-import { AUTH } from '../auth/auth.tokens.js';
-import { AuthGuard } from '../auth/auth.guard.js';
-import { BRAIN } from '../brain/brain.tokens.js';
-import { DB } from '../database/database.module.js';
-import { CoordModule } from '../coord/coord.module.js';
-import { McpClientModule } from '../mcp-client/mcp-client.module.js';
-import { SkillsModule } from '../skills/skills.module.js';
-import { GCModule } from '../gc/gc.module.js';
-import { LogModule } from '../log/log.module.js';
-import { CommandsModule } from '../commands/commands.module.js';
-import {
-  AGENT_RUNTIME_PROVIDER_REGISTRY,
-  RUNTIME_APPROVAL_VERIFIER,
-  RUNTIME_PROVIDER_AUDIT_SINK,
-  RuntimeProviderAuditService,
-} from './runtime-provider-registry.service.js';
-import { DurableSessionService } from './durable-session.service.js';
-import { DurableSessionRepository } from './durable-session.repository.js';
-import { AgentService } from './agent.service.js';
-import { ProviderService } from './provider.service.js';
-import { ProviderCredentialsService } from './provider-credentials.service.js';
-import { RoutingService } from './routing.service.js';
-import { RoutingEngineService } from './routing/routing-engine.service.js';
-import { SkillLoaderService } from './skill-loader.service.js';
-
-const authenticatedUser = { id: 'operator-1', tenantId: 'tenant-1' };
-
-@Module({})
-class EmptyAgentDependencyModule {}
-
-@Global()
-@Module({
-  providers: [
-    {
-      provide: AUTH,
-      useValue: {
-        api: {
-          getSession: vi.fn(async ({ headers }: { headers: Headers }) =>
-            headers.get('cookie') === 'session=trusted'
-              ? { user: authenticatedUser, session: { id: 'session-1' } }
-              : null,
-          ),
-        },
-      },
-    },
-    AuthGuard,
-    { provide: BRAIN, useValue: {} },
-    { provide: DB, useValue: {} },
-  ],
-  exports: [AUTH, AuthGuard, BRAIN, DB],
-})
-class AuthenticatedRequestModule {}
-
-/**
- * This is deliberately an HTTP test rather than a controller unit test: it
- * exercises AgentModule's actual provider factory, Nest DI, and AuthGuard.
- */
-describe('Hermes runtime provider reachability', (): void => {
-  let app: NestFastifyApplication | undefined;
-
-  beforeAll(async (): Promise<void> => {
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    const moduleRef = await Test.createTestingModule({
-      imports: [AuthenticatedRequestModule, AgentModule],
-    })
-      .overrideModule(CoordModule)
-      .useModule(EmptyAgentDependencyModule)
-      .overrideModule(McpClientModule)
-      .useModule(EmptyAgentDependencyModule)
-      .overrideModule(SkillsModule)
-      .useModule(EmptyAgentDependencyModule)
-      .overrideModule(GCModule)
-      .useModule(EmptyAgentDependencyModule)
-      .overrideModule(LogModule)
-      .useModule(EmptyAgentDependencyModule)
-      .overrideModule(CommandsModule)
-      .useModule(EmptyAgentDependencyModule)
-      .overrideProvider(RuntimeProviderAuditService)
-      .useValue({ record: vi.fn().mockResolvedValue(undefined) })
-      .overrideProvider(RUNTIME_PROVIDER_AUDIT_SINK)
-      .useValue({ record: vi.fn().mockResolvedValue(undefined) })
-      .overrideProvider(RUNTIME_APPROVAL_VERIFIER)
-      .useValue({ consume: vi.fn().mockResolvedValue(false) })
-      .overrideProvider(DurableSessionService)
-      .useValue({})
-      .overrideProvider(DurableSessionRepository)
-      .useValue({})
-      .overrideProvider(AgentService)
-      .useValue({})
-      .overrideProvider(ProviderService)
-      .useValue({})
-      .overrideProvider(ProviderCredentialsService)
-      .useValue({})
-      .overrideProvider(RoutingService)
-      .useValue({})
-      .overrideProvider(RoutingEngineService)
-      .useValue({})
-      .overrideProvider(SkillLoaderService)
-      .useValue({})
-      .compile();
-
-    app = moduleRef.createNestApplication<NestFastifyApplication>(new FastifyAdapter());
-    await app.init();
-    await app.getHttpAdapter().getInstance().ready();
-  });
-
-  afterAll(async (): Promise<void> => {
-    await app?.close();
-  });
-
-  it('returns gateway denial responses from the actual guarded interaction routes', async (): Promise<void> => {
-    if (!app) throw new Error('Nest application did not initialize');
-
-    const attachDenied = await app.inject({
-      method: 'POST',
-      url: '/api/interaction/Nova/sessions/session-1/attach',
-      headers: { 'x-correlation-id': 'correlation-1' },
-      payload: { mode: 'read' },
-    });
-    expect(attachDenied.statusCode).toBe(401);
-
-    const sendDenied = await app.inject({
-      method: 'POST',
-      url: '/api/interaction/Nova/sessions/session-1/send',
-      headers: { cookie: 'session=trusted', 'x-correlation-id': 'correlation-1' },
-      payload: {},
-    });
-    expect(sendDenied.statusCode).toBe(403);
-    expect(sendDenied.json()).toMatchObject({
-      message: 'Content and idempotency key are required',
-    });
-
-    const stopDenied = await app.inject({
-      method: 'POST',
-      url: '/api/interaction/Nova/sessions/session-1/stop',
-      headers: { cookie: 'session=trusted', 'x-correlation-id': 'correlation-1' },
-      payload: {},
-    });
-    expect(stopDenied.statusCode).toBe(403);
-    expect(stopDenied.json()).toMatchObject({ message: 'Exact-action approval is required' });
-  });
-
-  it('requires authentication and reaches the Hermes provider registered by AgentModule', async (): Promise<void> => {
-    if (!app) throw new Error('Nest application did not initialize');
-    const registry = app.get(AGENT_RUNTIME_PROVIDER_REGISTRY);
-    expect(registry.get('runtime.hermes')).toBeInstanceOf(HermesRuntimeProvider);
-
-    const denied = await app.inject({
-      method: 'GET',
-      url: '/api/interaction/Nova/transitional-capabilities?provider=runtime.hermes',
-      headers: { 'x-correlation-id': 'correlation-1' },
-    });
-    expect(denied.statusCode).toBe(401);
-
-    const response = await app.inject({
-      method: 'GET',
-      url: '/api/interaction/Nova/transitional-capabilities?provider=runtime.hermes',
-      headers: { cookie: 'session=trusted', 'x-correlation-id': 'correlation-1' },
-    });
-    expect(response.statusCode).toBe(200);
-    expect(response.json()).toEqual([
-      { capability: 'kanban', status: 'unsupported' },
-      { capability: 'skills', status: 'unsupported' },
-      { capability: 'memory', status: 'unsupported' },
-      { capability: 'tools', status: 'unsupported' },
-      { capability: 'cron', status: 'unsupported' },
-    ]);
-  });
-});
--- a/apps/gateway/src/agent/hermes-runtime.transport.test.ts
+++ b/apps/gateway/src/agent/hermes-runtime.transport.test.ts
@@ -1,46 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { GatewayHermesRuntimeTransport } from './hermes-runtime.transport.js';
-
-const scope = {
-  actorId: 'owner-1',
-  tenantId: 'tenant-1',
-  channelId: 'cli',
-  correlationId: 'correlation-1',
-};
-
-describe('GatewayHermesRuntimeTransport', () => {
-  it('preserves a configured path prefix and authenticates the concrete runtime request', async () => {
-    const fetchFn = vi
-      .fn()
-      .mockResolvedValue(new Response(JSON.stringify(['session.list']), { status: 200 }));
-    const transport = new GatewayHermesRuntimeTransport(
-      'https://runtime.example.test/hermes',
-      'test-service-token',
-      fetchFn,
-    );
-
-    await expect(transport.capabilities(scope)).resolves.toEqual(['session.list']);
-
-    expect(fetchFn).toHaveBeenCalledWith(
-      new URL('https://runtime.example.test/hermes/capabilities'),
-      expect.objectContaining({
-        headers: expect.objectContaining({
-          authorization: 'Bearer test-service-token',
-          'x-mosaic-channel-id': 'cli',
-        }),
-      }),
-    );
-  });
-
-  it('rejects non-loopback HTTP runtime endpoints before sending identity headers', async () => {
-    const fetchFn = vi.fn();
-    const transport = new GatewayHermesRuntimeTransport(
-      'http://runtime.example.test/hermes',
-      'test-service-token',
-      fetchFn,
-    );
-
-    await expect(transport.capabilities(scope)).rejects.toThrow('requires HTTPS');
-    expect(fetchFn).not.toHaveBeenCalled();
-  });
-});
--- a/apps/gateway/src/agent/hermes-runtime.transport.ts
+++ b/apps/gateway/src/agent/hermes-runtime.transport.ts
@@ -1,121 +0,0 @@
-import type { HermesLegacySession, HermesRuntimeTransport } from '@mosaicstack/agent';
-import type {
-  RuntimeAttachHandle,
-  RuntimeAttachMode,
-  RuntimeMessage,
-  RuntimeScope,
-  RuntimeStreamEvent,
-} from '@mosaicstack/types';
-
-/** Concrete HTTP transport for a configured legacy Hermes runtime endpoint. */
-export class GatewayHermesRuntimeTransport implements HermesRuntimeTransport {
-  constructor(
-    private readonly baseUrl = process.env['MOSAIC_HERMES_RUNTIME_URL']?.trim(),
-    private readonly serviceToken = process.env['MOSAIC_HERMES_RUNTIME_TOKEN']?.trim(),
-    private readonly fetchFn: typeof fetch = fetch,
-  ) {}
-
-  async capabilities(scope: RuntimeScope): Promise<string[]> {
-    return this.request<string[]>('/capabilities', scope);
-  }
-
-  async health(scope: RuntimeScope): Promise<{ status: string; detail?: string }> {
-    return this.request<{ status: string; detail?: string }>('/health', scope);
-  }
-
-  async sessions(scope: RuntimeScope): Promise<HermesLegacySession[]> {
-    return this.request<HermesLegacySession[]>('/sessions', scope);
-  }
-
-  async *stream(
-    sessionId: string,
-    cursor: string | undefined,
-    scope: RuntimeScope,
-  ): AsyncIterable<RuntimeStreamEvent> {
-    const params = new URLSearchParams(cursor ? { cursor } : {});
-    const events = await this.request<RuntimeStreamEvent[]>(
-      `/sessions/${encodeURIComponent(sessionId)}/stream?${params.toString()}`,
-      scope,
-    );
-    yield* events;
-  }
-
-  async send(sessionId: string, message: RuntimeMessage, scope: RuntimeScope): Promise<void> {
-    await this.request(`/sessions/${encodeURIComponent(sessionId)}/messages`, scope, {
-      method: 'POST',
-      body: message,
-    });
-  }
-
-  async attach(
-    sessionId: string,
-    mode: RuntimeAttachMode,
-    scope: RuntimeScope,
-  ): Promise<RuntimeAttachHandle> {
-    return this.request<RuntimeAttachHandle>(
-      `/sessions/${encodeURIComponent(sessionId)}/attach`,
-      scope,
-      {
-        method: 'POST',
-        body: { mode },
-      },
-    );
-  }
-
-  async detach(attachmentId: string, scope: RuntimeScope): Promise<void> {
-    await this.request(`/attachments/${encodeURIComponent(attachmentId)}`, scope, {
-      method: 'DELETE',
-    });
-  }
-
-  async terminate(sessionId: string, approvalRef: string, scope: RuntimeScope): Promise<void> {
-    await this.request(`/sessions/${encodeURIComponent(sessionId)}/terminate`, scope, {
-      method: 'POST',
-      body: { approvalRef },
-    });
-  }
-
-  private async request<T>(
-    path: string,
-    scope: RuntimeScope,
-    init: { method?: string; body?: unknown } = {},
-  ): Promise<T> {
-    if (!this.baseUrl || !this.serviceToken) {
-      throw new Error(
-        'MOSAIC_HERMES_RUNTIME_URL and MOSAIC_HERMES_RUNTIME_TOKEN must configure Hermes transport',
-      );
-    }
-    const endpoint = new URL(this.baseUrl);
-    if (endpoint.protocol !== 'https:' && !isLoopbackHttp(endpoint)) {
-      throw new Error('Hermes runtime transport requires HTTPS outside loopback');
-    }
-    const response = await this.fetchFn(
-      new URL(path.replace(/^\//, ''), `${endpoint.toString().replace(/\/$/, '')}/`),
-      {
-        method: init.method ?? 'GET',
-        headers: {
-          accept: 'application/json',
-          authorization: `Bearer ${this.serviceToken}`,
-          'x-mosaic-actor-id': scope.actorId,
-          'x-mosaic-tenant-id': scope.tenantId,
-          'x-mosaic-channel-id': scope.channelId,
-          'x-correlation-id': scope.correlationId,
-          ...(init.body ? { 'content-type': 'application/json' } : {}),
-        },
-        ...(init.body ? { body: JSON.stringify(init.body) } : {}),
-      },
-    );
-    if (!response.ok) throw new Error(`Hermes runtime request failed: ${response.status}`);
-    if (response.status === 204) return undefined as T;
-    return (await response.json()) as T;
-  }
-}
-
-function isLoopbackHttp(endpoint: URL): boolean {
-  return (
-    endpoint.protocol === 'http:' &&
-    (endpoint.hostname === 'localhost' ||
-      endpoint.hostname === '127.0.0.1' ||
-      endpoint.hostname === '::1')
-  );
-}
--- a/apps/gateway/src/agent/interaction.controller.test.ts
+++ b/apps/gateway/src/agent/interaction.controller.test.ts
@@ -1,263 +0,0 @@
-import { createGatewayRuntimeProviderRegistry } from './agent.module.js';
-import { firstValueFrom } from 'rxjs';
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import {
-  RuntimeApprovalDeniedError,
-  RuntimeProviderService,
-} from './runtime-provider-registry.service.js';
-import { RuntimeApprovalDeniedFilter } from './runtime-approval-denied.filter.js';
-import { InteractionController } from './interaction.controller.js';
-
-describe('InteractionController', (): void => {
-  afterEach(() => vi.restoreAllMocks());
-
-  it('maps a denied runtime approval to Fastify HTTP 403', () => {
-    const send = vi.fn();
-    const status = vi.fn().mockReturnValue({ send });
-    const response = { status };
-    const host = { switchToHttp: () => ({ getResponse: () => response }) };
-
-    new RuntimeApprovalDeniedFilter().catch(new RuntimeApprovalDeniedError(), host as never);
-
-    expect(status).toHaveBeenCalledWith(403);
-    expect(send).toHaveBeenCalledWith({
-      statusCode: 403,
-      message: 'Runtime termination approval denied',
-    });
-  });
-
-  it('honors a differently named configured instance without a code change', async () => {
-    const prior = process.env['MOSAIC_AGENT_NAME'];
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    const runtime = { listSessions: vi.fn().mockResolvedValue([]) };
-    const controller = new InteractionController(runtime as never, {} as never);
-
-    await expect(
-      controller.sessions('Nova', 'fleet', { id: 'owner', tenantId: 'team' }, 'corr-1'),
-    ).resolves.toEqual([]);
-    await expect(
-      controller.sessions('Other', 'fleet', { id: 'owner', tenantId: 'team' }, 'corr-1'),
-    ).rejects.toThrow('Interaction agent is not configured');
-
-    if (prior === undefined) delete process.env['MOSAIC_AGENT_NAME'];
-    else process.env['MOSAIC_AGENT_NAME'] = prior;
-  });
-
-  it('reaches the registered Hermes provider through the authenticated transitional matrix route', async () => {
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    const registry = createGatewayRuntimeProviderRegistry();
-    const runtime = new RuntimeProviderService(
-      registry,
-      { record: vi.fn().mockResolvedValue(undefined) },
-      { consume: vi.fn().mockResolvedValue(false) },
-    );
-    const controller = new InteractionController(runtime, {} as never);
-
-    await expect(
-      controller.transitionalCapabilities(
-        'Nova',
-        'runtime.hermes',
-        { id: 'owner', tenantId: 'team' },
-        'corr-1',
-      ),
-    ).resolves.toEqual([
-      { capability: 'kanban', status: 'unsupported' },
-      { capability: 'skills', status: 'unsupported' },
-      { capability: 'memory', status: 'unsupported' },
-      { capability: 'tools', status: 'unsupported' },
-      { capability: 'cron', status: 'unsupported' },
-    ]);
-  });
-
-  it('rejects a request without the non-simple correlation header', async () => {
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    const controller = new InteractionController({ listSessions: vi.fn() } as never, {} as never);
-
-    await expect(controller.sessions('Nova', 'fleet', { id: 'owner' })).rejects.toThrow(
-      'X-Correlation-Id is required',
-    );
-  });
-
-  it('enrolls a visible runtime session under the cross-surface conversation handle', async () => {
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    const runtime = {
-      listSessions: vi.fn().mockResolvedValue([{ id: 'runtime-1' }]),
-    };
-    const durable = { enroll: vi.fn().mockResolvedValue(undefined) };
-    const controller = new InteractionController(runtime as never, durable as never);
-
-    await expect(
-      controller.enroll(
-        'Nova',
-        'conversation-1',
-        { providerId: 'fleet', runtimeSessionId: 'runtime-1' },
-        { id: 'owner', tenantId: 'team' },
-        'corr-1',
-      ),
-    ).resolves.toEqual({ status: 'enrolled', sessionId: 'conversation-1' });
-    expect(durable.enroll).toHaveBeenCalledWith(
-      {
-        agentName: 'Nova',
-        sessionId: 'conversation-1',
-        tenantId: 'team',
-        ownerId: 'owner',
-        providerId: 'fleet',
-        runtimeSessionId: 'runtime-1',
-      },
-      expect.objectContaining({ correlationId: 'corr-1' }),
-    );
-  });
-
-  it('rejects an invalid attach mode before invoking a provider', async () => {
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    const controller = new InteractionController({ attach: vi.fn() } as never, {} as never);
-
-    await expect(
-      controller.attach('Nova', 'durable-1', { mode: 'write' as never }, { id: 'owner' }, 'corr-1'),
-    ).rejects.toThrow('Interaction attach mode is invalid');
-  });
-
-  it('resumes a durable session by attaching and streaming its runtime events', async () => {
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    const runtimeEvent = {
-      type: 'message.delta' as const,
-      sessionId: 'runtime-1',
-      cursor: 'cursor-1',
-      occurredAt: '2026-07-13T00:00:00.000Z',
-      content: 'resumed',
-    };
-    const runtime = {
-      attach: vi.fn().mockResolvedValue({ attachmentId: 'attach-1', sessionId: 'runtime-1' }),
-      streamSession: vi.fn(async function* () {
-        yield runtimeEvent;
-      }),
-    };
-    const durable = {
-      getSnapshot: vi.fn().mockResolvedValue({
-        identity: { agentName: 'Nova', providerId: 'fleet', runtimeSessionId: 'runtime-1' },
-      }),
-    };
-    const controller = new InteractionController(runtime as never, durable as never);
-
-    await controller.attach('Nova', 'conversation-1', { mode: 'read' }, { id: 'owner' }, 'corr-1');
-    await expect(
-      firstValueFrom(
-        controller.stream('Nova', 'conversation-1', undefined, { id: 'owner' }, 'corr-1'),
-      ),
-    ).resolves.toEqual({ data: runtimeEvent });
-
-    expect(runtime.attach).toHaveBeenCalledWith(
-      'fleet',
-      'runtime-1',
-      'read',
-      expect.objectContaining({ correlationId: 'corr-1' }),
-    );
-    expect(runtime.streamSession).toHaveBeenCalledWith(
-      'fleet',
-      'runtime-1',
-      undefined,
-      expect.objectContaining({ correlationId: 'corr-1' }),
-    );
-  });
-
-  it('does not create a runtime stream after the SSE subscriber disconnects during snapshot lookup', async () => {
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    let resolveSnapshot!: (value: { identity: Record<string, string> }) => void;
-    const snapshot = new Promise<{ identity: Record<string, string> }>((resolve) => {
-      resolveSnapshot = resolve;
-    });
-    const runtime = { streamSession: vi.fn() };
-    const durable = { getSnapshot: vi.fn().mockReturnValue(snapshot) };
-    const controller = new InteractionController(runtime as never, durable as never);
-
-    const subscription = controller
-      .stream('Nova', 'conversation-1', undefined, { id: 'owner' }, 'corr-1')
-      .subscribe();
-    subscription.unsubscribe();
-    resolveSnapshot({
-      identity: { agentName: 'Nova', providerId: 'fleet', runtimeSessionId: 'runtime-1' },
-    });
-    await new Promise((resolve) => setTimeout(resolve, 0));
-
-    expect(runtime.streamSession).not.toHaveBeenCalled();
-  });
-
-  it.each([
-    ['wrong actor', { getSnapshot: vi.fn().mockRejectedValue(new Error('scope mismatch')) }],
-    [
-      'session-agent mismatch',
-      {
-        getSnapshot: vi.fn().mockResolvedValue({
-          identity: { agentName: 'Other', providerId: 'fleet', runtimeSessionId: 'runtime-1' },
-        }),
-      },
-    ],
-  ])('denies a CLI stop for %s', async (_reason, durable) => {
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    const runtime = { terminate: vi.fn().mockResolvedValue(undefined) };
-    const controller = new InteractionController(runtime as never, durable as never);
-
-    await expect(
-      controller.stop(
-        'Nova',
-        'durable-1',
-        { approvalRef: 'approval-1' },
-        { id: 'owner' },
-        'corr-1',
-      ),
-    ).rejects.toBeDefined();
-    expect(runtime.terminate).not.toHaveBeenCalled();
-  });
-
-  it('surfaces a denied runtime approval to the CLI interaction surface', async () => {
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    const runtime = {
-      terminate: vi.fn().mockRejectedValue(new Error('Runtime termination approval denied')),
-    };
-    const durable = {
-      getSnapshot: vi.fn().mockResolvedValue({
-        identity: { agentName: 'Nova', providerId: 'fleet', runtimeSessionId: 'runtime-1' },
-      }),
-    };
-    const controller = new InteractionController(runtime as never, durable as never);
-
-    await expect(
-      controller.stop(
-        'Nova',
-        'durable-1',
-        { approvalRef: 'approval-1' },
-        { id: 'owner' },
-        'corr-1',
-      ),
-    ).rejects.toThrow('Runtime termination approval denied');
-  });
-
-  it('uses the durable session identity and runtime registry for an approved stop', async () => {
-    process.env['MOSAIC_AGENT_NAME'] = 'Nova';
-    const runtime = { terminate: vi.fn().mockResolvedValue(undefined) };
-    const durable = {
-      getSnapshot: vi.fn().mockResolvedValue({
-        identity: { agentName: 'Nova', providerId: 'fleet', runtimeSessionId: 'runtime-1' },
-      }),
-    };
-    const controller = new InteractionController(runtime as never, durable as never);
-
-    await controller.stop(
-      'Nova',
-      'durable-1',
-      { approvalRef: 'approval-1' },
-      { id: 'owner' },
-      'corr-1',
-    );
-
-    expect(runtime.terminate).toHaveBeenCalledWith(
-      'fleet',
-      'runtime-1',
-      'approval-1',
-      expect.objectContaining({
-        correlationId: 'corr-1',
-        actorScope: { userId: 'owner', tenantId: 'owner' },
-      }),
-    );
-  });
-});
--- a/apps/gateway/src/agent/interaction.controller.ts
+++ b/apps/gateway/src/agent/interaction.controller.ts
@@ -1,293 +0,0 @@
-import {
-  Body,
-  Controller,
-  ForbiddenException,
-  Get,
-  Headers,
-  Sse,
-  Inject,
-  Param,
-  Post,
-  Query,
-  UseGuards,
-  UseFilters,
-} from '@nestjs/common';
-import type { RuntimeAttachMode, RuntimeStreamEvent } from '@mosaicstack/types';
-import { Observable } from 'rxjs';
-import { AuthGuard } from '../auth/auth.guard.js';
-import { CurrentUser } from '../auth/current-user.decorator.js';
-import { scopeFromUser, type AuthenticatedUserLike } from '../auth/session-scope.js';
-import { DurableSessionService } from './durable-session.service.js';
-import { RuntimeApprovalDeniedFilter } from './runtime-approval-denied.filter.js';
-import {
-  RuntimeProviderService,
-  type RuntimeProviderRequestContext,
-} from './runtime-provider-registry.service.js';
-
-/**
- * Authenticated HTTP boundary for operator interaction clients. Identity is
- * selected from deployment configuration, never a client-side command name.
- */
-@Controller('api/interaction/:agentName')
-@UseGuards(AuthGuard)
-@UseFilters(RuntimeApprovalDeniedFilter)
-export class InteractionController {
-  constructor(
-    @Inject(RuntimeProviderService) private readonly runtime: RuntimeProviderService,
-    @Inject(DurableSessionService) private readonly durable: DurableSessionService,
-  ) {}
-
-  @Get('sessions')
-  async sessions(
-    @Param('agentName') agentName: string,
-    @Query('provider') providerId: string,
-    @CurrentUser() user: AuthenticatedUserLike,
-    @Headers('x-correlation-id') correlationId?: string,
-  ) {
-    this.assertConfiguredAgent(agentName);
-    return this.runtime.listSessions(
-      this.requiredProvider(providerId),
-      this.context(user, correlationId),
-    );
-  }
-
-  @Get('transitional-capabilities')
-  async transitionalCapabilities(
-    @Param('agentName') agentName: string,
-    @Query('provider') providerId: string,
-    @CurrentUser() user: AuthenticatedUserLike,
-    @Headers('x-correlation-id') correlationId?: string,
-  ) {
-    this.assertConfiguredAgent(agentName);
-    return this.runtime.transitionalCapabilityMatrix(
-      this.requiredProvider(providerId),
-      this.context(user, correlationId),
-    );
-  }
-
-  @Get('tree')
-  async tree(
-    @Param('agentName') agentName: string,
-    @Query('provider') providerId: string,
-    @CurrentUser() user: AuthenticatedUserLike,
-    @Headers('x-correlation-id') correlationId?: string,
-  ) {
-    this.assertConfiguredAgent(agentName);
-    return this.runtime.getSessionTree(
-      this.requiredProvider(providerId),
-      this.context(user, correlationId),
-    );
-  }
-
-  /**
-   * Bind an existing, authorized runtime session to the stable conversation ID.
-   * This is the lifecycle boundary where both runtime identifiers are known.
-   */
-  @Post('sessions/:sessionId/enroll')
-  async enroll(
-    @Param('agentName') agentName: string,
-    @Param('sessionId') sessionId: string,
-    @Body() body: { providerId?: string; runtimeSessionId?: string } = {},
-    @CurrentUser() user: AuthenticatedUserLike,
-    @Headers('x-correlation-id') correlationId?: string,
-  ) {
-    this.assertConfiguredAgent(agentName);
-    const providerId = this.requiredProvider(body.providerId ?? '');
-    const runtimeSessionId = body.runtimeSessionId?.trim();
-    if (!runtimeSessionId) throw new ForbiddenException('Runtime session identity is required');
-    const context = this.context(user, correlationId);
-    const sessions = await this.runtime.listSessions(providerId, context);
-    if (!sessions.some((session): boolean => session.id === runtimeSessionId)) {
-      throw new ForbiddenException('Runtime session is not visible to this actor');
-    }
-    await this.durable.enroll(
-      {
-        agentName,
-        sessionId,
-        tenantId: context.actorScope.tenantId,
-        ownerId: context.actorScope.userId,
-        providerId,
-        runtimeSessionId,
-      },
-      context,
-    );
-    return { status: 'enrolled', sessionId };
-  }
-
-  @Post('sessions/:sessionId/attach')
-  async attach(
-    @Param('agentName') agentName: string,
-    @Param('sessionId') sessionId: string,
-    @Body() body: { mode?: RuntimeAttachMode } = {},
-    @CurrentUser() user: AuthenticatedUserLike,
-    @Headers('x-correlation-id') correlationId?: string,
-  ) {
-    this.assertConfiguredAgent(agentName);
-    const context = this.context(user, correlationId);
-    const mode = body.mode ?? 'read';
-    if (mode !== 'read' && mode !== 'control') {
-      throw new ForbiddenException('Interaction attach mode is invalid');
-    }
-    const snapshot = await this.durable.getSnapshot(sessionId, context);
-    this.assertSessionAgent(snapshot.identity.agentName, agentName);
-    return this.runtime.attach(
-      snapshot.identity.providerId,
-      snapshot.identity.runtimeSessionId,
-      mode,
-      context,
-    );
-  }
-
-  @Sse('sessions/:sessionId/stream')
-  stream(
-    @Param('agentName') agentName: string,
-    @Param('sessionId') sessionId: string,
-    @Query('cursor') cursor: string | undefined,
-    @CurrentUser() user: AuthenticatedUserLike,
-    @Headers('x-correlation-id') correlationId?: string,
-  ): Observable<{ data: RuntimeStreamEvent }> {
-    this.assertConfiguredAgent(agentName);
-    const context = this.context(user, correlationId);
-    return new Observable((subscriber) => {
-      let iterator: AsyncIterator<RuntimeStreamEvent> | undefined;
-      let cancelled = false;
-      void (async (): Promise<void> => {
-        try {
-          const snapshot = await this.durable.getSnapshot(sessionId, context);
-          if (cancelled || subscriber.closed) return;
-          this.assertSessionAgent(snapshot.identity.agentName, agentName);
-          iterator = this.runtime
-            .streamSession(
-              snapshot.identity.providerId,
-              snapshot.identity.runtimeSessionId,
-              cursor?.trim() || undefined,
-              context,
-            )
-            [Symbol.asyncIterator]();
-          if (cancelled || subscriber.closed) {
-            await iterator.return?.();
-            return;
-          }
-          while (!cancelled && !subscriber.closed) {
-            const next = await iterator.next();
-            if (next.done || cancelled || subscriber.closed) break;
-            subscriber.next({ data: next.value });
-          }
-          if (!subscriber.closed) subscriber.complete();
-        } catch (error: unknown) {
-          if (!subscriber.closed) subscriber.error(error);
-        }
-      })();
-      return (): void => {
-        cancelled = true;
-        void iterator?.return?.();
-      };
-    });
-  }
-
-  @Post('sessions/:sessionId/send')
-  async send(
-    @Param('agentName') agentName: string,
-    @Param('sessionId') sessionId: string,
-    @Body() body: { content?: string; idempotencyKey?: string } = {},
-    @CurrentUser() user: AuthenticatedUserLike,
-    @Headers('x-correlation-id') correlationId?: string,
-  ) {
-    this.assertConfiguredAgent(agentName);
-    if (!body.content?.trim() || !body.idempotencyKey?.trim()) {
-      throw new ForbiddenException('Content and idempotency key are required');
-    }
-    const context = this.context(user, correlationId);
-    const snapshot = await this.durable.getSnapshot(sessionId, context);
-    this.assertSessionAgent(snapshot.identity.agentName, agentName);
-    const input = {
-      sessionId,
-      content: body.content,
-      idempotencyKey: body.idempotencyKey,
-      correlationId: context.correlationId,
-      context,
-    };
-    await this.durable.queueProviderSend(input);
-    await this.durable.dispatchProviderOutbox(sessionId, input);
-    return { status: 'queued', sessionId };
-  }
-
-  @Post('sessions/:sessionId/stop')
-  async stop(
-    @Param('agentName') agentName: string,
-    @Param('sessionId') sessionId: string,
-    @Body() body: { approvalRef?: string } = {},
-    @CurrentUser() user: AuthenticatedUserLike,
-    @Headers('x-correlation-id') correlationId?: string,
-  ) {
-    this.assertConfiguredAgent(agentName);
-    if (!body.approvalRef?.trim())
-      throw new ForbiddenException('Exact-action approval is required');
-    const context = this.context(user, correlationId);
-    const snapshot = await this.durable.getSnapshot(sessionId, context);
-    this.assertSessionAgent(snapshot.identity.agentName, agentName);
-    await this.runtime.terminate(
-      snapshot.identity.providerId,
-      snapshot.identity.runtimeSessionId,
-      body.approvalRef,
-      context,
-    );
-    return { status: 'stopped', sessionId };
-  }
-
-  @Post('sessions/:sessionId/recover')
-  async recover(
-    @Param('agentName') agentName: string,
-    @Param('sessionId') sessionId: string,
-    @CurrentUser() user: AuthenticatedUserLike,
-    @Headers('x-correlation-id') correlationId?: string,
-  ) {
-    this.assertConfiguredAgent(agentName);
-    const context = this.context(user, correlationId);
-    const snapshot = await this.durable.getSnapshot(sessionId, context);
-    this.assertSessionAgent(snapshot.identity.agentName, agentName);
-    await this.durable.recoverProviderSession(sessionId, {
-      sessionId,
-      content: '',
-      idempotencyKey: `recovery:${context.correlationId}`,
-      correlationId: context.correlationId,
-      context,
-    });
-    return { status: 'recovered', sessionId };
-  }
-
-  private context(
-    user: AuthenticatedUserLike,
-    correlationId?: string,
-  ): RuntimeProviderRequestContext {
-    const requestCorrelationId = correlationId?.trim();
-    // This non-simple request header is mandatory for mutations. Browser
-    // cross-origin requests cannot set it without a CORS preflight, and the
-    // gateway's allowlist rejects untrusted origins before the handler runs.
-    if (!requestCorrelationId) {
-      throw new ForbiddenException('X-Correlation-Id is required');
-    }
-    return {
-      actorScope: scopeFromUser(user),
-      channelId: 'cli',
-      correlationId: requestCorrelationId,
-    };
-  }
-
-  private assertConfiguredAgent(agentName: string): void {
-    const configured = process.env['MOSAIC_AGENT_NAME']?.trim();
-    if (!configured || configured !== agentName) {
-      throw new ForbiddenException('Interaction agent is not configured for this request');
-    }
-  }
-
-  private assertSessionAgent(sessionAgentName: string, agentName: string): void {
-    if (sessionAgentName !== agentName)
-      throw new ForbiddenException('Interaction session identity mismatch');
-  }
-
-  private requiredProvider(providerId: string): string {
-    if (!providerId?.trim()) throw new ForbiddenException('Runtime provider is required');
-    return providerId;
-  }
-}
--- a/apps/gateway/src/agent/model-capabilities.ts
+++ b/apps/gateway/src/agent/model-capabilities.ts
@@ -1,204 +0,0 @@
-import type { ModelCapability } from '@mosaicstack/types';
-
-/**
- * Comprehensive capability matrix for all target models.
- * Cost fields are optional and will be filled in when real pricing data is available.
- */
-export const MODEL_CAPABILITIES: ModelCapability[] = [
-  {
-    id: 'claude-opus-4-6',
-    provider: 'anthropic',
-    displayName: 'Claude Opus 4.6',
-    tier: 'premium',
-    contextWindow: 200000,
-    maxOutputTokens: 32000,
-    capabilities: {
-      tools: true,
-      vision: true,
-      streaming: true,
-      reasoning: true,
-      embedding: false,
-    },
-  },
-  {
-    id: 'claude-sonnet-4-6',
-    provider: 'anthropic',
-    displayName: 'Claude Sonnet 4.6',
-    tier: 'standard',
-    contextWindow: 200000,
-    maxOutputTokens: 16000,
-    capabilities: {
-      tools: true,
-      vision: true,
-      streaming: true,
-      reasoning: true,
-      embedding: false,
-    },
-  },
-  {
-    id: 'claude-haiku-4-5',
-    provider: 'anthropic',
-    displayName: 'Claude Haiku 4.5',
-    tier: 'cheap',
-    contextWindow: 200000,
-    maxOutputTokens: 8192,
-    capabilities: {
-      tools: true,
-      vision: true,
-      streaming: true,
-      reasoning: false,
-      embedding: false,
-    },
-  },
-  {
-    id: 'codex-gpt-5.4',
-    provider: 'openai',
-    displayName: 'Codex gpt-5.4',
-    tier: 'premium',
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: {
-      tools: true,
-      vision: true,
-      streaming: true,
-      reasoning: true,
-      embedding: false,
-    },
-  },
-  {
-    id: 'glm-5',
-    provider: 'zai',
-    displayName: 'GLM-5',
-    tier: 'standard',
-    contextWindow: 128000,
-    maxOutputTokens: 8192,
-    capabilities: {
-      tools: true,
-      vision: false,
-      streaming: true,
-      reasoning: false,
-      embedding: false,
-    },
-  },
-  {
-    id: 'llama3.2',
-    provider: 'ollama',
-    displayName: 'llama3.2',
-    tier: 'local',
-    contextWindow: 128000,
-    maxOutputTokens: 8192,
-    capabilities: {
-      tools: true,
-      vision: false,
-      streaming: true,
-      reasoning: false,
-      embedding: false,
-    },
-  },
-  {
-    id: 'codellama',
-    provider: 'ollama',
-    displayName: 'codellama',
-    tier: 'local',
-    contextWindow: 16000,
-    maxOutputTokens: 4096,
-    capabilities: {
-      tools: true,
-      vision: false,
-      streaming: true,
-      reasoning: false,
-      embedding: false,
-    },
-  },
-  {
-    id: 'mistral',
-    provider: 'ollama',
-    displayName: 'mistral',
-    tier: 'local',
-    contextWindow: 32000,
-    maxOutputTokens: 8192,
-    capabilities: {
-      tools: true,
-      vision: false,
-      streaming: true,
-      reasoning: false,
-      embedding: false,
-    },
-  },
-  {
-    id: 'nomic-embed-text',
-    provider: 'ollama',
-    displayName: 'nomic-embed-text',
-    tier: 'local',
-    contextWindow: 8192,
-    maxOutputTokens: 0,
-    capabilities: {
-      tools: false,
-      vision: false,
-      streaming: false,
-      reasoning: false,
-      embedding: true,
-    },
-  },
-  {
-    id: 'mxbai-embed-large',
-    provider: 'ollama',
-    displayName: 'mxbai-embed-large',
-    tier: 'local',
-    contextWindow: 8192,
-    maxOutputTokens: 0,
-    capabilities: {
-      tools: false,
-      vision: false,
-      streaming: false,
-      reasoning: false,
-      embedding: true,
-    },
-  },
-];
-
-/**
- * Look up a model by its ID.
- * Returns undefined if the model is not found.
- */
-export function getModelCapability(modelId: string): ModelCapability | undefined {
-  return MODEL_CAPABILITIES.find((m) => m.id === modelId);
-}
-
-/**
- * Find models matching a partial capability filter.
- * All provided filter keys must match for a model to be included.
- */
-export function findModelsByCapability(
-  filter: Partial<Pick<ModelCapability, 'tier' | 'provider'>> & {
-    capabilities?: Partial<ModelCapability['capabilities']>;
-  },
-): ModelCapability[] {
-  return MODEL_CAPABILITIES.filter((model) => {
-    if (filter.tier !== undefined && model.tier !== filter.tier) return false;
-    if (filter.provider !== undefined && model.provider !== filter.provider) return false;
-    if (filter.capabilities) {
-      for (const [key, value] of Object.entries(filter.capabilities) as [
-        keyof ModelCapability['capabilities'],
-        boolean,
-      ][]) {
-        if (model.capabilities[key] !== value) return false;
-      }
-    }
-    return true;
-  });
-}
-
-/**
- * Get all models for a specific provider.
- */
-export function getModelsByProvider(provider: string): ModelCapability[] {
-  return MODEL_CAPABILITIES.filter((m) => m.provider === provider);
-}
-
-/**
- * Get the full list of all known models.
- */
-export function getAllModels(): ModelCapability[] {
-  return MODEL_CAPABILITIES;
-}
--- a/apps/gateway/src/agent/provider-credentials.dto.ts
+++ b/apps/gateway/src/agent/provider-credentials.dto.ts
@@ -1,23 +0,0 @@
-/** DTO for storing a provider credential. */
-export interface StoreCredentialDto {
-  /** Provider identifier (e.g., 'anthropic', 'openai', 'openrouter', 'zai') */
-  provider: string;
-  /** Credential type */
-  type: 'api_key' | 'oauth_token';
-  /** Plain-text credential value — will be encrypted before storage */
-  value: string;
-  /** Optional extra config (e.g., base URL overrides) */
-  metadata?: Record<string, unknown>;
-}
-
-/** DTO returned in list/existence responses — never contains decrypted values. */
-export interface ProviderCredentialSummaryDto {
-  provider: string;
-  credentialType: 'api_key' | 'oauth_token';
-  /** Whether a credential is stored for this provider */
-  exists: boolean;
-  expiresAt?: string | null;
-  metadata?: Record<string, unknown> | null;
-  createdAt: string;
-  updatedAt: string;
-}
--- a/apps/gateway/src/agent/provider-credentials.service.ts
+++ b/apps/gateway/src/agent/provider-credentials.service.ts
@@ -1,123 +0,0 @@
-import { Inject, Injectable, Logger } from '@nestjs/common';
-import { seal, unseal } from '@mosaicstack/auth';
-import type { Db } from '@mosaicstack/db';
-import { providerCredentials, eq, and } from '@mosaicstack/db';
-import { DB } from '../database/database.module.js';
-import type { ProviderCredentialSummaryDto } from './provider-credentials.dto.js';
-
-@Injectable()
-export class ProviderCredentialsService {
-  private readonly logger = new Logger(ProviderCredentialsService.name);
-
-  constructor(@Inject(DB) private readonly db: Db) {}
-
-  /**
-   * Encrypt and store (or update) a credential for the given user + provider.
-   * Uses an upsert pattern: one row per (userId, provider).
-   */
-  async store(
-    userId: string,
-    provider: string,
-    type: 'api_key' | 'oauth_token',
-    value: string,
-    metadata?: Record<string, unknown>,
-  ): Promise<void> {
-    const encryptedValue = seal(value);
-
-    await this.db
-      .insert(providerCredentials)
-      .values({
-        userId,
-        provider,
-        credentialType: type,
-        encryptedValue,
-        metadata: metadata ?? null,
-      })
-      .onConflictDoUpdate({
-        target: [providerCredentials.userId, providerCredentials.provider],
-        set: {
-          credentialType: type,
-          encryptedValue,
-          metadata: metadata ?? null,
-          updatedAt: new Date(),
-        },
-      });
-
-    this.logger.log(`Credential stored for user=${userId} provider=${provider}`);
-  }
-
-  /**
-   * Decrypt and return the plain-text credential value for the given user + provider.
-   * Returns null if no credential is stored.
-   */
-  async retrieve(userId: string, provider: string): Promise<string | null> {
-    const rows = await this.db
-      .select()
-      .from(providerCredentials)
-      .where(
-        and(eq(providerCredentials.userId, userId), eq(providerCredentials.provider, provider)),
-      )
-      .limit(1);
-
-    if (rows.length === 0) return null;
-
-    const row = rows[0]!;
-
-    // Skip expired OAuth tokens
-    if (row.expiresAt && row.expiresAt < new Date()) {
-      this.logger.warn(`Credential for user=${userId} provider=${provider} has expired`);
-      return null;
-    }
-
-    try {
-      return unseal(row.encryptedValue);
-    } catch (err) {
-      this.logger.error(
-        `Failed to decrypt credential for user=${userId} provider=${provider}`,
-        err instanceof Error ? err.message : String(err),
-      );
-      return null;
-    }
-  }
-
-  /**
-   * Delete the stored credential for the given user + provider.
-   */
-  async remove(userId: string, provider: string): Promise<void> {
-    await this.db
-      .delete(providerCredentials)
-      .where(
-        and(eq(providerCredentials.userId, userId), eq(providerCredentials.provider, provider)),
-      );
-
-    this.logger.log(`Credential removed for user=${userId} provider=${provider}`);
-  }
-
-  /**
-   * List all providers for which the user has stored credentials.
-   * Never returns decrypted values.
-   */
-  async listProviders(userId: string): Promise<ProviderCredentialSummaryDto[]> {
-    const rows = await this.db
-      .select({
-        provider: providerCredentials.provider,
-        credentialType: providerCredentials.credentialType,
-        expiresAt: providerCredentials.expiresAt,
-        metadata: providerCredentials.metadata,
-        createdAt: providerCredentials.createdAt,
-        updatedAt: providerCredentials.updatedAt,
-      })
-      .from(providerCredentials)
-      .where(eq(providerCredentials.userId, userId));
-
-    return rows.map((row) => ({
-      provider: row.provider,
-      credentialType: row.credentialType,
-      exists: true,
-      expiresAt: row.expiresAt?.toISOString() ?? null,
-      metadata: row.metadata as Record<string, unknown> | null,
-      createdAt: row.createdAt.toISOString(),
-      updatedAt: row.updatedAt.toISOString(),
-    }));
-  }
-}
--- a/apps/gateway/src/agent/provider.service.ts
+++ b/apps/gateway/src/agent/provider.service.ts
@@ -1,255 +1,25 @@
-import {
-  Inject,
-  Injectable,
-  Logger,
-  Optional,
-  type OnModuleDestroy,
-  type OnModuleInit,
-} from '@nestjs/common';
+import { Injectable, Logger, type OnModuleInit } from '@nestjs/common';
 import { ModelRegistry, AuthStorage } from '@mariozechner/pi-coding-agent';
-import { getModel, type Model, type Api } from '@mariozechner/pi-ai';
-import type {
-  CustomProviderConfig,
-  IProviderAdapter,
-  ModelInfo,
-  ProviderHealth,
-  ProviderInfo,
-} from '@mosaicstack/types';
-import {
-  AnthropicAdapter,
-  OllamaAdapter,
-  OpenAIAdapter,
-  OpenRouterAdapter,
-  ZaiAdapter,
-} from './adapters/index.js';
+import type { Model, Api } from '@mariozechner/pi-ai';
+import type { ModelInfo, ProviderInfo, CustomProviderConfig } from '@mosaic/types';
 import type { TestConnectionResultDto } from './provider.dto.js';
-import { ProviderCredentialsService } from './provider-credentials.service.js';
-
-/** Default health check interval in seconds */
-const DEFAULT_HEALTH_INTERVAL_SECS = 60;
-
-/** DI injection token for the provider adapter array. */
-export const PROVIDER_ADAPTERS = Symbol('PROVIDER_ADAPTERS');
-
-/** Environment variable names for well-known providers */
-const PROVIDER_ENV_KEYS: Record<string, string> = {
-  anthropic: 'ANTHROPIC_API_KEY',
-  openai: 'OPENAI_API_KEY',
-  openrouter: 'OPENROUTER_API_KEY',
-  zai: 'ZAI_API_KEY',
-};

@Injectable()
-export class ProviderService implements OnModuleInit, OnModuleDestroy {
+export class ProviderService implements OnModuleInit {
  private readonly logger = new Logger(ProviderService.name);
  private registry!: ModelRegistry;

-  constructor(
-    @Optional()
-    @Inject(ProviderCredentialsService)
-    private readonly credentialsService: ProviderCredentialsService | null,
-  ) {}
-
-  /**
-   * Adapters registered with this service.
-   * Built-in adapters (Ollama) are always present; additional adapters can be
-   * supplied via the PROVIDER_ADAPTERS injection token in the future.
-   */
-  private adapters: IProviderAdapter[] = [];
-
-  /**
-   * Cached health status per provider, updated by the health check scheduler.
-   */
-  private healthCache: Map<string, ProviderHealth & { modelCount: number }> = new Map();
-
-  /** Timer handle for the periodic health check scheduler */
-  private healthCheckTimer: ReturnType<typeof setInterval> | null = null;
-
-  async onModuleInit(): Promise<void> {
+  onModuleInit(): void {
    const authStorage = AuthStorage.inMemory();
-    this.registry = ModelRegistry.inMemory(authStorage);
+    this.registry = new ModelRegistry(authStorage);

-    // Build the default set of adapters that rely on the registry
-    this.adapters = [
-      new OllamaAdapter(this.registry),
-      new AnthropicAdapter(this.registry),
-      new OpenAIAdapter(this.registry),
-      new OpenRouterAdapter(),
-      new ZaiAdapter(),
-    ];
-
-    // Run all adapter registrations first (Ollama, Anthropic, OpenAI, OpenRouter, Z.ai)
-    await this.registerAll();
-
-    // Register API-key providers directly (custom)
+    this.registerOllamaProvider();
    this.registerCustomProviders();

    const available = this.registry.getAvailable();
    this.logger.log(`Providers initialized: ${available.length} models available`);
-
-    // Kick off the health check scheduler
-    this.startHealthCheckScheduler();
  }

-  onModuleDestroy(): void {
-    if (this.healthCheckTimer !== null) {
-      clearInterval(this.healthCheckTimer);
-      this.healthCheckTimer = null;
-    }
-  }
-
-  // ---------------------------------------------------------------------------
-  // Health check scheduler
-  // ---------------------------------------------------------------------------
-
-  /**
-   * Start periodic health checks on all adapters.
-   * Interval is configurable via PROVIDER_HEALTH_INTERVAL env (seconds, default 60).
-   */
-  private startHealthCheckScheduler(): void {
-    const intervalSecs = this.effectiveHealthCheckIntervalSecs();
-    const intervalMs = intervalSecs * 1000;
-
-    // Run an initial check immediately (non-blocking)
-    void this.runScheduledHealthChecks();
-
-    this.healthCheckTimer = setInterval(() => {
-      void this.runScheduledHealthChecks();
-    }, intervalMs);
-
-    this.logger.log(`Provider health check scheduler started (interval: ${intervalSecs}s)`);
-  }
-
-  private async runScheduledHealthChecks(): Promise<void> {
-    for (const adapter of this.adapters) {
-      try {
-        const health = await adapter.healthCheck();
-        const modelCount = adapter.listModels().length;
-        this.healthCache.set(adapter.name, { ...health, modelCount });
-        this.logger.debug(
-          `Health check [${adapter.name}]: ${health.status} (${health.latencyMs ?? 'n/a'}ms)`,
-        );
-      } catch (err) {
-        const modelCount = adapter.listModels().length;
-        this.healthCache.set(adapter.name, {
-          status: 'down',
-          lastChecked: new Date().toISOString(),
-          error: err instanceof Error ? err.message : String(err),
-          modelCount,
-        });
-      }
-    }
-  }
-
-  /**
-   * Return the cached health status for all adapters.
-   * Format: array of { name, status, latencyMs, lastChecked, modelCount }
-   */
-  getProvidersHealth(): Array<{
-    name: string;
-    status: string;
-    latencyMs?: number;
-    lastChecked: string;
-    modelCount: number;
-    error?: string;
-  }> {
-    return this.adapters.map((adapter) => {
-      const cached = this.healthCache.get(adapter.name);
-      if (cached) {
-        return {
-          name: adapter.name,
-          status: cached.status,
-          latencyMs: cached.latencyMs,
-          lastChecked: cached.lastChecked,
-          modelCount: cached.modelCount,
-          error: cached.error,
-        };
-      }
-      // Not yet checked — return a pending placeholder
-      return {
-        name: adapter.name,
-        status: 'unknown',
-        lastChecked: new Date().toISOString(),
-        modelCount: adapter.listModels().length,
-      };
-    });
-  }
-
-  /**
-   * Returns the effective provider operational policy without credentials,
-   * endpoints, request content, or provider error details.
-   */
-  getEffectivePolicyStatus(): {
-    healthCheckIntervalSecs: number;
-    configuredProviders: string[];
-    availableModelCount: number;
-  } {
-    return {
-      healthCheckIntervalSecs: this.effectiveHealthCheckIntervalSecs(),
-      configuredProviders: this.adapters.map((adapter) => adapter.name),
-      availableModelCount: this.registry?.getAvailable().length ?? 0,
-    };
-  }
-
-  private effectiveHealthCheckIntervalSecs(): number {
-    return (
-      parseInt(process.env['PROVIDER_HEALTH_INTERVAL'] ?? '', 10) || DEFAULT_HEALTH_INTERVAL_SECS
-    );
-  }
-
-  // ---------------------------------------------------------------------------
-  // Adapter-pattern API
-  // ---------------------------------------------------------------------------
-
-  /**
-   * Call register() on each adapter in order.
-   * Errors from individual adapters are logged and do not abort the others.
-   */
-  async registerAll(): Promise<void> {
-    for (const adapter of this.adapters) {
-      try {
-        await adapter.register();
-      } catch (err) {
-        this.logger.error(
-          `Adapter "${adapter.name}" registration failed`,
-          err instanceof Error ? err.stack : String(err),
-        );
-      }
-    }
-  }
-
-  /**
-   * Return the adapter registered under the given provider name, or undefined.
-   */
-  getAdapter(providerName: string): IProviderAdapter | undefined {
-    return this.adapters.find((a) => a.name === providerName);
-  }
-
-  /**
-   * Run healthCheck() on all adapters and return results keyed by provider name.
-   */
-  async healthCheckAll(): Promise<Record<string, ProviderHealth>> {
-    const results: Record<string, ProviderHealth> = {};
-    await Promise.all(
-      this.adapters.map(async (adapter) => {
-        try {
-          results[adapter.name] = await adapter.healthCheck();
-        } catch (err) {
-          results[adapter.name] = {
-            status: 'down',
-            lastChecked: new Date().toISOString(),
-            error: err instanceof Error ? err.message : String(err),
-          };
-        }
-      }),
-    );
-    return results;
-  }
-
-  // ---------------------------------------------------------------------------
-  // Legacy / Pi-SDK-facing API (preserved for AgentService and RoutingService)
-  // ---------------------------------------------------------------------------
-
  getRegistry(): ModelRegistry {
    return this.registry;
  }
@@ -296,18 +66,6 @@ export class ProviderService implements OnModuleInit, OnModuleDestroy {
  }

  async testConnection(providerId: string, baseUrl?: string): Promise<TestConnectionResultDto> {
-    // Delegate to the adapter when one exists and no URL override is given
-    const adapter = this.getAdapter(providerId);
-    if (adapter && !baseUrl) {
-      const health = await adapter.healthCheck();
-      return {
-        providerId,
-        reachable: health.status !== 'down',
-        latencyMs: health.latencyMs,
-        error: health.error,
-      };
-    }
-
    // Resolve baseUrl: explicit override > registered provider > ollama env
    let resolvedUrl = baseUrl;

@@ -382,9 +140,35 @@ export class ProviderService implements OnModuleInit, OnModuleDestroy {
    this.logger.log(`Registered custom provider: ${config.id} (${config.models.length} models)`);
  }

-  // ---------------------------------------------------------------------------
-  // Private helpers
-  // ---------------------------------------------------------------------------
+  private registerOllamaProvider(): void {
+    const ollamaUrl = process.env['OLLAMA_BASE_URL'] ?? process.env['OLLAMA_HOST'];
+    if (!ollamaUrl) return;
+
+    const modelsEnv = process.env['OLLAMA_MODELS'] ?? 'llama3.2,codellama,mistral';
+    const modelIds = modelsEnv
+      .split(',')
+      .map((modelId: string) => modelId.trim())
+      .filter(Boolean);
+
+    this.registry.registerProvider('ollama', {
+      baseUrl: `${ollamaUrl}/v1`,
+      apiKey: 'ollama',
+      api: 'openai-completions' as never,
+      models: modelIds.map((id) => ({
+        id,
+        name: id,
+        reasoning: false,
+        input: ['text'] as ('text' | 'image')[],
+        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+        contextWindow: 8192,
+        maxTokens: 4096,
+      })),
+    });
+
+    this.logger.log(
+      `Ollama provider registered at ${ollamaUrl} with models: ${modelIds.join(', ')}`,
+    );
+  }

  private registerCustomProviders(): void {
    const customJson = process.env['MOSAIC_CUSTOM_PROVIDERS'];
@@ -400,42 +184,6 @@ export class ProviderService implements OnModuleInit, OnModuleDestroy {
    }
  }

-  /**
-   * Resolve an API key for a provider, scoped to a specific user.
-   * User-stored credentials take precedence over environment variables.
-   * Returns null if no key is available from either source.
-   */
-  async resolveApiKey(userId: string, provider: string): Promise<string | null> {
-    if (this.credentialsService) {
-      const userKey = await this.credentialsService.retrieve(userId, provider);
-      if (userKey) {
-        this.logger.debug(`Using user-scoped credential for user=${userId} provider=${provider}`);
-        return userKey;
-      }
-    }
-
-    // Fall back to environment variable
-    const envVar = PROVIDER_ENV_KEYS[provider];
-    const envKey = envVar ? (process.env[envVar] ?? null) : null;
-    if (envKey) {
-      this.logger.debug(`Using env-var credential for provider=${provider}`);
-    }
-    return envKey;
-  }
-
-  private cloneBuiltInModel(
-    provider: string,
-    modelId: string,
-    overrides: Partial<Model<Api>> = {},
-  ): Model<Api> {
-    const model = getModel(provider as never, modelId as never) as Model<Api> | undefined;
-    if (!model) {
-      throw new Error(`Built-in model not found: ${provider}:${modelId}`);
-    }
-
-    return { ...model, ...overrides };
-  }
-
  private toModelInfo(model: Model<Api>): ModelInfo {
    return {
      id: model.id,
--- a/apps/gateway/src/agent/providers.controller.test.ts
+++ b/apps/gateway/src/agent/providers.controller.test.ts
@@ -1,46 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { ProvidersController } from './providers.controller.js';
-
-describe('ProvidersController operational status', (): void => {
-  it('reports provider latency and effective policy without exposing provider error details', (): void => {
-    const providerService = {
-      getProvidersHealth: vi.fn(() => [
-        {
-          name: 'fleet',
-          status: 'down',
-          latencyMs: 42,
-          lastChecked: '2026-07-12T00:00:00.000Z',
-          modelCount: 0,
-          error: 'credential-canary=secret-value',
-        },
-      ]),
-      getEffectivePolicyStatus: vi.fn(() => ({
-        healthCheckIntervalSecs: 60,
-        configuredProviders: ['fleet'],
-        availableModelCount: 0,
-      })),
-    };
-    const controller = new ProvidersController(providerService as never, {} as never, {} as never);
-
-    const status = controller.status();
-
-    expect(status).toEqual({
-      providers: [
-        {
-          name: 'fleet',
-          status: 'down',
-          latencyMs: 42,
-          lastChecked: '2026-07-12T00:00:00.000Z',
-          modelCount: 0,
-          errorCode: 'provider_unavailable',
-        },
-      ],
-      effectivePolicy: {
-        healthCheckIntervalSecs: 60,
-        configuredProviders: ['fleet'],
-        availableModelCount: 0,
-      },
-    });
-    expect(JSON.stringify(status)).not.toContain('secret-value');
-  });
-});
--- a/apps/gateway/src/agent/providers.controller.ts
+++ b/apps/gateway/src/agent/providers.controller.ts
@@ -1,23 +1,15 @@
-import { Body, Controller, Delete, Get, Inject, Param, Post, UseGuards } from '@nestjs/common';
-import type { RoutingCriteria } from '@mosaicstack/types';
+import { Body, Controller, Get, Inject, Post, UseGuards } from '@nestjs/common';
+import type { RoutingCriteria } from '@mosaic/types';
 import { AuthGuard } from '../auth/auth.guard.js';
-import { CurrentUser } from '../auth/current-user.decorator.js';
 import { ProviderService } from './provider.service.js';
-import { ProviderCredentialsService } from './provider-credentials.service.js';
 import { RoutingService } from './routing.service.js';
 import type { TestConnectionDto, TestConnectionResultDto } from './provider.dto.js';
-import type {
-  StoreCredentialDto,
-  ProviderCredentialSummaryDto,
-} from './provider-credentials.dto.js';

@Controller('api/providers')
@UseGuards(AuthGuard)
 export class ProvidersController {
  constructor(
    @Inject(ProviderService) private readonly providerService: ProviderService,
-    @Inject(ProviderCredentialsService)
-    private readonly credentialsService: ProviderCredentialsService,
    @Inject(RoutingService) private readonly routingService: RoutingService,
  ) {}

@@ -31,24 +23,6 @@ export class ProvidersController {
    return this.providerService.listAvailableModels();
  }

-  @Get('health')
-  health() {
-    return { providers: this.safeProviderHealth() };
-  }
-
-  /**
-   * Safe operational status for troubleshooting and readiness checks. Provider
-   * errors are reduced to a stable code so credentials and remote responses
-   * cannot leak through this endpoint.
-   */
-  @Get('status')
-  status() {
-    return {
-      providers: this.safeProviderHealth(),
-      effectivePolicy: this.providerService.getEffectivePolicyStatus(),
-    };
-  }
-
  @Post('test')
  testConnection(@Body() body: TestConnectionDto): Promise<TestConnectionResultDto> {
    return this.providerService.testConnection(body.providerId, body.baseUrl);
@@ -63,56 +37,4 @@ export class ProvidersController {
  rank(@Body() criteria: RoutingCriteria) {
    return this.routingService.rank(criteria);
  }
-
-  private safeProviderHealth() {
-    return this.providerService.getProvidersHealth().map(({ error, ...provider }) => ({
-      ...provider,
-      ...(error ? { errorCode: 'provider_unavailable' } : {}),
-    }));
-  }
-
-  // ── Credential CRUD ──────────────────────────────────────────────────────
-
-  /**
-   * GET /api/providers/credentials
-   * List all provider credentials for the authenticated user.
-   * Returns provider names, types, and metadata — never decrypted values.
-   */
-  @Get('credentials')
-  listCredentials(@CurrentUser() user: { id: string }): Promise<ProviderCredentialSummaryDto[]> {
-    return this.credentialsService.listProviders(user.id);
-  }
-
-  /**
-   * POST /api/providers/credentials
-   * Store or update a provider credential for the authenticated user.
-   * The value is encrypted before storage and never returned.
-   */
-  @Post('credentials')
-  async storeCredential(
-    @CurrentUser() user: { id: string },
-    @Body() body: StoreCredentialDto,
-  ): Promise<{ success: boolean; provider: string }> {
-    await this.credentialsService.store(
-      user.id,
-      body.provider,
-      body.type,
-      body.value,
-      body.metadata,
-    );
-    return { success: true, provider: body.provider };
-  }
-
-  /**
-   * DELETE /api/providers/credentials/:provider
-   * Remove a stored credential for the authenticated user.
-   */
-  @Delete('credentials/:provider')
-  async removeCredential(
-    @CurrentUser() user: { id: string },
-    @Param('provider') provider: string,
-  ): Promise<{ success: boolean; provider: string }> {
-    await this.credentialsService.remove(user.id, provider);
-    return { success: true, provider };
-  }
 }
--- a/apps/gateway/src/agent/routing.service.ts
+++ b/apps/gateway/src/agent/routing.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
-import type { ModelInfo } from '@mosaicstack/types';
-import type { RoutingCriteria, RoutingResult, CostTier } from '@mosaicstack/types';
+import type { ModelInfo } from '@mosaic/types';
+import type { RoutingCriteria, RoutingResult, CostTier } from '@mosaic/types';
 import { ProviderService } from './provider.service.js';

 /** Per-million-token cost thresholds for tier classification */
@@ -8,8 +8,6 @@ const COST_TIER_THRESHOLDS: Record<CostTier, { maxInput: number }> = {
  cheap: { maxInput: 1 },
  standard: { maxInput: 10 },
  premium: { maxInput: Infinity },
-  // local = self-hosted; treat as cheapest tier for cost scoring purposes
-  local: { maxInput: 0 },
 };

@Injectable()
--- a/apps/gateway/src/agent/routing/default-rules.ts
+++ b/apps/gateway/src/agent/routing/default-rules.ts
@@ -1,138 +0,0 @@
-import { Inject, Injectable, Logger, type OnModuleInit } from '@nestjs/common';
-import { routingRules, type Db, sql } from '@mosaicstack/db';
-import { DB } from '../../database/database.module.js';
-import type { RoutingCondition, RoutingAction } from './routing.types.js';
-
-/** Seed-time routing rule descriptor */
-interface RoutingRuleSeed {
-  name: string;
-  priority: number;
-  conditions: RoutingCondition[];
-  action: RoutingAction;
-}
-
-export const DEFAULT_ROUTING_RULES: RoutingRuleSeed[] = [
-  {
-    name: 'Complex coding → Opus',
-    priority: 1,
-    conditions: [
-      { field: 'taskType', operator: 'eq', value: 'coding' },
-      { field: 'complexity', operator: 'eq', value: 'complex' },
-    ],
-    action: { provider: 'anthropic', model: 'claude-opus-4-6' },
-  },
-  {
-    name: 'Moderate coding → Sonnet',
-    priority: 2,
-    conditions: [
-      { field: 'taskType', operator: 'eq', value: 'coding' },
-      { field: 'complexity', operator: 'eq', value: 'moderate' },
-    ],
-    action: { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-  },
-  {
-    name: 'Simple coding → Codex',
-    priority: 3,
-    conditions: [
-      { field: 'taskType', operator: 'eq', value: 'coding' },
-      { field: 'complexity', operator: 'eq', value: 'simple' },
-    ],
-    action: { provider: 'openai', model: 'codex-gpt-5-4' },
-  },
-  {
-    name: 'Research → Codex',
-    priority: 4,
-    conditions: [{ field: 'taskType', operator: 'eq', value: 'research' }],
-    action: { provider: 'openai', model: 'codex-gpt-5-4' },
-  },
-  {
-    name: 'Summarization → GLM-5',
-    priority: 5,
-    conditions: [{ field: 'taskType', operator: 'eq', value: 'summarization' }],
-    action: { provider: 'zai', model: 'glm-5' },
-  },
-  {
-    name: 'Analysis with reasoning → Opus',
-    priority: 6,
-    conditions: [
-      { field: 'taskType', operator: 'eq', value: 'analysis' },
-      { field: 'requiredCapabilities', operator: 'includes', value: 'reasoning' },
-    ],
-    action: { provider: 'anthropic', model: 'claude-opus-4-6' },
-  },
-  {
-    name: 'Conversation → Sonnet',
-    priority: 7,
-    conditions: [{ field: 'taskType', operator: 'eq', value: 'conversation' }],
-    action: { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-  },
-  {
-    name: 'Creative → Sonnet',
-    priority: 8,
-    conditions: [{ field: 'taskType', operator: 'eq', value: 'creative' }],
-    action: { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-  },
-  {
-    name: 'Cheap/general → Haiku',
-    priority: 9,
-    conditions: [{ field: 'costTier', operator: 'eq', value: 'cheap' }],
-    action: { provider: 'anthropic', model: 'claude-haiku-4-5' },
-  },
-  {
-    name: 'Fallback → Sonnet',
-    priority: 10,
-    conditions: [],
-    action: { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-  },
-  {
-    name: 'Offline → Ollama',
-    priority: 99,
-    conditions: [{ field: 'costTier', operator: 'eq', value: 'local' }],
-    action: { provider: 'ollama', model: 'llama3.2' },
-  },
-];
-
-@Injectable()
-export class DefaultRoutingRulesSeed implements OnModuleInit {
-  private readonly logger = new Logger(DefaultRoutingRulesSeed.name);
-
-  constructor(@Inject(DB) private readonly db: Db) {}
-
-  async onModuleInit(): Promise<void> {
-    await this.seedDefaultRules();
-  }
-
-  /**
-   * Insert default routing rules into the database if the table is empty.
-   * Skips seeding if any system-scoped rules already exist.
-   */
-  async seedDefaultRules(): Promise<void> {
-    const rows = await this.db
-      .select({ count: sql<number>`count(*)::int` })
-      .from(routingRules)
-      .where(sql`scope = 'system'`);
-
-    const count = rows[0]?.count ?? 0;
-    if (count > 0) {
-      this.logger.debug(
-        `Skipping default routing rules seed — ${count} system rule(s) already exist`,
-      );
-      return;
-    }
-
-    this.logger.log(`Seeding ${DEFAULT_ROUTING_RULES.length} default routing rules`);
-
-    await this.db.insert(routingRules).values(
-      DEFAULT_ROUTING_RULES.map((rule) => ({
-        name: rule.name,
-        priority: rule.priority,
-        scope: 'system' as const,
-        conditions: rule.conditions as unknown as Record<string, unknown>[],
-        action: rule.action as unknown as Record<string, unknown>,
-        enabled: true,
-      })),
-    );
-
-    this.logger.log('Default routing rules seeded successfully');
-  }
-}
--- a/apps/gateway/src/agent/routing/routing-e2e.test.ts
+++ b/apps/gateway/src/agent/routing/routing-e2e.test.ts
@@ -1,260 +0,0 @@
-/**
- * M4-013: Routing end-to-end integration tests.
- *
- * These tests exercise the full pipeline:
- *   classifyTask (task-classifier) → matchConditions (routing-engine) → RoutingDecision
- *
- * All tests use a mocked DB (rule store) and mocked ProviderService (health map)
- * to avoid real I/O — they verify the complete classify → match → decide path.
- */
-import { describe, it, expect, vi } from 'vitest';
-import { RoutingEngineService } from './routing-engine.service.js';
-import { DEFAULT_ROUTING_RULES } from '../routing/default-rules.js';
-import type { RoutingRule } from './routing.types.js';
-
-// ─── Test helpers ─────────────────────────────────────────────────────────────
-
-/** Build a RoutingEngineService backed by the given rule set and health map. */
-function makeService(
-  rules: RoutingRule[],
-  healthMap: Record<string, { status: string }>,
-): RoutingEngineService {
-  const mockDb = {
-    select: vi.fn().mockReturnValue({
-      from: vi.fn().mockReturnValue({
-        where: vi.fn().mockReturnValue({
-          orderBy: vi.fn().mockResolvedValue(
-            rules.map((r) => ({
-              id: r.id,
-              name: r.name,
-              priority: r.priority,
-              scope: r.scope,
-              userId: r.userId ?? null,
-              conditions: r.conditions,
-              action: r.action,
-              enabled: r.enabled,
-              createdAt: new Date(),
-              updatedAt: new Date(),
-            })),
-          ),
-        }),
-      }),
-    }),
-  };
-
-  const mockProviderService = {
-    healthCheckAll: vi.fn().mockResolvedValue(healthMap),
-  };
-
-  return new (RoutingEngineService as unknown as new (
-    db: unknown,
-    ps: unknown,
-  ) => RoutingEngineService)(mockDb, mockProviderService);
-}
-
-/**
- * Convert DEFAULT_ROUTING_RULES (seed format, no id) to RoutingRule objects
- * so we can use them in tests.
- */
-function defaultRules(): RoutingRule[] {
-  return DEFAULT_ROUTING_RULES.map((r, i) => ({
-    id: `rule-${i + 1}`,
-    scope: 'system' as const,
-    userId: undefined,
-    enabled: true,
-    ...r,
-  }));
-}
-
-/** A health map where anthropic, openai, and zai are all healthy. */
-const allHealthy: Record<string, { status: string }> = {
-  anthropic: { status: 'up' },
-  openai: { status: 'up' },
-  zai: { status: 'up' },
-  ollama: { status: 'up' },
-};
-
-// ─── M4-013 E2E tests ─────────────────────────────────────────────────────────
-
-describe('M4-013: routing end-to-end pipeline', () => {
-  // Test 1: coding message → should route to Opus (complex coding rule)
-  it('coding message routes to Opus via task classifier + routing rules', async () => {
-    // Use a message that classifies as coding + complex
-    // "architecture" triggers complex; "implement" triggers coding
-    const message =
-      'Implement an architecture for a multi-tenant system with database isolation and role-based access control. The system needs to support multiple organizations.';
-
-    const service = makeService(defaultRules(), allHealthy);
-    const decision = await service.resolve(message);
-
-    // Classifier should detect: taskType=coding, complexity=complex
-    // That matches "Complex coding → Opus" rule at priority 1
-    expect(decision.provider).toBe('anthropic');
-    expect(decision.model).toBe('claude-opus-4-6');
-    expect(decision.ruleName).toBe('Complex coding → Opus');
-  });
-
-  // Test 2: "Summarize this" → routes to GLM-5
-  it('"Summarize this" routes to GLM-5 via summarization rule', async () => {
-    const message = 'Summarize this document for me please';
-
-    const service = makeService(defaultRules(), allHealthy);
-    const decision = await service.resolve(message);
-
-    // Classifier should detect: taskType=summarization
-    // Matches "Summarization → GLM-5" rule (priority 5)
-    expect(decision.provider).toBe('zai');
-    expect(decision.model).toBe('glm-5');
-    expect(decision.ruleName).toBe('Summarization → GLM-5');
-  });
-
-  // Test 3: simple question → routes to cheap tier (Haiku)
-  // Note: the "Cheap/general → Haiku" rule uses costTier=cheap condition.
-  // Since costTier is not part of TaskClassification (it's a request-level field),
-  // it won't auto-match. Instead we test that a simple conversation falls through
-  // to the "Conversation → Sonnet" rule — which IS the cheap-tier routing path
-  // for simple conversational questions.
-  // We also verify that routing using a user-scoped cheap-tier rule overrides correctly.
-  it('simple conversational question routes to Sonnet (conversation rule)', async () => {
-    const message = 'What time is it?';
-
-    const service = makeService(defaultRules(), allHealthy);
-    const decision = await service.resolve(message);
-
-    // Classifier: taskType=conversation (no strong signals), complexity=simple
-    // Matches "Conversation → Sonnet" rule (priority 7)
-    expect(decision.provider).toBe('anthropic');
-    expect(decision.model).toBe('claude-sonnet-4-6');
-    expect(decision.ruleName).toBe('Conversation → Sonnet');
-  });
-
-  // Test 3b: explicit cheap-tier rule via user-scoped override
-  it('cheap-tier rule routes to Haiku when costTier=cheap condition matches', async () => {
-    // Build a cheap-tier user rule that has a conversation condition overlapping
-    // with what we send, but give it lower priority so we can test explicitly
-    const cheapRule: RoutingRule = {
-      id: 'cheap-rule-1',
-      name: 'Cheap/general → Haiku',
-      priority: 1,
-      scope: 'system',
-      enabled: true,
-      // This rule matches any simple conversation when costTier is set by the resolver.
-      // We test the rule condition matching directly here:
-      conditions: [{ field: 'taskType', operator: 'eq', value: 'conversation' }],
-      action: { provider: 'anthropic', model: 'claude-haiku-4-5' },
-    };
-
-    const service = makeService([cheapRule], allHealthy);
-    const decision = await service.resolve('Hello, how are you doing today?');
-
-    // Simple greeting → conversation → matches cheapRule → Haiku
-    expect(decision.provider).toBe('anthropic');
-    expect(decision.model).toBe('claude-haiku-4-5');
-    expect(decision.ruleName).toBe('Cheap/general → Haiku');
-  });
-
-  // Test 4: /model override bypasses routing
-  // This test verifies that when a model override is set (stored in chatGateway.modelOverrides),
-  // the routing engine is NOT called. We simulate this by verifying that the routing engine
-  // service is not consulted when the override path is taken.
-  it('/model override bypasses routing engine (no classify → route call)', async () => {
-    // Build a service that would route to Opus for a coding message
-    const mockHealthCheckAll = vi.fn().mockResolvedValue(allHealthy);
-    const mockSelect = vi.fn();
-    const mockDb = {
-      select: mockSelect.mockReturnValue({
-        from: vi.fn().mockReturnValue({
-          where: vi.fn().mockReturnValue({
-            orderBy: vi.fn().mockResolvedValue(defaultRules()),
-          }),
-        }),
-      }),
-    };
-    const mockProviderService = { healthCheckAll: mockHealthCheckAll };
-
-    const service = new (RoutingEngineService as unknown as new (
-      db: unknown,
-      ps: unknown,
-    ) => RoutingEngineService)(mockDb, mockProviderService);
-
-    // Simulate the ChatGateway model-override logic:
-    // When a /model override exists, the gateway skips calling routingEngine.resolve().
-    // We verify this by checking that if we do NOT call resolve(), the DB is never queried.
-    // (This is the same guarantee the ChatGateway code provides.)
-    expect(mockSelect).not.toHaveBeenCalled();
-    expect(mockHealthCheckAll).not.toHaveBeenCalled();
-
-    // Now if we DO call resolve (no override), it hits the DB and health check
-    await service.resolve('implement a function');
-    expect(mockSelect).toHaveBeenCalled();
-    expect(mockHealthCheckAll).toHaveBeenCalled();
-  });
-
-  // Test 5: full pipeline classification accuracy — "Summarize this" message
-  it('full pipeline: classify → match rules → summarization decision', async () => {
-    const message = 'Can you give me a brief summary of the last meeting notes?';
-
-    const service = makeService(defaultRules(), allHealthy);
-    const decision = await service.resolve(message);
-
-    // "brief" keyword → summarization; "brief" is < 100 chars... check length
-    // message length is ~68 chars → simple complexity but summarization type wins
-    expect(decision.ruleName).toBe('Summarization → GLM-5');
-    expect(decision.provider).toBe('zai');
-    expect(decision.model).toBe('glm-5');
-    expect(decision.reason).toContain('Summarization → GLM-5');
-  });
-
-  // Test 6: pipeline with unhealthy provider — falls through to fallback
-  it('when all matched rule providers are unhealthy, falls through to openai fallback', async () => {
-    // The message classifies as: taskType=coding, complexity=moderate (implement + no architecture keyword,
-    // moderate length ~60 chars → simple threshold is < 100 → actually simple since it is < 100 chars)
-    // Let's use a simple coding message to target Simple coding → Codex (openai)
-    const message = 'implement a sort function';
-
-    const unhealthyHealth = {
-      anthropic: { status: 'down' },
-      openai: { status: 'up' },
-      zai: { status: 'up' },
-      ollama: { status: 'down' },
-    };
-
-    const service = makeService(defaultRules(), unhealthyHealth);
-    const decision = await service.resolve(message);
-
-    // "implement" → coding; 26 chars → simple; so: coding+simple → "Simple coding → Codex" (openai)
-    // openai is up → should match
-    expect(decision.provider).toBe('openai');
-    expect(decision.model).toBe('codex-gpt-5-4');
-  });
-
-  // Test 7: research message routing
-  it('research message routes to Codex via research rule', async () => {
-    const message = 'Research the best approaches for distributed caching systems';
-
-    const service = makeService(defaultRules(), allHealthy);
-    const decision = await service.resolve(message);
-
-    // "research" keyword → taskType=research → "Research → Codex" rule (priority 4)
-    expect(decision.ruleName).toBe('Research → Codex');
-    expect(decision.provider).toBe('openai');
-    expect(decision.model).toBe('codex-gpt-5-4');
-  });
-
-  // Test 8: full pipeline integrity — decision includes all required fields
-  it('routing decision includes provider, model, ruleName, and reason', async () => {
-    const message = 'implement a new feature';
-
-    const service = makeService(defaultRules(), allHealthy);
-    const decision = await service.resolve(message);
-
-    expect(decision).toHaveProperty('provider');
-    expect(decision).toHaveProperty('model');
-    expect(decision).toHaveProperty('ruleName');
-    expect(decision).toHaveProperty('reason');
-    expect(typeof decision.provider).toBe('string');
-    expect(typeof decision.model).toBe('string');
-    expect(typeof decision.ruleName).toBe('string');
-    expect(typeof decision.reason).toBe('string');
-  });
-});
--- a/apps/gateway/src/agent/routing/routing-engine.service.ts
+++ b/apps/gateway/src/agent/routing/routing-engine.service.ts
@@ -1,216 +0,0 @@
-import { Inject, Injectable, Logger } from '@nestjs/common';
-import { routingRules, type Db, and, asc, eq, or } from '@mosaicstack/db';
-import { DB } from '../../database/database.module.js';
-import { ProviderService } from '../provider.service.js';
-import { classifyTask } from './task-classifier.js';
-import type {
-  RoutingCondition,
-  RoutingRule,
-  RoutingDecision,
-  TaskClassification,
-} from './routing.types.js';
-
-// ─── Injection tokens ────────────────────────────────────────────────────────
-
-export const PROVIDER_SERVICE = Symbol('ProviderService');
-
-// ─── Fallback chain ──────────────────────────────────────────────────────────
-
-/**
- * Ordered fallback providers tried when no rule matches or all matched
- * providers are unhealthy.
- */
-const FALLBACK_CHAIN: Array<{ provider: string; model: string }> = [
-  { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-  { provider: 'anthropic', model: 'claude-haiku-4-5' },
-  { provider: 'ollama', model: 'llama3.2' },
-];
-
-// ─── Service ─────────────────────────────────────────────────────────────────
-
-@Injectable()
-export class RoutingEngineService {
-  private readonly logger = new Logger(RoutingEngineService.name);
-
-  constructor(
-    @Inject(DB) private readonly db: Db,
-    @Inject(ProviderService) private readonly providerService: ProviderService,
-  ) {}
-
-  /**
-   * Classify the message, evaluate routing rules in priority order, and return
-   * the best routing decision.
-   *
-   * @param message       - Raw user message text used for classification.
-   * @param userId        - Optional user ID for loading user-scoped rules.
-   * @param availableProviders - Optional pre-fetched provider health map to
-   *                       avoid redundant health checks inside tight loops.
-   */
-  async resolve(
-    message: string,
-    userId?: string,
-    availableProviders?: Record<string, { status: string }>,
-  ): Promise<RoutingDecision> {
-    const classification = classifyTask(message);
-    this.logger.debug(
-      `Classification: taskType=${classification.taskType} complexity=${classification.complexity} domain=${classification.domain}`,
-    );
-
-    // Load health data once (re-use caller-supplied map if provided)
-    const health = availableProviders ?? (await this.providerService.healthCheckAll());
-
-    // Load all applicable rules ordered by priority
-    const rules = await this.loadRules(userId);
-
-    // Evaluate rules in priority order
-    for (const rule of rules) {
-      if (!rule.enabled) continue;
-
-      if (!this.matchConditions(rule, classification)) continue;
-
-      const providerStatus = health[rule.action.provider]?.status;
-      const isHealthy = providerStatus === 'up' || providerStatus === 'ok';
-
-      if (!isHealthy) {
-        this.logger.debug(
-          `Rule "${rule.name}" matched but provider "${rule.action.provider}" is unhealthy (status: ${providerStatus ?? 'unknown'})`,
-        );
-        continue;
-      }
-
-      this.logger.debug(
-        `Rule matched: "${rule.name}" → ${rule.action.provider}/${rule.action.model}`,
-      );
-
-      return {
-        provider: rule.action.provider,
-        model: rule.action.model,
-        agentConfigId: rule.action.agentConfigId,
-        ruleName: rule.name,
-        reason: `Matched routing rule "${rule.name}"`,
-      };
-    }
-
-    // No rule matched (or all matched providers were unhealthy) — apply fallback chain
-    this.logger.debug('No rule matched; applying fallback chain');
-    return this.applyFallbackChain(health);
-  }
-
-  /**
-   * Check whether all conditions of a rule match the given task classification.
-   * An empty conditions array always matches (catch-all / fallback rule).
-   */
-  matchConditions(
-    rule: Pick<RoutingRule, 'conditions'>,
-    classification: TaskClassification,
-  ): boolean {
-    if (rule.conditions.length === 0) return true;
-
-    return rule.conditions.every((condition) => this.evaluateCondition(condition, classification));
-  }
-
-  // ─── Private helpers ───────────────────────────────────────────────────────
-
-  private evaluateCondition(
-    condition: RoutingCondition,
-    classification: TaskClassification,
-  ): boolean {
-    // `costTier` is a valid condition field but is not part of TaskClassification
-    // (it is supplied via userOverrides / request context). Treat unknown fields as
-    // undefined so conditions referencing them simply do not match.
-    const fieldValue = (classification as unknown as Record<string, unknown>)[condition.field];
-
-    switch (condition.operator) {
-      case 'eq': {
-        // Scalar equality: field value must equal condition value (string)
-        if (typeof condition.value !== 'string') return false;
-        return fieldValue === condition.value;
-      }
-
-      case 'in': {
-        // Set membership: condition value (array) contains field value
-        if (!Array.isArray(condition.value)) return false;
-        return condition.value.includes(fieldValue as string);
-      }
-
-      case 'includes': {
-        // Array containment: field value (array) includes condition value (string)
-        if (!Array.isArray(fieldValue)) return false;
-        if (typeof condition.value !== 'string') return false;
-        return (fieldValue as string[]).includes(condition.value);
-      }
-
-      default:
-        return false;
-    }
-  }
-
-  /**
-   * Load routing rules from the database.
-   * System rules + user-scoped rules (when userId is provided) are returned,
-   * ordered by priority ascending.
-   */
-  private async loadRules(userId?: string): Promise<RoutingRule[]> {
-    const whereClause = userId
-      ? or(
-          eq(routingRules.scope, 'system'),
-          and(eq(routingRules.scope, 'user'), eq(routingRules.userId, userId)),
-        )
-      : eq(routingRules.scope, 'system');
-
-    const rows = await this.db
-      .select()
-      .from(routingRules)
-      .where(whereClause)
-      .orderBy(asc(routingRules.priority));
-
-    return rows.map((row) => ({
-      id: row.id,
-      name: row.name,
-      priority: row.priority,
-      scope: row.scope as 'system' | 'user',
-      userId: row.userId ?? undefined,
-      conditions: (row.conditions as unknown as RoutingCondition[]) ?? [],
-      action: row.action as unknown as {
-        provider: string;
-        model: string;
-        agentConfigId?: string;
-        systemPromptOverride?: string;
-        toolAllowlist?: string[];
-      },
-      enabled: row.enabled,
-    }));
-  }
-
-  /**
-   * Walk the fallback chain and return the first healthy provider/model pair.
-   * If none are healthy, return the first entry unconditionally (last resort).
-   */
-  private applyFallbackChain(health: Record<string, { status: string }>): RoutingDecision {
-    for (const candidate of FALLBACK_CHAIN) {
-      const providerStatus = health[candidate.provider]?.status;
-      const isHealthy = providerStatus === 'up' || providerStatus === 'ok';
-      if (isHealthy) {
-        this.logger.debug(`Fallback resolved: ${candidate.provider}/${candidate.model}`);
-        return {
-          provider: candidate.provider,
-          model: candidate.model,
-          ruleName: 'fallback',
-          reason: `Fallback chain — no matching rule; selected ${candidate.provider}/${candidate.model}`,
-        };
-      }
-    }
-
-    // All providers in the fallback chain are unhealthy — use the first entry
-    const lastResort = FALLBACK_CHAIN[0]!;
-    this.logger.warn(
-      `All fallback providers unhealthy; using last resort: ${lastResort.provider}/${lastResort.model}`,
-    );
-    return {
-      provider: lastResort.provider,
-      model: lastResort.model,
-      ruleName: 'fallback',
-      reason: `Fallback chain exhausted (all providers unhealthy); using ${lastResort.provider}/${lastResort.model}`,
-    };
-  }
-}
--- a/apps/gateway/src/agent/routing/routing-engine.test.ts
+++ b/apps/gateway/src/agent/routing/routing-engine.test.ts
@@ -1,460 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { RoutingEngineService } from './routing-engine.service.js';
-import type { RoutingRule, TaskClassification } from './routing.types.js';
-
-// ─── Helpers ─────────────────────────────────────────────────────────────────
-
-function makeRule(
-  overrides: Partial<RoutingRule> &
-    Pick<RoutingRule, 'name' | 'priority' | 'conditions' | 'action'>,
-): RoutingRule {
-  return {
-    id: overrides.id ?? crypto.randomUUID(),
-    scope: 'system',
-    enabled: true,
-    ...overrides,
-  };
-}
-
-function makeClassification(overrides: Partial<TaskClassification> = {}): TaskClassification {
-  return {
-    taskType: 'conversation',
-    complexity: 'simple',
-    domain: 'general',
-    requiredCapabilities: [],
-    ...overrides,
-  };
-}
-
-/** Build a minimal RoutingEngineService with mocked DB and ProviderService. */
-function makeService(
-  rules: RoutingRule[] = [],
-  healthMap: Record<string, { status: string }> = {},
-): RoutingEngineService {
-  const mockDb = {
-    select: vi.fn().mockReturnValue({
-      from: vi.fn().mockReturnValue({
-        where: vi.fn().mockReturnValue({
-          orderBy: vi.fn().mockResolvedValue(
-            rules.map((r) => ({
-              id: r.id,
-              name: r.name,
-              priority: r.priority,
-              scope: r.scope,
-              userId: r.userId ?? null,
-              conditions: r.conditions,
-              action: r.action,
-              enabled: r.enabled,
-              createdAt: new Date(),
-              updatedAt: new Date(),
-            })),
-          ),
-        }),
-      }),
-    }),
-  };
-
-  const mockProviderService = {
-    healthCheckAll: vi.fn().mockResolvedValue(healthMap),
-  };
-
-  // Inject mocked dependencies directly (bypass NestJS DI for unit tests)
-  const service = new (RoutingEngineService as unknown as new (
-    db: unknown,
-    ps: unknown,
-  ) => RoutingEngineService)(mockDb, mockProviderService);
-
-  return service;
-}
-
-// ─── matchConditions ──────────────────────────────────────────────────────────
-
-describe('RoutingEngineService.matchConditions', () => {
-  let service: RoutingEngineService;
-
-  beforeEach(() => {
-    service = makeService();
-  });
-
-  it('returns true for empty conditions array (catch-all rule)', () => {
-    const rule = makeRule({
-      name: 'fallback',
-      priority: 99,
-      conditions: [],
-      action: { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-    });
-    expect(service.matchConditions(rule, makeClassification())).toBe(true);
-  });
-
-  it('matches eq operator on scalar field', () => {
-    const rule = makeRule({
-      name: 'coding',
-      priority: 1,
-      conditions: [{ field: 'taskType', operator: 'eq', value: 'coding' }],
-      action: { provider: 'anthropic', model: 'claude-opus-4-6' },
-    });
-    expect(service.matchConditions(rule, makeClassification({ taskType: 'coding' }))).toBe(true);
-    expect(service.matchConditions(rule, makeClassification({ taskType: 'conversation' }))).toBe(
-      false,
-    );
-  });
-
-  it('matches in operator: field value is in the condition array', () => {
-    const rule = makeRule({
-      name: 'simple or moderate',
-      priority: 2,
-      conditions: [{ field: 'complexity', operator: 'in', value: ['simple', 'moderate'] }],
-      action: { provider: 'anthropic', model: 'claude-haiku-4-5' },
-    });
-    expect(service.matchConditions(rule, makeClassification({ complexity: 'simple' }))).toBe(true);
-    expect(service.matchConditions(rule, makeClassification({ complexity: 'moderate' }))).toBe(
-      true,
-    );
-    expect(service.matchConditions(rule, makeClassification({ complexity: 'complex' }))).toBe(
-      false,
-    );
-  });
-
-  it('matches includes operator: field array includes the condition value', () => {
-    const rule = makeRule({
-      name: 'reasoning required',
-      priority: 3,
-      conditions: [{ field: 'requiredCapabilities', operator: 'includes', value: 'reasoning' }],
-      action: { provider: 'anthropic', model: 'claude-opus-4-6' },
-    });
-    expect(
-      service.matchConditions(rule, makeClassification({ requiredCapabilities: ['reasoning'] })),
-    ).toBe(true);
-    expect(
-      service.matchConditions(
-        rule,
-        makeClassification({ requiredCapabilities: ['tools', 'reasoning'] }),
-      ),
-    ).toBe(true);
-    expect(
-      service.matchConditions(rule, makeClassification({ requiredCapabilities: ['tools'] })),
-    ).toBe(false);
-    expect(service.matchConditions(rule, makeClassification({ requiredCapabilities: [] }))).toBe(
-      false,
-    );
-  });
-
-  it('requires ALL conditions to match (AND logic)', () => {
-    const rule = makeRule({
-      name: 'complex coding',
-      priority: 1,
-      conditions: [
-        { field: 'taskType', operator: 'eq', value: 'coding' },
-        { field: 'complexity', operator: 'eq', value: 'complex' },
-      ],
-      action: { provider: 'anthropic', model: 'claude-opus-4-6' },
-    });
-
-    // Both match
-    expect(
-      service.matchConditions(
-        rule,
-        makeClassification({ taskType: 'coding', complexity: 'complex' }),
-      ),
-    ).toBe(true);
-
-    // Only one matches
-    expect(
-      service.matchConditions(
-        rule,
-        makeClassification({ taskType: 'coding', complexity: 'simple' }),
-      ),
-    ).toBe(false);
-
-    // Neither matches
-    expect(
-      service.matchConditions(
-        rule,
-        makeClassification({ taskType: 'conversation', complexity: 'simple' }),
-      ),
-    ).toBe(false);
-  });
-
-  it('returns false for eq when condition value is an array (type mismatch)', () => {
-    const rule = makeRule({
-      name: 'bad eq',
-      priority: 1,
-      conditions: [{ field: 'taskType', operator: 'eq', value: ['coding', 'research'] }],
-      action: { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-    });
-    expect(service.matchConditions(rule, makeClassification({ taskType: 'coding' }))).toBe(false);
-  });
-
-  it('returns false for includes when field is not an array', () => {
-    const rule = makeRule({
-      name: 'bad includes',
-      priority: 1,
-      conditions: [{ field: 'taskType', operator: 'includes', value: 'coding' }],
-      action: { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-    });
-    // taskType is a string, not an array — should be false
-    expect(service.matchConditions(rule, makeClassification({ taskType: 'coding' }))).toBe(false);
-  });
-});
-
-// ─── resolve — priority ordering ─────────────────────────────────────────────
-
-describe('RoutingEngineService.resolve — priority ordering', () => {
-  it('selects the highest-priority matching rule', async () => {
-    // Rules are supplied in priority-ascending order, as the DB would return them.
-    const rules = [
-      makeRule({
-        name: 'high priority',
-        priority: 1,
-        conditions: [{ field: 'taskType', operator: 'eq', value: 'coding' }],
-        action: { provider: 'anthropic', model: 'claude-opus-4-6' },
-      }),
-      makeRule({
-        name: 'low priority',
-        priority: 10,
-        conditions: [{ field: 'taskType', operator: 'eq', value: 'coding' }],
-        action: { provider: 'openai', model: 'gpt-4o' },
-      }),
-    ];
-
-    const service = makeService(rules, { anthropic: { status: 'up' }, openai: { status: 'up' } });
-
-    const decision = await service.resolve('implement a function');
-    expect(decision.ruleName).toBe('high priority');
-    expect(decision.provider).toBe('anthropic');
-    expect(decision.model).toBe('claude-opus-4-6');
-  });
-
-  it('skips non-matching rules and picks first match', async () => {
-    const rules = [
-      makeRule({
-        name: 'research rule',
-        priority: 1,
-        conditions: [{ field: 'taskType', operator: 'eq', value: 'research' }],
-        action: { provider: 'openai', model: 'gpt-4o' },
-      }),
-      makeRule({
-        name: 'coding rule',
-        priority: 2,
-        conditions: [{ field: 'taskType', operator: 'eq', value: 'coding' }],
-        action: { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-      }),
-    ];
-
-    const service = makeService(rules, { anthropic: { status: 'up' }, openai: { status: 'up' } });
-
-    const decision = await service.resolve('implement a function');
-    expect(decision.ruleName).toBe('coding rule');
-    expect(decision.provider).toBe('anthropic');
-  });
-});
-
-// ─── resolve — unhealthy provider fallback ────────────────────────────────────
-
-describe('RoutingEngineService.resolve — unhealthy provider handling', () => {
-  it('skips matched rule when provider is unhealthy, tries next rule', async () => {
-    const rules = [
-      makeRule({
-        name: 'primary rule',
-        priority: 1,
-        conditions: [{ field: 'taskType', operator: 'eq', value: 'coding' }],
-        action: { provider: 'anthropic', model: 'claude-opus-4-6' },
-      }),
-      makeRule({
-        name: 'secondary rule',
-        priority: 2,
-        conditions: [{ field: 'taskType', operator: 'eq', value: 'coding' }],
-        action: { provider: 'openai', model: 'gpt-4o' },
-      }),
-    ];
-
-    const service = makeService(rules, {
-      anthropic: { status: 'down' }, // primary is unhealthy
-      openai: { status: 'up' },
-    });
-
-    const decision = await service.resolve('implement a function');
-    expect(decision.ruleName).toBe('secondary rule');
-    expect(decision.provider).toBe('openai');
-  });
-
-  it('falls back to Sonnet when all rules have unhealthy providers', async () => {
-    // Override the rule's provider to something unhealthy but keep anthropic up for fallback
-    const unhealthyRules = [
-      makeRule({
-        name: 'only rule',
-        priority: 1,
-        conditions: [{ field: 'taskType', operator: 'eq', value: 'coding' }],
-        action: { provider: 'openai', model: 'gpt-4o' }, // openai is unhealthy
-      }),
-    ];
-
-    const service2 = makeService(unhealthyRules, {
-      anthropic: { status: 'up' },
-      openai: { status: 'down' },
-    });
-
-    const decision = await service2.resolve('implement a function');
-    // Should fall through to Sonnet fallback on anthropic
-    expect(decision.provider).toBe('anthropic');
-    expect(decision.model).toBe('claude-sonnet-4-6');
-    expect(decision.ruleName).toBe('fallback');
-  });
-
-  it('falls back to Haiku when Sonnet provider is also down', async () => {
-    const rules: RoutingRule[] = []; // no rules
-
-    const service = makeService(rules, {
-      anthropic: { status: 'down' }, // Sonnet is on anthropic — down
-      ollama: { status: 'up' }, // Haiku is also on anthropic — use Ollama as next
-    });
-
-    const decision = await service.resolve('hello there');
-    // Sonnet (anthropic) is down, Haiku (anthropic) is down, Ollama is up
-    expect(decision.provider).toBe('ollama');
-    expect(decision.model).toBe('llama3.2');
-    expect(decision.ruleName).toBe('fallback');
-  });
-
-  it('uses last resort (Sonnet) when all fallback providers are unhealthy', async () => {
-    const rules: RoutingRule[] = [];
-
-    const service = makeService(rules, {
-      anthropic: { status: 'down' },
-      ollama: { status: 'down' },
-    });
-
-    const decision = await service.resolve('hello');
-    // All unhealthy — still returns first fallback entry as last resort
-    expect(decision.provider).toBe('anthropic');
-    expect(decision.model).toBe('claude-sonnet-4-6');
-    expect(decision.ruleName).toBe('fallback');
-  });
-});
-
-// ─── resolve — empty conditions (catch-all rule) ──────────────────────────────
-
-describe('RoutingEngineService.resolve — empty conditions (fallback rule)', () => {
-  it('matches catch-all rule for any message', async () => {
-    const rules = [
-      makeRule({
-        name: 'catch-all',
-        priority: 99,
-        conditions: [],
-        action: { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-      }),
-    ];
-
-    const service = makeService(rules, { anthropic: { status: 'up' } });
-
-    const decision = await service.resolve('completely unrelated message xyz');
-    expect(decision.ruleName).toBe('catch-all');
-    expect(decision.provider).toBe('anthropic');
-    expect(decision.model).toBe('claude-sonnet-4-6');
-  });
-
-  it('catch-all is overridden by a higher-priority specific rule', async () => {
-    const rules = [
-      makeRule({
-        name: 'specific coding rule',
-        priority: 1,
-        conditions: [{ field: 'taskType', operator: 'eq', value: 'coding' }],
-        action: { provider: 'anthropic', model: 'claude-opus-4-6' },
-      }),
-      makeRule({
-        name: 'catch-all',
-        priority: 99,
-        conditions: [],
-        action: { provider: 'anthropic', model: 'claude-haiku-4-5' },
-      }),
-    ];
-
-    const service = makeService(rules, { anthropic: { status: 'up' } });
-
-    const codingDecision = await service.resolve('implement a function');
-    expect(codingDecision.ruleName).toBe('specific coding rule');
-    expect(codingDecision.model).toBe('claude-opus-4-6');
-
-    const conversationDecision = await service.resolve('hello how are you');
-    expect(conversationDecision.ruleName).toBe('catch-all');
-    expect(conversationDecision.model).toBe('claude-haiku-4-5');
-  });
-});
-
-// ─── resolve — disabled rules ─────────────────────────────────────────────────
-
-describe('RoutingEngineService.resolve — disabled rules', () => {
-  it('skips disabled rules', async () => {
-    const rules = [
-      makeRule({
-        name: 'disabled rule',
-        priority: 1,
-        enabled: false,
-        conditions: [{ field: 'taskType', operator: 'eq', value: 'coding' }],
-        action: { provider: 'anthropic', model: 'claude-opus-4-6' },
-      }),
-      makeRule({
-        name: 'enabled fallback',
-        priority: 99,
-        conditions: [],
-        action: { provider: 'anthropic', model: 'claude-sonnet-4-6' },
-      }),
-    ];
-
-    const service = makeService(rules, { anthropic: { status: 'up' } });
-
-    const decision = await service.resolve('implement a function');
-    expect(decision.ruleName).toBe('enabled fallback');
-    expect(decision.model).toBe('claude-sonnet-4-6');
-  });
-});
-
-// ─── resolve — pre-fetched health map ────────────────────────────────────────
-
-describe('RoutingEngineService.resolve — availableProviders override', () => {
-  it('uses the provided health map instead of calling healthCheckAll', async () => {
-    const rules = [
-      makeRule({
-        name: 'coding rule',
-        priority: 1,
-        conditions: [{ field: 'taskType', operator: 'eq', value: 'coding' }],
-        action: { provider: 'anthropic', model: 'claude-opus-4-6' },
-      }),
-    ];
-
-    const mockHealthCheckAll = vi.fn().mockResolvedValue({});
-    const mockDb = {
-      select: vi.fn().mockReturnValue({
-        from: vi.fn().mockReturnValue({
-          where: vi.fn().mockReturnValue({
-            orderBy: vi.fn().mockResolvedValue(
-              rules.map((r) => ({
-                id: r.id,
-                name: r.name,
-                priority: r.priority,
-                scope: r.scope,
-                userId: r.userId ?? null,
-                conditions: r.conditions,
-                action: r.action,
-                enabled: r.enabled,
-                createdAt: new Date(),
-                updatedAt: new Date(),
-              })),
-            ),
-          }),
-        }),
-      }),
-    };
-    const mockProviderService = { healthCheckAll: mockHealthCheckAll };
-
-    const service = new (RoutingEngineService as unknown as new (
-      db: unknown,
-      ps: unknown,
-    ) => RoutingEngineService)(mockDb, mockProviderService);
-
-    const preSupplied = { anthropic: { status: 'up' } };
-    await service.resolve('implement a function', undefined, preSupplied);
-
-    expect(mockHealthCheckAll).not.toHaveBeenCalled();
-  });
-});
--- a/apps/gateway/src/agent/routing/routing.controller.ts
+++ b/apps/gateway/src/agent/routing/routing.controller.ts
@@ -1,234 +0,0 @@
-import {
-  Body,
-  Controller,
-  Delete,
-  ForbiddenException,
-  Get,
-  HttpCode,
-  HttpStatus,
-  Inject,
-  NotFoundException,
-  Param,
-  Patch,
-  Post,
-  UseGuards,
-} from '@nestjs/common';
-import { routingRules, type Db, and, asc, eq, or, inArray } from '@mosaicstack/db';
-import { DB } from '../../database/database.module.js';
-import { AuthGuard } from '../../auth/auth.guard.js';
-import { CurrentUser } from '../../auth/current-user.decorator.js';
-import {
-  CreateRoutingRuleDto,
-  UpdateRoutingRuleDto,
-  ReorderRoutingRulesDto,
-} from './routing.dto.js';
-
-@Controller('api/routing/rules')
-@UseGuards(AuthGuard)
-export class RoutingController {
-  constructor(@Inject(DB) private readonly db: Db) {}
-
-  /**
-   * GET /api/routing/rules
-   * List all rules visible to the authenticated user:
-   * - All system rules
-   * - User's own rules
-   * Ordered by priority ascending (lower number = higher priority).
-   */
-  @Get()
-  async list(@CurrentUser() user: { id: string }) {
-    const rows = await this.db
-      .select()
-      .from(routingRules)
-      .where(
-        or(
-          eq(routingRules.scope, 'system'),
-          and(eq(routingRules.scope, 'user'), eq(routingRules.userId, user.id)),
-        ),
-      )
-      .orderBy(asc(routingRules.priority));
-
-    return rows;
-  }
-
-  /**
-   * GET /api/routing/rules/effective
-   * Return the merged rule set in priority order.
-   * User-scoped rules are checked before system rules at the same priority
-   * (achieved by ordering: priority ASC, then scope='user' first).
-   */
-  @Get('effective')
-  async effective(@CurrentUser() user: { id: string }) {
-    const rows = await this.db
-      .select()
-      .from(routingRules)
-      .where(
-        and(
-          eq(routingRules.enabled, true),
-          or(
-            eq(routingRules.scope, 'system'),
-            and(eq(routingRules.scope, 'user'), eq(routingRules.userId, user.id)),
-          ),
-        ),
-      )
-      .orderBy(asc(routingRules.priority));
-
-    // For rules with the same priority: user rules beat system rules.
-    // Group by priority then stable-sort each group: user before system.
-    const grouped = new Map<number, typeof rows>();
-    for (const row of rows) {
-      const bucket = grouped.get(row.priority) ?? [];
-      bucket.push(row);
-      grouped.set(row.priority, bucket);
-    }
-
-    const effective: typeof rows = [];
-    for (const [, bucket] of [...grouped.entries()].sort(([a], [b]) => a - b)) {
-      // user-scoped rules first within the same priority bucket
-      const userRules = bucket.filter((r) => r.scope === 'user');
-      const systemRules = bucket.filter((r) => r.scope === 'system');
-      effective.push(...userRules, ...systemRules);
-    }
-
-    return effective;
-  }
-
-  /**
-   * POST /api/routing/rules
-   * Create a new routing rule. Scope is forced to 'user' (users cannot create
-   * system rules). The authenticated user's ID is attached automatically.
-   */
-  @Post()
-  async create(@Body() dto: CreateRoutingRuleDto, @CurrentUser() user: { id: string }) {
-    const [created] = await this.db
-      .insert(routingRules)
-      .values({
-        name: dto.name,
-        priority: dto.priority,
-        scope: 'user',
-        userId: user.id,
-        conditions: dto.conditions as unknown as Record<string, unknown>[],
-        action: dto.action as unknown as Record<string, unknown>,
-        enabled: dto.enabled ?? true,
-      })
-      .returning();
-
-    return created;
-  }
-
-  /**
-   * PATCH /api/routing/rules/reorder
-   * Reassign priorities so that the order of `ruleIds` reflects ascending
-   * priority (index 0 = priority 0, index 1 = priority 1, …).
-   * Only the authenticated user's own rules can be reordered.
-   */
-  @Patch('reorder')
-  async reorder(@Body() dto: ReorderRoutingRulesDto, @CurrentUser() user: { id: string }) {
-    // Verify all supplied IDs belong to this user
-    const owned = await this.db
-      .select({ id: routingRules.id })
-      .from(routingRules)
-      .where(
-        and(
-          inArray(routingRules.id, dto.ruleIds),
-          eq(routingRules.scope, 'user'),
-          eq(routingRules.userId, user.id),
-        ),
-      );
-
-    const ownedIds = new Set(owned.map((r) => r.id));
-    const unowned = dto.ruleIds.filter((id) => !ownedIds.has(id));
-    if (unowned.length > 0) {
-      throw new ForbiddenException(
-        `Cannot reorder rules that do not belong to you: ${unowned.join(', ')}`,
-      );
-    }
-
-    // Apply new priorities in transaction
-    const updates = await this.db.transaction(async (tx) => {
-      const results = [];
-      for (let i = 0; i < dto.ruleIds.length; i++) {
-        const [updated] = await tx
-          .update(routingRules)
-          .set({ priority: i, updatedAt: new Date() })
-          .where(and(eq(routingRules.id, dto.ruleIds[i]!), eq(routingRules.userId, user.id)))
-          .returning();
-        if (updated) results.push(updated);
-      }
-      return results;
-    });
-
-    return updates;
-  }
-
-  /**
-   * PATCH /api/routing/rules/:id
-   * Update a user-owned rule. System rules cannot be modified by regular users.
-   */
-  @Patch(':id')
-  async update(
-    @Param('id') id: string,
-    @Body() dto: UpdateRoutingRuleDto,
-    @CurrentUser() user: { id: string },
-  ) {
-    const [existing] = await this.db.select().from(routingRules).where(eq(routingRules.id, id));
-
-    if (!existing) throw new NotFoundException('Routing rule not found');
-
-    if (existing.scope === 'system') {
-      throw new ForbiddenException('System routing rules cannot be modified');
-    }
-
-    if (existing.userId !== user.id) {
-      throw new ForbiddenException('Routing rule does not belong to the current user');
-    }
-
-    const updatePayload: Partial<typeof routingRules.$inferInsert> = {
-      updatedAt: new Date(),
-    };
-
-    if (dto.name !== undefined) updatePayload.name = dto.name;
-    if (dto.priority !== undefined) updatePayload.priority = dto.priority;
-    if (dto.conditions !== undefined)
-      updatePayload.conditions = dto.conditions as unknown as Record<string, unknown>[];
-    if (dto.action !== undefined)
-      updatePayload.action = dto.action as unknown as Record<string, unknown>;
-    if (dto.enabled !== undefined) updatePayload.enabled = dto.enabled;
-
-    const [updated] = await this.db
-      .update(routingRules)
-      .set(updatePayload)
-      .where(and(eq(routingRules.id, id), eq(routingRules.userId, user.id)))
-      .returning();
-
-    if (!updated) throw new NotFoundException('Routing rule not found');
-    return updated;
-  }
-
-  /**
-   * DELETE /api/routing/rules/:id
-   * Delete a user-owned routing rule. System rules cannot be deleted.
-   */
-  @Delete(':id')
-  @HttpCode(HttpStatus.NO_CONTENT)
-  async remove(@Param('id') id: string, @CurrentUser() user: { id: string }) {
-    const [existing] = await this.db.select().from(routingRules).where(eq(routingRules.id, id));
-
-    if (!existing) throw new NotFoundException('Routing rule not found');
-
-    if (existing.scope === 'system') {
-      throw new ForbiddenException('System routing rules cannot be deleted');
-    }
-
-    if (existing.userId !== user.id) {
-      throw new ForbiddenException('Routing rule does not belong to the current user');
-    }
-
-    const [deleted] = await this.db
-      .delete(routingRules)
-      .where(and(eq(routingRules.id, id), eq(routingRules.userId, user.id)))
-      .returning();
-
-    if (!deleted) throw new NotFoundException('Routing rule not found');
-  }
-}
--- a/apps/gateway/src/agent/routing/routing.dto.ts
+++ b/apps/gateway/src/agent/routing/routing.dto.ts
@@ -1,135 +0,0 @@
-import {
-  IsArray,
-  IsBoolean,
-  IsInt,
-  IsIn,
-  IsObject,
-  IsOptional,
-  IsString,
-  IsUUID,
-  MaxLength,
-  Min,
-  ValidateNested,
-  ArrayNotEmpty,
-} from 'class-validator';
-import { Type } from 'class-transformer';
-
-// ─── Condition DTO ────────────────────────────────────────────────────────────
-
-const conditionFields = [
-  'taskType',
-  'complexity',
-  'domain',
-  'costTier',
-  'requiredCapabilities',
-] as const;
-const conditionOperators = ['eq', 'in', 'includes'] as const;
-
-export class RoutingConditionDto {
-  @IsString()
-  @IsIn(conditionFields)
-  field!: (typeof conditionFields)[number];
-
-  @IsString()
-  @IsIn(conditionOperators)
-  operator!: (typeof conditionOperators)[number];
-
-  // value can be string or string[] — keep as unknown and validate at runtime
-  value!: string | string[];
-}
-
-// ─── Action DTO ───────────────────────────────────────────────────────────────
-
-export class RoutingActionDto {
-  @IsString()
-  @MaxLength(255)
-  provider!: string;
-
-  @IsString()
-  @MaxLength(255)
-  model!: string;
-
-  @IsOptional()
-  @IsUUID()
-  agentConfigId?: string;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(50_000)
-  systemPromptOverride?: string;
-
-  @IsOptional()
-  @IsArray()
-  toolAllowlist?: string[];
-}
-
-// ─── Create DTO ───────────────────────────────────────────────────────────────
-
-const scopeValues = ['system', 'user'] as const;
-
-export class CreateRoutingRuleDto {
-  @IsString()
-  @MaxLength(255)
-  name!: string;
-
-  @IsInt()
-  @Min(0)
-  priority!: number;
-
-  @IsOptional()
-  @IsIn(scopeValues)
-  scope?: 'system' | 'user';
-
-  @IsArray()
-  @ValidateNested({ each: true })
-  @Type(() => RoutingConditionDto)
-  conditions!: RoutingConditionDto[];
-
-  @IsObject()
-  @ValidateNested()
-  @Type(() => RoutingActionDto)
-  action!: RoutingActionDto;
-
-  @IsOptional()
-  @IsBoolean()
-  enabled?: boolean;
-}
-
-// ─── Update DTO ───────────────────────────────────────────────────────────────
-
-export class UpdateRoutingRuleDto {
-  @IsOptional()
-  @IsString()
-  @MaxLength(255)
-  name?: string;
-
-  @IsOptional()
-  @IsInt()
-  @Min(0)
-  priority?: number;
-
-  @IsOptional()
-  @IsArray()
-  @ValidateNested({ each: true })
-  @Type(() => RoutingConditionDto)
-  conditions?: RoutingConditionDto[];
-
-  @IsOptional()
-  @IsObject()
-  @ValidateNested()
-  @Type(() => RoutingActionDto)
-  action?: RoutingActionDto;
-
-  @IsOptional()
-  @IsBoolean()
-  enabled?: boolean;
-}
-
-// ─── Reorder DTO ──────────────────────────────────────────────────────────────
-
-export class ReorderRoutingRulesDto {
-  @IsArray()
-  @ArrayNotEmpty()
-  @IsUUID(undefined, { each: true })
-  ruleIds!: string[];
-}
--- a/apps/gateway/src/agent/routing/routing.types.ts
+++ b/apps/gateway/src/agent/routing/routing.types.ts
@@ -1,118 +0,0 @@
-/**
- * Routing engine types — M4-002 (condition types) and M4-003 (action types).
- *
- * These types are re-exported from `@mosaicstack/types` for shared use across packages.
- */
-
-// ─── Classification primitives ───────────────────────────────────────────────
-
-/** Category of work the agent is being asked to perform */
-export type TaskType =
-  | 'coding'
-  | 'research'
-  | 'summarization'
-  | 'conversation'
-  | 'analysis'
-  | 'creative';
-
-/** Estimated complexity of the task, used to bias toward cheaper or more capable models */
-export type Complexity = 'simple' | 'moderate' | 'complex';
-
-/** Primary knowledge domain of the task */
-export type Domain = 'frontend' | 'backend' | 'devops' | 'docs' | 'general';
-
-/**
- * Cost tier for model selection.
- * Extends the existing `CostTier` in `@mosaicstack/types` with `local` for self-hosted models.
- */
-export type CostTier = 'cheap' | 'standard' | 'premium' | 'local';
-
-/** Special model capability required by the task */
-export type Capability = 'tools' | 'vision' | 'long-context' | 'reasoning' | 'embedding';
-
-// ─── Condition types ─────────────────────────────────────────────────────────
-
-/**
- * A single predicate that must be satisfied for a routing rule to match.
- *
- * - `eq`       — scalar equality: `field === value`
- * - `in`       — set membership: `value` contains `field`
- * - `includes` — array containment: `field` (array) includes `value`
- */
-export interface RoutingCondition {
-  /** The task-classification field to test */
-  field: 'taskType' | 'complexity' | 'domain' | 'costTier' | 'requiredCapabilities';
-  /** Comparison operator */
-  operator: 'eq' | 'in' | 'includes';
-  /** Expected value or set of values */
-  value: string | string[];
-}
-
-// ─── Action types ────────────────────────────────────────────────────────────
-
-/**
- * The routing action to execute when all conditions in a rule are satisfied.
- */
-export interface RoutingAction {
-  /** LLM provider identifier, e.g. `'anthropic'`, `'openai'`, `'ollama'` */
-  provider: string;
-  /** Model identifier, e.g. `'claude-opus-4-6'`, `'gpt-4o'` */
-  model: string;
-  /** Optional: use a specific pre-configured agent config from the agent registry */
-  agentConfigId?: string;
-  /** Optional: override the agent's default system prompt for this route */
-  systemPromptOverride?: string;
-  /** Optional: restrict the tool set available to the agent for this route */
-  toolAllowlist?: string[];
-}
-
-// ─── Rule and decision types ─────────────────────────────────────────────────
-
-/**
- * Full routing rule as stored in the database and used at runtime.
- */
-export interface RoutingRule {
-  /** UUID primary key */
-  id: string;
-  /** Human-readable rule name */
-  name: string;
-  /** Lower number = evaluated first; unique per scope */
-  priority: number;
-  /** `'system'` rules apply globally; `'user'` rules override for a specific user */
-  scope: 'system' | 'user';
-  /** Present only for `'user'`-scoped rules */
-  userId?: string;
-  /** All conditions must match for the rule to fire */
-  conditions: RoutingCondition[];
-  /** Action to take when all conditions are met */
-  action: RoutingAction;
-  /** Whether this rule is active */
-  enabled: boolean;
-}
-
-/**
- * Structured representation of what an agent has been asked to do,
- * produced by the task classifier and consumed by the routing engine.
- */
-export interface TaskClassification {
-  taskType: TaskType;
-  complexity: Complexity;
-  domain: Domain;
-  requiredCapabilities: Capability[];
-}
-
-/**
- * Output of the routing engine — which model to use and why.
- */
-export interface RoutingDecision {
-  /** LLM provider identifier */
-  provider: string;
-  /** Model identifier */
-  model: string;
-  /** Optional agent config to apply */
-  agentConfigId?: string;
-  /** Name of the rule that matched, for observability */
-  ruleName: string;
-  /** Human-readable explanation of why this rule was selected */
-  reason: string;
-}
--- a/apps/gateway/src/agent/routing/task-classifier.test.ts
+++ b/apps/gateway/src/agent/routing/task-classifier.test.ts
@@ -1,366 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { classifyTask } from './task-classifier.js';
-
-// ─── Task Type Detection ──────────────────────────────────────────────────────
-
-describe('classifyTask — taskType', () => {
-  it('detects coding from "code" keyword', () => {
-    expect(classifyTask('Can you write some code for me?').taskType).toBe('coding');
-  });
-
-  it('detects coding from "implement" keyword', () => {
-    expect(classifyTask('Implement a binary search algorithm').taskType).toBe('coding');
-  });
-
-  it('detects coding from "function" keyword', () => {
-    expect(classifyTask('Write a function that reverses a string').taskType).toBe('coding');
-  });
-
-  it('detects coding from "debug" keyword', () => {
-    expect(classifyTask('Help me debug this error').taskType).toBe('coding');
-  });
-
-  it('detects coding from "fix" keyword', () => {
-    expect(classifyTask('fix the broken test').taskType).toBe('coding');
-  });
-
-  it('detects coding from "refactor" keyword', () => {
-    expect(classifyTask('Please refactor this module').taskType).toBe('coding');
-  });
-
-  it('detects coding from "typescript" keyword', () => {
-    expect(classifyTask('How do I use generics in TypeScript?').taskType).toBe('coding');
-  });
-
-  it('detects coding from "javascript" keyword', () => {
-    expect(classifyTask('JavaScript promises explained').taskType).toBe('coding');
-  });
-
-  it('detects coding from "python" keyword', () => {
-    expect(classifyTask('Write a Python script to parse CSV').taskType).toBe('coding');
-  });
-
-  it('detects coding from "SQL" keyword', () => {
-    expect(classifyTask('Write a SQL query to join these tables').taskType).toBe('coding');
-  });
-
-  it('detects coding from "API" keyword', () => {
-    expect(classifyTask('Design an API for user management').taskType).toBe('coding');
-  });
-
-  it('detects coding from "endpoint" keyword', () => {
-    expect(classifyTask('Add a new endpoint for user profiles').taskType).toBe('coding');
-  });
-
-  it('detects coding from "class" keyword', () => {
-    expect(classifyTask('Create a class for handling payments').taskType).toBe('coding');
-  });
-
-  it('detects coding from "method" keyword', () => {
-    expect(classifyTask('Add a method to validate emails').taskType).toBe('coding');
-  });
-
-  it('detects coding from inline backtick code', () => {
-    expect(classifyTask('What does `Array.prototype.reduce` do?').taskType).toBe('coding');
-  });
-
-  it('detects summarization from "summarize"', () => {
-    expect(classifyTask('Please summarize this document').taskType).toBe('summarization');
-  });
-
-  it('detects summarization from "summary"', () => {
-    expect(classifyTask('Give me a summary of the meeting').taskType).toBe('summarization');
-  });
-
-  it('detects summarization from "tldr"', () => {
-    expect(classifyTask('TLDR this article for me').taskType).toBe('summarization');
-  });
-
-  it('detects summarization from "condense"', () => {
-    expect(classifyTask('Condense this into 3 bullet points').taskType).toBe('summarization');
-  });
-
-  it('detects summarization from "brief"', () => {
-    expect(classifyTask('Give me a brief overview of this topic').taskType).toBe('summarization');
-  });
-
-  it('detects creative from "write"', () => {
-    expect(classifyTask('Write a short story about a dragon').taskType).toBe('creative');
-  });
-
-  it('detects creative from "story"', () => {
-    expect(classifyTask('Tell me a story about space exploration').taskType).toBe('creative');
-  });
-
-  it('detects creative from "poem"', () => {
-    expect(classifyTask('Write a poem about autumn').taskType).toBe('creative');
-  });
-
-  it('detects creative from "generate"', () => {
-    expect(classifyTask('Generate some creative marketing copy').taskType).toBe('creative');
-  });
-
-  it('detects creative from "create content"', () => {
-    expect(classifyTask('Help me create content for my website').taskType).toBe('creative');
-  });
-
-  it('detects creative from "blog post"', () => {
-    expect(classifyTask('Write a blog post about productivity habits').taskType).toBe('creative');
-  });
-
-  it('detects analysis from "analyze"', () => {
-    expect(classifyTask('Analyze the performance of this system').taskType).toBe('analysis');
-  });
-
-  it('detects analysis from "review"', () => {
-    expect(classifyTask('Please review my pull request changes').taskType).toBe('analysis');
-  });
-
-  it('detects analysis from "evaluate"', () => {
-    expect(classifyTask('Evaluate the pros and cons of this approach').taskType).toBe('analysis');
-  });
-
-  it('detects analysis from "assess"', () => {
-    expect(classifyTask('Assess the security risks here').taskType).toBe('analysis');
-  });
-
-  it('detects analysis from "audit"', () => {
-    expect(classifyTask('Audit this codebase for vulnerabilities').taskType).toBe('analysis');
-  });
-
-  it('detects research from "research"', () => {
-    expect(classifyTask('Research the best state management libraries').taskType).toBe('research');
-  });
-
-  it('detects research from "find"', () => {
-    expect(classifyTask('Find all open issues in our backlog').taskType).toBe('research');
-  });
-
-  it('detects research from "search"', () => {
-    expect(classifyTask('Search for papers on transformer architectures').taskType).toBe(
-      'research',
-    );
-  });
-
-  it('detects research from "what is"', () => {
-    expect(classifyTask('What is the difference between REST and GraphQL?').taskType).toBe(
-      'research',
-    );
-  });
-
-  it('detects research from "explain"', () => {
-    expect(classifyTask('Explain how OAuth2 works').taskType).toBe('research');
-  });
-
-  it('detects research from "how does"', () => {
-    expect(classifyTask('How does garbage collection work in V8?').taskType).toBe('research');
-  });
-
-  it('detects research from "compare"', () => {
-    expect(classifyTask('Compare Postgres and MySQL for this use case').taskType).toBe('research');
-  });
-
-  it('falls back to conversation with no strong signal', () => {
-    expect(classifyTask('Hello, how are you?').taskType).toBe('conversation');
-  });
-
-  it('falls back to conversation for generic greetings', () => {
-    expect(classifyTask('Good morning!').taskType).toBe('conversation');
-  });
-
-  // Priority: coding wins over research when both keywords present
-  it('coding takes priority over research', () => {
-    expect(classifyTask('find a code example for sorting').taskType).toBe('coding');
-  });
-
-  // Priority: summarization wins over creative
-  it('summarization takes priority over creative', () => {
-    expect(classifyTask('write a summary of this article').taskType).toBe('summarization');
-  });
-});
-
-// ─── Complexity Estimation ────────────────────────────────────────────────────
-
-describe('classifyTask — complexity', () => {
-  it('classifies short message as simple', () => {
-    expect(classifyTask('Fix typo').complexity).toBe('simple');
-  });
-
-  it('classifies single question as simple', () => {
-    expect(classifyTask('What is a closure?').complexity).toBe('simple');
-  });
-
-  it('classifies message > 500 chars as complex', () => {
-    const long = 'a'.repeat(501);
-    expect(classifyTask(long).complexity).toBe('complex');
-  });
-
-  it('classifies message with "architecture" keyword as complex', () => {
-    expect(
-      classifyTask('Can you help me think through the architecture of this system?').complexity,
-    ).toBe('complex');
-  });
-
-  it('classifies message with "design" keyword as complex', () => {
-    expect(classifyTask('Design a data model for this feature').complexity).toBe('complex');
-  });
-
-  it('classifies message with "complex" keyword as complex', () => {
-    expect(classifyTask('This is a complex problem involving multiple services').complexity).toBe(
-      'complex',
-    );
-  });
-
-  it('classifies message with "system" keyword as complex', () => {
-    expect(classifyTask('Explain the whole system behavior').complexity).toBe('complex');
-  });
-
-  it('classifies message with multiple code blocks as complex', () => {
-    const msg = '```\nconst a = 1;\n```\n\nAlso look at\n\n```\nconst b = 2;\n```';
-    expect(classifyTask(msg).complexity).toBe('complex');
-  });
-
-  it('classifies moderate-length message as moderate', () => {
-    const msg =
-      'Please help me implement a small utility function that parses query strings. It should handle arrays and nested objects properly.';
-    expect(classifyTask(msg).complexity).toBe('moderate');
-  });
-});
-
-// ─── Domain Detection ─────────────────────────────────────────────────────────
-
-describe('classifyTask — domain', () => {
-  it('detects frontend from "react"', () => {
-    expect(classifyTask('How do I use React hooks?').domain).toBe('frontend');
-  });
-
-  it('detects frontend from "css"', () => {
-    expect(classifyTask('Fix the CSS layout issue').domain).toBe('frontend');
-  });
-
-  it('detects frontend from "html"', () => {
-    expect(classifyTask('Add an HTML form element').domain).toBe('frontend');
-  });
-
-  it('detects frontend from "component"', () => {
-    expect(classifyTask('Create a reusable component').domain).toBe('frontend');
-  });
-
-  it('detects frontend from "UI"', () => {
-    expect(classifyTask('Update the UI spacing').domain).toBe('frontend');
-  });
-
-  it('detects frontend from "tailwind"', () => {
-    expect(classifyTask('Style this button with Tailwind').domain).toBe('frontend');
-  });
-
-  it('detects frontend from "next.js"', () => {
-    expect(classifyTask('Configure Next.js routing').domain).toBe('frontend');
-  });
-
-  it('detects backend from "server"', () => {
-    expect(classifyTask('Set up the server to handle requests').domain).toBe('backend');
-  });
-
-  it('detects backend from "database"', () => {
-    expect(classifyTask('Optimize this database query').domain).toBe('backend');
-  });
-
-  it('detects backend from "endpoint"', () => {
-    expect(classifyTask('Add an endpoint for authentication').domain).toBe('backend');
-  });
-
-  it('detects backend from "nest"', () => {
-    expect(classifyTask('Add a NestJS guard for this route').domain).toBe('backend');
-  });
-
-  it('detects backend from "express"', () => {
-    expect(classifyTask('Middleware in Express explained').domain).toBe('backend');
-  });
-
-  it('detects devops from "docker"', () => {
-    expect(classifyTask('Write a Dockerfile for this app').domain).toBe('devops');
-  });
-
-  it('detects devops from "deploy"', () => {
-    expect(classifyTask('Deploy this service to production').domain).toBe('devops');
-  });
-
-  it('detects devops from "pipeline"', () => {
-    expect(classifyTask('Set up a CI pipeline').domain).toBe('devops');
-  });
-
-  it('detects devops from "kubernetes"', () => {
-    expect(classifyTask('Configure a Kubernetes deployment').domain).toBe('devops');
-  });
-
-  it('detects docs from "documentation"', () => {
-    expect(classifyTask('Write documentation for this module').domain).toBe('docs');
-  });
-
-  it('detects docs from "readme"', () => {
-    expect(classifyTask('Update the README').domain).toBe('docs');
-  });
-
-  it('detects docs from "guide"', () => {
-    expect(classifyTask('Create a user guide for this feature').domain).toBe('docs');
-  });
-
-  it('falls back to general domain', () => {
-    expect(classifyTask('What time is it?').domain).toBe('general');
-  });
-
-  // devops takes priority over backend when both match
-  it('devops takes priority over backend (both keywords)', () => {
-    expect(classifyTask('Deploy the API server using Docker').domain).toBe('devops');
-  });
-
-  // docs takes priority over frontend when both match
-  it('docs takes priority over frontend (both keywords)', () => {
-    expect(classifyTask('Write documentation for React components').domain).toBe('docs');
-  });
-});
-
-// ─── Combined Classification ──────────────────────────────────────────────────
-
-describe('classifyTask — combined', () => {
-  it('returns full classification object', () => {
-    const result = classifyTask('Fix the bug?');
-    expect(result).toHaveProperty('taskType');
-    expect(result).toHaveProperty('complexity');
-    expect(result).toHaveProperty('domain');
-  });
-
-  it('classifies complex TypeScript architecture request', () => {
-    const msg =
-      'Design the architecture for a multi-tenant TypeScript system using NestJS with proper database isolation and role-based access control. The system needs to support multiple organizations each with their own data namespace.';
-    const result = classifyTask(msg);
-    expect(result.taskType).toBe('coding');
-    expect(result.complexity).toBe('complex');
-    expect(result.domain).toBe('backend');
-  });
-
-  it('classifies simple frontend question', () => {
-    const result = classifyTask('How do I center a div in CSS?');
-    expect(result.taskType).toBe('research');
-    expect(result.domain).toBe('frontend');
-  });
-
-  it('classifies a DevOps pipeline task as complex', () => {
-    const msg =
-      'Design a complete CI/CD pipeline architecture using Docker and Kubernetes with blue-green deployments and automatic rollback capabilities for a complex microservices system.';
-    const result = classifyTask(msg);
-    expect(result.domain).toBe('devops');
-    expect(result.complexity).toBe('complex');
-  });
-
-  it('classifies summarization task correctly', () => {
-    const result = classifyTask('Summarize the key points from this document');
-    expect(result.taskType).toBe('summarization');
-  });
-
-  it('classifies creative writing task correctly', () => {
-    const result = classifyTask('Write a poem about the ocean');
-    expect(result.taskType).toBe('creative');
-  });
-});
--- a/apps/gateway/src/agent/routing/task-classifier.ts
+++ b/apps/gateway/src/agent/routing/task-classifier.ts
@@ -1,159 +0,0 @@
-import type { TaskType, Complexity, Domain, TaskClassification } from './routing.types.js';
-
-// ─── Pattern Banks ──────────────────────────────────────────────────────────
-
-const CODING_PATTERNS: RegExp[] = [
-  /\bcode\b/i,
-  /\bfunction\b/i,
-  /\bimplement\b/i,
-  /\bdebug\b/i,
-  /\bfix\b/i,
-  /\brefactor\b/i,
-  /\btypescript\b/i,
-  /\bjavascript\b/i,
-  /\bpython\b/i,
-  /\bSQL\b/i,
-  /\bAPI\b/i,
-  /\bendpoint\b/i,
-  /\bclass\b/i,
-  /\bmethod\b/i,
-  /`[^`]*`/,
-];
-
-const RESEARCH_PATTERNS: RegExp[] = [
-  /\bresearch\b/i,
-  /\bfind\b/i,
-  /\bsearch\b/i,
-  /\bwhat is\b/i,
-  /\bexplain\b/i,
-  /\bhow do(es)?\b/i,
-  /\bcompare\b/i,
-  /\banalyze\b/i,
-];
-
-const SUMMARIZATION_PATTERNS: RegExp[] = [
-  /\bsummariz(e|ation)\b/i,
-  /\bsummary\b/i,
-  /\btldr\b/i,
-  /\bcondense\b/i,
-  /\bbrief\b/i,
-];
-
-const CREATIVE_PATTERNS: RegExp[] = [
-  /\bwrite\b/i,
-  /\bstory\b/i,
-  /\bpoem\b/i,
-  /\bgenerate\b/i,
-  /\bcreate content\b/i,
-  /\bblog post\b/i,
-];
-
-const ANALYSIS_PATTERNS: RegExp[] = [
-  /\banalyze\b/i,
-  /\breview\b/i,
-  /\bevaluate\b/i,
-  /\bassess\b/i,
-  /\baudit\b/i,
-];
-
-// ─── Complexity Indicators ───────────────────────────────────────────────────
-
-const COMPLEX_KEYWORDS: RegExp[] = [
-  /\barchitecture\b/i,
-  /\bdesign\b/i,
-  /\bcomplex\b/i,
-  /\bsystem\b/i,
-];
-
-const SIMPLE_QUESTION_PATTERN = /^[^.!?]+[?]$/;
-
-/** Counts occurrences of triple-backtick code fences in the message */
-function countCodeBlocks(message: string): number {
-  return (message.match(/```/g) ?? []).length / 2;
-}
-
-// ─── Domain Indicators ───────────────────────────────────────────────────────
-
-const FRONTEND_PATTERNS: RegExp[] = [
-  /\breact\b/i,
-  /\bcss\b/i,
-  /\bhtml\b/i,
-  /\bcomponent\b/i,
-  /\bUI\b/,
-  /\btailwind\b/i,
-  /\bnext\.js\b/i,
-];
-
-const BACKEND_PATTERNS: RegExp[] = [
-  /\bAPI\b/i,
-  /\bserver\b/i,
-  /\bdatabase\b/i,
-  /\bendpoint\b/i,
-  /\bnest(js)?\b/i,
-  /\bexpress\b/i,
-];
-
-const DEVOPS_PATTERNS: RegExp[] = [
-  /\bdocker(file|compose|hub)?\b/i,
-  /\bCI\b/,
-  /\bdeploy\b/i,
-  /\bpipeline\b/i,
-  /\bkubernetes\b/i,
-];
-
-const DOCS_PATTERNS: RegExp[] = [/\bdocumentation\b/i, /\breadme\b/i, /\bguide\b/i];
-
-// ─── Helpers ─────────────────────────────────────────────────────────────────
-
-function matchesAny(message: string, patterns: RegExp[]): boolean {
-  return patterns.some((p) => p.test(message));
-}
-
-// ─── Classifier ──────────────────────────────────────────────────────────────
-
-/**
- * Classify a task based on the user's message using deterministic regex/keyword matching.
- * No LLM calls are made — this is a pure, fast, synchronous classification.
- */
-export function classifyTask(message: string): TaskClassification {
-  return {
-    taskType: detectTaskType(message),
-    complexity: estimateComplexity(message),
-    domain: detectDomain(message),
-    requiredCapabilities: [],
-  };
-}
-
-function detectTaskType(message: string): TaskType {
-  if (matchesAny(message, CODING_PATTERNS)) return 'coding';
-  if (matchesAny(message, SUMMARIZATION_PATTERNS)) return 'summarization';
-  if (matchesAny(message, CREATIVE_PATTERNS)) return 'creative';
-  if (matchesAny(message, ANALYSIS_PATTERNS)) return 'analysis';
-  if (matchesAny(message, RESEARCH_PATTERNS)) return 'research';
-  return 'conversation';
-}
-
-function estimateComplexity(message: string): Complexity {
-  const trimmed = message.trim();
-  const codeBlocks = countCodeBlocks(trimmed);
-
-  // Complex: long messages, multiple code blocks, or complexity keywords
-  if (trimmed.length > 500 || codeBlocks > 1 || matchesAny(trimmed, COMPLEX_KEYWORDS)) {
-    return 'complex';
-  }
-
-  // Simple: short messages or a single direct question
-  if (trimmed.length < 100 || SIMPLE_QUESTION_PATTERN.test(trimmed)) {
-    return 'simple';
-  }
-
-  return 'moderate';
-}
-
-function detectDomain(message: string): Domain {
-  if (matchesAny(message, DEVOPS_PATTERNS)) return 'devops';
-  if (matchesAny(message, DOCS_PATTERNS)) return 'docs';
-  if (matchesAny(message, FRONTEND_PATTERNS)) return 'frontend';
-  if (matchesAny(message, BACKEND_PATTERNS)) return 'backend';
-  return 'general';
-}
--- a/apps/gateway/src/agent/runtime-approval-denied.filter.ts
+++ b/apps/gateway/src/agent/runtime-approval-denied.filter.ts
@@ -1,13 +0,0 @@
-import { Catch, type ArgumentsHost, type ExceptionFilter } from '@nestjs/common';
-import { RuntimeApprovalDeniedError } from './runtime-provider-registry.service.js';
-
-/** Maps a consumed/missing runtime approval to a stable HTTP authorization response. */
-@Catch(RuntimeApprovalDeniedError)
-export class RuntimeApprovalDeniedFilter implements ExceptionFilter {
-  catch(_exception: RuntimeApprovalDeniedError, host: ArgumentsHost): void {
-    const response = host.switchToHttp().getResponse<{
-      status(code: number): { send(body: { statusCode: number; message: string }): void };
-    }>();
-    response.status(403).send({ statusCode: 403, message: 'Runtime termination approval denied' });
-  }
-}
--- a/apps/gateway/src/agent/runtime-provider-registry.service.ts
+++ b/apps/gateway/src/agent/runtime-provider-registry.service.ts
@@ -1,500 +0,0 @@
-import { ForbiddenException, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
-import { AgentRuntimeProviderRegistry } from '@mosaicstack/agent';
-import {
-  createRuntimeAuditLogEntry,
-  type LogService,
-  type RuntimeAuditErrorCode,
-} from '@mosaicstack/log';
-import type {
-  AgentRuntimeProvider,
-  RuntimeAttachHandle,
-  RuntimeAttachMode,
-  RuntimeCapability,
-  RuntimeCapabilitySet,
-  RuntimeHealth,
-  RuntimeMessage,
-  RuntimeScope,
-  RuntimeSession,
-  RuntimeSessionTree,
-  RuntimeStreamEvent,
-  TransitionalCapabilityInventoryEntry,
-  TransitionalCapabilityInventoryProvider,
-} from '@mosaicstack/types';
-import type { ActorTenantScope } from '../auth/session-scope.js';
-import { LOG_SERVICE } from '../log/log.tokens.js';
-
-export const AGENT_RUNTIME_PROVIDER_REGISTRY = Symbol('AGENT_RUNTIME_PROVIDER_REGISTRY');
-export const RUNTIME_PROVIDER_AUDIT_SINK = Symbol('RUNTIME_PROVIDER_AUDIT_SINK');
-export const RUNTIME_APPROVAL_VERIFIER = Symbol('RUNTIME_APPROVAL_VERIFIER');
-
-export type RuntimeProviderOperation =
-  | RuntimeCapability
-  | 'runtime.capabilities'
-  | 'runtime.health'
-  | 'runtime.transitional-capabilities';
-export type RuntimeProviderAuditOutcome = 'requested' | 'succeeded' | 'denied' | 'failed';
-
-/** Trusted server-side context only; it intentionally excludes client-provided identity fields. */
-export interface RuntimeProviderRequestContext {
-  actorScope: ActorTenantScope;
-  channelId: string;
-  correlationId: string;
-}
-
-/** Metadata-only audit record. Message bodies, idempotency keys, and approval refs are excluded. */
-export interface RuntimeAuditEvent {
-  providerId: string;
-  operation: RuntimeProviderOperation;
-  outcome: RuntimeProviderAuditOutcome;
-  actorId: string;
-  tenantId: string;
-  channelId: string;
-  correlationId: string;
-  resourceId?: string;
-  durationMs?: number;
-  errorCode?: RuntimeAuditErrorCode;
-}
-
-export interface RuntimeAuditSink {
-  record(event: RuntimeAuditEvent): Promise<void>;
-}
-
-/** Exact action shape that a durable approval implementation must consume once. */
-export interface RuntimeTerminationAction {
-  providerId: string;
-  sessionId: string;
-  actorId: string;
-  tenantId: string;
-  channelId: string;
-  correlationId: string;
-  agentName: string;
-}
-
-export interface RuntimeApprovalVerifier {
-  consume(approvalRef: string, action: RuntimeTerminationAction): Promise<boolean>;
-}
-
-function isTransitionalInventoryProvider(
-  provider: AgentRuntimeProvider,
-): provider is AgentRuntimeProvider & TransitionalCapabilityInventoryProvider {
-  return (
-    typeof (provider as Partial<TransitionalCapabilityInventoryProvider>)
-      .transitionalCapabilityMatrix === 'function'
-  );
-}
-
-function configuredAgentName(): string {
-  const agentName = process.env['MOSAIC_AGENT_NAME']?.trim();
-  if (!agentName) throw new RuntimeApprovalDeniedError();
-  return agentName;
-}
-
-export class RuntimeApprovalDeniedError extends Error {
-  constructor() {
-    super('Runtime termination approval denied');
-  }
-}
-
-/**
- * The default denies all runtime termination until a durable, exact-action
- * approval implementation is configured. This is safer than a permissive stub.
- */
-@Injectable()
-export class DenyRuntimeApprovalVerifier implements RuntimeApprovalVerifier {
-  async consume(_approvalRef: string, _action: RuntimeTerminationAction): Promise<boolean> {
-    return false;
-  }
-}
-
-/**
- * Temporary metadata-only audit sink. M1 observability can replace this token
- * with a durable audit writer without changing provider call sites.
- */
-@Injectable()
-export class RuntimeProviderAuditService implements RuntimeAuditSink {
-  private readonly logger = new Logger(RuntimeProviderAuditService.name);
-
-  constructor(@Inject(LOG_SERVICE) private readonly logService: LogService) {}
-
-  async record(event: RuntimeAuditEvent): Promise<void> {
-    const entry = createRuntimeAuditLogEntry(event);
-    await this.logService.logs.ingest(entry);
-    this.logger.log(JSON.stringify({ event: entry.content, metadata: entry.metadata }));
-  }
-}
-
-@Injectable()
-export class RuntimeProviderService {
-  private readonly logger = new Logger(RuntimeProviderService.name);
-
-  constructor(
-    @Inject(AGENT_RUNTIME_PROVIDER_REGISTRY)
-    private readonly registry: AgentRuntimeProviderRegistry,
-    @Inject(RUNTIME_PROVIDER_AUDIT_SINK)
-    private readonly audit: RuntimeAuditSink,
-    @Inject(RUNTIME_APPROVAL_VERIFIER)
-    private readonly approvals: RuntimeApprovalVerifier,
-  ) {}
-
-  async capabilities(
-    providerId: string,
-    context: RuntimeProviderRequestContext,
-  ): Promise<RuntimeCapabilitySet> {
-    return this.execute(
-      providerId,
-      'runtime.capabilities',
-      undefined,
-      undefined,
-      context,
-      (provider: AgentRuntimeProvider, scope: RuntimeScope): Promise<RuntimeCapabilitySet> =>
-        provider.capabilities(scope),
-    );
-  }
-
-  async health(providerId: string, context: RuntimeProviderRequestContext): Promise<RuntimeHealth> {
-    return this.execute(
-      providerId,
-      'runtime.health',
-      undefined,
-      undefined,
-      context,
-      (provider: AgentRuntimeProvider, scope: RuntimeScope): Promise<RuntimeHealth> =>
-        provider.health(scope),
-    );
-  }
-
-  async transitionalCapabilityMatrix(
-    providerId: string,
-    context: RuntimeProviderRequestContext,
-  ): Promise<TransitionalCapabilityInventoryEntry[]> {
-    return this.execute(
-      providerId,
-      'runtime.transitional-capabilities',
-      undefined,
-      undefined,
-      context,
-      async (provider: AgentRuntimeProvider, scope: RuntimeScope) => {
-        if (!isTransitionalInventoryProvider(provider)) {
-          throw new NotFoundException('Runtime provider has no transitional capability inventory');
-        }
-        return provider.transitionalCapabilityMatrix(scope);
-      },
-    );
-  }
-
-  async listSessions(
-    providerId: string,
-    context: RuntimeProviderRequestContext,
-  ): Promise<RuntimeSession[]> {
-    return this.execute(
-      providerId,
-      'session.list',
-      'session.list',
-      undefined,
-      context,
-      (provider: AgentRuntimeProvider, scope: RuntimeScope): Promise<RuntimeSession[]> =>
-        provider.listSessions(scope),
-    );
-  }
-
-  async getSessionTree(
-    providerId: string,
-    context: RuntimeProviderRequestContext,
-  ): Promise<RuntimeSessionTree[]> {
-    return this.execute(
-      providerId,
-      'session.tree',
-      'session.tree',
-      undefined,
-      context,
-      (provider: AgentRuntimeProvider, scope: RuntimeScope): Promise<RuntimeSessionTree[]> =>
-        provider.getSessionTree(scope),
-    );
-  }
-
-  streamSession(
-    providerId: string,
-    sessionId: string,
-    cursor: string | undefined,
-    context: RuntimeProviderRequestContext,
-  ): AsyncIterable<RuntimeStreamEvent> {
-    return this.stream(
-      providerId,
-      'session.stream',
-      'session.stream',
-      sessionId,
-      context,
-      (provider: AgentRuntimeProvider, scope: RuntimeScope): AsyncIterable<RuntimeStreamEvent> =>
-        provider.streamSession(sessionId, cursor, scope),
-    );
-  }
-
-  async sendMessage(
-    providerId: string,
-    sessionId: string,
-    message: RuntimeMessage,
-    context: RuntimeProviderRequestContext,
-  ): Promise<void> {
-    await this.execute(
-      providerId,
-      'session.send',
-      'session.send',
-      sessionId,
-      context,
-      (provider: AgentRuntimeProvider, scope: RuntimeScope): Promise<void> =>
-        provider.sendMessage(sessionId, message, scope),
-    );
-  }
-
-  async attach(
-    providerId: string,
-    sessionId: string,
-    mode: RuntimeAttachMode,
-    context: RuntimeProviderRequestContext,
-  ): Promise<RuntimeAttachHandle> {
-    return this.execute(
-      providerId,
-      'session.attach',
-      'session.attach',
-      sessionId,
-      context,
-      (provider: AgentRuntimeProvider, scope: RuntimeScope): Promise<RuntimeAttachHandle> =>
-        provider.attach(sessionId, mode, scope),
-    );
-  }
-
-  async detach(
-    providerId: string,
-    attachmentId: string,
-    context: RuntimeProviderRequestContext,
-  ): Promise<void> {
-    await this.execute(
-      providerId,
-      'session.attach',
-      'session.attach',
-      attachmentId,
-      context,
-      (provider: AgentRuntimeProvider, scope: RuntimeScope): Promise<void> =>
-        provider.detach(attachmentId, scope),
-    );
-  }
-
-  async terminate(
-    providerId: string,
-    sessionId: string,
-    approvalRef: string,
-    context: RuntimeProviderRequestContext,
-  ): Promise<void> {
-    await this.execute(
-      providerId,
-      'session.terminate',
-      'session.terminate',
-      sessionId,
-      context,
-      async (provider: AgentRuntimeProvider, scope: RuntimeScope): Promise<void> => {
-        const approved = await this.approvals.consume(approvalRef, {
-          providerId,
-          sessionId,
-          actorId: scope.actorId,
-          tenantId: scope.tenantId,
-          channelId: scope.channelId,
-          correlationId: scope.correlationId,
-          agentName: configuredAgentName(),
-        });
-        if (!approved) {
-          throw new RuntimeApprovalDeniedError();
-        }
-        await provider.terminate(sessionId, approvalRef, scope);
-      },
-    );
-  }
-
-  private async execute<T>(
-    providerId: string,
-    operation: RuntimeProviderOperation,
-    requiredCapability: RuntimeCapability | undefined,
-    resourceId: string | undefined,
-    context: RuntimeProviderRequestContext,
-    invoke: (provider: AgentRuntimeProvider, scope: RuntimeScope) => Promise<T>,
-  ): Promise<T> {
-    const scope = this.deriveScope(context);
-    const startedAt = Date.now();
-    await this.record(providerId, operation, 'requested', scope, resourceId);
-    let invocationStarted = false;
-    try {
-      const provider = this.provider(providerId);
-      if (requiredCapability) {
-        await this.assertCapability(provider, requiredCapability, scope);
-      }
-      invocationStarted = true;
-      const result = await invoke(provider, scope);
-      await this.recordCompletion(providerId, operation, scope, resourceId, Date.now() - startedAt);
-      return result;
-    } catch (error: unknown) {
-      const durationMs = Date.now() - startedAt;
-      if (invocationStarted && !this.isAuthorizationDenied(error)) {
-        await this.recordFailure(providerId, operation, scope, resourceId, durationMs);
-      } else {
-        await this.record(
-          providerId,
-          operation,
-          'denied',
-          scope,
-          resourceId,
-          durationMs,
-          'policy_denied',
-        );
-      }
-      throw error;
-    }
-  }
-
-  private async *stream(
-    providerId: string,
-    operation: RuntimeProviderOperation,
-    requiredCapability: RuntimeCapability,
-    resourceId: string,
-    context: RuntimeProviderRequestContext,
-    invoke: (
-      provider: AgentRuntimeProvider,
-      scope: RuntimeScope,
-    ) => AsyncIterable<RuntimeStreamEvent>,
-  ): AsyncIterable<RuntimeStreamEvent> {
-    const scope = this.deriveScope(context);
-    const startedAt = Date.now();
-    await this.record(providerId, operation, 'requested', scope, resourceId);
-    let invocationStarted = false;
-    try {
-      const provider = this.provider(providerId);
-      await this.assertCapability(provider, requiredCapability, scope);
-      invocationStarted = true;
-      for await (const event of invoke(provider, scope)) {
-        yield event;
-      }
-      await this.recordCompletion(providerId, operation, scope, resourceId, Date.now() - startedAt);
-    } catch (error: unknown) {
-      const durationMs = Date.now() - startedAt;
-      if (invocationStarted) {
-        await this.recordFailure(providerId, operation, scope, resourceId, durationMs);
-      } else {
-        await this.record(
-          providerId,
-          operation,
-          'denied',
-          scope,
-          resourceId,
-          durationMs,
-          'policy_denied',
-        );
-      }
-      throw error;
-    }
-  }
-
-  private isAuthorizationDenied(error: unknown): boolean {
-    return (
-      error instanceof RuntimeApprovalDeniedError ||
-      error instanceof ForbiddenException ||
-      (typeof error === 'object' &&
-        error !== null &&
-        'code' in error &&
-        (error as { code?: unknown }).code === 'forbidden')
-    );
-  }
-
-  private provider(providerId: string): AgentRuntimeProvider {
-    try {
-      return this.registry.require(providerId);
-    } catch (error: unknown) {
-      const message = error instanceof Error ? error.message : 'Runtime provider is not registered';
-      throw new NotFoundException(message);
-    }
-  }
-
-  private async assertCapability(
-    provider: AgentRuntimeProvider,
-    requiredCapability: RuntimeCapability,
-    scope: RuntimeScope,
-  ): Promise<void> {
-    const capabilities = await provider.capabilities(scope);
-    if (!capabilities.supported.includes(requiredCapability)) {
-      throw new ForbiddenException(`Runtime provider capability denied: ${requiredCapability}`);
-    }
-  }
-
-  private deriveScope(context: RuntimeProviderRequestContext): RuntimeScope {
-    const actorId = context.actorScope.userId.trim();
-    const tenantId = context.actorScope.tenantId.trim();
-    const channelId = context.channelId.trim();
-    const correlationId = context.correlationId.trim();
-    if (!actorId || !tenantId || !channelId || !correlationId) {
-      throw new ForbiddenException(
-        'Authenticated runtime actor scope and correlation are required',
-      );
-    }
-    return Object.freeze({ actorId, tenantId, channelId, correlationId });
-  }
-
-  private async recordFailure(
-    providerId: string,
-    operation: RuntimeProviderOperation,
-    scope: RuntimeScope,
-    resourceId: string | undefined,
-    durationMs: number,
-  ): Promise<void> {
-    try {
-      await this.record(
-        providerId,
-        operation,
-        'failed',
-        scope,
-        resourceId,
-        durationMs,
-        'provider_error',
-      );
-    } catch {
-      this.logger.error(
-        `Runtime provider failure audit failed provider=${providerId} operation=${operation} correlation=${scope.correlationId}`,
-      );
-    }
-  }
-
-  private async recordCompletion(
-    providerId: string,
-    operation: RuntimeProviderOperation,
-    scope: RuntimeScope,
-    resourceId: string | undefined,
-    durationMs: number,
-  ): Promise<void> {
-    try {
-      await this.record(providerId, operation, 'succeeded', scope, resourceId, durationMs);
-    } catch {
-      this.logger.error(
-        `Runtime provider completion audit failed provider=${providerId} operation=${operation} correlation=${scope.correlationId}`,
-      );
-    }
-  }
-
-  private async record(
-    providerId: string,
-    operation: RuntimeProviderOperation,
-    outcome: RuntimeProviderAuditOutcome,
-    scope: RuntimeScope,
-    resourceId: string | undefined,
-    durationMs?: number,
-    errorCode?: RuntimeAuditErrorCode,
-  ): Promise<void> {
-    await this.audit.record({
-      providerId,
-      operation,
-      outcome,
-      actorId: scope.actorId,
-      tenantId: scope.tenantId,
-      channelId: scope.channelId,
-      correlationId: scope.correlationId,
-      ...(resourceId ? { resourceId } : {}),
-      ...(durationMs !== undefined ? { durationMs } : {}),
-      ...(errorCode ? { errorCode } : {}),
-    });
-  }
-}
--- a/apps/gateway/src/agent/session.dto.ts
+++ b/apps/gateway/src/agent/session.dto.ts
@@ -1,32 +1,11 @@
-/** Token usage metrics for a session (M5-007). */
-export interface SessionTokenMetrics {
-  input: number;
-  output: number;
-  cacheRead: number;
-  cacheWrite: number;
-  total: number;
-}
-
-/** Per-session metrics tracked throughout the session lifetime (M5-007). */
-export interface SessionMetrics {
-  tokens: SessionTokenMetrics;
-  modelSwitches: number;
-  messageCount: number;
-  lastActivityAt: string;
-}
-
 export interface SessionInfoDto {
  id: string;
  provider: string;
  modelId: string;
-  /** M5-005: human-readable agent name when an agent config is applied. */
-  agentName?: string;
  createdAt: string;
  promptCount: number;
  channels: string[];
  durationMs: number;
-  /** M5-007: per-session metrics (token usage, model switches, etc.) */
-  metrics: SessionMetrics;
 }

 export interface SessionListDto {
--- a/apps/gateway/src/agent/sessions.controller.ts
+++ b/apps/gateway/src/agent/sessions.controller.ts
@@ -10,8 +10,6 @@ import {
  UseGuards,
 } from '@nestjs/common';
 import { AuthGuard } from '../auth/auth.guard.js';
-import { CurrentUser } from '../auth/current-user.decorator.js';
-import { scopeFromUser, type AuthenticatedUserLike } from '../auth/session-scope.js';
 import { AgentService } from './agent.service.js';

@Controller('api/sessions')
@@ -20,24 +18,23 @@ export class SessionsController {
  constructor(@Inject(AgentService) private readonly agentService: AgentService) {}

  @Get()
-  list(@CurrentUser() user: AuthenticatedUserLike) {
-    const sessions = this.agentService.listSessions(scopeFromUser(user));
+  list() {
+    const sessions = this.agentService.listSessions();
    return { sessions, total: sessions.length };
  }

  @Get(':id')
-  findOne(@Param('id') id: string, @CurrentUser() user: AuthenticatedUserLike) {
-    const info = this.agentService.getSessionInfo(id, scopeFromUser(user));
+  findOne(@Param('id') id: string) {
+    const info = this.agentService.getSessionInfo(id);
    if (!info) throw new NotFoundException('Session not found');
    return info;
  }

  @Delete(':id')
  @HttpCode(HttpStatus.NO_CONTENT)
-  async destroy(@Param('id') id: string, @CurrentUser() user: AuthenticatedUserLike) {
-    const scope = scopeFromUser(user);
-    const info = this.agentService.getSessionInfo(id, scope);
+  async destroy(@Param('id') id: string) {
+    const info = this.agentService.getSessionInfo(id);
    if (!info) throw new NotFoundException('Session not found');
-    await this.agentService.destroySession(id, scope);
+    await this.agentService.destroySession(id);
  }
 }
--- a/apps/gateway/src/agent/tools/brain-tools.ts
+++ b/apps/gateway/src/agent/tools/brain-tools.ts
@@ -1,6 +1,6 @@
 import { Type } from '@sinclair/typebox';
 import type { ToolDefinition } from '@mariozechner/pi-coding-agent';
-import type { Brain } from '@mosaicstack/brain';
+import type { Brain } from '@mosaic/brain';

 export function createBrainTools(brain: Brain): ToolDefinition[] {
  const listProjects: ToolDefinition = {
--- a/apps/gateway/src/agent/tools/file-tools.ts
+++ b/apps/gateway/src/agent/tools/file-tools.ts
@@ -190,169 +190,5 @@ export function createFileTools(baseDir: string): ToolDefinition[] {
    },
  };

-  const editFileTool: ToolDefinition = {
-    name: 'fs_edit_file',
-    label: 'Edit File',
-    description:
-      'Make targeted text replacements in a file. Each edit replaces an exact match of oldText with newText. ' +
-      'All edits are matched against the original file content (not incrementally). ' +
-      'Each oldText must be unique in the file and edits must not overlap.',
-    parameters: Type.Object({
-      path: Type.String({
-        description: 'File path (relative to sandbox base or absolute within it)',
-      }),
-      edits: Type.Array(
-        Type.Object({
-          oldText: Type.String({
-            description: 'Exact text to find and replace (must be unique in the file)',
-          }),
-          newText: Type.String({ description: 'Replacement text' }),
-        }),
-        { description: 'One or more targeted replacements', minItems: 1 },
-      ),
-    }),
-    async execute(_toolCallId, params) {
-      const { path, edits } = params as {
-        path: string;
-        edits: Array<{ oldText: string; newText: string }>;
-      };
-
-      let safePath: string;
-      try {
-        safePath = guardPath(path, baseDir);
-      } catch (err) {
-        if (err instanceof SandboxEscapeError) {
-          return {
-            content: [{ type: 'text' as const, text: `Error: ${err.message}` }],
-            details: undefined,
-          };
-        }
-        return {
-          content: [{ type: 'text' as const, text: `Error: ${String(err)}` }],
-          details: undefined,
-        };
-      }
-
-      try {
-        const info = await stat(safePath);
-        if (!info.isFile()) {
-          return {
-            content: [{ type: 'text' as const, text: `Error: path is not a file: ${path}` }],
-            details: undefined,
-          };
-        }
-        if (info.size > MAX_READ_BYTES) {
-          return {
-            content: [
-              {
-                type: 'text' as const,
-                text: `Error: file too large for editing (${info.size} bytes, limit ${MAX_READ_BYTES} bytes)`,
-              },
-            ],
-            details: undefined,
-          };
-        }
-      } catch (err) {
-        return {
-          content: [{ type: 'text' as const, text: `Error reading file: ${String(err)}` }],
-          details: undefined,
-        };
-      }
-
-      let content: string;
-      try {
-        content = await readFile(safePath, { encoding: 'utf8' });
-      } catch (err) {
-        return {
-          content: [{ type: 'text' as const, text: `Error reading file: ${String(err)}` }],
-          details: undefined,
-        };
-      }
-
-      // Validate all edits before applying any
-      const errors: string[] = [];
-      for (let i = 0; i < edits.length; i++) {
-        const edit = edits[i]!;
-        const occurrences = content.split(edit.oldText).length - 1;
-        if (occurrences === 0) {
-          errors.push(`Edit ${i + 1}: oldText not found in file`);
-        } else if (occurrences > 1) {
-          errors.push(`Edit ${i + 1}: oldText matches ${occurrences} locations (must be unique)`);
-        }
-      }
-
-      // Check for overlapping edits
-      if (errors.length === 0) {
-        const positions = edits.map((edit, i) => ({
-          index: i,
-          start: content.indexOf(edit.oldText),
-          end: content.indexOf(edit.oldText) + edit.oldText.length,
-        }));
-        positions.sort((a, b) => a.start - b.start);
-        for (let i = 1; i < positions.length; i++) {
-          if (positions[i]!.start < positions[i - 1]!.end) {
-            errors.push(
-              `Edits ${positions[i - 1]!.index + 1} and ${positions[i]!.index + 1} overlap`,
-            );
-          }
-        }
-      }
-
-      if (errors.length > 0) {
-        return {
-          content: [
-            {
-              type: 'text' as const,
-              text: `Edit validation failed:\n${errors.join('\n')}`,
-            },
-          ],
-          details: undefined,
-        };
-      }
-
-      // Apply edits: process from end to start to preserve positions
-      const positions = edits.map((edit) => ({
-        edit,
-        start: content.indexOf(edit.oldText),
-      }));
-      positions.sort((a, b) => b.start - a.start); // reverse order
-
-      let result = content;
-      for (const { edit } of positions) {
-        result = result.replace(edit.oldText, edit.newText);
-      }
-
-      if (Buffer.byteLength(result, 'utf8') > MAX_WRITE_BYTES) {
-        return {
-          content: [
-            {
-              type: 'text' as const,
-              text: `Error: resulting file too large (limit ${MAX_WRITE_BYTES} bytes)`,
-            },
-          ],
-          details: undefined,
-        };
-      }
-
-      try {
-        await writeFile(safePath, result, { encoding: 'utf8' });
-        return {
-          content: [
-            {
-              type: 'text' as const,
-              text: `File edited successfully: ${path} (${edits.length} edit(s) applied)`,
-            },
-          ],
-          details: undefined,
-        };
-      } catch (err) {
-        return {
-          content: [{ type: 'text' as const, text: `Error writing file: ${String(err)}` }],
-          details: undefined,
-        };
-      }
-    },
-  };
-
-  return [readFileTool, writeFileTool, listDirectoryTool, editFileTool];
+  return [readFileTool, writeFileTool, listDirectoryTool];
 }
--- a/apps/gateway/src/agent/tools/index.ts
+++ b/apps/gateway/src/agent/tools/index.ts
@@ -2,7 +2,6 @@ export { createBrainTools } from './brain-tools.js';
 export { createCoordTools } from './coord-tools.js';
 export { createFileTools } from './file-tools.js';
 export { createGitTools } from './git-tools.js';
-export { createSearchTools } from './search-tools.js';
 export { createShellTools } from './shell-tools.js';
 export { createWebTools } from './web-tools.js';
 export { createSkillTools } from './skill-tools.js';
--- a/apps/gateway/src/agent/tools/memory-tools.test.ts
+++ b/apps/gateway/src/agent/tools/memory-tools.test.ts
@@ -1,41 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { createMemoryTools } from './memory-tools.js';
-
-describe('createMemoryTools operator retrieval binding', () => {
-  const memory = {
-    insights: { searchByEmbedding: vi.fn(), create: vi.fn() },
-    preferences: { findByUserAndCategory: vi.fn(), findByUser: vi.fn(), upsert: vi.fn() },
-  };
-  const scope = { tenantId: 'tenant-a', ownerId: 'owner-a', sessionId: 'session-a' };
-
-  it('uses the configured plugin with the server-derived scope for retrieval and capture', async () => {
-    const plugin = {
-      search: vi.fn(async () => []),
-      capture: vi.fn(async () => ({ id: 'insight-1' })),
-    };
-    const tools = createMemoryTools(memory as never, null, 'owner-a', {
-      plugin: plugin as never,
-      scope,
-    });
-
-    await tools
-      .find((tool) => tool.name === 'memory_search')!
-      .execute('call-1', { query: 'plans' }, undefined, undefined, {} as never);
-    await tools
-      .find((tool) => tool.name === 'memory_save_insight')!
-      .execute(
-        'call-2',
-        { content: 'secret', category: 'decision' },
-        undefined,
-        undefined,
-        {} as never,
-      );
-
-    expect(plugin.search).toHaveBeenCalledWith(scope, 'plans', 5);
-    expect(plugin.capture).toHaveBeenCalledWith(scope, {
-      content: 'secret',
-      source: 'agent',
-      category: 'decision',
-    });
-  });
-});
--- a/apps/gateway/src/agent/tools/memory-tools.ts
+++ b/apps/gateway/src/agent/tools/memory-tools.ts
@@ -1,65 +1,29 @@
 import { Type } from '@sinclair/typebox';
 import type { ToolDefinition } from '@mariozechner/pi-coding-agent';
-import type {
-  EmbeddingProvider,
-  Memory,
-  OperatorMemoryPlugin,
-  OperatorMemoryScope,
-} from '@mosaicstack/memory';
+import type { Memory } from '@mosaic/memory';
+import type { EmbeddingProvider } from '@mosaic/memory';

-/**
- * Create memory tools bound to the session's authenticated userId.
- *
- * SECURITY: userId is resolved from the authenticated session at tool-creation
- * time and is never accepted as a user-supplied or LLM-supplied parameter.
- * This prevents cross-user data access via parameter injection.
- */
 export function createMemoryTools(
  memory: Memory,
  embeddingProvider: EmbeddingProvider | null,
-  /** Authenticated user ID from the session. All preference operations are scoped to this user. */
-  sessionUserId: string | undefined,
-  /** Optional configured retrieval plugin, bound to a server-derived session scope. */
-  operatorMemory?: { plugin: OperatorMemoryPlugin; scope: OperatorMemoryScope },
 ): ToolDefinition[] {
-  /** Return an error result when no session user is bound. */
-  function noUserError() {
-    return {
-      content: [
-        {
-          type: 'text' as const,
-          text: 'Memory tools unavailable — no authenticated user bound to this session',
-        },
-      ],
-      details: undefined,
-    };
-  }
-
  const searchMemory: ToolDefinition = {
    name: 'memory_search',
    label: 'Search Memory',
    description:
      'Search across stored insights and knowledge using natural language. Returns semantically similar results.',
    parameters: Type.Object({
+      userId: Type.String({ description: 'User ID to search memory for' }),
      query: Type.String({ description: 'Natural language search query' }),
      limit: Type.Optional(Type.Number({ description: 'Max results (default 5)' })),
    }),
    async execute(_toolCallId, params) {
-      if (!sessionUserId) return noUserError();
-
-      const { query, limit } = params as {
+      const { userId, query, limit } = params as {
+        userId: string;
        query: string;
        limit?: number;
      };

-      if (operatorMemory) {
-        const results = await operatorMemory.plugin.search(operatorMemory.scope, query, limit ?? 5);
-        return {
-          content: [{ type: 'text' as const, text: JSON.stringify(results, null, 2) }],
-          details: undefined,
-        };
-      }
-
      if (!embeddingProvider) {
        return {
          content: [
@@ -73,7 +37,7 @@ export function createMemoryTools(
      }

      const embedding = await embeddingProvider.embed(query);
-      const results = await memory.insights.searchByEmbedding(sessionUserId, embedding, limit ?? 5);
+      const results = await memory.insights.searchByEmbedding(userId, embedding, limit ?? 5);
      return {
        content: [{ type: 'text' as const, text: JSON.stringify(results, null, 2) }],
        details: undefined,
@@ -84,8 +48,9 @@ export function createMemoryTools(
  const getPreferences: ToolDefinition = {
    name: 'memory_get_preferences',
    label: 'Get User Preferences',
-    description: 'Retrieve stored preferences for the current session user.',
+    description: 'Retrieve stored preferences for a user.',
    parameters: Type.Object({
+      userId: Type.String({ description: 'User ID' }),
      category: Type.Optional(
        Type.String({
          description: 'Filter by category: communication, coding, workflow, appearance, general',
@@ -93,13 +58,11 @@ export function createMemoryTools(
      ),
    }),
    async execute(_toolCallId, params) {
-      if (!sessionUserId) return noUserError();
-
-      const { category } = params as { category?: string };
+      const { userId, category } = params as { userId: string; category?: string };
      type Cat = 'communication' | 'coding' | 'workflow' | 'appearance' | 'general';
      const prefs = category
-        ? await memory.preferences.findByUserAndCategory(sessionUserId, category as Cat)
-        : await memory.preferences.findByUser(sessionUserId);
+        ? await memory.preferences.findByUserAndCategory(userId, category as Cat)
+        : await memory.preferences.findByUser(userId);
      return {
        content: [{ type: 'text' as const, text: JSON.stringify(prefs, null, 2) }],
        details: undefined,
@@ -113,6 +76,7 @@ export function createMemoryTools(
    description:
      'Store a learned user preference (e.g., "prefers tables over paragraphs", "timezone: America/Chicago").',
    parameters: Type.Object({
+      userId: Type.String({ description: 'User ID' }),
      key: Type.String({ description: 'Preference key' }),
      value: Type.String({ description: 'Preference value (JSON string)' }),
      category: Type.Optional(
@@ -122,9 +86,8 @@ export function createMemoryTools(
      ),
    }),
    async execute(_toolCallId, params) {
-      if (!sessionUserId) return noUserError();
-
-      const { key, value, category } = params as {
+      const { userId, key, value, category } = params as {
+        userId: string;
        key: string;
        value: string;
        category?: string;
@@ -137,7 +100,7 @@ export function createMemoryTools(
        parsedValue = value;
      }
      const pref = await memory.preferences.upsert({
-        userId: sessionUserId,
+        userId,
        key,
        value: parsedValue,
        category: (category as Cat) ?? 'general',
@@ -156,6 +119,7 @@ export function createMemoryTools(
    description:
      'Store a learned insight, decision, or knowledge extracted from the current interaction.',
    parameters: Type.Object({
+      userId: Type.String({ description: 'User ID' }),
      content: Type.String({ description: 'The insight or knowledge to store' }),
      category: Type.Optional(
        Type.String({
@@ -164,33 +128,20 @@ export function createMemoryTools(
      ),
    }),
    async execute(_toolCallId, params) {
-      if (!sessionUserId) return noUserError();
-
-      const { content, category } = params as {
+      const { userId, content, category } = params as {
+        userId: string;
        content: string;
        category?: string;
      };
      type Cat = 'decision' | 'learning' | 'preference' | 'fact' | 'pattern' | 'general';

-      if (operatorMemory) {
-        const insight = await operatorMemory.plugin.capture(operatorMemory.scope, {
-          content,
-          source: 'agent',
-          category: category ?? 'learning',
-        });
-        return {
-          content: [{ type: 'text' as const, text: JSON.stringify(insight, null, 2) }],
-          details: undefined,
-        };
-      }
-
      let embedding: number[] | null = null;
      if (embeddingProvider) {
        embedding = await embeddingProvider.embed(content);
      }

      const insight = await memory.insights.create({
-        userId: sessionUserId,
+        userId,
        content,
        embedding,
        source: 'agent',
--- a/apps/gateway/src/agent/tools/search-tools.ts
+++ b/apps/gateway/src/agent/tools/search-tools.ts
@@ -1,496 +0,0 @@
-import { Type } from '@sinclair/typebox';
-import type { ToolDefinition } from '@mariozechner/pi-coding-agent';
-
-const DEFAULT_TIMEOUT_MS = 15_000;
-const MAX_RESULTS = 10;
-const MAX_RESPONSE_BYTES = 256 * 1024; // 256 KB
-
-// ─── Provider helpers ────────────────────────────────────────────────────────
-
-interface SearchResult {
-  title: string;
-  url: string;
-  snippet: string;
-}
-
-interface SearchResponse {
-  provider: string;
-  query: string;
-  results: SearchResult[];
-  error?: string;
-}
-
-async function fetchWithTimeout(
-  url: string,
-  init: RequestInit,
-  timeoutMs: number,
-): Promise<Response> {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    return await fetch(url, { ...init, signal: controller.signal });
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-async function readLimited(response: Response): Promise<string> {
-  const reader = response.body?.getReader();
-  if (!reader) return '';
-  const chunks: Uint8Array[] = [];
-  let total = 0;
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    total += value.length;
-    if (total > MAX_RESPONSE_BYTES) {
-      chunks.push(value.subarray(0, MAX_RESPONSE_BYTES - (total - value.length)));
-      reader.cancel();
-      break;
-    }
-    chunks.push(value);
-  }
-  const combined = new Uint8Array(chunks.reduce((a, c) => a + c.length, 0));
-  let offset = 0;
-  for (const chunk of chunks) {
-    combined.set(chunk, offset);
-    offset += chunk.length;
-  }
-  return new TextDecoder().decode(combined);
-}
-
-// ─── Brave Search ────────────────────────────────────────────────────────────
-
-async function searchBrave(query: string, limit: number): Promise<SearchResponse> {
-  const apiKey = process.env['BRAVE_API_KEY'];
-  if (!apiKey) return { provider: 'brave', query, results: [], error: 'BRAVE_API_KEY not set' };
-
-  try {
-    const params = new URLSearchParams({
-      q: query,
-      count: String(Math.min(limit, 20)),
-    });
-    const res = await fetchWithTimeout(
-      `https://api.search.brave.com/res/v1/web/search?${params}`,
-      { headers: { 'X-Subscription-Token': apiKey, Accept: 'application/json' } },
-      DEFAULT_TIMEOUT_MS,
-    );
-    if (!res.ok) {
-      const body = await res.text().catch(() => '');
-      return { provider: 'brave', query, results: [], error: `HTTP ${res.status}: ${body}` };
-    }
-    const data = (await res.json()) as {
-      web?: { results?: Array<{ title: string; url: string; description: string }> };
-    };
-    const results: SearchResult[] = (data.web?.results ?? []).slice(0, limit).map((r) => ({
-      title: r.title,
-      url: r.url,
-      snippet: r.description,
-    }));
-    return { provider: 'brave', query, results };
-  } catch (err) {
-    return {
-      provider: 'brave',
-      query,
-      results: [],
-      error: err instanceof Error ? err.message : String(err),
-    };
-  }
-}
-
-// ─── Tavily Search ───────────────────────────────────────────────────────────
-
-async function searchTavily(query: string, limit: number): Promise<SearchResponse> {
-  const apiKey = process.env['TAVILY_API_KEY'];
-  if (!apiKey) return { provider: 'tavily', query, results: [], error: 'TAVILY_API_KEY not set' };
-
-  try {
-    const res = await fetchWithTimeout(
-      'https://api.tavily.com/search',
-      {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-          api_key: apiKey,
-          query,
-          max_results: Math.min(limit, 10),
-          include_answer: false,
-        }),
-      },
-      DEFAULT_TIMEOUT_MS,
-    );
-    if (!res.ok) {
-      const body = await res.text().catch(() => '');
-      return { provider: 'tavily', query, results: [], error: `HTTP ${res.status}: ${body}` };
-    }
-    const data = (await res.json()) as {
-      results?: Array<{ title: string; url: string; content: string }>;
-    };
-    const results: SearchResult[] = (data.results ?? []).slice(0, limit).map((r) => ({
-      title: r.title,
-      url: r.url,
-      snippet: r.content,
-    }));
-    return { provider: 'tavily', query, results };
-  } catch (err) {
-    return {
-      provider: 'tavily',
-      query,
-      results: [],
-      error: err instanceof Error ? err.message : String(err),
-    };
-  }
-}
-
-// ─── SearXNG (self-hosted) ───────────────────────────────────────────────────
-
-async function searchSearxng(query: string, limit: number): Promise<SearchResponse> {
-  const baseUrl = process.env['SEARXNG_URL'];
-  if (!baseUrl) return { provider: 'searxng', query, results: [], error: 'SEARXNG_URL not set' };
-
-  try {
-    const params = new URLSearchParams({
-      q: query,
-      format: 'json',
-      pageno: '1',
-    });
-    const res = await fetchWithTimeout(
-      `${baseUrl.replace(/\/$/, '')}/search?${params}`,
-      { headers: { Accept: 'application/json' } },
-      DEFAULT_TIMEOUT_MS,
-    );
-    if (!res.ok) {
-      const body = await res.text().catch(() => '');
-      return { provider: 'searxng', query, results: [], error: `HTTP ${res.status}: ${body}` };
-    }
-    const data = (await res.json()) as {
-      results?: Array<{ title: string; url: string; content: string }>;
-    };
-    const results: SearchResult[] = (data.results ?? []).slice(0, limit).map((r) => ({
-      title: r.title,
-      url: r.url,
-      snippet: r.content,
-    }));
-    return { provider: 'searxng', query, results };
-  } catch (err) {
-    return {
-      provider: 'searxng',
-      query,
-      results: [],
-      error: err instanceof Error ? err.message : String(err),
-    };
-  }
-}
-
-// ─── DuckDuckGo (lite HTML endpoint) ─────────────────────────────────────────
-
-async function searchDuckDuckGo(query: string, limit: number): Promise<SearchResponse> {
-  try {
-    // Use the DuckDuckGo Instant Answer API (JSON, free, no key)
-    const params = new URLSearchParams({
-      q: query,
-      format: 'json',
-      no_html: '1',
-      skip_disambig: '1',
-    });
-    const res = await fetchWithTimeout(
-      `https://api.duckduckgo.com/?${params}`,
-      { headers: { Accept: 'application/json' } },
-      DEFAULT_TIMEOUT_MS,
-    );
-    if (!res.ok) {
-      return {
-        provider: 'duckduckgo',
-        query,
-        results: [],
-        error: `HTTP ${res.status}`,
-      };
-    }
-    const text = await readLimited(res);
-    const data = JSON.parse(text) as {
-      AbstractText?: string;
-      AbstractURL?: string;
-      AbstractSource?: string;
-      RelatedTopics?: Array<{
-        Text?: string;
-        FirstURL?: string;
-        Result?: string;
-        Topics?: Array<{ Text?: string; FirstURL?: string }>;
-      }>;
-    };
-
-    const results: SearchResult[] = [];
-
-    // Main abstract result
-    if (data.AbstractText && data.AbstractURL) {
-      results.push({
-        title: data.AbstractSource ?? 'DuckDuckGo Abstract',
-        url: data.AbstractURL,
-        snippet: data.AbstractText,
-      });
-    }
-
-    // Related topics
-    for (const topic of data.RelatedTopics ?? []) {
-      if (results.length >= limit) break;
-      if (topic.Text && topic.FirstURL) {
-        results.push({
-          title: topic.Text.slice(0, 120),
-          url: topic.FirstURL,
-          snippet: topic.Text,
-        });
-      }
-      // Sub-topics
-      for (const sub of topic.Topics ?? []) {
-        if (results.length >= limit) break;
-        if (sub.Text && sub.FirstURL) {
-          results.push({
-            title: sub.Text.slice(0, 120),
-            url: sub.FirstURL,
-            snippet: sub.Text,
-          });
-        }
-      }
-    }
-
-    return { provider: 'duckduckgo', query, results: results.slice(0, limit) };
-  } catch (err) {
-    return {
-      provider: 'duckduckgo',
-      query,
-      results: [],
-      error: err instanceof Error ? err.message : String(err),
-    };
-  }
-}
-
-// ─── Provider resolution ─────────────────────────────────────────────────────
-
-type SearchProvider = 'brave' | 'tavily' | 'searxng' | 'duckduckgo' | 'auto';
-
-function getAvailableProviders(): SearchProvider[] {
-  const available: SearchProvider[] = [];
-  if (process.env['BRAVE_API_KEY']) available.push('brave');
-  if (process.env['TAVILY_API_KEY']) available.push('tavily');
-  if (process.env['SEARXNG_URL']) available.push('searxng');
-  // DuckDuckGo is always available (no API key needed)
-  available.push('duckduckgo');
-  return available;
-}
-
-async function executeSearch(
-  provider: SearchProvider,
-  query: string,
-  limit: number,
-): Promise<SearchResponse> {
-  switch (provider) {
-    case 'brave':
-      return searchBrave(query, limit);
-    case 'tavily':
-      return searchTavily(query, limit);
-    case 'searxng':
-      return searchSearxng(query, limit);
-    case 'duckduckgo':
-      return searchDuckDuckGo(query, limit);
-    case 'auto': {
-      // Try providers in priority order: Brave > Tavily > SearXNG > DuckDuckGo
-      const available = getAvailableProviders();
-      for (const p of available) {
-        const result = await executeSearch(p, query, limit);
-        if (!result.error && result.results.length > 0) return result;
-      }
-      // Fall back to DuckDuckGo if everything failed
-      return searchDuckDuckGo(query, limit);
-    }
-  }
-}
-
-function formatSearchResults(response: SearchResponse): string {
-  const lines: string[] = [];
-  lines.push(`Search provider: ${response.provider}`);
-  lines.push(`Query: "${response.query}"`);
-
-  if (response.error) {
-    lines.push(`Error: ${response.error}`);
-  }
-
-  if (response.results.length === 0) {
-    lines.push('No results found.');
-  } else {
-    lines.push(`Results (${response.results.length}):\n`);
-    for (let i = 0; i < response.results.length; i++) {
-      const r = response.results[i]!;
-      lines.push(`${i + 1}. ${r.title}`);
-      lines.push(`   URL: ${r.url}`);
-      lines.push(`   ${r.snippet}`);
-      lines.push('');
-    }
-  }
-  return lines.join('\n');
-}
-
-// ─── Tool exports ────────────────────────────────────────────────────────────
-
-export function createSearchTools(): ToolDefinition[] {
-  const webSearch: ToolDefinition = {
-    name: 'web_search',
-    label: 'Web Search',
-    description:
-      'Search the web using configured search providers. ' +
-      'Supports Brave, Tavily, SearXNG, and DuckDuckGo. ' +
-      'Use "auto" provider to pick the best available. ' +
-      'DuckDuckGo is always available as a fallback (no API key needed).',
-    parameters: Type.Object({
-      query: Type.String({ description: 'Search query' }),
-      provider: Type.Optional(
-        Type.String({
-          description:
-            'Search provider: "auto" (default), "brave", "tavily", "searxng", or "duckduckgo"',
-        }),
-      ),
-      limit: Type.Optional(
-        Type.Number({ description: `Max results to return (default 5, max ${MAX_RESULTS})` }),
-      ),
-    }),
-    async execute(_toolCallId, params) {
-      const { query, provider, limit } = params as {
-        query: string;
-        provider?: string;
-        limit?: number;
-      };
-
-      const effectiveProvider = (provider ?? 'auto') as SearchProvider;
-      const validProviders = ['auto', 'brave', 'tavily', 'searxng', 'duckduckgo'];
-      if (!validProviders.includes(effectiveProvider)) {
-        return {
-          content: [
-            {
-              type: 'text' as const,
-              text: `Invalid provider "${provider}". Valid: ${validProviders.join(', ')}`,
-            },
-          ],
-          details: undefined,
-        };
-      }
-
-      const effectiveLimit = Math.min(Math.max(limit ?? 5, 1), MAX_RESULTS);
-
-      try {
-        const response = await executeSearch(effectiveProvider, query, effectiveLimit);
-        return {
-          content: [{ type: 'text' as const, text: formatSearchResults(response) }],
-          details: undefined,
-        };
-      } catch (err) {
-        return {
-          content: [
-            {
-              type: 'text' as const,
-              text: `Search failed: ${err instanceof Error ? err.message : String(err)}`,
-            },
-          ],
-          details: undefined,
-        };
-      }
-    },
-  };
-
-  const webSearchNews: ToolDefinition = {
-    name: 'web_search_news',
-    label: 'Web Search (News)',
-    description:
-      'Search for recent news articles. Uses Brave News API if available, falls back to standard search with news keywords.',
-    parameters: Type.Object({
-      query: Type.String({ description: 'News search query' }),
-      limit: Type.Optional(
-        Type.Number({ description: `Max results (default 5, max ${MAX_RESULTS})` }),
-      ),
-    }),
-    async execute(_toolCallId, params) {
-      const { query, limit } = params as { query: string; limit?: number };
-      const effectiveLimit = Math.min(Math.max(limit ?? 5, 1), MAX_RESULTS);
-
-      // Try Brave News API first (dedicated news endpoint)
-      const braveKey = process.env['BRAVE_API_KEY'];
-      if (braveKey) {
-        try {
-          const newsParams = new URLSearchParams({
-            q: query,
-            count: String(effectiveLimit),
-          });
-          const res = await fetchWithTimeout(
-            `https://api.search.brave.com/res/v1/news/search?${newsParams}`,
-            {
-              headers: {
-                'X-Subscription-Token': braveKey,
-                Accept: 'application/json',
-              },
-            },
-            DEFAULT_TIMEOUT_MS,
-          );
-          if (res.ok) {
-            const data = (await res.json()) as {
-              results?: Array<{
-                title: string;
-                url: string;
-                description: string;
-                age?: string;
-              }>;
-            };
-            const results: SearchResult[] = (data.results ?? [])
-              .slice(0, effectiveLimit)
-              .map((r) => ({
-                title: r.title + (r.age ? ` (${r.age})` : ''),
-                url: r.url,
-                snippet: r.description,
-              }));
-            const response: SearchResponse = { provider: 'brave-news', query, results };
-            return {
-              content: [{ type: 'text' as const, text: formatSearchResults(response) }],
-              details: undefined,
-            };
-          }
-        } catch {
-          // Fall through to generic search
-        }
-      }
-
-      // Fallback: standard search with "news" appended
-      const newsQuery = `${query} news latest`;
-      const response = await executeSearch('auto', newsQuery, effectiveLimit);
-      return {
-        content: [{ type: 'text' as const, text: formatSearchResults(response) }],
-        details: undefined,
-      };
-    },
-  };
-
-  const searchProviders: ToolDefinition = {
-    name: 'web_search_providers',
-    label: 'List Search Providers',
-    description: 'List the currently available and configured web search providers.',
-    parameters: Type.Object({}),
-    async execute() {
-      const available = getAvailableProviders();
-      const allProviders = [
-        { name: 'brave', configured: !!process.env['BRAVE_API_KEY'], envVar: 'BRAVE_API_KEY' },
-        { name: 'tavily', configured: !!process.env['TAVILY_API_KEY'], envVar: 'TAVILY_API_KEY' },
-        { name: 'searxng', configured: !!process.env['SEARXNG_URL'], envVar: 'SEARXNG_URL' },
-        { name: 'duckduckgo', configured: true, envVar: '(none — always available)' },
-      ];
-
-      const lines = ['Search providers:\n'];
-      for (const p of allProviders) {
-        const status = p.configured ? '✓ configured' : '✗ not configured';
-        lines.push(`  ${p.name}: ${status} (${p.envVar})`);
-      }
-      lines.push(`\nActive providers for "auto" mode: ${available.join(', ')}`);
-      return {
-        content: [{ type: 'text' as const, text: lines.join('\n') }],
-        details: undefined,
-      };
-    },
-  };
-
-  return [webSearch, webSearchNews, searchProviders];
-}
--- a/apps/gateway/src/app.module.ts
+++ b/apps/gateway/src/app.module.ts
@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common';
 import { APP_GUARD } from '@nestjs/core';
 import { HealthController } from './health/health.controller.js';
-import { ConfigModule } from './config/config.module.js';
 import { DatabaseModule } from './database/database.module.js';
 import { AuthModule } from './auth/auth.module.js';
 import { BrainModule } from './brain/brain.module.js';
@@ -23,14 +22,11 @@ import { PreferencesModule } from './preferences/preferences.module.js';
 import { GCModule } from './gc/gc.module.js';
 import { ReloadModule } from './reload/reload.module.js';
 import { WorkspaceModule } from './workspace/workspace.module.js';
-import { QueueModule } from './queue/queue.module.js';
-import { FederationModule } from './federation/federation.module.js';
 import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';

@Module({
  imports: [
    ThrottlerModule.forRoot([{ name: 'default', ttl: 60_000, limit: 60 }]),
-    ConfigModule,
    DatabaseModule,
    AuthModule,
    BrainModule,
@@ -50,10 +46,8 @@ import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';
    PreferencesModule,
    CommandsModule,
    GCModule,
-    QueueModule,
    ReloadModule,
    WorkspaceModule,
-    FederationModule,
  ],
  controllers: [HealthController],
  providers: [
--- a/apps/gateway/src/auth/auth.controller.ts
+++ b/apps/gateway/src/auth/auth.controller.ts
@@ -1,6 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { toNodeHandler } from 'better-auth/node';
-import type { Auth } from '@mosaicstack/auth';
+import type { Auth } from '@mosaic/auth';
 import type { NestFastifyApplication } from '@nestjs/platform-fastify';
 import { AUTH } from './auth.tokens.js';

--- a/apps/gateway/src/auth/auth.guard.ts
+++ b/apps/gateway/src/auth/auth.guard.ts
@@ -6,7 +6,7 @@ import {
  UnauthorizedException,
 } from '@nestjs/common';
 import { fromNodeHeaders } from 'better-auth/node';
-import type { Auth } from '@mosaicstack/auth';
+import type { Auth } from '@mosaic/auth';
 import type { FastifyRequest } from 'fastify';
 import { AUTH } from './auth.tokens.js';

--- a/apps/gateway/src/auth/auth.module.ts
+++ b/apps/gateway/src/auth/auth.module.ts
@@ -1,20 +1,18 @@
 import { Global, Module } from '@nestjs/common';
-import { createAuth, type Auth } from '@mosaicstack/auth';
-import type { Db } from '@mosaicstack/db';
+import { createAuth, type Auth } from '@mosaic/auth';
+import type { Db } from '@mosaic/db';
 import { DB } from '../database/database.module.js';
 import { AUTH } from './auth.tokens.js';
-import { SsoController } from './sso.controller.js';

@Global()
@Module({
-  controllers: [SsoController],
  providers: [
    {
      provide: AUTH,
      useFactory: (db: Db): Auth =>
        createAuth({
          db,
-          baseURL: process.env['BETTER_AUTH_URL'] ?? 'http://localhost:14242',
+          baseURL: process.env['BETTER_AUTH_URL'] ?? 'http://localhost:4000',
          secret: process.env['BETTER_AUTH_SECRET'],
        }),
      inject: [DB],
--- a/apps/gateway/src/auth/session-scope.ts
+++ b/apps/gateway/src/auth/session-scope.ts
@@ -1,24 +0,0 @@
-export interface AuthenticatedUserLike {
-  id: string;
-  tenantId?: string | null;
-  teamId?: string | null;
-  organizationId?: string | null;
-  orgId?: string | null;
-}
-
-export interface ActorTenantScope {
-  userId: string;
-  tenantId: string;
-}
-
-/**
- * Build the immutable server-derived scope used for Tess session operations.
- * Current Mosaic auth is user-scoped; future org/team claims can populate one
- * of the tenant fields without allowing clients to choose another tenant.
- */
-export function scopeFromUser(user: AuthenticatedUserLike): ActorTenantScope {
-  return {
-    userId: user.id,
-    tenantId: user.tenantId ?? user.teamId ?? user.organizationId ?? user.orgId ?? user.id,
-  };
-}
--- a/Show More
+++ b/Show More