feat(M4-013,M5-001,M5-002,M5-003): routing e2e tests, agent config loading, model+agent switching

- M4-013: Add routing-e2e.test.ts with 9 integration tests covering the full classify → match rules → routing decision pipeline; includes coding→Opus, summarization→GLM-5, conversation→Sonnet, cheap-tier→Haiku, /model bypass, unhealthy-provider fallback, and research→Codex scenarios - M5-001: Store resolvedAgentName during session creation when agentConfigId is provided; expose agentName on AgentSession and SessionInfoDto; emit agentName in session:info from chat.gateway.ts (message handler and set:thinking handler); preserve userId and conversationHistory in merged options so they are not lost when agent config is applied - M5-002: Add AgentService.updateSessionModel() to update live session modelId metadata; wire it into ChatGateway.setModelOverride() so the /model command immediately reflects in session:info; add ChatGateway.broadcastSessionInfo() to push updated session:info to all clients watching a conversation on model or agent switch - M5-003: Implement /agent <name> command end-to-end: inject Brain into CommandExecutorService; replace stub handleAgent() with real brain.agents.findByName() + findById() lookup; call agentService.applyAgentConfig() to update live session; emit session:info via chatGateway.broadcastSessionInfo(); update tests to mock brain and agentService.applyAgentConfig; add AgentService.applyAgentConfig() method Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-22 20:01:59 -05:00
761 changed files with 1547 additions and 87436 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 ───────────────────────────────────────────────────────────
@@ -121,12 +121,12 @@ 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) ───────────────────────────────
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1 @@
-@mosaicstack:registry=https://git.mosaicstack.dev/api/packages/mosaicstack/npm/
+@mosaic:registry=https://git.mosaicstack.dev/api/packages/mosaic/npm/
--- a/.woodpecker/ci.yml
+++ b/.woodpecker/ci.yml
@@ -15,7 +15,6 @@ steps:
    image: *node_image
    commands:
      - corepack enable
-      - apk add --no-cache python3 make g++
      - pnpm install --frozen-lockfile

  typecheck:
@@ -45,30 +44,18 @@ steps:

  test:
    image: *node_image
-    environment:
-      DATABASE_URL: postgresql://mosaic:mosaic@postgres:5432/mosaic
    commands:
      - *enable_pnpm
-      # Install postgresql-client for pg_isready
-      - apk add --no-cache postgresql-client
-      # Wait up to 30s for postgres to be ready
-      - |
-        for i in $(seq 1 30); do
-          pg_isready -h postgres -p 5432 -U mosaic && break
-          echo "Waiting for postgres ($i/30)..."
-          sleep 1
-        done
-      # 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:
-  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,140 +0,0 @@
-# Build, publish npm packages, and push Docker images
-# Runs only on main branch push/tag
-
-variables:
-  - &node_image 'node:22-alpine'
-  - &enable_pnpm 'corepack enable'
-
-when:
-  - branch: [main]
-    event: [push, manual, tag]
-
-steps:
-  install:
-    image: *node_image
-    commands:
-      - corepack enable
-      - pnpm install --frozen-lockfile
-
-  build:
-    image: *node_image
-    commands:
-      - *enable_pnpm
-      - pnpm build
-    depends_on:
-      - install
-
-  publish-npm:
-    image: *node_image
-    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
-    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/mosaic-stack/gateway:sha-${CI_COMMIT_SHA:0:7}"
-        if [ "$CI_COMMIT_BRANCH" = "main" ]; then
-          DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/mosaic-stack/gateway:latest"
-        fi
-        if [ -n "$CI_COMMIT_TAG" ]; then
-          DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/mosaic-stack/gateway:$CI_COMMIT_TAG"
-        fi
-        /kaniko/executor --context . --dockerfile docker/gateway.Dockerfile $DESTINATIONS
-    depends_on:
-      - build
-
-  build-web:
-    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
-      - |
-        DESTINATIONS="--destination git.mosaicstack.dev/mosaicstack/mosaic-stack/web:sha-${CI_COMMIT_SHA:0:7}"
-        if [ "$CI_COMMIT_BRANCH" = "main" ]; then
-          DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/mosaic-stack/web:latest"
-        fi
-        if [ -n "$CI_COMMIT_TAG" ]; then
-          DESTINATIONS="$DESTINATIONS --destination git.mosaicstack.dev/mosaicstack/mosaic-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)

--- 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/README.md
+++ b/README.md
@@ -1,348 +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
-bash <(curl -fsSL https://git.mosaicstack.dev/mosaicstack/mosaic-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.
-
-### 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
-
-```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/mosaic-stack.git
-cd mosaic-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
-
-```
-mosaic-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
-bash <(curl -fsSL https://git.mosaicstack.dev/mosaicstack/mosaic-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/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/mosaic-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",
@@ -28,28 +14,26 @@
  "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/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/brain": "workspace:^",
+    "@mosaic/coord": "workspace:^",
+    "@mosaic/db": "workspace:^",
+    "@mosaic/discord-plugin": "workspace:^",
+    "@mosaic/log": "workspace:^",
+    "@mosaic/memory": "workspace:^",
+    "@mosaic/queue": "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",
@@ -58,7 +42,6 @@
    "@opentelemetry/semantic-conventions": "^1.40.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",
@@ -72,17 +55,11 @@
    "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
@@ -12,7 +12,7 @@ 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';
+import type { Message } from '@mosaic/brain';

 // ---------------------------------------------------------------------------
 // Shared test data
--- a/apps/gateway/src/tests/cross-user-isolation.test.ts
+++ b/apps/gateway/src/tests/cross-user-isolation.test.ts
@@ -18,13 +18,13 @@
 */

 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';
+import { createDb } from '@mosaic/db';
+import { createConversationsRepo } from '@mosaic/brain';
+import { createAgentsRepo } from '@mosaic/brain';
+import { createPreferencesRepo, createInsightsRepo } from '@mosaic/memory';
+import { users, conversations, messages, agents, preferences, insights } from '@mosaic/db';
+import { eq } from '@mosaic/db';
+import type { DbHandle } from '@mosaic/db';

 // ─── Fixed IDs so the afterAll cleanup is deterministic ──────────────────────

--- 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';
--- 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/provider-adapters.test.ts
+++ b/apps/gateway/src/agent/tests/provider-adapters.test.ts
@@ -62,7 +62,7 @@ function restoreEnv(saved: Map<EnvKey, string | undefined>): void {
 }

 function makeRegistry(): ModelRegistry {
-  return ModelRegistry.inMemory(AuthStorage.inMemory());
+  return new ModelRegistry(AuthStorage.inMemory());
 }

 // ---------------------------------------------------------------------------
--- 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/adapters/anthropic.adapter.ts
+++ b/apps/gateway/src/agent/adapters/anthropic.adapter.ts
@@ -7,7 +7,7 @@ import type {
  IProviderAdapter,
  ModelInfo,
  ProviderHealth,
-} from '@mosaicstack/types';
+} from '@mosaic/types';

 /**
 * Anthropic provider adapter.
--- a/apps/gateway/src/agent/adapters/ollama.adapter.ts
+++ b/apps/gateway/src/agent/adapters/ollama.adapter.ts
@@ -6,7 +6,7 @@ import type {
  IProviderAdapter,
  ModelInfo,
  ProviderHealth,
-} from '@mosaicstack/types';
+} from '@mosaic/types';

 /** Embedding models that Ollama ships with out of the box */
 const OLLAMA_EMBEDDING_MODELS: ReadonlyArray<{
--- a/apps/gateway/src/agent/adapters/openai.adapter.ts
+++ b/apps/gateway/src/agent/adapters/openai.adapter.ts
@@ -7,7 +7,7 @@ import type {
  IProviderAdapter,
  ModelInfo,
  ProviderHealth,
-} from '@mosaicstack/types';
+} from '@mosaic/types';

 /**
 * OpenAI provider adapter.
--- a/apps/gateway/src/agent/adapters/openrouter.adapter.ts
+++ b/apps/gateway/src/agent/adapters/openrouter.adapter.ts
@@ -6,7 +6,7 @@ import type {
  IProviderAdapter,
  ModelInfo,
  ProviderHealth,
-} from '@mosaicstack/types';
+} from '@mosaic/types';

 const OPENROUTER_BASE_URL = 'https://openrouter.ai/api/v1';

--- a/apps/gateway/src/agent/adapters/zai.adapter.ts
+++ b/apps/gateway/src/agent/adapters/zai.adapter.ts
@@ -6,7 +6,7 @@ import type {
  IProviderAdapter,
  ModelInfo,
  ProviderHealth,
-} from '@mosaicstack/types';
+} from '@mosaic/types';
 import { getModelCapability } from '../model-capabilities.js';

 /**
--- a/apps/gateway/src/agent/agent-configs.controller.ts
+++ b/apps/gateway/src/agent/agent-configs.controller.ts
@@ -13,7 +13,7 @@ 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';
--- a/apps/gateway/src/agent/agent.service.ts
+++ b/apps/gateway/src/agent/agent.service.ts
@@ -7,8 +7,8 @@ import {
  type AgentSessionEvent,
  type ToolDefinition,
 } from '@mariozechner/pi-coding-agent';
-import type { Brain } from '@mosaicstack/brain';
-import type { Memory } 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 { EmbeddingService } from '../memory/embedding.service.js';
@@ -23,8 +23,7 @@ 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';
@@ -98,8 +97,6 @@ export interface AgentSession {
  agentConfigId?: string;
  /** Human-readable agent name applied to this session, if any (M5-001). */
  agentName?: string;
-  /** M5-007: per-session metrics. */
-  metrics: SessionMetrics;
 }

@Injectable()
@@ -147,7 +144,6 @@ export class AgentService implements OnModuleDestroy {
      ...createGitTools(sandboxDir),
      ...createShellTools(sandboxDir),
      ...createWebTools(),
-      ...createSearchTools(),
    ];
  }

@@ -344,12 +340,6 @@ export class AgentService implements OnModuleDestroy {
      userId: mergedOptions?.userId,
      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);
@@ -477,95 +467,24 @@ export class AgentService implements OnModuleDestroy {
    return this.sessions.get(sessionId);
  }

-  listSessions(): SessionInfoDto[] {
-    const now = Date.now();
-    return Array.from(this.sessions.values()).map((s) => ({
-      id: s.id,
-      provider: s.provider,
-      modelId: s.modelId,
-      ...(s.agentName ? { agentName: s.agentName } : {}),
-      createdAt: new Date(s.createdAt).toISOString(),
-      promptCount: s.promptCount,
-      channels: Array.from(s.channels),
-      durationMs: now - s.createdAt,
-      metrics: { ...s.metrics },
-    }));
-  }
-
-  getSessionInfo(sessionId: string): SessionInfoDto | undefined {
-    const s = this.sessions.get(sessionId);
-    if (!s) return undefined;
-    return {
-      id: s.id,
-      provider: s.provider,
-      modelId: s.modelId,
-      ...(s.agentName ? { agentName: s.agentName } : {}),
-      createdAt: new Date(s.createdAt).toISOString(),
-      promptCount: s.promptCount,
-      channels: Array.from(s.channels),
-      durationMs: Date.now() - s.createdAt,
-      metrics: { ...s.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 {
-    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.
+   * Records the model change in session metadata so subsequent session:info
+   * emissions reflect the new model. The Pi session itself is not reconstructed —
+   * the new model takes effect on the next message prompt.
   */
  updateSessionModel(sessionId: string, modelId: string): void {
    const session = this.sessions.get(sessionId);
    if (!session) return;
    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
+   * System prompt and tools take effect when a new session is created for
   * this conversationId (they are baked in at session creation time).
   */
  applyAgentConfig(
@@ -586,6 +505,35 @@ export class AgentService implements OnModuleDestroy {
    );
  }

+  listSessions(): SessionInfoDto[] {
+    const now = Date.now();
+    return Array.from(this.sessions.values()).map((s) => ({
+      id: s.id,
+      provider: s.provider,
+      modelId: s.modelId,
+      ...(s.agentName ? { agentName: s.agentName } : {}),
+      createdAt: new Date(s.createdAt).toISOString(),
+      promptCount: s.promptCount,
+      channels: Array.from(s.channels),
+      durationMs: now - s.createdAt,
+    }));
+  }
+
+  getSessionInfo(sessionId: string): SessionInfoDto | undefined {
+    const s = this.sessions.get(sessionId);
+    if (!s) return undefined;
+    return {
+      id: s.id,
+      provider: s.provider,
+      modelId: s.modelId,
+      ...(s.agentName ? { agentName: s.agentName } : {}),
+      createdAt: new Date(s.createdAt).toISOString(),
+      promptCount: s.promptCount,
+      channels: Array.from(s.channels),
+      durationMs: Date.now() - s.createdAt,
+    };
+  }
+
  addChannel(sessionId: string, channel: string): void {
    const session = this.sessions.get(sessionId);
    if (session) {
--- a/apps/gateway/src/agent/model-capabilities.ts
+++ b/apps/gateway/src/agent/model-capabilities.ts
@@ -1,4 +1,4 @@
-import type { ModelCapability } from '@mosaicstack/types';
+import type { ModelCapability } from '@mosaic/types';

 /**
 * Comprehensive capability matrix for all target models.
--- a/apps/gateway/src/agent/provider-credentials.service.ts
+++ b/apps/gateway/src/agent/provider-credentials.service.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { createCipheriv, createDecipheriv, createHash, randomBytes } from 'node:crypto';
-import type { Db } from '@mosaicstack/db';
-import { providerCredentials, eq, and } from '@mosaicstack/db';
+import type { Db } from '@mosaic/db';
+import { providerCredentials, eq, and } from '@mosaic/db';
 import { DB } from '../database/database.module.js';
 import type { ProviderCredentialSummaryDto } from './provider-credentials.dto.js';

--- a/apps/gateway/src/agent/provider.service.ts
+++ b/apps/gateway/src/agent/provider.service.ts
@@ -14,7 +14,7 @@ import type {
  ModelInfo,
  ProviderHealth,
  ProviderInfo,
-} from '@mosaicstack/types';
+} from '@mosaic/types';
 import {
  AnthropicAdapter,
  OllamaAdapter,
@@ -67,7 +67,7 @@ export class ProviderService implements OnModuleInit, OnModuleDestroy {

  async onModuleInit(): Promise<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 = [
--- a/apps/gateway/src/agent/providers.controller.ts
+++ b/apps/gateway/src/agent/providers.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, Inject, Param, Post, UseGuards } from '@nestjs/common';
-import type { RoutingCriteria } from '@mosaicstack/types';
+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';
--- 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 */
--- a/apps/gateway/src/agent/routing/default-rules.ts
+++ b/apps/gateway/src/agent/routing/default-rules.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable, Logger, type OnModuleInit } from '@nestjs/common';
-import { routingRules, type Db, sql } from '@mosaicstack/db';
+import { routingRules, type Db, sql } from '@mosaic/db';
 import { DB } from '../../database/database.module.js';
 import type { RoutingCondition, RoutingAction } from './routing.types.js';

--- a/apps/gateway/src/agent/routing/routing-engine.service.ts
+++ b/apps/gateway/src/agent/routing/routing-engine.service.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
-import { routingRules, type Db, and, asc, eq, or } from '@mosaicstack/db';
+import { routingRules, type Db, and, asc, eq, or } from '@mosaic/db';
 import { DB } from '../../database/database.module.js';
 import { ProviderService } from '../provider.service.js';
 import { classifyTask } from './task-classifier.js';
--- a/apps/gateway/src/agent/routing/routing.controller.ts
+++ b/apps/gateway/src/agent/routing/routing.controller.ts
@@ -13,7 +13,7 @@ import {
  Post,
  UseGuards,
 } from '@nestjs/common';
-import { routingRules, type Db, and, asc, eq, or, inArray } from '@mosaicstack/db';
+import { routingRules, type Db, and, asc, eq, or, inArray } from '@mosaic/db';
 import { DB } from '../../database/database.module.js';
 import { AuthGuard } from '../../auth/auth.guard.js';
 import { CurrentUser } from '../../auth/current-user.decorator.js';
--- a/apps/gateway/src/agent/routing/routing.types.ts
+++ b/apps/gateway/src/agent/routing/routing.types.ts
@@ -1,7 +1,7 @@
 /**
 * 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.
+ * These types are re-exported from `@mosaic/types` for shared use across packages.
 */

 // ─── Classification primitives ───────────────────────────────────────────────
@@ -23,7 +23,7 @@ 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.
+ * Extends the existing `CostTier` in `@mosaic/types` with `local` for self-hosted models.
 */
 export type CostTier = 'cheap' | 'standard' | 'premium' | 'local';

--- a/apps/gateway/src/agent/session.dto.ts
+++ b/apps/gateway/src/agent/session.dto.ts
@@ -1,32 +1,13 @@
-/** 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. */
+  /** Human-readable agent name when an agent config is applied (M5-001). */
  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/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.ts
+++ b/apps/gateway/src/agent/tools/memory-tools.ts
@@ -1,7 +1,7 @@
 import { Type } from '@sinclair/typebox';
 import type { ToolDefinition } from '@mariozechner/pi-coding-agent';
-import type { Memory } from '@mosaicstack/memory';
-import type { EmbeddingProvider } 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.
--- 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,13 +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 { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';

@Module({
  imports: [
    ThrottlerModule.forRoot([{ name: 'default', ttl: 60_000, limit: 60 }]),
-    ConfigModule,
    DatabaseModule,
    AuthModule,
    BrainModule,
@@ -49,7 +46,6 @@ import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';
    PreferencesModule,
    CommandsModule,
    GCModule,
-    QueueModule,
    ReloadModule,
    WorkspaceModule,
  ],
--- 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,6 +1,6 @@
 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';
@@ -14,7 +14,7 @@ import { SsoController } from './sso.controller.js';
      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/sso.controller.ts
+++ b/apps/gateway/src/auth/sso.controller.ts
@@ -1,5 +1,5 @@
 import { Controller, Get } from '@nestjs/common';
-import { buildSsoDiscovery, type SsoProviderDiscovery } from '@mosaicstack/auth';
+import { buildSsoDiscovery, type SsoProviderDiscovery } from '@mosaic/auth';

@Controller('api/sso/providers')
 export class SsoController {
--- a/apps/gateway/src/brain/brain.module.ts
+++ b/apps/gateway/src/brain/brain.module.ts
@@ -1,6 +1,6 @@
 import { Global, Module } from '@nestjs/common';
-import { createBrain, type Brain } from '@mosaicstack/brain';
-import type { Db } from '@mosaicstack/db';
+import { createBrain, type Brain } from '@mosaic/brain';
+import type { Db } from '@mosaic/db';
 import { DB } from '../database/database.module.js';
 import { BRAIN } from './brain.tokens.js';

--- a/apps/gateway/src/chat/chat.gateway.ts
+++ b/apps/gateway/src/chat/chat.gateway.ts
@@ -11,15 +11,14 @@ import {
 } from '@nestjs/websockets';
 import { Server, Socket } from 'socket.io';
 import type { AgentSessionEvent } from '@mariozechner/pi-coding-agent';
-import type { Auth } from '@mosaicstack/auth';
-import type { Brain } from '@mosaicstack/brain';
+import type { Auth } from '@mosaic/auth';
+import type { Brain } from '@mosaic/brain';
 import type {
  SetThinkingPayload,
  SlashCommandPayload,
  SystemReloadPayload,
  RoutingDecisionInfo,
-  AbortPayload,
-} from '@mosaicstack/types';
+} from '@mosaic/types';
 import { AgentService, type ConversationHistoryMessage } from '../agent/agent.service.js';
 import { AUTH } from '../auth/auth.tokens.js';
 import { BRAIN } from '../brain/brain.tokens.js';
@@ -120,17 +119,6 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
        // When resuming an existing conversation, load prior messages to inject as context (M1-004)
        const conversationHistory = await this.loadConversationHistory(conversationId, userId);

-        // M5-004: Check if there's an existing sessionId bound to this conversation
-        let existingSessionId: string | undefined;
-        if (userId) {
-          existingSessionId = await this.getConversationSessionId(conversationId, userId);
-          if (existingSessionId) {
-            this.logger.log(
-              `Resuming existing sessionId=${existingSessionId} for conversation=${conversationId}`,
-            );
-          }
-        }
-
        // Determine provider/model via routing engine or per-session /model override (M4-012 / M4-007)
        let resolvedProvider = data.provider;
        let resolvedModelId = data.modelId;
@@ -165,9 +153,7 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
          }
        }

-        // M5-004: Use existingSessionId as sessionId when available (session reuse)
-        const sessionIdToCreate = existingSessionId ?? conversationId;
-        agentSession = await this.agentService.createSession(sessionIdToCreate, {
+        agentSession = await this.agentService.createSession(conversationId, {
          provider: resolvedProvider,
          modelId: resolvedModelId,
          agentConfigId: data.agentId,
@@ -194,15 +180,10 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
    }

    // Ensure conversation record exists in the DB before persisting messages
-    // M5-004: Also bind the sessionId to the conversation record
    if (userId) {
      await this.ensureConversation(conversationId, userId);
-      await this.bindSessionToConversation(conversationId, userId, conversationId);
    }

-    // M5-007: Count the user message
-    this.agentService.recordMessage(conversationId);
-
    // Persist the user message
    if (userId) {
      try {
@@ -253,7 +234,6 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
    this.agentService.addChannel(conversationId, `websocket:${client.id}`);

    // Send session info so the client knows the model/provider (M4-008: include routing decision)
-    // Include agentName when a named agent config is active (M5-001)
    {
      const agentSession = this.agentService.getSession(conversationId);
      if (agentSession) {
@@ -326,38 +306,6 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
    });
  }

-  @SubscribeMessage('abort')
-  async handleAbort(
-    @ConnectedSocket() client: Socket,
-    @MessageBody() data: AbortPayload,
-  ): Promise<void> {
-    const conversationId = data.conversationId;
-    this.logger.log(`Abort requested by ${client.id} for conversation ${conversationId}`);
-
-    const session = this.agentService.getSession(conversationId);
-    if (!session) {
-      client.emit('error', {
-        conversationId,
-        error: 'No active session to abort.',
-      });
-      return;
-    }
-
-    try {
-      await session.piSession.abort();
-      this.logger.log(`Agent session ${conversationId} aborted successfully`);
-    } catch (err) {
-      this.logger.error(
-        `Failed to abort session ${conversationId}`,
-        err instanceof Error ? err.stack : String(err),
-      );
-      client.emit('error', {
-        conversationId,
-        error: 'Failed to abort the agent operation.',
-      });
-    }
-  }
-
  @SubscribeMessage('command:execute')
  async handleCommandExecute(
    @ConnectedSocket() client: Socket,
@@ -377,18 +325,17 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
   * Set a per-conversation model override (M4-007 / M5-002).
   * When set, the routing engine is bypassed and the specified model is used.
   * Pass null to clear the override and resume automatic routing.
-   * M5-005: Emits session:info to clients subscribed to this conversation when a model is set.
-   * M5-007: Records a model switch in session metrics.
+   * M5-002: Also updates the live session's modelId and emits session:info.
   */
  setModelOverride(conversationId: string, modelName: string | null): void {
    if (modelName) {
      modelOverrides.set(conversationId, modelName);
      this.logger.log(`Model override set: conversation=${conversationId} model="${modelName}"`);

-      // M5-002: Update the live session's modelId so session:info reflects the new model immediately
+      // M5-002: Update live session model so next session:info reflects the new model
      this.agentService.updateSessionModel(conversationId, modelName);

-      // M5-005: Broadcast session:info to all clients subscribed to this conversation
+      // Broadcast updated session:info to all clients watching this conversation
      this.broadcastSessionInfo(conversationId);
    } else {
      modelOverrides.delete(conversationId);
@@ -404,13 +351,10 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
  }

  /**
-   * M5-005: Broadcast session:info to all clients currently subscribed to a conversation.
+   * Broadcast session:info to all clients currently subscribed to a conversation (M5-002/M5-003).
   * Called on model or agent switch to ensure the TUI TopBar updates immediately.
   */
-  broadcastSessionInfo(
-    conversationId: string,
-    extra?: { agentName?: string; routingDecision?: RoutingDecisionInfo },
-  ): void {
+  broadcastSessionInfo(conversationId: string, extra?: { agentName?: string }): void {
    const agentSession = this.agentService.getSession(conversationId);
    if (!agentSession) return;

@@ -423,7 +367,6 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
      thinkingLevel: piSession.thinkingLevel,
      availableThinkingLevels: piSession.getAvailableThinkingLevels(),
      ...(resolvedAgentName ? { agentName: resolvedAgentName } : {}),
-      ...(extra?.routingDecision ? { routingDecision: extra.routingDecision } : {}),
    };

    // Emit to all clients currently subscribed to this conversation
@@ -459,45 +402,6 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
    }
  }

-  /**
-   * M5-004: Bind the agent sessionId to the conversation record in the DB.
-   * Updates the sessionId column so future resumes can reuse the session.
-   */
-  private async bindSessionToConversation(
-    conversationId: string,
-    userId: string,
-    sessionId: string,
-  ): Promise<void> {
-    try {
-      await this.brain.conversations.update(conversationId, userId, { sessionId });
-    } catch (err) {
-      this.logger.error(
-        `Failed to bind sessionId=${sessionId} to conversation=${conversationId}`,
-        err instanceof Error ? err.stack : String(err),
-      );
-    }
-  }
-
-  /**
-   * M5-004: Retrieve the sessionId bound to a conversation, if any.
-   * Returns undefined when the conversation does not exist or has no bound session.
-   */
-  private async getConversationSessionId(
-    conversationId: string,
-    userId: string,
-  ): Promise<string | undefined> {
-    try {
-      const conv = await this.brain.conversations.findById(conversationId, userId);
-      return conv?.sessionId ?? undefined;
-    } catch (err) {
-      this.logger.error(
-        `Failed to get sessionId for conversation=${conversationId}`,
-        err instanceof Error ? err.stack : String(err),
-      );
-      return undefined;
-    }
-  }
-
  /**
   * Load prior conversation messages from DB for context injection on session resume (M1-004).
   * Returns an empty array when no history exists, the conversation is not owned by the user,
@@ -574,17 +478,6 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
          usage: usagePayload,
        });

-        // M5-007: Accumulate token usage in session metrics
-        if (stats?.tokens) {
-          this.agentService.recordTokenUsage(conversationId, {
-            input: stats.tokens.input ?? 0,
-            output: stats.tokens.output ?? 0,
-            cacheRead: stats.tokens.cacheRead ?? 0,
-            cacheWrite: stats.tokens.cacheWrite ?? 0,
-            total: stats.tokens.total ?? 0,
-          });
-        }
-
        // Persist the assistant message with metadata
        const cs = this.clientSessions.get(client.id);
        const userId = (client.data.user as { id: string } | undefined)?.id;
--- a/apps/gateway/src/commands/command-executor-p8012.spec.ts
+++ b/apps/gateway/src/commands/command-executor-p8012.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { CommandExecutorService } from './command-executor.service.js';
-import type { SlashCommandPayload } from '@mosaicstack/types';
+import type { SlashCommandPayload } from '@mosaic/types';

 // Minimal mock implementations
 const mockRegistry = {
@@ -42,7 +42,7 @@ const mockRedis = {

 // Mock agent config returned by brain.agents.findByName for "my-agent-id"
 const mockAgentConfig = {
-  id: 'my-agent-id',
+  id: 'agent-uuid-123',
  name: 'my-agent-id',
  model: 'claude-sonnet-4-6',
  provider: 'anthropic',
@@ -57,12 +57,11 @@ const mockAgentConfig = {

 const mockBrain = {
  agents: {
-    // findByName resolves with the agent when name matches, undefined otherwise
    findByName: vi.fn((name: string) =>
      Promise.resolve(name === 'my-agent-id' ? mockAgentConfig : undefined),
    ),
    findById: vi.fn((id: string) =>
-      Promise.resolve(id === 'my-agent-id' ? mockAgentConfig : undefined),
+      Promise.resolve(id === 'agent-uuid-123' ? mockAgentConfig : undefined),
    ),
    create: vi.fn(),
  },
@@ -82,7 +81,6 @@ function buildService(): CommandExecutorService {
    mockBrain as never,
    null,
    mockChatGateway as never,
-    null,
  );
 }

--- a/apps/gateway/src/commands/command-executor.service.ts
+++ b/apps/gateway/src/commands/command-executor.service.ts
@@ -1,13 +1,12 @@
 import { forwardRef, Inject, Injectable, Logger, Optional } from '@nestjs/common';
-import type { QueueHandle } from '@mosaicstack/queue';
-import type { Brain } from '@mosaicstack/brain';
-import type { SlashCommandPayload, SlashCommandResultPayload } from '@mosaicstack/types';
+import type { QueueHandle } from '@mosaic/queue';
+import type { Brain } from '@mosaic/brain';
+import type { SlashCommandPayload, SlashCommandResultPayload } from '@mosaic/types';
 import { AgentService } from '../agent/agent.service.js';
 import { ChatGateway } from '../chat/chat.gateway.js';
 import { SessionGCService } from '../gc/session-gc.service.js';
 import { SystemOverrideService } from '../preferences/system-override.service.js';
 import { ReloadService } from '../reload/reload.service.js';
-import { McpClientService } from '../mcp-client/mcp-client.service.js';
 import { BRAIN } from '../brain/brain.tokens.js';
 import { COMMANDS_REDIS } from './commands.tokens.js';
 import { CommandRegistryService } from './command-registry.service.js';
@@ -29,9 +28,6 @@ export class CommandExecutorService {
    @Optional()
    @Inject(forwardRef(() => ChatGateway))
    private readonly chatGateway: ChatGateway | null,
-    @Optional()
-    @Inject(McpClientService)
-    private readonly mcpClient: McpClientService | null,
  ) {}

  async execute(payload: SlashCommandPayload, userId: string): Promise<SlashCommandResultPayload> {
@@ -109,8 +105,6 @@ export class CommandExecutorService {
          };
        case 'tools':
          return await this.handleTools(conversationId, userId);
-        case 'mcp':
-          return await this.handleMcp(args ?? null, conversationId);
        case 'reload': {
          if (!this.reloadService) {
            return {
@@ -248,14 +242,13 @@ export class CommandExecutorService {
  private async handleAgent(
    args: string | null,
    conversationId: string,
-    userId: string,
+    _userId: string,
  ): Promise<SlashCommandResultPayload> {
    if (!args) {
      return {
        command: 'agent',
        success: true,
-        message:
-          'Usage: /agent <agent-id> | /agent list | /agent new <name> to create a new agent.',
+        message: 'Usage: /agent <agent-name> to switch, or /agent list to see available agents.',
        conversationId,
      };
    }
@@ -269,58 +262,12 @@ export class CommandExecutorService {
      };
    }

-    // M5-006: /agent new <name> — create a new agent config via brain.agents.create()
-    if (args.startsWith('new')) {
-      const namePart = args.slice(3).trim();
-      if (!namePart) {
-        return {
-          command: 'agent',
-          success: false,
-          message: 'Usage: /agent new <name> — provide a name for the new agent.',
-          conversationId,
-        };
-      }
-
-      try {
-        const defaultProvider = process.env['DEFAULT_PROVIDER'] ?? 'anthropic';
-        const defaultModel = process.env['DEFAULT_MODEL'] ?? 'claude-sonnet-4-5-20251001';
-
-        const newAgent = await this.brain.agents.create({
-          name: namePart,
-          provider: defaultProvider,
-          model: defaultModel,
-          status: 'idle',
-          ownerId: userId,
-          isSystem: false,
-        });
-
-        this.logger.log(`Created new agent "${newAgent.name}" (${newAgent.id}) for user ${userId}`);
-
-        return {
-          command: 'agent',
-          success: true,
-          message: `Agent "${newAgent.name}" created with ID: ${newAgent.id}. Configure it via the web dashboard.`,
-          conversationId,
-          data: { agentId: newAgent.id, agentName: newAgent.name },
-        };
-      } catch (err) {
-        this.logger.error(`Failed to create agent: ${err}`);
-        return {
-          command: 'agent',
-          success: false,
-          message: `Failed to create agent: ${String(err)}`,
-          conversationId,
-        };
-      }
-    }
-
    // M5-003: Look up agent by name (or ID) and apply to session mid-conversation
    const agentName = args.trim();
    try {
-      // Try lookup by name first; fall back to ID-based lookup
+      // Try lookup by name first; fall back to ID lookup
      let agentConfig = await this.brain.agents.findByName(agentName);
      if (!agentConfig) {
-        // Try by ID (UUID-style input)
        agentConfig = await this.brain.agents.findById(agentName);
      }

@@ -333,7 +280,7 @@ export class CommandExecutorService {
        };
      }

-      // Apply the agent config to the live session and emit session:info (M5-003)
+      // Apply agent config to the live session metadata (M5-003)
      this.agentService.applyAgentConfig(
        conversationId,
        agentConfig.id,
@@ -341,7 +288,7 @@ export class CommandExecutorService {
        agentConfig.model ?? undefined,
      );

-      // Broadcast updated session:info so TUI TopBar reflects new agent/model
+      // Broadcast updated session:info so TUI reflects new agent/model (M5-003)
      this.chatGateway?.broadcastSessionInfo(conversationId, { agentName: agentConfig.name });

      this.logger.log(
@@ -351,7 +298,7 @@ export class CommandExecutorService {
      return {
        command: 'agent',
        success: true,
-        message: `Switched to agent "${agentConfig.name}". System prompt and tools applied. Model: ${agentConfig.model ?? 'default'}.`,
+        message: `Switched to agent "${agentConfig.name}". Model: ${agentConfig.model ?? 'default'}.`,
        conversationId,
        data: { agentId: agentConfig.id, agentName: agentConfig.name, model: agentConfig.model },
      };
@@ -495,92 +442,4 @@ export class CommandExecutorService {
      conversationId,
    };
  }
-
-  private async handleMcp(
-    args: string | null,
-    conversationId: string,
-  ): Promise<SlashCommandResultPayload> {
-    if (!this.mcpClient) {
-      return {
-        command: 'mcp',
-        conversationId,
-        success: false,
-        message: 'MCP client service is not available.',
-      };
-    }
-
-    const action = args?.trim().split(/\s+/)[0] ?? 'status';
-
-    switch (action) {
-      case 'status':
-      case 'servers': {
-        const statuses = this.mcpClient.getServerStatuses();
-        if (statuses.length === 0) {
-          return {
-            command: 'mcp',
-            conversationId,
-            success: true,
-            message:
-              'No MCP servers configured. Set MCP_SERVERS env var to connect external tool servers.',
-          };
-        }
-        const lines = ['MCP Server Status:\n'];
-        for (const s of statuses) {
-          const status = s.connected ? '✓ connected' : '✗ disconnected';
-          lines.push(`  ${s.name}: ${status}`);
-          lines.push(`    URL: ${s.url}`);
-          lines.push(`    Tools: ${s.toolCount}`);
-          if (s.error) lines.push(`    Error: ${s.error}`);
-          lines.push('');
-        }
-        const tools = this.mcpClient.getToolDefinitions();
-        if (tools.length > 0) {
-          lines.push(`Total bridged tools: ${tools.length}`);
-          lines.push(`Tool names: ${tools.map((t) => t.name).join(', ')}`);
-        }
-        return {
-          command: 'mcp',
-          conversationId,
-          success: true,
-          message: lines.join('\n'),
-        };
-      }
-
-      case 'reconnect': {
-        const serverName = args?.trim().split(/\s+/).slice(1).join(' ');
-        if (!serverName) {
-          return {
-            command: 'mcp',
-            conversationId,
-            success: false,
-            message: 'Usage: /mcp reconnect <server-name>',
-          };
-        }
-        try {
-          await this.mcpClient.reconnectServer(serverName);
-          return {
-            command: 'mcp',
-            conversationId,
-            success: true,
-            message: `MCP server "${serverName}" reconnected successfully.`,
-          };
-        } catch (err) {
-          return {
-            command: 'mcp',
-            conversationId,
-            success: false,
-            message: `Failed to reconnect MCP server "${serverName}": ${err instanceof Error ? err.message : String(err)}`,
-          };
-        }
-      }
-
-      default:
-        return {
-          command: 'mcp',
-          conversationId,
-          success: false,
-          message: `Unknown MCP action: "${action}". Use: /mcp status, /mcp servers, /mcp reconnect <name>`,
-        };
-    }
-  }
 }
--- a/apps/gateway/src/commands/command-registry.service.spec.ts
+++ b/apps/gateway/src/commands/command-registry.service.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { CommandRegistryService } from './command-registry.service.js';
-import type { CommandDef } from '@mosaicstack/types';
+import type { CommandDef } from '@mosaic/types';

 const mockCmd: CommandDef = {
  name: 'test',
--- a/apps/gateway/src/commands/command-registry.service.ts
+++ b/apps/gateway/src/commands/command-registry.service.ts
@@ -1,5 +1,5 @@
 import { Injectable, type OnModuleInit } from '@nestjs/common';
-import type { CommandDef, CommandManifest } from '@mosaicstack/types';
+import type { CommandDef, CommandManifest } from '@mosaic/types';

@Injectable()
 export class CommandRegistryService implements OnModuleInit {
@@ -260,23 +260,6 @@ export class CommandRegistryService implements OnModuleInit {
        execution: 'socket',
        available: true,
      },
-      {
-        name: 'mcp',
-        description: 'Manage MCP server connections (status/reconnect/servers)',
-        aliases: [],
-        args: [
-          {
-            name: 'action',
-            type: 'enum',
-            optional: true,
-            values: ['status', 'reconnect', 'servers'],
-            description: 'Action: status (default), reconnect <name>, servers',
-          },
-        ],
-        scope: 'agent',
-        execution: 'socket',
-        available: true,
-      },
      {
        name: 'reload',
        description: 'Soft-reload gateway plugins and command manifest (admin)',
--- a/apps/gateway/src/commands/commands.integration.spec.ts
+++ b/apps/gateway/src/commands/commands.integration.spec.ts
@@ -13,7 +13,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { CommandRegistryService } from './command-registry.service.js';
 import { CommandExecutorService } from './command-executor.service.js';
-import type { SlashCommandPayload } from '@mosaicstack/types';
+import type { SlashCommandPayload } from '@mosaic/types';

 // ─── Mocks ───────────────────────────────────────────────────────────────────

@@ -39,14 +39,6 @@ const mockRedis = {
  keys: vi.fn().mockResolvedValue([]),
 };

-const mockBrain = {
-  agents: {
-    findByName: vi.fn().mockResolvedValue(undefined),
-    findById: vi.fn().mockResolvedValue(undefined),
-    create: vi.fn(),
-  },
-};
-
 // ─── Helpers ─────────────────────────────────────────────────────────────────

 function buildRegistry(): CommandRegistryService {
@@ -55,6 +47,14 @@ function buildRegistry(): CommandRegistryService {
  return svc;
 }

+const mockBrain = {
+  agents: {
+    findByName: vi.fn().mockResolvedValue(undefined),
+    findById: vi.fn().mockResolvedValue(undefined),
+    create: vi.fn(),
+  },
+};
+
 function buildExecutor(registry: CommandRegistryService): CommandExecutorService {
  return new CommandExecutorService(
    registry as never,
@@ -65,7 +65,6 @@ function buildExecutor(registry: CommandRegistryService): CommandExecutorService
    mockBrain as never,
    null, // reloadService (optional)
    null, // chatGateway (optional)
-    null, // mcpClient (optional)
  );
 }

--- a/apps/gateway/src/commands/commands.module.ts
+++ b/apps/gateway/src/commands/commands.module.ts
@@ -1,5 +1,5 @@
 import { forwardRef, Inject, Module, type OnApplicationShutdown } from '@nestjs/common';
-import { createQueue, type QueueHandle } from '@mosaicstack/queue';
+import { createQueue, type QueueHandle } from '@mosaic/queue';
 import { ChatModule } from '../chat/chat.module.js';
 import { GCModule } from '../gc/gc.module.js';
 import { ReloadModule } from '../reload/reload.module.js';
--- a/apps/gateway/src/config/config.module.ts
+++ b/apps/gateway/src/config/config.module.ts
@@ -1,16 +0,0 @@
-import { Global, Module } from '@nestjs/common';
-import { loadConfig, type MosaicConfig } from '@mosaicstack/config';
-
-export const MOSAIC_CONFIG = 'MOSAIC_CONFIG';
-
-@Global()
-@Module({
-  providers: [
-    {
-      provide: MOSAIC_CONFIG,
-      useFactory: (): MosaicConfig => loadConfig(),
-    },
-  ],
-  exports: [MOSAIC_CONFIG],
-})
-export class ConfigModule {}
--- a/apps/gateway/src/conversations/conversations.controller.ts
+++ b/apps/gateway/src/conversations/conversations.controller.ts
@@ -15,7 +15,7 @@ import {
  Query,
  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';
--- a/apps/gateway/src/coord/coord.service.ts
+++ b/apps/gateway/src/coord/coord.service.ts
@@ -8,7 +8,7 @@ import {
  type MissionStatusSummary,
  type MissionTask,
  type TaskDetail,
-} from '@mosaicstack/coord';
+} from '@mosaic/coord';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';

--- a/apps/gateway/src/database/database.module.ts
+++ b/apps/gateway/src/database/database.module.ts
@@ -1,51 +1,28 @@
-import { mkdirSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
 import { Global, Inject, Module, type OnApplicationShutdown } from '@nestjs/common';
-import { createDb, createPgliteDb, type Db, type DbHandle } from '@mosaicstack/db';
-import { createStorageAdapter, type StorageAdapter } from '@mosaicstack/storage';
-import type { MosaicConfig } from '@mosaicstack/config';
-import { MOSAIC_CONFIG } from '../config/config.module.js';
+import { createDb, type Db, type DbHandle } from '@mosaic/db';

 export const DB_HANDLE = 'DB_HANDLE';
 export const DB = 'DB';
-export const STORAGE_ADAPTER = 'STORAGE_ADAPTER';

@Global()
@Module({
  providers: [
    {
      provide: DB_HANDLE,
-      useFactory: (config: MosaicConfig): DbHandle => {
-        if (config.tier === 'local') {
-          const dataDir = join(homedir(), '.config', 'mosaic', 'gateway', 'pglite');
-          mkdirSync(dataDir, { recursive: true });
-          return createPgliteDb(dataDir);
-        }
-        return createDb(config.storage.type === 'postgres' ? config.storage.url : undefined);
-      },
-      inject: [MOSAIC_CONFIG],
+      useFactory: (): DbHandle => createDb(),
    },
    {
      provide: DB,
      useFactory: (handle: DbHandle): Db => handle.db,
      inject: [DB_HANDLE],
    },
-    {
-      provide: STORAGE_ADAPTER,
-      useFactory: (config: MosaicConfig): StorageAdapter => createStorageAdapter(config.storage),
-      inject: [MOSAIC_CONFIG],
-    },
  ],
-  exports: [DB, STORAGE_ADAPTER],
+  exports: [DB],
 })
 export class DatabaseModule implements OnApplicationShutdown {
-  constructor(
-    @Inject(DB_HANDLE) private readonly handle: DbHandle,
-    @Inject(STORAGE_ADAPTER) private readonly storageAdapter: StorageAdapter,
-  ) {}
+  constructor(@Inject(DB_HANDLE) private readonly handle: DbHandle) {}

  async onApplicationShutdown(): Promise<void> {
-    await Promise.all([this.handle.close(), this.storageAdapter.close()]);
+    await this.handle.close();
  }
 }
--- a/apps/gateway/src/gc/gc.module.ts
+++ b/apps/gateway/src/gc/gc.module.ts
@@ -1,5 +1,5 @@
 import { Module, type OnApplicationShutdown, Inject } from '@nestjs/common';
-import { createQueue, type QueueHandle } from '@mosaicstack/queue';
+import { createQueue, type QueueHandle } from '@mosaic/queue';
 import { SessionGCService } from './session-gc.service.js';
 import { REDIS } from './gc.tokens.js';

--- a/apps/gateway/src/gc/session-gc.service.spec.ts
+++ b/apps/gateway/src/gc/session-gc.service.spec.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { Logger } from '@nestjs/common';
-import type { QueueHandle } from '@mosaicstack/queue';
-import type { LogService } from '@mosaicstack/log';
+import type { QueueHandle } from '@mosaic/queue';
+import type { LogService } from '@mosaic/log';
 import { SessionGCService } from './session-gc.service.js';

 type MockRedis = {
--- a/apps/gateway/src/gc/session-gc.service.ts
+++ b/apps/gateway/src/gc/session-gc.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable, Logger, type OnModuleInit } from '@nestjs/common';
-import type { QueueHandle } from '@mosaicstack/queue';
-import type { LogService } from '@mosaicstack/log';
+import type { QueueHandle } from '@mosaic/queue';
+import type { LogService } from '@mosaic/log';
 import { LOG_SERVICE } from '../log/log.tokens.js';
 import { REDIS } from './gc.tokens.js';

--- a/apps/gateway/src/log/cron.service.ts
+++ b/apps/gateway/src/log/cron.service.ts
@@ -5,72 +5,59 @@ import {
  type OnModuleInit,
  type OnModuleDestroy,
 } from '@nestjs/common';
+import cron from 'node-cron';
 import { SummarizationService } from './summarization.service.js';
 import { SessionGCService } from '../gc/session-gc.service.js';
-import {
-  QueueService,
-  QUEUE_SUMMARIZATION,
-  QUEUE_GC,
-  QUEUE_TIER_MANAGEMENT,
-} from '../queue/queue.service.js';
-import type { Worker } from 'bullmq';
-import type { MosaicJobData } from '../queue/queue.service.js';

@Injectable()
 export class CronService implements OnModuleInit, OnModuleDestroy {
  private readonly logger = new Logger(CronService.name);
-  private readonly registeredWorkers: Worker<MosaicJobData>[] = [];
+  private readonly tasks: cron.ScheduledTask[] = [];

  constructor(
    @Inject(SummarizationService) private readonly summarization: SummarizationService,
    @Inject(SessionGCService) private readonly sessionGC: SessionGCService,
-    @Inject(QueueService) private readonly queueService: QueueService,
  ) {}

-  async onModuleInit(): Promise<void> {
+  onModuleInit(): void {
    const summarizationSchedule = process.env['SUMMARIZATION_CRON'] ?? '0 */6 * * *'; // every 6 hours
    const tierManagementSchedule = process.env['TIER_MANAGEMENT_CRON'] ?? '0 3 * * *'; // daily at 3am
    const gcSchedule = process.env['SESSION_GC_CRON'] ?? '0 4 * * *'; // daily at 4am

-    // M6-003: Summarization repeatable job
-    await this.queueService.addRepeatableJob(
-      QUEUE_SUMMARIZATION,
-      'summarization',
-      {},
-      summarizationSchedule,
+    this.tasks.push(
+      cron.schedule(summarizationSchedule, () => {
+        this.summarization.runSummarization().catch((err) => {
+          this.logger.error(`Scheduled summarization failed: ${err}`);
+        });
+      }),
    );
-    const summarizationWorker = this.queueService.registerWorker(QUEUE_SUMMARIZATION, async () => {
-      await this.summarization.runSummarization();
-    });
-    this.registeredWorkers.push(summarizationWorker);

-    // M6-005: Tier management repeatable job
-    await this.queueService.addRepeatableJob(
-      QUEUE_TIER_MANAGEMENT,
-      'tier-management',
-      {},
-      tierManagementSchedule,
+    this.tasks.push(
+      cron.schedule(tierManagementSchedule, () => {
+        this.summarization.runTierManagement().catch((err) => {
+          this.logger.error(`Scheduled tier management failed: ${err}`);
+        });
+      }),
    );
-    const tierWorker = this.queueService.registerWorker(QUEUE_TIER_MANAGEMENT, async () => {
-      await this.summarization.runTierManagement();
-    });
-    this.registeredWorkers.push(tierWorker);

-    // M6-004: GC repeatable job
-    await this.queueService.addRepeatableJob(QUEUE_GC, 'session-gc', {}, gcSchedule);
-    const gcWorker = this.queueService.registerWorker(QUEUE_GC, async () => {
-      await this.sessionGC.sweepOrphans();
-    });
-    this.registeredWorkers.push(gcWorker);
+    this.tasks.push(
+      cron.schedule(gcSchedule, () => {
+        this.sessionGC.sweepOrphans().catch((err) => {
+          this.logger.error(`Session GC sweep failed: ${err}`);
+        });
+      }),
+    );

    this.logger.log(
-      `BullMQ jobs scheduled: summarization="${summarizationSchedule}", tier="${tierManagementSchedule}", gc="${gcSchedule}"`,
+      `Cron scheduled: summarization="${summarizationSchedule}", tier="${tierManagementSchedule}", gc="${gcSchedule}"`,
    );
  }

-  async onModuleDestroy(): Promise<void> {
-    // Workers are closed by QueueService.onModuleDestroy — nothing extra needed here.
-    this.registeredWorkers.length = 0;
-    this.logger.log('CronService destroyed (workers managed by QueueService)');
+  onModuleDestroy(): void {
+    for (const task of this.tasks) {
+      task.stop();
+    }
+    this.tasks.length = 0;
+    this.logger.log('Cron tasks stopped');
  }
 }
--- a/apps/gateway/src/log/log.controller.ts
+++ b/apps/gateway/src/log/log.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Get, Inject, Param, Post, Query, UseGuards } from '@nestjs/common';
-import type { LogService } from '@mosaicstack/log';
+import type { LogService } from '@mosaic/log';
 import { LOG_SERVICE } from './log.tokens.js';
 import { AuthGuard } from '../auth/auth.guard.js';
 import type { IngestLogDto, QueryLogsDto } from './log.dto.js';
--- a/apps/gateway/src/log/log.module.ts
+++ b/apps/gateway/src/log/log.module.ts
@@ -1,17 +1,16 @@
 import { Global, Module } from '@nestjs/common';
-import { createLogService, type LogService } from '@mosaicstack/log';
-import type { Db } from '@mosaicstack/db';
+import { createLogService, type LogService } from '@mosaic/log';
+import type { Db } from '@mosaic/db';
 import { DB } from '../database/database.module.js';
 import { LOG_SERVICE } from './log.tokens.js';
 import { LogController } from './log.controller.js';
 import { SummarizationService } from './summarization.service.js';
 import { CronService } from './cron.service.js';
 import { GCModule } from '../gc/gc.module.js';
-import { QueueModule } from '../queue/queue.module.js';

@Global()
@Module({
-  imports: [GCModule, QueueModule],
+  imports: [GCModule],
  providers: [
    {
      provide: LOG_SERVICE,
--- a/apps/gateway/src/log/summarization.service.ts
+++ b/apps/gateway/src/log/summarization.service.ts
@@ -1,11 +1,11 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
-import type { LogService } from '@mosaicstack/log';
-import type { Memory } from '@mosaicstack/memory';
+import type { LogService } from '@mosaic/log';
+import type { Memory } from '@mosaic/memory';
 import { LOG_SERVICE } from './log.tokens.js';
 import { MEMORY } from '../memory/memory.tokens.js';
 import { EmbeddingService } from '../memory/embedding.service.js';
-import type { Db } from '@mosaicstack/db';
-import { sql, summarizationJobs } from '@mosaicstack/db';
+import type { Db } from '@mosaic/db';
+import { sql, summarizationJobs } from '@mosaic/db';
 import { DB } from '../database/database.module.js';

 const SUMMARIZATION_PROMPT = `You are a knowledge extraction assistant. Given the following agent interaction logs, extract the key decisions, learnings, and patterns. Output a concise summary (2-4 sentences) that captures the most important information for future reference. Focus on actionable insights, not raw events.
--- a/apps/gateway/src/main.ts
+++ b/apps/gateway/src/main.ts
@@ -1,13 +1,5 @@
-#!/usr/bin/env node
 import { config } from 'dotenv';
-import { existsSync } from 'node:fs';
-import { resolve, join } from 'node:path';
-import { homedir } from 'node:os';
-
-// Load .env from daemon config dir (global install / daemon mode).
-// Loaded first so monorepo .env can override for local dev.
-const daemonEnv = join(homedir(), '.config', 'mosaic', 'gateway', '.env');
-if (existsSync(daemonEnv)) config({ path: daemonEnv });
+import { resolve } from 'node:path';

 // Load .env from monorepo root (cwd is apps/gateway when run via pnpm filter)
 config({ path: resolve(process.cwd(), '../../.env') });
@@ -19,7 +11,7 @@ import { NestFactory } from '@nestjs/core';
 import { Logger, ValidationPipe } from '@nestjs/common';
 import { FastifyAdapter, type NestFastifyApplication } from '@nestjs/platform-fastify';
 import helmet from '@fastify/helmet';
-import { listSsoStartupWarnings } from '@mosaicstack/auth';
+import { listSsoStartupWarnings } from '@mosaic/auth';
 import { AppModule } from './app.module.js';
 import { mountAuthHandler } from './auth/auth.controller.js';
 import { mountMcpHandler } from './mcp/mcp.controller.js';
@@ -59,7 +51,7 @@ async function bootstrap(): Promise<void> {
  mountAuthHandler(app);
  mountMcpHandler(app, app.get(McpService));

-  const port = Number(process.env['GATEWAY_PORT'] ?? 14242);
+  const port = Number(process.env['GATEWAY_PORT'] ?? 4000);
  await app.listen(port, '0.0.0.0');
  logger.log(`Gateway listening on port ${port}`);
 }
--- a/apps/gateway/src/mcp/mcp.controller.ts
+++ b/apps/gateway/src/mcp/mcp.controller.ts
@@ -1,7 +1,7 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { Logger } from '@nestjs/common';
 import { fromNodeHeaders } from 'better-auth/node';
-import type { Auth } from '@mosaicstack/auth';
+import type { Auth } from '@mosaic/auth';
 import type { NestFastifyApplication } from '@nestjs/platform-fastify';
 import type { McpService } from './mcp.service.js';
 import { AUTH } from '../auth/auth.tokens.js';
--- a/apps/gateway/src/mcp/mcp.service.ts
+++ b/apps/gateway/src/mcp/mcp.service.ts
@@ -3,8 +3,8 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { randomUUID } from 'node:crypto';
 import { z } from 'zod';
-import type { Brain } from '@mosaicstack/brain';
-import type { Memory } 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 { EmbeddingService } from '../memory/embedding.service.js';
--- a/apps/gateway/src/memory/embedding.service.ts
+++ b/apps/gateway/src/memory/embedding.service.ts
@@ -1,5 +1,5 @@
 import { Injectable, Logger } from '@nestjs/common';
-import type { EmbeddingProvider } from '@mosaicstack/memory';
+import type { EmbeddingProvider } from '@mosaic/memory';

 // ---------------------------------------------------------------------------
 // Environment-driven configuration
--- a/apps/gateway/src/memory/memory.controller.ts
+++ b/apps/gateway/src/memory/memory.controller.ts
@@ -12,7 +12,7 @@ import {
  Query,
  UseGuards,
 } from '@nestjs/common';
-import type { Memory } from '@mosaicstack/memory';
+import type { Memory } from '@mosaic/memory';
 import { MEMORY } from './memory.tokens.js';
 import { AuthGuard } from '../auth/auth.guard.js';
 import { CurrentUser } from '../auth/current-user.decorator.js';
--- a/apps/gateway/src/memory/memory.module.ts
+++ b/apps/gateway/src/memory/memory.module.ts
@@ -1,29 +1,11 @@
 import { Global, Module } from '@nestjs/common';
-import {
-  createMemory,
-  type Memory,
-  createMemoryAdapter,
-  type MemoryAdapter,
-  type MemoryConfig,
-} from '@mosaicstack/memory';
-import type { Db } from '@mosaicstack/db';
-import type { StorageAdapter } from '@mosaicstack/storage';
-import type { MosaicConfig } from '@mosaicstack/config';
-import { MOSAIC_CONFIG } from '../config/config.module.js';
-import { DB, STORAGE_ADAPTER } from '../database/database.module.js';
+import { createMemory, type Memory } from '@mosaic/memory';
+import type { Db } from '@mosaic/db';
+import { DB } from '../database/database.module.js';
 import { MEMORY } from './memory.tokens.js';
 import { MemoryController } from './memory.controller.js';
 import { EmbeddingService } from './embedding.service.js';

-export const MEMORY_ADAPTER = 'MEMORY_ADAPTER';
-
-function buildMemoryConfig(config: MosaicConfig, storageAdapter: StorageAdapter): MemoryConfig {
-  if (config.memory.type === 'keyword') {
-    return { type: 'keyword', storage: storageAdapter };
-  }
-  return { type: config.memory.type };
-}
-
@Global()
@Module({
  providers: [
@@ -32,15 +14,9 @@ function buildMemoryConfig(config: MosaicConfig, storageAdapter: StorageAdapter)
      useFactory: (db: Db): Memory => createMemory(db),
      inject: [DB],
    },
-    {
-      provide: MEMORY_ADAPTER,
-      useFactory: (config: MosaicConfig, storageAdapter: StorageAdapter): MemoryAdapter =>
-        createMemoryAdapter(buildMemoryConfig(config, storageAdapter)),
-      inject: [MOSAIC_CONFIG, STORAGE_ADAPTER],
-    },
    EmbeddingService,
  ],
  controllers: [MemoryController],
-  exports: [MEMORY, MEMORY_ADAPTER, EmbeddingService],
+  exports: [MEMORY, EmbeddingService],
 })
 export class MemoryModule {}
--- a/apps/gateway/src/missions/missions.controller.ts
+++ b/apps/gateway/src/missions/missions.controller.ts
@@ -12,7 +12,7 @@ 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';
--- a/apps/gateway/src/plugin/plugin.module.ts
+++ b/apps/gateway/src/plugin/plugin.module.ts
@@ -6,8 +6,8 @@ import {
  type OnModuleDestroy,
  type OnModuleInit,
 } from '@nestjs/common';
-import { DiscordPlugin } from '@mosaicstack/discord-plugin';
-import { TelegramPlugin } from '@mosaicstack/telegram-plugin';
+import { DiscordPlugin } from '@mosaic/discord-plugin';
+import { TelegramPlugin } from '@mosaic/telegram-plugin';
 import { PluginService } from './plugin.service.js';
 import type { IChannelPlugin } from './plugin.interface.js';
 import { PLUGIN_REGISTRY } from './plugin.tokens.js';
@@ -48,7 +48,7 @@ class TelegramChannelPluginAdapter implements IChannelPlugin {
  }
 }

-const DEFAULT_GATEWAY_URL = 'http://localhost:14242';
+const DEFAULT_GATEWAY_URL = 'http://localhost:4000';

 function createPluginRegistry(): IChannelPlugin[] {
  const plugins: IChannelPlugin[] = [];
--- a/apps/gateway/src/preferences/preferences.service.spec.ts
+++ b/apps/gateway/src/preferences/preferences.service.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi } from 'vitest';
 import { PreferencesService, PLATFORM_DEFAULTS, IMMUTABLE_KEYS } from './preferences.service.js';
-import type { Db } from '@mosaicstack/db';
+import type { Db } from '@mosaic/db';

 /**
 * Build a mock Drizzle DB where the select chain supports:
--- a/apps/gateway/src/preferences/preferences.service.ts
+++ b/apps/gateway/src/preferences/preferences.service.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
-import { eq, and, sql, type Db, preferences as preferencesTable } from '@mosaicstack/db';
+import { eq, and, sql, type Db, preferences as preferencesTable } from '@mosaic/db';
 import { DB } from '../database/database.module.js';

 export const PLATFORM_DEFAULTS: Record<string, unknown> = {
--- a/apps/gateway/src/preferences/system-override.service.ts
+++ b/apps/gateway/src/preferences/system-override.service.ts
@@ -1,5 +1,5 @@
 import { Injectable, Logger } from '@nestjs/common';
-import { createQueue, type QueueHandle } from '@mosaicstack/queue';
+import { createQueue, type QueueHandle } from '@mosaic/queue';

 const SESSION_SYSTEM_KEY = (sessionId: string) => `mosaic:session:${sessionId}:system`;
 const SESSION_SYSTEM_FRAGMENTS_KEY = (sessionId: string) =>
--- a/apps/gateway/src/projects/projects.controller.ts
+++ b/apps/gateway/src/projects/projects.controller.ts
@@ -13,7 +13,7 @@ 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';
--- a/apps/gateway/src/queue/queue-admin.dto.ts
+++ b/apps/gateway/src/queue/queue-admin.dto.ts
@@ -1,34 +0,0 @@
-export type JobStatus = 'active' | 'completed' | 'failed' | 'waiting' | 'delayed';
-
-export interface JobDto {
-  id: string;
-  name: string;
-  queue: string;
-  status: JobStatus;
-  attempts: number;
-  maxAttempts: number;
-  createdAt?: string;
-  processedAt?: string;
-  finishedAt?: string;
-  failedReason?: string;
-  data: Record<string, unknown>;
-}
-
-export interface JobListDto {
-  jobs: JobDto[];
-  total: number;
-}
-
-export interface QueueStatusDto {
-  name: string;
-  waiting: number;
-  active: number;
-  completed: number;
-  failed: number;
-  delayed: number;
-  paused: boolean;
-}
-
-export interface QueueListDto {
-  queues: QueueStatusDto[];
-}
--- a/apps/gateway/src/queue/queue.module.ts
+++ b/apps/gateway/src/queue/queue.module.ts
@@ -1,21 +0,0 @@
-import { Global, Module } from '@nestjs/common';
-import { createQueueAdapter, type QueueAdapter } from '@mosaicstack/queue';
-import type { MosaicConfig } from '@mosaicstack/config';
-import { MOSAIC_CONFIG } from '../config/config.module.js';
-import { QueueService } from './queue.service.js';
-
-export const QUEUE_ADAPTER = 'QUEUE_ADAPTER';
-
-@Global()
-@Module({
-  providers: [
-    QueueService,
-    {
-      provide: QUEUE_ADAPTER,
-      useFactory: (config: MosaicConfig): QueueAdapter => createQueueAdapter(config.queue),
-      inject: [MOSAIC_CONFIG],
-    },
-  ],
-  exports: [QueueService, QUEUE_ADAPTER],
-})
-export class QueueModule {}
--- a/apps/gateway/src/queue/queue.service.ts
+++ b/apps/gateway/src/queue/queue.service.ts
@@ -1,412 +0,0 @@
-import {
-  Inject,
-  Injectable,
-  Logger,
-  Optional,
-  type OnModuleInit,
-  type OnModuleDestroy,
-} from '@nestjs/common';
-import { Queue, Worker, type Job, type ConnectionOptions } from 'bullmq';
-import type { LogService } from '@mosaicstack/log';
-import { LOG_SERVICE } from '../log/log.tokens.js';
-import type { JobDto, JobStatus } from './queue-admin.dto.js';
-
-// ---------------------------------------------------------------------------
-// Typed job definitions
-// ---------------------------------------------------------------------------
-
-export interface SummarizationJobData {
-  triggeredBy?: string;
-}
-
-export interface GCJobData {
-  triggeredBy?: string;
-}
-
-export interface TierManagementJobData {
-  triggeredBy?: string;
-}
-
-export type MosaicJobData = SummarizationJobData | GCJobData | TierManagementJobData;
-
-// ---------------------------------------------------------------------------
-// Queue health status
-// ---------------------------------------------------------------------------
-
-export interface QueueHealthStatus {
-  queues: Record<
-    string,
-    {
-      waiting: number;
-      active: number;
-      failed: number;
-      completed: number;
-      paused: boolean;
-    }
-  >;
-  healthy: boolean;
-}
-
-// ---------------------------------------------------------------------------
-// Constants
-// ---------------------------------------------------------------------------
-
-export const QUEUE_SUMMARIZATION = 'mosaic-summarization';
-export const QUEUE_GC = 'mosaic-gc';
-export const QUEUE_TIER_MANAGEMENT = 'mosaic-tier-management';
-
-const DEFAULT_VALKEY_URL = 'redis://localhost:6380';
-
-/**
- * Parse a Redis URL string into a BullMQ-compatible ConnectionOptions object.
- *
- * BullMQ v5 does `Object.assign({ port: 6379, host: '127.0.0.1' }, opts)` in
- * its RedisConnection constructor. If opts is a URL string, Object.assign only
- * copies character-index properties and the defaults survive — so 6379 wins.
- * We must parse the URL ourselves and return a plain RedisOptions object.
- */
-function getConnection(): ConnectionOptions {
-  const url = process.env['VALKEY_URL'] ?? DEFAULT_VALKEY_URL;
-  try {
-    const parsed = new URL(url);
-    const opts: ConnectionOptions = {
-      host: parsed.hostname || '127.0.0.1',
-      port: parsed.port ? parseInt(parsed.port, 10) : 6380,
-    };
-    if (parsed.password) {
-      (opts as Record<string, unknown>)['password'] = decodeURIComponent(parsed.password);
-    }
-    if (parsed.pathname && parsed.pathname.length > 1) {
-      const db = parseInt(parsed.pathname.slice(1), 10);
-      if (!isNaN(db)) {
-        (opts as Record<string, unknown>)['db'] = db;
-      }
-    }
-    return opts;
-  } catch {
-    // Fallback: hope the value is already a host string ioredis understands
-    return { host: '127.0.0.1', port: 6380 } as ConnectionOptions;
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Job handler type
-// ---------------------------------------------------------------------------
-
-export type JobHandler<T = MosaicJobData> = (job: Job<T>) => Promise<void>;
-
-/** System session ID used for job-event log entries (no real user session). */
-const SYSTEM_SESSION_ID = 'system';
-
-// ---------------------------------------------------------------------------
-// QueueService
-// ---------------------------------------------------------------------------
-
-@Injectable()
-export class QueueService implements OnModuleInit, OnModuleDestroy {
-  private readonly logger = new Logger(QueueService.name);
-  private readonly connection: ConnectionOptions;
-  private readonly queues = new Map<string, Queue<MosaicJobData>>();
-  private readonly workers = new Map<string, Worker<MosaicJobData>>();
-
-  constructor(
-    @Optional()
-    @Inject(LOG_SERVICE)
-    private readonly logService: LogService | null,
-  ) {
-    this.connection = getConnection();
-  }
-
-  onModuleInit(): void {
-    this.logger.log('QueueService initialised (BullMQ)');
-  }
-
-  async onModuleDestroy(): Promise<void> {
-    await this.closeAll();
-  }
-
-  // -------------------------------------------------------------------------
-  // Queue helpers
-  // -------------------------------------------------------------------------
-
-  /**
-   * Get or create a BullMQ Queue for the given queue name.
-   */
-  getQueue<T extends MosaicJobData = MosaicJobData>(name: string): Queue<T> {
-    let queue = this.queues.get(name) as Queue<T> | undefined;
-    if (!queue) {
-      queue = new Queue<T>(name, { connection: this.connection });
-      this.queues.set(name, queue as unknown as Queue<MosaicJobData>);
-    }
-    return queue;
-  }
-
-  /**
-   * Add a BullMQ repeatable job (cron-style).
-   * Uses `jobId` as a deterministic key so duplicate registrations are idempotent.
-   */
-  async addRepeatableJob<T extends MosaicJobData>(
-    queueName: string,
-    jobName: string,
-    data: T,
-    cronExpression: string,
-  ): Promise<void> {
-    const queue = this.getQueue<T>(queueName);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    await (queue as Queue<any>).add(jobName, data, {
-      repeat: { pattern: cronExpression },
-      jobId: `${queueName}:${jobName}:repeatable`,
-    });
-    this.logger.log(
-      `Repeatable job "${jobName}" registered on "${queueName}" (cron: ${cronExpression})`,
-    );
-  }
-
-  /**
-   * Register a Worker for the given queue name with error handling and
-   * exponential backoff.
-   */
-  registerWorker<T extends MosaicJobData>(queueName: string, handler: JobHandler<T>): Worker<T> {
-    const worker = new Worker<T>(
-      queueName,
-      async (job) => {
-        this.logger.debug(`Processing job "${job.name}" (id=${job.id}) on queue "${queueName}"`);
-        await this.logJobEvent(
-          queueName,
-          job.name,
-          job.id ?? 'unknown',
-          'started',
-          job.attemptsMade + 1,
-        );
-        await handler(job);
-      },
-      {
-        connection: this.connection,
-        // Exponential backoff: base 5s, factor 2, max 5 attempts
-        settings: {
-          backoffStrategy: (attemptsMade: number) => {
-            return Math.min(5000 * Math.pow(2, attemptsMade - 1), 60_000);
-          },
-        },
-      },
-    );
-
-    worker.on('completed', (job) => {
-      this.logger.log(`Job "${job.name}" (id=${job.id}) completed on queue "${queueName}"`);
-      this.logJobEvent(
-        queueName,
-        job.name,
-        job.id ?? 'unknown',
-        'completed',
-        job.attemptsMade,
-      ).catch((err) => this.logger.warn(`Failed to write completed job log: ${String(err)}`));
-    });
-
-    worker.on('failed', (job, err) => {
-      const errMsg = err instanceof Error ? err.message : String(err);
-      this.logger.error(
-        `Job "${job?.name ?? 'unknown'}" (id=${job?.id ?? 'unknown'}) failed on queue "${queueName}": ${errMsg}`,
-      );
-      this.logJobEvent(
-        queueName,
-        job?.name ?? 'unknown',
-        job?.id ?? 'unknown',
-        'failed',
-        job?.attemptsMade ?? 0,
-        errMsg,
-      ).catch((e) => this.logger.warn(`Failed to write failed job log: ${String(e)}`));
-    });
-
-    this.workers.set(queueName, worker as unknown as Worker<MosaicJobData>);
-    return worker;
-  }
-
-  /**
-   * Return queue health statistics for all managed queues.
-   */
-  async getHealthStatus(): Promise<QueueHealthStatus> {
-    const queues: QueueHealthStatus['queues'] = {};
-    let healthy = true;
-
-    for (const [name, queue] of this.queues) {
-      try {
-        const [waiting, active, failed, completed, paused] = await Promise.all([
-          queue.getWaitingCount(),
-          queue.getActiveCount(),
-          queue.getFailedCount(),
-          queue.getCompletedCount(),
-          queue.isPaused(),
-        ]);
-        queues[name] = { waiting, active, failed, completed, paused };
-      } catch (err) {
-        this.logger.error(`Failed to fetch health for queue "${name}": ${err}`);
-        healthy = false;
-        queues[name] = { waiting: 0, active: 0, failed: 0, completed: 0, paused: false };
-      }
-    }
-
-    return { queues, healthy };
-  }
-
-  // -------------------------------------------------------------------------
-  // Admin API helpers (M6-006)
-  // -------------------------------------------------------------------------
-
-  /**
-   * List jobs across all managed queues, optionally filtered by status.
-   * BullMQ jobs are fetched by state type from each queue.
-   */
-  async listJobs(status?: JobStatus): Promise<JobDto[]> {
-    const jobs: JobDto[] = [];
-    const states: JobStatus[] = status
-      ? [status]
-      : ['active', 'completed', 'failed', 'waiting', 'delayed'];
-
-    for (const [queueName, queue] of this.queues) {
-      try {
-        for (const state of states) {
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          const raw = await (queue as Queue<any>).getJobs([state as any]);
-          for (const j of raw) {
-            jobs.push(this.toJobDto(queueName, j, state));
-          }
-        }
-      } catch (err) {
-        this.logger.warn(`Failed to list jobs for queue "${queueName}": ${String(err)}`);
-      }
-    }
-
-    return jobs;
-  }
-
-  /**
-   * Retry a specific failed job by its BullMQ job ID (format: "queueName:id").
-   * The caller passes "<queueName>__<jobId>" as the composite ID because BullMQ
-   * job IDs are not globally unique — they are scoped to their queue.
-   */
-  async retryJob(compositeId: string): Promise<{ ok: boolean; message: string }> {
-    const sep = compositeId.lastIndexOf('__');
-    if (sep === -1) {
-      return { ok: false, message: 'Invalid job id format. Expected "<queue>__<jobId>".' };
-    }
-    const queueName = compositeId.slice(0, sep);
-    const jobId = compositeId.slice(sep + 2);
-
-    const queue = this.queues.get(queueName);
-    if (!queue) {
-      return { ok: false, message: `Queue "${queueName}" not found.` };
-    }
-
-    const job = await queue.getJob(jobId);
-    if (!job) {
-      return { ok: false, message: `Job "${jobId}" not found in queue "${queueName}".` };
-    }
-
-    const state = await job.getState();
-    if (state !== 'failed') {
-      return { ok: false, message: `Job "${jobId}" is not in failed state (current: ${state}).` };
-    }
-
-    await job.retry('failed');
-    await this.logJobEvent(queueName, job.name, jobId, 'retried', (job.attemptsMade ?? 0) + 1);
-    return { ok: true, message: `Job "${jobId}" on queue "${queueName}" queued for retry.` };
-  }
-
-  /**
-   * Pause a queue by name.
-   */
-  async pauseQueue(name: string): Promise<{ ok: boolean; message: string }> {
-    const queue = this.queues.get(name);
-    if (!queue) return { ok: false, message: `Queue "${name}" not found.` };
-    await queue.pause();
-    this.logger.log(`Queue paused: ${name}`);
-    return { ok: true, message: `Queue "${name}" paused.` };
-  }
-
-  /**
-   * Resume a paused queue by name.
-   */
-  async resumeQueue(name: string): Promise<{ ok: boolean; message: string }> {
-    const queue = this.queues.get(name);
-    if (!queue) return { ok: false, message: `Queue "${name}" not found.` };
-    await queue.resume();
-    this.logger.log(`Queue resumed: ${name}`);
-    return { ok: true, message: `Queue "${name}" resumed.` };
-  }
-
-  private toJobDto(queueName: string, job: Job<MosaicJobData>, status: JobStatus): JobDto {
-    return {
-      id: `${queueName}__${job.id ?? 'unknown'}`,
-      name: job.name,
-      queue: queueName,
-      status,
-      attempts: job.attemptsMade,
-      maxAttempts: job.opts?.attempts ?? 1,
-      createdAt: job.timestamp ? new Date(job.timestamp).toISOString() : undefined,
-      processedAt: job.processedOn ? new Date(job.processedOn).toISOString() : undefined,
-      finishedAt: job.finishedOn ? new Date(job.finishedOn).toISOString() : undefined,
-      failedReason: job.failedReason,
-      data: (job.data as Record<string, unknown>) ?? {},
-    };
-  }
-
-  // -------------------------------------------------------------------------
-  // Job event logging (M6-007)
-  // -------------------------------------------------------------------------
-
-  /** Write a log entry to agent_logs for BullMQ job lifecycle events. */
-  private async logJobEvent(
-    queueName: string,
-    jobName: string,
-    jobId: string,
-    event: 'started' | 'completed' | 'retried' | 'failed',
-    attempts: number,
-    errorMessage?: string,
-  ): Promise<void> {
-    if (!this.logService) return;
-
-    const level = event === 'failed' ? ('error' as const) : ('info' as const);
-    const content =
-      event === 'failed'
-        ? `Job "${jobName}" (${jobId}) on queue "${queueName}" failed: ${errorMessage ?? 'unknown error'}`
-        : `Job "${jobName}" (${jobId}) on queue "${queueName}" ${event} (attempt ${attempts})`;
-
-    try {
-      await this.logService.logs.ingest({
-        sessionId: SYSTEM_SESSION_ID,
-        userId: 'system',
-        level,
-        category: 'general',
-        content,
-        metadata: {
-          jobId,
-          jobName,
-          queue: queueName,
-          event,
-          attempts,
-          ...(errorMessage ? { errorMessage } : {}),
-        },
-      });
-    } catch (err) {
-      // Log errors must never crash job execution
-      this.logger.warn(`Failed to write job event log for job ${jobId}: ${String(err)}`);
-    }
-  }
-
-  // -------------------------------------------------------------------------
-  // Lifecycle
-  // -------------------------------------------------------------------------
-
-  private async closeAll(): Promise<void> {
-    const workerCloses = Array.from(this.workers.values()).map((w) =>
-      w.close().catch((err) => this.logger.error(`Worker close error: ${err}`)),
-    );
-    const queueCloses = Array.from(this.queues.values()).map((q) =>
-      q.close().catch((err) => this.logger.error(`Queue close error: ${err}`)),
-    );
-    await Promise.all([...workerCloses, ...queueCloses]);
-    this.workers.clear();
-    this.queues.clear();
-    this.logger.log('QueueService shut down');
-  }
-}
--- a/apps/gateway/src/queue/queue.tokens.ts
+++ b/apps/gateway/src/queue/queue.tokens.ts
@@ -1,2 +0,0 @@
-export const QUEUE_REDIS = 'QUEUE_REDIS';
-export const QUEUE_SERVICE = 'QUEUE_SERVICE';
--- a/apps/gateway/src/reload/reload.controller.ts
+++ b/apps/gateway/src/reload/reload.controller.ts
@@ -1,5 +1,5 @@
 import { Controller, HttpCode, HttpStatus, Inject, Post, UseGuards } from '@nestjs/common';
-import type { SystemReloadPayload } from '@mosaicstack/types';
+import type { SystemReloadPayload } from '@mosaic/types';
 import { AdminGuard } from '../admin/admin.guard.js';
 import { ChatGateway } from '../chat/chat.gateway.js';
 import { ReloadService } from './reload.service.js';
--- a/apps/gateway/src/reload/reload.service.ts
+++ b/apps/gateway/src/reload/reload.service.ts
@@ -5,7 +5,7 @@ import {
  type OnApplicationBootstrap,
  type OnApplicationShutdown,
 } from '@nestjs/common';
-import type { SystemReloadPayload } from '@mosaicstack/types';
+import type { SystemReloadPayload } from '@mosaic/types';
 import { CommandRegistryService } from '../commands/command-registry.service.js';
 import { isMosaicPlugin } from './mosaic-plugin.interface.js';

--- a/apps/gateway/src/skills/skills.service.ts
+++ b/apps/gateway/src/skills/skills.service.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common';
-import { eq, type Db, skills } from '@mosaicstack/db';
+import { eq, type Db, skills } from '@mosaic/db';
 import { DB } from '../database/database.module.js';

 type Skill = typeof skills.$inferSelect;
--- a/apps/gateway/src/tasks/tasks.controller.ts
+++ b/apps/gateway/src/tasks/tasks.controller.ts
@@ -14,7 +14,7 @@ import {
  Query,
  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';
--- a/apps/gateway/src/workspace/project-bootstrap.service.ts
+++ b/apps/gateway/src/workspace/project-bootstrap.service.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
-import type { Brain } from '@mosaicstack/brain';
+import type { Brain } from '@mosaic/brain';
 import { BRAIN } from '../brain/brain.tokens.js';
 import { PluginService } from '../plugin/plugin.service.js';
 import { WorkspaceService } from './workspace.service.js';
--- a/apps/gateway/src/workspace/teams.service.ts
+++ b/apps/gateway/src/workspace/teams.service.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
-import { eq, and, type Db, teams, teamMembers, projects } from '@mosaicstack/db';
+import { eq, and, type Db, teams, teamMembers, projects } from '@mosaic/db';
 import { DB } from '../database/database.module.js';

@Injectable()
--- a/apps/gateway/tsconfig.typecheck.json
+++ b/apps/gateway/tsconfig.typecheck.json
@@ -4,15 +4,15 @@
    "rootDir": "../..",
    "baseUrl": ".",
    "paths": {
-      "@mosaicstack/auth": ["../../packages/auth/src/index.ts"],
-      "@mosaicstack/brain": ["../../packages/brain/src/index.ts"],
-      "@mosaicstack/coord": ["../../packages/coord/src/index.ts"],
-      "@mosaicstack/db": ["../../packages/db/src/index.ts"],
-      "@mosaicstack/log": ["../../packages/log/src/index.ts"],
-      "@mosaicstack/memory": ["../../packages/memory/src/index.ts"],
-      "@mosaicstack/types": ["../../packages/types/src/index.ts"],
-      "@mosaicstack/discord-plugin": ["../../plugins/discord/src/index.ts"],
-      "@mosaicstack/telegram-plugin": ["../../plugins/telegram/src/index.ts"]
+      "@mosaic/auth": ["../../packages/auth/src/index.ts"],
+      "@mosaic/brain": ["../../packages/brain/src/index.ts"],
+      "@mosaic/coord": ["../../packages/coord/src/index.ts"],
+      "@mosaic/db": ["../../packages/db/src/index.ts"],
+      "@mosaic/log": ["../../packages/log/src/index.ts"],
+      "@mosaic/memory": ["../../packages/memory/src/index.ts"],
+      "@mosaic/types": ["../../packages/types/src/index.ts"],
+      "@mosaic/discord-plugin": ["../../plugins/discord/src/index.ts"],
+      "@mosaic/telegram-plugin": ["../../plugins/telegram/src/index.ts"]
    }
  }
 }
--- a/apps/gateway/vitest.config.ts
+++ b/apps/gateway/vitest.config.ts
@@ -1,4 +1,3 @@
-import swc from 'unplugin-swc';
 import { defineConfig } from 'vitest/config';

 export default defineConfig({
@@ -6,22 +5,4 @@ export default defineConfig({
    globals: true,
    environment: 'node',
  },
-  plugins: [
-    swc.vite({
-      jsc: {
-        parser: {
-          syntax: 'typescript',
-          decorators: true,
-        },
-        transform: {
-          decoratorMetadata: true,
-          legacyDecorator: true,
-        },
-        target: 'es2022',
-      },
-      module: {
-        type: 'nodenext',
-      },
-    }),
-  ],
 });
--- a/apps/web/next.config.ts
+++ b/apps/web/next.config.ts
@@ -2,7 +2,7 @@ import type { NextConfig } from 'next';

 const nextConfig: NextConfig = {
  output: 'standalone',
-  transpilePackages: ['@mosaicstack/design-tokens'],
+  transpilePackages: ['@mosaic/design-tokens'],

  // Enable gzip/brotli compression for all responses.
  compress: true,
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@mosaicstack/web",
-  "version": "0.0.2",
+  "name": "@mosaic/web",
+  "version": "0.0.0",
  "private": true,
  "scripts": {
    "build": "next build",
@@ -12,7 +12,7 @@
    "start": "next start"
  },
  "dependencies": {
-    "@mosaicstack/design-tokens": "workspace:^",
+    "@mosaic/design-tokens": "workspace:^",
    "better-auth": "^1.5.5",
    "clsx": "^2.1.0",
    "next": "^16.0.0",
--- a/apps/web/playwright.config.ts
+++ b/apps/web/playwright.config.ts
@@ -5,9 +5,9 @@ import { defineConfig, devices } from '@playwright/test';
 *
 * Assumes:
 *   - Next.js web app running on http://localhost:3000
- *   - NestJS gateway running on http://localhost:14242
+ *   - NestJS gateway running on http://localhost:4000
 *
- * Run with:   pnpm --filter @mosaicstack/web test:e2e
+ * Run with:   pnpm --filter @mosaic/web test:e2e
 */
 export default defineConfig({
  testDir: './e2e',
--- a/apps/web/public/.gitkeep
+++ b/apps/web/public/.gitkeep
--- a/apps/web/src/lib/api.ts
+++ b/apps/web/src/lib/api.ts
@@ -1,4 +1,4 @@
-const GATEWAY_URL = process.env['NEXT_PUBLIC_GATEWAY_URL'] ?? 'http://localhost:14242';
+const GATEWAY_URL = process.env['NEXT_PUBLIC_GATEWAY_URL'] ?? 'http://localhost:4000';

 export interface ApiRequestInit extends Omit<RequestInit, 'body'> {
  body?: unknown;
--- a/apps/web/src/lib/auth-client.ts
+++ b/apps/web/src/lib/auth-client.ts
@@ -2,7 +2,7 @@ import { createAuthClient } from 'better-auth/react';
 import { adminClient, genericOAuthClient } from 'better-auth/client/plugins';

 export const authClient = createAuthClient({
-  baseURL: process.env['NEXT_PUBLIC_GATEWAY_URL'] ?? 'http://localhost:14242',
+  baseURL: process.env['NEXT_PUBLIC_GATEWAY_URL'] ?? 'http://localhost:4000',
  plugins: [adminClient(), genericOAuthClient()],
 });

--- a/apps/web/src/lib/socket.ts
+++ b/apps/web/src/lib/socket.ts
@@ -1,6 +1,6 @@
 import { io, type Socket } from 'socket.io-client';

-const GATEWAY_URL = process.env['NEXT_PUBLIC_GATEWAY_URL'] ?? 'http://localhost:14242';
+const GATEWAY_URL = process.env['NEXT_PUBLIC_GATEWAY_URL'] ?? 'http://localhost:4000';

 let socket: Socket | null = null;

--- a/Show More
+++ b/Show More