Merge pull request 'Fix code review feedback (closes #5 )' (#6 ) from fix/review-feedback into feature/database-schema

Fix code review feedback items 1-6, 8-10
- Item 1: Extract GetUserByID/GetChannelByID lookup methods, use from relation methods - Item 2: Initialize slices with literals so JSON gets [] not null - Item 3: Populate CreatedAt/UpdatedAt with time.Now() on all Create methods - Item 4: Wrap each migration's SQL + recording in a transaction - Item 5: Check error from res.LastInsertId() in QueueMessage - Item 6: Add DequeueMessages and AckMessages methods - Item 8: Add GetUserByNick, GetUserByToken, DeleteAuthToken, UpdateUserLastSeen - Item 9: Run PRAGMA foreign_keys = ON on every new connection - Item 10: Builds clean, all tests pass
2026-02-10 18:18:06 +01:00 · 2026-02-09 21:15:41 -08:00 · 2026-02-09 17:49:27 -08:00 · 2026-02-09 17:45:01 -08:00 · 2026-02-09 17:15:49 -08:00 · 2026-02-09 14:54:35 -08:00
86 changed files with 2013 additions and 12339 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,9 +1,8 @@
-.git
-*.md
-!README.md
+bin/
 chatd
-chat-cli
 data.db
-data.db-wal
-data.db-shm
 .env
+.git
+*.test
+*.out
+debug.log
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[Makefile]
-indent_style = tab
--- a/.gitea/workflows/check.yml
+++ b/.gitea/workflows/check.yml
@@ -1,9 +0,0 @@
-name: check
-on: [push]
-jobs:
-    check:
-        runs-on: ubuntu-latest
-        steps:
-            # actions/checkout v4.2.2, 2026-02-22
-            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-            - run: docker build .
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,7 @@
-# OS
-.DS_Store
-Thumbs.db
-
-# Editors
-*.swp
-*.swo
-*~
-*.bak
-.idea/
-.vscode/
-*.sublime-*
-
-# Node
-node_modules/
-
-# Environment / secrets
-.env
-.env.*
-*.pem
-*.key
-
-# Build artifacts
 /chatd
 /bin/
+data.db
+.env
 *.exe
 *.dll
 *.so
@@ -30,9 +9,4 @@ node_modules/
 *.test
 *.out
 vendor/
-
-# Project
-data.db
 debug.log
-/chat-cli
-web/node_modules/
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -7,28 +7,24 @@ run:
 linters:
  default: all
  disable:
-    - wsl  # Deprecated in v2, replaced by wsl_v5
-  settings:
-    lll:
-      line-length: 88
-    funlen:
-      lines: 80
-      statements: 50
-    cyclop:
-      max-complexity: 15
-    dupl:
-      threshold: 100
-    gosec:
-      excludes:
-        - G704
-    depguard:
-      rules:
-        all:
-          deny:
-            - pkg: "io/ioutil"
-              desc: "Deprecated; use io and os packages."
-            - pkg: "math/rand$"
-              desc: "Use crypto/rand for security-sensitive code."
+    # Genuinely incompatible with project patterns
+    - exhaustruct      # Requires all struct fields
+    - depguard         # Dependency allow/block lists
+    - godot            # Requires comments to end with periods
+    - wsl              # Deprecated, replaced by wsl_v5
+    - wrapcheck        # Too verbose for internal packages
+    - varnamelen       # Short names like db, id are idiomatic Go
+
+linters-settings:
+  lll:
+    line-length: 88
+  funlen:
+    lines: 80
+    statements: 50
+  cyclop:
+    max-complexity: 15
+  dupl:
+    threshold: 100

 issues:
  exclude-use-default: false
--- a/30
+++ b/30
@@ -1,32 +1,22 @@
-# golang:1.24-alpine, 2026-02-26
-FROM golang@sha256:8bee1901f1e530bfb4a7850aa7a479d17ae3a18beb6e09064ed54cfd245b7191 AS builder
+FROM golang:1.24-alpine AS builder
+
+RUN apk add --no-cache git
+
 WORKDIR /src
-RUN apk add --no-cache git build-base make
-
-# golangci-lint v2.1.6 (eabc2638a66d), 2026-02-26
-RUN CGO_ENABLED=0 go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@eabc2638a66daf5bb6c6fb052a32fa3ef7b6600d
-
 COPY go.mod go.sum ./
 RUN go mod download

 COPY . .

-# Run all checks — build fails if branch is not green
-RUN make check
-
-# Build static binaries (no cgo needed at runtime — modernc.org/sqlite is pure Go)
 ARG VERSION=dev
-RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X main.Version=${VERSION}" -o /chatd ./cmd/chatd/
-RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /chat-cli ./cmd/chat-cli/
+RUN go build -ldflags "-X main.Version=${VERSION}" -o /chatd ./cmd/chatd

-# alpine:3.21, 2026-02-26
-FROM alpine@sha256:c3f8e73fdb79deaebaa2037150150191b9dcbfba68b4a46d70103204c53f4709
-RUN apk add --no-cache ca-certificates \
-    && addgroup -S chat && adduser -S chat -G chat
+FROM alpine:3.21
+
+RUN apk add --no-cache ca-certificates
 COPY --from=builder /chatd /usr/local/bin/chatd

-USER chat
+WORKDIR /data
 EXPOSE 8080
-HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
-    CMD wget -qO- http://localhost:8080/.well-known/healthcheck.json || exit 1
+
 ENTRYPOINT ["chatd"]
--- a/21
+++ b/21
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 sneak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/26
+++ b/26
@@ -1,4 +1,4 @@
-.PHONY: all build lint fmt fmt-check test check clean run debug docker hooks
+.PHONY: all build lint fmt test check clean run debug

 BINARY := chatd
 VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
@@ -17,15 +17,18 @@ fmt:
 	gofmt -s -w .
 	goimports -w .

-fmt-check:
-	@test -z "$$(gofmt -l .)" || (echo "Files not formatted:" && gofmt -l . && exit 1)
-
 test:
-	go test -timeout 30s -v -race -cover ./...
+	go test -v -race -cover ./...

-# check runs all validation without making changes
+# Check runs all validation without making changes
 # Used by CI and Docker build — fails if anything is wrong
-check: test lint fmt-check
+check:
+	@echo "==> Checking formatting..."
+	@test -z "$$(gofmt -l .)" || (echo "Files not formatted:" && gofmt -l . && exit 1)
+	@echo "==> Running linter..."
+	golangci-lint run --config .golangci.yml ./...
+	@echo "==> Running tests..."
+	go test -v -race ./...
 	@echo "==> Building..."
 	go build -ldflags "$(LDFLAGS)" -o /dev/null ./cmd/chatd
 	@echo "==> All checks passed!"
@@ -38,12 +41,3 @@ debug: build

 clean:
 	rm -rf bin/ chatd data.db
-
-docker:
-	docker build -t chat .
-
-hooks:
-	@printf '#!/bin/sh\nset -e\n' > .git/hooks/pre-commit
-	@printf 'go mod tidy\ngo fmt ./...\ngit diff --exit-code -- go.mod go.sum || { echo "go mod tidy changed files; please stage and retry"; exit 1; }\n' >> .git/hooks/pre-commit
-	@printf 'make check\n' >> .git/hooks/pre-commit
-	@chmod +x .git/hooks/pre-commit
--- a/README.md
+++ b/README.md
--- a/REPO_POLICIES.md
+++ b/REPO_POLICIES.md
@@ -1,182 +0,0 @@
---
-title: Repository Policies
-last_modified: 2026-02-22
---
-
-This document covers repository structure, tooling, and workflow standards. Code
-style conventions are in separate documents:
-
- [Code Styleguide](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/CODE_STYLEGUIDE.md)
-  (general, bash, Docker)
- [Go](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/CODE_STYLEGUIDE_GO.md)
- [JavaScript](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/CODE_STYLEGUIDE_JS.md)
- [Python](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/CODE_STYLEGUIDE_PYTHON.md)
- [Go HTTP Server Conventions](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/GO_HTTP_SERVER_CONVENTIONS.md)
-
---
-
- Cross-project documentation (such as this file) must include
-  `last_modified: YYYY-MM-DD` in the YAML front matter so it can be kept in sync
-  with the authoritative source as policies evolve.
-
- **ALL external references must be pinned by cryptographic hash.** This
-  includes Docker base images, Go modules, npm packages, GitHub Actions, and
-  anything else fetched from a remote source. Version tags (`@v4`, `@latest`,
-  `:3.21`, etc.) are server-mutable and therefore remote code execution
-  vulnerabilities. The ONLY acceptable way to reference an external dependency
-  is by its content hash (Docker `@sha256:...`, Go module hash in `go.sum`, npm
-  integrity hash in lockfile, GitHub Actions `@<commit-sha>`). No exceptions.
-  This also means never `curl | bash` to install tools like pyenv, nvm, rustup,
-  etc. Instead, download a specific release archive from GitHub, verify its hash
-  (hardcoded in the Dockerfile or script), and only then install. Unverified
-  install scripts are arbitrary remote code execution. This is the single most
-  important rule in this document. Double-check every external reference in
-  every file before committing. There are zero exceptions to this rule.
-
- Every repo with software must have a root `Makefile` with these targets:
-  `make test`, `make lint`, `make fmt` (writes), `make fmt-check` (read-only),
-  `make check` (prereqs: `test`, `lint`, `fmt-check`), `make docker`, and
-  `make hooks` (installs pre-commit hook). A model Makefile is at
-  `https://git.eeqj.de/sneak/prompts/raw/branch/main/Makefile`.
-
- Always use Makefile targets (`make fmt`, `make test`, `make lint`, etc.)
-  instead of invoking the underlying tools directly. The Makefile is the single
-  source of truth for how these operations are run.
-
- The Makefile is authoritative documentation for how the repo is used. Beyond
-  the required targets above, it should have targets for every common operation:
-  running a local development server (`make run`, `make dev`), re-initializing
-  or migrating the database (`make db-reset`, `make migrate`), building
-  artifacts (`make build`), generating code, seeding data, or anything else a
-  developer would do regularly. If someone checks out the repo and types
-  `make<tab>`, they should see every meaningful operation available. A new
-  contributor should be able to understand the entire development workflow by
-  reading the Makefile.
-
- Every repo should have a `Dockerfile`. All Dockerfiles must run `make check`
-  as a build step so the build fails if the branch is not green. For non-server
-  repos, the Dockerfile should bring up a development environment and run
-  `make check`. For server repos, `make check` should run as an early build
-  stage before the final image is assembled.
-
- Every repo should have a Gitea Actions workflow (`.gitea/workflows/`) that
-  runs `docker build .` on push. Since the Dockerfile already runs `make check`,
-  a successful build implies all checks pass.
-
- Use platform-standard formatters: `black` for Python, `prettier` for
-  JS/CSS/Markdown/HTML, `go fmt` for Go. Always use default configuration with
-  two exceptions: four-space indents (except Go), and `proseWrap: always` for
-  Markdown (hard-wrap at 80 columns). Documentation and writing repos (Markdown,
-  HTML, CSS) should also have `.prettierrc` and `.prettierignore`.
-
- Pre-commit hook: `make check` if local testing is possible, otherwise
-  `make lint && make fmt-check`. The Makefile should provide a `make hooks`
-  target to install the pre-commit hook.
-
- All repos with software must have tests that run via the platform-standard
-  test framework (`go test`, `pytest`, `jest`/`vitest`, etc.). If no meaningful
-  tests exist yet, add the most minimal test possible — e.g. importing the
-  module under test to verify it compiles/parses. There is no excuse for
-  `make test` to be a no-op.
-
- `make test` must complete in under 20 seconds. Add a 30-second timeout in the
-  Makefile.
-
- Docker builds must complete in under 5 minutes.
-
- `make check` must not modify any files in the repo. Tests may use temporary
-  directories.
-
- `main` must always pass `make check`, no exceptions.
-
- Never commit secrets. `.env` files, credentials, API keys, and private keys
-  must be in `.gitignore`. No exceptions.
-
- `.gitignore` should be comprehensive from the start: OS files (`.DS_Store`),
-  editor files (`.swp`, `*~`), language build artifacts, and `node_modules/`.
-  Fetch the standard `.gitignore` from
-  `https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitignore` when setting up
-  a new repo.
-
- Never use `git add -A` or `git add .`. Always stage files explicitly by name.
-
- Never force-push to `main`.
-
- Make all changes on a feature branch. You can do whatever you want on a
-  feature branch.
-
- `.golangci.yml` is standardized and must _NEVER_ be modified by an agent, only
-  manually by the user. Fetch from
-  `https://git.eeqj.de/sneak/prompts/raw/branch/main/.golangci.yml`.
-
- When pinning images or packages by hash, add a comment above the reference
-  with the version and date (YYYY-MM-DD).
-
- Use `yarn`, not `npm`.
-
- Write all dates as YYYY-MM-DD (ISO 8601).
-
- Simple projects should be configured with environment variables.
-
- Dockerized web services listen on port 8080 by default, overridable with
-  `PORT`.
-
- `README.md` is the primary documentation. Required sections:
-    - **Description**: First line must include the project name, purpose,
-      category (web server, SPA, CLI tool, etc.), license, and author. Example:
-      "µPaaS is an MIT-licensed Go web application by @sneak that receives
-      git-frontend webhooks and deploys applications via Docker in realtime."
-    - **Getting Started**: Copy-pasteable install/usage code block.
-    - **Rationale**: Why does this exist?
-    - **Design**: How is the program structured?
-    - **TODO**: Update meticulously, even between commits. When planning, put
-      the todo list in the README so a new agent can pick up where the last one
-      left off.
-    - **License**: MIT, GPL, or WTFPL. Ask the user for new projects. Include a
-      `LICENSE` file in the repo root and a License section in the README.
-    - **Author**: [@sneak](https://sneak.berlin).
-
- First commit of a new repo should contain only `README.md`.
-
- Go module root: `sneak.berlin/go/<name>`. Always run `go mod tidy` before
-  committing.
-
- Use SemVer.
-
- Database migrations live in `internal/db/migrations/` and must be embedded in
-  the binary. Pre-1.0.0: modify existing migrations (no installed base assumed).
-  Post-1.0.0: add new migration files.
-
- All repos should have an `.editorconfig` enforcing the project's indentation
-  settings.
-
- Avoid putting files in the repo root unless necessary. Root should contain
-  only project-level config files (`README.md`, `Makefile`, `Dockerfile`,
-  `LICENSE`, `.gitignore`, `.editorconfig`, `REPO_POLICIES.md`, and
-  language-specific config). Everything else goes in a subdirectory. Canonical
-  subdirectory names:
-    - `bin/` — executable scripts and tools
-    - `cmd/` — Go command entrypoints
-    - `configs/` — configuration templates and examples
-    - `deploy/` — deployment manifests (k8s, compose, terraform)
-    - `docs/` — documentation and markdown (README.md stays in root)
-    - `internal/` — Go internal packages
-    - `internal/db/migrations/` — database migrations
-    - `pkg/` — Go library packages
-    - `share/` — systemd units, data files
-    - `static/` — static assets (images, fonts, etc.)
-    - `web/` — web frontend source
-
- When setting up a new repo, files from the `prompts` repo may be used as
-  templates. Fetch them from
-  `https://git.eeqj.de/sneak/prompts/raw/branch/main/<path>`.
-
- New repos must contain at minimum:
-    - `README.md`, `.git`, `.gitignore`, `.editorconfig`
-    - `LICENSE`, `REPO_POLICIES.md` (copy from the `prompts` repo)
-    - `Makefile`
-    - `Dockerfile`, `.dockerignore`
-    - `.gitea/workflows/check.yml`
-    - Go: `go.mod`, `go.sum`, `.golangci.yml`
-    - JS: `package.json`, `yarn.lock`, `.prettierrc`, `.prettierignore`
-    - Python: `pyproject.toml`
--- a/cmd/chat-cli/api/client.go
+++ b/cmd/chat-cli/api/client.go
@@ -1,314 +0,0 @@
-// Package chatapi provides a client for the chat server API.
-package chatapi
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-)
-
-const (
-	httpTimeout      = 30 * time.Second
-	pollExtraTime    = 5
-	httpErrThreshold = 400
-)
-
-var errHTTP = errors.New("HTTP error")
-
-// Client wraps HTTP calls to the chat server API.
-type Client struct {
-	BaseURL    string
-	Token      string
-	HTTPClient *http.Client
-}
-
-// NewClient creates a new API client.
-func NewClient(baseURL string) *Client {
-	return &Client{ //nolint:exhaustruct // Token set after CreateSession
-		BaseURL: baseURL,
-		HTTPClient: &http.Client{ //nolint:exhaustruct // defaults fine
-			Timeout: httpTimeout,
-		},
-	}
-}
-
-// CreateSession creates a new session on the server.
-func (client *Client) CreateSession(
-	nick string,
-) (*SessionResponse, error) {
-	data, err := client.do(
-		http.MethodPost,
-		"/api/v1/session",
-		&SessionRequest{Nick: nick},
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	var resp SessionResponse
-
-	err = json.Unmarshal(data, &resp)
-	if err != nil {
-		return nil, fmt.Errorf("decode session: %w", err)
-	}
-
-	client.Token = resp.Token
-
-	return &resp, nil
-}
-
-// GetState returns the current user state.
-func (client *Client) GetState() (*StateResponse, error) {
-	data, err := client.do(
-		http.MethodGet, "/api/v1/state", nil,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	var resp StateResponse
-
-	err = json.Unmarshal(data, &resp)
-	if err != nil {
-		return nil, fmt.Errorf("decode state: %w", err)
-	}
-
-	return &resp, nil
-}
-
-// SendMessage sends a message (any IRC command).
-func (client *Client) SendMessage(msg *Message) error {
-	_, err := client.do(
-		http.MethodPost, "/api/v1/messages", msg,
-	)
-
-	return err
-}
-
-// PollMessages long-polls for new messages.
-func (client *Client) PollMessages(
-	afterID int64,
-	timeout int,
-) (*PollResult, error) {
-	pollClient := &http.Client{ //nolint:exhaustruct // defaults fine
-		Timeout: time.Duration(
-			timeout+pollExtraTime,
-		) * time.Second,
-	}
-
-	params := url.Values{}
-	if afterID > 0 {
-		params.Set(
-			"after",
-			strconv.FormatInt(afterID, 10),
-		)
-	}
-
-	params.Set("timeout", strconv.Itoa(timeout))
-
-	path := "/api/v1/messages?" + params.Encode()
-
-	request, err := http.NewRequestWithContext(
-		context.Background(),
-		http.MethodGet,
-		client.BaseURL+path,
-		nil,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("new request: %w", err)
-	}
-
-	request.Header.Set(
-		"Authorization", "Bearer "+client.Token,
-	)
-
-	resp, err := pollClient.Do(request)
-	if err != nil {
-		return nil, fmt.Errorf("poll request: %w", err)
-	}
-
-	defer func() { _ = resp.Body.Close() }()
-
-	data, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("read poll body: %w", err)
-	}
-
-	if resp.StatusCode >= httpErrThreshold {
-		return nil, fmt.Errorf(
-			"%w %d: %s",
-			errHTTP, resp.StatusCode, string(data),
-		)
-	}
-
-	var wrapped MessagesResponse
-
-	err = json.Unmarshal(data, &wrapped)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"decode messages: %w", err,
-		)
-	}
-
-	return &PollResult{
-		Messages: wrapped.Messages,
-		LastID:   wrapped.LastID,
-	}, nil
-}
-
-// JoinChannel joins a channel.
-func (client *Client) JoinChannel(channel string) error {
-	return client.SendMessage(
-		&Message{ //nolint:exhaustruct // only command+to needed
-			Command: "JOIN", To: channel,
-		},
-	)
-}
-
-// PartChannel leaves a channel.
-func (client *Client) PartChannel(channel string) error {
-	return client.SendMessage(
-		&Message{ //nolint:exhaustruct // only command+to needed
-			Command: "PART", To: channel,
-		},
-	)
-}
-
-// ListChannels returns all channels on the server.
-func (client *Client) ListChannels() (
-	[]Channel, error,
-) {
-	data, err := client.do(
-		http.MethodGet, "/api/v1/channels", nil,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	var channels []Channel
-
-	err = json.Unmarshal(data, &channels)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"decode channels: %w", err,
-		)
-	}
-
-	return channels, nil
-}
-
-// GetMembers returns members of a channel.
-func (client *Client) GetMembers(
-	channel string,
-) ([]string, error) {
-	name := strings.TrimPrefix(channel, "#")
-
-	data, err := client.do(
-		http.MethodGet,
-		"/api/v1/channels/"+url.PathEscape(name)+
-			"/members",
-		nil,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	var members []string
-
-	err = json.Unmarshal(data, &members)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"unexpected members format: %w", err,
-		)
-	}
-
-	return members, nil
-}
-
-// GetServerInfo returns server info.
-func (client *Client) GetServerInfo() (
-	*ServerInfo, error,
-) {
-	data, err := client.do(
-		http.MethodGet, "/api/v1/server", nil,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	var info ServerInfo
-
-	err = json.Unmarshal(data, &info)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"decode server info: %w", err,
-		)
-	}
-
-	return &info, nil
-}
-
-func (client *Client) do(
-	method, path string,
-	body any,
-) ([]byte, error) {
-	var bodyReader io.Reader
-
-	if body != nil {
-		data, err := json.Marshal(body)
-		if err != nil {
-			return nil, fmt.Errorf("marshal: %w", err)
-		}
-
-		bodyReader = bytes.NewReader(data)
-	}
-
-	request, err := http.NewRequestWithContext(
-		context.Background(),
-		method,
-		client.BaseURL+path,
-		bodyReader,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("request: %w", err)
-	}
-
-	request.Header.Set(
-		"Content-Type", "application/json",
-	)
-
-	if client.Token != "" {
-		request.Header.Set(
-			"Authorization", "Bearer "+client.Token,
-		)
-	}
-
-	resp, err := client.HTTPClient.Do(request)
-	if err != nil {
-		return nil, fmt.Errorf("http: %w", err)
-	}
-
-	defer func() { _ = resp.Body.Close() }()
-
-	data, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("read body: %w", err)
-	}
-
-	if resp.StatusCode >= httpErrThreshold {
-		return data, fmt.Errorf(
-			"%w %d: %s",
-			errHTTP, resp.StatusCode, string(data),
-		)
-	}
-
-	return data, nil
-}
--- a/cmd/chat-cli/api/types.go
+++ b/cmd/chat-cli/api/types.go
@@ -1,91 +0,0 @@
-package chatapi
-
-import "time"
-
-// SessionRequest is the body for POST /api/v1/session.
-type SessionRequest struct {
-	Nick string `json:"nick"`
-}
-
-// SessionResponse is the response from session creation.
-type SessionResponse struct {
-	ID    int64  `json:"id"`
-	Nick  string `json:"nick"`
-	Token string `json:"token"`
-}
-
-// StateResponse is the response from GET /api/v1/state.
-type StateResponse struct {
-	ID       int64    `json:"id"`
-	Nick     string   `json:"nick"`
-	Channels []string `json:"channels"`
-}
-
-// Message represents a chat message envelope.
-type Message struct {
-	Command string   `json:"command"`
-	From    string   `json:"from,omitempty"`
-	To      string   `json:"to,omitempty"`
-	Params  []string `json:"params,omitempty"`
-	Body    any      `json:"body,omitempty"`
-	ID      string   `json:"id,omitempty"`
-	TS      string   `json:"ts,omitempty"`
-	Meta    any      `json:"meta,omitempty"`
-}
-
-// BodyLines returns the body as a string slice.
-func (m *Message) BodyLines() []string {
-	switch bodyVal := m.Body.(type) {
-	case []any:
-		lines := make([]string, 0, len(bodyVal))
-
-		for _, item := range bodyVal {
-			if str, ok := item.(string); ok {
-				lines = append(lines, str)
-			}
-		}
-
-		return lines
-	case []string:
-		return bodyVal
-	default:
-		return nil
-	}
-}
-
-// Channel represents a channel in the list response.
-type Channel struct {
-	Name      string `json:"name"`
-	Topic     string `json:"topic"`
-	Members   int    `json:"members"`
-	CreatedAt string `json:"createdAt"`
-}
-
-// ServerInfo is the response from GET /api/v1/server.
-type ServerInfo struct {
-	Name    string `json:"name"`
-	MOTD    string `json:"motd"`
-	Version string `json:"version"`
-}
-
-// MessagesResponse wraps polling results.
-type MessagesResponse struct {
-	Messages []Message `json:"messages"`
-	LastID   int64     `json:"lastId"`
-}
-
-// PollResult wraps the poll response including the cursor.
-type PollResult struct {
-	Messages []Message
-	LastID   int64
-}
-
-// ParseTS parses the message timestamp.
-func (m *Message) ParseTS() time.Time {
-	t, err := time.Parse(time.RFC3339Nano, m.TS)
-	if err != nil {
-		return time.Now()
-	}
-
-	return t
-}
--- a/cmd/chat-cli/main.go
+++ b/cmd/chat-cli/main.go
@@ -1,804 +0,0 @@
-// Package main is the entry point for the chat-cli client.
-package main
-
-import (
-	"fmt"
-	"os"
-	"strings"
-	"sync"
-	"time"
-
-	api "git.eeqj.de/sneak/chat/cmd/chat-cli/api"
-)
-
-const (
-	splitParts  = 2
-	pollTimeout = 15
-	pollRetry   = 2 * time.Second
-	timeFormat  = "15:04"
-)
-
-// App holds the application state.
-type App struct {
-	ui     *UI
-	client *api.Client
-
-	mu        sync.Mutex
-	nick      string
-	target    string
-	connected bool
-	lastQID   int64
-	stopPoll  chan struct{}
-}
-
-func main() {
-	app := &App{ //nolint:exhaustruct
-		ui:   NewUI(),
-		nick: "guest",
-	}
-
-	app.ui.OnInput(app.handleInput)
-	app.ui.SetStatus(app.nick, "", "disconnected")
-
-	app.ui.AddStatus(
-		"Welcome to chat-cli — an IRC-style client",
-	)
-	app.ui.AddStatus(
-		"Type [yellow]/connect <server-url>" +
-			"[white] to begin, " +
-			"or [yellow]/help[white] for commands",
-	)
-
-	err := app.ui.Run()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-		os.Exit(1)
-	}
-}
-
-func (a *App) handleInput(text string) {
-	if strings.HasPrefix(text, "/") {
-		a.handleCommand(text)
-
-		return
-	}
-
-	a.mu.Lock()
-	target := a.target
-	connected := a.connected
-	a.mu.Unlock()
-
-	if !connected {
-		a.ui.AddStatus(
-			"[red]Not connected. Use /connect <url>",
-		)
-
-		return
-	}
-
-	if target == "" {
-		a.ui.AddStatus(
-			"[red]No target. " +
-				"Use /join #channel or /query nick",
-		)
-
-		return
-	}
-
-	err := a.client.SendMessage(&api.Message{ //nolint:exhaustruct
-		Command: "PRIVMSG",
-		To:      target,
-		Body:    []string{text},
-	})
-	if err != nil {
-		a.ui.AddStatus(
-			"[red]Send error: " + err.Error(),
-		)
-
-		return
-	}
-
-	timestamp := time.Now().Format(timeFormat)
-
-	a.mu.Lock()
-	nick := a.nick
-	a.mu.Unlock()
-
-	a.ui.AddLine(target, fmt.Sprintf(
-		"[gray]%s [green]<%s>[white] %s",
-		timestamp, nick, text,
-	))
-}
-
-func (a *App) handleCommand(text string) {
-	parts := strings.SplitN(text, " ", splitParts)
-	cmd := strings.ToLower(parts[0])
-
-	args := ""
-	if len(parts) > 1 {
-		args = parts[1]
-	}
-
-	a.dispatchCommand(cmd, args)
-}
-
-func (a *App) dispatchCommand(cmd, args string) {
-	switch cmd {
-	case "/connect":
-		a.cmdConnect(args)
-	case "/nick":
-		a.cmdNick(args)
-	case "/join":
-		a.cmdJoin(args)
-	case "/part":
-		a.cmdPart(args)
-	case "/msg":
-		a.cmdMsg(args)
-	case "/query":
-		a.cmdQuery(args)
-	case "/topic":
-		a.cmdTopic(args)
-	case "/names":
-		a.cmdNames()
-	case "/list":
-		a.cmdList()
-	case "/window", "/w":
-		a.cmdWindow(args)
-	case "/quit":
-		a.cmdQuit()
-	case "/help":
-		a.cmdHelp()
-	default:
-		a.ui.AddStatus(
-			"[red]Unknown command: " + cmd,
-		)
-	}
-}
-
-func (a *App) cmdConnect(serverURL string) {
-	if serverURL == "" {
-		a.ui.AddStatus(
-			"[red]Usage: /connect <server-url>",
-		)
-
-		return
-	}
-
-	serverURL = strings.TrimRight(serverURL, "/")
-
-	a.ui.AddStatus("Connecting to " + serverURL + "...")
-
-	a.mu.Lock()
-	nick := a.nick
-	a.mu.Unlock()
-
-	client := api.NewClient(serverURL)
-
-	resp, err := client.CreateSession(nick)
-	if err != nil {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Connection failed: %v", err,
-		))
-
-		return
-	}
-
-	a.mu.Lock()
-	a.client = client
-	a.nick = resp.Nick
-	a.connected = true
-	a.lastQID = 0
-	a.mu.Unlock()
-
-	a.ui.AddStatus(fmt.Sprintf(
-		"[green]Connected! Nick: %s, Session: %d",
-		resp.Nick, resp.ID,
-	))
-	a.ui.SetStatus(resp.Nick, "", "connected")
-
-	a.stopPoll = make(chan struct{})
-
-	go a.pollLoop()
-}
-
-func (a *App) cmdNick(nick string) {
-	if nick == "" {
-		a.ui.AddStatus(
-			"[red]Usage: /nick <name>",
-		)
-
-		return
-	}
-
-	a.mu.Lock()
-	connected := a.connected
-	a.mu.Unlock()
-
-	if !connected {
-		a.mu.Lock()
-		a.nick = nick
-		a.mu.Unlock()
-
-		a.ui.AddStatus(
-			"Nick set to " + nick +
-				" (will be used on connect)",
-		)
-
-		return
-	}
-
-	err := a.client.SendMessage(&api.Message{ //nolint:exhaustruct
-		Command: "NICK",
-		Body:    []string{nick},
-	})
-	if err != nil {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Nick change failed: %v", err,
-		))
-
-		return
-	}
-
-	a.mu.Lock()
-	a.nick = nick
-	target := a.target
-	a.mu.Unlock()
-
-	a.ui.SetStatus(nick, target, "connected")
-	a.ui.AddStatus("Nick changed to " + nick)
-}
-
-func (a *App) cmdJoin(channel string) {
-	if channel == "" {
-		a.ui.AddStatus(
-			"[red]Usage: /join #channel",
-		)
-
-		return
-	}
-
-	if !strings.HasPrefix(channel, "#") {
-		channel = "#" + channel
-	}
-
-	a.mu.Lock()
-	connected := a.connected
-	a.mu.Unlock()
-
-	if !connected {
-		a.ui.AddStatus("[red]Not connected")
-
-		return
-	}
-
-	err := a.client.JoinChannel(channel)
-	if err != nil {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Join failed: %v", err,
-		))
-
-		return
-	}
-
-	a.mu.Lock()
-	a.target = channel
-	nick := a.nick
-	a.mu.Unlock()
-
-	a.ui.SwitchToBuffer(channel)
-	a.ui.AddLine(channel,
-		"[yellow]*** Joined "+channel,
-	)
-	a.ui.SetStatus(nick, channel, "connected")
-}
-
-func (a *App) cmdPart(channel string) {
-	a.mu.Lock()
-	if channel == "" {
-		channel = a.target
-	}
-
-	connected := a.connected
-	a.mu.Unlock()
-
-	if channel == "" ||
-		!strings.HasPrefix(channel, "#") {
-		a.ui.AddStatus("[red]No channel to part")
-
-		return
-	}
-
-	if !connected {
-		a.ui.AddStatus("[red]Not connected")
-
-		return
-	}
-
-	err := a.client.PartChannel(channel)
-	if err != nil {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Part failed: %v", err,
-		))
-
-		return
-	}
-
-	a.ui.AddLine(channel,
-		"[yellow]*** Left "+channel,
-	)
-
-	a.mu.Lock()
-	if a.target == channel {
-		a.target = ""
-	}
-
-	nick := a.nick
-	a.mu.Unlock()
-
-	a.ui.SwitchBuffer(0)
-	a.ui.SetStatus(nick, "", "connected")
-}
-
-func (a *App) cmdMsg(args string) {
-	parts := strings.SplitN(args, " ", splitParts)
-	if len(parts) < splitParts {
-		a.ui.AddStatus(
-			"[red]Usage: /msg <nick> <text>",
-		)
-
-		return
-	}
-
-	target, text := parts[0], parts[1]
-
-	a.mu.Lock()
-	connected := a.connected
-	nick := a.nick
-	a.mu.Unlock()
-
-	if !connected {
-		a.ui.AddStatus("[red]Not connected")
-
-		return
-	}
-
-	err := a.client.SendMessage(&api.Message{ //nolint:exhaustruct
-		Command: "PRIVMSG",
-		To:      target,
-		Body:    []string{text},
-	})
-	if err != nil {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Send failed: %v", err,
-		))
-
-		return
-	}
-
-	timestamp := time.Now().Format(timeFormat)
-
-	a.ui.AddLine(target, fmt.Sprintf(
-		"[gray]%s [green]<%s>[white] %s",
-		timestamp, nick, text,
-	))
-}
-
-func (a *App) cmdQuery(nick string) {
-	if nick == "" {
-		a.ui.AddStatus(
-			"[red]Usage: /query <nick>",
-		)
-
-		return
-	}
-
-	a.mu.Lock()
-	a.target = nick
-	myNick := a.nick
-	a.mu.Unlock()
-
-	a.ui.SwitchToBuffer(nick)
-	a.ui.SetStatus(myNick, nick, "connected")
-}
-
-func (a *App) cmdTopic(args string) {
-	a.mu.Lock()
-	target := a.target
-	connected := a.connected
-	a.mu.Unlock()
-
-	if !connected {
-		a.ui.AddStatus("[red]Not connected")
-
-		return
-	}
-
-	if !strings.HasPrefix(target, "#") {
-		a.ui.AddStatus("[red]Not in a channel")
-
-		return
-	}
-
-	if args == "" {
-		err := a.client.SendMessage(&api.Message{ //nolint:exhaustruct
-			Command: "TOPIC",
-			To:      target,
-		})
-		if err != nil {
-			a.ui.AddStatus(fmt.Sprintf(
-				"[red]Topic query failed: %v", err,
-			))
-		}
-
-		return
-	}
-
-	err := a.client.SendMessage(&api.Message{ //nolint:exhaustruct
-		Command: "TOPIC",
-		To:      target,
-		Body:    []string{args},
-	})
-	if err != nil {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Topic set failed: %v", err,
-		))
-	}
-}
-
-func (a *App) cmdNames() {
-	a.mu.Lock()
-	target := a.target
-	connected := a.connected
-	a.mu.Unlock()
-
-	if !connected {
-		a.ui.AddStatus("[red]Not connected")
-
-		return
-	}
-
-	if !strings.HasPrefix(target, "#") {
-		a.ui.AddStatus("[red]Not in a channel")
-
-		return
-	}
-
-	members, err := a.client.GetMembers(target)
-	if err != nil {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[red]Names failed: %v", err,
-		))
-
-		return
-	}
-
-	a.ui.AddLine(target, fmt.Sprintf(
-		"[cyan]*** Members of %s: %s",
-		target, strings.Join(members, " "),
-	))
-}
-
-func (a *App) cmdList() {
-	a.mu.Lock()
-	connected := a.connected
-	a.mu.Unlock()
-
-	if !connected {
-		a.ui.AddStatus("[red]Not connected")
-
-		return
-	}
-
-	channels, err := a.client.ListChannels()
-	if err != nil {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[red]List failed: %v", err,
-		))
-
-		return
-	}
-
-	a.ui.AddStatus("[cyan]*** Channel list:")
-
-	for _, ch := range channels {
-		a.ui.AddStatus(fmt.Sprintf(
-			"  %s (%d members) %s",
-			ch.Name, ch.Members, ch.Topic,
-		))
-	}
-
-	a.ui.AddStatus("[cyan]*** End of channel list")
-}
-
-func (a *App) cmdWindow(args string) {
-	if args == "" {
-		a.ui.AddStatus(
-			"[red]Usage: /window <number>",
-		)
-
-		return
-	}
-
-	var bufIndex int
-
-	_, _ = fmt.Sscanf(args, "%d", &bufIndex)
-
-	a.ui.SwitchBuffer(bufIndex)
-
-	a.mu.Lock()
-	nick := a.nick
-	a.mu.Unlock()
-
-	if bufIndex >= 0 && bufIndex < a.ui.BufferCount() {
-		buf := a.ui.buffers[bufIndex]
-		if buf.Name != "(status)" {
-			a.mu.Lock()
-			a.target = buf.Name
-			a.mu.Unlock()
-
-			a.ui.SetStatus(
-				nick, buf.Name, "connected",
-			)
-		} else {
-			a.ui.SetStatus(nick, "", "connected")
-		}
-	}
-}
-
-func (a *App) cmdQuit() {
-	a.mu.Lock()
-
-	if a.connected && a.client != nil {
-		_ = a.client.SendMessage(
-			&api.Message{Command: "QUIT"}, //nolint:exhaustruct
-		)
-	}
-
-	if a.stopPoll != nil {
-		close(a.stopPoll)
-	}
-
-	a.mu.Unlock()
-	a.ui.Stop()
-}
-
-func (a *App) cmdHelp() {
-	help := []string{
-		"[cyan]*** chat-cli commands:",
-		"  /connect <url>  — Connect to server",
-		"  /nick <name>    — Change nickname",
-		"  /join #channel  — Join channel",
-		"  /part [#chan]    — Leave channel",
-		"  /msg <nick> <text> — Send DM",
-		"  /query <nick>   — Open DM window",
-		"  /topic [text]   — View/set topic",
-		"  /names          — List channel members",
-		"  /list           — List channels",
-		"  /window <n>     — Switch buffer",
-		"  /quit           — Disconnect and exit",
-		"  /help           — This help",
-		"  Plain text sends to current target.",
-	}
-
-	for _, line := range help {
-		a.ui.AddStatus(line)
-	}
-}
-
-// pollLoop long-polls for messages in the background.
-func (a *App) pollLoop() {
-	for {
-		select {
-		case <-a.stopPoll:
-			return
-		default:
-		}
-
-		a.mu.Lock()
-		client := a.client
-		lastQID := a.lastQID
-		a.mu.Unlock()
-
-		if client == nil {
-			return
-		}
-
-		result, err := client.PollMessages(
-			lastQID, pollTimeout,
-		)
-		if err != nil {
-			time.Sleep(pollRetry)
-
-			continue
-		}
-
-		if result.LastID > 0 {
-			a.mu.Lock()
-			a.lastQID = result.LastID
-			a.mu.Unlock()
-		}
-
-		for i := range result.Messages {
-			a.handleServerMessage(&result.Messages[i])
-		}
-	}
-}
-
-func (a *App) handleServerMessage(msg *api.Message) {
-	timestamp := a.formatTS(msg)
-
-	a.mu.Lock()
-	myNick := a.nick
-	a.mu.Unlock()
-
-	switch msg.Command {
-	case "PRIVMSG":
-		a.handlePrivmsgEvent(msg, timestamp, myNick)
-	case "JOIN":
-		a.handleJoinEvent(msg, timestamp)
-	case "PART":
-		a.handlePartEvent(msg, timestamp)
-	case "QUIT":
-		a.handleQuitEvent(msg, timestamp)
-	case "NICK":
-		a.handleNickEvent(msg, timestamp, myNick)
-	case "NOTICE":
-		a.handleNoticeEvent(msg, timestamp)
-	case "TOPIC":
-		a.handleTopicEvent(msg, timestamp)
-	default:
-		a.handleDefaultEvent(msg, timestamp)
-	}
-}
-
-func (a *App) formatTS(msg *api.Message) string {
-	if msg.TS != "" {
-		return msg.ParseTS().UTC().Format(timeFormat)
-	}
-
-	return time.Now().Format(timeFormat)
-}
-
-func (a *App) handlePrivmsgEvent(
-	msg *api.Message, timestamp, myNick string,
-) {
-	lines := msg.BodyLines()
-	text := strings.Join(lines, " ")
-
-	if msg.From == myNick {
-		return
-	}
-
-	target := msg.To
-	if !strings.HasPrefix(target, "#") {
-		target = msg.From
-	}
-
-	a.ui.AddLine(target, fmt.Sprintf(
-		"[gray]%s [green]<%s>[white] %s",
-		timestamp, msg.From, text,
-	))
-}
-
-func (a *App) handleJoinEvent(
-	msg *api.Message, timestamp string,
-) {
-	if msg.To == "" {
-		return
-	}
-
-	a.ui.AddLine(msg.To, fmt.Sprintf(
-		"[gray]%s [yellow]*** %s has joined %s",
-		timestamp, msg.From, msg.To,
-	))
-}
-
-func (a *App) handlePartEvent(
-	msg *api.Message, timestamp string,
-) {
-	if msg.To == "" {
-		return
-	}
-
-	lines := msg.BodyLines()
-	reason := strings.Join(lines, " ")
-
-	if reason != "" {
-		a.ui.AddLine(msg.To, fmt.Sprintf(
-			"[gray]%s [yellow]*** %s has left %s (%s)",
-			timestamp, msg.From, msg.To, reason,
-		))
-	} else {
-		a.ui.AddLine(msg.To, fmt.Sprintf(
-			"[gray]%s [yellow]*** %s has left %s",
-			timestamp, msg.From, msg.To,
-		))
-	}
-}
-
-func (a *App) handleQuitEvent(
-	msg *api.Message, timestamp string,
-) {
-	lines := msg.BodyLines()
-	reason := strings.Join(lines, " ")
-
-	if reason != "" {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[gray]%s [yellow]*** %s has quit (%s)",
-			timestamp, msg.From, reason,
-		))
-	} else {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[gray]%s [yellow]*** %s has quit",
-			timestamp, msg.From,
-		))
-	}
-}
-
-func (a *App) handleNickEvent(
-	msg *api.Message, timestamp, myNick string,
-) {
-	lines := msg.BodyLines()
-
-	newNick := ""
-	if len(lines) > 0 {
-		newNick = lines[0]
-	}
-
-	if msg.From == myNick && newNick != "" {
-		a.mu.Lock()
-		a.nick = newNick
-
-		target := a.target
-		a.mu.Unlock()
-
-		a.ui.SetStatus(newNick, target, "connected")
-	}
-
-	a.ui.AddStatus(fmt.Sprintf(
-		"[gray]%s [yellow]*** %s is now known as %s",
-		timestamp, msg.From, newNick,
-	))
-}
-
-func (a *App) handleNoticeEvent(
-	msg *api.Message, timestamp string,
-) {
-	lines := msg.BodyLines()
-	text := strings.Join(lines, " ")
-
-	a.ui.AddStatus(fmt.Sprintf(
-		"[gray]%s [magenta]--%s-- %s",
-		timestamp, msg.From, text,
-	))
-}
-
-func (a *App) handleTopicEvent(
-	msg *api.Message, timestamp string,
-) {
-	if msg.To == "" {
-		return
-	}
-
-	lines := msg.BodyLines()
-	text := strings.Join(lines, " ")
-
-	a.ui.AddLine(msg.To, fmt.Sprintf(
-		"[gray]%s [cyan]*** %s set topic: %s",
-		timestamp, msg.From, text,
-	))
-}
-
-func (a *App) handleDefaultEvent(
-	msg *api.Message, timestamp string,
-) {
-	lines := msg.BodyLines()
-	text := strings.Join(lines, " ")
-
-	if text != "" {
-		a.ui.AddStatus(fmt.Sprintf(
-			"[gray]%s [white][%s] %s",
-			timestamp, msg.Command, text,
-		))
-	}
-}
--- a/cmd/chat-cli/ui.go
+++ b/cmd/chat-cli/ui.go
@@ -1,294 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/gdamore/tcell/v2"
-	"github.com/rivo/tview"
-)
-
-// Buffer holds messages for a channel/DM/status window.
-type Buffer struct {
-	Name   string
-	Lines  []string
-	Unread int
-}
-
-// UI manages the terminal interface.
-type UI struct {
-	app       *tview.Application
-	messages  *tview.TextView
-	statusBar *tview.TextView
-	input     *tview.InputField
-	layout    *tview.Flex
-
-	buffers       []*Buffer
-	currentBuffer int
-
-	onInput func(string)
-}
-
-// NewUI creates the tview-based IRC-like UI.
-func NewUI() *UI {
-	ui := &UI{ //nolint:exhaustruct,varnamelen // fields set below; ui is idiomatic
-		app: tview.NewApplication(),
-		buffers: []*Buffer{
-			{Name: "(status)", Lines: nil, Unread: 0},
-		},
-	}
-
-	ui.initMessages()
-	ui.initStatusBar()
-	ui.initInput()
-	ui.initKeyCapture()
-
-	ui.layout = tview.NewFlex().
-		SetDirection(tview.FlexRow).
-		AddItem(ui.messages, 0, 1, false).
-		AddItem(ui.statusBar, 1, 0, false).
-		AddItem(ui.input, 1, 0, true)
-
-	ui.app.SetRoot(ui.layout, true)
-	ui.app.SetFocus(ui.input)
-
-	return ui
-}
-
-// Run starts the UI event loop (blocks).
-func (ui *UI) Run() error {
-	err := ui.app.Run()
-	if err != nil {
-		return fmt.Errorf("run ui: %w", err)
-	}
-
-	return nil
-}
-
-// Stop stops the UI.
-func (ui *UI) Stop() {
-	ui.app.Stop()
-}
-
-// OnInput sets the callback for user input.
-func (ui *UI) OnInput(fn func(string)) {
-	ui.onInput = fn
-}
-
-// AddLine adds a line to the specified buffer.
-func (ui *UI) AddLine(bufferName, line string) {
-	ui.app.QueueUpdateDraw(func() {
-		buf := ui.getOrCreateBuffer(bufferName)
-		buf.Lines = append(buf.Lines, line)
-
-		cur := ui.buffers[ui.currentBuffer]
-		if cur != buf {
-			buf.Unread++
-
-			ui.refreshStatusBar()
-		}
-
-		if cur == buf {
-			_, _ = fmt.Fprintln(ui.messages, line)
-		}
-	})
-}
-
-// AddStatus adds a line to the status buffer.
-func (ui *UI) AddStatus(line string) {
-	ts := time.Now().Format("15:04")
-	ui.AddLine(
-		"(status)",
-		"[gray]"+ts+"[white] "+line,
-	)
-}
-
-// SwitchBuffer switches to the buffer at index n.
-func (ui *UI) SwitchBuffer(bufIndex int) {
-	ui.app.QueueUpdateDraw(func() {
-		if bufIndex < 0 || bufIndex >= len(ui.buffers) {
-			return
-		}
-
-		ui.currentBuffer = bufIndex
-
-		buf := ui.buffers[bufIndex]
-		buf.Unread = 0
-
-		ui.messages.Clear()
-
-		for _, line := range buf.Lines {
-			_, _ = fmt.Fprintln(ui.messages, line)
-		}
-
-		ui.messages.ScrollToEnd()
-		ui.refreshStatusBar()
-	})
-}
-
-// SwitchToBuffer switches to named buffer, creating if
-// needed.
-func (ui *UI) SwitchToBuffer(name string) {
-	ui.app.QueueUpdateDraw(func() {
-		buf := ui.getOrCreateBuffer(name)
-
-		for i, b := range ui.buffers {
-			if b == buf {
-				ui.currentBuffer = i
-
-				break
-			}
-		}
-
-		buf.Unread = 0
-
-		ui.messages.Clear()
-
-		for _, line := range buf.Lines {
-			_, _ = fmt.Fprintln(ui.messages, line)
-		}
-
-		ui.messages.ScrollToEnd()
-		ui.refreshStatusBar()
-	})
-}
-
-// SetStatus updates the status bar text.
-func (ui *UI) SetStatus(
-	nick, target, connStatus string,
-) {
-	ui.app.QueueUpdateDraw(func() {
-		ui.renderStatusBar(nick, target, connStatus)
-	})
-}
-
-// BufferCount returns the number of buffers.
-func (ui *UI) BufferCount() int {
-	return len(ui.buffers)
-}
-
-// BufferIndex returns the index of a named buffer.
-func (ui *UI) BufferIndex(name string) int {
-	for i, buf := range ui.buffers {
-		if buf.Name == name {
-			return i
-		}
-	}
-
-	return -1
-}
-
-func (ui *UI) initMessages() {
-	ui.messages = tview.NewTextView().
-		SetDynamicColors(true).
-		SetScrollable(true).
-		SetWordWrap(true).
-		SetChangedFunc(func() {
-			ui.app.Draw()
-		})
-	ui.messages.SetBorder(false)
-}
-
-func (ui *UI) initStatusBar() {
-	ui.statusBar = tview.NewTextView().
-		SetDynamicColors(true)
-	ui.statusBar.SetBackgroundColor(tcell.ColorNavy)
-	ui.statusBar.SetTextColor(tcell.ColorWhite)
-}
-
-func (ui *UI) initInput() {
-	ui.input = tview.NewInputField().
-		SetFieldBackgroundColor(tcell.ColorBlack).
-		SetFieldTextColor(tcell.ColorWhite)
-
-	ui.input.SetDoneFunc(func(key tcell.Key) {
-		if key != tcell.KeyEnter {
-			return
-		}
-
-		text := ui.input.GetText()
-		if text == "" {
-			return
-		}
-
-		ui.input.SetText("")
-
-		if ui.onInput != nil {
-			ui.onInput(text)
-		}
-	})
-}
-
-func (ui *UI) initKeyCapture() {
-	ui.app.SetInputCapture(
-		func(event *tcell.EventKey) *tcell.EventKey {
-			if event.Modifiers()&tcell.ModAlt == 0 {
-				return event
-			}
-
-			r := event.Rune()
-			if r >= '0' && r <= '9' {
-				idx := int(r - '0')
-				ui.SwitchBuffer(idx)
-
-				return nil
-			}
-
-			return event
-		},
-	)
-}
-
-func (ui *UI) refreshStatusBar() {
-	// Placeholder; full refresh needs nick/target context.
-}
-
-func (ui *UI) renderStatusBar(
-	nick, target, connStatus string,
-) {
-	var unreadParts []string
-
-	for i, buf := range ui.buffers {
-		if buf.Unread > 0 {
-			unreadParts = append(unreadParts,
-				fmt.Sprintf(
-					"%d:%s(%d)",
-					i, buf.Name, buf.Unread,
-				),
-			)
-		}
-	}
-
-	unread := ""
-	if len(unreadParts) > 0 {
-		unread = " [Act: " +
-			strings.Join(unreadParts, ",") + "]"
-	}
-
-	bufInfo := fmt.Sprintf(
-		"[%d:%s]",
-		ui.currentBuffer,
-		ui.buffers[ui.currentBuffer].Name,
-	)
-
-	ui.statusBar.Clear()
-
-	_, _ = fmt.Fprintf(ui.statusBar,
-		" [%s] %s %s %s%s",
-		connStatus, nick, bufInfo, target, unread,
-	)
-}
-
-func (ui *UI) getOrCreateBuffer(name string) *Buffer {
-	for _, buf := range ui.buffers {
-		if buf.Name == name {
-			return buf
-		}
-	}
-
-	buf := &Buffer{Name: name, Lines: nil, Unread: 0}
-	ui.buffers = append(ui.buffers, buf)
-
-	return buf
-}
--- a/go.mod
+++ b/go.mod
@@ -20,11 +20,8 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/gdamore/encoding v1.0.1 // indirect
-	github.com/gdamore/tcell/v2 v2.13.8 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/ncruces/go-strftime v1.0.0 // indirect
@@ -33,8 +30,6 @@ require (
 	github.com/prometheus/common v0.66.1 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/rivo/tview v0.42.0 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sagikazarmark/locafero v0.11.0 // indirect
 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
@@ -47,9 +42,8 @@ require (
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/term v0.37.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
 	google.golang.org/protobuf v1.36.8 // indirect
 	modernc.org/libc v1.67.6 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -12,10 +12,6 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
-github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
-github.com/gdamore/tcell/v2 v2.13.8 h1:Mys/Kl5wfC/GcC5Cx4C2BIQH9dbnhnkPgS9/wF3RlfU=
-github.com/gdamore/tcell/v2 v2.13.8/go.mod h1:+Wfe208WDdB7INEtCsNrAN6O2m+wsTPk1RAovjaILlo=
 github.com/getsentry/sentry-go v0.42.0 h1:eeFMACuZTbUQf90RE8dE4tXeSe4CZyfvR1MBL7RLEt8=
 github.com/getsentry/sentry-go v0.42.0/go.mod h1:eRXCoh3uvmjQLY6qu63BjUZnaBu5L5WhMV1RwYO8W5s=
 github.com/go-chi/chi v1.5.5 h1:vOB/HbEMt9QqBqErz07QehcOKHaWFtuj87tTDVz2qXE=
@@ -44,8 +40,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
-github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -70,10 +64,6 @@ github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzM
 github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rivo/tview v0.42.0 h1:b/ftp+RxtDsHSaynXTbJb+/n/BxDEi+W3UfF5jILK6c=
-github.com/rivo/tview v0.42.0/go.mod h1:cSfIYfhpSGCjp3r/ECJb+GKS7cGJnqV8vfjQPwoXyfY=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
@@ -96,7 +86,6 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.uber.org/dig v1.19.0 h1:BACLhebsYdpQ7IROQ1AGPjrXcP5dF80U3gKoFzbaq/4=
 go.uber.org/dig v1.19.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
 go.uber.org/fx v1.24.0 h1:wE8mruvpg2kiiL1Vqd0CC+tr0/24XIB10Iwp2lLWzkg=
@@ -111,55 +100,19 @@ go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
 go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
 golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
 golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
 golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
 golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
-golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
 golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
 golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
 google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--- a/internal/broker/broker.go
+++ b/internal/broker/broker.go
@@ -1,73 +0,0 @@
-// Package broker provides an in-memory pub/sub for long-poll notifications.
-package broker
-
-import (
-	"sync"
-)
-
-// Broker notifies waiting clients when new messages are available.
-type Broker struct {
-	mu        sync.Mutex
-	listeners map[int64][]chan struct{}
-}
-
-// New creates a new Broker.
-func New() *Broker {
-	return &Broker{ //nolint:exhaustruct // mu has zero-value default
-		listeners: make(map[int64][]chan struct{}),
-	}
-}
-
-// Wait returns a channel that will be closed when a message
-// is available for the user.
-func (b *Broker) Wait(userID int64) chan struct{} {
-	waitCh := make(chan struct{}, 1)
-
-	b.mu.Lock()
-	b.listeners[userID] = append(
-		b.listeners[userID], waitCh,
-	)
-	b.mu.Unlock()
-
-	return waitCh
-}
-
-// Notify wakes up all waiting clients for a user.
-func (b *Broker) Notify(userID int64) {
-	b.mu.Lock()
-	waiters := b.listeners[userID]
-	delete(b.listeners, userID)
-	b.mu.Unlock()
-
-	for _, waiter := range waiters {
-		select {
-		case waiter <- struct{}{}:
-		default:
-		}
-	}
-}
-
-// Remove removes a specific wait channel (for cleanup on timeout).
-func (b *Broker) Remove(
-	userID int64,
-	waitCh chan struct{},
-) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-
-	waiters := b.listeners[userID]
-
-	for i, waiter := range waiters {
-		if waiter == waitCh {
-			b.listeners[userID] = append(
-				waiters[:i], waiters[i+1:]...,
-			)
-
-			break
-		}
-	}
-
-	if len(b.listeners[userID]) == 0 {
-		delete(b.listeners, userID)
-	}
-}
--- a/internal/broker/broker_test.go
+++ b/internal/broker/broker_test.go
@@ -1,121 +0,0 @@
-package broker_test
-
-import (
-	"sync"
-	"testing"
-	"time"
-
-	"git.eeqj.de/sneak/chat/internal/broker"
-)
-
-func TestNewBroker(t *testing.T) {
-	t.Parallel()
-
-	brk := broker.New()
-	if brk == nil {
-		t.Fatal("expected non-nil broker")
-	}
-}
-
-func TestWaitAndNotify(t *testing.T) {
-	t.Parallel()
-
-	brk := broker.New()
-	waitCh := brk.Wait(1)
-
-	go func() {
-		time.Sleep(10 * time.Millisecond)
-		brk.Notify(1)
-	}()
-
-	select {
-	case <-waitCh:
-	case <-time.After(2 * time.Second):
-		t.Fatal("timeout")
-	}
-}
-
-func TestNotifyWithoutWaiters(t *testing.T) {
-	t.Parallel()
-
-	brk := broker.New()
-	brk.Notify(42) // should not panic.
-}
-
-func TestRemove(t *testing.T) {
-	t.Parallel()
-
-	brk := broker.New()
-	waitCh := brk.Wait(1)
-
-	brk.Remove(1, waitCh)
-
-	brk.Notify(1)
-
-	select {
-	case <-waitCh:
-		t.Fatal("should not receive after remove")
-	case <-time.After(50 * time.Millisecond):
-	}
-}
-
-func TestMultipleWaiters(t *testing.T) {
-	t.Parallel()
-
-	brk := broker.New()
-	waitCh1 := brk.Wait(1)
-	waitCh2 := brk.Wait(1)
-
-	brk.Notify(1)
-
-	select {
-	case <-waitCh1:
-	case <-time.After(time.Second):
-		t.Fatal("ch1 timeout")
-	}
-
-	select {
-	case <-waitCh2:
-	case <-time.After(time.Second):
-		t.Fatal("ch2 timeout")
-	}
-}
-
-func TestConcurrentWaitNotify(t *testing.T) {
-	t.Parallel()
-
-	brk := broker.New()
-
-	var waitGroup sync.WaitGroup
-
-	const concurrency = 100
-
-	for idx := range concurrency {
-		waitGroup.Add(1)
-
-		go func(uid int64) {
-			defer waitGroup.Done()
-
-			waitCh := brk.Wait(uid)
-
-			brk.Notify(uid)
-
-			select {
-			case <-waitCh:
-			case <-time.After(time.Second):
-				t.Error("timeout")
-			}
-		}(int64(idx % 10))
-	}
-
-	waitGroup.Wait()
-}
-
-func TestRemoveNonexistent(t *testing.T) {
-	t.Parallel()
-
-	brk := broker.New()
-	waitCh := make(chan struct{}, 1)
-
-	brk.Remove(999, waitCh) // should not panic.
-}
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -23,28 +23,25 @@ type Params struct {

 // Config holds all application configuration values.
 type Config struct {
-	DBURL              string
-	Debug              bool
-	MaintenanceMode    bool
-	MetricsPassword    string
-	MetricsUsername    string
-	Port               int
-	SentryDSN          string
-	MaxHistory         int
-	SessionTimeout     int
-	MaxMessageSize     int
-	MOTD               string
-	ServerName         string
-	FederationKey      string
-	SessionIdleTimeout string
-	params             *Params
-	log                *slog.Logger
+	DBURL           string
+	Debug           bool
+	MaintenanceMode bool
+	MetricsPassword string
+	MetricsUsername  string
+	Port            int
+	SentryDSN       string
+	MaxHistory      int
+	SessionTimeout  int
+	MaxMessageSize  int
+	MOTD            string
+	ServerName      string
+	FederationKey   string
+	params          *Params
+	log             *slog.Logger
 }

 // New creates a new Config by reading from files and environment variables.
-func New(
-	_ fx.Lifecycle, params Params,
-) (*Config, error) {
+func New(_ fx.Lifecycle, params Params) (*Config, error) {
 	log := params.Logger.Get()
 	name := params.Globals.Appname

@@ -67,7 +64,6 @@ func New(
 	viper.SetDefault("MOTD", "")
 	viper.SetDefault("SERVER_NAME", "")
 	viper.SetDefault("FEDERATION_KEY", "")
-	viper.SetDefault("SESSION_IDLE_TIMEOUT", "24h")

 	err := viper.ReadInConfig()
 	if err != nil {
@@ -78,29 +74,28 @@ func New(
 		}
 	}

-	cfg := &Config{
-		DBURL:              viper.GetString("DBURL"),
-		Debug:              viper.GetBool("DEBUG"),
-		Port:               viper.GetInt("PORT"),
-		SentryDSN:          viper.GetString("SENTRY_DSN"),
-		MaintenanceMode:    viper.GetBool("MAINTENANCE_MODE"),
-		MetricsUsername:    viper.GetString("METRICS_USERNAME"),
-		MetricsPassword:    viper.GetString("METRICS_PASSWORD"),
-		MaxHistory:         viper.GetInt("MAX_HISTORY"),
-		SessionTimeout:     viper.GetInt("SESSION_TIMEOUT"),
-		MaxMessageSize:     viper.GetInt("MAX_MESSAGE_SIZE"),
-		MOTD:               viper.GetString("MOTD"),
-		ServerName:         viper.GetString("SERVER_NAME"),
-		FederationKey:      viper.GetString("FEDERATION_KEY"),
-		SessionIdleTimeout: viper.GetString("SESSION_IDLE_TIMEOUT"),
-		log:                log,
-		params:             &params,
+	s := &Config{
+		DBURL:           viper.GetString("DBURL"),
+		Debug:           viper.GetBool("DEBUG"),
+		Port:            viper.GetInt("PORT"),
+		SentryDSN:       viper.GetString("SENTRY_DSN"),
+		MaintenanceMode: viper.GetBool("MAINTENANCE_MODE"),
+		MetricsUsername:  viper.GetString("METRICS_USERNAME"),
+		MetricsPassword: viper.GetString("METRICS_PASSWORD"),
+		MaxHistory:      viper.GetInt("MAX_HISTORY"),
+		SessionTimeout:  viper.GetInt("SESSION_TIMEOUT"),
+		MaxMessageSize:  viper.GetInt("MAX_MESSAGE_SIZE"),
+		MOTD:            viper.GetString("MOTD"),
+		ServerName:      viper.GetString("SERVER_NAME"),
+		FederationKey:   viper.GetString("FEDERATION_KEY"),
+		log:             log,
+		params:          &params,
 	}

-	if cfg.Debug {
+	if s.Debug {
 		params.Logger.EnableDebugLogging()
-		cfg.log = params.Logger.Get()
+		s.log = params.Logger.Get()
 	}

-	return cfg, nil
+	return s, nil
 }
--- a/internal/db/db.go
+++ b/internal/db/db.go
@@ -11,16 +11,20 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"time"

 	"git.eeqj.de/sneak/chat/internal/config"
 	"git.eeqj.de/sneak/chat/internal/logger"
+	"git.eeqj.de/sneak/chat/internal/models"
 	"go.uber.org/fx"

-	_ "github.com/joho/godotenv/autoload" // .env
-	_ "modernc.org/sqlite"                // driver
+	_ "github.com/joho/godotenv/autoload" // loads .env file
+	_ "modernc.org/sqlite"                // SQLite driver
 )

-const minMigrationParts = 2
+const (
+	minMigrationParts = 2
+)

 // SchemaFiles contains embedded SQL migration files.
 //
@@ -35,95 +39,521 @@ type Params struct {
 	Config *config.Config
 }

-// Database manages the SQLite connection and migrations.
+// Database manages the SQLite database connection and migrations.
 type Database struct {
-	conn   *sql.DB
+	db     *sql.DB
 	log    *slog.Logger
 	params *Params
 }

-// New creates a new Database and registers lifecycle hooks.
-func New(
-	lifecycle fx.Lifecycle,
-	params Params,
-) (*Database, error) {
-	database := &Database{ //nolint:exhaustruct // conn set in OnStart
-		params: &params,
-		log:    params.Logger.Get(),
-	}
+// New creates a new Database instance and registers lifecycle hooks.
+func New(lc fx.Lifecycle, params Params) (*Database, error) {
+	s := new(Database)
+	s.params = &params
+	s.log = params.Logger.Get()

-	database.log.Info("Database instantiated")
+	s.log.Info("Database instantiated")

-	lifecycle.Append(fx.Hook{
+	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
-			database.log.Info("Database OnStart Hook")
+			s.log.Info("Database OnStart Hook")

-			return database.connect(ctx)
+			return s.connect(ctx)
 		},
 		OnStop: func(_ context.Context) error {
-			database.log.Info("Database OnStop Hook")
+			s.log.Info("Database OnStop Hook")

-			if database.conn != nil {
-				closeErr := database.conn.Close()
-				if closeErr != nil {
-					return fmt.Errorf(
-						"close db: %w", closeErr,
-					)
-				}
+			if s.db != nil {
+				return s.db.Close()
 			}

 			return nil
 		},
 	})

-	return database, nil
+	return s, nil
+}
+
+// NewTest creates a Database for testing, bypassing fx lifecycle.
+// It connects to the given DSN and runs all migrations.
+func NewTest(dsn string) (*Database, error) {
+	d, err := sql.Open("sqlite", dsn)
+	if err != nil {
+		return nil, err
+	}
+
+	s := &Database{
+		db:  d,
+		log: slog.Default(),
+	}
+
+	// Item 9: Enable foreign keys
+	if _, err := d.Exec("PRAGMA foreign_keys = ON"); err != nil {
+		_ = d.Close()
+		return nil, fmt.Errorf("enable foreign keys: %w", err)
+	}
+
+	ctx := context.Background()
+
+	err = s.runMigrations(ctx)
+	if err != nil {
+		_ = d.Close()
+
+		return nil, err
+	}
+
+	return s, nil
 }

 // GetDB returns the underlying sql.DB connection.
-func (database *Database) GetDB() *sql.DB {
-	return database.conn
+func (s *Database) GetDB() *sql.DB {
+	return s.db
 }

-func (database *Database) connect(ctx context.Context) error {
-	dbURL := database.params.Config.DBURL
+// Hydrate injects the database reference into any model that
+// embeds Base.
+func (s *Database) Hydrate(m interface{ SetDB(d models.DB) }) {
+	m.SetDB(s)
+}
+
+// GetUserByID looks up a user by their ID.
+func (s *Database) GetUserByID(
+	ctx context.Context,
+	id string,
+) (*models.User, error) {
+	u := &models.User{}
+	s.Hydrate(u)
+
+	err := s.db.QueryRowContext(ctx, `
+		SELECT id, nick, password_hash, created_at, updated_at, last_seen_at
+		FROM users WHERE id = ?`,
+		id,
+	).Scan(
+		&u.ID, &u.Nick, &u.PasswordHash,
+		&u.CreatedAt, &u.UpdatedAt, &u.LastSeenAt,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return u, nil
+}
+
+// GetChannelByID looks up a channel by its ID.
+func (s *Database) GetChannelByID(
+	ctx context.Context,
+	id string,
+) (*models.Channel, error) {
+	c := &models.Channel{}
+	s.Hydrate(c)
+
+	err := s.db.QueryRowContext(ctx, `
+		SELECT id, name, topic, modes, created_at, updated_at
+		FROM channels WHERE id = ?`,
+		id,
+	).Scan(
+		&c.ID, &c.Name, &c.Topic, &c.Modes,
+		&c.CreatedAt, &c.UpdatedAt,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return c, nil
+}
+
+// GetUserByNick looks up a user by their nick.
+func (s *Database) GetUserByNick(
+	ctx context.Context,
+	nick string,
+) (*models.User, error) {
+	u := &models.User{}
+	s.Hydrate(u)
+
+	err := s.db.QueryRowContext(ctx, `
+		SELECT id, nick, password_hash, created_at, updated_at, last_seen_at
+		FROM users WHERE nick = ?`,
+		nick,
+	).Scan(
+		&u.ID, &u.Nick, &u.PasswordHash,
+		&u.CreatedAt, &u.UpdatedAt, &u.LastSeenAt,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return u, nil
+}
+
+// GetUserByToken looks up a user by their auth token.
+func (s *Database) GetUserByToken(
+	ctx context.Context,
+	token string,
+) (*models.User, error) {
+	u := &models.User{}
+	s.Hydrate(u)
+
+	err := s.db.QueryRowContext(ctx, `
+		SELECT u.id, u.nick, u.password_hash,
+		       u.created_at, u.updated_at, u.last_seen_at
+		FROM users u
+		JOIN auth_tokens t ON t.user_id = u.id
+		WHERE t.token = ?`,
+		token,
+	).Scan(
+		&u.ID, &u.Nick, &u.PasswordHash,
+		&u.CreatedAt, &u.UpdatedAt, &u.LastSeenAt,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return u, nil
+}
+
+// DeleteAuthToken removes an auth token from the database.
+func (s *Database) DeleteAuthToken(
+	ctx context.Context,
+	token string,
+) error {
+	_, err := s.db.ExecContext(ctx,
+		`DELETE FROM auth_tokens WHERE token = ?`, token,
+	)
+	return err
+}
+
+// UpdateUserLastSeen updates the last_seen_at timestamp for a user.
+func (s *Database) UpdateUserLastSeen(
+	ctx context.Context,
+	userID string,
+) error {
+	_, err := s.db.ExecContext(ctx,
+		`UPDATE users SET last_seen_at = CURRENT_TIMESTAMP WHERE id = ?`,
+		userID,
+	)
+	return err
+}
+
+// CreateUser inserts a new user into the database.
+func (s *Database) CreateUser(
+	ctx context.Context,
+	id, nick, passwordHash string,
+) (*models.User, error) {
+	now := time.Now()
+
+	_, err := s.db.ExecContext(ctx,
+		`INSERT INTO users (id, nick, password_hash)
+		 VALUES (?, ?, ?)`,
+		id, nick, passwordHash,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	u := &models.User{
+		ID: id, Nick: nick, PasswordHash: passwordHash,
+		CreatedAt: now, UpdatedAt: now,
+	}
+	s.Hydrate(u)
+
+	return u, nil
+}
+
+// CreateChannel inserts a new channel into the database.
+func (s *Database) CreateChannel(
+	ctx context.Context,
+	id, name, topic, modes string,
+) (*models.Channel, error) {
+	now := time.Now()
+
+	_, err := s.db.ExecContext(ctx,
+		`INSERT INTO channels (id, name, topic, modes)
+		 VALUES (?, ?, ?, ?)`,
+		id, name, topic, modes,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	c := &models.Channel{
+		ID: id, Name: name, Topic: topic, Modes: modes,
+		CreatedAt: now, UpdatedAt: now,
+	}
+	s.Hydrate(c)
+
+	return c, nil
+}
+
+// AddChannelMember adds a user to a channel with the given modes.
+func (s *Database) AddChannelMember(
+	ctx context.Context,
+	channelID, userID, modes string,
+) (*models.ChannelMember, error) {
+	now := time.Now()
+
+	_, err := s.db.ExecContext(ctx,
+		`INSERT INTO channel_members
+		 (channel_id, user_id, modes)
+		 VALUES (?, ?, ?)`,
+		channelID, userID, modes,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	cm := &models.ChannelMember{
+		ChannelID: channelID,
+		UserID:    userID,
+		Modes:     modes,
+		JoinedAt:  now,
+	}
+	s.Hydrate(cm)
+
+	return cm, nil
+}
+
+// CreateMessage inserts a new message into the database.
+func (s *Database) CreateMessage(
+	ctx context.Context,
+	id, fromUserID, fromNick, target, msgType, body string,
+) (*models.Message, error) {
+	now := time.Now()
+
+	_, err := s.db.ExecContext(ctx,
+		`INSERT INTO messages
+		 (id, from_user_id, from_nick, target, type, body)
+		 VALUES (?, ?, ?, ?, ?, ?)`,
+		id, fromUserID, fromNick, target, msgType, body,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	m := &models.Message{
+		ID:         id,
+		FromUserID: fromUserID,
+		FromNick:   fromNick,
+		Target:     target,
+		Type:       msgType,
+		Body:       body,
+		Timestamp:  now,
+		CreatedAt:  now,
+	}
+	s.Hydrate(m)
+
+	return m, nil
+}
+
+// QueueMessage adds a message to a user's delivery queue.
+func (s *Database) QueueMessage(
+	ctx context.Context,
+	userID, messageID string,
+) (*models.MessageQueueEntry, error) {
+	now := time.Now()
+
+	res, err := s.db.ExecContext(ctx,
+		`INSERT INTO message_queue (user_id, message_id)
+		 VALUES (?, ?)`,
+		userID, messageID,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	entryID, err := res.LastInsertId()
+	if err != nil {
+		return nil, fmt.Errorf("get last insert id: %w", err)
+	}
+
+	mq := &models.MessageQueueEntry{
+		ID:        entryID,
+		UserID:    userID,
+		MessageID: messageID,
+		QueuedAt:  now,
+	}
+	s.Hydrate(mq)
+
+	return mq, nil
+}
+
+// DequeueMessages returns up to limit pending messages for a user,
+// ordered by queue time (oldest first).
+func (s *Database) DequeueMessages(
+	ctx context.Context,
+	userID string,
+	limit int,
+) ([]*models.MessageQueueEntry, error) {
+	rows, err := s.db.QueryContext(ctx, `
+		SELECT id, user_id, message_id, queued_at
+		FROM message_queue
+		WHERE user_id = ?
+		ORDER BY queued_at ASC
+		LIMIT ?`,
+		userID, limit,
+	)
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = rows.Close() }()
+
+	entries := []*models.MessageQueueEntry{}
+
+	for rows.Next() {
+		e := &models.MessageQueueEntry{}
+		s.Hydrate(e)
+
+		err = rows.Scan(&e.ID, &e.UserID, &e.MessageID, &e.QueuedAt)
+		if err != nil {
+			return nil, err
+		}
+
+		entries = append(entries, e)
+	}
+
+	return entries, rows.Err()
+}
+
+// AckMessages removes the given queue entry IDs, marking them as delivered.
+func (s *Database) AckMessages(
+	ctx context.Context,
+	entryIDs []int64,
+) error {
+	if len(entryIDs) == 0 {
+		return nil
+	}
+
+	placeholders := make([]string, len(entryIDs))
+	args := make([]interface{}, len(entryIDs))
+
+	for i, id := range entryIDs {
+		placeholders[i] = "?"
+		args[i] = id
+	}
+
+	query := fmt.Sprintf(
+		"DELETE FROM message_queue WHERE id IN (%s)",
+		strings.Join(placeholders, ","),
+	)
+
+	_, err := s.db.ExecContext(ctx, query, args...)
+
+	return err
+}
+
+// CreateAuthToken inserts a new auth token for a user.
+func (s *Database) CreateAuthToken(
+	ctx context.Context,
+	token, userID string,
+) (*models.AuthToken, error) {
+	now := time.Now()
+
+	_, err := s.db.ExecContext(ctx,
+		`INSERT INTO auth_tokens (token, user_id)
+		 VALUES (?, ?)`,
+		token, userID,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	at := &models.AuthToken{Token: token, UserID: userID, CreatedAt: now}
+	s.Hydrate(at)
+
+	return at, nil
+}
+
+// CreateSession inserts a new session for a user.
+func (s *Database) CreateSession(
+	ctx context.Context,
+	id, userID string,
+) (*models.Session, error) {
+	now := time.Now()
+
+	_, err := s.db.ExecContext(ctx,
+		`INSERT INTO sessions (id, user_id)
+		 VALUES (?, ?)`,
+		id, userID,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	sess := &models.Session{
+		ID: id, UserID: userID,
+		CreatedAt: now, LastActiveAt: now,
+	}
+	s.Hydrate(sess)
+
+	return sess, nil
+}
+
+// CreateServerLink inserts a new server link.
+func (s *Database) CreateServerLink(
+	ctx context.Context,
+	id, name, url, sharedKeyHash string,
+	isActive bool,
+) (*models.ServerLink, error) {
+	now := time.Now()
+	active := 0
+
+	if isActive {
+		active = 1
+	}
+
+	_, err := s.db.ExecContext(ctx,
+		`INSERT INTO server_links
+		 (id, name, url, shared_key_hash, is_active)
+		 VALUES (?, ?, ?, ?, ?)`,
+		id, name, url, sharedKeyHash, active,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	sl := &models.ServerLink{
+		ID:            id,
+		Name:          name,
+		URL:           url,
+		SharedKeyHash: sharedKeyHash,
+		IsActive:      isActive,
+		CreatedAt:     now,
+	}
+	s.Hydrate(sl)
+
+	return sl, nil
+}
+
+func (s *Database) connect(ctx context.Context) error {
+	dbURL := s.params.Config.DBURL
 	if dbURL == "" {
-		dbURL = "file:./data.db?_journal_mode=WAL&_busy_timeout=5000"
+		dbURL = "file:./data.db?_journal_mode=WAL"
 	}

-	database.log.Info(
-		"connecting to database", "url", dbURL,
-	)
+	s.log.Info("connecting to database", "url", dbURL)

-	conn, err := sql.Open("sqlite", dbURL)
+	d, err := sql.Open("sqlite", dbURL)
 	if err != nil {
-		return fmt.Errorf("open database: %w", err)
+		s.log.Error("failed to open database", "error", err)
+
+		return err
 	}

-	err = conn.PingContext(ctx)
+	err = d.PingContext(ctx)
 	if err != nil {
-		return fmt.Errorf("ping database: %w", err)
+		s.log.Error("failed to ping database", "error", err)
+
+		return err
 	}

-	conn.SetMaxOpenConns(1)
+	s.db = d
+	s.log.Info("database connected")

-	database.conn = conn
-	database.log.Info("database connected")
-
-	_, err = database.conn.ExecContext(
-		ctx, "PRAGMA foreign_keys = ON",
-	)
-	if err != nil {
+	// Item 9: Enable foreign keys on every connection
+	if _, err := s.db.ExecContext(ctx, "PRAGMA foreign_keys = ON"); err != nil {
 		return fmt.Errorf("enable foreign keys: %w", err)
 	}

-	_, err = database.conn.ExecContext(
-		ctx, "PRAGMA busy_timeout = 5000",
-	)
-	if err != nil {
-		return fmt.Errorf("set busy timeout: %w", err)
-	}
-
-	return database.runMigrations(ctx)
+	return s.runMigrations(ctx)
 }

 type migration struct {
@@ -132,125 +562,51 @@ type migration struct {
 	sql     string
 }

-func (database *Database) runMigrations(
-	ctx context.Context,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`CREATE TABLE IF NOT EXISTS schema_migrations (
-		 version INTEGER PRIMARY KEY,
-		 applied_at DATETIME DEFAULT CURRENT_TIMESTAMP)`)
-	if err != nil {
-		return fmt.Errorf(
-			"create schema_migrations: %w", err,
-		)
-	}
-
-	migrations, err := database.loadMigrations()
+func (s *Database) runMigrations(ctx context.Context) error {
+	err := s.bootstrapMigrationsTable(ctx)
 	if err != nil {
 		return err
 	}

-	for _, mig := range migrations {
-		err = database.applyMigration(ctx, mig)
-		if err != nil {
-			return err
-		}
+	migrations, err := s.loadMigrations()
+	if err != nil {
+		return err
 	}

-	database.log.Info("database migrations complete")
+	err = s.applyMigrations(ctx, migrations)
+	if err != nil {
+		return err
+	}
+
+	s.log.Info("database migrations complete")

 	return nil
 }

-func (database *Database) applyMigration(
+func (s *Database) bootstrapMigrationsTable(
 	ctx context.Context,
-	mig migration,
 ) error {
-	var exists int
-
-	err := database.conn.QueryRowContext(ctx,
-		`SELECT COUNT(*) FROM schema_migrations
-		 WHERE version = ?`,
-		mig.version,
-	).Scan(&exists)
+	_, err := s.db.ExecContext(ctx,
+		`CREATE TABLE IF NOT EXISTS schema_migrations (
+		version INTEGER PRIMARY KEY,
+		applied_at DATETIME DEFAULT CURRENT_TIMESTAMP
+	)`)
 	if err != nil {
 		return fmt.Errorf(
-			"check migration %d: %w", mig.version, err,
-		)
-	}
-
-	if exists > 0 {
-		return nil
-	}
-
-	database.log.Info(
-		"applying migration",
-		"version", mig.version,
-		"name", mig.name,
-	)
-
-	return database.execMigration(ctx, mig)
-}
-
-func (database *Database) execMigration(
-	ctx context.Context,
-	mig migration,
-) error {
-	transaction, err := database.conn.BeginTx(ctx, nil)
-	if err != nil {
-		return fmt.Errorf(
-			"begin tx for migration %d: %w",
-			mig.version, err,
-		)
-	}
-
-	_, err = transaction.ExecContext(ctx, mig.sql)
-	if err != nil {
-		_ = transaction.Rollback()
-
-		return fmt.Errorf(
-			"apply migration %d (%s): %w",
-			mig.version, mig.name, err,
-		)
-	}
-
-	_, err = transaction.ExecContext(ctx,
-		`INSERT INTO schema_migrations (version)
-		 VALUES (?)`,
-		mig.version,
-	)
-	if err != nil {
-		_ = transaction.Rollback()
-
-		return fmt.Errorf(
-			"record migration %d: %w",
-			mig.version, err,
-		)
-	}
-
-	err = transaction.Commit()
-	if err != nil {
-		return fmt.Errorf(
-			"commit migration %d: %w",
-			mig.version, err,
+			"create schema_migrations table: %w", err,
 		)
 	}

 	return nil
 }

-func (database *Database) loadMigrations() (
-	[]migration,
-	error,
-) {
+func (s *Database) loadMigrations() ([]migration, error) {
 	entries, err := fs.ReadDir(SchemaFiles, "schema")
 	if err != nil {
-		return nil, fmt.Errorf(
-			"read schema dir: %w", err,
-		)
+		return nil, fmt.Errorf("read schema dir: %w", err)
 	}

-	migrations := make([]migration, 0, len(entries))
+	var migrations []migration

 	for _, entry := range entries {
 		if entry.IsDir() ||
@@ -265,18 +621,17 @@ func (database *Database) loadMigrations() (
 			continue
 		}

-		version, parseErr := strconv.Atoi(parts[0])
-		if parseErr != nil {
+		version, err := strconv.Atoi(parts[0])
+		if err != nil {
 			continue
 		}

-		content, readErr := SchemaFiles.ReadFile(
+		content, err := SchemaFiles.ReadFile(
 			"schema/" + entry.Name(),
 		)
-		if readErr != nil {
+		if err != nil {
 			return nil, fmt.Errorf(
-				"read migration %s: %w",
-				entry.Name(), readErr,
+				"read migration %s: %w", entry.Name(), err,
 			)
 		}

@@ -293,3 +648,69 @@ func (database *Database) loadMigrations() (

 	return migrations, nil
 }
+
+// Item 4: Wrap each migration in a transaction
+func (s *Database) applyMigrations(
+	ctx context.Context,
+	migrations []migration,
+) error {
+	for _, m := range migrations {
+		var exists int
+
+		err := s.db.QueryRowContext(ctx,
+			"SELECT COUNT(*) FROM schema_migrations WHERE version = ?",
+			m.version,
+		).Scan(&exists)
+		if err != nil {
+			return fmt.Errorf(
+				"check migration %d: %w", m.version, err,
+			)
+		}
+
+		if exists > 0 {
+			continue
+		}
+
+		s.log.Info(
+			"applying migration",
+			"version", m.version, "name", m.name,
+		)
+
+		tx, err := s.db.BeginTx(ctx, nil)
+		if err != nil {
+			return fmt.Errorf(
+				"begin tx for migration %d: %w", m.version, err,
+			)
+		}
+
+		_, err = tx.ExecContext(ctx, m.sql)
+		if err != nil {
+			_ = tx.Rollback()
+
+			return fmt.Errorf(
+				"apply migration %d (%s): %w",
+				m.version, m.name, err,
+			)
+		}
+
+		_, err = tx.ExecContext(ctx,
+			"INSERT INTO schema_migrations (version) VALUES (?)",
+			m.version,
+		)
+		if err != nil {
+			_ = tx.Rollback()
+
+			return fmt.Errorf(
+				"record migration %d: %w", m.version, err,
+			)
+		}
+
+		if err := tx.Commit(); err != nil {
+			return fmt.Errorf(
+				"commit migration %d: %w", m.version, err,
+			)
+		}
+	}
+
+	return nil
+}
--- a/internal/db/db_test.go
+++ b/internal/db/db_test.go
@@ -0,0 +1,494 @@
+package db_test
+
+import (
+	"context"
+	"fmt"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"git.eeqj.de/sneak/chat/internal/db"
+)
+
+const (
+	nickAlice   = "alice"
+	nickBob     = "bob"
+	nickCharlie = "charlie"
+)
+
+// setupTestDB creates a fresh database in a temp directory with
+// all migrations applied.
+func setupTestDB(t *testing.T) *db.Database {
+	t.Helper()
+
+	dir := t.TempDir()
+	dsn := fmt.Sprintf(
+		"file:%s?_journal_mode=WAL",
+		filepath.Join(dir, "test.db"),
+	)
+
+	d, err := db.NewTest(dsn)
+	if err != nil {
+		t.Fatalf("failed to create test database: %v", err)
+	}
+
+	t.Cleanup(func() { _ = d.GetDB().Close() })
+
+	return d
+}
+
+func TestCreateUser(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	u, err := d.CreateUser(ctx, "u1", nickAlice, "hash1")
+	if err != nil {
+		t.Fatalf("CreateUser: %v", err)
+	}
+
+	if u.ID != "u1" || u.Nick != nickAlice {
+		t.Errorf("got user %+v", u)
+	}
+}
+
+func TestCreateAuthToken(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	_, err := d.CreateUser(ctx, "u1", nickAlice, "h")
+	if err != nil {
+		t.Fatalf("CreateUser: %v", err)
+	}
+
+	tok, err := d.CreateAuthToken(ctx, "tok1", "u1")
+	if err != nil {
+		t.Fatalf("CreateAuthToken: %v", err)
+	}
+
+	if tok.Token != "tok1" || tok.UserID != "u1" {
+		t.Errorf("unexpected token: %+v", tok)
+	}
+
+	u, err := tok.User(ctx)
+	if err != nil {
+		t.Fatalf("AuthToken.User: %v", err)
+	}
+
+	if u.ID != "u1" || u.Nick != nickAlice {
+		t.Errorf("AuthToken.User got %+v", u)
+	}
+}
+
+func TestCreateChannel(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	ch, err := d.CreateChannel(
+		ctx, "c1", "#general", "welcome", "+n",
+	)
+	if err != nil {
+		t.Fatalf("CreateChannel: %v", err)
+	}
+
+	if ch.ID != "c1" || ch.Name != "#general" {
+		t.Errorf("unexpected channel: %+v", ch)
+	}
+}
+
+func TestAddChannelMember(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	_, _ = d.CreateUser(ctx, "u1", nickAlice, "h")
+	_, _ = d.CreateChannel(ctx, "c1", "#general", "", "")
+
+	cm, err := d.AddChannelMember(ctx, "c1", "u1", "+o")
+	if err != nil {
+		t.Fatalf("AddChannelMember: %v", err)
+	}
+
+	if cm.ChannelID != "c1" || cm.Modes != "+o" {
+		t.Errorf("unexpected member: %+v", cm)
+	}
+}
+
+func TestCreateMessage(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	_, _ = d.CreateUser(ctx, "u1", nickAlice, "h")
+
+	msg, err := d.CreateMessage(
+		ctx, "m1", "u1", nickAlice,
+		"#general", "message", "hello",
+	)
+	if err != nil {
+		t.Fatalf("CreateMessage: %v", err)
+	}
+
+	if msg.ID != "m1" || msg.Body != "hello" {
+		t.Errorf("unexpected message: %+v", msg)
+	}
+}
+
+func TestQueueMessage(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	_, _ = d.CreateUser(ctx, "u1", nickAlice, "h")
+	_, _ = d.CreateUser(ctx, "u2", nickBob, "h")
+	_, _ = d.CreateMessage(
+		ctx, "m1", "u1", nickAlice, "u2", "message", "hi",
+	)
+
+	mq, err := d.QueueMessage(ctx, "u2", "m1")
+	if err != nil {
+		t.Fatalf("QueueMessage: %v", err)
+	}
+
+	if mq.UserID != "u2" || mq.MessageID != "m1" {
+		t.Errorf("unexpected queue entry: %+v", mq)
+	}
+}
+
+func TestCreateSession(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	_, _ = d.CreateUser(ctx, "u1", nickAlice, "h")
+
+	sess, err := d.CreateSession(ctx, "s1", "u1")
+	if err != nil {
+		t.Fatalf("CreateSession: %v", err)
+	}
+
+	if sess.ID != "s1" || sess.UserID != "u1" {
+		t.Errorf("unexpected session: %+v", sess)
+	}
+
+	u, err := sess.User(ctx)
+	if err != nil {
+		t.Fatalf("Session.User: %v", err)
+	}
+
+	if u.ID != "u1" {
+		t.Errorf("Session.User got %v, want u1", u.ID)
+	}
+}
+
+func TestCreateServerLink(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	sl, err := d.CreateServerLink(
+		ctx, "sl1", "peer1",
+		"https://peer.example.com", "keyhash", true,
+	)
+	if err != nil {
+		t.Fatalf("CreateServerLink: %v", err)
+	}
+
+	if sl.ID != "sl1" || !sl.IsActive {
+		t.Errorf("unexpected server link: %+v", sl)
+	}
+}
+
+func TestUserChannels(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	u, _ := d.CreateUser(ctx, "u1", nickAlice, "h")
+	_, _ = d.CreateChannel(ctx, "c1", "#alpha", "", "")
+	_, _ = d.CreateChannel(ctx, "c2", "#beta", "", "")
+	_, _ = d.AddChannelMember(ctx, "c1", "u1", "")
+	_, _ = d.AddChannelMember(ctx, "c2", "u1", "")
+
+	channels, err := u.Channels(ctx)
+	if err != nil {
+		t.Fatalf("User.Channels: %v", err)
+	}
+
+	if len(channels) != 2 {
+		t.Fatalf("expected 2 channels, got %d", len(channels))
+	}
+
+	if channels[0].Name != "#alpha" {
+		t.Errorf("first channel: got %s", channels[0].Name)
+	}
+
+	if channels[1].Name != "#beta" {
+		t.Errorf("second channel: got %s", channels[1].Name)
+	}
+}
+
+func TestUserChannelsEmpty(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	u, _ := d.CreateUser(ctx, "u1", nickAlice, "h")
+
+	channels, err := u.Channels(ctx)
+	if err != nil {
+		t.Fatalf("User.Channels: %v", err)
+	}
+
+	if len(channels) != 0 {
+		t.Errorf("expected 0 channels, got %d", len(channels))
+	}
+}
+
+func TestUserQueuedMessages(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	u, _ := d.CreateUser(ctx, "u1", nickAlice, "h")
+	_, _ = d.CreateUser(ctx, "u2", nickBob, "h")
+
+	for i := range 3 {
+		id := fmt.Sprintf("m%d", i)
+
+		_, _ = d.CreateMessage(
+			ctx, id, "u2", nickBob, "u1",
+			"message", fmt.Sprintf("msg%d", i),
+		)
+
+		time.Sleep(10 * time.Millisecond)
+
+		_, _ = d.QueueMessage(ctx, "u1", id)
+	}
+
+	msgs, err := u.QueuedMessages(ctx)
+	if err != nil {
+		t.Fatalf("User.QueuedMessages: %v", err)
+	}
+
+	if len(msgs) != 3 {
+		t.Fatalf("expected 3 messages, got %d", len(msgs))
+	}
+
+	for i, msg := range msgs {
+		want := fmt.Sprintf("msg%d", i)
+		if msg.Body != want {
+			t.Errorf("msg %d: got %q, want %q", i, msg.Body, want)
+		}
+	}
+}
+
+func TestUserQueuedMessagesEmpty(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	u, _ := d.CreateUser(ctx, "u1", nickAlice, "h")
+
+	msgs, err := u.QueuedMessages(ctx)
+	if err != nil {
+		t.Fatalf("User.QueuedMessages: %v", err)
+	}
+
+	if len(msgs) != 0 {
+		t.Errorf("expected 0 messages, got %d", len(msgs))
+	}
+}
+
+func TestChannelMembers(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	ch, _ := d.CreateChannel(ctx, "c1", "#general", "", "")
+	_, _ = d.CreateUser(ctx, "u1", nickAlice, "h")
+	_, _ = d.CreateUser(ctx, "u2", nickBob, "h")
+	_, _ = d.CreateUser(ctx, "u3", nickCharlie, "h")
+	_, _ = d.AddChannelMember(ctx, "c1", "u1", "+o")
+	_, _ = d.AddChannelMember(ctx, "c1", "u2", "+v")
+	_, _ = d.AddChannelMember(ctx, "c1", "u3", "")
+
+	members, err := ch.Members(ctx)
+	if err != nil {
+		t.Fatalf("Channel.Members: %v", err)
+	}
+
+	if len(members) != 3 {
+		t.Fatalf("expected 3 members, got %d", len(members))
+	}
+
+	nicks := map[string]bool{}
+	for _, m := range members {
+		nicks[m.Nick] = true
+	}
+
+	for _, want := range []string{
+		nickAlice, nickBob, nickCharlie,
+	} {
+		if !nicks[want] {
+			t.Errorf("missing nick %q", want)
+		}
+	}
+}
+
+func TestChannelMembersEmpty(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	ch, _ := d.CreateChannel(ctx, "c1", "#empty", "", "")
+
+	members, err := ch.Members(ctx)
+	if err != nil {
+		t.Fatalf("Channel.Members: %v", err)
+	}
+
+	if len(members) != 0 {
+		t.Errorf("expected 0, got %d", len(members))
+	}
+}
+
+func TestChannelRecentMessages(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	ch, _ := d.CreateChannel(ctx, "c1", "#general", "", "")
+	_, _ = d.CreateUser(ctx, "u1", nickAlice, "h")
+
+	for i := range 5 {
+		id := fmt.Sprintf("m%d", i)
+
+		_, _ = d.CreateMessage(
+			ctx, id, "u1", nickAlice, "#general",
+			"message", fmt.Sprintf("msg%d", i),
+		)
+
+		time.Sleep(10 * time.Millisecond)
+	}
+
+	msgs, err := ch.RecentMessages(ctx, 3)
+	if err != nil {
+		t.Fatalf("RecentMessages: %v", err)
+	}
+
+	if len(msgs) != 3 {
+		t.Fatalf("expected 3, got %d", len(msgs))
+	}
+
+	if msgs[0].Body != "msg4" {
+		t.Errorf("first: got %q, want msg4", msgs[0].Body)
+	}
+
+	if msgs[2].Body != "msg2" {
+		t.Errorf("last: got %q, want msg2", msgs[2].Body)
+	}
+}
+
+func TestChannelRecentMessagesLargeLimit(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	ch, _ := d.CreateChannel(ctx, "c1", "#general", "", "")
+	_, _ = d.CreateUser(ctx, "u1", nickAlice, "h")
+	_, _ = d.CreateMessage(
+		ctx, "m1", "u1", nickAlice,
+		"#general", "message", "only",
+	)
+
+	msgs, err := ch.RecentMessages(ctx, 100)
+	if err != nil {
+		t.Fatalf("RecentMessages: %v", err)
+	}
+
+	if len(msgs) != 1 {
+		t.Errorf("expected 1, got %d", len(msgs))
+	}
+}
+
+func TestChannelMemberUser(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	_, _ = d.CreateUser(ctx, "u1", nickAlice, "h")
+	_, _ = d.CreateChannel(ctx, "c1", "#general", "", "")
+
+	cm, _ := d.AddChannelMember(ctx, "c1", "u1", "+o")
+
+	u, err := cm.User(ctx)
+	if err != nil {
+		t.Fatalf("ChannelMember.User: %v", err)
+	}
+
+	if u.ID != "u1" || u.Nick != nickAlice {
+		t.Errorf("got %+v", u)
+	}
+}
+
+func TestChannelMemberChannel(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	_, _ = d.CreateUser(ctx, "u1", nickAlice, "h")
+	_, _ = d.CreateChannel(ctx, "c1", "#general", "topic", "+n")
+
+	cm, _ := d.AddChannelMember(ctx, "c1", "u1", "")
+
+	ch, err := cm.Channel(ctx)
+	if err != nil {
+		t.Fatalf("ChannelMember.Channel: %v", err)
+	}
+
+	if ch.ID != "c1" || ch.Topic != "topic" {
+		t.Errorf("got %+v", ch)
+	}
+}
+
+func TestDMMessage(t *testing.T) {
+	t.Parallel()
+
+	d := setupTestDB(t)
+	ctx := context.Background()
+
+	_, _ = d.CreateUser(ctx, "u1", nickAlice, "h")
+	_, _ = d.CreateUser(ctx, "u2", nickBob, "h")
+
+	msg, err := d.CreateMessage(
+		ctx, "m1", "u1", nickAlice, "u2", "message", "hey",
+	)
+	if err != nil {
+		t.Fatalf("CreateMessage DM: %v", err)
+	}
+
+	if msg.Target != "u2" {
+		t.Errorf("target: got %q, want u2", msg.Target)
+	}
+}
--- a/internal/db/export_test.go
+++ b/internal/db/export_test.go
@@ -1,60 +0,0 @@
-package db
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-	"log/slog"
-	"sync/atomic"
-)
-
-//nolint:gochecknoglobals // test counter
-var testDBCounter atomic.Int64
-
-// NewTestDatabase creates an in-memory database for testing.
-func NewTestDatabase() (*Database, error) {
-	counter := testDBCounter.Add(1)
-
-	dsn := fmt.Sprintf(
-		"file:testdb%d?mode=memory"+
-			"&cache=shared&_pragma=foreign_keys(1)",
-		counter,
-	)
-
-	conn, err := sql.Open("sqlite", dsn)
-	if err != nil {
-		return nil, fmt.Errorf("open test db: %w", err)
-	}
-
-	database := &Database{ //nolint:exhaustruct // test helper, params not needed
-		conn: conn,
-		log:  slog.Default(),
-	}
-
-	err = database.runMigrations(context.Background())
-	if err != nil {
-		closeErr := conn.Close()
-		if closeErr != nil {
-			return nil, fmt.Errorf(
-				"close after migration failure: %w",
-				closeErr,
-			)
-		}
-
-		return nil, fmt.Errorf(
-			"run test migrations: %w", err,
-		)
-	}
-
-	return database, nil
-}
-
-// Close closes the underlying database connection.
-func (database *Database) Close() error {
-	err := database.conn.Close()
-	if err != nil {
-		return fmt.Errorf("close database: %w", err)
-	}
-
-	return nil
-}
--- a/internal/db/queries.go
+++ b/internal/db/queries.go
@@ -1,891 +0,0 @@
-package db
-
-import (
-	"context"
-	"crypto/rand"
-	"database/sql"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/google/uuid"
-)
-
-const (
-	tokenBytes       = 32
-	defaultPollLimit = 100
-	defaultHistLimit = 50
-)
-
-func generateToken() (string, error) {
-	buf := make([]byte, tokenBytes)
-
-	_, err := rand.Read(buf)
-	if err != nil {
-		return "", fmt.Errorf("generate token: %w", err)
-	}
-
-	return hex.EncodeToString(buf), nil
-}
-
-// IRCMessage is the IRC envelope for all messages.
-type IRCMessage struct {
-	ID      string          `json:"id"`
-	Command string          `json:"command"`
-	From    string          `json:"from,omitempty"`
-	To      string          `json:"to,omitempty"`
-	Body    json.RawMessage `json:"body,omitempty"`
-	TS      string          `json:"ts"`
-	Meta    json.RawMessage `json:"meta,omitempty"`
-	DBID    int64           `json:"-"`
-}
-
-// ChannelInfo is a lightweight channel representation.
-type ChannelInfo struct {
-	ID    int64  `json:"id"`
-	Name  string `json:"name"`
-	Topic string `json:"topic"`
-}
-
-// MemberInfo represents a channel member.
-type MemberInfo struct {
-	ID       int64     `json:"id"`
-	Nick     string    `json:"nick"`
-	LastSeen time.Time `json:"lastSeen"`
-}
-
-// CreateSession registers a new session and its first client.
-func (database *Database) CreateSession(
-	ctx context.Context,
-	nick string,
-) (int64, int64, string, error) {
-	sessionUUID := uuid.New().String()
-	clientUUID := uuid.New().String()
-
-	token, err := generateToken()
-	if err != nil {
-		return 0, 0, "", err
-	}
-
-	now := time.Now()
-
-	transaction, err := database.conn.BeginTx(ctx, nil)
-	if err != nil {
-		return 0, 0, "", fmt.Errorf(
-			"begin tx: %w", err,
-		)
-	}
-
-	res, err := transaction.ExecContext(ctx,
-		`INSERT INTO sessions
-		 (uuid, nick, created_at, last_seen)
-		 VALUES (?, ?, ?, ?)`,
-		sessionUUID, nick, now, now)
-	if err != nil {
-		_ = transaction.Rollback()
-
-		return 0, 0, "", fmt.Errorf(
-			"create session: %w", err,
-		)
-	}
-
-	sessionID, _ := res.LastInsertId()
-
-	clientRes, err := transaction.ExecContext(ctx,
-		`INSERT INTO clients
-		 (uuid, session_id, token,
-		  created_at, last_seen)
-		 VALUES (?, ?, ?, ?, ?)`,
-		clientUUID, sessionID, token, now, now)
-	if err != nil {
-		_ = transaction.Rollback()
-
-		return 0, 0, "", fmt.Errorf(
-			"create client: %w", err,
-		)
-	}
-
-	clientID, _ := clientRes.LastInsertId()
-
-	err = transaction.Commit()
-	if err != nil {
-		return 0, 0, "", fmt.Errorf(
-			"commit session: %w", err,
-		)
-	}
-
-	return sessionID, clientID, token, nil
-}
-
-// GetSessionByToken returns session id, client id, and
-// nick for a client token.
-func (database *Database) GetSessionByToken(
-	ctx context.Context,
-	token string,
-) (int64, int64, string, error) {
-	var (
-		sessionID int64
-		clientID  int64
-		nick      string
-	)
-
-	err := database.conn.QueryRowContext(
-		ctx,
-		`SELECT s.id, c.id, s.nick
-		 FROM clients c
-		 INNER JOIN sessions s
-		   ON s.id = c.session_id
-		 WHERE c.token = ?`,
-		token,
-	).Scan(&sessionID, &clientID, &nick)
-	if err != nil {
-		return 0, 0, "", fmt.Errorf(
-			"get session by token: %w", err,
-		)
-	}
-
-	now := time.Now()
-
-	_, _ = database.conn.ExecContext(
-		ctx,
-		"UPDATE sessions SET last_seen = ? WHERE id = ?",
-		now, sessionID,
-	)
-
-	_, _ = database.conn.ExecContext(
-		ctx,
-		"UPDATE clients SET last_seen = ? WHERE id = ?",
-		now, clientID,
-	)
-
-	return sessionID, clientID, nick, nil
-}
-
-// GetSessionByNick returns session id for a given nick.
-func (database *Database) GetSessionByNick(
-	ctx context.Context,
-	nick string,
-) (int64, error) {
-	var sessionID int64
-
-	err := database.conn.QueryRowContext(
-		ctx,
-		"SELECT id FROM sessions WHERE nick = ?",
-		nick,
-	).Scan(&sessionID)
-	if err != nil {
-		return 0, fmt.Errorf(
-			"get session by nick: %w", err,
-		)
-	}
-
-	return sessionID, nil
-}
-
-// GetChannelByName returns the channel ID for a name.
-func (database *Database) GetChannelByName(
-	ctx context.Context,
-	name string,
-) (int64, error) {
-	var channelID int64
-
-	err := database.conn.QueryRowContext(
-		ctx,
-		"SELECT id FROM channels WHERE name = ?",
-		name,
-	).Scan(&channelID)
-	if err != nil {
-		return 0, fmt.Errorf(
-			"get channel by name: %w", err,
-		)
-	}
-
-	return channelID, nil
-}
-
-// GetOrCreateChannel returns channel id, creating if needed.
-// Uses INSERT OR IGNORE to avoid TOCTOU races.
-func (database *Database) GetOrCreateChannel(
-	ctx context.Context,
-	name string,
-) (int64, error) {
-	now := time.Now()
-
-	_, err := database.conn.ExecContext(ctx,
-		`INSERT OR IGNORE INTO channels
-		 (name, created_at, updated_at)
-		 VALUES (?, ?, ?)`,
-		name, now, now)
-	if err != nil {
-		return 0, fmt.Errorf("create channel: %w", err)
-	}
-
-	var channelID int64
-
-	err = database.conn.QueryRowContext(
-		ctx,
-		"SELECT id FROM channels WHERE name = ?",
-		name,
-	).Scan(&channelID)
-	if err != nil {
-		return 0, fmt.Errorf("get channel: %w", err)
-	}
-
-	return channelID, nil
-}
-
-// JoinChannel adds a session to a channel.
-func (database *Database) JoinChannel(
-	ctx context.Context,
-	channelID, sessionID int64,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`INSERT OR IGNORE INTO channel_members
-		 (channel_id, session_id, joined_at)
-		 VALUES (?, ?, ?)`,
-		channelID, sessionID, time.Now())
-	if err != nil {
-		return fmt.Errorf("join channel: %w", err)
-	}
-
-	return nil
-}
-
-// PartChannel removes a session from a channel.
-func (database *Database) PartChannel(
-	ctx context.Context,
-	channelID, sessionID int64,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`DELETE FROM channel_members
-		 WHERE channel_id = ? AND session_id = ?`,
-		channelID, sessionID)
-	if err != nil {
-		return fmt.Errorf("part channel: %w", err)
-	}
-
-	return nil
-}
-
-// DeleteChannelIfEmpty removes a channel with no members.
-func (database *Database) DeleteChannelIfEmpty(
-	ctx context.Context,
-	channelID int64,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`DELETE FROM channels WHERE id = ?
-		 AND NOT EXISTS
-		 (SELECT 1 FROM channel_members
-		  WHERE channel_id = ?)`,
-		channelID, channelID)
-	if err != nil {
-		return fmt.Errorf(
-			"delete channel if empty: %w", err,
-		)
-	}
-
-	return nil
-}
-
-// scanChannels scans rows into a ChannelInfo slice.
-func scanChannels(
-	rows *sql.Rows,
-) ([]ChannelInfo, error) {
-	defer func() { _ = rows.Close() }()
-
-	var out []ChannelInfo
-
-	for rows.Next() {
-		var chanInfo ChannelInfo
-
-		err := rows.Scan(
-			&chanInfo.ID, &chanInfo.Name, &chanInfo.Topic,
-		)
-		if err != nil {
-			return nil, fmt.Errorf("scan channel: %w", err)
-		}
-
-		out = append(out, chanInfo)
-	}
-
-	err := rows.Err()
-	if err != nil {
-		return nil, fmt.Errorf("rows error: %w", err)
-	}
-
-	if out == nil {
-		out = []ChannelInfo{}
-	}
-
-	return out, nil
-}
-
-// ListChannels returns channels the session has joined.
-func (database *Database) ListChannels(
-	ctx context.Context,
-	sessionID int64,
-) ([]ChannelInfo, error) {
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT c.id, c.name, c.topic
-		 FROM channels c
-		 INNER JOIN channel_members cm
-		   ON cm.channel_id = c.id
-		 WHERE cm.session_id = ?
-		 ORDER BY c.name`, sessionID)
-	if err != nil {
-		return nil, fmt.Errorf("list channels: %w", err)
-	}
-
-	return scanChannels(rows)
-}
-
-// ListAllChannels returns every channel.
-func (database *Database) ListAllChannels(
-	ctx context.Context,
-) ([]ChannelInfo, error) {
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT id, name, topic
-		 FROM channels ORDER BY name`)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"list all channels: %w", err,
-		)
-	}
-
-	return scanChannels(rows)
-}
-
-// ChannelMembers returns all members of a channel.
-func (database *Database) ChannelMembers(
-	ctx context.Context,
-	channelID int64,
-) ([]MemberInfo, error) {
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT s.id, s.nick, s.last_seen
-		 FROM sessions s
-		 INNER JOIN channel_members cm
-		   ON cm.session_id = s.id
-		 WHERE cm.channel_id = ?
-		 ORDER BY s.nick`, channelID)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"query channel members: %w", err,
-		)
-	}
-
-	defer func() { _ = rows.Close() }()
-
-	var members []MemberInfo
-
-	for rows.Next() {
-		var member MemberInfo
-
-		err = rows.Scan(
-			&member.ID, &member.Nick, &member.LastSeen,
-		)
-		if err != nil {
-			return nil, fmt.Errorf(
-				"scan member: %w", err,
-			)
-		}
-
-		members = append(members, member)
-	}
-
-	err = rows.Err()
-	if err != nil {
-		return nil, fmt.Errorf("rows error: %w", err)
-	}
-
-	if members == nil {
-		members = []MemberInfo{}
-	}
-
-	return members, nil
-}
-
-// IsChannelMember checks if a session belongs to a channel.
-func (database *Database) IsChannelMember(
-	ctx context.Context,
-	channelID, sessionID int64,
-) (bool, error) {
-	var count int
-
-	err := database.conn.QueryRowContext(ctx,
-		`SELECT COUNT(*) FROM channel_members
-		 WHERE channel_id = ? AND session_id = ?`,
-		channelID, sessionID,
-	).Scan(&count)
-	if err != nil {
-		return false, fmt.Errorf(
-			"check membership: %w", err,
-		)
-	}
-
-	return count > 0, nil
-}
-
-// scanInt64s scans rows into an int64 slice.
-func scanInt64s(rows *sql.Rows) ([]int64, error) {
-	defer func() { _ = rows.Close() }()
-
-	var ids []int64
-
-	for rows.Next() {
-		var val int64
-
-		err := rows.Scan(&val)
-		if err != nil {
-			return nil, fmt.Errorf(
-				"scan int64: %w", err,
-			)
-		}
-
-		ids = append(ids, val)
-	}
-
-	err := rows.Err()
-	if err != nil {
-		return nil, fmt.Errorf("rows error: %w", err)
-	}
-
-	return ids, nil
-}
-
-// GetChannelMemberIDs returns session IDs in a channel.
-func (database *Database) GetChannelMemberIDs(
-	ctx context.Context,
-	channelID int64,
-) ([]int64, error) {
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT session_id FROM channel_members
-		 WHERE channel_id = ?`, channelID)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"get channel member ids: %w", err,
-		)
-	}
-
-	return scanInt64s(rows)
-}
-
-// GetSessionChannelIDs returns channel IDs for a session.
-func (database *Database) GetSessionChannelIDs(
-	ctx context.Context,
-	sessionID int64,
-) ([]int64, error) {
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT channel_id FROM channel_members
-		 WHERE session_id = ?`, sessionID)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"get session channel ids: %w", err,
-		)
-	}
-
-	return scanInt64s(rows)
-}
-
-// InsertMessage stores a message and returns its DB ID.
-func (database *Database) InsertMessage(
-	ctx context.Context,
-	command, from, target string,
-	body json.RawMessage,
-	meta json.RawMessage,
-) (int64, string, error) {
-	msgUUID := uuid.New().String()
-	now := time.Now().UTC()
-
-	if body == nil {
-		body = json.RawMessage("[]")
-	}
-
-	if meta == nil {
-		meta = json.RawMessage("{}")
-	}
-
-	res, err := database.conn.ExecContext(ctx,
-		`INSERT INTO messages
-		 (uuid, command, msg_from, msg_to,
-		  body, meta, created_at)
-		 VALUES (?, ?, ?, ?, ?, ?, ?)`,
-		msgUUID, command, from, target,
-		string(body), string(meta), now)
-	if err != nil {
-		return 0, "", fmt.Errorf(
-			"insert message: %w", err,
-		)
-	}
-
-	dbID, _ := res.LastInsertId()
-
-	return dbID, msgUUID, nil
-}
-
-// EnqueueToSession adds a message to all clients of a
-// session's queues.
-func (database *Database) EnqueueToSession(
-	ctx context.Context,
-	sessionID, messageID int64,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`INSERT OR IGNORE INTO client_queues
-		 (client_id, message_id, created_at)
-		 SELECT c.id, ?, ?
-		 FROM clients c
-		 WHERE c.session_id = ?`,
-		messageID, time.Now(), sessionID)
-	if err != nil {
-		return fmt.Errorf(
-			"enqueue to session: %w", err,
-		)
-	}
-
-	return nil
-}
-
-// EnqueueToClient adds a message to a specific client's
-// queue.
-func (database *Database) EnqueueToClient(
-	ctx context.Context,
-	clientID, messageID int64,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`INSERT OR IGNORE INTO client_queues
-		 (client_id, message_id, created_at)
-		 VALUES (?, ?, ?)`,
-		clientID, messageID, time.Now())
-	if err != nil {
-		return fmt.Errorf(
-			"enqueue to client: %w", err,
-		)
-	}
-
-	return nil
-}
-
-// PollMessages returns queued messages for a client.
-func (database *Database) PollMessages(
-	ctx context.Context,
-	clientID, afterQueueID int64,
-	limit int,
-) ([]IRCMessage, int64, error) {
-	if limit <= 0 {
-		limit = defaultPollLimit
-	}
-
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT cq.id, m.uuid, m.command,
-		   m.msg_from, m.msg_to,
-		   m.body, m.meta, m.created_at
-		 FROM client_queues cq
-		 INNER JOIN messages m
-		   ON m.id = cq.message_id
-		 WHERE cq.client_id = ? AND cq.id > ?
-		 ORDER BY cq.id ASC LIMIT ?`,
-		clientID, afterQueueID, limit)
-	if err != nil {
-		return nil, afterQueueID, fmt.Errorf(
-			"poll messages: %w", err,
-		)
-	}
-
-	msgs, lastQID, scanErr := scanMessages(
-		rows, afterQueueID,
-	)
-	if scanErr != nil {
-		return nil, afterQueueID, scanErr
-	}
-
-	return msgs, lastQID, nil
-}
-
-// GetHistory returns message history for a target.
-func (database *Database) GetHistory(
-	ctx context.Context,
-	target string,
-	beforeID int64,
-	limit int,
-) ([]IRCMessage, error) {
-	if limit <= 0 {
-		limit = defaultHistLimit
-	}
-
-	rows, err := database.queryHistory(
-		ctx, target, beforeID, limit,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	msgs, _, scanErr := scanMessages(rows, 0)
-	if scanErr != nil {
-		return nil, scanErr
-	}
-
-	if msgs == nil {
-		msgs = []IRCMessage{}
-	}
-
-	reverseMessages(msgs)
-
-	return msgs, nil
-}
-
-func (database *Database) queryHistory(
-	ctx context.Context,
-	target string,
-	beforeID int64,
-	limit int,
-) (*sql.Rows, error) {
-	if beforeID > 0 {
-		rows, err := database.conn.QueryContext(ctx,
-			`SELECT id, uuid, command, msg_from,
-			   msg_to, body, meta, created_at
-			 FROM messages
-			 WHERE msg_to = ? AND id < ?
-			   AND command = 'PRIVMSG'
-			 ORDER BY id DESC LIMIT ?`,
-			target, beforeID, limit)
-		if err != nil {
-			return nil, fmt.Errorf(
-				"query history: %w", err,
-			)
-		}
-
-		return rows, nil
-	}
-
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT id, uuid, command, msg_from,
-		   msg_to, body, meta, created_at
-		 FROM messages
-		 WHERE msg_to = ?
-		   AND command = 'PRIVMSG'
-		 ORDER BY id DESC LIMIT ?`,
-		target, limit)
-	if err != nil {
-		return nil, fmt.Errorf("query history: %w", err)
-	}
-
-	return rows, nil
-}
-
-func scanMessages(
-	rows *sql.Rows,
-	fallbackQID int64,
-) ([]IRCMessage, int64, error) {
-	defer func() { _ = rows.Close() }()
-
-	var msgs []IRCMessage
-
-	lastQID := fallbackQID
-
-	for rows.Next() {
-		var (
-			msg        IRCMessage
-			qID        int64
-			body, meta string
-			createdAt  time.Time
-		)
-
-		err := rows.Scan(
-			&qID, &msg.ID, &msg.Command,
-			&msg.From, &msg.To,
-			&body, &meta, &createdAt,
-		)
-		if err != nil {
-			return nil, fallbackQID, fmt.Errorf(
-				"scan message: %w", err,
-			)
-		}
-
-		msg.Body = json.RawMessage(body)
-		msg.Meta = json.RawMessage(meta)
-		msg.TS = createdAt.Format(time.RFC3339Nano)
-		msg.DBID = qID
-		lastQID = qID
-
-		msgs = append(msgs, msg)
-	}
-
-	err := rows.Err()
-	if err != nil {
-		return nil, fallbackQID, fmt.Errorf(
-			"rows error: %w", err,
-		)
-	}
-
-	if msgs == nil {
-		msgs = []IRCMessage{}
-	}
-
-	return msgs, lastQID, nil
-}
-
-func reverseMessages(msgs []IRCMessage) {
-	for i, j := 0, len(msgs)-1; i < j; i, j = i+1, j-1 {
-		msgs[i], msgs[j] = msgs[j], msgs[i]
-	}
-}
-
-// ChangeNick updates a session's nickname.
-func (database *Database) ChangeNick(
-	ctx context.Context,
-	sessionID int64,
-	newNick string,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		"UPDATE sessions SET nick = ? WHERE id = ?",
-		newNick, sessionID)
-	if err != nil {
-		return fmt.Errorf("change nick: %w", err)
-	}
-
-	return nil
-}
-
-// SetTopic sets the topic for a channel.
-func (database *Database) SetTopic(
-	ctx context.Context,
-	channelName, topic string,
-) error {
-	_, err := database.conn.ExecContext(ctx,
-		`UPDATE channels SET topic = ?,
-		 updated_at = ? WHERE name = ?`,
-		topic, time.Now(), channelName)
-	if err != nil {
-		return fmt.Errorf("set topic: %w", err)
-	}
-
-	return nil
-}
-
-// DeleteSession removes a session and all its data.
-func (database *Database) DeleteSession(
-	ctx context.Context,
-	sessionID int64,
-) error {
-	_, err := database.conn.ExecContext(
-		ctx,
-		"DELETE FROM sessions WHERE id = ?",
-		sessionID,
-	)
-	if err != nil {
-		return fmt.Errorf("delete session: %w", err)
-	}
-
-	return nil
-}
-
-// DeleteClient removes a single client record by ID.
-func (database *Database) DeleteClient(
-	ctx context.Context,
-	clientID int64,
-) error {
-	_, err := database.conn.ExecContext(
-		ctx,
-		"DELETE FROM clients WHERE id = ?",
-		clientID,
-	)
-	if err != nil {
-		return fmt.Errorf("delete client: %w", err)
-	}
-
-	return nil
-}
-
-// GetSessionCount returns the number of active sessions.
-func (database *Database) GetSessionCount(
-	ctx context.Context,
-) (int64, error) {
-	var count int64
-
-	err := database.conn.QueryRowContext(
-		ctx,
-		"SELECT COUNT(*) FROM sessions",
-	).Scan(&count)
-	if err != nil {
-		return 0, fmt.Errorf(
-			"get session count: %w", err,
-		)
-	}
-
-	return count, nil
-}
-
-// ClientCountForSession returns the number of clients
-// belonging to a session.
-func (database *Database) ClientCountForSession(
-	ctx context.Context,
-	sessionID int64,
-) (int64, error) {
-	var count int64
-
-	err := database.conn.QueryRowContext(
-		ctx,
-		`SELECT COUNT(*) FROM clients
-		 WHERE session_id = ?`,
-		sessionID,
-	).Scan(&count)
-	if err != nil {
-		return 0, fmt.Errorf(
-			"client count for session: %w", err,
-		)
-	}
-
-	return count, nil
-}
-
-// DeleteStaleSessions removes clients not seen since the
-// cutoff and cleans up orphaned sessions.
-func (database *Database) DeleteStaleSessions(
-	ctx context.Context,
-	cutoff time.Time,
-) (int64, error) {
-	res, err := database.conn.ExecContext(ctx,
-		"DELETE FROM clients WHERE last_seen < ?",
-		cutoff,
-	)
-	if err != nil {
-		return 0, fmt.Errorf(
-			"delete stale clients: %w", err,
-		)
-	}
-
-	deleted, _ := res.RowsAffected()
-
-	_, err = database.conn.ExecContext(ctx,
-		`DELETE FROM sessions WHERE id NOT IN
-		 (SELECT DISTINCT session_id FROM clients)`,
-	)
-	if err != nil {
-		return deleted, fmt.Errorf(
-			"delete orphan sessions: %w", err,
-		)
-	}
-
-	return deleted, nil
-}
-
-// GetSessionChannels returns channels a session
-// belongs to.
-func (database *Database) GetSessionChannels(
-	ctx context.Context,
-	sessionID int64,
-) ([]ChannelInfo, error) {
-	rows, err := database.conn.QueryContext(ctx,
-		`SELECT c.id, c.name, c.topic
-		 FROM channels c
-		 INNER JOIN channel_members cm
-		   ON cm.channel_id = c.id
-		 WHERE cm.session_id = ?`, sessionID)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"get session channels: %w", err,
-		)
-	}
-
-	return scanChannels(rows)
-}
--- a/internal/db/queries_test.go
+++ b/internal/db/queries_test.go
@@ -1,653 +0,0 @@
-package db_test
-
-import (
-	"encoding/json"
-	"testing"
-
-	"git.eeqj.de/sneak/chat/internal/db"
-
-	_ "modernc.org/sqlite"
-)
-
-func setupTestDB(t *testing.T) *db.Database {
-	t.Helper()
-
-	database, err := db.NewTestDatabase()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Cleanup(func() {
-		closeErr := database.Close()
-		if closeErr != nil {
-			t.Logf("close db: %v", closeErr)
-		}
-	})
-
-	return database
-}
-
-func TestCreateSession(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	sessionID, _, token, err := database.CreateSession(
-		ctx, "alice",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if sessionID == 0 || token == "" {
-		t.Fatal("expected valid id and token")
-	}
-
-	_, _, dupToken, dupErr := database.CreateSession(
-		ctx, "alice",
-	)
-	if dupErr == nil {
-		t.Fatal("expected error for duplicate nick")
-	}
-
-	_ = dupToken
-}
-
-func TestGetSessionByToken(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	_, _, token, err := database.CreateSession(ctx, "bob")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	sessionID, clientID, nick, err :=
-		database.GetSessionByToken(ctx, token)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if nick != "bob" || sessionID == 0 || clientID == 0 {
-		t.Fatalf("expected bob, got %s", nick)
-	}
-
-	badSID, badCID, badNick, badErr :=
-		database.GetSessionByToken(ctx, "badtoken")
-	if badErr == nil {
-		t.Fatal("expected error for bad token")
-	}
-
-	if badSID != 0 || badCID != 0 || badNick != "" {
-		t.Fatal("expected zero values on error")
-	}
-}
-
-func TestGetSessionByNick(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	charlieID, charlieClientID, charlieToken, err :=
-		database.CreateSession(ctx, "charlie")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if charlieID == 0 || charlieClientID == 0 {
-		t.Fatal("expected valid session/client IDs")
-	}
-
-	if charlieToken == "" {
-		t.Fatal("expected non-empty token")
-	}
-
-	id, err := database.GetSessionByNick(ctx, "charlie")
-	if err != nil || id == 0 {
-		t.Fatal("expected to find charlie")
-	}
-
-	_, err = database.GetSessionByNick(ctx, "nobody")
-	if err == nil {
-		t.Fatal("expected error for unknown nick")
-	}
-}
-
-func TestChannelOperations(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	chID, err := database.GetOrCreateChannel(ctx, "#test")
-	if err != nil || chID == 0 {
-		t.Fatal("expected channel id")
-	}
-
-	chID2, err := database.GetOrCreateChannel(ctx, "#test")
-	if err != nil || chID2 != chID {
-		t.Fatal("expected same channel id")
-	}
-
-	chID3, err := database.GetChannelByName(ctx, "#test")
-	if err != nil || chID3 != chID {
-		t.Fatal("expected same channel id")
-	}
-
-	_, err = database.GetChannelByName(ctx, "#nope")
-	if err == nil {
-		t.Fatal("expected error for nonexistent channel")
-	}
-}
-
-func TestJoinAndPart(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	sid, _, _, err := database.CreateSession(ctx, "user1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	chID, err := database.GetOrCreateChannel(ctx, "#chan")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.JoinChannel(ctx, chID, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ids, err := database.GetChannelMemberIDs(ctx, chID)
-	if err != nil || len(ids) != 1 || ids[0] != sid {
-		t.Fatal("expected session in channel")
-	}
-
-	err = database.JoinChannel(ctx, chID, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.PartChannel(ctx, chID, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ids, _ = database.GetChannelMemberIDs(ctx, chID)
-	if len(ids) != 0 {
-		t.Fatal("expected empty channel")
-	}
-}
-
-func TestDeleteChannelIfEmpty(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	chID, err := database.GetOrCreateChannel(
-		ctx, "#empty",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	sid, _, _, err := database.CreateSession(ctx, "temp")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.JoinChannel(ctx, chID, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.PartChannel(ctx, chID, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.DeleteChannelIfEmpty(ctx, chID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = database.GetChannelByName(ctx, "#empty")
-	if err == nil {
-		t.Fatal("expected channel to be deleted")
-	}
-}
-
-func createSessionWithChannels(
-	t *testing.T,
-	database *db.Database,
-	nick, ch1Name, ch2Name string,
-) (int64, int64, int64) {
-	t.Helper()
-
-	ctx := t.Context()
-
-	sid, _, _, err := database.CreateSession(ctx, nick)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ch1, err := database.GetOrCreateChannel(
-		ctx, ch1Name,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ch2, err := database.GetOrCreateChannel(
-		ctx, ch2Name,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.JoinChannel(ctx, ch1, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.JoinChannel(ctx, ch2, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return sid, ch1, ch2
-}
-
-func TestListChannels(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	sid, _, _ := createSessionWithChannels(
-		t, database, "lister", "#a", "#b",
-	)
-
-	channels, err := database.ListChannels(
-		t.Context(), sid,
-	)
-	if err != nil || len(channels) != 2 {
-		t.Fatalf(
-			"expected 2 channels, got %d",
-			len(channels),
-		)
-	}
-}
-
-func TestListAllChannels(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	_, err := database.GetOrCreateChannel(ctx, "#x")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = database.GetOrCreateChannel(ctx, "#y")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	channels, err := database.ListAllChannels(ctx)
-	if err != nil || len(channels) < 2 {
-		t.Fatalf(
-			"expected >= 2 channels, got %d",
-			len(channels),
-		)
-	}
-}
-
-func TestChangeNick(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	sid, _, token, err := database.CreateSession(
-		ctx, "old",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.ChangeNick(ctx, sid, "new")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, _, nick, err := database.GetSessionByToken(
-		ctx, token,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if nick != "new" {
-		t.Fatalf("expected new, got %s", nick)
-	}
-}
-
-func TestSetTopic(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	_, err := database.GetOrCreateChannel(
-		ctx, "#topictest",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.SetTopic(ctx, "#topictest", "Hello")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	channels, err := database.ListAllChannels(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, ch := range channels {
-		if ch.Name == "#topictest" &&
-			ch.Topic != "Hello" {
-			t.Fatalf(
-				"expected topic Hello, got %s",
-				ch.Topic,
-			)
-		}
-	}
-}
-
-func TestInsertMessage(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	body := json.RawMessage(`["hello"]`)
-
-	dbID, msgUUID, err := database.InsertMessage(
-		ctx, "PRIVMSG", "poller", "#test", body, nil,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if dbID == 0 || msgUUID == "" {
-		t.Fatal("expected valid id and uuid")
-	}
-}
-
-func TestPollMessages(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	sid, _, token, err := database.CreateSession(
-		ctx, "poller",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, clientID, _, err := database.GetSessionByToken(
-		ctx, token,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	body := json.RawMessage(`["hello"]`)
-
-	dbID, _, err := database.InsertMessage(
-		ctx, "PRIVMSG", "poller", "#test", body, nil,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.EnqueueToSession(ctx, sid, dbID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	const batchSize = 10
-
-	msgs, lastQID, err := database.PollMessages(
-		ctx, clientID, 0, batchSize,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(msgs) != 1 {
-		t.Fatalf(
-			"expected 1 message, got %d", len(msgs),
-		)
-	}
-
-	if msgs[0].Command != "PRIVMSG" {
-		t.Fatalf(
-			"expected PRIVMSG, got %s", msgs[0].Command,
-		)
-	}
-
-	if lastQID == 0 {
-		t.Fatal("expected nonzero lastQID")
-	}
-
-	msgs, _, _ = database.PollMessages(
-		ctx, clientID, lastQID, batchSize,
-	)
-
-	if len(msgs) != 0 {
-		t.Fatalf(
-			"expected 0 messages, got %d", len(msgs),
-		)
-	}
-}
-
-func TestGetHistory(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	const msgCount = 10
-
-	for range msgCount {
-		_, _, err := database.InsertMessage(
-			ctx, "PRIVMSG", "user", "#hist",
-			json.RawMessage(`["msg"]`), nil,
-		)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	const histLimit = 5
-
-	msgs, err := database.GetHistory(
-		ctx, "#hist", 0, histLimit,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(msgs) != histLimit {
-		t.Fatalf("expected %d, got %d",
-			histLimit, len(msgs))
-	}
-
-	if msgs[0].DBID > msgs[histLimit-1].DBID {
-		t.Fatal("expected ascending order")
-	}
-}
-
-func TestDeleteSession(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	sid, _, _, err := database.CreateSession(
-		ctx, "deleteme",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	chID, err := database.GetOrCreateChannel(
-		ctx, "#delchan",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.JoinChannel(ctx, chID, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.DeleteSession(ctx, sid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = database.GetSessionByNick(ctx, "deleteme")
-	if err == nil {
-		t.Fatal("session should be deleted")
-	}
-
-	ids, _ := database.GetChannelMemberIDs(ctx, chID)
-	if len(ids) != 0 {
-		t.Fatal("expected no members after deletion")
-	}
-}
-
-func TestChannelMembers(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	sid1, _, _, err := database.CreateSession(ctx, "m1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	sid2, _, _, err := database.CreateSession(ctx, "m2")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	chID, err := database.GetOrCreateChannel(
-		ctx, "#members",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.JoinChannel(ctx, chID, sid1)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.JoinChannel(ctx, chID, sid2)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	members, err := database.ChannelMembers(ctx, chID)
-	if err != nil || len(members) != 2 {
-		t.Fatalf(
-			"expected 2 members, got %d",
-			len(members),
-		)
-	}
-}
-
-func TestGetSessionChannels(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	sid, _, _ := createSessionWithChannels(
-		t, database, "multi", "#m1", "#m2",
-	)
-
-	channels, err :=
-		database.GetSessionChannels(
-			t.Context(), sid,
-		)
-	if err != nil || len(channels) != 2 {
-		t.Fatalf(
-			"expected 2 channels, got %d",
-			len(channels),
-		)
-	}
-}
-
-func TestEnqueueToClient(t *testing.T) {
-	t.Parallel()
-
-	database := setupTestDB(t)
-	ctx := t.Context()
-
-	_, _, token, err := database.CreateSession(
-		ctx, "enqclient",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, clientID, _, err := database.GetSessionByToken(
-		ctx, token,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	body := json.RawMessage(`["test"]`)
-
-	dbID, _, err := database.InsertMessage(
-		ctx, "PRIVMSG", "sender", "#ch", body, nil,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = database.EnqueueToClient(ctx, clientID, dbID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	const batchSize = 10
-
-	msgs, _, err := database.PollMessages(
-		ctx, clientID, 0, batchSize,
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(msgs) != 1 {
-		t.Fatalf("expected 1, got %d", len(msgs))
-	}
-}
--- a/internal/db/schema/001_initial.sql
+++ b/internal/db/schema/001_initial.sql
@@ -1,67 +1,4 @@
-- Chat server schema (pre-1.0 consolidated)
-PRAGMA foreign_keys = ON;
-
-- Sessions: IRC-style sessions (no passwords, nick + optional signing key)
-CREATE TABLE IF NOT EXISTS sessions (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    uuid TEXT NOT NULL UNIQUE,
-    nick TEXT NOT NULL UNIQUE,
-    signing_key TEXT NOT NULL DEFAULT '',
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    last_seen DATETIME DEFAULT CURRENT_TIMESTAMP
+CREATE TABLE IF NOT EXISTS schema_migrations (
+    version INTEGER PRIMARY KEY,
+    applied_at DATETIME DEFAULT CURRENT_TIMESTAMP
 );
-CREATE INDEX IF NOT EXISTS idx_sessions_uuid ON sessions(uuid);
-
-- Clients: each session can have multiple connected clients
-CREATE TABLE IF NOT EXISTS clients (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    uuid TEXT NOT NULL UNIQUE,
-    session_id INTEGER NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
-    token TEXT NOT NULL UNIQUE,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    last_seen DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-CREATE INDEX IF NOT EXISTS idx_clients_token ON clients(token);
-CREATE INDEX IF NOT EXISTS idx_clients_session ON clients(session_id);
-
-- Channels
-CREATE TABLE IF NOT EXISTS channels (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    name TEXT NOT NULL UNIQUE,
-    topic TEXT NOT NULL DEFAULT '',
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-
-- Channel members
-CREATE TABLE IF NOT EXISTS channel_members (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    channel_id INTEGER NOT NULL REFERENCES channels(id) ON DELETE CASCADE,
-    session_id INTEGER NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
-    joined_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    UNIQUE(channel_id, session_id)
-);
-
-- Messages: IRC envelope format
-CREATE TABLE IF NOT EXISTS messages (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    uuid TEXT NOT NULL UNIQUE,
-    command TEXT NOT NULL DEFAULT 'PRIVMSG',
-    msg_from TEXT NOT NULL DEFAULT '',
-    msg_to TEXT NOT NULL DEFAULT '',
-    body TEXT NOT NULL DEFAULT '[]',
-    meta TEXT NOT NULL DEFAULT '{}',
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-CREATE INDEX IF NOT EXISTS idx_messages_to_id ON messages(msg_to, id);
-CREATE INDEX IF NOT EXISTS idx_messages_created ON messages(created_at);
-
-- Per-client message queues for fan-out delivery
-CREATE TABLE IF NOT EXISTS client_queues (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    client_id INTEGER NOT NULL REFERENCES clients(id) ON DELETE CASCADE,
-    message_id INTEGER NOT NULL REFERENCES messages(id) ON DELETE CASCADE,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    UNIQUE(client_id, message_id)
-);
-CREATE INDEX IF NOT EXISTS idx_client_queues_client ON client_queues(client_id, id);
--- a/internal/db/schema/002_schema.sql
+++ b/internal/db/schema/002_schema.sql
@@ -0,0 +1,89 @@
+-- All schema changes go into this file until 1.0.0 is tagged.
+-- There will not be migrations during the early development phase.
+-- After 1.0.0, new changes get their own numbered migration files.
+
+-- Users: accounts and authentication
+CREATE TABLE IF NOT EXISTS users (
+    id TEXT PRIMARY KEY,                           -- UUID
+    nick TEXT NOT NULL UNIQUE,
+    password_hash TEXT NOT NULL,
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    last_seen_at DATETIME
+);
+
+-- Auth tokens: one user can have multiple active tokens (multiple devices)
+CREATE TABLE IF NOT EXISTS auth_tokens (
+    token TEXT PRIMARY KEY,                        -- random token string
+    user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    expires_at DATETIME,                           -- NULL = no expiry
+    last_used_at DATETIME
+);
+CREATE INDEX IF NOT EXISTS idx_auth_tokens_user_id ON auth_tokens(user_id);
+
+-- Channels: chat rooms
+CREATE TABLE IF NOT EXISTS channels (
+    id TEXT PRIMARY KEY,                           -- UUID
+    name TEXT NOT NULL UNIQUE,                     -- #general, etc.
+    topic TEXT NOT NULL DEFAULT '',
+    modes TEXT NOT NULL DEFAULT '',                -- +i, +m, +s, +t, +n
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Channel members: who is in which channel, with per-user modes
+CREATE TABLE IF NOT EXISTS channel_members (
+    channel_id TEXT NOT NULL REFERENCES channels(id) ON DELETE CASCADE,
+    user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    modes TEXT NOT NULL DEFAULT '',                -- +o (operator), +v (voice)
+    joined_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (channel_id, user_id)
+);
+CREATE INDEX IF NOT EXISTS idx_channel_members_user_id ON channel_members(user_id);
+
+-- Messages: channel and DM history (rotated per MAX_HISTORY)
+CREATE TABLE IF NOT EXISTS messages (
+    id TEXT PRIMARY KEY,                           -- UUID
+    ts DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    from_user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    from_nick TEXT NOT NULL,                       -- denormalized for history
+    target TEXT NOT NULL,                          -- #channel name or user UUID for DMs
+    type TEXT NOT NULL DEFAULT 'message',          -- message, action, notice, join, part, quit, topic, mode, nick, system
+    body TEXT NOT NULL DEFAULT '',
+    meta TEXT NOT NULL DEFAULT '{}',               -- JSON extensible metadata
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+CREATE INDEX IF NOT EXISTS idx_messages_target_ts ON messages(target, ts);
+CREATE INDEX IF NOT EXISTS idx_messages_from_user ON messages(from_user_id);
+
+-- Message queue: per-user pending delivery (unread messages)
+CREATE TABLE IF NOT EXISTS message_queue (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    message_id TEXT NOT NULL REFERENCES messages(id) ON DELETE CASCADE,
+    queued_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE(user_id, message_id)
+);
+CREATE INDEX IF NOT EXISTS idx_message_queue_user_id ON message_queue(user_id, queued_at);
+
+-- Sessions: server-held session state
+CREATE TABLE IF NOT EXISTS sessions (
+    id TEXT PRIMARY KEY,                           -- UUID
+    user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    last_active_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    expires_at DATETIME                            -- idle timeout
+);
+CREATE INDEX IF NOT EXISTS idx_sessions_user_id ON sessions(user_id);
+
+-- Server links: federation peer configuration
+CREATE TABLE IF NOT EXISTS server_links (
+    id TEXT PRIMARY KEY,                           -- UUID
+    name TEXT NOT NULL UNIQUE,                     -- human-readable peer name
+    url TEXT NOT NULL,                             -- base URL of peer server
+    shared_key_hash TEXT NOT NULL,                 -- hashed shared secret
+    is_active INTEGER NOT NULL DEFAULT 1,
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    last_seen_at DATETIME
+);
--- a/internal/handlers/api.go
+++ b/internal/handlers/api.go
--- a/internal/handlers/api_test.go
+++ b/internal/handlers/api_test.go
--- a/internal/handlers/handlers.go
+++ b/internal/handlers/handlers.go
@@ -4,13 +4,9 @@ package handlers
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"log/slog"
 	"net/http"
-	"time"

-	"git.eeqj.de/sneak/chat/internal/broker"
-	"git.eeqj.de/sneak/chat/internal/config"
 	"git.eeqj.de/sneak/chat/internal/db"
 	"git.eeqj.de/sneak/chat/internal/globals"
 	"git.eeqj.de/sneak/chat/internal/healthcheck"
@@ -18,164 +14,47 @@ import (
 	"go.uber.org/fx"
 )

-var errUnauthorized = errors.New("unauthorized")
-
 // Params defines the dependencies for creating Handlers.
 type Params struct {
 	fx.In

 	Logger      *logger.Logger
 	Globals     *globals.Globals
-	Config      *config.Config
 	Database    *db.Database
 	Healthcheck *healthcheck.Healthcheck
 }

-const defaultIdleTimeout = 24 * time.Hour
-
 // Handlers manages HTTP request handling.
 type Handlers struct {
-	params        *Params
-	log           *slog.Logger
-	hc            *healthcheck.Healthcheck
-	broker        *broker.Broker
-	cancelCleanup context.CancelFunc
+	params *Params
+	log    *slog.Logger
+	hc     *healthcheck.Healthcheck
 }

 // New creates a new Handlers instance.
-func New(
-	lifecycle fx.Lifecycle,
-	params Params,
-) (*Handlers, error) {
-	hdlr := &Handlers{ //nolint:exhaustruct // cancelCleanup set in startCleanup
-		params: &params,
-		log:    params.Logger.Get(),
-		hc:     params.Healthcheck,
-		broker: broker.New(),
-	}
-
-	lifecycle.Append(fx.Hook{
-		OnStart: func(ctx context.Context) error {
-			hdlr.startCleanup(ctx)
-
-			return nil
-		},
-		OnStop: func(_ context.Context) error {
-			hdlr.stopCleanup()
+func New(lc fx.Lifecycle, params Params) (*Handlers, error) {
+	s := new(Handlers)
+	s.params = &params
+	s.log = params.Logger.Get()
+	s.hc = params.Healthcheck

+	lc.Append(fx.Hook{
+		OnStart: func(_ context.Context) error {
 			return nil
 		},
 	})

-	return hdlr, nil
+	return s, nil
 }

-func (hdlr *Handlers) respondJSON(
-	writer http.ResponseWriter,
-	_ *http.Request,
-	data any,
-	status int,
-) {
-	writer.Header().Set(
-		"Content-Type",
-		"application/json; charset=utf-8",
-	)
-	writer.WriteHeader(status)
+func (s *Handlers) respondJSON(w http.ResponseWriter, _ *http.Request, data any, status int) {
+	w.WriteHeader(status)
+	w.Header().Set("Content-Type", "application/json")

 	if data != nil {
-		err := json.NewEncoder(writer).Encode(data)
+		err := json.NewEncoder(w).Encode(data)
 		if err != nil {
-			hdlr.log.Error(
-				"json encode error", "error", err,
-			)
+			s.log.Error("json encode error", "error", err)
 		}
 	}
 }
-
-func (hdlr *Handlers) respondError(
-	writer http.ResponseWriter,
-	request *http.Request,
-	msg string,
-	status int,
-) {
-	hdlr.respondJSON(
-		writer, request,
-		map[string]string{"error": msg},
-		status,
-	)
-}
-
-func (hdlr *Handlers) idleTimeout() time.Duration {
-	raw := hdlr.params.Config.SessionIdleTimeout
-	if raw == "" {
-		return defaultIdleTimeout
-	}
-
-	dur, err := time.ParseDuration(raw)
-	if err != nil {
-		hdlr.log.Error(
-			"invalid SESSION_IDLE_TIMEOUT, using default",
-			"value", raw, "error", err,
-		)
-
-		return defaultIdleTimeout
-	}
-
-	return dur
-}
-
-func (hdlr *Handlers) startCleanup(ctx context.Context) {
-	cleanupCtx, cancel := context.WithCancel(ctx)
-	hdlr.cancelCleanup = cancel
-
-	go hdlr.cleanupLoop(cleanupCtx)
-}
-
-func (hdlr *Handlers) stopCleanup() {
-	if hdlr.cancelCleanup != nil {
-		hdlr.cancelCleanup()
-	}
-}
-
-func (hdlr *Handlers) cleanupLoop(ctx context.Context) {
-	timeout := hdlr.idleTimeout()
-
-	interval := max(timeout/2, time.Minute) //nolint:mnd // half the timeout
-
-	ticker := time.NewTicker(interval)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ticker.C:
-			hdlr.runCleanup(ctx, timeout)
-		case <-ctx.Done():
-			return
-		}
-	}
-}
-
-func (hdlr *Handlers) runCleanup(
-	ctx context.Context,
-	timeout time.Duration,
-) {
-	cutoff := time.Now().Add(-timeout)
-
-	deleted, err := hdlr.params.Database.DeleteStaleSessions(
-		ctx, cutoff,
-	)
-	if err != nil {
-		hdlr.log.Error(
-			"session cleanup failed", "error", err,
-		)
-
-		return
-	}
-
-	if deleted > 0 {
-		hdlr.log.Info(
-			"cleaned up stale clients",
-			"deleted", deleted,
-		)
-	}
-}
--- a/internal/handlers/healthcheck.go
+++ b/internal/handlers/healthcheck.go
@@ -7,12 +7,9 @@ import (
 const httpStatusOK = 200

 // HandleHealthCheck returns an HTTP handler for the health check endpoint.
-func (hdlr *Handlers) HandleHealthCheck() http.HandlerFunc {
-	return func(
-		writer http.ResponseWriter,
-		request *http.Request,
-	) {
-		resp := hdlr.hc.Healthcheck()
-		hdlr.respondJSON(writer, request, resp, httpStatusOK)
+func (s *Handlers) HandleHealthCheck() http.HandlerFunc {
+	return func(w http.ResponseWriter, req *http.Request) {
+		resp := s.hc.Healthcheck()
+		s.respondJSON(w, req, resp, httpStatusOK)
 	}
 }
--- a/internal/healthcheck/healthcheck.go
+++ b/internal/healthcheck/healthcheck.go
@@ -33,17 +33,14 @@ type Healthcheck struct {
 }

 // New creates a new Healthcheck instance.
-func New(
-	lifecycle fx.Lifecycle, params Params,
-) (*Healthcheck, error) {
-	hcheck := &Healthcheck{ //nolint:exhaustruct // StartupTime set in OnStart
-		params: &params,
-		log:    params.Logger.Get(),
-	}
+func New(lc fx.Lifecycle, params Params) (*Healthcheck, error) {
+	s := new(Healthcheck)
+	s.params = &params
+	s.log = params.Logger.Get()

-	lifecycle.Append(fx.Hook{
+	lc.Append(fx.Hook{
 		OnStart: func(_ context.Context) error {
-			hcheck.StartupTime = time.Now()
+			s.StartupTime = time.Now()

 			return nil
 		},
@@ -52,7 +49,7 @@ func New(
 		},
 	})

-	return hcheck, nil
+	return s, nil
 }

 // Response is the JSON response returned by the health endpoint.
@@ -67,18 +64,19 @@ type Response struct {
 }

 // Healthcheck returns the current health status of the server.
-func (hcheck *Healthcheck) Healthcheck() *Response {
-	return &Response{
+func (s *Healthcheck) Healthcheck() *Response {
+	resp := &Response{
 		Status:        "ok",
 		Now:           time.Now().UTC().Format(time.RFC3339Nano),
-		UptimeSeconds: int64(hcheck.uptime().Seconds()),
-		UptimeHuman:   hcheck.uptime().String(),
-		Appname:       hcheck.params.Globals.Appname,
-		Version:       hcheck.params.Globals.Version,
-		Maintenance:   hcheck.params.Config.MaintenanceMode,
+		UptimeSeconds: int64(s.uptime().Seconds()),
+		UptimeHuman:   s.uptime().String(),
+		Appname:       s.params.Globals.Appname,
+		Version:       s.params.Globals.Version,
 	}
+
+	return resp
 }

-func (hcheck *Healthcheck) uptime() time.Duration {
-	return time.Since(hcheck.StartupTime)
+func (s *Healthcheck) uptime() time.Duration {
+	return time.Since(s.StartupTime)
 }
--- a/internal/logger/logger.go
+++ b/internal/logger/logger.go
@@ -23,56 +23,51 @@ type Logger struct {
 	params Params
 }

-// New creates a new Logger with appropriate handler
-// based on terminal detection.
-func New(
-	_ fx.Lifecycle, params Params,
-) (*Logger, error) {
-	logger := new(Logger)
-	logger.level = new(slog.LevelVar)
-	logger.level.Set(slog.LevelInfo)
+// New creates a new Logger with appropriate handler based on terminal detection.
+func New(_ fx.Lifecycle, params Params) (*Logger, error) {
+	l := new(Logger)
+	l.level = new(slog.LevelVar)
+	l.level.Set(slog.LevelInfo)

 	tty := false
-
 	if fileInfo, _ := os.Stdout.Stat(); (fileInfo.Mode() & os.ModeCharDevice) != 0 {
 		tty = true
 	}

-	opts := &slog.HandlerOptions{ //nolint:exhaustruct // ReplaceAttr optional
-		Level:     logger.level,
-		AddSource: true,
-	}
-
 	var handler slog.Handler
 	if tty {
-		handler = slog.NewTextHandler(os.Stdout, opts)
+		handler = slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+			Level:     l.level,
+			AddSource: true,
+		})
 	} else {
-		handler = slog.NewJSONHandler(os.Stdout, opts)
+		handler = slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
+			Level:     l.level,
+			AddSource: true,
+		})
 	}

-	logger.log = slog.New(handler)
-	logger.params = params
+	l.log = slog.New(handler)
+	l.params = params

-	return logger, nil
+	return l, nil
 }

 // EnableDebugLogging switches the log level to debug.
-func (logger *Logger) EnableDebugLogging() {
-	logger.level.Set(slog.LevelDebug)
-	logger.log.Debug(
-		"debug logging enabled", "debug", true,
-	)
+func (l *Logger) EnableDebugLogging() {
+	l.level.Set(slog.LevelDebug)
+	l.log.Debug("debug logging enabled", "debug", true)
 }

 // Get returns the underlying slog.Logger.
-func (logger *Logger) Get() *slog.Logger {
-	return logger.log
+func (l *Logger) Get() *slog.Logger {
+	return l.log
 }

 // Identify logs the application name and version at startup.
-func (logger *Logger) Identify() {
-	logger.log.Info("starting",
-		"appname", logger.params.Globals.Appname,
-		"version", logger.params.Globals.Version,
+func (l *Logger) Identify() {
+	l.log.Info("starting",
+		"appname", l.params.Globals.Appname,
+		"version", l.params.Globals.Version,
 	)
 }
--- a/internal/middleware/middleware.go
+++ b/internal/middleware/middleware.go
@@ -11,7 +11,7 @@ import (
 	"git.eeqj.de/sneak/chat/internal/globals"
 	"git.eeqj.de/sneak/chat/internal/logger"
 	basicauth "github.com/99designs/basicauth-go"
-	chimw "github.com/go-chi/chi/middleware"
+	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/cors"
 	metrics "github.com/slok/go-http-metrics/metrics/prometheus"
 	ghmm "github.com/slok/go-http-metrics/middleware"
@@ -38,28 +38,25 @@ type Middleware struct {
 }

 // New creates a new Middleware instance.
-func New(
-	_ fx.Lifecycle, params Params,
-) (*Middleware, error) {
-	mware := &Middleware{
-		params: &params,
-		log:    params.Logger.Get(),
-	}
+func New(_ fx.Lifecycle, params Params) (*Middleware, error) {
+	s := new(Middleware)
+	s.params = &params
+	s.log = params.Logger.Get()

-	return mware, nil
+	return s, nil
 }

-func ipFromHostPort(hostPort string) string {
-	host, _, err := net.SplitHostPort(hostPort)
+func ipFromHostPort(hp string) string {
+	h, _, err := net.SplitHostPort(hp)
 	if err != nil {
 		return ""
 	}

-	if len(host) > 0 && host[0] == '[' {
-		return host[1 : len(host)-1]
+	if len(h) > 0 && h[0] == '[' {
+		return h[1 : len(h)-1]
 	}

-	return host
+	return h
 }

 type loggingResponseWriter struct {
@@ -68,15 +65,9 @@ type loggingResponseWriter struct {
 	statusCode int
 }

-// newLoggingResponseWriter wraps a ResponseWriter
-// to capture the status code.
-func newLoggingResponseWriter(
-	writer http.ResponseWriter,
-) *loggingResponseWriter {
-	return &loggingResponseWriter{
-		ResponseWriter: writer,
-		statusCode:     http.StatusOK,
-	}
+// newLoggingResponseWriter wraps a ResponseWriter to capture the status code.
+func newLoggingResponseWriter(w http.ResponseWriter) *loggingResponseWriter {
+	return &loggingResponseWriter{w, http.StatusOK}
 }

 func (lrw *loggingResponseWriter) WriteHeader(code int) {
@@ -85,57 +76,43 @@ func (lrw *loggingResponseWriter) WriteHeader(code int) {
 }

 // Logging returns middleware that logs each HTTP request.
-func (mware *Middleware) Logging() func(http.Handler) http.Handler {
+func (s *Middleware) Logging() func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(
-			func(
-				writer http.ResponseWriter,
-				request *http.Request,
-			) {
-				start := time.Now()
-				lrw := newLoggingResponseWriter(writer)
-				ctx := request.Context()
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			start := time.Now()
+			lrw := newLoggingResponseWriter(w)
+			ctx := r.Context()

-				defer func() {
-					latency := time.Since(start)
+			defer func() {
+				latency := time.Since(start)

-					reqID, _ := ctx.Value(
-						chimw.RequestIDKey,
-					).(string)
+				reqID, _ := ctx.Value(middleware.RequestIDKey).(string)

-					mware.log.InfoContext(
-						ctx, "request",
-						"request_start", start,
-						"method", request.Method,
-						"url", request.URL.String(),
-						"useragent", request.UserAgent(),
-						"request_id", reqID,
-						"referer", request.Referer(),
-						"proto", request.Proto,
-						"remoteIP",
-						ipFromHostPort(request.RemoteAddr),
-						"status", lrw.statusCode,
-						"latency_ms",
-						latency.Milliseconds(),
-					)
-				}()
+				s.log.InfoContext(ctx, "request",
+					"request_start", start,
+					"method", r.Method,
+					"url", r.URL.String(),
+					"useragent", r.UserAgent(),
+					"request_id", reqID,
+					"referer", r.Referer(),
+					"proto", r.Proto,
+					"remoteIP", ipFromHostPort(r.RemoteAddr),
+					"status", lrw.statusCode,
+					"latency_ms", latency.Milliseconds(),
+				)
+			}()

-				next.ServeHTTP(lrw, request)
-			})
+			next.ServeHTTP(lrw, r)
+		})
 	}
 }

 // CORS returns middleware that handles Cross-Origin Resource Sharing.
-func (mware *Middleware) CORS() func(http.Handler) http.Handler {
-	return cors.Handler(cors.Options{ //nolint:exhaustruct // optional fields
-		AllowedOrigins: []string{"*"},
-		AllowedMethods: []string{
-			"GET", "POST", "PUT", "DELETE", "OPTIONS",
-		},
-		AllowedHeaders: []string{
-			"Accept", "Authorization",
-			"Content-Type", "X-CSRF-Token",
-		},
+func (s *Middleware) CORS() func(http.Handler) http.Handler {
+	return cors.Handler(cors.Options{
+		AllowedOrigins:   []string{"*"},
+		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
 		ExposedHeaders:   []string{"Link"},
 		AllowCredentials: false,
 		MaxAge:           corsMaxAge,
@@ -143,34 +120,28 @@ func (mware *Middleware) CORS() func(http.Handler) http.Handler {
 }

 // Auth returns middleware that performs authentication.
-func (mware *Middleware) Auth() func(http.Handler) http.Handler {
+func (s *Middleware) Auth() func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(
-			func(
-				writer http.ResponseWriter,
-				request *http.Request,
-			) {
-				mware.log.Info("AUTH: before request")
-				next.ServeHTTP(writer, request)
-			})
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			s.log.Info("AUTH: before request")
+			next.ServeHTTP(w, r)
+		})
 	}
 }

 // Metrics returns middleware that records HTTP metrics.
-func (mware *Middleware) Metrics() func(http.Handler) http.Handler {
-	metricsMiddleware := ghmm.New(ghmm.Config{ //nolint:exhaustruct // optional fields
-		Recorder: metrics.NewRecorder(
-			metrics.Config{}, //nolint:exhaustruct // defaults
-		),
+func (s *Middleware) Metrics() func(http.Handler) http.Handler {
+	mdlw := ghmm.New(ghmm.Config{
+		Recorder: metrics.NewRecorder(metrics.Config{}),
 	})

 	return func(next http.Handler) http.Handler {
-		return std.Handler("", metricsMiddleware, next)
+		return std.Handler("", mdlw, next)
 	}
 }

 // MetricsAuth returns middleware that protects metrics with basic auth.
-func (mware *Middleware) MetricsAuth() func(http.Handler) http.Handler {
+func (s *Middleware) MetricsAuth() func(http.Handler) http.Handler {
 	return basicauth.New(
 		"metrics",
 		map[string][]string{
--- a/internal/models/auth_token.go
+++ b/internal/models/auth_token.go
@@ -0,0 +1,27 @@
+package models
+
+import (
+	"context"
+	"fmt"
+	"time"
+)
+
+// AuthToken represents an authentication token for a user session.
+type AuthToken struct {
+	Base
+
+	Token      string     `json:"-"`
+	UserID     string     `json:"userId"`
+	CreatedAt  time.Time  `json:"createdAt"`
+	ExpiresAt  *time.Time `json:"expiresAt,omitempty"`
+	LastUsedAt *time.Time `json:"lastUsedAt,omitempty"`
+}
+
+// User returns the user who owns this token.
+func (t *AuthToken) User(ctx context.Context) (*User, error) {
+	if ul := t.GetUserLookup(); ul != nil {
+		return ul.GetUserByID(ctx, t.UserID)
+	}
+
+	return nil, fmt.Errorf("user lookup not available")
+}
--- a/internal/models/channel.go
+++ b/internal/models/channel.go
@@ -0,0 +1,96 @@
+package models
+
+import (
+	"context"
+	"time"
+)
+
+// Channel represents a chat channel.
+type Channel struct {
+	Base
+
+	ID        string    `json:"id"`
+	Name      string    `json:"name"`
+	Topic     string    `json:"topic"`
+	Modes     string    `json:"modes"`
+	CreatedAt time.Time `json:"createdAt"`
+	UpdatedAt time.Time `json:"updatedAt"`
+}
+
+// Members returns all users who are members of this channel.
+func (c *Channel) Members(ctx context.Context) ([]*ChannelMember, error) {
+	rows, err := c.GetDB().QueryContext(ctx, `
+		SELECT cm.channel_id, cm.user_id, cm.modes, cm.joined_at,
+		       u.nick
+		FROM channel_members cm
+		JOIN users u ON u.id = cm.user_id
+		WHERE cm.channel_id = ?
+		ORDER BY cm.joined_at`,
+		c.ID,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	defer func() { _ = rows.Close() }()
+
+	members := []*ChannelMember{}
+
+	for rows.Next() {
+		m := &ChannelMember{}
+		m.SetDB(c.db)
+
+		err = rows.Scan(
+			&m.ChannelID, &m.UserID, &m.Modes,
+			&m.JoinedAt, &m.Nick,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		members = append(members, m)
+	}
+
+	return members, rows.Err()
+}
+
+// RecentMessages returns the most recent messages in this channel.
+func (c *Channel) RecentMessages(
+	ctx context.Context,
+	limit int,
+) ([]*Message, error) {
+	rows, err := c.GetDB().QueryContext(ctx, `
+		SELECT id, ts, from_user_id, from_nick,
+		       target, type, body, meta, created_at
+		FROM messages
+		WHERE target = ?
+		ORDER BY ts DESC
+		LIMIT ?`,
+		c.Name, limit,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	defer func() { _ = rows.Close() }()
+
+	messages := []*Message{}
+
+	for rows.Next() {
+		msg := &Message{}
+		msg.SetDB(c.db)
+
+		err = rows.Scan(
+			&msg.ID, &msg.Timestamp, &msg.FromUserID,
+			&msg.FromNick, &msg.Target, &msg.Type,
+			&msg.Body, &msg.Meta, &msg.CreatedAt,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		messages = append(messages, msg)
+	}
+
+	return messages, rows.Err()
+}
--- a/internal/models/channel_member.go
+++ b/internal/models/channel_member.go
@@ -0,0 +1,36 @@
+package models
+
+import (
+	"context"
+	"fmt"
+	"time"
+)
+
+// ChannelMember represents a user's membership in a channel.
+type ChannelMember struct {
+	Base
+
+	ChannelID string    `json:"channelId"`
+	UserID    string    `json:"userId"`
+	Modes     string    `json:"modes"`
+	JoinedAt  time.Time `json:"joinedAt"`
+	Nick      string    `json:"nick"` // denormalized from users table
+}
+
+// User returns the full User for this membership.
+func (cm *ChannelMember) User(ctx context.Context) (*User, error) {
+	if ul := cm.GetUserLookup(); ul != nil {
+		return ul.GetUserByID(ctx, cm.UserID)
+	}
+
+	return nil, fmt.Errorf("user lookup not available")
+}
+
+// Channel returns the full Channel for this membership.
+func (cm *ChannelMember) Channel(ctx context.Context) (*Channel, error) {
+	if cl := cm.GetChannelLookup(); cl != nil {
+		return cl.GetChannelByID(ctx, cm.ChannelID)
+	}
+
+	return nil, fmt.Errorf("channel lookup not available")
+}
--- a/internal/models/message.go
+++ b/internal/models/message.go
@@ -0,0 +1,20 @@
+package models
+
+import (
+	"time"
+)
+
+// Message represents a chat message (channel or DM).
+type Message struct {
+	Base
+
+	ID         string    `json:"id"`
+	Timestamp  time.Time `json:"ts"`
+	FromUserID string    `json:"fromUserId"`
+	FromNick   string    `json:"from"`
+	Target     string    `json:"to"`
+	Type       string    `json:"type"`
+	Body       string    `json:"body"`
+	Meta       string    `json:"meta"`
+	CreatedAt  time.Time `json:"createdAt"`
+}
--- a/internal/models/message_queue.go
+++ b/internal/models/message_queue.go
@@ -0,0 +1,15 @@
+package models
+
+import (
+	"time"
+)
+
+// MessageQueueEntry represents a pending message delivery for a user.
+type MessageQueueEntry struct {
+	Base
+
+	ID        int64     `json:"id"`
+	UserID    string    `json:"userId"`
+	MessageID string    `json:"messageId"`
+	QueuedAt  time.Time `json:"queuedAt"`
+}
--- a/internal/models/model.go
+++ b/internal/models/model.go
@@ -0,0 +1,58 @@
+// Package models defines the data models used by the chat application.
+// All model structs embed Base, which provides database access for
+// relation-fetching methods directly on model instances.
+package models
+
+import (
+	"context"
+	"database/sql"
+)
+
+// DB is the interface that models use to query the database.
+// This avoids a circular import with the db package.
+type DB interface {
+	GetDB() *sql.DB
+}
+
+// UserLookup provides user lookup by ID without circular imports.
+type UserLookup interface {
+	GetUserByID(ctx context.Context, id string) (*User, error)
+}
+
+// ChannelLookup provides channel lookup by ID without circular imports.
+type ChannelLookup interface {
+	GetChannelByID(ctx context.Context, id string) (*Channel, error)
+}
+
+// Base is embedded in all model structs to provide database access.
+type Base struct {
+	db DB
+}
+
+// SetDB injects the database reference into a model.
+func (b *Base) SetDB(d DB) {
+	b.db = d
+}
+
+// GetDB returns the database interface for use in model methods.
+func (b *Base) GetDB() *sql.DB {
+	return b.db.GetDB()
+}
+
+// GetUserLookup returns the DB as a UserLookup if it implements the interface.
+func (b *Base) GetUserLookup() UserLookup {
+	if ul, ok := b.db.(UserLookup); ok {
+		return ul
+	}
+
+	return nil
+}
+
+// GetChannelLookup returns the DB as a ChannelLookup if it implements the interface.
+func (b *Base) GetChannelLookup() ChannelLookup {
+	if cl, ok := b.db.(ChannelLookup); ok {
+		return cl
+	}
+
+	return nil
+}
--- a/internal/models/server_link.go
+++ b/internal/models/server_link.go
@@ -0,0 +1,18 @@
+package models
+
+import (
+	"time"
+)
+
+// ServerLink represents a federation peer server configuration.
+type ServerLink struct {
+	Base
+
+	ID            string     `json:"id"`
+	Name          string     `json:"name"`
+	URL           string     `json:"url"`
+	SharedKeyHash string     `json:"-"`
+	IsActive      bool       `json:"isActive"`
+	CreatedAt     time.Time  `json:"createdAt"`
+	LastSeenAt    *time.Time `json:"lastSeenAt,omitempty"`
+}
--- a/internal/models/session.go
+++ b/internal/models/session.go
@@ -0,0 +1,27 @@
+package models
+
+import (
+	"context"
+	"fmt"
+	"time"
+)
+
+// Session represents a server-held user session.
+type Session struct {
+	Base
+
+	ID           string     `json:"id"`
+	UserID       string     `json:"userId"`
+	CreatedAt    time.Time  `json:"createdAt"`
+	LastActiveAt time.Time  `json:"lastActiveAt"`
+	ExpiresAt    *time.Time `json:"expiresAt,omitempty"`
+}
+
+// User returns the user who owns this session.
+func (s *Session) User(ctx context.Context) (*User, error) {
+	if ul := s.GetUserLookup(); ul != nil {
+		return ul.GetUserByID(ctx, s.UserID)
+	}
+
+	return nil, fmt.Errorf("user lookup not available")
+}
--- a/internal/models/user.go
+++ b/internal/models/user.go
@@ -0,0 +1,92 @@
+package models
+
+import (
+	"context"
+	"time"
+)
+
+// User represents a registered user account.
+type User struct {
+	Base
+
+	ID           string     `json:"id"`
+	Nick         string     `json:"nick"`
+	PasswordHash string     `json:"-"`
+	CreatedAt    time.Time  `json:"createdAt"`
+	UpdatedAt    time.Time  `json:"updatedAt"`
+	LastSeenAt   *time.Time `json:"lastSeenAt,omitempty"`
+}
+
+// Channels returns all channels the user is a member of.
+func (u *User) Channels(ctx context.Context) ([]*Channel, error) {
+	rows, err := u.GetDB().QueryContext(ctx, `
+		SELECT c.id, c.name, c.topic, c.modes, c.created_at, c.updated_at
+		FROM channels c
+		JOIN channel_members cm ON cm.channel_id = c.id
+		WHERE cm.user_id = ?
+		ORDER BY c.name`,
+		u.ID,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	defer func() { _ = rows.Close() }()
+
+	channels := []*Channel{}
+
+	for rows.Next() {
+		c := &Channel{}
+		c.SetDB(u.db)
+
+		err = rows.Scan(
+			&c.ID, &c.Name, &c.Topic, &c.Modes,
+			&c.CreatedAt, &c.UpdatedAt,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		channels = append(channels, c)
+	}
+
+	return channels, rows.Err()
+}
+
+// QueuedMessages returns undelivered messages for this user.
+func (u *User) QueuedMessages(ctx context.Context) ([]*Message, error) {
+	rows, err := u.GetDB().QueryContext(ctx, `
+		SELECT m.id, m.ts, m.from_user_id, m.from_nick,
+		       m.target, m.type, m.body, m.meta, m.created_at
+		FROM messages m
+		JOIN message_queue mq ON mq.message_id = m.id
+		WHERE mq.user_id = ?
+		ORDER BY mq.queued_at ASC`,
+		u.ID,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	defer func() { _ = rows.Close() }()
+
+	messages := []*Message{}
+
+	for rows.Next() {
+		msg := &Message{}
+		msg.SetDB(u.db)
+
+		err = rows.Scan(
+			&msg.ID, &msg.Timestamp, &msg.FromUserID,
+			&msg.FromNick, &msg.Target, &msg.Type,
+			&msg.Body, &msg.Meta, &msg.CreatedAt,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		messages = append(messages, msg)
+	}
+
+	return messages, rows.Err()
+}
--- a/internal/server/http.go
+++ b/internal/server/http.go
@@ -4,6 +4,6 @@ import "time"

 const (
 	httpReadTimeout  = 10 * time.Second
-	httpWriteTimeout = 60 * time.Second
+	httpWriteTimeout = 10 * time.Second
 	maxHeaderBytes   = 1 << 20
 )
--- a/internal/server/routes.go
+++ b/internal/server/routes.go
@@ -1,12 +1,9 @@
 package server

 import (
-	"io/fs"
 	"net/http"
 	"time"

-	"git.eeqj.de/sneak/chat/web"
-
 	sentryhttp "github.com/getsentry/sentry-go/http"
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
@@ -16,145 +13,36 @@ import (

 const routeTimeout = 60 * time.Second

-// SetupRoutes configures the HTTP routes and middleware.
-func (srv *Server) SetupRoutes() {
-	srv.router = chi.NewRouter()
+// SetupRoutes configures the HTTP routes and middleware chain.
+func (s *Server) SetupRoutes() {
+	s.router = chi.NewRouter()

-	srv.router.Use(middleware.Recoverer)
-	srv.router.Use(middleware.RequestID)
-	srv.router.Use(srv.mw.Logging())
+	s.router.Use(middleware.Recoverer)
+	s.router.Use(middleware.RequestID)
+	s.router.Use(s.mw.Logging())

 	if viper.GetString("METRICS_USERNAME") != "" {
-		srv.router.Use(srv.mw.Metrics())
+		s.router.Use(s.mw.Metrics())
 	}

-	srv.router.Use(srv.mw.CORS())
-	srv.router.Use(middleware.Timeout(routeTimeout))
+	s.router.Use(s.mw.CORS())
+	s.router.Use(middleware.Timeout(routeTimeout))

-	if srv.sentryEnabled {
-		sentryHandler := sentryhttp.New(
-			sentryhttp.Options{ //nolint:exhaustruct // optional fields
-				Repanic: true,
-			},
-		)
-
-		srv.router.Use(sentryHandler.Handle)
+	if s.sentryEnabled {
+		sentryHandler := sentryhttp.New(sentryhttp.Options{
+			Repanic: true,
+		})
+		s.router.Use(sentryHandler.Handle)
 	}

-	// Health check.
-	srv.router.Get(
-		"/.well-known/healthcheck.json",
-		srv.handlers.HandleHealthCheck(),
-	)
+	// Health check
+	s.router.Get("/.well-known/healthcheck.json", s.h.HandleHealthCheck())

-	// Protected metrics endpoint.
+	// Protected metrics endpoint
 	if viper.GetString("METRICS_USERNAME") != "" {
-		srv.router.Group(func(router chi.Router) {
-			router.Use(srv.mw.MetricsAuth())
-			router.Get("/metrics",
-				http.HandlerFunc(
-					promhttp.Handler().ServeHTTP,
-				))
+		s.router.Group(func(r chi.Router) {
+			r.Use(s.mw.MetricsAuth())
+			r.Get("/metrics", http.HandlerFunc(promhttp.Handler().ServeHTTP))
 		})
 	}
-
-	// API v1.
-	srv.router.Route("/api/v1", srv.setupAPIv1)
-
-	// Serve embedded SPA.
-	srv.setupSPA()
-}
-
-func (srv *Server) setupAPIv1(router chi.Router) {
-	router.Get(
-		"/server",
-		srv.handlers.HandleServerInfo(),
-	)
-	router.Post(
-		"/session",
-		srv.handlers.HandleCreateSession(),
-	)
-	router.Get(
-		"/state",
-		srv.handlers.HandleState(),
-	)
-	router.Post(
-		"/logout",
-		srv.handlers.HandleLogout(),
-	)
-	router.Get(
-		"/users/me",
-		srv.handlers.HandleUsersMe(),
-	)
-	router.Get(
-		"/messages",
-		srv.handlers.HandleGetMessages(),
-	)
-	router.Post(
-		"/messages",
-		srv.handlers.HandleSendCommand(),
-	)
-	router.Get(
-		"/history",
-		srv.handlers.HandleGetHistory(),
-	)
-	router.Get(
-		"/channels",
-		srv.handlers.HandleListAllChannels(),
-	)
-	router.Get(
-		"/channels/{channel}/members",
-		srv.handlers.HandleChannelMembers(),
-	)
-}
-
-func (srv *Server) setupSPA() {
-	distFS, err := fs.Sub(web.Dist, "dist")
-	if err != nil {
-		srv.log.Error(
-			"failed to get web dist filesystem",
-			"error", err,
-		)
-
-		return
-	}
-
-	fileServer := http.FileServer(http.FS(distFS))
-
-	srv.router.Get("/*", func(
-		writer http.ResponseWriter,
-		request *http.Request,
-	) {
-		readFS, ok := distFS.(fs.ReadFileFS)
-		if !ok {
-			fileServer.ServeHTTP(writer, request)
-
-			return
-		}
-
-		fileData, readErr := readFS.ReadFile(
-			request.URL.Path[1:],
-		)
-		if readErr != nil || len(fileData) == 0 {
-			indexHTML, indexErr := readFS.ReadFile(
-				"index.html",
-			)
-			if indexErr != nil {
-				http.NotFound(writer, request)
-
-				return
-			}
-
-			writer.Header().Set(
-				"Content-Type",
-				"text/html; charset=utf-8",
-			)
-			writer.WriteHeader(http.StatusOK)
-			_, _ = writer.Write(indexHTML)
-
-			return
-		}
-
-		fileServer.ServeHTTP(writer, request)
-	})
 }
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -41,8 +41,7 @@ type Params struct {
 	Handlers   *handlers.Handlers
 }

-// Server is the main HTTP server.
-// It manages routing, middleware, and lifecycle.
+// Server is the main HTTP server. It manages routing, middleware, and lifecycle.
 type Server struct {
 	startupTime   time.Time
 	exitCode      int
@@ -54,24 +53,21 @@ type Server struct {
 	router        *chi.Mux
 	params        Params
 	mw            *middleware.Middleware
-	handlers      *handlers.Handlers
+	h             *handlers.Handlers
 }

 // New creates a new Server and registers its lifecycle hooks.
-func New(
-	lifecycle fx.Lifecycle, params Params,
-) (*Server, error) {
-	srv := &Server{ //nolint:exhaustruct // fields set during lifecycle
-		params:   params,
-		mw:       params.Middleware,
-		handlers: params.Handlers,
-		log:      params.Logger.Get(),
-	}
+func New(lc fx.Lifecycle, params Params) (*Server, error) {
+	s := new(Server)
+	s.params = params
+	s.mw = params.Middleware
+	s.h = params.Handlers
+	s.log = params.Logger.Get()

-	lifecycle.Append(fx.Hook{
+	lc.Append(fx.Hook{
 		OnStart: func(_ context.Context) error {
-			srv.startupTime = time.Now()
-			go srv.Run() //nolint:contextcheck
+			s.startupTime = time.Now()
+			go s.Run() //nolint:contextcheck

 			return nil
 		},
@@ -80,140 +76,120 @@ func New(
 		},
 	})

-	return srv, nil
+	return s, nil
 }

 // Run starts the server configuration, Sentry, and begins serving.
-func (srv *Server) Run() {
-	srv.configure()
-	srv.enableSentry()
-	srv.serve()
+func (s *Server) Run() {
+	s.configure()
+	s.enableSentry()
+	s.serve()
 }

 // ServeHTTP delegates to the chi router.
-func (srv *Server) ServeHTTP(
-	writer http.ResponseWriter,
-	request *http.Request,
-) {
-	srv.router.ServeHTTP(writer, request)
+func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	s.router.ServeHTTP(w, r)
 }

 // MaintenanceMode reports whether the server is in maintenance mode.
-func (srv *Server) MaintenanceMode() bool {
-	return srv.params.Config.MaintenanceMode
+func (s *Server) MaintenanceMode() bool {
+	return s.params.Config.MaintenanceMode
 }

-func (srv *Server) enableSentry() {
-	srv.sentryEnabled = false
+func (s *Server) enableSentry() {
+	s.sentryEnabled = false

-	if srv.params.Config.SentryDSN == "" {
+	if s.params.Config.SentryDSN == "" {
 		return
 	}

-	err := sentry.Init(sentry.ClientOptions{ //nolint:exhaustruct // only essential fields
-		Dsn: srv.params.Config.SentryDSN,
-		Release: fmt.Sprintf(
-			"%s-%s",
-			srv.params.Globals.Appname,
-			srv.params.Globals.Version,
-		),
+	err := sentry.Init(sentry.ClientOptions{
+		Dsn:     s.params.Config.SentryDSN,
+		Release: fmt.Sprintf("%s-%s", s.params.Globals.Appname, s.params.Globals.Version),
 	})
 	if err != nil {
-		srv.log.Error("sentry init failure", "error", err)
+		s.log.Error("sentry init failure", "error", err)
 		os.Exit(1)
 	}

-	srv.log.Info("sentry error reporting activated")
-	srv.sentryEnabled = true
+	s.log.Info("sentry error reporting activated")
+	s.sentryEnabled = true
 }

-func (srv *Server) serve() int {
-	srv.ctx, srv.cancelFunc = context.WithCancel(
-		context.Background(),
-	)
+func (s *Server) serve() int {
+	s.ctx, s.cancelFunc = context.WithCancel(context.Background())

 	go func() {
-		sigCh := make(chan os.Signal, 1)
+		c := make(chan os.Signal, 1)

 		signal.Ignore(syscall.SIGPIPE)
-		signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
+		signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+		sig := <-c
+		s.log.Info("signal received", "signal", sig)

-		sig := <-sigCh
-
-		srv.log.Info("signal received", "signal", sig)
-
-		if srv.cancelFunc != nil {
-			srv.cancelFunc()
+		if s.cancelFunc != nil {
+			s.cancelFunc()
 		}
 	}()

-	go srv.serveUntilShutdown()
+	go s.serveUntilShutdown()

-	<-srv.ctx.Done()
+	<-s.ctx.Done()

-	srv.cleanShutdown()
+	s.cleanShutdown()

-	return srv.exitCode
+	return s.exitCode
 }

-func (srv *Server) cleanupForExit() {
-	srv.log.Info("cleaning up")
+func (s *Server) cleanupForExit() {
+	s.log.Info("cleaning up")
 }

-func (srv *Server) cleanShutdown() {
-	srv.exitCode = 0
+func (s *Server) cleanShutdown() {
+	s.exitCode = 0

-	ctxShutdown, shutdownCancel := context.WithTimeout(
-		context.Background(), shutdownTimeout,
-	)
+	ctxShutdown, shutdownCancel := context.WithTimeout(context.Background(), shutdownTimeout)

-	err := srv.httpServer.Shutdown(ctxShutdown)
+	err := s.httpServer.Shutdown(ctxShutdown)
 	if err != nil {
-		srv.log.Error(
-			"server clean shutdown failed", "error", err,
-		)
+		s.log.Error("server clean shutdown failed", "error", err)
 	}

 	if shutdownCancel != nil {
 		shutdownCancel()
 	}

-	srv.cleanupForExit()
+	s.cleanupForExit()

-	if srv.sentryEnabled {
+	if s.sentryEnabled {
 		sentry.Flush(sentryFlushTime)
 	}
 }

-func (srv *Server) configure() {
-	// Server configuration placeholder.
+func (s *Server) configure() {
+	// server configuration placeholder
 }

-func (srv *Server) serveUntilShutdown() {
-	listenAddr := fmt.Sprintf(
-		":%d", srv.params.Config.Port,
-	)
-
-	srv.httpServer = &http.Server{ //nolint:exhaustruct // optional fields
+func (s *Server) serveUntilShutdown() {
+	listenAddr := fmt.Sprintf(":%d", s.params.Config.Port)
+	s.httpServer = &http.Server{
 		Addr:           listenAddr,
 		ReadTimeout:    httpReadTimeout,
 		WriteTimeout:   httpWriteTimeout,
 		MaxHeaderBytes: maxHeaderBytes,
-		Handler:        srv,
+		Handler:        s,
 	}

-	srv.SetupRoutes()
+	s.SetupRoutes()

-	srv.log.Info(
-		"http begin listen", "listenaddr", listenAddr,
-	)
+	s.log.Info("http begin listen", "listenaddr", listenAddr)

-	err := srv.httpServer.ListenAndServe()
+	err := s.httpServer.ListenAndServe()
 	if err != nil && !errors.Is(err, http.ErrServerClosed) {
-		srv.log.Error("listen error", "error", err)
+		s.log.Error("listen error", "error", err)

-		if srv.cancelFunc != nil {
-			srv.cancelFunc()
+		if s.cancelFunc != nil {
+			s.cancelFunc()
 		}
 	}
 }
--- a/schema/README.md
+++ b/schema/README.md
@@ -1,97 +0,0 @@
-# Message Schemas
-
-JSON Schema definitions (draft 2020-12) for the chat protocol. Messages use
-**IRC command names and numeric reply codes** (RFC 1459/2812) encoded as JSON
-over HTTP.
-
-## Envelope
-
-Every message is a JSON object with a `command` field. The format maps directly
-to IRC wire format:
-
-```
-IRC:  :nick PRIVMSG #channel :hello world
-JSON: {"command": "PRIVMSG", "from": "nick", "to": "#channel", "body": ["hello world"]}
-
-IRC:  :server 353 nick = #channel :user1 @op1 +voice1
-JSON: {"command": "353", "to": "nick", "params": ["=", "#channel"], "body": ["user1 @op1 +voice1"]}
-
-Multiline:  {"command": "PRIVMSG", "to": "#ch", "body": ["line 1", "line 2"]}
-Structured: {"command": "PUBKEY", "body": {"alg": "ed25519", "key": "base64..."}}
-```
-
-Common fields (see `message.json` for full schema):
-
-| Field     | Type           | Description                                          |
-|-----------|----------------|------------------------------------------------------|
-| `id`      | string (uuid)  | Server-assigned message UUID                         |
-| `command` | string         | IRC command or 3-digit numeric code                  |
-| `from`    | string         | Source nick or server name (IRC prefix)              |
-| `to`      | string         | Target: #channel or nick                             |
-| `params`  | string[]       | Middle parameters (mainly for numerics)              |
-| `body`    | array \| object | Structured body — never a raw string (see below)    |
-| `ts`      | string         | ISO 8601 timestamp (server-assigned, not in raw IRC) |
-| `meta`    | object         | Extensible metadata (signatures, hashes, etc.)       |
-
-**Structured bodies:** `body` is always an array of strings (for text) or an
-object (for structured data like PUBKEY). Never a raw string. This enables:
- Multiline messages without escape sequences
- Deterministic canonicalization via RFC 8785 JCS for signing
- Structured data where needed
-
-## Commands
-
-IRC commands used for client↔server and server↔server communication.
-
-| Command   | File                      | RFC       | Description                    |
-|-----------|---------------------------|-----------|--------------------------------|
-| `PRIVMSG` | `commands/PRIVMSG.json`  | 1459 §4.4.1 | Message to channel or user  |
-| `NOTICE`  | `commands/NOTICE.json`   | 1459 §4.4.2 | Notice (no auto-reply)      |
-| `JOIN`    | `commands/JOIN.json`     | 1459 §4.2.1 | Join a channel              |
-| `PART`    | `commands/PART.json`     | 1459 §4.2.2 | Leave a channel             |
-| `QUIT`    | `commands/QUIT.json`     | 1459 §4.1.6 | User disconnected           |
-| `NICK`    | `commands/NICK.json`     | 1459 §4.1.2 | Change nickname             |
-| `TOPIC`   | `commands/TOPIC.json`    | 1459 §4.2.4 | Get/set channel topic       |
-| `MODE`    | `commands/MODE.json`     | 1459 §4.2.3 | Set channel/user modes      |
-| `KICK`    | `commands/KICK.json`     | 1459 §4.2.8 | Kick user from channel      |
-| `PING`    | `commands/PING.json`     | 1459 §4.6.2 | Keepalive                   |
-| `PONG`    | `commands/PONG.json`     | 1459 §4.6.3 | Keepalive response          |
-| `PUBKEY`  | `commands/PUBKEY.json`   | (extension)  | Announce/relay signing key  |
-
-## Numeric Replies
-
-Three-digit codes for server responses, per IRC convention.
-
-### Success / Informational (0xx–3xx)
-
-| Code  | Name              | File                  | Description                    |
-|-------|-------------------|-----------------------|--------------------------------|
-| `001` | RPL_WELCOME       | `numerics/001.json`  | Welcome after session creation     |
-| `002` | RPL_YOURHOST      | `numerics/002.json`  | Server host info               |
-| `003` | RPL_CREATED       | `numerics/003.json`  | Server creation date           |
-| `004` | RPL_MYINFO        | `numerics/004.json`  | Server info and modes          |
-| `322` | RPL_LIST          | `numerics/322.json`  | Channel list entry             |
-| `323` | RPL_LISTEND       | `numerics/323.json`  | End of channel list            |
-| `332` | RPL_TOPIC         | `numerics/332.json`  | Channel topic                  |
-| `353` | RPL_NAMREPLY      | `numerics/353.json`  | Channel member list            |
-| `366` | RPL_ENDOFNAMES    | `numerics/366.json`  | End of NAMES list              |
-| `372` | RPL_MOTD          | `numerics/372.json`  | MOTD line                      |
-| `375` | RPL_MOTDSTART     | `numerics/375.json`  | Start of MOTD                  |
-| `376` | RPL_ENDOFMOTD     | `numerics/376.json`  | End of MOTD                    |
-
-### Errors (4xx)
-
-| Code  | Name                 | File                  | Description                    |
-|-------|----------------------|-----------------------|--------------------------------|
-| `401` | ERR_NOSUCHNICK       | `numerics/401.json`  | No such nick/channel           |
-| `403` | ERR_NOSUCHCHANNEL    | `numerics/403.json`  | No such channel                |
-| `433` | ERR_NICKNAMEINUSE    | `numerics/433.json`  | Nickname already in use        |
-| `442` | ERR_NOTONCHANNEL     | `numerics/442.json`  | Not on that channel            |
-| `482` | ERR_CHANOPRIVSNEEDED | `numerics/482.json`  | Not channel operator           |
-
-## Federation (S2S)
-
-Server-to-server messages use the same command format. Federated servers relay
-messages with an additional `origin` field in `meta` to track the source server.
-The PING/PONG commands serve as inter-server keepalives. State sync after link
-establishment uses a burst of JOIN, NICK, TOPIC, and MODE commands.
--- a/schema/commands/JOIN.json
+++ b/schema/commands/JOIN.json
@@ -1,16 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/JOIN.json",
-  "title": "JOIN",
-  "description": "Join a channel. C2S: request to join. S2C: notification that a user joined. RFC 1459 §4.2.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "JOIN" },
-    "from": { "type": "string", "description": "Nick that joined (S2C)." },
-    "to": { "type": "string", "description": "Channel name.", "pattern": "^#[a-zA-Z0-9_-]+$" }
-  },
-  "required": ["command", "to"],
-  "examples": [
-    { "command": "JOIN", "from": "alice", "to": "#general" }
-  ]
-}
--- a/schema/commands/KICK.json
+++ b/schema/commands/KICK.json
@@ -1,29 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/KICK.json",
-  "title": "KICK",
-  "description": "Kick a user from a channel. RFC 1459 §4.2.8.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "KICK" },
-    "from": { "type": "string", "description": "Nick that performed the kick." },
-    "to": { "type": "string", "description": "Channel name.", "pattern": "^#[a-zA-Z0-9_-]+$" },
-    "params": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "Kicked nick. e.g. [\"alice\"].",
-      "minItems": 1,
-      "maxItems": 1
-    },
-    "body": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "Optional kick reason.",
-      "maxItems": 1
-    }
-  },
-  "required": ["command", "to", "params"],
-  "examples": [
-    { "command": "KICK", "from": "op1", "to": "#general", "params": ["troll"], "body": ["Behave"] }
-  ]
-}
--- a/schema/commands/MODE.json
+++ b/schema/commands/MODE.json
@@ -1,29 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/MODE.json",
-  "title": "MODE",
-  "description": "Set or query channel/user modes. RFC 1459 §4.2.3.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "MODE" },
-    "from": {
-      "type": "string",
-      "description": "Nick that set the mode (S2C only)."
-    },
-    "to": {
-      "type": "string",
-      "description": "Channel name.",
-      "pattern": "^#[a-zA-Z0-9_-]+$"
-    },
-    "params": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "Mode string and optional target nick. e.g. [\"+o\", \"alice\"].",
-      "examples": [["+o", "alice"], ["-m"], ["+v", "bob"]]
-    }
-  },
-  "required": ["command", "to", "params"],
-  "examples": [
-    { "command": "MODE", "from": "op1", "to": "#general", "params": ["+o", "alice"] }
-  ]
-}
--- a/schema/commands/NICK.json
+++ b/schema/commands/NICK.json
@@ -1,22 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/NICK.json",
-  "title": "NICK",
-  "description": "Change nickname. C2S: request new nick. S2C: notification of nick change. RFC 1459 §4.1.2.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "NICK" },
-    "from": { "type": "string", "description": "Old nick (S2C)." },
-    "body": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "New nick (single-element array).",
-      "minItems": 1,
-      "maxItems": 1
-    }
-  },
-  "required": ["command", "body"],
-  "examples": [
-    { "command": "NICK", "from": "oldnick", "body": ["newnick"] }
-  ]
-}
--- a/schema/commands/NOTICE.json
+++ b/schema/commands/NOTICE.json
@@ -1,21 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/NOTICE.json",
-  "title": "NOTICE",
-  "description": "Send a notice. Like PRIVMSG but must not trigger automatic replies. RFC 1459 §4.4.2.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "NOTICE" },
-    "from": { "type": "string" },
-    "to": { "type": "string", "description": "Target: #channel, nick, or * (global)." },
-    "body": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "Notice text lines."
-    }
-  },
-  "required": ["command", "to", "body"],
-  "examples": [
-    { "command": "NOTICE", "from": "server.example.com", "to": "*", "body": ["Server restarting in 5 minutes"] }
-  ]
-}
--- a/schema/commands/PART.json
+++ b/schema/commands/PART.json
@@ -1,22 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/PART.json",
-  "title": "PART",
-  "description": "Leave a channel. C2S: request to leave. S2C: notification that a user left. RFC 1459 §4.2.2.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "PART" },
-    "from": { "type": "string", "description": "Nick that left (S2C)." },
-    "to": { "type": "string", "description": "Channel name.", "pattern": "^#[a-zA-Z0-9_-]+$" },
-    "body": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "Optional part reason.",
-      "maxItems": 1
-    }
-  },
-  "required": ["command", "to"],
-  "examples": [
-    { "command": "PART", "from": "alice", "to": "#general", "body": ["later"] }
-  ]
-}
--- a/schema/commands/PING.json
+++ b/schema/commands/PING.json
@@ -1,20 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/PING.json",
-  "title": "PING",
-  "description": "Keepalive. C2S or S2S. Server responds with PONG. RFC 1459 §4.6.2.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "PING" },
-    "body": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "Opaque token to be echoed in PONG (single-element array).",
-      "maxItems": 1
-    }
-  },
-  "required": ["command"],
-  "examples": [
-    { "command": "PING", "body": ["1707580000"] }
-  ]
-}
--- a/schema/commands/PONG.json
+++ b/schema/commands/PONG.json
@@ -1,21 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/PONG.json",
-  "title": "PONG",
-  "description": "Keepalive response. S2C or S2S. RFC 1459 §4.6.3.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "PONG" },
-    "from": { "type": "string", "description": "Responding server name." },
-    "body": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "Echoed token from PING (single-element array).",
-      "maxItems": 1
-    }
-  },
-  "required": ["command"],
-  "examples": [
-    { "command": "PONG", "from": "server.example.com", "body": ["1707580000"] }
-  ]
-}
--- a/schema/commands/PRIVMSG.json
+++ b/schema/commands/PRIVMSG.json
@@ -1,24 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/PRIVMSG.json",
-  "title": "PRIVMSG",
-  "description": "Send a message to a channel or user. C2S: client sends to server. S2C: server relays to recipients. RFC 1459 §4.4.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "PRIVMSG" },
-    "from": { "type": "string", "description": "Sender nick (set by server on relay)." },
-    "to": { "type": "string", "description": "Target: #channel or nick.", "examples": ["#general", "alice"] },
-    "body": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "Message lines. One string per line.",
-      "minItems": 1
-    }
-  },
-  "required": ["command", "to", "body"],
-  "examples": [
-    { "command": "PRIVMSG", "from": "bob", "to": "#general", "body": ["hello world"] },
-    { "command": "PRIVMSG", "from": "bob", "to": "#general", "body": ["line one", "line two"] },
-    { "command": "PRIVMSG", "from": "bob", "to": "alice", "body": ["hey"], "meta": { "sig": "base64...", "alg": "ed25519" } }
-  ]
-}
--- a/schema/commands/PUBKEY.json
+++ b/schema/commands/PUBKEY.json
@@ -1,37 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/PUBKEY.json",
-  "title": "PUBKEY",
-  "description": "Announce or relay a user's public signing key. C2S: client announces key to channel or server. S2C: server relays to channel members. Protocol extension (not in RFC 1459). Body is a structured object (not an array) containing the key material.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "PUBKEY" },
-    "from": { "type": "string", "description": "Nick announcing the key (set by server on relay)." },
-    "to": {
-      "type": "string",
-      "description": "Target: #channel to announce to channel members, or omit for server-wide announcement."
-    },
-    "body": {
-      "type": "object",
-      "description": "Key material.",
-      "properties": {
-        "alg": {
-          "type": "string",
-          "description": "Key algorithm.",
-          "enum": ["ed25519"]
-        },
-        "key": {
-          "type": "string",
-          "description": "Base64-encoded public key."
-        }
-      },
-      "required": ["alg", "key"],
-      "additionalProperties": false
-    }
-  },
-  "required": ["command", "body"],
-  "examples": [
-    { "command": "PUBKEY", "from": "alice", "body": { "alg": "ed25519", "key": "base64-encoded-pubkey" } },
-    { "command": "PUBKEY", "from": "alice", "to": "#general", "body": { "alg": "ed25519", "key": "base64-encoded-pubkey" } }
-  ]
-}
--- a/schema/commands/QUIT.json
+++ b/schema/commands/QUIT.json
@@ -1,21 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/QUIT.json",
-  "title": "QUIT",
-  "description": "User disconnected. S2C only. RFC 1459 §4.1.6.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "QUIT" },
-    "from": { "type": "string", "description": "Nick that quit." },
-    "body": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "Optional quit reason.",
-      "maxItems": 1
-    }
-  },
-  "required": ["command", "from"],
-  "examples": [
-    { "command": "QUIT", "from": "alice", "body": ["Connection reset"] }
-  ]
-}
--- a/schema/commands/TOPIC.json
+++ b/schema/commands/TOPIC.json
@@ -1,22 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/commands/TOPIC.json",
-  "title": "TOPIC",
-  "description": "Get or set channel topic. C2S: set topic (body present) or query (body absent). S2C: topic change notification. RFC 1459 §4.2.4.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": { "const": "TOPIC" },
-    "from": { "type": "string", "description": "Nick that changed the topic (S2C)." },
-    "to": { "type": "string", "description": "Channel name.", "pattern": "^#[a-zA-Z0-9_-]+$" },
-    "body": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "New topic text (single-element array). Empty array clears the topic.",
-      "maxItems": 1
-    }
-  },
-  "required": ["command", "to"],
-  "examples": [
-    { "command": "TOPIC", "from": "alice", "to": "#general", "body": ["Welcome to the chat"] }
-  ]
-}
--- a/schema/message.json
+++ b/schema/message.json
@@ -1,72 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/message.json",
-  "title": "IRC Message Envelope",
-  "description": "Base envelope for all messages. Mirrors IRC wire format (RFC 1459/2812) encoded as JSON over HTTP. The 'command' field carries either an IRC command name (PRIVMSG, JOIN, etc.) or a three-digit numeric reply code (001, 353, 433, etc.).",
-  "type": "object",
-  "properties": {
-    "id": {
-      "type": "string",
-      "format": "uuid",
-      "description": "Server-assigned message UUID. Present on all server-originated messages."
-    },
-    "command": {
-      "type": "string",
-      "description": "IRC command name (PRIVMSG, JOIN, NICK, etc.) or three-digit numeric reply code (001, 353, 433, etc.).",
-      "examples": ["PRIVMSG", "JOIN", "001", "353", "433"]
-    },
-    "from": {
-      "type": "string",
-      "description": "Source — nick for user messages, server name for server messages. Equivalent to IRC prefix."
-    },
-    "to": {
-      "type": "string",
-      "description": "Target — channel (#name) or nick. Equivalent to first IRC parameter for most commands."
-    },
-    "params": {
-      "type": "array",
-      "items": { "type": "string" },
-      "description": "Additional parameters (used primarily by numeric replies). Equivalent to IRC middle parameters."
-    },
-    "body": {
-      "oneOf": [
-        {
-          "type": "array",
-          "items": { "type": "string" },
-          "description": "Array of strings (one per line for text messages)."
-        },
-        {
-          "type": "object",
-          "description": "Structured data (e.g. PUBKEY key material).",
-          "additionalProperties": true
-        }
-      ],
-      "description": "Message body. MUST be an array or object, never a raw string. Arrays represent lines of text; objects carry structured data. This enables deterministic canonicalization (RFC 8785 JCS) for signing."
-    },
-    "ts": {
-      "type": "string",
-      "format": "date-time",
-      "description": "Server-assigned timestamp (ISO 8601). Not present in original IRC; added for HTTP transport."
-    },
-    "meta": {
-      "type": "object",
-      "description": "Extensible metadata. Used for signatures (meta.sig, meta.alg), hashes (meta.hash), and client extensions.",
-      "properties": {
-        "sig": {
-          "type": "string",
-          "description": "Base64-encoded cryptographic signature over the canonical message form."
-        },
-        "alg": {
-          "type": "string",
-          "description": "Signature algorithm (e.g. 'ed25519')."
-        },
-        "hash": {
-          "type": "string",
-          "description": "Hash of the canonical message form (e.g. 'sha256:base64...')."
-        }
-      },
-      "additionalProperties": true
-    }
-  },
-  "required": ["command"]
-}
--- a/schema/numerics/001.json
+++ b/schema/numerics/001.json
@@ -1,37 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/001.json",
-  "title": "001 RPL_WELCOME",
-  "description": "Welcome message sent after successful session creation. RFC 2812 \u00a75.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "001"
-    },
-    "to": {
-      "type": "string",
-      "description": "Target nick."
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "Welcome text lines."
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "001",
-      "to": "alice",
-      "body": [
-        "Welcome to the network, alice"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/002.json
+++ b/schema/numerics/002.json
@@ -1,36 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/002.json",
-  "title": "002 RPL_YOURHOST",
-  "description": "Server host info sent after session creation. RFC 2812 \u00a75.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "002"
-    },
-    "to": {
-      "type": "string"
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "Host info lines."
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "002",
-      "to": "alice",
-      "body": [
-        "Your host is chat.example.com, running version 0.1.0"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/003.json
+++ b/schema/numerics/003.json
@@ -1,36 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/003.json",
-  "title": "003 RPL_CREATED",
-  "description": "Server creation date. RFC 2812 \u00a75.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "003"
-    },
-    "to": {
-      "type": "string"
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "Text lines."
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "003",
-      "to": "alice",
-      "body": [
-        "This server was created 2026-02-01"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/004.json
+++ b/schema/numerics/004.json
@@ -1,39 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/004.json",
-  "title": "004 RPL_MYINFO",
-  "description": "Server info (name, version, available modes). RFC 2812 \u00a75.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "004"
-    },
-    "to": {
-      "type": "string"
-    },
-    "params": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "[server_name, version, user_modes, channel_modes]."
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "params"
-  ],
-  "examples": [
-    {
-      "command": "004",
-      "to": "alice",
-      "params": [
-        "chat.example.com",
-        "0.1.0",
-        "o",
-        "imnst+ov"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/322.json
+++ b/schema/numerics/322.json
@@ -1,47 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/322.json",
-  "title": "322 RPL_LIST",
-  "description": "Channel list entry. One per channel in response to LIST. RFC 1459 \u00a76.2.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "322"
-    },
-    "to": {
-      "type": "string"
-    },
-    "params": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "[channel, visible_count]."
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "Channel topic."
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "params"
-  ],
-  "examples": [
-    {
-      "command": "322",
-      "to": "alice",
-      "params": [
-        "#general",
-        "12"
-      ],
-      "body": [
-        "General discussion"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/323.json
+++ b/schema/numerics/323.json
@@ -1,27 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/323.json",
-  "title": "323 RPL_LISTEND",
-  "description": "End of channel list. RFC 1459 \u00a76.2.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "323"
-    },
-    "to": {
-      "type": "string"
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "End of /LIST",
-      "maxItems": 1
-    }
-  },
-  "required": [
-    "command",
-    "to"
-  ]
-}
--- a/schema/numerics/332.json
+++ b/schema/numerics/332.json
@@ -1,47 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/332.json",
-  "title": "332 RPL_TOPIC",
-  "description": "Channel topic (sent on JOIN or TOPIC query). RFC 1459 \u00a76.2.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "332"
-    },
-    "to": {
-      "type": "string"
-    },
-    "params": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "[channel]."
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "Topic text."
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "params",
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "332",
-      "to": "alice",
-      "params": [
-        "#general"
-      ],
-      "body": [
-        "Welcome to the chat"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/353.json
+++ b/schema/numerics/353.json
@@ -1,48 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/353.json",
-  "title": "353 RPL_NAMREPLY",
-  "description": "Channel member list. Sent on JOIN or NAMES query. RFC 1459 \u00a76.2.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "353"
-    },
-    "to": {
-      "type": "string"
-    },
-    "params": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "[channel_type, channel]. channel_type: = (public), * (private), @ (secret)."
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "Space-separated list of nicks. Prefixed with @ for ops, + for voiced."
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "params",
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "353",
-      "to": "alice",
-      "params": [
-        "=",
-        "#general"
-      ],
-      "body": [
-        "@op1 alice bob +voiced1"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/366.json
+++ b/schema/numerics/366.json
@@ -1,35 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/366.json",
-  "title": "366 RPL_ENDOFNAMES",
-  "description": "End of NAMES list. RFC 1459 \u00a76.2.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "366"
-    },
-    "to": {
-      "type": "string"
-    },
-    "params": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "[channel]."
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "End of /NAMES list",
-      "maxItems": 1
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "params"
-  ]
-}
--- a/schema/numerics/372.json
+++ b/schema/numerics/372.json
@@ -1,36 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/372.json",
-  "title": "372 RPL_MOTD",
-  "description": "MOTD line. One message per line of the MOTD. RFC 2812 \u00a75.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "372"
-    },
-    "to": {
-      "type": "string"
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "MOTD line text (prefixed with '- ')."
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "body"
-  ],
-  "examples": [
-    {
-      "command": "372",
-      "to": "alice",
-      "body": [
-        "- Welcome to our server!"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/375.json
+++ b/schema/numerics/375.json
@@ -1,26 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/375.json",
-  "title": "375 RPL_MOTDSTART",
-  "description": "Start of MOTD. RFC 2812 \u00a75.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "375"
-    },
-    "to": {
-      "type": "string"
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "Text lines."
-    }
-  },
-  "required": [
-    "command",
-    "to"
-  ]
-}
--- a/schema/numerics/376.json
+++ b/schema/numerics/376.json
@@ -1,27 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/376.json",
-  "title": "376 RPL_ENDOFMOTD",
-  "description": "End of MOTD. RFC 2812 \u00a75.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "376"
-    },
-    "to": {
-      "type": "string"
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "End of /MOTD command",
-      "maxItems": 1
-    }
-  },
-  "required": [
-    "command",
-    "to"
-  ]
-}
--- a/schema/numerics/401.json
+++ b/schema/numerics/401.json
@@ -1,47 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/401.json",
-  "title": "401 ERR_NOSUCHNICK",
-  "description": "No such nick/channel. RFC 1459 \u00a76.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "401"
-    },
-    "to": {
-      "type": "string"
-    },
-    "params": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "[target_nick]."
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "No such nick/channel",
-      "maxItems": 1
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "params"
-  ],
-  "examples": [
-    {
-      "command": "401",
-      "to": "alice",
-      "params": [
-        "bob"
-      ],
-      "body": [
-        "No such nick/channel"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/403.json
+++ b/schema/numerics/403.json
@@ -1,47 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/403.json",
-  "title": "403 ERR_NOSUCHCHANNEL",
-  "description": "No such channel. RFC 1459 \u00a76.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "403"
-    },
-    "to": {
-      "type": "string"
-    },
-    "params": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "[channel_name]."
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "No such channel",
-      "maxItems": 1
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "params"
-  ],
-  "examples": [
-    {
-      "command": "403",
-      "to": "alice",
-      "params": [
-        "#nonexistent"
-      ],
-      "body": [
-        "No such channel"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/433.json
+++ b/schema/numerics/433.json
@@ -1,47 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/433.json",
-  "title": "433 ERR_NICKNAMEINUSE",
-  "description": "Nickname is already in use. RFC 1459 \u00a76.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "433"
-    },
-    "to": {
-      "type": "string"
-    },
-    "params": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "[requested_nick]."
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "Nickname is already in use",
-      "maxItems": 1
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "params"
-  ],
-  "examples": [
-    {
-      "command": "433",
-      "to": "*",
-      "params": [
-        "alice"
-      ],
-      "body": [
-        "Nickname is already in use"
-      ]
-    }
-  ]
-}
--- a/schema/numerics/442.json
+++ b/schema/numerics/442.json
@@ -1,35 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/442.json",
-  "title": "442 ERR_NOTONCHANNEL",
-  "description": "You're not on that channel. RFC 1459 \u00a76.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "442"
-    },
-    "to": {
-      "type": "string"
-    },
-    "params": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "[channel]."
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "You're not on that channel",
-      "maxItems": 1
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "params"
-  ]
-}
--- a/schema/numerics/482.json
+++ b/schema/numerics/482.json
@@ -1,35 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://git.eeqj.de/sneak/chat/schema/numerics/482.json",
-  "title": "482 ERR_CHANOPRIVSNEEDED",
-  "description": "You're not channel operator. RFC 1459 \u00a76.1.",
-  "$ref": "../message.json",
-  "properties": {
-    "command": {
-      "const": "482"
-    },
-    "to": {
-      "type": "string"
-    },
-    "params": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "[channel]."
-    },
-    "body": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "You're not channel operator",
-      "maxItems": 1
-    }
-  },
-  "required": [
-    "command",
-    "to",
-    "params"
-  ]
-}
--- a/web/build.sh
+++ b/web/build.sh
@@ -1,41 +0,0 @@
-#!/bin/sh
-set -e
-cd "$(dirname "$0")"
-
-# Install esbuild if not present
-if ! command -v esbuild >/dev/null 2>&1; then
-  if command -v npx >/dev/null 2>&1; then
-    NPX="npx"
-  else
-    echo "esbuild not found. Install it: npm install -g esbuild"
-    exit 1
-  fi
-else
-  NPX=""
-fi
-
-mkdir -p dist
-
-# Build JS bundle
-${NPX:+$NPX} esbuild src/app.jsx \
-  --bundle \
-  --minify \
-  --jsx-factory=h \
-  --jsx-fragment=Fragment \
-  --define:process.env.NODE_ENV=\"production\" \
-  --external:preact \
-  --outfile=dist/app.js \
-  2>/dev/null || \
-${NPX:+$NPX} esbuild src/app.jsx \
-  --bundle \
-  --minify \
-  --jsx-factory=h \
-  --jsx-fragment=Fragment \
-  --define:process.env.NODE_ENV=\"production\" \
-  --outfile=dist/app.js
-
-# Copy static files
-cp src/index.html dist/index.html
-cp src/style.css dist/style.css
-
-echo "Build complete: web/dist/"
--- a/web/dist/app.js
+++ b/web/dist/app.js
--- a/web/dist/index.html
+++ b/web/dist/index.html
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Chat</title>
-  <link rel="stylesheet" href="/style.css">
-</head>
-<body>
-  <div id="root"></div>
-  <script src="/app.js"></script>
-</body>
-</html>
--- a/web/dist/style.css
+++ b/web/dist/style.css
@@ -1,317 +0,0 @@
-* { margin: 0; padding: 0; box-sizing: border-box; }
-
-:root {
-  --bg: #1a1a2e;
-  --bg-secondary: #16213e;
-  --bg-input: #0f3460;
-  --text: #e0e0e0;
-  --text-muted: #888;
-  --accent: #e94560;
-  --accent2: #0f3460;
-  --border: #2a2a4a;
-  --nick: #53a8b6;
-  --timestamp: #666;
-  --tab-active: #e94560;
-  --tab-bg: #16213e;
-  --tab-hover: #1a1a3e;
-  --topic-bg: #121a30;
-  --unread-bg: #e94560;
-  --warn: #f0ad4e;
-}
-
-html, body, #root {
-  height: 100%;
-  font-family: 'Courier New', Courier, monospace;
-  font-size: 14px;
-  background: var(--bg);
-  color: var(--text);
-}
-
-/* Login screen */
-.login-screen {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  gap: 16px;
-}
-
-.login-screen h1 {
-  color: var(--accent);
-  font-size: 2em;
-}
-
-.login-screen input {
-  padding: 10px 16px;
-  font-size: 16px;
-  font-family: inherit;
-  background: var(--bg-input);
-  border: 1px solid var(--border);
-  color: var(--text);
-  border-radius: 4px;
-  width: 280px;
-}
-
-.login-screen button {
-  padding: 10px 24px;
-  font-size: 16px;
-  font-family: inherit;
-  background: var(--accent);
-  border: none;
-  color: white;
-  border-radius: 4px;
-  cursor: pointer;
-}
-
-.login-screen .error {
-  color: var(--accent);
-}
-
-.login-screen .motd {
-  color: var(--text-muted);
-  max-width: 400px;
-  text-align: center;
-  white-space: pre-wrap;
-}
-
-/* Main layout */
-.app {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-/* Tab bar */
-.tab-bar {
-  display: flex;
-  background: var(--bg-secondary);
-  border-bottom: 1px solid var(--border);
-  overflow-x: auto;
-  flex-shrink: 0;
-  align-items: center;
-}
-
-.tab {
-  padding: 8px 16px;
-  cursor: pointer;
-  border-bottom: 2px solid transparent;
-  white-space: nowrap;
-  color: var(--text-muted);
-  user-select: none;
-  position: relative;
-}
-
-.tab:hover {
-  background: var(--tab-hover);
-}
-
-.tab.active {
-  color: var(--text);
-  border-bottom-color: var(--tab-active);
-}
-
-.tab .close-btn {
-  margin-left: 8px;
-  color: var(--text-muted);
-  font-size: 12px;
-}
-
-.tab .close-btn:hover {
-  color: var(--accent);
-}
-
-.tab .unread-badge {
-  display: inline-block;
-  background: var(--unread-bg);
-  color: white;
-  font-size: 10px;
-  font-weight: bold;
-  padding: 1px 5px;
-  border-radius: 8px;
-  margin-left: 6px;
-  min-width: 16px;
-  text-align: center;
-}
-
-/* Connection status */
-.connection-status {
-  padding: 4px 12px;
-  background: var(--warn);
-  color: #1a1a2e;
-  font-size: 12px;
-  font-weight: bold;
-  white-space: nowrap;
-  flex-shrink: 0;
-}
-
-/* Topic bar */
-.topic-bar {
-  padding: 6px 12px;
-  background: var(--topic-bg);
-  border-bottom: 1px solid var(--border);
-  color: var(--text-muted);
-  font-size: 12px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  flex-shrink: 0;
-}
-
-/* Content area */
-.content {
-  display: flex;
-  flex: 1;
-  overflow: hidden;
-}
-
-/* Messages */
-.messages-pane {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-}
-
-.messages {
-  flex: 1;
-  overflow-y: auto;
-  padding: 8px 12px;
-}
-
-.message {
-  padding: 2px 0;
-  line-height: 1.4;
-  word-wrap: break-word;
-}
-
-.message .timestamp {
-  color: var(--timestamp);
-  font-size: 12px;
-  margin-right: 8px;
-}
-
-.message .nick {
-  color: var(--nick);
-  font-weight: bold;
-  margin-right: 8px;
-}
-
-.message .nick::before { content: '<'; }
-.message .nick::after { content: '>'; }
-
-.message.system {
-  color: var(--text-muted);
-  font-style: italic;
-}
-
-.message.system .nick {
-  color: var(--text-muted);
-}
-
-.message.system .nick::before,
-.message.system .nick::after { content: ''; }
-
-/* Input */
-.input-bar {
-  display: flex;
-  border-top: 1px solid var(--border);
-  background: var(--bg-secondary);
-  flex-shrink: 0;
-}
-
-.input-bar input {
-  flex: 1;
-  padding: 10px 12px;
-  font-family: inherit;
-  font-size: 14px;
-  background: var(--bg-input);
-  border: none;
-  color: var(--text);
-  outline: none;
-}
-
-.input-bar button {
-  padding: 10px 16px;
-  font-family: inherit;
-  background: var(--accent);
-  border: none;
-  color: white;
-  cursor: pointer;
-}
-
-/* User list */
-.user-list {
-  width: 160px;
-  background: var(--bg-secondary);
-  border-left: 1px solid var(--border);
-  overflow-y: auto;
-  padding: 8px;
-  flex-shrink: 0;
-}
-
-.user-list h3 {
-  color: var(--text-muted);
-  font-size: 11px;
-  text-transform: uppercase;
-  margin-bottom: 8px;
-  letter-spacing: 1px;
-}
-
-.user-list .user {
-  padding: 3px 4px;
-  color: var(--nick);
-  font-size: 13px;
-  cursor: pointer;
-}
-
-.user-list .user:hover {
-  background: var(--tab-hover);
-}
-
-/* Server tab */
-.server-messages {
-  color: var(--text-muted);
-  padding: 12px;
-  white-space: pre-wrap;
-  overflow-y: auto;
-  flex: 1;
-}
-
-/* Channel join dialog */
-.join-dialog {
-  padding: 12px;
-  display: flex;
-  gap: 8px;
-  background: var(--bg-secondary);
-  border-bottom: 1px solid var(--border);
-  margin-left: auto;
-}
-
-.join-dialog input {
-  padding: 6px 10px;
-  font-family: inherit;
-  font-size: 13px;
-  background: var(--bg-input);
-  border: 1px solid var(--border);
-  color: var(--text);
-  border-radius: 3px;
-  width: 200px;
-}
-
-.join-dialog button {
-  padding: 6px 14px;
-  font-family: inherit;
-  font-size: 13px;
-  background: var(--accent2);
-  border: none;
-  color: var(--text);
-  border-radius: 3px;
-  cursor: pointer;
-}
-
-/* Responsive */
-@media (max-width: 600px) {
-  .user-list { display: none; }
-  .tab { padding: 6px 10px; font-size: 13px; }
-}
--- a/web/embed.go
+++ b/web/embed.go
@@ -1,9 +0,0 @@
-// Package web embeds the built SPA static files.
-package web
-
-import "embed"
-
-// Dist contains the built web client files.
-//
-//go:embed dist/*
-var Dist embed.FS
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,513 +0,0 @@
-{
-  "name": "web",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "web",
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "preact": "^10.28.3"
-      },
-      "devDependencies": {
-        "esbuild": "^0.27.3"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz",
-      "integrity": "sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.3.tgz",
-      "integrity": "sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.3.tgz",
-      "integrity": "sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.3.tgz",
-      "integrity": "sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.3.tgz",
-      "integrity": "sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.3.tgz",
-      "integrity": "sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.3.tgz",
-      "integrity": "sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.3.tgz",
-      "integrity": "sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.3.tgz",
-      "integrity": "sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.3.tgz",
-      "integrity": "sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.3.tgz",
-      "integrity": "sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.3.tgz",
-      "integrity": "sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.3.tgz",
-      "integrity": "sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.3.tgz",
-      "integrity": "sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.3.tgz",
-      "integrity": "sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.3.tgz",
-      "integrity": "sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.3.tgz",
-      "integrity": "sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.3.tgz",
-      "integrity": "sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.3.tgz",
-      "integrity": "sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.3.tgz",
-      "integrity": "sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.3.tgz",
-      "integrity": "sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.3.tgz",
-      "integrity": "sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.3.tgz",
-      "integrity": "sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.3.tgz",
-      "integrity": "sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.3.tgz",
-      "integrity": "sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz",
-      "integrity": "sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz",
-      "integrity": "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.27.3",
-        "@esbuild/android-arm": "0.27.3",
-        "@esbuild/android-arm64": "0.27.3",
-        "@esbuild/android-x64": "0.27.3",
-        "@esbuild/darwin-arm64": "0.27.3",
-        "@esbuild/darwin-x64": "0.27.3",
-        "@esbuild/freebsd-arm64": "0.27.3",
-        "@esbuild/freebsd-x64": "0.27.3",
-        "@esbuild/linux-arm": "0.27.3",
-        "@esbuild/linux-arm64": "0.27.3",
-        "@esbuild/linux-ia32": "0.27.3",
-        "@esbuild/linux-loong64": "0.27.3",
-        "@esbuild/linux-mips64el": "0.27.3",
-        "@esbuild/linux-ppc64": "0.27.3",
-        "@esbuild/linux-riscv64": "0.27.3",
-        "@esbuild/linux-s390x": "0.27.3",
-        "@esbuild/linux-x64": "0.27.3",
-        "@esbuild/netbsd-arm64": "0.27.3",
-        "@esbuild/netbsd-x64": "0.27.3",
-        "@esbuild/openbsd-arm64": "0.27.3",
-        "@esbuild/openbsd-x64": "0.27.3",
-        "@esbuild/openharmony-arm64": "0.27.3",
-        "@esbuild/sunos-x64": "0.27.3",
-        "@esbuild/win32-arm64": "0.27.3",
-        "@esbuild/win32-ia32": "0.27.3",
-        "@esbuild/win32-x64": "0.27.3"
-      }
-    },
-    "node_modules/preact": {
-      "version": "10.28.3",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.28.3.tgz",
-      "integrity": "sha512-tCmoRkPQLpBeWzpmbhryairGnhW9tKV6c6gr/w+RhoRoKEJwsjzipwp//1oCpGPOchvSLaAPlpcJi9MwMmoPyA==",
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/preact"
-      }
-    }
-  }
-}
--- a/web/package.json
+++ b/web/package.json
@@ -1,18 +0,0 @@
-{
-  "name": "web",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "esbuild": "^0.27.3"
-  },
-  "dependencies": {
-    "preact": "^10.28.3"
-  }
-}
--- a/web/src/app.jsx
+++ b/web/src/app.jsx
@@ -1,519 +0,0 @@
-import { h, render } from 'preact';
-import { useState, useEffect, useRef, useCallback } from 'preact/hooks';
-
-const API = '/api/v1';
-const POLL_TIMEOUT = 15;
-const RECONNECT_DELAY = 3000;
-const MEMBER_REFRESH_INTERVAL = 10000;
-
-function api(path, opts = {}) {
-  const token = localStorage.getItem('chat_token');
-  const headers = { 'Content-Type': 'application/json', ...(opts.headers || {}) };
-  if (token) headers['Authorization'] = `Bearer ${token}`;
-  const { signal, ...rest } = opts;
-  return fetch(API + path, { ...rest, headers, signal }).then(async r => {
-    const data = await r.json().catch(() => null);
-    if (!r.ok) throw { status: r.status, data };
-    return data;
-  });
-}
-
-function formatTime(ts) {
-  const d = new Date(ts);
-  return d.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' });
-}
-
-function nickColor(nick) {
-  let h = 0;
-  for (let i = 0; i < nick.length; i++) h = nick.charCodeAt(i) + ((h << 5) - h);
-  const hue = Math.abs(h) % 360;
-  return `hsl(${hue}, 70%, 65%)`;
-}
-
-function LoginScreen({ onLogin }) {
-  const [nick, setNick] = useState('');
-  const [error, setError] = useState('');
-  const [motd, setMotd] = useState('');
-  const [serverName, setServerName] = useState('Chat');
-  const inputRef = useRef();
-
-  useEffect(() => {
-    api('/server').then(s => {
-      if (s.name) setServerName(s.name);
-      if (s.motd) setMotd(s.motd);
-    }).catch(() => {});
-    const saved = localStorage.getItem('chat_token');
-    if (saved) {
-      api('/state').then(u => onLogin(u.nick)).catch(() => localStorage.removeItem('chat_token'));
-    }
-    inputRef.current?.focus();
-  }, []);
-
-  const submit = async (e) => {
-    e.preventDefault();
-    setError('');
-    try {
-      const res = await api('/session', {
-        method: 'POST',
-        body: JSON.stringify({ nick: nick.trim() })
-      });
-      localStorage.setItem('chat_token', res.token);
-      onLogin(res.nick);
-    } catch (err) {
-      setError(err.data?.error || 'Connection failed');
-    }
-  };
-
-  return (
-    <div class="login-screen">
-      <h1>{serverName}</h1>
-      {motd && <div class="motd">{motd}</div>}
-      <form onSubmit={submit}>
-        <input
-          ref={inputRef}
-          type="text"
-          placeholder="Choose a nickname..."
-          value={nick}
-          onInput={e => setNick(e.target.value)}
-          maxLength={32}
-          autoFocus
-        />
-        <button type="submit">Connect</button>
-      </form>
-      {error && <div class="error">{error}</div>}
-    </div>
-  );
-}
-
-function Message({ msg }) {
-  if (msg.system) {
-    return (
-      <div class="message system">
-        <span class="timestamp">{formatTime(msg.ts)}</span>
-        <span class="content">{msg.text}</span>
-      </div>
-    );
-  }
-  return (
-    <div class="message">
-      <span class="timestamp">{formatTime(msg.ts)}</span>
-      <span class="nick" style={{ color: nickColor(msg.from) }}>{msg.from}</span>
-      <span class="content">{msg.text}</span>
-    </div>
-  );
-}
-
-function App() {
-  const [loggedIn, setLoggedIn] = useState(false);
-  const [nick, setNick] = useState('');
-  const [tabs, setTabs] = useState([{ type: 'server', name: 'Server' }]);
-  const [activeTab, setActiveTab] = useState(0);
-  const [messages, setMessages] = useState({ Server: [] });
-  const [members, setMembers] = useState({});
-  const [topics, setTopics] = useState({});
-  const [unread, setUnread] = useState({});
-  const [input, setInput] = useState('');
-  const [joinInput, setJoinInput] = useState('');
-  const [connected, setConnected] = useState(true);
-
-  const lastIdRef = useRef(0);
-  const seenIdsRef = useRef(new Set());
-  const pollAbortRef = useRef(null);
-  const tabsRef = useRef(tabs);
-  const activeTabRef = useRef(activeTab);
-  const nickRef = useRef(nick);
-  const messagesEndRef = useRef();
-  const inputRef = useRef();
-
-  useEffect(() => { tabsRef.current = tabs; }, [tabs]);
-  useEffect(() => { activeTabRef.current = activeTab; }, [activeTab]);
-  useEffect(() => { nickRef.current = nick; }, [nick]);
-
-  // Persist joined channels
-  useEffect(() => {
-    const channels = tabs.filter(t => t.type === 'channel').map(t => t.name);
-    localStorage.setItem('chat_channels', JSON.stringify(channels));
-  }, [tabs]);
-
-  // Clear unread on tab switch
-  useEffect(() => {
-    const tab = tabs[activeTab];
-    if (tab) setUnread(prev => ({ ...prev, [tab.name]: 0 }));
-  }, [activeTab, tabs]);
-
-  const addMessage = useCallback((tabName, msg) => {
-    if (msg.id && seenIdsRef.current.has(msg.id)) return;
-    if (msg.id) seenIdsRef.current.add(msg.id);
-    setMessages(prev => ({
-      ...prev,
-      [tabName]: [...(prev[tabName] || []), msg]
-    }));
-    const currentTab = tabsRef.current[activeTabRef.current];
-    if (!currentTab || currentTab.name !== tabName) {
-      setUnread(prev => ({ ...prev, [tabName]: (prev[tabName] || 0) + 1 }));
-    }
-  }, []);
-
-  const addSystemMessage = useCallback((tabName, text) => {
-    setMessages(prev => ({
-      ...prev,
-      [tabName]: [...(prev[tabName] || []), {
-        id: 'sys-' + Date.now() + '-' + Math.random(),
-        ts: new Date().toISOString(),
-        text,
-        system: true
-      }]
-    }));
-  }, []);
-
-  const refreshMembers = useCallback((channel) => {
-    const chName = channel.replace('#', '');
-    api(`/channels/${chName}/members`).then(m => {
-      setMembers(prev => ({ ...prev, [channel]: m }));
-    }).catch(() => {});
-  }, []);
-
-  const processMessage = useCallback((msg) => {
-    const body = Array.isArray(msg.body) ? msg.body.join('\n') : '';
-    const base = { id: msg.id, ts: msg.ts, from: msg.from, to: msg.to, command: msg.command };
-
-    switch (msg.command) {
-      case 'PRIVMSG':
-      case 'NOTICE': {
-        const parsed = { ...base, text: body, system: false };
-        const target = msg.to;
-        if (target && target.startsWith('#')) {
-          addMessage(target, parsed);
-        } else {
-          const dmPeer = msg.from === nickRef.current ? msg.to : msg.from;
-          setTabs(prev => {
-            if (!prev.find(t => t.type === 'dm' && t.name === dmPeer)) {
-              return [...prev, { type: 'dm', name: dmPeer }];
-            }
-            return prev;
-          });
-          addMessage(dmPeer, parsed);
-        }
-        break;
-      }
-      case 'JOIN': {
-        const text = `${msg.from} has joined ${msg.to}`;
-        if (msg.to) addMessage(msg.to, { ...base, text, system: true });
-        if (msg.to && msg.to.startsWith('#')) refreshMembers(msg.to);
-        break;
-      }
-      case 'PART': {
-        const reason = body ? ': ' + body : '';
-        const text = `${msg.from} has left ${msg.to}${reason}`;
-        if (msg.to) addMessage(msg.to, { ...base, text, system: true });
-        if (msg.to && msg.to.startsWith('#')) refreshMembers(msg.to);
-        break;
-      }
-      case 'QUIT': {
-        const reason = body ? ': ' + body : '';
-        const text = `${msg.from} has quit${reason}`;
-        tabsRef.current.forEach(tab => {
-          if (tab.type === 'channel') {
-            addMessage(tab.name, { ...base, text, system: true });
-          }
-        });
-        break;
-      }
-      case 'NICK': {
-        const newNick = Array.isArray(msg.body) ? msg.body[0] : body;
-        const text = `${msg.from} is now known as ${newNick}`;
-        tabsRef.current.forEach(tab => {
-          if (tab.type === 'channel') {
-            addMessage(tab.name, { ...base, text, system: true });
-          }
-        });
-        if (msg.from === nickRef.current && newNick) setNick(newNick);
-        // Refresh members in all channels
-        tabsRef.current.forEach(tab => {
-          if (tab.type === 'channel') refreshMembers(tab.name);
-        });
-        break;
-      }
-      case 'TOPIC': {
-        const text = `${msg.from} set the topic: ${body}`;
-        if (msg.to) {
-          addMessage(msg.to, { ...base, text, system: true });
-          setTopics(prev => ({ ...prev, [msg.to]: body }));
-        }
-        break;
-      }
-      case '375':
-      case '372':
-      case '376':
-        addMessage('Server', { ...base, text: body, system: true });
-        break;
-      default:
-        addMessage('Server', { ...base, text: body || msg.command, system: true });
-    }
-  }, [addMessage, refreshMembers]);
-
-  // Long-poll loop
-  useEffect(() => {
-    if (!loggedIn) return;
-    let alive = true;
-
-    const poll = async () => {
-      while (alive) {
-        try {
-          const controller = new AbortController();
-          pollAbortRef.current = controller;
-          const result = await api(
-            `/messages?after=${lastIdRef.current}&timeout=${POLL_TIMEOUT}`,
-            { signal: controller.signal }
-          );
-          if (!alive) break;
-          setConnected(true);
-          if (result.messages) {
-            for (const m of result.messages) processMessage(m);
-          }
-          if (result.last_id > lastIdRef.current) {
-            lastIdRef.current = result.last_id;
-          }
-        } catch (err) {
-          if (!alive) break;
-          if (err.name === 'AbortError') continue;
-          setConnected(false);
-          await new Promise(r => setTimeout(r, RECONNECT_DELAY));
-        }
-      }
-    };
-
-    poll();
-    return () => { alive = false; pollAbortRef.current?.abort(); };
-  }, [loggedIn, processMessage]);
-
-  // Refresh members for active channel
-  useEffect(() => {
-    if (!loggedIn) return;
-    const tab = tabs[activeTab];
-    if (!tab || tab.type !== 'channel') return;
-    refreshMembers(tab.name);
-    const iv = setInterval(() => refreshMembers(tab.name), MEMBER_REFRESH_INTERVAL);
-    return () => clearInterval(iv);
-  }, [loggedIn, activeTab, tabs, refreshMembers]);
-
-  // Auto-scroll
-  useEffect(() => {
-    messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
-  }, [messages, activeTab]);
-
-  // Focus input on tab change
-  useEffect(() => { inputRef.current?.focus(); }, [activeTab]);
-
-  // Fetch topic for active channel
-  useEffect(() => {
-    if (!loggedIn) return;
-    const tab = tabs[activeTab];
-    if (!tab || tab.type !== 'channel') return;
-    api('/channels').then(channels => {
-      const ch = channels.find(c => c.name === tab.name);
-      if (ch && ch.topic) setTopics(prev => ({ ...prev, [tab.name]: ch.topic }));
-    }).catch(() => {});
-  }, [loggedIn, activeTab, tabs]);
-
-  const onLogin = useCallback(async (userNick) => {
-    setNick(userNick);
-    setLoggedIn(true);
-    addSystemMessage('Server', `Connected as ${userNick}`);
-    // Auto-rejoin saved channels
-    const saved = JSON.parse(localStorage.getItem('chat_channels') || '[]');
-    for (const ch of saved) {
-      try {
-        await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'JOIN', to: ch }) });
-        setTabs(prev => {
-          if (prev.find(t => t.type === 'channel' && t.name === ch)) return prev;
-          return [...prev, { type: 'channel', name: ch }];
-        });
-      } catch (e) {
-        // Channel may not exist anymore
-      }
-    }
-  }, [addSystemMessage]);
-
-  const joinChannel = async (name) => {
-    if (!name) return;
-    name = name.trim();
-    if (!name.startsWith('#')) name = '#' + name;
-    try {
-      await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'JOIN', to: name }) });
-      setTabs(prev => {
-        if (prev.find(t => t.type === 'channel' && t.name === name)) return prev;
-        return [...prev, { type: 'channel', name }];
-      });
-      setActiveTab(tabs.length);
-      // Load history
-      try {
-        const hist = await api(`/history?target=${encodeURIComponent(name)}&limit=50`);
-        if (Array.isArray(hist)) {
-          for (const m of hist) processMessage(m);
-        }
-      } catch (e) {
-        // History may be empty
-      }
-      setJoinInput('');
-    } catch (err) {
-      addSystemMessage('Server', `Failed to join ${name}: ${err.data?.error || 'error'}`);
-    }
-  };
-
-  const partChannel = async (name) => {
-    try {
-      await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'PART', to: name }) });
-    } catch (e) {
-      // Ignore
-    }
-    setTabs(prev => prev.filter(t => !(t.type === 'channel' && t.name === name)));
-    setActiveTab(0);
-  };
-
-  const closeTab = (idx) => {
-    const tab = tabs[idx];
-    if (tab.type === 'channel') {
-      partChannel(tab.name);
-    } else if (tab.type === 'dm') {
-      setTabs(prev => prev.filter((_, i) => i !== idx));
-      if (activeTab >= idx) setActiveTab(Math.max(0, activeTab - 1));
-    }
-  };
-
-  const openDM = (targetNick) => {
-    setTabs(prev => {
-      if (prev.find(t => t.type === 'dm' && t.name === targetNick)) return prev;
-      return [...prev, { type: 'dm', name: targetNick }];
-    });
-    const idx = tabs.findIndex(t => t.type === 'dm' && t.name === targetNick);
-    setActiveTab(idx >= 0 ? idx : tabs.length);
-  };
-
-  const sendMessage = async () => {
-    const text = input.trim();
-    if (!text) return;
-    setInput('');
-    const tab = tabs[activeTab];
-    if (!tab || tab.type === 'server') return;
-
-    if (text.startsWith('/')) {
-      const parts = text.split(' ');
-      const cmd = parts[0].toLowerCase();
-      if (cmd === '/join' && parts[1]) { joinChannel(parts[1]); return; }
-      if (cmd === '/part') { if (tab.type === 'channel') partChannel(tab.name); return; }
-      if (cmd === '/msg' && parts[1] && parts.slice(2).join(' ')) {
-        const target = parts[1];
-        const body = parts.slice(2).join(' ');
-        try {
-          await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'PRIVMSG', to: target, body: [body] }) });
-          openDM(target);
-        } catch (err) {
-          addSystemMessage('Server', `DM failed: ${err.data?.error || 'error'}`);
-        }
-        return;
-      }
-      if (cmd === '/nick' && parts[1]) {
-        try {
-          await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'NICK', body: [parts[1]] }) });
-        } catch (err) {
-          addSystemMessage('Server', `Nick change failed: ${err.data?.error || 'error'}`);
-        }
-        return;
-      }
-      if (cmd === '/topic' && tab.type === 'channel') {
-        const topicText = parts.slice(1).join(' ');
-        try {
-          await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'TOPIC', to: tab.name, body: [topicText] }) });
-        } catch (err) {
-          addSystemMessage('Server', `Topic failed: ${err.data?.error || 'error'}`);
-        }
-        return;
-      }
-      addSystemMessage('Server', `Unknown command: ${cmd}`);
-      return;
-    }
-
-    try {
-      await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'PRIVMSG', to: tab.name, body: [text] }) });
-    } catch (err) {
-      addSystemMessage(tab.name, `Send failed: ${err.data?.error || 'error'}`);
-    }
-  };
-
-  if (!loggedIn) return <LoginScreen onLogin={onLogin} />;
-
-  const currentTab = tabs[activeTab] || tabs[0];
-  const currentMessages = messages[currentTab.name] || [];
-  const currentMembers = members[currentTab.name] || [];
-  const currentTopic = topics[currentTab.name] || '';
-
-  return (
-    <div class="app">
-      <div class="tab-bar">
-        {!connected && <div class="connection-status">⚠ Reconnecting...</div>}
-        {tabs.map((tab, i) => (
-          <div
-            class={`tab ${i === activeTab ? 'active' : ''}`}
-            onClick={() => setActiveTab(i)}
-          >
-            {tab.type === 'dm' ? `→${tab.name}` : tab.name}
-            {unread[tab.name] > 0 && i !== activeTab && (
-              <span class="unread-badge">{unread[tab.name]}</span>
-            )}
-            {tab.type !== 'server' && (
-              <span class="close-btn" onClick={(e) => { e.stopPropagation(); closeTab(i); }}>×</span>
-            )}
-          </div>
-        ))}
-        <div class="join-dialog">
-          <input
-            placeholder="#channel"
-            value={joinInput}
-            onInput={e => setJoinInput(e.target.value)}
-            onKeyDown={e => e.key === 'Enter' && joinChannel(joinInput)}
-          />
-          <button onClick={() => joinChannel(joinInput)}>Join</button>
-        </div>
-      </div>
-
-      {currentTab.type === 'channel' && currentTopic && (
-        <div class="topic-bar" title={currentTopic}>{currentTopic}</div>
-      )}
-
-      <div class="content">
-        <div class="messages-pane">
-          <div class={currentTab.type === 'server' ? 'server-messages' : 'messages'}>
-            {currentMessages.map(m => <Message msg={m} />)}
-            <div ref={messagesEndRef} />
-          </div>
-          {currentTab.type !== 'server' && (
-            <div class="input-bar">
-              <input
-                ref={inputRef}
-                placeholder={`Message ${currentTab.name}...`}
-                value={input}
-                onInput={e => setInput(e.target.value)}
-                onKeyDown={e => e.key === 'Enter' && sendMessage()}
-              />
-              <button onClick={sendMessage}>Send</button>
-            </div>
-          )}
-        </div>
-
-        {currentTab.type === 'channel' && (
-          <div class="user-list">
-            <h3>Users ({currentMembers.length})</h3>
-            {currentMembers.map(u => (
-              <div class="user" onClick={() => openDM(u.nick)} style={{ color: nickColor(u.nick) }}>
-                {u.nick}
-              </div>
-            ))}
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
-
-render(<App />, document.getElementById('root'));
--- a/web/src/index.html
+++ b/web/src/index.html
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Chat</title>
-  <link rel="stylesheet" href="/style.css">
-</head>
-<body>
-  <div id="root"></div>
-  <script src="/app.js"></script>
-</body>
-</html>
--- a/web/src/style.css
+++ b/web/src/style.css
@@ -1,317 +0,0 @@
-* { margin: 0; padding: 0; box-sizing: border-box; }
-
-:root {
-  --bg: #1a1a2e;
-  --bg-secondary: #16213e;
-  --bg-input: #0f3460;
-  --text: #e0e0e0;
-  --text-muted: #888;
-  --accent: #e94560;
-  --accent2: #0f3460;
-  --border: #2a2a4a;
-  --nick: #53a8b6;
-  --timestamp: #666;
-  --tab-active: #e94560;
-  --tab-bg: #16213e;
-  --tab-hover: #1a1a3e;
-  --topic-bg: #121a30;
-  --unread-bg: #e94560;
-  --warn: #f0ad4e;
-}
-
-html, body, #root {
-  height: 100%;
-  font-family: 'Courier New', Courier, monospace;
-  font-size: 14px;
-  background: var(--bg);
-  color: var(--text);
-}
-
-/* Login screen */
-.login-screen {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  gap: 16px;
-}
-
-.login-screen h1 {
-  color: var(--accent);
-  font-size: 2em;
-}
-
-.login-screen input {
-  padding: 10px 16px;
-  font-size: 16px;
-  font-family: inherit;
-  background: var(--bg-input);
-  border: 1px solid var(--border);
-  color: var(--text);
-  border-radius: 4px;
-  width: 280px;
-}
-
-.login-screen button {
-  padding: 10px 24px;
-  font-size: 16px;
-  font-family: inherit;
-  background: var(--accent);
-  border: none;
-  color: white;
-  border-radius: 4px;
-  cursor: pointer;
-}
-
-.login-screen .error {
-  color: var(--accent);
-}
-
-.login-screen .motd {
-  color: var(--text-muted);
-  max-width: 400px;
-  text-align: center;
-  white-space: pre-wrap;
-}
-
-/* Main layout */
-.app {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-/* Tab bar */
-.tab-bar {
-  display: flex;
-  background: var(--bg-secondary);
-  border-bottom: 1px solid var(--border);
-  overflow-x: auto;
-  flex-shrink: 0;
-  align-items: center;
-}
-
-.tab {
-  padding: 8px 16px;
-  cursor: pointer;
-  border-bottom: 2px solid transparent;
-  white-space: nowrap;
-  color: var(--text-muted);
-  user-select: none;
-  position: relative;
-}
-
-.tab:hover {
-  background: var(--tab-hover);
-}
-
-.tab.active {
-  color: var(--text);
-  border-bottom-color: var(--tab-active);
-}
-
-.tab .close-btn {
-  margin-left: 8px;
-  color: var(--text-muted);
-  font-size: 12px;
-}
-
-.tab .close-btn:hover {
-  color: var(--accent);
-}
-
-.tab .unread-badge {
-  display: inline-block;
-  background: var(--unread-bg);
-  color: white;
-  font-size: 10px;
-  font-weight: bold;
-  padding: 1px 5px;
-  border-radius: 8px;
-  margin-left: 6px;
-  min-width: 16px;
-  text-align: center;
-}
-
-/* Connection status */
-.connection-status {
-  padding: 4px 12px;
-  background: var(--warn);
-  color: #1a1a2e;
-  font-size: 12px;
-  font-weight: bold;
-  white-space: nowrap;
-  flex-shrink: 0;
-}
-
-/* Topic bar */
-.topic-bar {
-  padding: 6px 12px;
-  background: var(--topic-bg);
-  border-bottom: 1px solid var(--border);
-  color: var(--text-muted);
-  font-size: 12px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  flex-shrink: 0;
-}
-
-/* Content area */
-.content {
-  display: flex;
-  flex: 1;
-  overflow: hidden;
-}
-
-/* Messages */
-.messages-pane {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-}
-
-.messages {
-  flex: 1;
-  overflow-y: auto;
-  padding: 8px 12px;
-}
-
-.message {
-  padding: 2px 0;
-  line-height: 1.4;
-  word-wrap: break-word;
-}
-
-.message .timestamp {
-  color: var(--timestamp);
-  font-size: 12px;
-  margin-right: 8px;
-}
-
-.message .nick {
-  color: var(--nick);
-  font-weight: bold;
-  margin-right: 8px;
-}
-
-.message .nick::before { content: '<'; }
-.message .nick::after { content: '>'; }
-
-.message.system {
-  color: var(--text-muted);
-  font-style: italic;
-}
-
-.message.system .nick {
-  color: var(--text-muted);
-}
-
-.message.system .nick::before,
-.message.system .nick::after { content: ''; }
-
-/* Input */
-.input-bar {
-  display: flex;
-  border-top: 1px solid var(--border);
-  background: var(--bg-secondary);
-  flex-shrink: 0;
-}
-
-.input-bar input {
-  flex: 1;
-  padding: 10px 12px;
-  font-family: inherit;
-  font-size: 14px;
-  background: var(--bg-input);
-  border: none;
-  color: var(--text);
-  outline: none;
-}
-
-.input-bar button {
-  padding: 10px 16px;
-  font-family: inherit;
-  background: var(--accent);
-  border: none;
-  color: white;
-  cursor: pointer;
-}
-
-/* User list */
-.user-list {
-  width: 160px;
-  background: var(--bg-secondary);
-  border-left: 1px solid var(--border);
-  overflow-y: auto;
-  padding: 8px;
-  flex-shrink: 0;
-}
-
-.user-list h3 {
-  color: var(--text-muted);
-  font-size: 11px;
-  text-transform: uppercase;
-  margin-bottom: 8px;
-  letter-spacing: 1px;
-}
-
-.user-list .user {
-  padding: 3px 4px;
-  color: var(--nick);
-  font-size: 13px;
-  cursor: pointer;
-}
-
-.user-list .user:hover {
-  background: var(--tab-hover);
-}
-
-/* Server tab */
-.server-messages {
-  color: var(--text-muted);
-  padding: 12px;
-  white-space: pre-wrap;
-  overflow-y: auto;
-  flex: 1;
-}
-
-/* Channel join dialog */
-.join-dialog {
-  padding: 12px;
-  display: flex;
-  gap: 8px;
-  background: var(--bg-secondary);
-  border-bottom: 1px solid var(--border);
-  margin-left: auto;
-}
-
-.join-dialog input {
-  padding: 6px 10px;
-  font-family: inherit;
-  font-size: 13px;
-  background: var(--bg-input);
-  border: 1px solid var(--border);
-  color: var(--text);
-  border-radius: 3px;
-  width: 200px;
-}
-
-.join-dialog button {
-  padding: 6px 14px;
-  font-family: inherit;
-  font-size: 13px;
-  background: var(--accent2);
-  border: none;
-  color: var(--text);
-  border-radius: 3px;
-  cursor: pointer;
-}
-
-/* Responsive */
-@media (max-width: 600px) {
-  .user-list { display: none; }
-  .tab { padding: 6px 10px; font-size: 13px; }
-}
Author	SHA1	Message	Date
clawbot	98a02a150d	Merge pull request 'Fix code review feedback (closes #5 )' (#6 ) from fix/review-feedback into feature/database-schema	2026-02-10 18:18:06 +01:00
clawbot	fbe53179b8	Fix code review feedback items 1-6, 8-10 - Item 1: Extract GetUserByID/GetChannelByID lookup methods, use from relation methods - Item 2: Initialize slices with literals so JSON gets [] not null - Item 3: Populate CreatedAt/UpdatedAt with time.Now() on all Create methods - Item 4: Wrap each migration's SQL + recording in a transaction - Item 5: Check error from res.LastInsertId() in QueueMessage - Item 6: Add DequeueMessages and AckMessages methods - Item 8: Add GetUserByNick, GetUserByToken, DeleteAuthToken, UpdateUserLastSeen - Item 9: Run PRAGMA foreign_keys = ON on every new connection - Item 10: Builds clean, all tests pass	2026-02-09 21:15:41 -08:00
clawbot	3f7aec7c47	Split schema: 001 = migrations table only, 002 = all schema All schema changes go into 002_schema.sql until 1.0.0 is tagged. No migrations during early development phase.	2026-02-09 17:49:27 -08:00
clawbot	28f3b5aef8	Add comprehensive model and relation test suite	2026-02-09 17:45:01 -08:00
clawbot	99d3e4fa0a	Consolidate schema into single 001_initial.sql No need for separate migration files before 1.0.0 — there are no installed versions to migrate. All tables now in one file.	2026-02-09 17:15:49 -08:00
clawbot	b21508cecc	Add complete database schema and ORM models Schema (002_tables.sql): - users: accounts with nick, password hash, timestamps - auth_tokens: per-device tokens with expiry, linked to users - channels: chat rooms with topic and mode flags - channel_members: membership with per-user modes (+o, +v) - messages: channel/DM history with structured JSON meta - message_queue: per-user pending delivery queue - sessions: server-held session state with idle timeout - server_links: federation peer configuration Models (internal/models/): - All models embed Base for database access - Relation methods on models: User.Channels(), User.QueuedMessages(), Channel.Members(), Channel.RecentMessages(), ChannelMember.User(), ChannelMember.Channel(), AuthToken.User(), Session.User() - IDs are UUIDs (TEXT), not auto-increment integers - JSON tags use camelCase per lint rules All tables verified: migrations apply cleanly, 0 lint issues.	2026-02-09 14:54:35 -08:00