refactor(httpapi): standardize output formatting in job report response

- Adjusted the order of fields in the job report response for consistency.
- Ensured that the output structure remains clear and maintainable.

.cursor/commands/commit-message.md

@@ -32,6 +32,6 @@ powershell -NoProfile -File scripts/commit/staged-context.ps1
 - Новая пользовательская возможность → `feat` (minor)
 - Починка ожидаемого поведения / баг → `fix` (patch)
 - Follow-up баги после недавнего `feat` в том же scope → **`fix`**, не `feat`
-- Только перестройка без нового поведения → `refactor` (none)
+- Только перестройка без нового поведения → `refactor` (patch, без новых функций)
 
 Заголовок — EN, императив, ≤72 символов. Тело — RU.

.cursor/rules/conventional-commits.mdc

@@ -50,7 +50,7 @@ powershell -NoProfile -File scripts/commit/staged-context.ps1
 | `feat` | **новая** пользовательская возможность (раньше нельзя было) | minor |
 | `fix` | восстановление **ожидаемого** поведения; баг, регрессия, падение UI | patch |
 | `perf` | ускорение без смены API | patch |
-| `refactor` | реструктуризация **без** новой возможности и **без** исправления бага | — |
+| `refactor` | реструктуризация **без** новой возможности и **без** исправления бага | patch |
 | `docs` | только документация | — |
 | `test` | тесты | — |
 | `ci` | CI/CD (`.gitea/`, workflows); правки, из‑за которых нужны новые образы | patch |
@@ -62,7 +62,7 @@ powershell -NoProfile -File scripts/commit/staged-context.ps1
 
 1. Появилось **новое** действие / экран / API / настройка, которых не было → `feat`
 2. То, что **должно было работать**, не работало (кнопки, диалоги, сохранение, 500) → `fix`
-3. Только перестройка кода или UI на другой паттерн, поведение для пользователя то же → `refactor`
+3. Только перестройка кода или UI на другой паттерн, поведение для пользователя то же → `refactor` (patch, без новых функций)
 4. Ускорение без изменения контракта → `perf`
 
 **Не путать с формулировкой diff:**
@@ -105,7 +105,7 @@ feat(web): migrate modules list to AppDataTable
 # Хорошо — если не было нового user-facing
 refactor(web): migrate modules list to AppDataTable
 
-Единый паттерн таблиц; поведение списка модулей без изменений.
+Единый паттерн таблиц; поведение списка модулей без изменений. Semver: patch.
 ```
 
 ```

.cursor/skills/commit-message/SKILL.md

@@ -101,7 +101,7 @@ git commit -m "$( @'
 | Пользователь получает **новую** возможность? | `feat` (minor) |
 | Восстанавливается **ожидаемое** поведение / устранён баг? | `fix` (patch) |
 | Только скорость, контракт тот же? | `perf` (patch) |
-| Только структура кода/UI, поведение то же? | `refactor` (none) |
+| Только структура кода/UI, поведение то же? | `refactor` (patch) |
 
 **Follow-up:** правки сразу после `feat` в том же scope без новой возможности → **`fix`**, не `feat` (слова *enhance/improve/refactor* в задаче не делают commit `feat`).
 

.releaserc.json

@@ -11,6 +11,7 @@
           { "type": "fix", "release": "patch" },
           { "type": "perf", "release": "patch" },
           { "type": "ci", "release": "patch" },
+          { "type": "refactor", "release": "patch" },
           { "breaking": true, "release": "major" }
         ]
       }

cmd/evobgp-all/main.go

@@ -55,8 +55,12 @@ func main() {
 	startBirdMetricsPoller(ctx)
 
 	httpSrv := &http.Server{
-		Addr:    cfg.HTTPAddr,
-		Handler: srv.Handler(),
+		Addr:              cfg.HTTPAddr,
+		Handler:           srv.Handler(),
+		ReadHeaderTimeout: 10 * time.Second,
+		ReadTimeout:       60 * time.Second,
+		WriteTimeout:      120 * time.Second,
+		IdleTimeout:       120 * time.Second,
 	}
 	go func() {
 		svc := platform.ServiceName("evobgp-all")
@@ -91,6 +95,7 @@ func startBirdMetricsPoller(ctx context.Context) {
 			return birdfmt.ShowProtocols(ctx, socket, birdcBin)
 		},
 		birdfmt.CountEstablishedBGPSessions,
+		birdfmt.ParseBGPProtocolStates,
 	)
 	log.Printf("birdc protocols poller enabled (socket=%s interval=%s)", sock, interval)
 }

cmd/evobgp-api/main.go

@@ -42,8 +42,12 @@ func main() {
 	startBirdMetricsPoller(ctx)
 
 	httpSrv := &http.Server{
-		Addr:    cfg.HTTPAddr,
-		Handler: srv.Handler(),
+		Addr:              cfg.HTTPAddr,
+		Handler:           srv.Handler(),
+		ReadHeaderTimeout: 10 * time.Second,
+		ReadTimeout:       60 * time.Second,
+		WriteTimeout:      120 * time.Second,
+		IdleTimeout:       120 * time.Second,
 	}
 	go func() {
 		svc := platform.ServiceName("evobgp-api")
@@ -84,6 +88,7 @@ func startBirdMetricsPoller(ctx context.Context) {
 			return birdfmt.ShowProtocols(ctx, socket, birdcBin)
 		},
 		birdfmt.CountEstablishedBGPSessions,
+		birdfmt.ParseBGPProtocolStates,
 	)
 	log.Printf("birdc protocols poller enabled (socket=%s interval=%s)", sock, interval)
 }

deploy/docker/evobgp-web/nginx.conf

@@ -5,8 +5,14 @@ server {
     gzip on;
     gzip_types text/css application/javascript application/json image/svg+xml;
 
+    # Docker embedded DNS: без resolver nginx кэширует IP upstream при старте —
+    # после recreate evobgp-all остаётся 502 (connection refused на старый IP).
+    resolver 127.0.0.11 valid=10s ipv6=off;
+    set $evobgp_upstream evobgp-api;
+
     location /v1/ {
-        proxy_pass http://evobgp-api:8080/v1/;
+        # С переменной в proxy_pass нельзя полагаться на замену URI — передаём $request_uri целиком.
+        proxy_pass http://$evobgp_upstream:8080$request_uri;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -15,7 +21,7 @@ server {
     }
 
     location = /metrics {
-        proxy_pass http://evobgp-api:8080/metrics;
+        proxy_pass http://$evobgp_upstream:8080/metrics;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
     }

docs/releasing.md

@@ -7,9 +7,11 @@ EvoBGP использует [Conventional Commits](https://www.conventionalcommi
 | Тип коммита | Bump |
 |-------------|------|
 | `feat` | minor (1.0.0 → 1.1.0) |
-| `fix`, `perf`, `ci` | patch (1.5.1 → 1.5.2) |
+| `fix`, `perf`, `ci`, `refactor` | patch (1.5.1 → 1.5.2) |
 | `feat!`, `fix!` или `BREAKING CHANGE:` в теле | major (1.0.0 → 2.0.0) |
-| `docs`, `chore`, `test`, `refactor` | без релиза |
+| `docs`, `chore`, `test` | без релиза |
+
+`refactor` — patch без новых функций: перестройка кода/UI при том же поведении для пользователя. По semver на одном уровне с `fix`, но семантически «мельче» `feat` (не minor).
 
 Отдельного суффикса `1.x.y.fix` в semver нет: «fix» в Conventional Commits означает **patch** (третья цифра). Для починки пайплайна без смены продукта — `fix(ci):` или `ci:` (оба дают patch после настройки `.releaserc.json`).
 

internal/birdfmt/filter.go

@@ -9,6 +9,21 @@ import (
 
 const maxBGPASN = 4294967295
 
+const filterPrefixChunkSize = 500
+
+func writePrefixSetAcceptBlocks(b *strings.Builder, keys []string) {
+	for i := 0; i < len(keys); i += filterPrefixChunkSize {
+		end := i + filterPrefixChunkSize
+		if end > len(keys) {
+			end = len(keys)
+		}
+		chunk := keys[i:end]
+		b.WriteString("    if net ~ [ ")
+		b.WriteString(strings.Join(chunk, ", "))
+		b.WriteString(" ] then accept;\n")
+	}
+}
+
 func filterUniqueASNs(pathASNs []int64) []int64 {
 	seen := make(map[int64]struct{})
 	for _, a := range pathASNs {
@@ -52,9 +67,7 @@ func RenderExportFilterIPv4(filterName string, prefixes []netip.Prefix, pathASNs
 	b.WriteString(strings.TrimSpace(filterName))
 	b.WriteString(" {\n")
 	if len(keys) > 0 {
-		b.WriteString("    if net ~ [ ")
-		b.WriteString(strings.Join(keys, ", "))
-		b.WriteString(" ] then accept;\n")
+		writePrefixSetAcceptBlocks(&b, keys)
 	}
 	for _, asn := range asns {
 		fmt.Fprintf(&b, "    if bgp_path ~ [= * %d =] then accept;\n", asn)
@@ -95,9 +108,7 @@ func RenderExportFilterIPv6(filterName string, prefixes []netip.Prefix, pathASNs
 	b.WriteString(strings.TrimSpace(filterName))
 	b.WriteString(" {\n")
 	if len(keys) > 0 {
-		b.WriteString("    if net ~ [ ")
-		b.WriteString(strings.Join(keys, ", "))
-		b.WriteString(" ] then accept;\n")
+		writePrefixSetAcceptBlocks(&b, keys)
 	}
 	for _, asn := range asns {
 		fmt.Fprintf(&b, "    if bgp_path ~ [= * %d =] then accept;\n", asn)

internal/birdfmt/protocols.go

@@ -50,3 +50,48 @@ func CountEstablishedBGPSessions(showProtocolsOutput string) int {
 	}
 	return n
 }
+
+// ParseBGPProtocolStates parses `birdc show protocols all` summary rows into protocol_name -> state.
+func ParseBGPProtocolStates(output string) map[string]string {
+	out := make(map[string]string)
+	for _, raw := range strings.Split(output, "\n") {
+		line := strings.TrimSpace(raw)
+		if line == "" {
+			continue
+		}
+		low := strings.ToLower(line)
+		if strings.HasPrefix(low, "bird ") || strings.HasPrefix(low, "name ") || strings.HasPrefix(low, "table ") {
+			continue
+		}
+		fields := strings.Fields(line)
+		if len(fields) < 4 {
+			continue
+		}
+		if !strings.EqualFold(fields[1], "BGP") {
+			continue
+		}
+		state := extractBGPSessionStateLine(line)
+		if state == "" {
+			state = fields[3]
+		}
+		out[fields[0]] = state
+	}
+	return out
+}
+
+func extractBGPSessionStateLine(line string) string {
+	known := []string{
+		"Established",
+		"Idle",
+		"Connect",
+		"Active",
+		"OpenSent",
+		"OpenConfirm",
+	}
+	for _, st := range known {
+		if strings.Contains(line, st) {
+			return st
+		}
+	}
+	return ""
+}

internal/db/open.go

@@ -6,9 +6,12 @@ import (
 	"errors"
 	"fmt"
 	"io/fs"
+	"os"
 	"path"
 	"sort"
+	"strconv"
 	"strings"
+	"time"
 
 	"evobgp/migrations"
 
@@ -22,6 +25,17 @@ func OpenPostgresPool(ctx context.Context, dsn string) (*pgxpool.Pool, error) {
 	if err != nil {
 		return nil, err
 	}
+	if max := os.Getenv("EVOBGP_DB_MAX_CONNS"); max != "" {
+		if n, err := strconv.Atoi(strings.TrimSpace(max)); err == nil && n > 0 {
+			cfg.MaxConns = int32(n)
+		}
+	}
+	if min := os.Getenv("EVOBGP_DB_MIN_CONNS"); min != "" {
+		if n, err := strconv.Atoi(strings.TrimSpace(min)); err == nil && n >= 0 {
+			cfg.MinConns = int32(n)
+		}
+	}
+	cfg.MaxConnLifetime = 30 * time.Minute
 	pool, err := pgxpool.NewWithConfig(ctx, cfg)
 	if err != nil {
 		return nil, err

internal/httpapi/bootstrap.go

@@ -53,6 +53,21 @@ func BootstrapWorkers(ctx context.Context, opts Options) (store.Backend, *jobs.R
 	wk := &jobs.Worker{Store: backend, HTTPClient: cdnHTTP}
 	reg := jobs.NewRegistry(wk.Process)
 	wk.Registry = reg
+	if pool != nil {
+		audit := repository.NewJobAuditWriter(pool)
+		reg.SetTerminalHook(func(j *jobs.Job) {
+			if j == nil {
+				return
+			}
+			st := j.Snapshot()
+			status, _ := st["status"].(string)
+			var errMsg *string
+			if e, ok := st["error"].(string); ok && e != "" {
+				errMsg = &e
+			}
+			audit.MarkTerminal(context.Background(), j.TenantID, j.ID, status, errMsg, time.Now().UTC())
+		})
+	}
 	observability.RegisterStoreBackend(backend)
 	return backend, reg, pool, nil
 }

internal/httpapi/routes.go

@@ -69,6 +69,7 @@ func (s *Server) registerV1(m *http.ServeMux) {
 	m.HandleFunc("GET /bird/status", s.handleBirdStatus)
 	m.HandleFunc("GET /jobs", s.handleListJobs)
 	m.HandleFunc("GET /jobs/{job_id}", s.handleGetJob)
+	m.HandleFunc("GET /jobs/{job_id}/report", s.handleGetJobReport)
 	m.HandleFunc("POST /jobs/{job_id}/cancel", s.handleCancelJob)
 	m.HandleFunc("GET /speakers/{speaker_id}/revisions/latest", s.handleNodeLatestRevision)
 	m.HandleFunc("GET /speakers/{speaker_id}/bundle/{revision_id}", s.handleNodeBundle)
@@ -201,6 +202,22 @@ func (s *Server) handleListModules(w http.ResponseWriter, r *http.Request) {
 	}
 
 	filtered := make([]*store.Module, 0)
+	limit := parseListLimit(r)
+	cursor := r.URL.Query().Get("cursor")
+	if typeFilter == "" && enabledFilter == nil {
+		page, next, more := s.store.ListModulesPage(a.TenantID, cursor, limit)
+		for _, mod := range page {
+			filtered = append(filtered, mod)
+		}
+		items := make([]map[string]any, 0, len(filtered))
+		for _, mod := range filtered {
+			items = append(items, moduleJSON(mod))
+		}
+		writeJSON(w, http.StatusOK, map[string]any{
+			"items": items, "next_cursor": strPtrOrNull(next), "has_more": more,
+		})
+		return
+	}
 	for _, mod := range s.store.ListModules(a.TenantID) {
 		if typeFilter != "" && mod.Type != typeFilter {
 			continue
@@ -275,7 +292,7 @@ func (s *Server) handleListPeers(w http.ResponseWriter, r *http.Request) {
 	}
 	allPeers := s.store.ListPeers(a.TenantID)
 	page, next, more := store.PaginateOffset(allPeers, r.URL.Query().Get("cursor"), parseListLimit(r))
-	liveStates := s.liveBGPProtocolStates(r.Context())
+	liveStates := s.liveBGPProtocolStates(r)
 	items := make([]map[string]any, 0, len(page))
 	for _, p := range page {
 		row := peerJSON(p)
@@ -289,7 +306,17 @@ func (s *Server) handleListPeers(w http.ResponseWriter, r *http.Request) {
 	})
 }
 
-func (s *Server) liveBGPProtocolStates(ctx context.Context) map[string]string {
+func (s *Server) liveBGPProtocolStates(r *http.Request) map[string]string {
+	if r != nil && strings.EqualFold(strings.TrimSpace(r.URL.Query().Get("live")), "1") {
+		return s.liveBGPProtocolStatesFresh(r.Context())
+	}
+	if cached, ok := observability.CachedBirdProtocolStates(90 * time.Second); ok {
+		return cached
+	}
+	return s.liveBGPProtocolStatesFresh(r.Context())
+}
+
+func (s *Server) liveBGPProtocolStatesFresh(ctx context.Context) map[string]string {
 	sock := strings.TrimSpace(os.Getenv("EVOBGP_BIRDC_SOCKET"))
 	if sock == "" {
 		return map[string]string{}
@@ -298,7 +325,9 @@ func (s *Server) liveBGPProtocolStates(ctx context.Context) map[string]string {
 	if err != nil {
 		return map[string]string{}
 	}
-	return parseBGPProtocolStates(out)
+	states := birdfmt.ParseBGPProtocolStates(out)
+	observability.SetBirdProtocolStates(states)
+	return states
 }
 
 // parseBGPProtocolStates parses `birdc show protocols all` summary rows into protocol_name -> state.
@@ -522,7 +551,8 @@ func (s *Server) enqueueModuleRefreshIfEnabled(tenantID, moduleID, trigger strin
 		return
 	}
 	mid := moduleID
-	_, _, _ = s.jobs.Enqueue(tenantID, jobs.KindModuleRefresh, nil, &mid, map[string]any{
+	key := "module_refresh:" + moduleID
+	_, _, _ = s.jobs.Enqueue(tenantID, jobs.KindModuleRefresh, &key, &mid, map[string]any{
 		"module_id": moduleID,
 		"trigger":   trigger,
 	})
@@ -589,6 +619,9 @@ func (s *Server) handleRevisionPreview(w http.ResponseWriter, r *http.Request) {
 	for k, v := range rev.PreviewFragments {
 		obj[k] = v
 	}
+	if expanded := pipeline.BuildExpandedBirdPreview(rev.PreviewFragments); expanded != "" {
+		obj[pipeline.AuxBirdFullExpandedKey()] = expanded
+	}
 	writeJSON(w, http.StatusOK, obj)
 }
 
@@ -843,6 +876,44 @@ func (s *Server) handleGetJob(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, j.Snapshot())
 }
 
+func (s *Server) handleGetJobReport(w http.ResponseWriter, r *http.Request) {
+	a, ok := authFromContext(r.Context())
+	if !ok {
+		writeProblem(w, http.StatusUnauthorized, "Unauthorized", "missing auth")
+		return
+	}
+	if !s.requireAtLeast(w, a, "viewer") {
+		return
+	}
+	j, err := s.jobs.Get(a.TenantID, r.PathValue("job_id"))
+	if err != nil {
+		writeProblem(w, http.StatusNotFound, "Not Found", "job not found")
+		return
+	}
+	snap := j.Snapshot()
+	meta, _ := snap["meta"].(map[string]any)
+	out := map[string]any{
+		"job_id":     snap["job_id"],
+		"kind":       snap["kind"],
+		"status":     snap["status"],
+		"meta":       meta,
+		"error":      snap["error"],
+		"created_at": snap["created_at"],
+	}
+	if meta != nil {
+		if v, ok := meta["log_entries"]; ok {
+			out["log_entries"] = v
+		}
+		if v, ok := meta["log_total"]; ok {
+			out["log_total"] = v
+		}
+		if v, ok := meta["revision_id"]; ok {
+			out["revision_id"] = v
+		}
+	}
+	writeJSON(w, http.StatusOK, out)
+}
+
 func (s *Server) handleCancelJob(w http.ResponseWriter, r *http.Request) {
 	a, ok := authFromContext(r.Context())
 	if !ok {

internal/jobs/context.go

@@ -0,0 +1,77 @@
+package jobs
+
+import (
+	"context"
+	"os"
+	"strconv"
+	"time"
+)
+
+const (
+	defaultJobTimeoutModuleRefresh = 10 * time.Minute
+	defaultJobTimeoutTenantRefresh = 15 * time.Minute
+	defaultJobTimeoutDeployApply   = 5 * time.Minute
+	defaultJobTimeoutPeerReconcile = 10 * time.Minute
+	defaultJobTimeoutRollback      = 5 * time.Minute
+	defaultJobTimeoutBirdReload    = 2 * time.Minute
+)
+
+func jobTimeout(kind string) time.Duration {
+	envKey := map[string]string{
+		KindModuleRefresh:    "EVOBGP_JOB_TIMEOUT_MODULE_REFRESH",
+		KindTenantRefresh:    "EVOBGP_JOB_TIMEOUT_TENANT_REFRESH",
+		KindDeployApply:      "EVOBGP_JOB_TIMEOUT_DEPLOY_APPLY",
+		KindPeerReconcile:    "EVOBGP_JOB_TIMEOUT_PEER_RECONCILE",
+		KindRevisionRollback: "EVOBGP_JOB_TIMEOUT_ROLLBACK",
+		KindBirdReload:       "EVOBGP_JOB_TIMEOUT_BIRD_RELOAD",
+	}[kind]
+	if envKey != "" {
+		if d, err := time.ParseDuration(os.Getenv(envKey)); err == nil && d > 0 {
+			return d
+		}
+	}
+	switch kind {
+	case KindModuleRefresh:
+		return defaultJobTimeoutModuleRefresh
+	case KindTenantRefresh:
+		return defaultJobTimeoutTenantRefresh
+	case KindDeployApply:
+		return defaultJobTimeoutDeployApply
+	case KindPeerReconcile:
+		return defaultJobTimeoutPeerReconcile
+	case KindRevisionRollback:
+		return defaultJobTimeoutRollback
+	case KindBirdReload:
+		return defaultJobTimeoutBirdReload
+	default:
+		if n, err := strconv.Atoi(os.Getenv("EVOBGP_JOB_TIMEOUT_SEC")); err == nil && n > 0 {
+			return time.Duration(n) * time.Second
+		}
+		return defaultJobTimeoutModuleRefresh
+	}
+}
+
+// workContext returns a timeout context that also cancels when the job is cancelled.
+func (j *Job) workContext() (context.Context, context.CancelFunc) {
+	if j == nil {
+		return context.Background(), func() {}
+	}
+	timeout := jobTimeout(j.Kind)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	go func() {
+		ticker := time.NewTicker(500 * time.Millisecond)
+		defer ticker.Stop()
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case <-ticker.C:
+				if j.IsCancelRequested() {
+					cancel()
+					return
+				}
+			}
+		}
+	}()
+	return ctx, cancel
+}

internal/jobs/job.go

@@ -9,6 +9,8 @@ import (
 	"sync"
 	"time"
 
+	"evobgp/internal/observability"
+
 	"github.com/google/uuid"
 )
 
@@ -178,6 +180,8 @@ type Registry struct {
 	byID        map[string]*Job
 	byIdempo    map[idempoKey]*Job
 	workerStart func(j *Job)
+	workerSem   chan struct{}
+	onTerminal  func(j *Job)
 }
 
 type idempoKey struct {
@@ -186,13 +190,44 @@ type idempoKey struct {
 }
 
 func NewRegistry(workerStart func(j *Job)) *Registry {
+	maxWorkers := registryMaxConcurrentJobs()
 	return &Registry{
 		byID:        make(map[string]*Job),
 		byIdempo:    make(map[idempoKey]*Job),
 		workerStart: workerStart,
+		workerSem:   make(chan struct{}, maxWorkers),
 	}
 }
 
+// SetTerminalHook registers a best-effort callback when jobs reach a terminal state.
+func (r *Registry) SetTerminalHook(fn func(j *Job)) {
+	if r == nil {
+		return
+	}
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	r.onTerminal = fn
+}
+
+func (r *Registry) fireTerminal(j *Job) {
+	if r == nil || j == nil {
+		return
+	}
+	r.mu.RLock()
+	fn := r.onTerminal
+	r.mu.RUnlock()
+	if fn != nil {
+		fn(j)
+	}
+}
+
+func registryMaxConcurrentJobs() int {
+	if n, err := strconv.Atoi(strings.TrimSpace(os.Getenv("EVOBGP_JOB_MAX_CONCURRENT"))); err == nil && n > 0 {
+		return n
+	}
+	return 8
+}
+
 // pruneTerminalIfOver удаляет самые старые завершённые джобы (succeeded/failed/cancelled), пока len(byID) > maxJobs.
 func (r *Registry) pruneTerminalIfOver(maxJobs int) {
 	if r == nil || maxJobs <= 0 || len(r.byID) <= maxJobs {
@@ -244,7 +279,11 @@ func (r *Registry) Enqueue(tenantID, kind string, idempotencyKey *string, module
 	if idempotencyKey != nil && *idempotencyKey != "" {
 		k := idempoKey{tenant: tenantID, key: *idempotencyKey}
 		if existing, ok := r.byIdempo[k]; ok {
-			return existing, false, nil
+			st := existing.statusLocked()
+			if st == StatusQueued || st == StatusRunning {
+				return existing, false, nil
+			}
+			delete(r.byIdempo, k)
 		}
 	}
 
@@ -265,7 +304,17 @@ func (r *Registry) Enqueue(tenantID, kind string, idempotencyKey *string, module
 	r.pruneTerminalIfOver(maxJobs)
 
 	if r.workerStart != nil {
-		go r.workerStart(j)
+		go func() {
+			r.workerSem <- struct{}{}
+			active := len(r.workerSem)
+			capacity := cap(r.workerSem)
+			observability.RecordJobQueueDepth(active, capacity)
+			defer func() {
+				<-r.workerSem
+				observability.RecordJobQueueDepth(len(r.workerSem), capacity)
+			}()
+			r.workerStart(j)
+		}()
 	}
 	return j, true, nil
 }

internal/jobs/worker.go

@@ -82,6 +82,9 @@ func (w *Worker) httpClient() *http.Client {
 func (w *Worker) Process(j *Job) {
 	defer func() {
 		observability.RecordJobTerminal(j.Kind, j.statusLocked())
+		if w != nil && w.Registry != nil {
+			w.Registry.fireTerminal(j)
+		}
 	}()
 
 	if w == nil || w.Store == nil {
@@ -102,7 +105,17 @@ func (w *Worker) Process(j *Job) {
 			j.Fail("missing module_id in job meta")
 			return
 		}
-		if err := pipeline.RefreshModuleIngest(context.Background(), w.Store, w.httpClient(), j.TenantID, mid); err != nil {
+		ctx, cancel := j.workContext()
+		defer cancel()
+		if ctx.Err() != nil {
+			j.MarkCancelled()
+			return
+		}
+		if err := pipeline.RefreshModuleIngest(ctx, w.Store, w.httpClient(), j.TenantID, mid); err != nil {
+			if ctx.Err() != nil {
+				j.MarkCancelled()
+				return
+			}
 			j.Fail(err.Error())
 			return
 		}
@@ -121,11 +134,17 @@ func (w *Worker) Process(j *Job) {
 			j.Succeed()
 			return
 		}
+		ctx, cancel := j.workContext()
+		defer cancel()
 		ctl := &birdfmt.BirdCtl{
 			Socket: sock,
 			Birdc:  strings.TrimSpace(os.Getenv("EVOBGP_BIRDC_BIN")),
 		}
-		if err := ctl.Configure(context.Background()); err != nil {
+		if err := ctl.Configure(ctx); err != nil {
+			if ctx.Err() != nil {
+				j.MarkCancelled()
+				return
+			}
 			j.Fail(err.Error())
 			return
 		}
@@ -152,9 +171,14 @@ func (w *Worker) runPeerReconcile(j *Job) {
 		return
 	}
 	if len(latest) == 0 {
-		// First run fallback: render full tenant state once if no baseline revision exists yet.
-		rid, err := pipeline.RenderTenantRevision(context.Background(), w.Store, w.httpClient(), j.TenantID, triggerModuleID)
+		ctx, cancel := j.workContext()
+		defer cancel()
+		rid, err := pipeline.RenderTenantRevision(ctx, w.Store, w.httpClient(), j.TenantID, triggerModuleID)
 		if err != nil {
+			if ctx.Err() != nil {
+				j.MarkCancelled()
+				return
+			}
 			j.Fail(err.Error())
 			return
 		}
@@ -171,8 +195,14 @@ func (w *Worker) runPeerReconcile(j *Job) {
 			}
 			cursor = next
 		}
-		rid, err := pipeline.RenderTenantRevisionFromPrefixes(context.Background(), w.Store, w.httpClient(), j.TenantID, triggerModuleID, rows)
+		ctx, cancel := j.workContext()
+		defer cancel()
+		rid, err := pipeline.RenderTenantRevisionFromPrefixes(ctx, w.Store, w.httpClient(), j.TenantID, triggerModuleID, rows)
 		if err != nil {
+			if ctx.Err() != nil {
+				j.MarkCancelled()
+				return
+			}
 			j.Fail(err.Error())
 			return
 		}
@@ -230,7 +260,13 @@ func (w *Worker) runTenantRefresh(j *Job) {
 		j.Fail("missing module_ids in job meta")
 		return
 	}
-	if err := pipeline.RefreshTenantModules(context.Background(), w.Store, w.httpClient(), j.TenantID, moduleIDs); err != nil {
+	ctx, cancel := j.workContext()
+	defer cancel()
+	if err := pipeline.RefreshTenantModules(ctx, w.Store, w.httpClient(), j.TenantID, moduleIDs); err != nil {
+		if ctx.Err() != nil {
+			j.MarkCancelled()
+			return
+		}
 		j.Fail(err.Error())
 		return
 	}
@@ -275,6 +311,8 @@ func (w *Worker) finishModuleRefreshSuccess(j *Job, triggerModuleID string) {
 	mu := w.tenantRefreshMu(j.TenantID)
 	mu.Lock()
 	defer mu.Unlock()
+	ctx, cancel := j.workContext()
+	defer cancel()
 	deferDeploy := false
 	if w.Registry != nil {
 		deferDeploy = w.Registry.CountOtherActiveRefresh(j.TenantID, j.ID) > 0
@@ -288,8 +326,12 @@ func (w *Worker) finishModuleRefreshSuccess(j *Job, triggerModuleID string) {
 		return
 	}
 
-	rev, err := pipeline.RenderTenantRevision(context.Background(), w.Store, w.httpClient(), j.TenantID, triggerModuleID)
+	rev, err := pipeline.RenderTenantRevision(ctx, w.Store, w.httpClient(), j.TenantID, triggerModuleID)
 	if err != nil {
+		if ctx.Err() != nil {
+			j.MarkCancelled()
+			return
+		}
 		j.Fail(err.Error())
 		return
 	}
@@ -335,6 +377,8 @@ func (w *Worker) runDeployApply(j *Job) {
 		j.Fail("missing revision_id in job meta")
 		return
 	}
+	ctx, cancel := j.workContext()
+	defer cancel()
 	activeDir := strings.TrimSpace(os.Getenv("EVOBGP_BIRD_ACTIVE_DIR"))
 	if activeDir != "" {
 		revObj, err := w.Store.GetRevision(j.TenantID, revID)
@@ -354,7 +398,11 @@ func (w *Worker) runDeployApply(j *Job) {
 			Socket:     strings.TrimSpace(os.Getenv("EVOBGP_BIRDC_SOCKET")),
 		}
 		ctl := &birdfmt.BirdCtl{Bird: cfg.BirdBin, Birdc: cfg.BirdcBin, Socket: cfg.Socket}
-		if err := birddeploy.ApplyRevision(context.Background(), ctl, revObj, cfg); err != nil {
+		if err := birddeploy.ApplyRevision(ctx, ctl, revObj, cfg); err != nil {
+			if ctx.Err() != nil {
+				j.MarkCancelled()
+				return
+			}
 			j.Fail(err.Error())
 			return
 		}

internal/observability/metrics.go

@@ -80,6 +80,38 @@ var (
 		Help:      "Prefix row count after CIDR aggregation on tenant render.",
 		Buckets:   prometheus.ExponentialBuckets(1, 2, 16),
 	})
+
+	pipelineRefreshDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{
+		Namespace: namespace,
+		Name:      "pipeline_refresh_duration_seconds",
+		Help:      "Module refresh ingest duration by module type.",
+		Buckets:   prometheus.ExponentialBuckets(0.05, 2, 14),
+	}, []string{"module_type"})
+
+	renderPrefixCount = promauto.NewHistogram(prometheus.HistogramOpts{
+		Namespace: namespace,
+		Name:      "render_prefix_count",
+		Help:      "Materialized prefix count per tenant render.",
+		Buckets:   prometheus.ExponentialBuckets(10, 2, 16),
+	})
+
+	jobQueueActive = promauto.NewGauge(prometheus.GaugeOpts{
+		Namespace: namespace,
+		Name:      "job_queue_active",
+		Help:      "Currently running in-process async jobs.",
+	})
+
+	jobQueueCapacity = promauto.NewGauge(prometheus.GaugeOpts{
+		Namespace: namespace,
+		Name:      "job_queue_capacity",
+		Help:      "Maximum concurrent in-process async jobs.",
+	})
+)
+
+var (
+	birdProtocolStatesMu sync.RWMutex
+	birdProtocolStates   map[string]string
+	birdProtocolStatesAt time.Time
 )
 
 // RecordPrefixAggregation records tenant render CIDR aggregation stats.
@@ -93,6 +125,27 @@ func RecordPrefixAggregation(rawCount, aggregatedCount int, duration time.Durati
 	prefixAggregationDuration.Observe(duration.Seconds())
 	prefixAggregationRawCount.Observe(float64(rawCount))
 	prefixAggregationAggregatedCount.Observe(float64(aggregatedCount))
+	renderPrefixCount.Observe(float64(aggregatedCount))
+}
+
+// RecordPipelineRefresh records module ingest duration.
+func RecordPipelineRefresh(moduleType string, duration time.Duration) {
+	if moduleType == "" {
+		moduleType = "unknown"
+	}
+	pipelineRefreshDuration.WithLabelValues(moduleType).Observe(duration.Seconds())
+}
+
+// RecordJobQueueDepth updates in-process job worker utilization gauges.
+func RecordJobQueueDepth(active, capacity int) {
+	if active < 0 {
+		active = 0
+	}
+	if capacity < 0 {
+		capacity = 0
+	}
+	jobQueueActive.Set(float64(active))
+	jobQueueCapacity.Set(float64(capacity))
 }
 
 // RecordJobTerminal increments jobs_finished_total for terminal statuses.
@@ -205,6 +258,35 @@ func SetBirdSessionMetrics(established int, scrapeOK bool) {
 	}
 }
 
+// SetBirdProtocolStates caches parsed BGP protocol states from the last birdc scrape.
+func SetBirdProtocolStates(states map[string]string) {
+	birdProtocolStatesMu.Lock()
+	defer birdProtocolStatesMu.Unlock()
+	if states == nil {
+		birdProtocolStates = map[string]string{}
+	} else {
+		birdProtocolStates = states
+	}
+	birdProtocolStatesAt = time.Now()
+}
+
+// CachedBirdProtocolStates returns cached protocol states if younger than maxAge.
+func CachedBirdProtocolStates(maxAge time.Duration) (map[string]string, bool) {
+	if maxAge <= 0 {
+		maxAge = 60 * time.Second
+	}
+	birdProtocolStatesMu.RLock()
+	defer birdProtocolStatesMu.RUnlock()
+	if birdProtocolStates == nil || time.Since(birdProtocolStatesAt) > maxAge {
+		return nil, false
+	}
+	out := make(map[string]string, len(birdProtocolStates))
+	for k, v := range birdProtocolStates {
+		out[k] = v
+	}
+	return out, true
+}
+
 // MetricsHandler returns the Prometheus scrape handler.
 func MetricsHandler() http.Handler {
 	return promhttp.HandlerFor(prometheus.DefaultGatherer, promhttp.HandlerOpts{})
@@ -231,7 +313,7 @@ func (s *statusRecorder) WriteHeader(code int) {
 
 // StartBirdProtocolsPoller runs birdc "show protocols" on interval when socket is non-empty.
 // Горутина завершается при отмене ctx (корректное завершение вместе с процессом API).
-func StartBirdProtocolsPoller(ctx context.Context, socket string, birdcPath string, interval time.Duration, showFn func(ctx context.Context, socket, birdcBin string) (string, error), countFn func(output string) int) {
+func StartBirdProtocolsPoller(ctx context.Context, socket string, birdcPath string, interval time.Duration, showFn func(ctx context.Context, socket, birdcBin string) (string, error), countFn func(output string) int, parseFn func(output string) map[string]string) {
 	socket = trimSpace(socket)
 	if ctx == nil || socket == "" || interval <= 0 || showFn == nil || countFn == nil {
 		return
@@ -245,6 +327,9 @@ func StartBirdProtocolsPoller(ctx context.Context, socket string, birdcPath stri
 			return
 		}
 		SetBirdSessionMetrics(countFn(out), true)
+		if parseFn != nil {
+			SetBirdProtocolStates(parseFn(out))
+		}
 	}
 	go func() {
 		scrape()

internal/pipeline/asn_cache.go

@@ -44,6 +44,7 @@ func resolveASNForEntry(ctx context.Context, st store.Backend, hc *http.Client,
 	if err != nil {
 		return nil, "", err
 	}
+	asnresolve.PolitePause()
 	holder, _ := asnresolve.ASHolderName(ctx, hc, asn)
 	if st != nil {
 		strs := make([]string, len(pfxs))

internal/pipeline/cdn_snapshot.go

@@ -25,9 +25,6 @@ func cachedCDNPrefixRows(st store.Backend, tenantID, moduleID string, priorSnaps
 				return cached
 			}
 		}
-		if cached := latestCDNRowsBySource(st, tenantID)[sourceKey]; len(cached) > 0 {
-			return cached
-		}
 	}
 	return nil
 }
@@ -45,6 +42,35 @@ func mergeSnapshotDropSource(rows []store.PrefixRow, sourceKey string) []store.P
 	return out
 }
 
+// mergeSnapshotDropCDNSources removes all cdn:* rows (used before batch CDN merge).
+func mergeSnapshotDropCDNSources(rows []store.PrefixRow) []store.PrefixRow {
+	if len(rows) == 0 {
+		return nil
+	}
+	out := make([]store.PrefixRow, 0, len(rows))
+	for _, row := range rows {
+		if !strings.HasPrefix(strings.TrimSpace(row.Source), "cdn:") {
+			out = append(out, row)
+		}
+	}
+	return out
+}
+
+// mergeAllCDNSourcesIntoModuleSnapshot replaces all CDN rows in one write (avoids parallel read-modify-write races).
+func mergeAllCDNSourcesIntoModuleSnapshot(st store.Backend, tenantID string, mod *store.Module, priorSnapshot []store.PrefixRow, cdnRows []store.PrefixRow) error {
+	if st == nil || mod == nil {
+		return nil
+	}
+	var base []store.PrefixRow
+	if len(priorSnapshot) > 0 {
+		base = mergeSnapshotDropCDNSources(priorSnapshot)
+	} else if snap, ok, _ := st.GetModulePrefixSnapshot(tenantID, mod.ID); ok && snap != nil {
+		base = mergeSnapshotDropCDNSources(snap.Prefixes)
+	}
+	merged := append(base, cdnRows...)
+	return persistModuleSnapshot(st, tenantID, mod, merged)
+}
+
 func cdnRowsFromParsed(mod *store.Module, src *store.CDNSource, pfxStrings []string) []store.PrefixRow {
 	var rows []store.PrefixRow
 	for _, p := range pfxStrings {
@@ -156,3 +182,68 @@ func applyCDNSourceHTTPResult(ctx context.Context, st store.Backend, hc *http.Cl
 	}
 	return rows, nil
 }
+
+// fetchCDNSourceRows loads CDN prefixes without persisting the module snapshot (caller merges once).
+func fetchCDNSourceRows(ctx context.Context, st store.Backend, hc *http.Client, tenantID, moduleID string, mod *store.Module, src *store.CDNSource, priorSnapshot []store.PrefixRow, now time.Time) ([]store.PrefixRow, error) {
+	u := strings.TrimSpace(src.URL)
+	if u == "" {
+		return nil, nil
+	}
+	sourceKey := cdnSourceKey(src.ID)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, u, nil)
+	if err != nil {
+		return nil, err
+	}
+	if etag := strings.TrimSpace(src.Etag); etag != "" {
+		req.Header.Set("If-None-Match", etag)
+	}
+	resp, err := hc.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("cdn fetch %s: %w", u, err)
+	}
+
+	if resp.StatusCode == http.StatusNotModified {
+		if cached := cachedCDNPrefixRows(st, tenantID, moduleID, priorSnapshot, sourceKey); len(cached) > 0 {
+			_ = resp.Body.Close()
+			return cached, nil
+		}
+		_ = resp.Body.Close()
+		req2, err := http.NewRequestWithContext(ctx, http.MethodGet, u, nil)
+		if err != nil {
+			return nil, err
+		}
+		resp, err = hc.Do(req2)
+		if err != nil {
+			return nil, fmt.Errorf("cdn fetch %s: %w", u, err)
+		}
+		if resp.StatusCode == http.StatusNotModified {
+			_ = resp.Body.Close()
+			return nil, fmt.Errorf("cdn url %s: 304 without cached prefixes", u)
+		}
+	}
+	defer func() { _ = resp.Body.Close() }()
+
+	if resp.StatusCode != http.StatusOK {
+		_, _ = io.Copy(io.Discard, resp.Body)
+		return nil, fmt.Errorf("cdn url %s: %s", u, resp.Status)
+	}
+	body, err := io.ReadAll(io.LimitReader(resp.Body, 8<<20))
+	if err != nil {
+		return nil, err
+	}
+	prefixStrs, err := parseCDNBody(string(body), src)
+	if err != nil {
+		return nil, fmt.Errorf("cdn parse %s: %w", u, err)
+	}
+	etag := strings.TrimSpace(resp.Header.Get("ETag"))
+	patch := &store.CDNSourcePatch{}
+	if etag != "" && etag != strings.TrimSpace(src.Etag) {
+		e := etag
+		patch.Etag = &e
+	}
+	refreshedAt := now
+	patch.LastRefreshedAt = &refreshedAt
+	_, _ = st.UpdateCDNSource(tenantID, moduleID, src.ID, patch)
+
+	return cdnRowsFromParsed(mod, src, prefixStrs), nil
+}

internal/pipeline/collect_parallel.go

@@ -97,15 +97,18 @@ func collectASPrefixRows(ctx context.Context, st store.Backend, hc *http.Client,
 
 	seenPfx := make(map[string]struct{})
 	var out []store.PrefixRow
+	var metaUpdates []store.ASEntryResolveMetaUpdate
 	now := time.Now().UTC()
 	for _, r := range results {
 		if r.err != nil {
 			return nil, r.err
 		}
 		if r.metaID != "" {
-			if err := st.UpdateASEntryResolveMeta(tenantID, moduleID, r.metaID, r.holder, r.count, now); err != nil {
-				return nil, fmt.Errorf("as entry meta AS%d: %w", r.asn, err)
-			}
+			metaUpdates = append(metaUpdates, store.ASEntryResolveMetaUpdate{
+				EntryID:     r.metaID,
+				ASNName:     r.holder,
+				PrefixCount: r.count,
+			})
 		}
 		for _, row := range r.rows {
 			k := row.Prefix
@@ -116,6 +119,11 @@ func collectASPrefixRows(ctx context.Context, st store.Backend, hc *http.Client,
 			out = append(out, row)
 		}
 	}
+	if len(metaUpdates) > 0 {
+		if err := st.UpdateASEntryResolveMetaBatch(tenantID, moduleID, metaUpdates, now); err != nil {
+			return nil, fmt.Errorf("as entry meta batch: %w", err)
+		}
+	}
 	return out, nil
 }
 
@@ -150,12 +158,14 @@ func collectCDNPrefixRows(ctx context.Context, st store.Backend, hc *http.Client
 					results[idx] = srcResult{rows: cached}
 					return
 				}
-				if cached := latestCDNRowsBySource(st, tenantID)[sourceKey]; len(cached) > 0 {
-					results[idx] = srcResult{rows: cached}
-					return
+				if snap, ok, _ := st.GetModulePrefixSnapshot(tenantID, moduleID); ok && snap != nil {
+					if cached := prefixRowsForSource(snap.Prefixes, sourceKey); len(cached) > 0 {
+						results[idx] = srcResult{rows: cached}
+						return
+					}
 				}
 			}
-			rows, err := applyCDNSourceHTTPResult(ctx, st, hc, tenantID, moduleID, mod, src, priorSnapshot, now)
+			rows, err := fetchCDNSourceRows(ctx, st, hc, tenantID, moduleID, mod, src, priorSnapshot, now)
 			if err != nil {
 				results[idx] = srcResult{err: err}
 				return
@@ -172,6 +182,11 @@ func collectCDNPrefixRows(ctx context.Context, st store.Backend, hc *http.Client
 		}
 		out = append(out, r.rows...)
 	}
+	if len(valid) > 0 {
+		if err := mergeAllCDNSourcesIntoModuleSnapshot(st, tenantID, mod, priorSnapshot, out); err != nil {
+			return nil, err
+		}
+	}
 	return out, nil
 }
 

internal/pipeline/refresh.go

@@ -36,6 +36,11 @@ const (
 	revisionDefaultTTL  = 30 * 24 * time.Hour
 )
 
+// AuxBirdFullExpandedKey returns the preview map key for the expanded BIRD config (generated on demand).
+func AuxBirdFullExpandedKey() string {
+	return auxBirdFullExpanded
+}
+
 // MaterializedASPrefixKey returns the revision snapshot key for an AS-only entry (not a CIDR).
 func MaterializedASPrefixKey(asn int64) string {
 	return fmt.Sprintf("as:%d", asn)
@@ -47,10 +52,14 @@ func RefreshModuleIngest(ctx context.Context, st store.Backend, hc *http.Client,
 	if hc == nil {
 		hc = http.DefaultClient
 	}
+	start := time.Now()
 	mod, err := st.GetModule(tenantID, moduleID)
 	if err != nil {
 		return err
 	}
+	defer func() {
+		observability.RecordPipelineRefresh(mod.Type, time.Since(start))
+	}()
 	if !mod.Enabled {
 		return fmt.Errorf("pipeline: module disabled")
 	}
@@ -197,33 +206,6 @@ func shouldSkipCDNSourceFetch(src *store.CDNSource, now time.Time) bool {
 	return now.UTC().Before(nextRefreshAt)
 }
 
-func latestCDNRowsBySource(st store.Backend, tenantID string) map[string][]store.PrefixRow {
-	out := make(map[string][]store.PrefixRow)
-	if st == nil {
-		return out
-	}
-	revs, _, _ := st.ListRevisions(tenantID, "", "", 1)
-	if len(revs) == 0 || strings.TrimSpace(revs[0].ID) == "" {
-		return out
-	}
-	revID := strings.TrimSpace(revs[0].ID)
-	cursor := ""
-	for {
-		page, next, more := st.ListRevisionPrefixes(tenantID, revID, cursor, 2000)
-		for _, row := range page {
-			if !strings.HasPrefix(strings.TrimSpace(row.Source), "cdn:") {
-				continue
-			}
-			out[row.Source] = append(out[row.Source], row)
-		}
-		if !more || strings.TrimSpace(next) == "" {
-			break
-		}
-		cursor = next
-	}
-	return out
-}
-
 type dohJSONAnswer struct {
 	Type int    `json:"type"`
 	Data string `json:"data"`
@@ -836,10 +818,18 @@ func buildPreviewFragments(st store.Backend, tenantID, moduleID, revisionID stri
 		px6:         birdfmt.JoinFragments(birdfmt.ManagedBanner(revisionID), staticV6),
 		pPeers:      peersBody,
 	}
-	out[auxBirdFullExpanded] = buildExpandedBirdText(main, out)
 	return out, nil
 }
 
+// BuildExpandedBirdPreview concatenates bird.conf and deployable includes for UI preview (not persisted in revision).
+func BuildExpandedBirdPreview(frags map[string]string) string {
+	if frags == nil {
+		return ""
+	}
+	main := frags["bird.conf"]
+	return buildExpandedBirdText(main, frags)
+}
+
 func renderStaticProtocolsByCommunity(groups []staticCommunityRoutes) (string, string) {
 	var b4 strings.Builder
 	var b6 strings.Builder

internal/repository/job_audit.go

@@ -0,0 +1,50 @@
+package repository
+
+import (
+	"context"
+	"encoding/json"
+	"time"
+
+	"github.com/jackc/pgx/v5/pgxpool"
+)
+
+// JobAuditWriter persists async job lifecycle rows to job_audit (optional cross-process queue foundation).
+type JobAuditWriter struct {
+	pool *pgxpool.Pool
+}
+
+func NewJobAuditWriter(pool *pgxpool.Pool) *JobAuditWriter {
+	if pool == nil {
+		return nil
+	}
+	return &JobAuditWriter{pool: pool}
+}
+
+// UpsertRunning inserts or updates a running job row (best-effort).
+func (w *JobAuditWriter) UpsertRunning(ctx context.Context, tenantID, jobID, kind string, idempotencyKey *string, meta map[string]any) {
+	if w == nil || w.pool == nil {
+		return
+	}
+	metaJSON, _ := json.Marshal(meta)
+	var idem any
+	if idempotencyKey != nil && *idempotencyKey != "" {
+		idem = *idempotencyKey
+	}
+	_, _ = w.pool.Exec(ctx, `
+		INSERT INTO job_audit (id, tenant_id, kind, status, idempotency_key, meta_json, created_at, started_at)
+		VALUES ($1::uuid, $2::uuid, $3, 'running', $4, $5::jsonb, now(), now())
+		ON CONFLICT (tenant_id, idempotency_key) WHERE idempotency_key IS NOT NULL
+		DO UPDATE SET status='running', started_at=now(), meta_json=EXCLUDED.meta_json`,
+		jobID, tenantID, kind, idem, metaJSON)
+}
+
+// MarkTerminal updates job_audit terminal state (best-effort).
+func (w *JobAuditWriter) MarkTerminal(ctx context.Context, tenantID, jobID, status string, errMsg *string, finishedAt time.Time) {
+	if w == nil || w.pool == nil {
+		return
+	}
+	_, _ = w.pool.Exec(ctx, `
+		UPDATE job_audit SET status=$3, error_message=$4, finished_at=$5
+		WHERE id=$1::uuid AND tenant_id=$2::uuid`,
+		jobID, tenantID, status, errMsg, finishedAt.UTC())
+}

internal/repository/postgres.go

@@ -126,6 +126,7 @@ func (p *Postgres) ListModules(tenantID string) []*store.Module {
 	}
 	defer rows.Close()
 	var out []*store.Module
+	moduleByID := make(map[string]*store.Module)
 	for rows.Next() {
 		var m store.Module
 		m.TenantID = tenantID
@@ -152,14 +153,84 @@ func (p *Postgres) ListModules(tenantID string) []*store.Module {
 			t := last.UTC()
 			m.LastRefreshedAt = &t
 		}
-		if err := p.fillModuleDohFields(ctx, &m); err != nil {
-			continue
-		}
 		out = append(out, &m)
+		moduleByID[m.ID] = &m
+	}
+	if err := p.batchFillModuleDohFields(ctx, moduleByID); err != nil {
+		return nil
 	}
 	return out
 }
 
+func (p *Postgres) ListModulesPage(tenantID, cursor string, limit int) ([]*store.Module, string, bool) {
+	if limit <= 0 {
+		limit = 50
+	}
+	off := 0
+	if cursor != "" {
+		if n, err := strconv.Atoi(cursor); err == nil && n >= 0 {
+			off = n
+		}
+	}
+	ctx := context.Background()
+	rows, err := p.pool.Query(ctx, `
+		SELECT id, type, name, enabled, priority, doh_profile_id::text, doh_resolver_policy,
+			refresh_interval_sec, cron_expr, default_community_id::text, last_refreshed_at
+		FROM module WHERE tenant_id = $1 AND deleted_at IS NULL
+		ORDER BY priority, name
+		LIMIT $2 OFFSET $3`, tenantID, limit+1, off)
+	if err != nil {
+		return nil, "", false
+	}
+	defer rows.Close()
+	var out []*store.Module
+	moduleByID := make(map[string]*store.Module)
+	for rows.Next() {
+		var m store.Module
+		m.TenantID = tenantID
+		var doh, dc, cron *string
+		var refresh *int32
+		var last *time.Time
+		if err := rows.Scan(&m.ID, &m.Type, &m.Name, &m.Enabled, &m.Priority, &doh, &m.DohResolverPolicy, &refresh, &cron, &dc, &last); err != nil {
+			continue
+		}
+		m.DohResolverPolicy = store.NormalizeDohResolverPolicy(m.DohResolverPolicy)
+		if refresh != nil {
+			m.RefreshIntervalSec = int(*refresh)
+		}
+		if cron != nil {
+			m.CronExpr = *cron
+		}
+		if doh != nil && *doh != "" {
+			m.DohProfileID = doh
+		}
+		if dc != nil && *dc != "" {
+			m.DefaultCommunityID = dc
+		}
+		if last != nil {
+			t := last.UTC()
+			m.LastRefreshedAt = &t
+		}
+		out = append(out, &m)
+		moduleByID[m.ID] = &m
+	}
+	if err := p.batchFillModuleDohFields(ctx, moduleByID); err != nil {
+		return nil, "", false
+	}
+	more := len(out) > limit
+	if more {
+		out = out[:limit]
+	}
+	next := ""
+	if more {
+		next = fmt.Sprintf("%d", off+limit)
+	}
+	if len(out) == 0 {
+		return nil, "", false
+	}
+	return out, next, more
+}
+
 func (p *Postgres) GetModule(tenantID, moduleID string) (*store.Module, error) {
 	ctx := context.Background()
 	var m store.Module
@@ -685,7 +756,13 @@ func (p *Postgres) ListRevisionPrefixes(tenantID, revisionID string, cursor stri
 		}
 	}
 	ctx := context.Background()
-	if _, err := p.GetRevision(tenantID, revisionID); err != nil {
+	var one int
+	if err := p.pool.QueryRow(ctx, `
+		SELECT 1 FROM config_revision WHERE id = $1::uuid AND tenant_id = $2::uuid`,
+		revisionID, tenantID).Scan(&one); err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, "", false
+		}
 		return nil, "", false
 	}
 	rows, err := p.pool.Query(ctx, `
@@ -754,6 +831,8 @@ func (p *Postgres) CreateRollbackRevision(tenantID, sourceRevisionID string) (st
 	return newID, nil
 }
 
+const maxRevisionDiffRows = 5000
+
 func (p *Postgres) RevisionDiff(tenantID, aID, bID string) (map[string]any, error) {
 	if _, err := p.GetRevision(tenantID, aID); err != nil {
 		return nil, err
@@ -778,7 +857,7 @@ func (p *Postgres) RevisionDiff(tenantID, aID, bID string) (map[string]any, erro
 			SELECT prefix FROM revision_materialized_prefix WHERE revision_id=$1::uuid
 			EXCEPT
 			SELECT prefix FROM revision_materialized_prefix WHERE revision_id=$2::uuid
-		) s ORDER BY 1`, bID, aID)
+		) s ORDER BY 1 LIMIT $3`, bID, aID, maxRevisionDiffRows+1)
 	if err != nil {
 		return nil, err
 	}
@@ -790,13 +869,18 @@ func (p *Postgres) RevisionDiff(tenantID, aID, bID string) (map[string]any, erro
 			continue
 		}
 		added = append(added, s)
+		if len(added) > maxRevisionDiffRows {
+			added = added[:maxRevisionDiffRows]
+			break
+		}
 	}
+	addedTruncated := len(added) >= maxRevisionDiffRows
 	rowsRem, err := p.pool.Query(ctx, `
 		SELECT prefix::text FROM (
 			SELECT prefix FROM revision_materialized_prefix WHERE revision_id=$1::uuid
 			EXCEPT
 			SELECT prefix FROM revision_materialized_prefix WHERE revision_id=$2::uuid
-		) s ORDER BY 1`, aID, bID)
+		) s ORDER BY 1 LIMIT $3`, aID, bID, maxRevisionDiffRows+1)
 	if err != nil {
 		return nil, err
 	}
@@ -808,40 +892,56 @@ func (p *Postgres) RevisionDiff(tenantID, aID, bID string) (map[string]any, erro
 			continue
 		}
 		removed = append(removed, s)
+		if len(removed) > maxRevisionDiffRows {
+			removed = removed[:maxRevisionDiffRows]
+			break
+		}
 	}
 	return map[string]any{
 		"revision_a": aID,
 		"revision_b": bID,
 		"prefixes": map[string]any{
 			"added": added, "removed": removed, "unchanged_count": unchanged,
+			"truncated": addedTruncated || len(removed) >= maxRevisionDiffRows,
 		},
 	}, nil
 }
 
 func (p *Postgres) PruneRevisionsBefore(tenantID string, cutoff time.Time) (int, error) {
 	ctx := context.Background()
-	cmd, err := p.pool.Exec(ctx, `
-		DELETE FROM config_revision AS cr
-		WHERE cr.tenant_id = $1
-		  AND cr.created_at < $2
-		  AND cr.id <> (
-			SELECT id
-			FROM config_revision
-			WHERE tenant_id = $1
-			ORDER BY created_at DESC
-			LIMIT 1
-		  )
-		  AND NOT EXISTS (
-			SELECT 1
-			FROM bgp_speaker AS sp
-			WHERE sp.tenant_id = $1
-			  AND (sp.last_applied_revision_id = cr.id OR sp.published_revision_id = cr.id)
-		  )`,
-		tenantID, cutoff.UTC())
-	if err != nil {
-		return 0, err
+	total := 0
+	const batchSize = 50
+	for {
+		cmd, err := p.pool.Exec(ctx, `
+			DELETE FROM config_revision AS cr
+			WHERE cr.id IN (
+				SELECT id FROM config_revision
+				WHERE tenant_id = $1
+				  AND created_at < $2
+				  AND id <> (
+					SELECT id FROM config_revision
+					WHERE tenant_id = $1
+					ORDER BY created_at DESC
+					LIMIT 1
+				  )
+				  AND NOT EXISTS (
+					SELECT 1 FROM bgp_speaker AS sp
+					WHERE sp.tenant_id = $1
+					  AND (sp.last_applied_revision_id = config_revision.id OR sp.published_revision_id = config_revision.id)
+				  )
+				ORDER BY created_at ASC
+				LIMIT $3
+			)`, tenantID, cutoff.UTC(), batchSize)
+		if err != nil {
+			return total, err
+		}
+		n := int(cmd.RowsAffected())
+		total += n
+		if n < batchSize {
+			break
+		}
 	}
-	return int(cmd.RowsAffected()), nil
+	return total, nil
 }
 
 func (p *Postgres) SetLastAppliedRevision(tenantID, speakerID, revisionID string) error {

internal/repository/postgres_entities.go

@@ -325,6 +325,38 @@ func (p *Postgres) UpdateASEntryResolveMeta(tenantID, moduleID, entryID string,
 	return nil
 }
 
+func (p *Postgres) UpdateASEntryResolveMetaBatch(tenantID, moduleID string, updates []store.ASEntryResolveMetaUpdate, resolvedAt time.Time) error {
+	if len(updates) == 0 {
+		return nil
+	}
+	if _, err := p.GetModule(tenantID, moduleID); err != nil {
+		return err
+	}
+	ctx := context.Background()
+	batch := &pgx.Batch{}
+	for _, u := range updates {
+		var nameArg any
+		sn := strings.TrimSpace(u.ASNName)
+		if sn == "" {
+			nameArg = nil
+		} else {
+			nameArg = sn
+		}
+		batch.Queue(`
+			UPDATE module_as_entry SET asn_name=$3, prefix_count=$4, asn_resolved_at=$5, updated_at=now()
+			WHERE id=$1 AND module_id=$2`,
+			u.EntryID, moduleID, nameArg, u.PrefixCount, resolvedAt.UTC())
+	}
+	br := p.pool.SendBatch(ctx, batch)
+	defer func() { _ = br.Close() }()
+	for range updates {
+		if _, err := br.Exec(); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (p *Postgres) DeleteASEntry(tenantID, moduleID, entryID string) error {
 	if _, err := p.GetModule(tenantID, moduleID); err != nil {
 		return err

internal/repository/postgres_module_doh.go

@@ -10,28 +10,41 @@ func (p *Postgres) fillModuleDohFields(ctx context.Context, m *store.Module) err
 	if m == nil {
 		return nil
 	}
+	return p.batchFillModuleDohFields(ctx, map[string]*store.Module{m.ID: m})
+}
+
+func (p *Postgres) batchFillModuleDohFields(ctx context.Context, modules map[string]*store.Module) error {
+	if len(modules) == 0 {
+		return nil
+	}
+	ids := make([]string, 0, len(modules))
+	for id := range modules {
+		ids = append(ids, id)
+	}
 	rows, err := p.pool.Query(ctx, `
-		SELECT doh_profile_id::text
+		SELECT module_id::text, doh_profile_id::text
 		FROM module_doh_profile
-		WHERE module_id = $1
-		ORDER BY sort_order, doh_profile_id`, m.ID)
+		WHERE module_id = ANY($1::uuid[])
+		ORDER BY module_id, sort_order, doh_profile_id`, ids)
 	if err != nil {
 		return err
 	}
 	defer rows.Close()
-	var ids []string
+	byModule := make(map[string][]string, len(modules))
 	for rows.Next() {
-		var id string
-		if err := rows.Scan(&id); err != nil {
+		var moduleID, profileID string
+		if err := rows.Scan(&moduleID, &profileID); err != nil {
 			return err
 		}
-		ids = append(ids, id)
+		byModule[moduleID] = append(byModule[moduleID], profileID)
 	}
 	if err := rows.Err(); err != nil {
 		return err
 	}
-	m.DohProfileIDs = store.NormalizeDohProfileIDList(ids)
-	m.SyncLegacyDohProfileID()
+	for id, m := range modules {
+		m.DohProfileIDs = store.NormalizeDohProfileIDList(byModule[id])
+		m.SyncLegacyDohProfileID()
+	}
 	return nil
 }
 

internal/store/as_meta_batch.go

@@ -0,0 +1,8 @@
+package store
+
+// ASEntryResolveMetaUpdate is one row for batch AS resolve metadata writes.
+type ASEntryResolveMetaUpdate struct {
+	EntryID     string
+	ASNName     string
+	PrefixCount int64
+}

internal/store/backend.go

@@ -18,6 +18,8 @@ type Backend interface {
 
 	// ListModules returns all modules for a tenant (control plane may paginate in httpapi).
 	ListModules(tenantID string) []*Module
+	// ListModulesPage returns one page of modules (limit capped by caller).
+	ListModulesPage(tenantID, cursor string, limit int) ([]*Module, string, bool)
 	GetModule(tenantID, moduleID string) (*Module, error)
 	CreateModule(tenantID string, in *Module) (*Module, error)
 	UpdateModule(tenantID, moduleID string, patch *ModulePatch) (*Module, error)
@@ -34,6 +36,7 @@ type Backend interface {
 	DeleteASEntry(tenantID, moduleID, entryID string) error
 	// UpdateASEntryResolveMeta записывает имя AS, число объявленных префиксов и время успешного резолва (pipeline).
 	UpdateASEntryResolveMeta(tenantID, moduleID, entryID string, asnName string, prefixCount int64, resolvedAt time.Time) error
+	UpdateASEntryResolveMetaBatch(tenantID, moduleID string, updates []ASEntryResolveMetaUpdate, resolvedAt time.Time) error
 
 	ListDomainEntries(tenantID, moduleID string) ([]*DomainEntry, error)
 	CreateDomainEntry(tenantID, moduleID string, in *DomainEntry) (*DomainEntry, error)

internal/store/memory.go

@@ -382,6 +382,11 @@ func (m *Memory) ListModules(tenantID string) []*Module {
 	return out
 }
 
+func (m *Memory) ListModulesPage(tenantID, cursor string, limit int) ([]*Module, string, bool) {
+	all := m.ListModules(tenantID)
+	return PaginateOffset(all, cursor, limit)
+}
+
 // ListPeers returns BGP peers for a tenant (sorted by name).
 func (m *Memory) ListPeers(tenantID string) []*BGPPeer {
 	m.mu.RLock()

internal/store/memory_crud.go

@@ -301,6 +301,15 @@ func (m *Memory) UpdateASEntryResolveMeta(tenantID, moduleID, entryID string, as
 	return nil
 }
 
+func (m *Memory) UpdateASEntryResolveMetaBatch(tenantID, moduleID string, updates []ASEntryResolveMetaUpdate, resolvedAt time.Time) error {
+	for _, u := range updates {
+		if err := m.UpdateASEntryResolveMeta(tenantID, moduleID, u.EntryID, u.ASNName, u.PrefixCount, resolvedAt); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (m *Memory) DeleteASEntry(tenantID, moduleID, entryID string) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()

migrations/postgres/000012_perf_indexes.down.sql

@@ -0,0 +1,6 @@
+DROP INDEX IF EXISTS idx_rev_mat_prefix_rev_id;
+DROP INDEX IF EXISTS idx_config_revision_tenant_module_created;
+DROP INDEX IF EXISTS idx_bgp_speaker_published;
+DROP INDEX IF EXISTS idx_bgp_speaker_last_applied;
+DROP INDEX IF EXISTS idx_module_default_community;
+DROP INDEX IF EXISTS idx_module_doh_profile_id;

migrations/postgres/000012_perf_indexes.up.sql

@@ -0,0 +1,17 @@
+CREATE INDEX IF NOT EXISTS idx_module_doh_profile_id
+    ON module (doh_profile_id) WHERE deleted_at IS NULL AND doh_profile_id IS NOT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_module_default_community
+    ON module (default_community_id) WHERE deleted_at IS NULL AND default_community_id IS NOT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_bgp_speaker_last_applied
+    ON bgp_speaker (last_applied_revision_id) WHERE last_applied_revision_id IS NOT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_bgp_speaker_published
+    ON bgp_speaker (published_revision_id) WHERE published_revision_id IS NOT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_config_revision_tenant_module_created
+    ON config_revision (tenant_id, module_id, created_at DESC);
+
+CREATE INDEX IF NOT EXISTS idx_rev_mat_prefix_rev_id
+    ON revision_materialized_prefix (revision_id, id);

migrations/sqlite/000012_perf_indexes.down.sql

@@ -0,0 +1,6 @@
+DROP INDEX IF EXISTS idx_rev_mat_prefix_rev_id;
+DROP INDEX IF EXISTS idx_config_revision_tenant_module_created;
+DROP INDEX IF EXISTS idx_bgp_speaker_published;
+DROP INDEX IF EXISTS idx_bgp_speaker_last_applied;
+DROP INDEX IF EXISTS idx_module_default_community;
+DROP INDEX IF EXISTS idx_module_doh_profile_id;

migrations/sqlite/000012_perf_indexes.up.sql

@@ -0,0 +1,17 @@
+CREATE INDEX IF NOT EXISTS idx_module_doh_profile_id
+    ON module (doh_profile_id) WHERE deleted_at IS NULL AND doh_profile_id IS NOT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_module_default_community
+    ON module (default_community_id) WHERE deleted_at IS NULL AND default_community_id IS NOT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_bgp_speaker_last_applied
+    ON bgp_speaker (last_applied_revision_id) WHERE last_applied_revision_id IS NOT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_bgp_speaker_published
+    ON bgp_speaker (published_revision_id) WHERE published_revision_id IS NOT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_config_revision_tenant_module_created
+    ON config_revision (tenant_id, module_id, created_at DESC);
+
+CREATE INDEX IF NOT EXISTS idx_rev_mat_prefix_rev_id
+    ON revision_materialized_prefix (revision_id, id);

web/src/lib/components/network/BirdSettingsForm.svelte

@@ -0,0 +1,212 @@
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import { defaults, superForm } from 'sveltekit-superforms';
+	import { zod4 } from 'sveltekit-superforms/adapters';
+	import {
+		birdSettingsSchema,
+		emptyBirdSettingsForm,
+		type BirdSettingsForm
+	} from '$lib/settings/bird-settings.schema.js';
+	import {
+		buildPayloadFromFormFields,
+		loadSettings,
+		partitionSettings,
+		patchSettings
+	} from '$lib/settings/settings-api.js';
+	import { BIRD_SETTING_KEYS } from '$lib/settings/settings-known-keys.js';
+	import { Button } from '$lib/ui/core/button/index.js';
+	import {
+		Card,
+		CardContent,
+		CardDescription,
+		CardHeader,
+		CardTitle
+	} from '$lib/ui/core/card/index.js';
+	import { Input } from '$lib/ui/core/input/index.js';
+	import { Alert, AlertDescription, AlertTitle } from '$lib/ui/core/alert/index.js';
+	import FormField from '$lib/ui/patterns/form/form-field.svelte';
+	import { notify, notifyApiError } from '$lib/ui/app/toast.js';
+	import Save from '@lucide/svelte/icons/save';
+	import Info from '@lucide/svelte/icons/info';
+
+	let loading = $state(false);
+	let saving = $state(false);
+	let loaded = $state(false);
+
+	const { form, errors, reset, validateForm } = superForm(
+		defaults(emptyBirdSettingsForm(), zod4(birdSettingsSchema)),
+		{
+			validators: zod4(birdSettingsSchema),
+			SPA: true,
+			dataType: 'json'
+		}
+	);
+
+	let hasValidationErrors = $derived(
+		BIRD_SETTING_KEYS.some((key) => Boolean($errors[key as keyof BirdSettingsForm]?.length))
+	);
+
+	let canSave = $derived.by(() => {
+		if (loading || saving || hasValidationErrors || !loaded) return false;
+		return BIRD_SETTING_KEYS.some((key) => {
+			const value = String($form[key as keyof BirdSettingsForm] ?? '').trim();
+			return value !== '' && !$errors[key as keyof BirdSettingsForm]?.length;
+		});
+	});
+
+	async function load() {
+		loading = true;
+		try {
+			const settings = await loadSettings();
+			const { partitioned } = partitionSettings(settings);
+			reset({ data: partitioned.bird });
+			loaded = true;
+		} catch (e) {
+			notifyApiError(e);
+		} finally {
+			loading = false;
+		}
+	}
+
+	async function save() {
+		const validation = await validateForm({ update: true });
+		if (!validation.valid) {
+			notify.error('Исправьте ошибки в полях настроек');
+			return;
+		}
+		if (!canSave) {
+			notify.error('Нечего сохранять или есть ошибки в полях');
+			return;
+		}
+
+		const payload = buildPayloadFromFormFields(
+			BIRD_SETTING_KEYS,
+			$form as Record<string, string>,
+			$errors as Partial<Record<string, string[]>>
+		);
+
+		saving = true;
+		try {
+			await patchSettings(payload);
+			notify.success('Параметры BIRD сохранены');
+			await load();
+		} catch (e) {
+			notifyApiError(e);
+		} finally {
+			saving = false;
+		}
+	}
+
+	onMount(() => {
+		void load();
+	});
+</script>
+
+<Card>
+	<CardHeader>
+		<CardTitle>Control plane</CardTitle>
+		<CardDescription>
+			Глобальные параметры BIRD для pipeline refresh/apply. Сохранение через
+			<code class="text-xs">PATCH /v1/settings</code> (роль operator).
+		</CardDescription>
+	</CardHeader>
+	<CardContent class="space-y-5">
+		<Alert class="border-info/30 bg-info/5">
+			<Info class="text-info" />
+			<AlertTitle>Подстановка в конфиг</AlertTitle>
+			<AlertDescription>
+				Значения используются при генерации BIRD-конфигурации в pipeline (router id, local AS,
+				адреса). Пиры и спикеры настраиваются на соседних вкладках.
+			</AlertDescription>
+		</Alert>
+
+		{#if loading && !loaded}
+			<p class="text-sm text-muted-foreground">Загрузка…</p>
+		{:else if !loaded}
+			<Button variant="outline" onclick={load}>Загрузить параметры</Button>
+		{:else}
+			<div class="space-y-3">
+				<FormField
+					id="bird-router-id"
+					label="Router ID (bird_router_id)"
+					error={$errors.bird_router_id?.[0]}
+				>
+					<Input id="bird-router-id" bind:value={$form.bird_router_id} placeholder="203.0.113.1" />
+				</FormField>
+
+				<FormField
+					id="bird-local-ipv4"
+					label="Локальный IPv4 (bird_local_ipv4)"
+					error={$errors.bird_local_ipv4?.[0]}
+				>
+					<Input
+						id="bird-local-ipv4"
+						bind:value={$form.bird_local_ipv4}
+						placeholder="198.51.100.10"
+					/>
+				</FormField>
+
+				<FormField
+					id="bird-local-ipv6"
+					label="Локальный IPv6 (bird_local_ipv6)"
+					error={$errors.bird_local_ipv6?.[0]}
+				>
+					<Input
+						id="bird-local-ipv6"
+						bind:value={$form.bird_local_ipv6}
+						placeholder="2001:db8::10"
+					/>
+				</FormField>
+
+				<FormField
+					id="bird-local-asn"
+					label="Локальный ASN (bird_local_asn)"
+					error={$errors.bird_local_asn?.[0]}
+				>
+					<Input
+						id="bird-local-asn"
+						type="number"
+						min="1"
+						bind:value={$form.bird_local_asn}
+						placeholder="65001"
+					/>
+				</FormField>
+
+				<FormField
+					id="bird-bgp-source-ipv4"
+					label="BGP source IPv4 (bird_bgp_source_ipv4)"
+					error={$errors.bird_bgp_source_ipv4?.[0]}
+				>
+					<Input
+						id="bird-bgp-source-ipv4"
+						bind:value={$form.bird_bgp_source_ipv4}
+						placeholder="198.51.100.11"
+					/>
+				</FormField>
+
+				<FormField
+					id="bird-bgp-source-ipv6"
+					label="BGP source IPv6 (bird_bgp_source_ipv6)"
+					error={$errors.bird_bgp_source_ipv6?.[0]}
+				>
+					<Input
+						id="bird-bgp-source-ipv6"
+						bind:value={$form.bird_bgp_source_ipv6}
+						placeholder="2001:db8::11"
+					/>
+				</FormField>
+			</div>
+
+			{#if hasValidationErrors}
+				<p class="text-sm text-destructive">
+					Есть ошибки в полях. Исправьте их, чтобы сохранить изменения.
+				</p>
+			{/if}
+
+			<Button onclick={save} disabled={!canSave}>
+				<Save />
+				{saving ? 'Сохранение…' : 'Применить параметры'}
+			</Button>
+		{/if}
+	</CardContent>
+</Card>

web/src/lib/components/operations/OperationsSystemSettingsTab.svelte

@@ -0,0 +1,223 @@
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import { defaults, superForm } from 'sveltekit-superforms';
+	import { zod4 } from 'sveltekit-superforms/adapters';
+	import {
+		emptyRevisionSettingsForm,
+		revisionSettingsSchema
+	} from '$lib/settings/revision-settings.schema.js';
+	import {
+		buildPayloadFromFormFields,
+		loadSettings,
+		partitionSettings,
+		patchSettings,
+		type AdditionalSettingEntry
+	} from '$lib/settings/settings-api.js';
+	import { REVISION_SETTING_KEYS } from '$lib/settings/settings-known-keys.js';
+	import { Button } from '$lib/ui/core/button/index.js';
+	import {
+		Card,
+		CardContent,
+		CardDescription,
+		CardHeader,
+		CardTitle
+	} from '$lib/ui/core/card/index.js';
+	import { Input } from '$lib/ui/core/input/index.js';
+	import { Alert, AlertDescription, AlertTitle } from '$lib/ui/core/alert/index.js';
+	import FormField from '$lib/ui/patterns/form/form-field.svelte';
+	import EmptyState from '$lib/ui/patterns/empty-state/empty-state.svelte';
+	import { notify, notifyApiError } from '$lib/ui/app/toast.js';
+	import Save from '@lucide/svelte/icons/save';
+	import Plus from '@lucide/svelte/icons/plus';
+	import Trash2 from '@lucide/svelte/icons/trash-2';
+	import Info from '@lucide/svelte/icons/info';
+
+	let loading = $state(false);
+	let saving = $state(false);
+	let loaded = $state(false);
+	let additionalSettings = $state<AdditionalSettingEntry[]>([]);
+	let additionalIdCounter = $state(1);
+
+	const { form, errors, reset, validateForm } = superForm(
+		defaults(emptyRevisionSettingsForm(), zod4(revisionSettingsSchema)),
+		{
+			validators: zod4(revisionSettingsSchema),
+			SPA: true,
+			dataType: 'json'
+		}
+	);
+
+	let hasValidationErrors = $derived(Boolean($errors.revision_retention_minutes?.length));
+
+	function addAdditionalSetting() {
+		additionalSettings.push({ id: additionalIdCounter++, key: '', value: '' });
+	}
+
+	function removeAdditionalSetting(id: number) {
+		additionalSettings = additionalSettings.filter((entry) => entry.id !== id);
+	}
+
+	let canSave = $derived.by(() => {
+		if (loading || saving || hasValidationErrors || !loaded) return false;
+
+		const hasRetention = String($form.revision_retention_minutes ?? '').trim() !== '';
+		const hasAdditional = additionalSettings.some((entry) => entry.key.trim() !== '');
+
+		return hasRetention || hasAdditional;
+	});
+
+	async function load() {
+		loading = true;
+		try {
+			const settings = await loadSettings();
+			const { partitioned, nextId } = partitionSettings(settings, additionalIdCounter);
+			reset({ data: partitioned.revision });
+			additionalSettings = partitioned.additional;
+			additionalIdCounter = nextId;
+			loaded = true;
+		} catch (e) {
+			notifyApiError(e);
+		} finally {
+			loading = false;
+		}
+	}
+
+	async function save() {
+		const validation = await validateForm({ update: true });
+		if (!validation.valid) {
+			notify.error('Исправьте ошибки в полях настроек');
+			return;
+		}
+		if (!canSave) {
+			notify.error('Нечего сохранять или есть ошибки в полях');
+			return;
+		}
+
+		const payload = buildPayloadFromFormFields(
+			REVISION_SETTING_KEYS,
+			$form as Record<string, string>,
+			$errors as Partial<Record<string, string[]>>
+		);
+
+		for (const entry of additionalSettings) {
+			const key = entry.key.trim();
+			if (!key) continue;
+			payload[key] = entry.value;
+		}
+
+		saving = true;
+		try {
+			await patchSettings(payload);
+			notify.success('Системные настройки сохранены');
+			await load();
+		} catch (e) {
+			notifyApiError(e);
+		} finally {
+			saving = false;
+		}
+	}
+
+	onMount(() => {
+		void load();
+	});
+</script>
+
+<div class="flex flex-col gap-6">
+	<Alert class="border-info/30 bg-info/5">
+		<Info class="text-info" />
+		<AlertTitle>Operator-only</AlertTitle>
+		<AlertDescription>
+			Изменение параметров через <code class="text-xs">PATCH /v1/settings</code> требует роли operator.
+			При отсутствии прав API вернёт 403.
+		</AlertDescription>
+	</Alert>
+
+	<Card>
+		<CardHeader>
+			<CardTitle>Хранение ревизий</CardTitle>
+			<CardDescription>
+				Автоматическая очистка старых ревизий. Последняя раскатанная ревизия не удаляется.
+			</CardDescription>
+		</CardHeader>
+		<CardContent>
+			{#if loading && !loaded}
+				<p class="text-sm text-muted-foreground">Загрузка…</p>
+			{:else if !loaded}
+				<Button variant="outline" onclick={load}>Загрузить настройки</Button>
+			{:else}
+				<FormField
+					id="revision-retention-minutes"
+					label="Время жизни ревизий, мин (revision_retention_minutes)"
+					error={$errors.revision_retention_minutes?.[0]}
+					description="Допустимый диапазон: 15–43200 минут."
+				>
+					<Input
+						id="revision-retention-minutes"
+						type="number"
+						min="15"
+						max="43200"
+						bind:value={$form.revision_retention_minutes}
+						placeholder="43200"
+					/>
+				</FormField>
+			{/if}
+		</CardContent>
+	</Card>
+
+	<Card>
+		<CardHeader>
+			<div class="flex items-center justify-between gap-4">
+				<div class="space-y-1">
+					<CardTitle>Дополнительные параметры</CardTitle>
+					<CardDescription>Произвольные KV-пары в global_settings.</CardDescription>
+				</div>
+				{#if loaded}
+					<Button variant="outline" size="sm" onclick={addAdditionalSetting}>
+						<Plus class="size-4" />
+						Добавить строку
+					</Button>
+				{/if}
+			</div>
+		</CardHeader>
+		<CardContent>
+			{#if !loaded}
+				<p class="text-sm text-muted-foreground">Загрузите настройки выше.</p>
+			{:else if additionalSettings.length === 0}
+				<EmptyState
+					title="Нет дополнительных параметров"
+					description="Добавьте KV-пару при необходимости."
+				/>
+			{:else}
+				<div class="space-y-2">
+					{#each additionalSettings as entry (entry.id)}
+						<div class="grid grid-cols-1 gap-2 md:grid-cols-[1fr_1fr_auto]">
+							<Input bind:value={entry.key} placeholder="Ключ (например, bird_log_level)" />
+							<Input bind:value={entry.value} placeholder="Значение (строка)" />
+							<Button
+								variant="ghost"
+								size="icon"
+								aria-label="Удалить строку"
+								onclick={() => removeAdditionalSetting(entry.id)}
+							>
+								<Trash2 class="size-4" />
+							</Button>
+						</div>
+					{/each}
+				</div>
+			{/if}
+		</CardContent>
+	</Card>
+
+	{#if loaded}
+		{#if hasValidationErrors}
+			<p class="text-sm text-destructive">
+				Есть ошибки в полях. Исправьте их, чтобы сохранить изменения.
+			</p>
+		{/if}
+
+		<Button onclick={save} disabled={!canSave}>
+			<Save />
+			{saving ? 'Сохранение…' : 'Применить настройки'}
+		</Button>
+	{/if}
+</div>

web/src/lib/settings/bird-settings.schema.ts

@@ -0,0 +1,24 @@
+import { z } from 'zod';
+import { optionalIPv4, optionalIPv6 } from './ip-validation.js';
+
+export const birdSettingsSchema = z.object({
+	bird_router_id: optionalIPv4('router id'),
+	bird_local_ipv4: optionalIPv4('local IPv4'),
+	bird_local_ipv6: optionalIPv6('local IPv6'),
+	bird_local_asn: z.string().refine((v) => v.trim() === '' || /^[1-9]\d*$/.test(v.trim()), {
+		message: 'ASN должен быть целым числом больше 0'
+	}),
+	bird_bgp_source_ipv4: optionalIPv4('BGP source IPv4'),
+	bird_bgp_source_ipv6: optionalIPv6('BGP source IPv6')
+});
+
+export type BirdSettingsForm = z.infer<typeof birdSettingsSchema>;
+
+export const emptyBirdSettingsForm = (): BirdSettingsForm => ({
+	bird_router_id: '',
+	bird_local_ipv4: '',
+	bird_local_ipv6: '',
+	bird_local_asn: '',
+	bird_bgp_source_ipv4: '',
+	bird_bgp_source_ipv6: ''
+});

web/src/lib/settings/ip-validation.ts

@@ -0,0 +1,47 @@
+import { z } from 'zod';
+
+function isValidIPv4(value: string): boolean {
+	const parts = value.split('.');
+	if (parts.length !== 4) return false;
+	for (const part of parts) {
+		if (!/^\d{1,3}$/.test(part)) return false;
+		if (part.length > 1 && part.startsWith('0')) return false;
+		const n = Number(part);
+		if (!Number.isInteger(n) || n < 0 || n > 255) return false;
+	}
+	return true;
+}
+
+function isValidIPv6(value: string): boolean {
+	if (!/^[0-9A-Fa-f:.]+$/.test(value)) return false;
+	if ((value.match(/::/g) ?? []).length > 1) return false;
+	const hasCompression = value.includes('::');
+	const [leftRaw, rightRaw = ''] = value.split('::');
+	const left = leftRaw === '' ? [] : leftRaw.split(':');
+	const right = rightRaw === '' ? [] : rightRaw.split(':');
+	if (left.some((part) => part === '') || right.some((part) => part === '')) return false;
+	let segments = [...left, ...right];
+	let ipv4TailSegments = 0;
+	const lastSegment = segments.at(-1);
+	if (lastSegment && lastSegment.includes('.')) {
+		if (!isValidIPv4(lastSegment)) return false;
+		segments = segments.slice(0, -1);
+		ipv4TailSegments = 2;
+	}
+	for (const segment of segments) {
+		if (!/^[0-9A-Fa-f]{1,4}$/.test(segment)) return false;
+	}
+	const totalSegments = segments.length + ipv4TailSegments;
+	if (hasCompression) return totalSegments < 8;
+	return totalSegments === 8;
+}
+
+export const optionalIPv4 = (label: string) =>
+	z.string().refine((v) => v.trim() === '' || isValidIPv4(v.trim()), {
+		message: `Введите корректный IPv4 адрес (${label})`
+	});
+
+export const optionalIPv6 = (label: string) =>
+	z.string().refine((v) => v.trim() === '' || isValidIPv6(v.trim()), {
+		message: `Введите корректный IPv6 адрес (${label})`
+	});

web/src/lib/settings/revision-settings.schema.ts

@@ -0,0 +1,19 @@
+import { z } from 'zod';
+
+export const revisionSettingsSchema = z.object({
+	revision_retention_minutes: z.string().refine(
+		(v) => {
+			const s = v.trim();
+			if (s === '') return true;
+			const ttl = Number(s);
+			return /^\d+$/.test(s) && Number.isInteger(ttl) && ttl >= 15 && ttl <= 43200;
+		},
+		{ message: 'TTL ревизий должен быть целым числом от 15 до 43200 минут' }
+	)
+});
+
+export type RevisionSettingsForm = z.infer<typeof revisionSettingsSchema>;
+
+export const emptyRevisionSettingsForm = (): RevisionSettingsForm => ({
+	revision_retention_minutes: ''
+});

web/src/lib/settings/settings-api.ts

@@ -0,0 +1,89 @@
+import { apiJSON, apiMutate } from '$lib/api/client.js';
+import type { AppSettings } from '$lib/api/types.js';
+import { emptyBirdSettingsForm, type BirdSettingsForm } from './bird-settings.schema.js';
+import {
+	emptyRevisionSettingsForm,
+	type RevisionSettingsForm
+} from './revision-settings.schema.js';
+import {
+	BIRD_SETTING_KEYS,
+	KNOWN_SETTING_KEYS,
+	NUMERIC_SETTING_KEYS,
+	type BirdSettingKey,
+	type KnownSettingKey,
+	type RevisionSettingKey
+} from './settings-known-keys.js';
+
+export type AdditionalSettingEntry = { id: number; key: string; value: string };
+
+export type PartitionedSettings = {
+	bird: BirdSettingsForm;
+	revision: RevisionSettingsForm;
+	additional: AdditionalSettingEntry[];
+};
+
+function parseKnownValue(key: KnownSettingKey, value: unknown): string {
+	if (NUMERIC_SETTING_KEYS.has(key)) {
+		if (typeof value === 'number' && Number.isFinite(value)) return String(value);
+		if (typeof value === 'string') return value;
+		return '';
+	}
+	if (typeof value === 'string') return value;
+	return '';
+}
+
+export function partitionSettings(
+	settings: AppSettings,
+	nextId = 1
+): { partitioned: PartitionedSettings; nextId: number } {
+	const bird = emptyBirdSettingsForm();
+	const revision = emptyRevisionSettingsForm();
+	const additional: AdditionalSettingEntry[] = [];
+	let idCounter = nextId;
+
+	for (const [key, value] of Object.entries(settings as Record<string, unknown>)) {
+		if ((BIRD_SETTING_KEYS as readonly string[]).includes(key)) {
+			bird[key as BirdSettingKey] = parseKnownValue(key as KnownSettingKey, value);
+		} else if (key === 'revision_retention_minutes') {
+			revision.revision_retention_minutes = parseKnownValue(key as RevisionSettingKey, value);
+		} else {
+			additional.push({
+				id: idCounter++,
+				key,
+				value: typeof value === 'string' ? value : String(value)
+			});
+		}
+	}
+
+	return {
+		partitioned: { bird, revision, additional },
+		nextId: idCounter
+	};
+}
+
+export async function loadSettings(): Promise<AppSettings> {
+	return apiJSON<AppSettings>('/v1/settings');
+}
+
+export async function patchSettings(payload: Record<string, string | number>): Promise<void> {
+	await apiMutate('/v1/settings', 'PATCH', payload);
+}
+
+export function buildPayloadFromFormFields(
+	keys: readonly KnownSettingKey[],
+	form: Record<string, string>,
+	errors: Partial<Record<string, string[]>>
+): Record<string, string | number> {
+	const payload: Record<string, string | number> = {};
+	for (const key of keys) {
+		const value = String(form[key] ?? '').trim();
+		if (!value || errors[key]?.length) continue;
+		if (NUMERIC_SETTING_KEYS.has(key)) payload[key] = Number(value);
+		else payload[key] = value;
+	}
+	return payload;
+}
+
+export function isKnownSettingKey(key: string): key is KnownSettingKey {
+	return (KNOWN_SETTING_KEYS as readonly string[]).includes(key);
+}

web/src/lib/settings/settings-known-keys.ts

@@ -0,0 +1,21 @@
+export const BIRD_SETTING_KEYS = [
+	'bird_router_id',
+	'bird_local_ipv4',
+	'bird_local_ipv6',
+	'bird_local_asn',
+	'bird_bgp_source_ipv4',
+	'bird_bgp_source_ipv6'
+] as const;
+
+export const REVISION_SETTING_KEYS = ['revision_retention_minutes'] as const;
+
+export const KNOWN_SETTING_KEYS = [...BIRD_SETTING_KEYS, ...REVISION_SETTING_KEYS] as const;
+
+export type BirdSettingKey = (typeof BIRD_SETTING_KEYS)[number];
+export type RevisionSettingKey = (typeof REVISION_SETTING_KEYS)[number];
+export type KnownSettingKey = (typeof KNOWN_SETTING_KEYS)[number];
+
+export const NUMERIC_SETTING_KEYS = new Set<KnownSettingKey>([
+	'bird_local_asn',
+	'revision_retention_minutes'
+]);

web/src/lib/settings/settings-known.schema.ts

@@ -1,79 +1,15 @@
 import { z } from 'zod';
+import { birdSettingsSchema, emptyBirdSettingsForm } from './bird-settings.schema.js';
+import { emptyRevisionSettingsForm, revisionSettingsSchema } from './revision-settings.schema.js';
 
-function isValidIPv4(value: string): boolean {
-	const parts = value.split('.');
-	if (parts.length !== 4) return false;
-	for (const part of parts) {
-		if (!/^\d{1,3}$/.test(part)) return false;
-		if (part.length > 1 && part.startsWith('0')) return false;
-		const n = Number(part);
-		if (!Number.isInteger(n) || n < 0 || n > 255) return false;
-	}
-	return true;
-}
-
-function isValidIPv6(value: string): boolean {
-	if (!/^[0-9A-Fa-f:.]+$/.test(value)) return false;
-	if ((value.match(/::/g) ?? []).length > 1) return false;
-	const hasCompression = value.includes('::');
-	const [leftRaw, rightRaw = ''] = value.split('::');
-	const left = leftRaw === '' ? [] : leftRaw.split(':');
-	const right = rightRaw === '' ? [] : rightRaw.split(':');
-	if (left.some((part) => part === '') || right.some((part) => part === '')) return false;
-	let segments = [...left, ...right];
-	let ipv4TailSegments = 0;
-	const lastSegment = segments.at(-1);
-	if (lastSegment && lastSegment.includes('.')) {
-		if (!isValidIPv4(lastSegment)) return false;
-		segments = segments.slice(0, -1);
-		ipv4TailSegments = 2;
-	}
-	for (const segment of segments) {
-		if (!/^[0-9A-Fa-f]{1,4}$/.test(segment)) return false;
-	}
-	const totalSegments = segments.length + ipv4TailSegments;
-	if (hasCompression) return totalSegments < 8;
-	return totalSegments === 8;
-}
-
-const optionalIPv4 = (label: string) =>
-	z.string().refine((v) => v.trim() === '' || isValidIPv4(v.trim()), {
-		message: `Введите корректный IPv4 адрес (${label})`
-	});
-
-const optionalIPv6 = (label: string) =>
-	z.string().refine((v) => v.trim() === '' || isValidIPv6(v.trim()), {
-		message: `Введите корректный IPv6 адрес (${label})`
-	});
-
-export const settingsKnownSchema = z.object({
-	bird_router_id: optionalIPv4('router id'),
-	bird_local_ipv4: optionalIPv4('local IPv4'),
-	bird_local_ipv6: optionalIPv6('local IPv6'),
-	bird_local_asn: z.string().refine((v) => v.trim() === '' || /^[1-9]\d*$/.test(v.trim()), {
-		message: 'ASN должен быть целым числом больше 0'
-	}),
-	bird_bgp_source_ipv4: optionalIPv4('BGP source IPv4'),
-	bird_bgp_source_ipv6: optionalIPv6('BGP source IPv6'),
-	revision_retention_minutes: z.string().refine(
-		(v) => {
-			const s = v.trim();
-			if (s === '') return true;
-			const ttl = Number(s);
-			return /^\d+$/.test(s) && Number.isInteger(ttl) && ttl >= 15 && ttl <= 43200;
-		},
-		{ message: 'TTL ревизий должен быть целым числом от 15 до 43200 минут' }
-	)
-});
+/** @deprecated Используйте birdSettingsSchema и revisionSettingsSchema отдельно. */
+export const settingsKnownSchema = birdSettingsSchema.merge(revisionSettingsSchema);
 
+/** @deprecated Используйте BirdSettingsForm и RevisionSettingsForm. */
 export type SettingsKnownForm = z.infer<typeof settingsKnownSchema>;
 
+/** @deprecated Используйте emptyBirdSettingsForm и emptyRevisionSettingsForm. */
 export const emptySettingsKnownForm = (): SettingsKnownForm => ({
-	bird_router_id: '',
-	bird_local_ipv4: '',
-	bird_local_ipv6: '',
-	bird_local_asn: '',
-	bird_bgp_source_ipv4: '',
-	bird_bgp_source_ipv6: '',
-	revision_retention_minutes: ''
+	...emptyBirdSettingsForm(),
+	...emptyRevisionSettingsForm()
 });

web/src/lib/theme-preferences.svelte.ts

@@ -0,0 +1,28 @@
+import { browser } from '$app/environment';
+import { applyTheme, readTheme, THEME_STORAGE_KEY, type ThemePreference } from './theme.js';
+
+class ThemePreferencesState {
+	pref = $state<ThemePreference>('system');
+
+	init(): void {
+		if (!browser) return;
+		this.pref = readTheme();
+		applyTheme(this.pref);
+	}
+
+	set(next: ThemePreference): void {
+		this.pref = next;
+	}
+
+	persist(): void {
+		if (!browser) return;
+		applyTheme(this.pref);
+		try {
+			localStorage.setItem(THEME_STORAGE_KEY, this.pref);
+		} catch {
+			/* ignore */
+		}
+	}
+}
+
+export const themeState = new ThemePreferencesState();

web/src/lib/ui/patterns/virtual-list/virtual-prefix-list.svelte

@@ -0,0 +1,38 @@
+<script lang="ts">
+	type Props = {
+		items: readonly string[];
+		rowHeight?: number;
+		viewportHeight?: number;
+		class?: string;
+	};
+
+	let { items, rowHeight = 20, viewportHeight = 320, class: className = '' }: Props = $props();
+
+	let scrollTop = $state(0);
+	const totalHeight = $derived(items.length * rowHeight);
+	const startIndex = $derived(Math.max(0, Math.floor(scrollTop / rowHeight) - 2));
+	const visibleCount = $derived(Math.ceil(viewportHeight / rowHeight) + 4);
+	const visibleItems = $derived(items.slice(startIndex, startIndex + visibleCount));
+</script>
+
+<div
+	class="overflow-auto rounded-md border {className}"
+	style="height: {viewportHeight}px"
+	onscroll={(e) => {
+		scrollTop = e.currentTarget.scrollTop;
+	}}
+>
+	<div style="height: {totalHeight}px; position: relative">
+		{#each visibleItems as pfx, i (`${startIndex + i}-${pfx}`)}
+			<p
+				class="truncate px-2 font-mono text-xs leading-5"
+				style="position: absolute; top: {(startIndex + i) *
+					rowHeight}px; left: 0; right: 0; height: {rowHeight}px"
+			>
+				{pfx}
+			</p>
+		{:else}
+			<p class="text-muted-foreground p-2 text-sm">Нет префиксов</p>
+		{/each}
+	</div>
+</div>

web/src/routes/+layout.svelte

@@ -5,19 +5,17 @@
 	import favicon from '$lib/assets/favicon.svg';
 	import AppLayout from '$lib/ui/app/layout/app-layout.svelte';
 	import ConfirmDialog from '$lib/ui/patterns/confirm/confirm-dialog.svelte';
-	import { applyTheme, readTheme, THEME_STORAGE_KEY, type ThemePreference } from '$lib/theme.js';
+	import { applyTheme } from '$lib/theme.js';
+	import { themeState } from '$lib/theme-preferences.svelte.js';
 	import { Toaster } from 'svelte-sonner';
 
 	let { children } = $props();
 
-	let themePref = $state<ThemePreference>('system');
-
 	onMount(() => {
-		themePref = readTheme();
-		applyTheme(themePref);
+		themeState.init();
 		const mq = window.matchMedia('(prefers-color-scheme: dark)');
 		const onOs = () => {
-			if (themePref === 'system') applyTheme('system');
+			if (themeState.pref === 'system') applyTheme('system');
 		};
 		mq.addEventListener('change', onOs);
 		return () => mq.removeEventListener('change', onOs);
@@ -25,16 +23,11 @@
 
 	$effect(() => {
 		if (!browser) return;
-		applyTheme(themePref);
-		try {
-			localStorage.setItem(THEME_STORAGE_KEY, themePref);
-		} catch {
-			/* ignore */
-		}
+		themeState.persist();
 	});
 
 	const sonnerTheme = $derived(
-		themePref === 'system' ? 'system' : themePref === 'dark' ? 'dark' : 'light'
+		themeState.pref === 'system' ? 'system' : themeState.pref === 'dark' ? 'dark' : 'light'
 	);
 </script>
 
@@ -44,4 +37,4 @@
 </svelte:head>
 <Toaster richColors theme={sonnerTheme} position="top-right" />
 <ConfirmDialog />
-<AppLayout bind:theme={themePref}>{@render children()}</AppLayout>
+<AppLayout bind:theme={themeState.pref}>{@render children()}</AppLayout>

web/src/routes/+page.svelte

@@ -159,37 +159,68 @@
 		}
 	]);
 
+	function toErrorMessage(e: unknown): string {
+		return e instanceof Error ? e.message : String(e);
+	}
+
 	async function load() {
 		if (!initialLoading) refreshing = true;
 		loadError = null;
 		try {
-			const [h, m, p, s, r, j] = await Promise.all([
-				apiFetch('/v1/health'),
+			try {
+				const h = await apiFetch('/v1/health');
+				healthy = h.ok;
+				if (!h.ok) {
+					loadError = `GET /v1/health: HTTP ${h.status}`;
+					return;
+				}
+			} catch (e) {
+				healthy = false;
+				loadError = toErrorMessage(e);
+				notifyApiError(e);
+				return;
+			}
+
+			const [m, p, s, r, j] = await Promise.allSettled([
 				apiJSON<ModulesResponse>('/v1/modules?limit=200'),
 				apiJSON<PeersResponse>('/v1/peers?limit=200'),
 				apiJSON<SpeakersResponse>('/v1/speakers?limit=200'),
-				apiJSON<RevisionsResponse>('/v1/revisions?limit=200'),
-				apiJSON<JobsResponse>('/v1/jobs?limit=20')
+				apiJSON<RevisionsResponse>('/v1/revisions?limit=10'),
+				apiJSON<JobsResponse>('/v1/jobs?limit=10')
 			]);
 
-			healthy = h.ok;
-			moduleItems = m.items ?? [];
-			modulesHasMore = m.has_more;
-			peerItems = p.items ?? [];
-			peersHasMore = p.has_more;
-			speakerItems = s.items ?? [];
-			speakersHasMore = s.has_more;
-			revisionItems = r.items ?? [];
-			revisionsHasMore = r.has_more;
-			jobItems = j.items ?? [];
-			recentJobs = jobItems.slice(0, 10);
-			recentRevisions = revisionItems.slice(0, 10);
-			runningJobs = jobItems.filter((i) => i.status === 'running' || i.status === 'queued').length;
-			lastUpdated = new Date();
-		} catch (e) {
-			healthy = false;
-			loadError = e instanceof Error ? e.message : String(e);
-			notifyApiError(e);
+			const firstReject = [m, p, s, r, j].find((x) => x.status === 'rejected');
+			if (firstReject?.status === 'rejected') {
+				loadError = toErrorMessage(firstReject.reason);
+				notifyApiError(firstReject.reason);
+			}
+
+			if (m.status === 'fulfilled') {
+				moduleItems = m.value.items ?? [];
+				modulesHasMore = m.value.has_more;
+			}
+			if (p.status === 'fulfilled') {
+				peerItems = p.value.items ?? [];
+				peersHasMore = p.value.has_more;
+			}
+			if (s.status === 'fulfilled') {
+				speakerItems = s.value.items ?? [];
+				speakersHasMore = s.value.has_more;
+			}
+			if (r.status === 'fulfilled') {
+				revisionItems = r.value.items ?? [];
+				revisionsHasMore = r.value.has_more;
+			}
+			if (j.status === 'fulfilled') {
+				jobItems = j.value.items ?? [];
+				recentJobs = jobItems.slice(0, 10);
+				recentRevisions = revisionItems.slice(0, 10);
+				runningJobs = jobItems.filter(
+					(i) => i.status === 'running' || i.status === 'queued'
+				).length;
+			}
+
+			if (!loadError) lastUpdated = new Date();
 		} finally {
 			initialLoading = false;
 			refreshing = false;
@@ -235,18 +266,30 @@
 			<AlertTitle>Проверка API…</AlertTitle>
 			<AlertDescription>Запрос к <code class="text-xs">/v1/health</code></AlertDescription>
 		</Alert>
-	{:else if healthy}
+	{:else if healthy && !loadError}
 		<Alert class="border-success/30 bg-success/5">
 			<CheckCircle class="text-success" />
 			<AlertTitle>API работает</AlertTitle>
 			<AlertDescription>Сервер отвечает на запросы health-check.</AlertDescription>
 		</Alert>
+	{:else if healthy && loadError}
+		<Alert class="border-warning/30 bg-warning/5">
+			<Info class="text-warning" />
+			<AlertTitle>API доступен, данные не загружены</AlertTitle>
+			<AlertDescription>
+				{loadError}. Для локального демо укажите Bearer-токен
+				<code class="text-xs">dev</code> в
+				<Button variant="link" class="h-auto p-0" href={resolve('/settings')}>Настройках</Button>
+				(нужен <code class="text-xs">EVOBGP_DEV_INSECURE=1</code> на API).
+			</AlertDescription>
+		</Alert>
 	{:else}
 		<Alert variant="destructive" class="border-destructive/30 bg-destructive/5">
 			<XCircle class="text-destructive" />
 			<AlertTitle>API недоступен</AlertTitle>
 			<AlertDescription>
-				Не удалось получить ответ от сервера. Проверьте подключение и статус API.
+				{loadError ??
+					'Не удалось получить ответ от сервера. Проверьте, что API запущен (порт 8080), в dev — `npm run dev` с прокси Vite, в Docker — контейнер evobgp-api / evobgp-all и nginx в evobgp-web.'}
 			</AlertDescription>
 		</Alert>
 	{/if}

web/src/routes/network/+page.svelte

@@ -1,32 +1,33 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
+	import { goto } from '$app/navigation';
+	import { page } from '$app/state';
 	import { resolve } from '$app/paths';
 	import { apiJSON } from '$lib/api/client.js';
 	import type { PeerRow, PeersResponse, SpeakerRow, SpeakersResponse } from '$lib/api/types.js';
-	import { Badge } from '$lib/ui/core/badge/index.js';
 	import { Button } from '$lib/ui/core/button/index.js';
-	import {
-		Card,
-		CardContent,
-		CardHeader,
-		CardTitle,
-		CardDescription
-	} from '$lib/ui/core/card/index.js';
 	import { Alert, AlertDescription, AlertTitle } from '$lib/ui/core/alert/index.js';
 	import { Tabs, TabsContent, TabsList, TabsTrigger } from '$lib/ui/core/tabs/index.js';
-	import CardSkeleton from '$lib/ui/patterns/feedback/card-skeleton.svelte';
 	import KpiMetricsGrid from '$lib/ui/patterns/kpi/kpi-metrics-grid.svelte';
 	import PageHeader from '$lib/ui/app/page-header/page-header.svelte';
 	import { notifyApiError } from '$lib/ui/app/toast.js';
 	import NetworkPeersCard from '$lib/components/network/NetworkPeersCard.svelte';
 	import NetworkSpeakersCard from '$lib/components/network/NetworkSpeakersCard.svelte';
-	import { cn } from '$lib/utils.js';
+	import BirdSettingsForm from '$lib/components/network/BirdSettingsForm.svelte';
 	import RefreshCw from '@lucide/svelte/icons/refresh-cw';
 	import NetworkIcon from '@lucide/svelte/icons/network';
 	import Info from '@lucide/svelte/icons/info';
 	import Share2 from '@lucide/svelte/icons/share-2';
 	import CheckCircle2 from '@lucide/svelte/icons/check-circle-2';
 	import Server from '@lucide/svelte/icons/server';
+
+	type NetworkTab = 'peers' | 'speakers' | 'control-plane';
+
+	function parseNetworkTab(value: string | null): NetworkTab {
+		if (value === 'speakers' || value === 'control-plane') return value;
+		return 'peers';
+	}
+
 	let peers = $state<PeerRow[]>([]);
 	let speakers = $state<SpeakerRow[]>([]);
 	let peersLoading = $state(false);
@@ -34,6 +35,8 @@
 	let initialLoading = $state(true);
 	let loadError = $state<string | null>(null);
 	let lastUpdated = $state<Date | null>(null);
+	let activeTab = $state<NetworkTab>('peers');
+	let tabSyncReady = $state(false);
 
 	const establishedCount = $derived(peers.filter((p) => p.session_state === 'Established').length);
 
@@ -150,7 +153,27 @@
 		}
 	}
 
-	onMount(load);
+	onMount(() => {
+		activeTab = parseNetworkTab(page.url.searchParams.get('tab'));
+		tabSyncReady = true;
+		void load();
+	});
+
+	function syncTabToUrl(tab: NetworkTab) {
+		if (!tabSyncReady) return;
+		const url = new URL(page.url);
+		if (tab === 'peers') url.searchParams.delete('tab');
+		else url.searchParams.set('tab', tab);
+		const next = `${url.pathname}${url.search}${url.hash}`;
+		if (next !== `${page.url.pathname}${page.url.search}${page.url.hash}`) {
+			void goto(next, { replaceState: true, keepFocus: true, noScroll: true });
+		}
+	}
+
+	$effect(() => {
+		if (!tabSyncReady) return;
+		syncTabToUrl(activeTab);
+	});
 </script>
 
 <div class="flex flex-col gap-6">
@@ -187,10 +210,11 @@
 		class="sm:grid-cols-3"
 	/>
 
-	<Tabs value="peers">
+	<Tabs bind:value={activeTab}>
 		<TabsList>
 			<TabsTrigger value="peers">Пиры</TabsTrigger>
 			<TabsTrigger value="speakers">Спикеры</TabsTrigger>
+			<TabsTrigger value="control-plane">Control plane</TabsTrigger>
 		</TabsList>
 
 		<TabsContent value="peers" class="mt-4">
@@ -213,5 +237,9 @@
 				onRefresh={refreshSpeakers}
 			/>
 		</TabsContent>
+
+		<TabsContent value="control-plane" class="mt-4">
+			<BirdSettingsForm />
+		</TabsContent>
 	</Tabs>
 </div>

web/src/routes/operations/+page.svelte

@@ -53,12 +53,14 @@
 	import OperationsDiffTab from '$lib/components/operations/OperationsDiffTab.svelte';
 	import OperationsJobsTab from '$lib/components/operations/OperationsJobsTab.svelte';
 	import OperationsJobsFilters from '$lib/components/operations/OperationsJobsFilters.svelte';
+	import OperationsSystemSettingsTab from '$lib/components/operations/OperationsSystemSettingsTab.svelte';
 	import type {
 		JobDetailedReport,
 		JobLogEntry,
 		ReportRow
 	} from '$lib/components/operations/types.js';
 	import ScrollPreBlock from '$lib/components/app/scroll-pre-block.svelte';
+	import VirtualPrefixList from '$lib/ui/patterns/virtual-list/virtual-prefix-list.svelte';
 	import CardSkeleton from '$lib/ui/patterns/feedback/card-skeleton.svelte';
 	import KpiMetricsGrid from '$lib/ui/patterns/kpi/kpi-metrics-grid.svelte';
 	import { confirm } from '$lib/ui/patterns/confirm/confirm-state.svelte.js';
@@ -80,10 +82,10 @@
 	import Info from '@lucide/svelte/icons/info';
 	import ArrowRight from '@lucide/svelte/icons/arrow-right';
 
-	type OpsTab = 'revisions' | 'diff' | 'jobs';
+	type OpsTab = 'revisions' | 'diff' | 'jobs' | 'system';
 
 	function parseOpsTab(value: string | null): OpsTab {
-		if (value === 'diff' || value === 'jobs') return value;
+		if (value === 'diff' || value === 'jobs' || value === 'system') return value;
 		return 'revisions';
 	}
 
@@ -127,6 +129,7 @@
 	let jobs = $state<JobRow[]>([]);
 	let jobsLoading = $state(false);
 	let jobSearchQ = $state('');
+	let jobSearchDebounced = $state('');
 	let jobFilterStatus = $state('');
 	let jobFilterKind = $state('');
 	let jobFilterModule = $state('');
@@ -301,13 +304,23 @@
 				return j.kind === 'module_refresh' && mid === jobFilterModule;
 			});
 		}
-		const q = jobSearchQ.trim();
+		const q = jobSearchDebounced.trim();
 		if (q) {
 			list = list.filter((j) => jobMatchesSearch(j, q));
 		}
 		return list;
 	});
 
+	let jobSearchTimer: ReturnType<typeof setTimeout> | undefined;
+	$effect(() => {
+		const q = jobSearchQ;
+		clearTimeout(jobSearchTimer);
+		jobSearchTimer = setTimeout(() => {
+			jobSearchDebounced = q;
+		}, 250);
+		return () => clearTimeout(jobSearchTimer);
+	});
+
 	const jobModuleOptions = $derived(
 		[...moduleNameById.entries()]
 			.map(([id, name]) => ({ id, name }))
@@ -339,8 +352,18 @@
 
 	onMount(() => {
 		activeTab = parseOpsTab(page.url.searchParams.get('tab'));
+		lastLoadedTab = activeTab;
 		tabSyncReady = true;
-		void refreshAll(true);
+		void refreshActiveTab(true);
+	});
+
+	let lastLoadedTab = $state('');
+	$effect(() => {
+		if (!tabSyncReady) return;
+		const tab = activeTab;
+		if (tab === lastLoadedTab) return;
+		lastLoadedTab = tab;
+		void refreshActiveTab();
 	});
 
 	const statAccents = [
@@ -424,6 +447,29 @@
 		syncTabToUrl(activeTab);
 	});
 
+	async function refreshActiveTab(isInitial = false) {
+		if (isInitial) initialLoading = true;
+		else refreshing = true;
+		switch (activeTab) {
+			case 'revisions':
+				await loadRevisions();
+				break;
+			case 'jobs':
+				await Promise.all([loadJobs(), loadModules()]);
+				break;
+			case 'diff':
+				break;
+			case 'system':
+				await loadBirdStatus();
+				break;
+			default:
+				await loadRevisions();
+		}
+		lastUpdated = new Date();
+		initialLoading = false;
+		refreshing = false;
+	}
+
 	async function refreshAll(isInitial = false) {
 		if (isInitial) initialLoading = true;
 		else refreshing = true;
@@ -882,12 +928,12 @@
 
 	<Alert class="border-info/30 bg-info/5">
 		<Info class="text-info" />
-		<AlertTitle>Три раздела на одной странице</AlertTitle>
+		<AlertTitle>Четыре раздела на одной странице</AlertTitle>
 		<AlertDescription>
 			<strong>Ревизии</strong> — история конфигов и откат; <strong>Сравнение</strong> — diff
 			префиксов;
-			<strong>Задачи</strong> — ingest, apply, rollback. Apply и Reload требуют operator. Сводный
-			мониторинг BGP — на
+			<strong>Задачи</strong> — ingest, apply, rollback; <strong>Система</strong> — TTL ревизий и
+			дополнительные KV. Apply и Reload требуют operator. Сводный мониторинг BGP — на
 			<Button variant="link" class="h-auto p-0" href={resolve('/monitoring')}>Мониторинг</Button>.
 		</AlertDescription>
 	</Alert>
@@ -918,6 +964,7 @@
 				<TabsTrigger value="revisions">Ревизии ({revisions.length})</TabsTrigger>
 				<TabsTrigger value="diff">Сравнение</TabsTrigger>
 				<TabsTrigger value="jobs">Задачи ({jobs.length})</TabsTrigger>
+				<TabsTrigger value="system">Система</TabsTrigger>
 			</TabsList>
 		</div>
 
@@ -982,6 +1029,10 @@
 				jobStatusVariant={jobStatusBadgeVariant}
 			/>
 		</TabsContent>
+
+		<TabsContent value="system" class="mt-4">
+			<OperationsSystemSettingsTab />
+		</TabsContent>
 	</Tabs>
 </div>
 
@@ -1055,15 +1106,7 @@
 							<span class="font-medium">Префиксов:</span>
 							{prefixesData.length}
 						</p>
-						<div
-							class="flex min-h-[10rem] min-w-0 flex-1 flex-col overflow-auto overscroll-contain rounded-lg border border-border bg-muted/40 p-3 [scrollbar-gutter:stable]"
-						>
-							{#each prefixesData as pfx, idx (`${idx}-${pfx}`)}
-								<p class="font-mono text-xs">{pfx}</p>
-							{:else}
-								<p class="text-muted-foreground text-xs">Нет префиксов</p>
-							{/each}
-						</div>
+						<VirtualPrefixList items={prefixesData} viewportHeight={360} />
 					</TabsContent>
 				</Tabs>
 			</div>

web/src/routes/settings/+page.svelte

@@ -1,110 +1,33 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
 	import { onMount } from 'svelte';
-	import { defaults, superForm } from 'sveltekit-superforms';
-	import { zod4 } from 'sveltekit-superforms/adapters';
 	import { TOKEN_STORAGE_KEY } from '$lib/api/client.js';
-	import { apiJSON, apiMutate } from '$lib/api/client.js';
-	import type { AppSettings } from '$lib/api/types.js';
-	import {
-		emptySettingsKnownForm,
-		settingsKnownSchema,
-		type SettingsKnownForm
-	} from '$lib/settings/settings-known.schema.js';
+	import { themeState } from '$lib/theme-preferences.svelte.js';
+	import type { ThemePreference } from '$lib/theme.js';
 	import { Button } from '$lib/ui/core/button/index.js';
-	import { Card, CardContent, CardHeader, CardDescription } from '$lib/ui/core/card/index.js';
+	import {
+		Card,
+		CardContent,
+		CardDescription,
+		CardHeader,
+		CardTitle
+	} from '$lib/ui/core/card/index.js';
 	import { Input } from '$lib/ui/core/input/index.js';
 	import { Label } from '$lib/ui/core/label/index.js';
-	import FormField from '$lib/ui/patterns/form/form-field.svelte';
-	import { notify, notifyApiError } from '$lib/ui/app/toast.js';
+	import { Select, SelectContent, SelectItem, SelectTrigger } from '$lib/ui/core/select/index.js';
+	import { notify } from '$lib/ui/app/toast.js';
 	import Save from '@lucide/svelte/icons/save';
-	import Plus from '@lucide/svelte/icons/plus';
 	import SettingsIcon from '@lucide/svelte/icons/settings';
 	import PageHeader from '$lib/ui/app/page-header/page-header.svelte';
-	import Trash2 from '@lucide/svelte/icons/trash-2';
 
 	let token = $state('');
-	let apiSettings = $state<AppSettings | null>(null);
-	let loadingSettings = $state(false);
-	let savingSettings = $state(false);
-	let additionalSettings = $state<Array<{ id: number; key: string; value: string }>>([]);
-	let additionalIdCounter = $state(1);
 
-	type KnownFieldKey = keyof SettingsKnownForm;
-
-	type SettingsSection = 'token' | 'bird' | 'revisions' | 'additional';
-
-	const knownFieldKeys: KnownFieldKey[] = [
-		'bird_router_id',
-		'bird_local_ipv4',
-		'bird_local_ipv6',
-		'bird_local_asn',
-		'bird_bgp_source_ipv4',
-		'bird_bgp_source_ipv6',
-		'revision_retention_minutes'
+	const themeOptions: Array<{ value: ThemePreference; label: string }> = [
+		{ value: 'light', label: 'Светлая' },
+		{ value: 'dark', label: 'Тёмная' },
+		{ value: 'system', label: 'Как в системе' }
 	];
 
-	const { form, errors, reset, validateForm } = superForm(
-		defaults(emptySettingsKnownForm(), zod4(settingsKnownSchema)),
-		{
-			validators: zod4(settingsKnownSchema),
-			SPA: true,
-			dataType: 'json'
-		}
-	);
-
-	let activeSection = $state<SettingsSection>('token');
-
-	const sectionItems: Array<{ id: SettingsSection; label: string; description: string }> = [
-		{ id: 'token', label: 'API-ключ', description: 'Авторизация в UI' },
-		{ id: 'bird', label: 'BIRD', description: 'Сетевые параметры' },
-		{ id: 'revisions', label: 'Ревизии', description: 'Хранение истории' },
-		{ id: 'additional', label: 'Дополнительно', description: 'Ключ-значение' }
-	];
-
-	let hasValidationErrors = $derived(knownFieldKeys.some((key) => Boolean($errors[key]?.length)));
-
-	function addAdditionalSetting() {
-		additionalSettings.push({ id: additionalIdCounter++, key: '', value: '' });
-	}
-
-	function removeAdditionalSetting(id: number) {
-		additionalSettings = additionalSettings.filter((entry) => entry.id !== id);
-	}
-
-	function resetFormFromApi(settings: AppSettings) {
-		const parsedKnown: Record<KnownFieldKey, string> = {
-			bird_router_id: '',
-			bird_local_ipv4: '',
-			bird_local_ipv6: '',
-			bird_local_asn: '',
-			bird_bgp_source_ipv4: '',
-			bird_bgp_source_ipv6: '',
-			revision_retention_minutes: ''
-		};
-		const parsedAdditional: Array<{ id: number; key: string; value: string }> = [];
-
-		for (const [key, value] of Object.entries(settings as Record<string, unknown>)) {
-			if (knownFieldKeys.includes(key as KnownFieldKey)) {
-				if (key === 'bird_local_asn' || key === 'revision_retention_minutes') {
-					if (typeof value === 'number' && Number.isFinite(value)) parsedKnown[key] = String(value);
-					else if (typeof value === 'string') parsedKnown[key] = value;
-				} else if (typeof value === 'string') {
-					parsedKnown[key as KnownFieldKey] = value;
-				}
-			} else {
-				parsedAdditional.push({
-					id: additionalIdCounter++,
-					key,
-					value: typeof value === 'string' ? value : String(value)
-				});
-			}
-		}
-
-		reset({ data: parsedKnown });
-		additionalSettings = parsedAdditional;
-	}
-
 	function saveToken() {
 		if (!browser) return;
 		const t = token.trim();
@@ -113,295 +36,75 @@
 		notify.success('Токен сохранён');
 	}
 
-	async function loadApiSettings() {
-		loadingSettings = true;
-		try {
-			const s = await apiJSON<AppSettings>('/v1/settings');
-			apiSettings = s;
-			resetFormFromApi(s);
-		} catch (e) {
-			notifyApiError(e);
-		} finally {
-			loadingSettings = false;
-		}
-	}
-
-	let canSaveSettings = $derived.by(() => {
-		if (loadingSettings || savingSettings || hasValidationErrors) return false;
-
-		const hasKnownValues = knownFieldKeys.some((key) => {
-			const value = String($form[key] ?? '').trim();
-			return value !== '' && !$errors[key]?.length;
-		});
-		const hasAdditionalValues = additionalSettings.some((entry) => entry.key.trim() !== '');
-
-		return hasKnownValues || hasAdditionalValues;
-	});
-
-	async function saveApiSettings() {
-		const validation = await validateForm({ update: true });
-		if (!validation.valid) {
-			notify.error('Исправьте ошибки в полях настроек');
-			return;
-		}
-		if (!canSaveSettings) {
-			notify.error('Нечего сохранять или есть ошибки в полях');
-			return;
-		}
-
-		const payload: Record<string, string | number> = {};
-		for (const key of knownFieldKeys) {
-			const value = String($form[key] ?? '').trim();
-			if (!value || $errors[key]?.length) continue;
-			if (key === 'bird_local_asn' || key === 'revision_retention_minutes')
-				payload[key] = Number(value);
-			else payload[key] = value;
-		}
-		for (const entry of additionalSettings) {
-			const key = entry.key.trim();
-			if (!key) continue;
-			payload[key] = entry.value;
-		}
-
-		savingSettings = true;
-		try {
-			await apiMutate('/v1/settings', 'PATCH', payload);
-			notify.success('Настройки сохранены');
-			await loadApiSettings();
-		} catch (e) {
-			notifyApiError(e);
-		} finally {
-			savingSettings = false;
-		}
-	}
-
 	onMount(() => {
+		themeState.init();
 		if (browser) {
 			token = localStorage.getItem(TOKEN_STORAGE_KEY) ?? '';
 		}
-		void loadApiSettings();
 	});
+
+	function onThemeChange(value: string) {
+		if (value === 'light' || value === 'dark' || value === 'system') {
+			themeState.set(value);
+		}
+	}
 </script>
 
-<div class="mx-auto flex max-w-5xl flex-col gap-6">
+<div class="mx-auto flex max-w-3xl flex-col gap-6">
 	<PageHeader
 		title="Настройки"
-		description="Управление токеном доступа и глобальными параметрами control plane."
+		description="Параметры браузера и подключения к API."
 		icon={SettingsIcon}
 		iconClass="bg-muted text-muted-foreground"
 	/>
 
 	<Card>
-		<CardContent class="p-4 md:p-6">
-			<div class="grid gap-6 md:grid-cols-[220px_1fr]">
-				<div class="space-y-1">
-					{#each sectionItems as section (section.id)}
-						<button
-							type="button"
-							class={[
-								'w-full rounded-lg border px-3 py-2 text-left transition-colors',
-								activeSection === section.id
-									? 'border-primary bg-muted text-foreground'
-									: 'border-transparent text-muted-foreground hover:border-border hover:bg-muted/70 hover:text-foreground'
-							]}
-							onclick={() => (activeSection = section.id)}
-						>
-							<div class="text-sm font-medium">{section.label}</div>
-							<div class="text-xs opacity-80">{section.description}</div>
-						</button>
-					{/each}
-				</div>
-
-				<div class="rounded-xl border border-border p-4 md:p-5">
-					{#if activeSection === 'token'}
-						<div class="space-y-4">
-							<div class="space-y-1">
-								<h2 class="text-base font-semibold">API-ключ</h2>
-								<p class="text-sm text-muted-foreground">
-									Bearer-токен хранится только в localStorage браузера. Для локального демо с
-									<code class="rounded bg-muted px-1 py-0.5 text-xs">EVOBGP_DEV_INSECURE=1</code>
-									используйте токен <code class="rounded bg-muted px-1 py-0.5 text-xs">dev</code>.
-								</p>
-							</div>
-
-							<div class="space-y-2">
-								<Label for="token">Токен</Label>
-								<Input
-									id="token"
-									type="password"
-									autocomplete="off"
-									bind:value={token}
-									placeholder="Bearer …"
-								/>
-							</div>
-
-							<Button onclick={saveToken}>
-								<Save />
-								Сохранить токен
-							</Button>
-						</div>
-					{:else if loadingSettings}
-						<p class="text-sm text-muted-foreground">Загрузка…</p>
-					{:else if apiSettings === null}
-						<Button variant="outline" onclick={loadApiSettings}>Загрузить настройки</Button>
-					{:else}
-						<div class="space-y-5">
-							{#if activeSection === 'bird'}
-								<div class="space-y-3">
-									<h2 class="text-base font-semibold">Параметры BIRD</h2>
-
-									<FormField
-										id="bird-router-id"
-										label="Router ID (bird_router_id)"
-										error={$errors.bird_router_id?.[0]}
-									>
-										<Input
-											id="bird-router-id"
-											bind:value={$form.bird_router_id}
-											placeholder="203.0.113.1"
-										/>
-									</FormField>
-
-									<FormField
-										id="bird-local-ipv4"
-										label="Локальный IPv4 (bird_local_ipv4)"
-										error={$errors.bird_local_ipv4?.[0]}
-									>
-										<Input
-											id="bird-local-ipv4"
-											bind:value={$form.bird_local_ipv4}
-											placeholder="198.51.100.10"
-										/>
-									</FormField>
-
-									<FormField
-										id="bird-local-ipv6"
-										label="Локальный IPv6 (bird_local_ipv6)"
-										error={$errors.bird_local_ipv6?.[0]}
-									>
-										<Input
-											id="bird-local-ipv6"
-											bind:value={$form.bird_local_ipv6}
-											placeholder="2001:db8::10"
-										/>
-									</FormField>
-
-									<FormField
-										id="bird-local-asn"
-										label="Локальный ASN (bird_local_asn)"
-										error={$errors.bird_local_asn?.[0]}
-									>
-										<Input
-											id="bird-local-asn"
-											type="number"
-											min="1"
-											bind:value={$form.bird_local_asn}
-											placeholder="65001"
-										/>
-									</FormField>
-
-									<FormField
-										id="bird-bgp-source-ipv4"
-										label="BGP source IPv4 (bird_bgp_source_ipv4)"
-										error={$errors.bird_bgp_source_ipv4?.[0]}
-									>
-										<Input
-											id="bird-bgp-source-ipv4"
-											bind:value={$form.bird_bgp_source_ipv4}
-											placeholder="198.51.100.11"
-										/>
-									</FormField>
-
-									<FormField
-										id="bird-bgp-source-ipv6"
-										label="BGP source IPv6 (bird_bgp_source_ipv6)"
-										error={$errors.bird_bgp_source_ipv6?.[0]}
-									>
-										<Input
-											id="bird-bgp-source-ipv6"
-											bind:value={$form.bird_bgp_source_ipv6}
-											placeholder="2001:db8::11"
-										/>
-									</FormField>
-								</div>
-							{:else if activeSection === 'revisions'}
-								<div class="space-y-3">
-									<h2 class="text-base font-semibold">Управление ревизиями</h2>
-
-									<FormField
-										id="revision-retention-minutes"
-										label="Время жизни ревизий, мин (revision_retention_minutes)"
-										error={$errors.revision_retention_minutes?.[0]}
-										description="Старые ревизии удаляются автоматически. Последняя раскатанная ревизия не удаляется."
-									>
-										<Input
-											id="revision-retention-minutes"
-											type="number"
-											min="15"
-											max="43200"
-											bind:value={$form.revision_retention_minutes}
-											placeholder="43200"
-										/>
-									</FormField>
-								</div>
-							{:else if activeSection === 'additional'}
-								<div class="space-y-3">
-									<div class="flex items-center justify-between">
-										<h2 class="text-base font-semibold">Дополнительные настройки (KV)</h2>
-										<Button variant="outline" size="sm" onclick={addAdditionalSetting}>
-											<Plus class="size-4" />
-											Добавить строку
-										</Button>
-									</div>
-
-									{#if additionalSettings.length === 0}
-										<p class="text-sm text-muted-foreground">Нет дополнительных параметров.</p>
-									{/if}
-
-									<div class="space-y-2">
-										{#each additionalSettings as entry (entry.id)}
-											<div class="grid grid-cols-1 gap-2 md:grid-cols-[1fr_1fr_auto]">
-												<Input
-													bind:value={entry.key}
-													placeholder="Ключ (например, bird_log_level)"
-												/>
-												<Input bind:value={entry.value} placeholder="Значение (строка)" />
-												<Button
-													variant="ghost"
-													size="icon"
-													aria-label="Удалить строку"
-													onclick={() => removeAdditionalSetting(entry.id)}
-												>
-													<Trash2 class="size-4" />
-												</Button>
-											</div>
-										{/each}
-									</div>
-								</div>
-							{/if}
-
-							{#if hasValidationErrors}
-								<p class="text-sm text-red-600">
-									Есть ошибки в полях. Исправьте их, чтобы сохранить изменения.
-								</p>
-							{/if}
-
-							<div class="pt-2">
-								<Button onclick={saveApiSettings} disabled={!canSaveSettings}>
-									<Save />
-									{savingSettings ? 'Сохранение…' : 'Применить настройки'}
-								</Button>
-							</div>
-						</div>
-					{/if}
-				</div>
-			</div>
-		</CardContent>
-		<CardHeader class="pt-0">
+		<CardHeader>
+			<CardTitle>API-ключ</CardTitle>
 			<CardDescription>
-				<code class="text-xs">GET/PATCH /v1/settings</code> — глобальные параметры control plane (хранятся
-				в БД). Требуется роль operator.
+				Bearer-токен хранится только в localStorage браузера. Для локального демо с
+				<code class="text-xs">EVOBGP_DEV_INSECURE=1</code> используйте токен
+				<code class="text-xs">dev</code>.
 			</CardDescription>
 		</CardHeader>
+		<CardContent class="space-y-4">
+			<div class="space-y-2">
+				<Label for="token">Токен</Label>
+				<Input
+					id="token"
+					type="password"
+					autocomplete="off"
+					bind:value={token}
+					placeholder="Bearer …"
+				/>
+			</div>
+
+			<Button onclick={saveToken}>
+				<Save />
+				Сохранить токен
+			</Button>
+		</CardContent>
+	</Card>
+
+	<Card>
+		<CardHeader>
+			<CardTitle>Оформление</CardTitle>
+			<CardDescription>
+				Тема интерфейса. Быстрый переключатель также доступен в боковой панели.
+			</CardDescription>
+		</CardHeader>
+		<CardContent class="space-y-2">
+			<Label for="theme-select">Тема</Label>
+			<Select type="single" value={themeState.pref} onValueChange={onThemeChange}>
+				<SelectTrigger id="theme-select" class="w-full max-w-xs">
+					{themeOptions.find((o) => o.value === themeState.pref)?.label ?? 'Как в системе'}
+				</SelectTrigger>
+				<SelectContent>
+					{#each themeOptions as option (option.value)}
+						<SelectItem value={option.value} label={option.label}>{option.label}</SelectItem>
+					{/each}
+				</SelectContent>
+			</Select>
+		</CardContent>
 	</Card>
 </div>