feat: add session idle timeout cleanup goroutine

- Periodic cleanup loop deletes stale clients based on SESSION_IDLE_TIMEOUT
- Orphaned sessions (no clients) are cleaned up automatically
- last_seen already updated on each authenticated request via GetSessionByToken

.dockerignore

@@ -1,8 +1,9 @@
-bin/
-chatd
-data.db
-.env
 .git
-*.test
+*.md
-*.out
+!README.md
-debug.log
+chatd
+chat-cli
+data.db
+data.db-wal
+data.db-shm
+.env

.editorconfig

@@ -0,0 +1,12 @@
+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

.gitea/workflows/check.yml

@@ -0,0 +1,9 @@
+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 .

.gitignore

@@ -1,7 +1,28 @@
+# 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
@@ -9,6 +30,9 @@ data.db
 *.test
 *.out
 vendor/
+
+# Project
+data.db
 debug.log
+/chat-cli
 web/node_modules/
-chat-cli

.golangci.yml

@@ -7,15 +7,8 @@ run:
 linters:
   default: all
   disable:
-    # Genuinely incompatible with project patterns
+    - wsl  # Deprecated in v2, replaced by wsl_v5
-    - exhaustruct      # Requires all struct fields
+  settings:
-    - 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:
@@ -25,6 +18,17 @@ linters-settings:
       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."
 
 issues:
   exclude-use-default: false

Dockerfile

@@ -1,22 +1,32 @@
-FROM golang:1.24-alpine AS builder
+# golang:1.24-alpine, 2026-02-26
-
+FROM golang@sha256:8bee1901f1e530bfb4a7850aa7a479d17ae3a18beb6e09064ed54cfd245b7191 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 go build -ldflags "-X main.Version=${VERSION}" -o /chatd ./cmd/chatd
+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/
 
-FROM alpine:3.21
+# alpine:3.21, 2026-02-26
-
+FROM alpine@sha256:c3f8e73fdb79deaebaa2037150150191b9dcbfba68b4a46d70103204c53f4709
-RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache ca-certificates \
+    && addgroup -S chat && adduser -S chat -G chat
 COPY --from=builder /chatd /usr/local/bin/chatd
 
-WORKDIR /data
+USER chat
 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"]

LICENSE

@@ -0,0 +1,21 @@
+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.

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all build lint fmt test check clean run debug
+.PHONY: all build lint fmt fmt-check test check clean run debug docker hooks
 
 BINARY := chatd
 VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
@@ -17,18 +17,15 @@ fmt:
 	gofmt -s -w .
 	goimports -w .
 
-test:
+fmt-check:
-	go test -v -race -cover ./...
-
-# Check runs all validation without making changes
-# Used by CI and Docker build — fails if anything is wrong
-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 ./...
+test:
-	@echo "==> Running tests..."
+	go test -timeout 30s -v -race -cover ./...
-	go test -v -race ./...
+
+# check runs all validation without making changes
+# Used by CI and Docker build — fails if anything is wrong
+check: test lint fmt-check
 	@echo "==> Building..."
 	go build -ldflags "$(LDFLAGS)" -o /dev/null ./cmd/chatd
 	@echo "==> All checks passed!"
@@ -41,3 +38,12 @@ 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

REPO_POLICIES.md

@@ -0,0 +1,182 @@
+---
+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`

cmd/chat-cli/api/client.go

@@ -1,15 +1,28 @@
-package api
+// 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
@@ -19,186 +32,283 @@ type Client struct {
 
 // NewClient creates a new API client.
 func NewClient(baseURL string) *Client {
-	return &Client{
+	return &Client{ //nolint:exhaustruct // Token set after CreateSession
 		BaseURL: baseURL,
-		HTTPClient: &http.Client{
+		HTTPClient: &http.Client{ //nolint:exhaustruct // defaults fine
-			Timeout: 30 * time.Second,
+			Timeout: httpTimeout,
 		},
 	}
 }
 
-func (c *Client) do(method, path string, body interface{}) ([]byte, error) {
+// 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)
 	}
 
-	req, err := http.NewRequest(method, c.BaseURL+path, bodyReader)
+	request, err := http.NewRequestWithContext(
+		context.Background(),
+		method,
+		client.BaseURL+path,
+		bodyReader,
+	)
 	if err != nil {
 		return nil, fmt.Errorf("request: %w", err)
 	}
-	req.Header.Set("Content-Type", "application/json")
+
-	if c.Token != "" {
+	request.Header.Set(
-		req.Header.Set("Authorization", "Bearer "+c.Token)
+		"Content-Type", "application/json",
+	)
+
+	if client.Token != "" {
+		request.Header.Set(
+			"Authorization", "Bearer "+client.Token,
+		)
 	}
 
-	resp, err := c.HTTPClient.Do(req)
+	resp, err := client.HTTPClient.Do(request)
 	if err != nil {
 		return nil, fmt.Errorf("http: %w", err)
 	}
-	defer resp.Body.Close()
+
+	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 >= 400 {
+	if resp.StatusCode >= httpErrThreshold {
-		return data, fmt.Errorf("HTTP %d: %s", resp.StatusCode, string(data))
+		return data, fmt.Errorf(
+			"%w %d: %s",
+			errHTTP, resp.StatusCode, string(data),
+		)
 	}
 
 	return data, nil
 }
-
-// CreateSession creates a new session on the server.
-func (c *Client) CreateSession(nick string) (*SessionResponse, error) {
-	data, err := c.do("POST", "/api/v1/session", &SessionRequest{Nick: nick})
-	if err != nil {
-		return nil, err
-	}
-	var resp SessionResponse
-	if err := json.Unmarshal(data, &resp); err != nil {
-		return nil, fmt.Errorf("decode session: %w", err)
-	}
-	c.Token = resp.Token
-	return &resp, nil
-}
-
-// GetState returns the current user state.
-func (c *Client) GetState() (*StateResponse, error) {
-	data, err := c.do("GET", "/api/v1/state", nil)
-	if err != nil {
-		return nil, err
-	}
-	var resp StateResponse
-	if err := json.Unmarshal(data, &resp); err != nil {
-		return nil, fmt.Errorf("decode state: %w", err)
-	}
-	return &resp, nil
-}
-
-// SendMessage sends a message (any IRC command).
-func (c *Client) SendMessage(msg *Message) error {
-	_, err := c.do("POST", "/api/v1/messages", msg)
-	return err
-}
-
-// PollMessages long-polls for new messages.
-func (c *Client) PollMessages(afterID string, timeout int) ([]Message, error) {
-	// Use a longer HTTP timeout than the server long-poll timeout.
-	client := &http.Client{Timeout: time.Duration(timeout+5) * time.Second}
-
-	params := url.Values{}
-	if afterID != "" {
-		params.Set("after", afterID)
-	}
-	params.Set("timeout", fmt.Sprintf("%d", timeout))
-
-	path := "/api/v1/messages"
-	if len(params) > 0 {
-		path += "?" + params.Encode()
-	}
-
-	req, err := http.NewRequest("GET", c.BaseURL+path, nil)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Authorization", "Bearer "+c.Token)
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	data, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("HTTP %d: %s", resp.StatusCode, string(data))
-	}
-
-	// The server may return an array directly or wrapped.
-	var msgs []Message
-	if err := json.Unmarshal(data, &msgs); err != nil {
-		// Try wrapped format.
-		var wrapped MessagesResponse
-		if err2 := json.Unmarshal(data, &wrapped); err2 != nil {
-			return nil, fmt.Errorf("decode messages: %w (raw: %s)", err, string(data))
-		}
-		msgs = wrapped.Messages
-	}
-
-	return msgs, nil
-}
-
-// JoinChannel joins a channel via the unified command endpoint.
-func (c *Client) JoinChannel(channel string) error {
-	return c.SendMessage(&Message{Command: "JOIN", To: channel})
-}
-
-// PartChannel leaves a channel via the unified command endpoint.
-func (c *Client) PartChannel(channel string) error {
-	return c.SendMessage(&Message{Command: "PART", To: channel})
-}
-
-// ListChannels returns all channels on the server.
-func (c *Client) ListChannels() ([]Channel, error) {
-	data, err := c.do("GET", "/api/v1/channels", nil)
-	if err != nil {
-		return nil, err
-	}
-	var channels []Channel
-	if err := json.Unmarshal(data, &channels); err != nil {
-		return nil, err
-	}
-	return channels, nil
-}
-
-// GetMembers returns members of a channel.
-func (c *Client) GetMembers(channel string) ([]string, error) {
-	data, err := c.do("GET", "/api/v1/channels/"+url.PathEscape(channel)+"/members", nil)
-	if err != nil {
-		return nil, err
-	}
-	var members []string
-	if err := json.Unmarshal(data, &members); err != nil {
-		// Try object format.
-		var obj map[string]interface{}
-		if err2 := json.Unmarshal(data, &obj); err2 != nil {
-			return nil, err
-		}
-		// Extract member names from whatever format.
-		return nil, fmt.Errorf("unexpected members format: %s", string(data))
-	}
-	return members, nil
-}
-
-// GetServerInfo returns server info.
-func (c *Client) GetServerInfo() (*ServerInfo, error) {
-	data, err := c.do("GET", "/api/v1/server", nil)
-	if err != nil {
-		return nil, err
-	}
-	var info ServerInfo
-	if err := json.Unmarshal(data, &info); err != nil {
-		return nil, err
-	}
-	return &info, nil
-}

cmd/chat-cli/api/types.go

@@ -1,4 +1,4 @@
-package api
+package chatapi
 
 import "time"
 
@@ -7,18 +7,16 @@ type SessionRequest struct {
 	Nick string `json:"nick"`
 }
 
-// SessionResponse is the response from POST /api/v1/session.
+// SessionResponse is the response from session creation.
 type SessionResponse struct {
-	SessionID string `json:"session_id"`
+	ID    int64  `json:"id"`
-	ClientID  string `json:"client_id"`
 	Nick  string `json:"nick"`
 	Token string `json:"token"`
 }
 
 // StateResponse is the response from GET /api/v1/state.
 type StateResponse struct {
-	SessionID string   `json:"session_id"`
+	ID       int64    `json:"id"`
-	ClientID  string   `json:"client_id"`
 	Nick     string   `json:"nick"`
 	Channels []string `json:"channels"`
 }
@@ -29,25 +27,27 @@ type Message struct {
 	From    string   `json:"from,omitempty"`
 	To      string   `json:"to,omitempty"`
 	Params  []string `json:"params,omitempty"`
-	Body    interface{} `json:"body,omitempty"`
+	Body    any      `json:"body,omitempty"`
 	ID      string   `json:"id,omitempty"`
 	TS      string   `json:"ts,omitempty"`
-	Meta    interface{} `json:"meta,omitempty"`
+	Meta    any      `json:"meta,omitempty"`
 }
 
-// BodyLines returns the body as a slice of strings (for text messages).
+// BodyLines returns the body as a string slice.
 func (m *Message) BodyLines() []string {
-	switch v := m.Body.(type) {
+	switch bodyVal := m.Body.(type) {
-	case []interface{}:
+	case []any:
-		lines := make([]string, 0, len(v))
+		lines := make([]string, 0, len(bodyVal))
-		for _, item := range v {
+
-			if s, ok := item.(string); ok {
+		for _, item := range bodyVal {
-				lines = append(lines, s)
+			if str, ok := item.(string); ok {
+				lines = append(lines, str)
 			}
 		}
+
 		return lines
 	case []string:
-		return v
+		return bodyVal
 	default:
 		return nil
 	}
@@ -58,7 +58,7 @@ type Channel struct {
 	Name      string `json:"name"`
 	Topic     string `json:"topic"`
 	Members   int    `json:"members"`
-	CreatedAt string `json:"created_at"`
+	CreatedAt string `json:"createdAt"`
 }
 
 // ServerInfo is the response from GET /api/v1/server.
@@ -71,6 +71,13 @@ type ServerInfo struct {
 // 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.
@@ -79,5 +86,6 @@ func (m *Message) ParseTS() time.Time {
 	if err != nil {
 		return time.Now()
 	}
+
 	return t
 }

cmd/chat-cli/main.go

@@ -1,3 +1,4 @@
+// Package main is the entry point for the chat-cli client.
 package main
 
 import (
@@ -7,7 +8,14 @@ import (
 	"sync"
 	"time"
 
-	"git.eeqj.de/sneak/chat/cmd/chat-cli/api"
+	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.
@@ -17,14 +25,14 @@ type App struct {
 
 	mu        sync.Mutex
 	nick      string
-	target    string // current target (#channel or nick for DM)
+	target    string
 	connected bool
-	lastMsgID string
+	lastQID   int64
 	stopPoll  chan struct{}
 }
 
 func main() {
-	app := &App{
+	app := &App{ //nolint:exhaustruct
 		ui:   NewUI(),
 		nick: "guest",
 	}
@@ -32,10 +40,17 @@ func main() {
 	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(
-	app.ui.AddStatus("Type [yellow]/connect <server-url>[white] to begin, or [yellow]/help[white] for commands")
+		"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",
+	)
 
-	if err := app.ui.Run(); err != nil {
+	err := app.ui.Run()
+	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(1)
 	}
@@ -44,50 +59,70 @@ func main() {
 func (a *App) handleInput(text string) {
 	if strings.HasPrefix(text, "/") {
 		a.handleCommand(text)
+
 		return
 	}
 
-	// Plain text → PRIVMSG to current target.
 	a.mu.Lock()
 	target := a.target
 	connected := a.connected
 	a.mu.Unlock()
 
 	if !connected {
-		a.ui.AddStatus("[red]Not connected. Use /connect <url>")
+		a.ui.AddStatus(
-		return
+			"[red]Not connected. Use /connect <url>",
-	}
+		)
-	if target == "" {
+
-		a.ui.AddStatus("[red]No target. Use /join #channel or /query nick")
 		return
 	}
 
-	err := a.client.SendMessage(&api.Message{
+	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(fmt.Sprintf("[red]Send error: %v", err))
+		a.ui.AddStatus(
+			"[red]Send error: " + err.Error(),
+		)
+
 		return
 	}
 
-	// Echo locally.
+	timestamp := time.Now().Format(timeFormat)
-	ts := time.Now().Format("15:04")
+
 	a.mu.Lock()
 	nick := a.nick
 	a.mu.Unlock()
-	a.ui.AddLine(target, fmt.Sprintf("[gray]%s [green]<%s>[white] %s", ts, nick, text))
+
+	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, " ", 2)
+	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)
@@ -114,27 +149,37 @@ func (a *App) handleCommand(text string) {
 	case "/help":
 		a.cmdHelp()
 	default:
-		a.ui.AddStatus(fmt.Sprintf("[red]Unknown command: %s", cmd))
+		a.ui.AddStatus(
+			"[red]Unknown command: " + cmd,
+		)
 	}
 }
 
 func (a *App) cmdConnect(serverURL string) {
 	if serverURL == "" {
-		a.ui.AddStatus("[red]Usage: /connect <server-url>")
+		a.ui.AddStatus(
+			"[red]Usage: /connect <server-url>",
+		)
+
 		return
 	}
+
 	serverURL = strings.TrimRight(serverURL, "/")
 
-	a.ui.AddStatus(fmt.Sprintf("Connecting to %s...", 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))
+		a.ui.AddStatus(fmt.Sprintf(
+			"[red]Connection failed: %v", err,
+		))
+
 		return
 	}
 
@@ -142,22 +187,29 @@ func (a *App) cmdConnect(serverURL string) {
 	a.client = client
 	a.nick = resp.Nick
 	a.connected = true
-	a.lastMsgID = ""
+	a.lastQID = 0
 	a.mu.Unlock()
 
-	a.ui.AddStatus(fmt.Sprintf("[green]Connected! Nick: %s, Session: %s", resp.Nick, resp.SessionID))
+	a.ui.AddStatus(fmt.Sprintf(
+		"[green]Connected! Nick: %s, Session: %d",
+		resp.Nick, resp.ID,
+	))
 	a.ui.SetStatus(resp.Nick, "", "connected")
 
-	// Start polling.
 	a.stopPoll = make(chan struct{})
+
 	go a.pollLoop()
 }
 
 func (a *App) cmdNick(nick string) {
 	if nick == "" {
-		a.ui.AddStatus("[red]Usage: /nick <name>")
+		a.ui.AddStatus(
+			"[red]Usage: /nick <name>",
+		)
+
 		return
 	}
+
 	a.mu.Lock()
 	connected := a.connected
 	a.mu.Unlock()
@@ -166,16 +218,24 @@ func (a *App) cmdNick(nick string) {
 		a.mu.Lock()
 		a.nick = nick
 		a.mu.Unlock()
-		a.ui.AddStatus(fmt.Sprintf("Nick set to %s (will be used on connect)", nick))
+
+		a.ui.AddStatus(
+			"Nick set to " + nick +
+				" (will be used on connect)",
+		)
+
 		return
 	}
 
-	err := a.client.SendMessage(&api.Message{
+	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))
+		a.ui.AddStatus(fmt.Sprintf(
+			"[red]Nick change failed: %v", err,
+		))
+
 		return
 	}
 
@@ -183,15 +243,20 @@ func (a *App) cmdNick(nick string) {
 	a.nick = nick
 	target := a.target
 	a.mu.Unlock()
+
 	a.ui.SetStatus(nick, target, "connected")
-	a.ui.AddStatus(fmt.Sprintf("Nick changed to %s", nick))
+	a.ui.AddStatus("Nick changed to " + nick)
 }
 
 func (a *App) cmdJoin(channel string) {
 	if channel == "" {
-		a.ui.AddStatus("[red]Usage: /join #channel")
+		a.ui.AddStatus(
+			"[red]Usage: /join #channel",
+		)
+
 		return
 	}
+
 	if !strings.HasPrefix(channel, "#") {
 		channel = "#" + channel
 	}
@@ -199,14 +264,19 @@ func (a *App) cmdJoin(channel string) {
 	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))
+		a.ui.AddStatus(fmt.Sprintf(
+			"[red]Join failed: %v", err,
+		))
+
 		return
 	}
 
@@ -216,7 +286,9 @@ func (a *App) cmdJoin(channel string) {
 	a.mu.Unlock()
 
 	a.ui.SwitchToBuffer(channel)
-	a.ui.AddLine(channel, fmt.Sprintf("[yellow]*** Joined %s", channel))
+	a.ui.AddLine(channel,
+		"[yellow]*** Joined "+channel,
+	)
 	a.ui.SetStatus(nick, channel, "connected")
 }
 
@@ -225,30 +297,41 @@ func (a *App) cmdPart(channel string) {
 	if channel == "" {
 		channel = a.target
 	}
+
 	connected := a.connected
 	a.mu.Unlock()
 
-	if channel == "" || !strings.HasPrefix(channel, "#") {
+	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))
+		a.ui.AddStatus(fmt.Sprintf(
+			"[red]Part failed: %v", err,
+		))
+
 		return
 	}
 
-	a.ui.AddLine(channel, fmt.Sprintf("[yellow]*** Left %s", channel))
+	a.ui.AddLine(channel,
+		"[yellow]*** Left "+channel,
+	)
 
 	a.mu.Lock()
 	if a.target == channel {
 		a.target = ""
 	}
+
 	nick := a.nick
 	a.mu.Unlock()
 
@@ -257,39 +340,55 @@ func (a *App) cmdPart(channel string) {
 }
 
 func (a *App) cmdMsg(args string) {
-	parts := strings.SplitN(args, " ", 2)
+	parts := strings.SplitN(args, " ", splitParts)
-	if len(parts) < 2 {
+	if len(parts) < splitParts {
-		a.ui.AddStatus("[red]Usage: /msg <nick> <text>")
+		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{
+	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))
+		a.ui.AddStatus(fmt.Sprintf(
+			"[red]Send failed: %v", err,
+		))
+
 		return
 	}
 
-	ts := time.Now().Format("15:04")
+	timestamp := time.Now().Format(timeFormat)
-	a.ui.AddLine(target, fmt.Sprintf("[gray]%s [green]<%s>[white] %s", ts, nick, text))
+
+	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>")
+		a.ui.AddStatus(
+			"[red]Usage: /query <nick>",
+		)
+
 		return
 	}
 
@@ -310,32 +409,39 @@ func (a *App) cmdTopic(args string) {
 
 	if !connected {
 		a.ui.AddStatus("[red]Not connected")
+
 		return
 	}
+
 	if !strings.HasPrefix(target, "#") {
 		a.ui.AddStatus("[red]Not in a channel")
+
 		return
 	}
 
 	if args == "" {
-		// Query topic.
+		err := a.client.SendMessage(&api.Message{ //nolint:exhaustruct
-		err := a.client.SendMessage(&api.Message{
 			Command: "TOPIC",
 			To:      target,
 		})
 		if err != nil {
-			a.ui.AddStatus(fmt.Sprintf("[red]Topic query failed: %v", err))
+			a.ui.AddStatus(fmt.Sprintf(
+				"[red]Topic query failed: %v", err,
+			))
 		}
+
 		return
 	}
 
-	err := a.client.SendMessage(&api.Message{
+	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))
+		a.ui.AddStatus(fmt.Sprintf(
+			"[red]Topic set failed: %v", err,
+		))
 	}
 }
 
@@ -347,20 +453,29 @@ func (a *App) cmdNames() {
 
 	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))
+		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, " ")))
+	a.ui.AddLine(target, fmt.Sprintf(
+		"[cyan]*** Members of %s: %s",
+		target, strings.Join(members, " "),
+	))
 }
 
 func (a *App) cmdList() {
@@ -370,47 +485,60 @@ func (a *App) cmdList() {
 
 	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))
+		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(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>")
+		a.ui.AddStatus(
+			"[red]Usage: /window <number>",
+		)
+
 		return
 	}
-	n := 0
+
-	fmt.Sscanf(args, "%d", &n)
+	var bufIndex int
-	a.ui.SwitchBuffer(n)
+
+	_, _ = fmt.Sscanf(args, "%d", &bufIndex)
+
+	a.ui.SwitchBuffer(bufIndex)
 
 	a.mu.Lock()
-	if n < a.ui.BufferCount() && n >= 0 {
-		// Update target to the buffer name.
-		// Needs to be done carefully.
-	}
 	nick := a.nick
 	a.mu.Unlock()
 
-	// Update target based on buffer.
+	if bufIndex >= 0 && bufIndex < a.ui.BufferCount() {
-	if n < a.ui.BufferCount() {
+		buf := a.ui.buffers[bufIndex]
-		buf := a.ui.buffers[n]
 		if buf.Name != "(status)" {
 			a.mu.Lock()
 			a.target = buf.Name
 			a.mu.Unlock()
-			a.ui.SetStatus(nick, buf.Name, "connected")
+
+			a.ui.SetStatus(
+				nick, buf.Name, "connected",
+			)
 		} else {
 			a.ui.SetStatus(nick, "", "connected")
 		}
@@ -419,12 +547,17 @@ func (a *App) cmdWindow(args string) {
 
 func (a *App) cmdQuit() {
 	a.mu.Lock()
+
 	if a.connected && a.client != nil {
-		_ = a.client.SendMessage(&api.Message{Command: "QUIT"})
+		_ = a.client.SendMessage(
+			&api.Message{Command: "QUIT"}, //nolint:exhaustruct
+		)
 	}
+
 	if a.stopPoll != nil {
 		close(a.stopPoll)
 	}
+
 	a.mu.Unlock()
 	a.ui.Stop()
 }
@@ -441,11 +574,12 @@ func (a *App) cmdHelp() {
 		"  /topic [text]   — View/set topic",
 		"  /names          — List channel members",
 		"  /list           — List channels",
-		"  /window <n>     — Switch buffer (Alt+0-9)",
+		"  /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)
 	}
@@ -462,39 +596,36 @@ func (a *App) pollLoop() {
 
 		a.mu.Lock()
 		client := a.client
-		lastID := a.lastMsgID
+		lastQID := a.lastQID
 		a.mu.Unlock()
 
 		if client == nil {
 			return
 		}
 
-		msgs, err := client.PollMessages(lastID, 15)
+		result, err := client.PollMessages(
+			lastQID, pollTimeout,
+		)
 		if err != nil {
-			// Transient error — retry after delay.
+			time.Sleep(pollRetry)
-			time.Sleep(2 * time.Second)
+
 			continue
 		}
 
-		for _, msg := range msgs {
+		if result.LastID > 0 {
-			a.handleServerMessage(&msg)
-			if msg.ID != "" {
 			a.mu.Lock()
-				a.lastMsgID = msg.ID
+			a.lastQID = result.LastID
 			a.mu.Unlock()
 		}
+
+		for i := range result.Messages {
+			a.handleServerMessage(&result.Messages[i])
 		}
 	}
 }
 
 func (a *App) handleServerMessage(msg *api.Message) {
-	ts := ""
+	timestamp := a.formatTS(msg)
-	if msg.TS != "" {
-		t := msg.ParseTS()
-		ts = t.Local().Format("15:04")
-	} else {
-		ts = time.Now().Format("15:04")
-	}
 
 	a.mu.Lock()
 	myNick := a.nick
@@ -502,79 +633,172 @@ func (a *App) handleServerMessage(msg *api.Message) {
 
 	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 {
-			// Skip our own echoed messages (already displayed locally).
 		return
 	}
+
 	target := msg.To
 	if !strings.HasPrefix(target, "#") {
-			// DM — use sender's nick as buffer name.
 		target = msg.From
 	}
-		a.ui.AddLine(target, fmt.Sprintf("[gray]%s [green]<%s>[white] %s", ts, msg.From, text))
 
-	case "JOIN":
+	a.ui.AddLine(target, fmt.Sprintf(
-		target := msg.To
+		"[gray]%s [green]<%s>[white] %s",
-		if target != "" {
+		timestamp, msg.From, text,
-			a.ui.AddLine(target, fmt.Sprintf("[gray]%s [yellow]*** %s has joined %s", ts, msg.From, target))
+	))
+}
+
+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
 	}
 
-	case "PART":
-		target := msg.To
 	lines := msg.BodyLines()
 	reason := strings.Join(lines, " ")
-		if target != "" {
+
 	if reason != "" {
-				a.ui.AddLine(target, fmt.Sprintf("[gray]%s [yellow]*** %s has left %s (%s)", ts, msg.From, target, 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(target, fmt.Sprintf("[gray]%s [yellow]*** %s has left %s", ts, msg.From, target))
+		a.ui.AddLine(msg.To, fmt.Sprintf(
+			"[gray]%s [yellow]*** %s has left %s",
+			timestamp, msg.From, msg.To,
+		))
 	}
 }
 
-	case "QUIT":
+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)", ts, msg.From, 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", ts, msg.From))
+		a.ui.AddStatus(fmt.Sprintf(
+			"[gray]%s [yellow]*** %s has quit",
+			timestamp, msg.From,
+		))
+	}
 }
 
-	case "NICK":
+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", ts, msg.From, newNick))
 
-	case "NOTICE":
+	a.ui.AddStatus(fmt.Sprintf(
-		lines := msg.BodyLines()
+		"[gray]%s [yellow]*** %s is now known as %s",
-		text := strings.Join(lines, " ")
+		timestamp, msg.From, newNick,
-		a.ui.AddStatus(fmt.Sprintf("[gray]%s [magenta]--%s-- %s", ts, msg.From, text))
+	))
-
-	case "TOPIC":
-		lines := msg.BodyLines()
-		text := strings.Join(lines, " ")
-		if msg.To != "" {
-			a.ui.AddLine(msg.To, fmt.Sprintf("[gray]%s [cyan]*** %s set topic: %s", ts, msg.From, text))
 }
 
-	default:
+func (a *App) handleNoticeEvent(
-		// Numeric replies and other messages → status window.
+	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", ts, msg.Command, text))
+		a.ui.AddStatus(fmt.Sprintf(
-		}
+			"[gray]%s [white][%s] %s",
+			timestamp, msg.Command, text,
+		))
 	}
 }

cmd/chat-cli/ui.go

@@ -32,61 +32,20 @@ type UI struct {
 
 // NewUI creates the tview-based IRC-like UI.
 func NewUI() *UI {
-	ui := &UI{
+	ui := &UI{ //nolint:exhaustruct,varnamelen // fields set below; ui is idiomatic
 		app: tview.NewApplication(),
 		buffers: []*Buffer{
-			{Name: "(status)", Lines: nil},
+			{Name: "(status)", Lines: nil, Unread: 0},
 		},
 	}
 
-	// Message area.
+	ui.initMessages()
-	ui.messages = tview.NewTextView().
+	ui.initStatusBar()
-		SetDynamicColors(true).
+	ui.initInput()
-		SetScrollable(true).
+	ui.initKeyCapture()
-		SetWordWrap(true).
-		SetChangedFunc(func() {
-			ui.app.Draw()
-		})
-	ui.messages.SetBorder(false)
 
-	// Status bar.
+	ui.layout = tview.NewFlex().
-	ui.statusBar = tview.NewTextView().
+		SetDirection(tview.FlexRow).
-		SetDynamicColors(true)
-	ui.statusBar.SetBackgroundColor(tcell.ColorNavy)
-	ui.statusBar.SetTextColor(tcell.ColorWhite)
-
-	// Input field.
-	ui.input = tview.NewInputField().
-		SetFieldBackgroundColor(tcell.ColorBlack).
-		SetFieldTextColor(tcell.ColorWhite)
-	ui.input.SetDoneFunc(func(key tcell.Key) {
-		if key == tcell.KeyEnter {
-			text := ui.input.GetText()
-			if text == "" {
-				return
-			}
-			ui.input.SetText("")
-			if ui.onInput != nil {
-				ui.onInput(text)
-			}
-		}
-	})
-
-	// Capture Alt+N for window switching.
-	ui.app.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-		if event.Modifiers()&tcell.ModAlt != 0 {
-			r := event.Rune()
-			if r >= '0' && r <= '9' {
-				idx := int(r - '0')
-				ui.SwitchBuffer(idx)
-				return nil
-			}
-		}
-		return event
-	})
-
-	// Layout: messages on top, status bar, input at bottom.
-	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)
@@ -99,7 +58,12 @@ func NewUI() *UI {
 
 // Run starts the UI event loop (blocks).
 func (ui *UI) Run() error {
-	return ui.app.Run()
+	err := ui.app.Run()
+	if err != nil {
+		return fmt.Errorf("run ui: %w", err)
+	}
+
+	return nil
 }
 
 // Stop stops the UI.
@@ -113,97 +77,207 @@ func (ui *UI) OnInput(fn func(string)) {
 }
 
 // AddLine adds a line to the specified buffer.
-func (ui *UI) AddLine(bufferName string, line string) {
+func (ui *UI) AddLine(bufferName, line string) {
 	ui.app.QueueUpdateDraw(func() {
 		buf := ui.getOrCreateBuffer(bufferName)
 		buf.Lines = append(buf.Lines, line)
 
-		// Mark unread if not currently viewing this buffer.
+		cur := ui.buffers[ui.currentBuffer]
-		if ui.buffers[ui.currentBuffer] != buf {
+		if cur != buf {
 			buf.Unread++
-			ui.refreshStatus()
+
+			ui.refreshStatusBar()
 		}
 
-		// If viewing this buffer, append to display.
+		if cur == buf {
-		if ui.buffers[ui.currentBuffer] == buf {
+			_, _ = fmt.Fprintln(ui.messages, line)
-			fmt.Fprintln(ui.messages, line)
 		}
 	})
 }
 
-// AddStatus adds a line to the status buffer (buffer 0).
+// AddStatus adds a line to the status buffer.
 func (ui *UI) AddStatus(line string) {
 	ts := time.Now().Format("15:04")
-	ui.AddLine("(status)", fmt.Sprintf("[gray]%s[white] %s", ts, line))
+	ui.AddLine(
+		"(status)",
+		"[gray]"+ts+"[white] "+line,
+	)
 }
 
 // SwitchBuffer switches to the buffer at index n.
-func (ui *UI) SwitchBuffer(n int) {
+func (ui *UI) SwitchBuffer(bufIndex int) {
 	ui.app.QueueUpdateDraw(func() {
-		if n < 0 || n >= len(ui.buffers) {
+		if bufIndex < 0 || bufIndex >= len(ui.buffers) {
 			return
 		}
-		ui.currentBuffer = n
+
-		buf := ui.buffers[n]
+		ui.currentBuffer = bufIndex
+
+		buf := ui.buffers[bufIndex]
 		buf.Unread = 0
+
 		ui.messages.Clear()
+
 		for _, line := range buf.Lines {
-			fmt.Fprintln(ui.messages, line)
+			_, _ = fmt.Fprintln(ui.messages, line)
 		}
+
 		ui.messages.ScrollToEnd()
-		ui.refreshStatus()
+		ui.refreshStatusBar()
 	})
 }
 
-// SwitchToBuffer switches to the named buffer, creating it if needed.
+// 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)
+			_, _ = fmt.Fprintln(ui.messages, line)
 		}
+
 		ui.messages.ScrollToEnd()
-		ui.refreshStatus()
+		ui.refreshStatusBar()
 	})
 }
 
 // SetStatus updates the status bar text.
-func (ui *UI) SetStatus(nick, target, connStatus string) {
+func (ui *UI) SetStatus(
+	nick, target, connStatus string,
+) {
 	ui.app.QueueUpdateDraw(func() {
-		ui.refreshStatusWith(nick, target, connStatus)
+		ui.renderStatusBar(nick, target, connStatus)
 	})
 }
 
-func (ui *UI) refreshStatus() {
+// BufferCount returns the number of buffers.
-	// Will be called from the main goroutine via QueueUpdateDraw parent.
+func (ui *UI) BufferCount() int {
-	// Rebuild status from app state — caller must provide context.
+	return len(ui.buffers)
 }
 
-func (ui *UI) refreshStatusWith(nick, target, connStatus string) {
+// 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))
+			unreadParts = append(unreadParts,
+				fmt.Sprintf(
+					"%d:%s(%d)",
+					i, buf.Name, buf.Unread,
+				),
+			)
 		}
 	}
+
 	unread := ""
 	if len(unreadParts) > 0 {
-		unread = " [Act: " + strings.Join(unreadParts, ",") + "]"
+		unread = " [Act: " +
+			strings.Join(unreadParts, ",") + "]"
 	}
 
-	bufInfo := fmt.Sprintf("[%d:%s]", ui.currentBuffer, ui.buffers[ui.currentBuffer].Name)
+	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)
+	_, _ = fmt.Fprintf(ui.statusBar,
+		" [%s] %s %s %s%s",
+		connStatus, nick, bufInfo, target, unread,
+	)
 }
 
 func (ui *UI) getOrCreateBuffer(name string) *Buffer {
@@ -212,22 +286,9 @@ func (ui *UI) getOrCreateBuffer(name string) *Buffer {
 			return buf
 		}
 	}
-	buf := &Buffer{Name: name}
+
+	buf := &Buffer{Name: name, Lines: nil, Unread: 0}
 	ui.buffers = append(ui.buffers, buf)
+
 	return buf
 }
-
-// BufferCount returns the number of buffers.
-func (ui *UI) BufferCount() int {
-	return len(ui.buffers)
-}
-
-// BufferIndex returns the index of a named buffer, or -1.
-func (ui *UI) BufferIndex(name string) int {
-	for i, buf := range ui.buffers {
-		if buf.Name == name {
-			return i
-		}
-	}
-	return -1
-}

internal/broker/broker.go

@@ -0,0 +1,73 @@
+// 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)
+	}
+}

internal/broker/broker_test.go

@@ -0,0 +1,121 @@
+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.
+}

internal/config/config.go

@@ -36,12 +36,15 @@ type Config struct {
 	MOTD               string
 	ServerName         string
 	FederationKey      string
+	SessionIdleTimeout 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
 
@@ -64,6 +67,7 @@ func New(_ fx.Lifecycle, params Params) (*Config, error) {
 	viper.SetDefault("MOTD", "")
 	viper.SetDefault("SERVER_NAME", "")
 	viper.SetDefault("FEDERATION_KEY", "")
+	viper.SetDefault("SESSION_IDLE_TIMEOUT", "24h")
 
 	err := viper.ReadInConfig()
 	if err != nil {
@@ -74,7 +78,7 @@ func New(_ fx.Lifecycle, params Params) (*Config, error) {
 		}
 	}
 
-	s := &Config{
+	cfg := &Config{
 		DBURL:              viper.GetString("DBURL"),
 		Debug:              viper.GetBool("DEBUG"),
 		Port:               viper.GetInt("PORT"),
@@ -88,14 +92,15 @@ func New(_ fx.Lifecycle, params Params) (*Config, error) {
 		MOTD:               viper.GetString("MOTD"),
 		ServerName:         viper.GetString("SERVER_NAME"),
 		FederationKey:      viper.GetString("FEDERATION_KEY"),
+		SessionIdleTimeout: viper.GetString("SESSION_IDLE_TIMEOUT"),
 		log:                log,
 		params:             &params,
 	}
 
-	if s.Debug {
+	if cfg.Debug {
 		params.Logger.EnableDebugLogging()
-		s.log = params.Logger.Get()
+		cfg.log = params.Logger.Get()
 	}
 
-	return s, nil
+	return cfg, nil
 }

internal/db/db.go

@@ -11,20 +11,16 @@ 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" // loads .env file
+	_ "github.com/joho/godotenv/autoload" // .env
-	_ "modernc.org/sqlite"                // SQLite driver
+	_ "modernc.org/sqlite"                // driver
 )
 
-const (
+const minMigrationParts = 2
-	minMigrationParts = 2
-)
 
 // SchemaFiles contains embedded SQL migration files.
 //
@@ -39,87 +35,95 @@ type Params struct {
 	Config *config.Config
 }
 
-// Database manages the SQLite database connection and migrations.
+// Database manages the SQLite connection and migrations.
 type Database struct {
-	db     *sql.DB
+	conn   *sql.DB
 	log    *slog.Logger
 	params *Params
 }
 
-// GetDB returns the underlying sql.DB connection.
+// New creates a new Database and registers lifecycle hooks.
-func (s *Database) GetDB() *sql.DB {
+func New(
-	return s.db
+	lifecycle fx.Lifecycle,
+	params Params,
+) (*Database, error) {
+	database := &Database{ //nolint:exhaustruct // conn set in OnStart
+		params: &params,
+		log:    params.Logger.Get(),
 	}
 
-// NewChannel creates a Channel model instance with the db reference injected.
+	database.log.Info("Database instantiated")
-func (s *Database) NewChannel(id int64, name, topic, modes string, createdAt, updatedAt time.Time) *models.Channel {
-	c := &models.Channel{
-		ID:        id,
-		Name:      name,
-		Topic:     topic,
-		Modes:     modes,
-		CreatedAt: createdAt,
-		UpdatedAt: updatedAt,
-	}
-	c.SetDB(s)
 
-	return c
+	lifecycle.Append(fx.Hook{
-}
-
-// 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()
-
-	s.log.Info("Database instantiated")
-
-	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
-			s.log.Info("Database OnStart Hook")
+			database.log.Info("Database OnStart Hook")
 
-			return s.connect(ctx)
+			return database.connect(ctx)
 		},
 		OnStop: func(_ context.Context) error {
-			s.log.Info("Database OnStop Hook")
+			database.log.Info("Database OnStop Hook")
 
-			if s.db != nil {
+			if database.conn != nil {
-				return s.db.Close()
+				closeErr := database.conn.Close()
+				if closeErr != nil {
+					return fmt.Errorf(
+						"close db: %w", closeErr,
+					)
+				}
 			}
 
 			return nil
 		},
 	})
 
-	return s, nil
+	return database, nil
 }
 
-func (s *Database) connect(ctx context.Context) error {
+// GetDB returns the underlying sql.DB connection.
-	dbURL := s.params.Config.DBURL
+func (database *Database) GetDB() *sql.DB {
+	return database.conn
+}
+
+func (database *Database) connect(ctx context.Context) error {
+	dbURL := database.params.Config.DBURL
 	if dbURL == "" {
-		dbURL = "file:./data.db?_journal_mode=WAL"
+		dbURL = "file:./data.db?_journal_mode=WAL&_busy_timeout=5000"
 	}
 
-	s.log.Info("connecting to database", "url", dbURL)
+	database.log.Info(
+		"connecting to database", "url", dbURL,
+	)
 
-	d, err := sql.Open("sqlite", dbURL)
+	conn, err := sql.Open("sqlite", dbURL)
 	if err != nil {
-		s.log.Error("failed to open database", "error", err)
+		return fmt.Errorf("open database: %w", err)
-
-		return err
 	}
 
-	err = d.PingContext(ctx)
+	err = conn.PingContext(ctx)
 	if err != nil {
-		s.log.Error("failed to ping database", "error", err)
+		return fmt.Errorf("ping database: %w", err)
-
-		return err
 	}
 
-	s.db = d
+	conn.SetMaxOpenConns(1)
-	s.log.Info("database connected")
 
-	return s.runMigrations(ctx)
+	database.conn = conn
+	database.log.Info("database connected")
+
+	_, err = database.conn.ExecContext(
+		ctx, "PRAGMA foreign_keys = ON",
+	)
+	if 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)
 }
 
 type migration struct {
@@ -128,65 +132,152 @@ type migration struct {
 	sql     string
 }
 
-func (s *Database) runMigrations(ctx context.Context) error {
+func (database *Database) runMigrations(
-	err := s.bootstrapMigrationsTable(ctx)
+	ctx context.Context,
-	if err != nil {
+) error {
-		return err
+	_, err := database.conn.ExecContext(ctx,
-	}
+		`CREATE TABLE IF NOT EXISTS schema_migrations (
-
-	migrations, err := s.loadMigrations()
-	if err != nil {
-		return err
-	}
-
-	err = s.applyMigrations(ctx, migrations)
-	if err != nil {
-		return err
-	}
-
-	s.log.Info("database migrations complete")
-
-	return nil
-}
-
-func (s *Database) bootstrapMigrationsTable(ctx context.Context) error {
-	_, err := s.db.ExecContext(ctx, `CREATE TABLE IF NOT EXISTS schema_migrations (
 		 version INTEGER PRIMARY KEY,
-		applied_at DATETIME DEFAULT CURRENT_TIMESTAMP
+		 applied_at DATETIME DEFAULT CURRENT_TIMESTAMP)`)
-	)`)
 	if err != nil {
-		return fmt.Errorf("failed to create schema_migrations table: %w", err)
+		return fmt.Errorf(
+			"create schema_migrations: %w", err,
+		)
+	}
+
+	migrations, err := database.loadMigrations()
+	if err != nil {
+		return err
+	}
+
+	for _, mig := range migrations {
+		err = database.applyMigration(ctx, mig)
+		if err != nil {
+			return err
+		}
+	}
+
+	database.log.Info("database migrations complete")
+
+	return nil
+}
+
+func (database *Database) applyMigration(
+	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)
+	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,
+		)
 	}
 
 	return nil
 }
 
-func (s *Database) loadMigrations() ([]migration, error) {
+func (database *Database) loadMigrations() (
+	[]migration,
+	error,
+) {
 	entries, err := fs.ReadDir(SchemaFiles, "schema")
 	if err != nil {
-		return nil, fmt.Errorf("failed to read schema dir: %w", err)
+		return nil, fmt.Errorf(
+			"read schema dir: %w", err,
+		)
 	}
 
-	var migrations []migration
+	migrations := make([]migration, 0, len(entries))
 
 	for _, entry := range entries {
-		if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".sql") {
+		if entry.IsDir() ||
+			!strings.HasSuffix(entry.Name(), ".sql") {
 			continue
 		}
 
-		parts := strings.SplitN(entry.Name(), "_", minMigrationParts)
+		parts := strings.SplitN(
+			entry.Name(), "_", minMigrationParts,
+		)
 		if len(parts) < minMigrationParts {
 			continue
 		}
 
-		version, err := strconv.Atoi(parts[0])
+		version, parseErr := strconv.Atoi(parts[0])
-		if err != nil {
+		if parseErr != nil {
 			continue
 		}
 
-		content, err := SchemaFiles.ReadFile("schema/" + entry.Name())
+		content, readErr := SchemaFiles.ReadFile(
-		if err != nil {
+			"schema/" + entry.Name(),
-			return nil, fmt.Errorf("failed to read migration %s: %w", entry.Name(), err)
+		)
+		if readErr != nil {
+			return nil, fmt.Errorf(
+				"read migration %s: %w",
+				entry.Name(), readErr,
+			)
 		}
 
 		migrations = append(migrations, migration{
@@ -202,32 +293,3 @@ func (s *Database) loadMigrations() ([]migration, error) {
 
 	return migrations, nil
 }
-
-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("failed to check migration %d: %w", m.version, err)
-		}
-
-		if exists > 0 {
-			continue
-		}
-
-		s.log.Info("applying migration", "version", m.version, "name", m.name)
-
-		_, err = s.db.ExecContext(ctx, m.sql)
-		if err != nil {
-			return fmt.Errorf("failed to apply migration %d (%s): %w", m.version, m.name, err)
-		}
-
-		_, err = s.db.ExecContext(ctx, "INSERT INTO schema_migrations (version) VALUES (?)", m.version)
-		if err != nil {
-			return fmt.Errorf("failed to record migration %d: %w", m.version, err)
-		}
-	}
-
-	return nil
-}

internal/db/export_test.go

@@ -0,0 +1,60 @@
+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
+}

internal/db/queries_test.go

@@ -0,0 +1,653 @@
+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))
+	}
+}

internal/db/schema/001_initial.sql

@@ -1,4 +1,67 @@
-CREATE TABLE IF NOT EXISTS schema_migrations (
+-- Chat server schema (pre-1.0 consolidated)
-    version INTEGER PRIMARY KEY,
+PRAGMA foreign_keys = ON;
-    applied_at DATETIME DEFAULT CURRENT_TIMESTAMP
+
+-- 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 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);

internal/db/schema/002_tables.sql

@@ -1,8 +0,0 @@
-CREATE TABLE IF NOT EXISTS channels (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    name TEXT NOT NULL UNIQUE,
-    topic TEXT NOT NULL DEFAULT '',
-    modes TEXT NOT NULL DEFAULT '',
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
-);

internal/db/schema/003_users.sql

@@ -1,31 +0,0 @@
-PRAGMA foreign_keys = ON;
-
-CREATE TABLE IF NOT EXISTS users (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    nick TEXT NOT NULL UNIQUE,
-    token TEXT NOT NULL UNIQUE,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    last_seen DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-
-CREATE TABLE IF NOT EXISTS channel_members (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    channel_id INTEGER NOT NULL REFERENCES channels(id) ON DELETE CASCADE,
-    user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    joined_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    UNIQUE(channel_id, user_id)
-);
-
-CREATE TABLE IF NOT EXISTS messages (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    channel_id INTEGER REFERENCES channels(id) ON DELETE CASCADE,
-    user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    content TEXT NOT NULL,
-    is_dm INTEGER NOT NULL DEFAULT 0,
-    dm_target_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-
-CREATE INDEX IF NOT EXISTS idx_messages_channel ON messages(channel_id, created_at);
-CREATE INDEX IF NOT EXISTS idx_messages_dm ON messages(user_id, dm_target_id, created_at);
-CREATE INDEX IF NOT EXISTS idx_users_token ON users(token);

internal/handlers/handlers.go

@@ -4,9 +4,12 @@ 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"
@@ -15,6 +18,8 @@ import (
 	"go.uber.org/fx"
 )
 
+var errUnauthorized = errors.New("unauthorized")
+
 // Params defines the dependencies for creating Handlers.
 type Params struct {
 	fx.In
@@ -26,37 +31,151 @@ type Params struct {
 	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
 }
 
 // New creates a new Handlers instance.
-func New(lc fx.Lifecycle, params Params) (*Handlers, error) {
+func New(
-	s := new(Handlers)
+	lifecycle fx.Lifecycle,
-	s.params = &params
+	params Params,
-	s.log = params.Logger.Get()
+) (*Handlers, error) {
-	s.hc = params.Healthcheck
+	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()
 
-	lc.Append(fx.Hook{
-		OnStart: func(_ context.Context) error {
 			return nil
 		},
 	})
 
-	return s, nil
+	return hdlr, nil
 }
 
-func (s *Handlers) respondJSON(w http.ResponseWriter, _ *http.Request, data any, status int) {
+func (hdlr *Handlers) respondJSON(
-	w.WriteHeader(status)
+	writer http.ResponseWriter,
-	w.Header().Set("Content-Type", "application/json")
+	_ *http.Request,
+	data any,
+	status int,
+) {
+	writer.Header().Set(
+		"Content-Type",
+		"application/json; charset=utf-8",
+	)
+	writer.WriteHeader(status)
 
 	if data != nil {
-		err := json.NewEncoder(w).Encode(data)
+		err := json.NewEncoder(writer).Encode(data)
 		if err != nil {
-			s.log.Error("json encode error", "error", err)
+			hdlr.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,
+		)
+	}
+}

internal/handlers/healthcheck.go

@@ -7,9 +7,12 @@ import (
 const httpStatusOK = 200
 
 // HandleHealthCheck returns an HTTP handler for the health check endpoint.
-func (s *Handlers) HandleHealthCheck() http.HandlerFunc {
+func (hdlr *Handlers) HandleHealthCheck() http.HandlerFunc {
-	return func(w http.ResponseWriter, req *http.Request) {
+	return func(
-		resp := s.hc.Healthcheck()
+		writer http.ResponseWriter,
-		s.respondJSON(w, req, resp, httpStatusOK)
+		request *http.Request,
+	) {
+		resp := hdlr.hc.Healthcheck()
+		hdlr.respondJSON(writer, request, resp, httpStatusOK)
 	}
 }

internal/healthcheck/healthcheck.go

@@ -33,14 +33,17 @@ type Healthcheck struct {
 }
 
 // New creates a new Healthcheck instance.
-func New(lc fx.Lifecycle, params Params) (*Healthcheck, error) {
+func New(
-	s := new(Healthcheck)
+	lifecycle fx.Lifecycle, params Params,
-	s.params = &params
+) (*Healthcheck, error) {
-	s.log = params.Logger.Get()
+	hcheck := &Healthcheck{ //nolint:exhaustruct // StartupTime set in OnStart
+		params: &params,
+		log:    params.Logger.Get(),
+	}
 
-	lc.Append(fx.Hook{
+	lifecycle.Append(fx.Hook{
 		OnStart: func(_ context.Context) error {
-			s.StartupTime = time.Now()
+			hcheck.StartupTime = time.Now()
 
 			return nil
 		},
@@ -49,7 +52,7 @@ func New(lc fx.Lifecycle, params Params) (*Healthcheck, error) {
 		},
 	})
 
-	return s, nil
+	return hcheck, nil
 }
 
 // Response is the JSON response returned by the health endpoint.
@@ -64,19 +67,18 @@ type Response struct {
 }
 
 // Healthcheck returns the current health status of the server.
-func (s *Healthcheck) Healthcheck() *Response {
+func (hcheck *Healthcheck) Healthcheck() *Response {
-	resp := &Response{
+	return &Response{
 		Status:        "ok",
 		Now:           time.Now().UTC().Format(time.RFC3339Nano),
-		UptimeSeconds: int64(s.uptime().Seconds()),
+		UptimeSeconds: int64(hcheck.uptime().Seconds()),
-		UptimeHuman:   s.uptime().String(),
+		UptimeHuman:   hcheck.uptime().String(),
-		Appname:       s.params.Globals.Appname,
+		Appname:       hcheck.params.Globals.Appname,
-		Version:       s.params.Globals.Version,
+		Version:       hcheck.params.Globals.Version,
+		Maintenance:   hcheck.params.Config.MaintenanceMode,
+	}
 }
 
-	return resp
+func (hcheck *Healthcheck) uptime() time.Duration {
-}
+	return time.Since(hcheck.StartupTime)
-
-func (s *Healthcheck) uptime() time.Duration {
-	return time.Since(s.StartupTime)
 }

internal/logger/logger.go

@@ -23,51 +23,56 @@ type Logger struct {
 	params Params
 }
 
-// New creates a new Logger with appropriate handler based on terminal detection.
+// New creates a new Logger with appropriate handler
-func New(_ fx.Lifecycle, params Params) (*Logger, error) {
+// based on terminal detection.
-	l := new(Logger)
+func New(
-	l.level = new(slog.LevelVar)
+	_ fx.Lifecycle, params Params,
-	l.level.Set(slog.LevelInfo)
+) (*Logger, error) {
+	logger := new(Logger)
+	logger.level = new(slog.LevelVar)
+	logger.level.Set(slog.LevelInfo)
 
 	tty := false
+
 	if fileInfo, _ := os.Stdout.Stat(); (fileInfo.Mode() & os.ModeCharDevice) != 0 {
 		tty = true
 	}
 
-	var handler slog.Handler
+	opts := &slog.HandlerOptions{ //nolint:exhaustruct // ReplaceAttr optional
-	if tty {
+		Level:     logger.level,
-		handler = slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
-			Level:     l.level,
 		AddSource: true,
-		})
-	} else {
-		handler = slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
-			Level:     l.level,
-			AddSource: true,
-		})
 	}
 
-	l.log = slog.New(handler)
+	var handler slog.Handler
-	l.params = params
+	if tty {
+		handler = slog.NewTextHandler(os.Stdout, opts)
+	} else {
+		handler = slog.NewJSONHandler(os.Stdout, opts)
+	}
 
-	return l, nil
+	logger.log = slog.New(handler)
+	logger.params = params
+
+	return logger, nil
 }
 
 // EnableDebugLogging switches the log level to debug.
-func (l *Logger) EnableDebugLogging() {
+func (logger *Logger) EnableDebugLogging() {
-	l.level.Set(slog.LevelDebug)
+	logger.level.Set(slog.LevelDebug)
-	l.log.Debug("debug logging enabled", "debug", true)
+	logger.log.Debug(
+		"debug logging enabled", "debug", true,
+	)
 }
 
 // Get returns the underlying slog.Logger.
-func (l *Logger) Get() *slog.Logger {
+func (logger *Logger) Get() *slog.Logger {
-	return l.log
+	return logger.log
 }
 
 // Identify logs the application name and version at startup.
-func (l *Logger) Identify() {
+func (logger *Logger) Identify() {
-	l.log.Info("starting",
+	logger.log.Info("starting",
-		"appname", l.params.Globals.Appname,
+		"appname", logger.params.Globals.Appname,
-		"version", l.params.Globals.Version,
+		"version", logger.params.Globals.Version,
 	)
 }

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"
-	"github.com/go-chi/chi/middleware"
+	chimw "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,25 +38,28 @@ type Middleware struct {
 }
 
 // New creates a new Middleware instance.
-func New(_ fx.Lifecycle, params Params) (*Middleware, error) {
+func New(
-	s := new(Middleware)
+	_ fx.Lifecycle, params Params,
-	s.params = &params
+) (*Middleware, error) {
-	s.log = params.Logger.Get()
+	mware := &Middleware{
-
+		params: &params,
-	return s, nil
+		log:    params.Logger.Get(),
 	}
 
-func ipFromHostPort(hp string) string {
+	return mware, nil
-	h, _, err := net.SplitHostPort(hp)
+}
+
+func ipFromHostPort(hostPort string) string {
+	host, _, err := net.SplitHostPort(hostPort)
 	if err != nil {
 		return ""
 	}
 
-	if len(h) > 0 && h[0] == '[' {
+	if len(host) > 0 && host[0] == '[' {
-		return h[1 : len(h)-1]
+		return host[1 : len(host)-1]
 	}
 
-	return h
+	return host
 }
 
 type loggingResponseWriter struct {
@@ -65,9 +68,15 @@ type loggingResponseWriter struct {
 	statusCode int
 }
 
-// newLoggingResponseWriter wraps a ResponseWriter to capture the status code.
+// newLoggingResponseWriter wraps a ResponseWriter
-func newLoggingResponseWriter(w http.ResponseWriter) *loggingResponseWriter {
+// to capture the status code.
-	return &loggingResponseWriter{w, http.StatusOK}
+func newLoggingResponseWriter(
+	writer http.ResponseWriter,
+) *loggingResponseWriter {
+	return &loggingResponseWriter{
+		ResponseWriter: writer,
+		statusCode:     http.StatusOK,
+	}
 }
 
 func (lrw *loggingResponseWriter) WriteHeader(code int) {
@@ -76,43 +85,57 @@ func (lrw *loggingResponseWriter) WriteHeader(code int) {
 }
 
 // Logging returns middleware that logs each HTTP request.
-func (s *Middleware) Logging() func(http.Handler) http.Handler {
+func (mware *Middleware) Logging() func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		return http.HandlerFunc(
+			func(
+				writer http.ResponseWriter,
+				request *http.Request,
+			) {
 				start := time.Now()
-			lrw := newLoggingResponseWriter(w)
+				lrw := newLoggingResponseWriter(writer)
-			ctx := r.Context()
+				ctx := request.Context()
 
 				defer func() {
 					latency := time.Since(start)
 
-				reqID, _ := ctx.Value(middleware.RequestIDKey).(string)
+					reqID, _ := ctx.Value(
+						chimw.RequestIDKey,
+					).(string)
 
-				s.log.InfoContext(ctx, "request",
+					mware.log.InfoContext(
+						ctx, "request",
 						"request_start", start,
-					"method", r.Method,
+						"method", request.Method,
-					"url", r.URL.String(),
+						"url", request.URL.String(),
-					"useragent", r.UserAgent(),
+						"useragent", request.UserAgent(),
 						"request_id", reqID,
-					"referer", r.Referer(),
+						"referer", request.Referer(),
-					"proto", r.Proto,
+						"proto", request.Proto,
-					"remoteIP", ipFromHostPort(r.RemoteAddr),
+						"remoteIP",
+						ipFromHostPort(request.RemoteAddr),
 						"status", lrw.statusCode,
-					"latency_ms", latency.Milliseconds(),
+						"latency_ms",
+						latency.Milliseconds(),
 					)
 				}()
 
-			next.ServeHTTP(lrw, r)
+				next.ServeHTTP(lrw, request)
 			})
 	}
 }
 
 // CORS returns middleware that handles Cross-Origin Resource Sharing.
-func (s *Middleware) CORS() func(http.Handler) http.Handler {
+func (mware *Middleware) CORS() func(http.Handler) http.Handler {
-	return cors.Handler(cors.Options{
+	return cors.Handler(cors.Options{ //nolint:exhaustruct // optional fields
 		AllowedOrigins: []string{"*"},
-		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+		AllowedMethods: []string{
-		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
+			"GET", "POST", "PUT", "DELETE", "OPTIONS",
+		},
+		AllowedHeaders: []string{
+			"Accept", "Authorization",
+			"Content-Type", "X-CSRF-Token",
+		},
 		ExposedHeaders:   []string{"Link"},
 		AllowCredentials: false,
 		MaxAge:           corsMaxAge,
@@ -120,28 +143,34 @@ func (s *Middleware) CORS() func(http.Handler) http.Handler {
 }
 
 // Auth returns middleware that performs authentication.
-func (s *Middleware) Auth() func(http.Handler) http.Handler {
+func (mware *Middleware) Auth() func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		return http.HandlerFunc(
-			s.log.Info("AUTH: before request")
+			func(
-			next.ServeHTTP(w, r)
+				writer http.ResponseWriter,
+				request *http.Request,
+			) {
+				mware.log.Info("AUTH: before request")
+				next.ServeHTTP(writer, request)
 			})
 	}
 }
 
 // Metrics returns middleware that records HTTP metrics.
-func (s *Middleware) Metrics() func(http.Handler) http.Handler {
+func (mware *Middleware) Metrics() func(http.Handler) http.Handler {
-	mdlw := ghmm.New(ghmm.Config{
+	metricsMiddleware := ghmm.New(ghmm.Config{ //nolint:exhaustruct // optional fields
-		Recorder: metrics.NewRecorder(metrics.Config{}),
+		Recorder: metrics.NewRecorder(
+			metrics.Config{}, //nolint:exhaustruct // defaults
+		),
 	})
 
 	return func(next http.Handler) http.Handler {
-		return std.Handler("", mdlw, next)
+		return std.Handler("", metricsMiddleware, next)
 	}
 }
 
 // MetricsAuth returns middleware that protects metrics with basic auth.
-func (s *Middleware) MetricsAuth() func(http.Handler) http.Handler {
+func (mware *Middleware) MetricsAuth() func(http.Handler) http.Handler {
 	return basicauth.New(
 		"metrics",
 		map[string][]string{

internal/models/channel.go

@@ -1,17 +0,0 @@
-package models
-
-import (
-	"time"
-)
-
-// Channel represents a chat channel.
-type Channel struct {
-	Base
-
-	ID        int64     `json:"id"`
-	Name      string    `json:"name"`
-	Topic     string    `json:"topic"`
-	Modes     string    `json:"modes"`
-	CreatedAt time.Time `json:"createdAt"`
-	UpdatedAt time.Time `json:"updatedAt"`
-}

internal/models/model.go

@@ -1,20 +0,0 @@
-// Package models defines the data models used by the chat application.
-package models
-
-import "database/sql"
-
-// DB is the interface that models use to query relations.
-// This avoids a circular import with the db package.
-type DB interface {
-	GetDB() *sql.DB
-}
-
-// 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
-}

internal/server/http.go

@@ -4,6 +4,6 @@ import "time"
 
 const (
 	httpReadTimeout  = 10 * time.Second
-	httpWriteTimeout = 10 * time.Second
+	httpWriteTimeout = 60 * time.Second
 	maxHeaderBytes   = 1 << 20
 )

internal/server/routes.go

@@ -16,72 +16,145 @@ import (
 
 const routeTimeout = 60 * time.Second
 
-// SetupRoutes configures the HTTP routes and middleware chain.
+// SetupRoutes configures the HTTP routes and middleware.
-func (s *Server) SetupRoutes() {
+func (srv *Server) SetupRoutes() {
-	s.router = chi.NewRouter()
+	srv.router = chi.NewRouter()
 
-	s.router.Use(middleware.Recoverer)
+	srv.router.Use(middleware.Recoverer)
-	s.router.Use(middleware.RequestID)
+	srv.router.Use(middleware.RequestID)
-	s.router.Use(s.mw.Logging())
+	srv.router.Use(srv.mw.Logging())
 
 	if viper.GetString("METRICS_USERNAME") != "" {
-		s.router.Use(s.mw.Metrics())
+		srv.router.Use(srv.mw.Metrics())
 	}
 
-	s.router.Use(s.mw.CORS())
+	srv.router.Use(srv.mw.CORS())
-	s.router.Use(middleware.Timeout(routeTimeout))
+	srv.router.Use(middleware.Timeout(routeTimeout))
 
-	if s.sentryEnabled {
+	if srv.sentryEnabled {
-		sentryHandler := sentryhttp.New(sentryhttp.Options{
+		sentryHandler := sentryhttp.New(
+			sentryhttp.Options{ //nolint:exhaustruct // optional fields
 				Repanic: true,
-		})
+			},
-		s.router.Use(sentryHandler.Handle)
+		)
+
+		srv.router.Use(sentryHandler.Handle)
 	}
 
-	// Health check
+	// Health check.
-	s.router.Get("/.well-known/healthcheck.json", s.h.HandleHealthCheck())
+	srv.router.Get(
+		"/.well-known/healthcheck.json",
+		srv.handlers.HandleHealthCheck(),
+	)
 
-	// Protected metrics endpoint
+	// Protected metrics endpoint.
 	if viper.GetString("METRICS_USERNAME") != "" {
-		s.router.Group(func(r chi.Router) {
+		srv.router.Group(func(router chi.Router) {
-			r.Use(s.mw.MetricsAuth())
+			router.Use(srv.mw.MetricsAuth())
-			r.Get("/metrics", http.HandlerFunc(promhttp.Handler().ServeHTTP))
+			router.Get("/metrics",
+				http.HandlerFunc(
+					promhttp.Handler().ServeHTTP,
+				))
 		})
 	}
 
-	// API v1
+	// API v1.
-	s.router.Route("/api/v1", func(r chi.Router) {
+	srv.router.Route("/api/v1", srv.setupAPIv1)
-		r.Get("/server", s.h.HandleServerInfo())
-		r.Post("/session", s.h.HandleCreateSession())
 
-		// Unified state and message endpoints
+	// Serve embedded SPA.
-		r.Get("/state", s.h.HandleState())
+	srv.setupSPA()
-		r.Get("/messages", s.h.HandleGetMessages())
+}
-		r.Post("/messages", s.h.HandleSendCommand())
-		r.Get("/history", s.h.HandleGetHistory())
 
-		// Channels
+func (srv *Server) setupAPIv1(router chi.Router) {
-		r.Get("/channels", s.h.HandleListAllChannels())
+	router.Get(
-		r.Get("/channels/{channel}/members", s.h.HandleChannelMembers())
+		"/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(),
+	)
+}
 
-	// Serve embedded SPA
+func (srv *Server) setupSPA() {
 	distFS, err := fs.Sub(web.Dist, "dist")
 	if err != nil {
-		s.log.Error("failed to get web dist filesystem", "error", err)
+		srv.log.Error(
-	} else {
+			"failed to get web dist filesystem",
-		fileServer := http.FileServer(http.FS(distFS))
+			"error", err,
-		s.router.Get("/*", func(w http.ResponseWriter, r *http.Request) {
+		)
-			// Try to serve the file; if not found, serve index.html for SPA routing
+
-			f, err := distFS.(fs.ReadFileFS).ReadFile(r.URL.Path[1:])
-			if err != nil || len(f) == 0 {
-				indexHTML, _ := distFS.(fs.ReadFileFS).ReadFile("index.html")
-				w.Header().Set("Content-Type", "text/html; charset=utf-8")
-				w.WriteHeader(http.StatusOK)
-				_, _ = w.Write(indexHTML)
 		return
 	}
-			fileServer.ServeHTTP(w, r)
+
+	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)
 	})
 }
-}

internal/server/server.go

@@ -41,7 +41,8 @@ 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
@@ -53,21 +54,24 @@ type Server struct {
 	router        *chi.Mux
 	params        Params
 	mw            *middleware.Middleware
-	h             *handlers.Handlers
+	handlers      *handlers.Handlers
 }
 
 // New creates a new Server and registers its lifecycle hooks.
-func New(lc fx.Lifecycle, params Params) (*Server, error) {
+func New(
-	s := new(Server)
+	lifecycle fx.Lifecycle, params Params,
-	s.params = params
+) (*Server, error) {
-	s.mw = params.Middleware
+	srv := &Server{ //nolint:exhaustruct // fields set during lifecycle
-	s.h = params.Handlers
+		params:   params,
-	s.log = params.Logger.Get()
+		mw:       params.Middleware,
+		handlers: params.Handlers,
+		log:      params.Logger.Get(),
+	}
 
-	lc.Append(fx.Hook{
+	lifecycle.Append(fx.Hook{
 		OnStart: func(_ context.Context) error {
-			s.startupTime = time.Now()
+			srv.startupTime = time.Now()
-			go s.Run() //nolint:contextcheck
+			go srv.Run() //nolint:contextcheck
 
 			return nil
 		},
@@ -76,120 +80,140 @@ func New(lc fx.Lifecycle, params Params) (*Server, error) {
 		},
 	})
 
-	return s, nil
+	return srv, nil
 }
 
 // Run starts the server configuration, Sentry, and begins serving.
-func (s *Server) Run() {
+func (srv *Server) Run() {
-	s.configure()
+	srv.configure()
-	s.enableSentry()
+	srv.enableSentry()
-	s.serve()
+	srv.serve()
 }
 
 // ServeHTTP delegates to the chi router.
-func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (srv *Server) ServeHTTP(
-	s.router.ServeHTTP(w, r)
+	writer http.ResponseWriter,
+	request *http.Request,
+) {
+	srv.router.ServeHTTP(writer, request)
 }
 
 // MaintenanceMode reports whether the server is in maintenance mode.
-func (s *Server) MaintenanceMode() bool {
+func (srv *Server) MaintenanceMode() bool {
-	return s.params.Config.MaintenanceMode
+	return srv.params.Config.MaintenanceMode
 }
 
-func (s *Server) enableSentry() {
+func (srv *Server) enableSentry() {
-	s.sentryEnabled = false
+	srv.sentryEnabled = false
 
-	if s.params.Config.SentryDSN == "" {
+	if srv.params.Config.SentryDSN == "" {
 		return
 	}
 
-	err := sentry.Init(sentry.ClientOptions{
+	err := sentry.Init(sentry.ClientOptions{ //nolint:exhaustruct // only essential fields
-		Dsn:     s.params.Config.SentryDSN,
+		Dsn: srv.params.Config.SentryDSN,
-		Release: fmt.Sprintf("%s-%s", s.params.Globals.Appname, s.params.Globals.Version),
+		Release: fmt.Sprintf(
+			"%s-%s",
+			srv.params.Globals.Appname,
+			srv.params.Globals.Version,
+		),
 	})
 	if err != nil {
-		s.log.Error("sentry init failure", "error", err)
+		srv.log.Error("sentry init failure", "error", err)
 		os.Exit(1)
 	}
 
-	s.log.Info("sentry error reporting activated")
+	srv.log.Info("sentry error reporting activated")
-	s.sentryEnabled = true
+	srv.sentryEnabled = true
 }
 
-func (s *Server) serve() int {
+func (srv *Server) serve() int {
-	s.ctx, s.cancelFunc = context.WithCancel(context.Background())
+	srv.ctx, srv.cancelFunc = context.WithCancel(
+		context.Background(),
+	)
 
 	go func() {
-		c := make(chan os.Signal, 1)
+		sigCh := make(chan os.Signal, 1)
 
 		signal.Ignore(syscall.SIGPIPE)
-		signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+		signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
-		sig := <-c
-		s.log.Info("signal received", "signal", sig)
 
-		if s.cancelFunc != nil {
+		sig := <-sigCh
-			s.cancelFunc()
+
+		srv.log.Info("signal received", "signal", sig)
+
+		if srv.cancelFunc != nil {
+			srv.cancelFunc()
 		}
 	}()
 
-	go s.serveUntilShutdown()
+	go srv.serveUntilShutdown()
 
-	<-s.ctx.Done()
+	<-srv.ctx.Done()
 
-	s.cleanShutdown()
+	srv.cleanShutdown()
 
-	return s.exitCode
+	return srv.exitCode
 }
 
-func (s *Server) cleanupForExit() {
+func (srv *Server) cleanupForExit() {
-	s.log.Info("cleaning up")
+	srv.log.Info("cleaning up")
 }
 
-func (s *Server) cleanShutdown() {
+func (srv *Server) cleanShutdown() {
-	s.exitCode = 0
+	srv.exitCode = 0
 
-	ctxShutdown, shutdownCancel := context.WithTimeout(context.Background(), shutdownTimeout)
+	ctxShutdown, shutdownCancel := context.WithTimeout(
+		context.Background(), shutdownTimeout,
+	)
 
-	err := s.httpServer.Shutdown(ctxShutdown)
+	err := srv.httpServer.Shutdown(ctxShutdown)
 	if err != nil {
-		s.log.Error("server clean shutdown failed", "error", err)
+		srv.log.Error(
+			"server clean shutdown failed", "error", err,
+		)
 	}
 
 	if shutdownCancel != nil {
 		shutdownCancel()
 	}
 
-	s.cleanupForExit()
+	srv.cleanupForExit()
 
-	if s.sentryEnabled {
+	if srv.sentryEnabled {
 		sentry.Flush(sentryFlushTime)
 	}
 }
 
-func (s *Server) configure() {
+func (srv *Server) configure() {
-	// server configuration placeholder
+	// Server configuration placeholder.
 }
 
-func (s *Server) serveUntilShutdown() {
+func (srv *Server) serveUntilShutdown() {
-	listenAddr := fmt.Sprintf(":%d", s.params.Config.Port)
+	listenAddr := fmt.Sprintf(
-	s.httpServer = &http.Server{
+		":%d", srv.params.Config.Port,
+	)
+
+	srv.httpServer = &http.Server{ //nolint:exhaustruct // optional fields
 		Addr:           listenAddr,
 		ReadTimeout:    httpReadTimeout,
 		WriteTimeout:   httpWriteTimeout,
 		MaxHeaderBytes: maxHeaderBytes,
-		Handler:        s,
+		Handler:        srv,
 	}
 
-	s.SetupRoutes()
+	srv.SetupRoutes()
 
-	s.log.Info("http begin listen", "listenaddr", listenAddr)
+	srv.log.Info(
+		"http begin listen", "listenaddr", listenAddr,
+	)
 
-	err := s.httpServer.ListenAndServe()
+	err := srv.httpServer.ListenAndServe()
 	if err != nil && !errors.Is(err, http.ErrServerClosed) {
-		s.log.Error("listen error", "error", err)
+		srv.log.Error("listen error", "error", err)
 
-		if s.cancelFunc != nil {
+		if srv.cancelFunc != nil {
-			s.cancelFunc()
+			srv.cancelFunc()
 		}
 	}
 }

web/dist/style.css

@@ -14,6 +14,9 @@
   --tab-active: #e94560;
   --tab-bg: #16213e;
   --tab-hover: #1a1a3e;
+  --topic-bg: #121a30;
+  --unread-bg: #e94560;
+  --warn: #f0ad4e;
 }
 
 html, body, #root {
@@ -86,6 +89,7 @@ html, body, #root {
   border-bottom: 1px solid var(--border);
   overflow-x: auto;
   flex-shrink: 0;
+  align-items: center;
 }
 
 .tab {
@@ -95,6 +99,7 @@ html, body, #root {
   white-space: nowrap;
   color: var(--text-muted);
   user-select: none;
+  position: relative;
 }
 
 .tab:hover {
@@ -116,6 +121,43 @@ html, body, #root {
   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;
@@ -243,6 +285,7 @@ html, body, #root {
   gap: 8px;
   background: var(--bg-secondary);
   border-bottom: 1px solid var(--border);
+  margin-left: auto;
 }
 
 .join-dialog input {

web/src/app.jsx

@@ -1,13 +1,17 @@
-import { h, render, Component } from 'preact';
+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}`;
-  return fetch(API + path, { ...opts, headers }).then(async r => {
+  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;
@@ -19,7 +23,6 @@ function formatTime(ts) {
   return d.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' });
 }
 
-// Nick color hashing
 function nickColor(nick) {
   let h = 0;
   for (let i = 0; i < nick.length; i++) h = nick.charCodeAt(i) + ((h << 5) - h);
@@ -39,10 +42,9 @@ function LoginScreen({ onLogin }) {
       if (s.name) setServerName(s.name);
       if (s.motd) setMotd(s.motd);
     }).catch(() => {});
-    // Check for saved token
     const saved = localStorage.getItem('chat_token');
     if (saved) {
-      api('/state').then(u => onLogin(u.nick, saved)).catch(() => localStorage.removeItem('chat_token'));
+      api('/state').then(u => onLogin(u.nick)).catch(() => localStorage.removeItem('chat_token'));
     }
     inputRef.current?.focus();
   }, []);
@@ -56,7 +58,7 @@ function LoginScreen({ onLogin }) {
         body: JSON.stringify({ nick: nick.trim() })
       });
       localStorage.setItem('chat_token', res.token);
-      onLogin(res.nick, res.token);
+      onLogin(res.nick);
     } catch (err) {
       setError(err.data?.error || 'Connection failed');
     }
@@ -84,11 +86,19 @@ function LoginScreen({ onLogin }) {
 }
 
 function Message({ msg }) {
+  if (msg.system) {
     return (
-    <div class={`message ${msg.system ? 'system' : ''}`}>
+      <div class="message system">
-      <span class="timestamp">{formatTime(msg.createdAt)}</span>
+        <span class="timestamp">{formatTime(msg.ts)}</span>
-      <span class="nick" style={{ color: msg.system ? undefined : nickColor(msg.nick) }}>{msg.nick}</span>
+        <span class="content">{msg.text}</span>
-      <span class="content">{msg.content}</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>
   );
 }
@@ -98,93 +108,194 @@ function App() {
   const [nick, setNick] = useState('');
   const [tabs, setTabs] = useState([{ type: 'server', name: 'Server' }]);
   const [activeTab, setActiveTab] = useState(0);
-  const [messages, setMessages] = useState({ server: [] }); // keyed by tab name
+  const [messages, setMessages] = useState({ Server: [] });
-  const [members, setMembers] = useState({}); // keyed by channel name
+  const [members, setMembers] = useState({});
+  const [topics, setTopics] = useState({});
+  const [unread, setUnread] = useState({});
   const [input, setInput] = useState('');
   const [joinInput, setJoinInput] = useState('');
-  const [lastMsgId, setLastMsgId] = useState(0);
+  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();
-  const pollRef = 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) => {
-    addMessage(tabName, {
+    setMessages(prev => ({
-      id: Date.now(),
+      ...prev,
-      nick: '*',
+      [tabName]: [...(prev[tabName] || []), {
-      content: text,
+        id: 'sys-' + Date.now() + '-' + Math.random(),
-      createdAt: new Date().toISOString(),
+        ts: new Date().toISOString(),
+        text,
         system: true
-    });
+      }]
-  }, [addMessage]);
+    }));
+  }, []);
 
-  const onLogin = useCallback((userNick, token) => {
+  const refreshMembers = useCallback((channel) => {
-    setNick(userNick);
+    const chName = channel.replace('#', '');
-    setLoggedIn(true);
+    api(`/channels/${chName}/members`).then(m => {
-    addSystemMessage('server', `Connected as ${userNick}`);
+      setMembers(prev => ({ ...prev, [channel]: m }));
-    // Fetch server info
-    api('/server').then(s => {
-      if (s.motd) addSystemMessage('server', `MOTD: ${s.motd}`);
     }).catch(() => {});
-  }, [addSystemMessage]);
+  }, []);
 
-  // Poll for new messages
+  const processMessage = useCallback((msg) => {
-  useEffect(() => {
+    const body = Array.isArray(msg.body) ? msg.body.join('\n') : '';
-    if (!loggedIn) return;
+    const base = { id: msg.id, ts: msg.ts, from: msg.from, to: msg.to, command: msg.command };
-    let alive = true;
+
-    const poll = async () => {
+    switch (msg.command) {
-      try {
+      case 'PRIVMSG':
-        const msgs = await api(`/messages?after=${lastMsgId}`);
+      case 'NOTICE': {
-        if (!alive) return;
+        const parsed = { ...base, text: body, system: false };
-        let maxId = lastMsgId;
+        const target = msg.to;
-        for (const msg of msgs) {
+        if (target && target.startsWith('#')) {
-          if (msg.id > maxId) maxId = msg.id;
+          addMessage(target, parsed);
-          if (msg.isDm) {
+        } else {
-            const dmTab = msg.nick === nick ? msg.dmTarget : msg.nick;
+          const dmPeer = msg.from === nickRef.current ? msg.to : msg.from;
-            // Ensure DM tab exists
           setTabs(prev => {
-              if (!prev.find(t => t.type === 'dm' && t.name === dmTab)) {
+            if (!prev.find(t => t.type === 'dm' && t.name === dmPeer)) {
-                return [...prev, { type: 'dm', name: dmTab }];
+              return [...prev, { type: 'dm', name: dmPeer }];
             }
             return prev;
           });
-            addMessage(dmTab, msg);
+          addMessage(dmPeer, parsed);
-          } else if (msg.channel) {
-            addMessage(msg.channel, msg);
         }
+        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;
           }
-        if (maxId > lastMsgId) setLastMsgId(maxId);
         } catch (err) {
-        // silent
+          if (!alive) break;
+          if (err.name === 'AbortError') continue;
+          setConnected(false);
+          await new Promise(r => setTimeout(r, RECONNECT_DELAY));
+        }
       }
     };
-    pollRef.current = setInterval(poll, 1500);
-    poll();
-    return () => { alive = false; clearInterval(pollRef.current); };
-  }, [loggedIn, lastMsgId, nick, addMessage]);
 
-  // Fetch members for active channel tab
+    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;
-    const chName = tab.name.replace('#', '');
+    refreshMembers(tab.name);
-    api(`/channels/${chName}/members`).then(m => {
+    const iv = setInterval(() => refreshMembers(tab.name), MEMBER_REFRESH_INTERVAL);
-      setMembers(prev => ({ ...prev, [tab.name]: m }));
-    }).catch(() => {});
-    const iv = setInterval(() => {
-      api(`/channels/${chName}/members`).then(m => {
-        setMembers(prev => ({ ...prev, [tab.name]: m }));
-      }).catch(() => {});
-    }, 5000);
     return () => clearInterval(iv);
-  }, [loggedIn, activeTab, tabs]);
+  }, [loggedIn, activeTab, tabs, refreshMembers]);
 
   // Auto-scroll
   useEffect(() => {
@@ -192,9 +303,37 @@ function App() {
   }, [messages, activeTab]);
 
   // Focus input on tab change
+  useEffect(() => { inputRef.current?.focus(); }, [activeTab]);
+
+  // Fetch topic for active channel
   useEffect(() => {
-    inputRef.current?.focus();
+    if (!loggedIn) return;
-  }, [activeTab]);
+    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;
@@ -206,22 +345,29 @@ function App() {
         if (prev.find(t => t.type === 'channel' && t.name === name)) return prev;
         return [...prev, { type: 'channel', name }];
       });
-      setActiveTab(tabs.length); // switch to new tab
+      setActiveTab(tabs.length);
-      addSystemMessage(name, `Joined ${name}`);
+      // 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'}`);
+      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 (err) { /* ignore */ }
+    } catch (e) {
-    setTabs(prev => {
+      // Ignore
-      const next = prev.filter(t => !(t.type === 'channel' && t.name === name));
+    }
-      return next;
+    setTabs(prev => prev.filter(t => !(t.type === 'channel' && t.name === name)));
-    });
     setActiveTab(0);
   };
 
@@ -240,7 +386,8 @@ function App() {
       if (prev.find(t => t.type === 'dm' && t.name === targetNick)) return prev;
       return [...prev, { type: 'dm', name: targetNick }];
     });
-    setActiveTab(tabs.findIndex(t => t.type === 'dm' && t.name === targetNick) || tabs.length);
+    const idx = tabs.findIndex(t => t.type === 'dm' && t.name === targetNick);
+    setActiveTab(idx >= 0 ? idx : tabs.length);
   };
 
   const sendMessage = async () => {
@@ -250,46 +397,45 @@ function App() {
     const tab = tabs[activeTab];
     if (!tab || tab.type === 'server') return;
 
-    // Handle /commands
     if (text.startsWith('/')) {
       const parts = text.split(' ');
       const cmd = parts[0].toLowerCase();
-      if (cmd === '/join' && parts[1]) {
+      if (cmd === '/join' && parts[1]) { joinChannel(parts[1]); return; }
-        joinChannel(parts[1]);
+      if (cmd === '/part') { if (tab.type === 'channel') partChannel(tab.name); return; }
-        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 msg = parts.slice(2).join(' ');
+        const body = parts.slice(2).join(' ');
         try {
-          await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'PRIVMSG', to: target, body: [msg] }) });
+          await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'PRIVMSG', to: target, body: [body] }) });
           openDM(target);
         } catch (err) {
-          addSystemMessage('server', `Failed to send DM: ${err.data?.error || 'error'}`);
+          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]] }) });
-          setNick(parts[1]);
-          addSystemMessage('server', `Nick changed to ${parts[1]}`);
         } catch (err) {
-          addSystemMessage('server', `Nick change failed: ${err.data?.error || 'error'}`);
+          addSystemMessage('Server', `Nick change failed: ${err.data?.error || 'error'}`);
         }
         return;
       }
-      addSystemMessage('server', `Unknown command: ${cmd}`);
+      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;
     }
 
-    const to = tab.type === 'channel' ? tab.name : tab.name;
     try {
-      await api('/messages', { method: 'POST', body: JSON.stringify({ command: 'PRIVMSG', to, body: [text] }) });
+      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'}`);
     }
@@ -300,16 +446,21 @@ function App() {
   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>
             )}
@@ -326,19 +477,17 @@ function App() {
         </div>
       </div>
 
+      {currentTab.type === 'channel' && currentTopic && (
+        <div class="topic-bar" title={currentTopic}>{currentTopic}</div>
+      )}
+
       <div class="content">
         <div class="messages-pane">
-          {currentTab.type === 'server' ? (
+          <div class={currentTab.type === 'server' ? 'server-messages' : 'messages'}>
-            <div class="server-messages">
-              {currentMessages.map(m => <Message msg={m} />)}
-              <div ref={messagesEndRef} />
-            </div>
-          ) : (
-            <>
-              <div class="messages">
             {currentMessages.map(m => <Message msg={m} />)}
             <div ref={messagesEndRef} />
           </div>
+          {currentTab.type !== 'server' && (
             <div class="input-bar">
               <input
                 ref={inputRef}
@@ -349,7 +498,6 @@ function App() {
               />
               <button onClick={sendMessage}>Send</button>
             </div>
-            </>
           )}
         </div>
 

web/src/style.css

@@ -14,6 +14,9 @@
   --tab-active: #e94560;
   --tab-bg: #16213e;
   --tab-hover: #1a1a3e;
+  --topic-bg: #121a30;
+  --unread-bg: #e94560;
+  --warn: #f0ad4e;
 }
 
 html, body, #root {
@@ -86,6 +89,7 @@ html, body, #root {
   border-bottom: 1px solid var(--border);
   overflow-x: auto;
   flex-shrink: 0;
+  align-items: center;
 }
 
 .tab {
@@ -95,6 +99,7 @@ html, body, #root {
   white-space: nowrap;
   color: var(--text-muted);
   user-select: none;
+  position: relative;
 }
 
 .tab:hover {
@@ -116,6 +121,43 @@ html, body, #root {
   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;
@@ -243,6 +285,7 @@ html, body, #root {
   gap: 8px;
   background: var(--bg-secondary);
   border-bottom: 1px solid var(--border);
+  margin-left: auto;
 }
 
 .join-dialog input {