diff --git a/.claude/rules/design.md b/.claude/rules/design.md
index 56de8394..0b8aaa4a 100644
--- a/.claude/rules/design.md
+++ b/.claude/rules/design.md
@@ -100,7 +100,7 @@ Compact metric cards (e.g. dashboard tiles, salary KPI row) use `p-4`. Detail ca
 | Data table, **page-level list** | `components/ui/dry-table.tsx` `TH_CLASS` / `TD_CLASS` on a plain `<table className="w-full border-collapse text-[13px]">`, rows `hover:bg-secondary/35` | The concept list table: borderless, straight on the panel, 13px rows, hairline heads. This is what every migrated list page uses. Add `tabular-nums` to numeric cells. Hover-revealed row controls use `HOVER_REVEAL_CLASS` from the same file, never a hand-rolled `opacity-0 group-hover:opacity-100` (coarse pointers never hover, so the control would be unreachable on touch). |
 | Data table, **dialog or report view** | `components/ui/table.tsx` `Table / TableHeader / TableHead / TableRow / TableCell` | Header style is baked in: `text-[11px] font-medium uppercase tracking-wider text-muted-foreground`. Wrap in `<CardContent className="p-0">` when the table is a card's primary content. `TableCell` is `px-4 py-3` on `text-sm`, so a page-level list built from this primitive comes out ~15% taller with a different hover tint: use the dry-table row above instead. |
 | Status indicator | `components/ui/badge.tsx` `<Badge variant>` | Chips mark exceptions only: normal states (Aktiv, Bokförd, Betald-i-tid) render as muted text (`text-muted-foreground text-xs`); Badge is reserved for rows that deviate (Utkast, Förfallen, Ej bokförd). A table where every row carries the same chip is wrong. Variants: `default / secondary / success / warning / destructive / outline`. **Never** use raw Tailwind colors (`bg-blue-100`, `bg-emerald-500/10`, etc.) for status. Map status → variant via a small `Record` per feature. |
-| No-data state | `components/ui/empty-state.tsx` `EmptyState` | Don't hand-roll `<div className="flex flex-col items-center py-12">…</div>`. Preset variants exist (`EmptyInvoices`, `EmptyCustomers`, `EmptyTransactions`, etc.). |
+| No-data state | `components/ui/empty-state.tsx` `EmptyState` | Don't hand-roll `<div className="flex flex-col items-center py-12">…</div>`. Preset variants exist (`EmptyCustomers`, `EmptyByraClients`). |
 | Loading placeholder | `components/ui/skeleton.tsx` `<Skeleton>` | Don't hand-roll `bg-muted rounded animate-pulse` divs. |
 | Inline help / formulas | `components/ui/info-tooltip.tsx` `InfoTooltip` | Hover-revealed; don't use always-visible info buttons. |
 | View/mode switcher in a toolbar | `components/ui/segmented-control.tsx` `SegmentedControl` | Pill-in-pill tablist at the shared `h-8` toolbar height; `options` take an optional `count` for the standard count chip. Never hand-roll the `bg-muted/70` tablist div. |
diff --git a/DECISIONS.md b/DECISIONS.md
index c375d543..f9a90596 100644
--- a/DECISIONS.md
+++ b/DECISIONS.md
@@ -1481,6 +1481,7 @@ One line per decision: `[YYYY-MM-DD] <decision>: <why>`. Appended by agents and
 [2026-09-01] PR #2130 CodeRabbit P1 (org-number twin inherits a grant): the ombud path binds SKV system-credential access to an org number, and org numbers are public and tenant-editable, so while more than one live (non-archived) company claims the same 12-digit org number NO company may verify, mint a deep link, or be granted by the nightly sync on it (409 ORG_NUMBER_CONTESTED; cron counts them as contested and changes nothing). This does not re-add the company-creation org-number guard (org-number reuse stays allowed); it only fences the one feature where the org number is the authority boundary. Also: the cron honours summarizeGrants.recognized (unknown role codes = pinning problem, never a denial), mirroring probeViaOmbudsregister.
 
 [2026-09-01] ENABLE_BANKING_SANDBOX removed from the enable-banking manifest and the index.ts header (#2131): the variable was declared as optional but never read anywhere; sandbox vs production is decided by ENABLE_BANKING_API_URL (api.tilisy.com vs api.enablebanking.com, api-client.ts derives isSandbox from the host). A dead variable declared in the manifest is what the self-hosting docs would otherwise have copied. The manifest now lists the two optional variables the code actually reads (API_URL, PSU_TYPE); the _PRODUCTION aliases stay undeclared on purpose, they are a hosted Vercel convention, not an operator contract.
+[2026-09-02] Repo-wide bloat sweep (chore/bloat-sweep-2026-09): removed dead files/exports/types/i18n namespaces and deduplicated byte-identical helpers into canonical homes (lib/utils chunk/sleep/utcDateStamp, lib/dates/iso, lib/invariants/uuid, lib/xml/escape, lib/reports/sru/format, lib/pdf/number-text pdfAmount/formatDateSv, lib/browser/panel-request, lib/api/v1/body + v1ValidationError, lib/bookkeeping/booking-template-schemas). Deliberately NOT done: naive Math.round(x*100)/100 helpers were not swapped for roundOre (behaviour change at half-ore values, ratchet campaign owns it); lib/bokslut/rounding.ts shim kept because money.test.ts asserts the back-compat re-export; text-based v1 body parsers (empty body allowed) kept inline because readV1JsonBody has different empty-body semantics; the four HTTP endpoints with no first-party caller (skatteverket agi/underlag + agi/sparad DELETE, invoice-inbox items/:id/history, mail connections/backfill) stay because removing a reachable endpoint is a surface change; VacationBalanceCard deleted as unreachable since #1130, the v1/MCP vacation-year-close routes stay.
 [2026-09-01] PR #2130 security-scan round: the register's djuplank is validated (https + skatteverket.se host) before it is returned or navigated to, since the settings page follows it; a contested org number now WITHDRAWS an already-recorded grant nightly (not only blocks new ones), outside the downgrade guards on purpose. NOT done: proof of org-number ownership (Bolagsverket firmatecknare / BankID) before any ombud grant; the org number is tenant-editable across the product (AGI, invoices, årsredovisning) and binding it to a verified identity is a product decision for Emil, tracked as a follow-up rather than declined.
 [2026-09-02] Viewer write gate as ONE table-level trigger (enforce_company_writer_role) instead of re-emitting 15 SECURITY DEFINER bodies and ~130 policies: keyed on the JWT role claim so it fires inside definer functions too; no-op for service_role and trigger cascades. agent_conversations/agent_messages and telemetry tables deliberately excluded.
 [2026-09-02] Posting-integrity guards key on current_user IN ('anon','authenticated'), not the JWT claim: inside SECURITY DEFINER RPCs current_user is the definer, so commit_journal_entry, SIE import, storno and rättelse keep working while direct PostgREST manipulation of posted vouchers is blocked. Residual: a direct draft->posted flip may still reuse an unused number below the sequence high-water mark.
diff --git a/app/(dashboard)/bookkeeping/page.tsx b/app/(dashboard)/bookkeeping/page.tsx
index e2cde481..f92bd111 100644
--- a/app/(dashboard)/bookkeeping/page.tsx
+++ b/app/(dashboard)/bookkeeping/page.tsx
@@ -1,5 +1,6 @@
 'use client'
 
+import { UUID_RE } from '@/lib/invariants/uuid'
 import { useState, useEffect, useMemo } from 'react'
 import dynamic from 'next/dynamic'
 import { useRouter, useSearchParams } from 'next/navigation'
@@ -44,7 +45,6 @@ interface NextVoucher {
   series: string
 }
 
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
 
 export default function BookkeepingPage() {
   const { toast } = useToast()
diff --git a/app/(dashboard)/import/page.tsx b/app/(dashboard)/import/page.tsx
index aac59c78..1dd60a7f 100644
--- a/app/(dashboard)/import/page.tsx
+++ b/app/(dashboard)/import/page.tsx
@@ -58,7 +58,7 @@ import { decodeFileContent } from '@/lib/import/shared/encoding'
 import type { BankFileParseResult, BankFileFormatId, BankFileDuplicateInfo, GenericCSVColumnMapping } from '@/lib/import/bank-file/types'
 import type { SkattekontoFileParseResult } from '@/lib/import/skattekonto-file/types'
 import type { SkattekontoFileImportResult } from '@/components/import/SkattekontoFileResultStep'
-import type { IngestResult } from '@/lib/transactions/ingest'
+import type { IngestResult } from '@/types'
 import type {
   ImportWizardStep,
   ParsedSIEFile,
diff --git a/app/(dashboard)/invoices/[id]/credit/page.tsx b/app/(dashboard)/invoices/[id]/credit/page.tsx
index 42b5819b..07644cdb 100644
--- a/app/(dashboard)/invoices/[id]/credit/page.tsx
+++ b/app/(dashboard)/invoices/[id]/credit/page.tsx
@@ -22,15 +22,11 @@ import { useCompany, useCapability } from '@/contexts/CompanyContext'
 import { CAPABILITY } from '@/lib/entitlements/keys'
 import { getCreditNoteSendMode } from '@/lib/invoices/credit-note-send-mode'
 import { creditConfirmNumber } from '@/lib/invoices/display'
-import type { Invoice, InvoiceItem, Customer } from '@/types'
+import type { InvoiceItem } from '@/types'
+import type { InvoiceWithRelations } from '@/components/invoices/types'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
 import { InvoiceEditorSkeleton } from '@/components/common/DetailPageSkeleton'
 
-interface InvoiceWithRelations extends Invoice {
-  customer: Customer
-  items: InvoiceItem[]
-}
-
 export default function CreateCreditNotePage({ params }: { params: Promise<{ id: string }> }) {
   const { canWrite } = useCanWrite()
   const { isSandbox } = useCompany()
diff --git a/app/(dashboard)/invoices/[id]/page.tsx b/app/(dashboard)/invoices/[id]/page.tsx
index 019bffaf..82d54b53 100644
--- a/app/(dashboard)/invoices/[id]/page.tsx
+++ b/app/(dashboard)/invoices/[id]/page.tsx
@@ -80,7 +80,8 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog'
-import type { Invoice, InvoiceItem, Customer, InvoiceStatus, InvoiceReminder, InvoiceDocumentType } from '@/types'
+import type { Invoice, InvoiceItem, InvoiceStatus, InvoiceReminder, InvoiceDocumentType } from '@/types'
+import type { InvoiceWithRelations } from '@/components/invoices/types'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
 import { useBranding } from '@/lib/branding/brand-context'
 import { DetailPageSkeleton } from '@/components/common/DetailPageSkeleton'
@@ -136,15 +137,6 @@ function daysOverdue(dueDateStr: string): number {
   return Math.round((today.getTime() - dueDate.getTime()) / (1000 * 60 * 60 * 24))
 }
 
-interface InvoiceWithRelations extends Invoice {
-  customer: Customer
-  items: InvoiceItem[]
-  // Optional reference to the issuance verifikation. Populated by the
-  // backend when the invoice flow auto-books an entry on send; absent on
-  // older invoices and on companies where issuance is not auto-booked.
-  journal_entry_id?: string | null
-}
-
 export default function InvoiceDetailPage({ params }: { params: Promise<{ id: string }> }) {
   const { canWrite } = useCanWrite()
   const { company, isSandbox } = useCompany()
diff --git a/app/(dashboard)/reports/kassaflodesanalys/KassaflodesanalysClient.tsx b/app/(dashboard)/reports/kassaflodesanalys/KassaflodesanalysClient.tsx
index b1e0e7b1..526cf263 100644
--- a/app/(dashboard)/reports/kassaflodesanalys/KassaflodesanalysClient.tsx
+++ b/app/(dashboard)/reports/kassaflodesanalys/KassaflodesanalysClient.tsx
@@ -23,7 +23,7 @@ import {
   CheckCircle2,
   Loader2,
 } from 'lucide-react'
-import { formatDate } from '@/lib/utils'
+import { formatAmount, formatDate } from '@/lib/utils'
 import { downloadFile } from '@/lib/browser/download-file'
 import { failureDescription } from '@/lib/browser/action-failure'
 import type { KassaflodesanalysReport } from '@/lib/reports/kassaflodesanalys'
@@ -32,13 +32,6 @@ import {
   type ErrorLocale,
 } from '@/lib/errors/get-error-message'
 
-function formatAmount(n: number): string {
-  return n.toLocaleString('sv-SE', {
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 2,
-  })
-}
-
 interface CashRowProps {
   label: string
   amount: number
diff --git a/app/(dashboard)/suppliers/[id]/page.tsx b/app/(dashboard)/suppliers/[id]/page.tsx
index 679adacf..111e6777 100644
--- a/app/(dashboard)/suppliers/[id]/page.tsx
+++ b/app/(dashboard)/suppliers/[id]/page.tsx
@@ -13,17 +13,13 @@ import { useToast } from '@/components/ui/use-toast'
 import { getErrorMessage } from '@/lib/errors/get-error-message'
 import { ArrowLeft, Lock } from 'lucide-react'
 import { useCanWrite } from '@/lib/hooks/use-can-write'
-import { formatDate } from '@/lib/utils'
+import { formatAmount, formatDate } from '@/lib/utils'
 import SupplierForm from '@/components/suppliers/SupplierForm'
 import Link from 'next/link'
 import { DestructiveConfirmDialog, useDestructiveConfirm } from '@/components/ui/destructive-confirm-dialog'
 import type { Supplier, SupplierType, CreateSupplierInput, SupplierInvoice } from '@/types'
 import { DetailPageSkeleton } from '@/components/common/DetailPageSkeleton'
 
-function formatAmount(amount: number): string {
-  return amount.toLocaleString('sv-SE', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-}
-
 // Supplier invoices carry their own currency; "kr" is only correct for SEK.
 function amountWithCurrency(amount: number, currency?: string | null): string {
   return `${formatAmount(amount)} ${!currency || currency === 'SEK' ? 'kr' : currency}`
diff --git a/app/(dashboard)/transactions/page.tsx b/app/(dashboard)/transactions/page.tsx
index 79bd940a..4fac088d 100644
--- a/app/(dashboard)/transactions/page.tsx
+++ b/app/(dashboard)/transactions/page.tsx
@@ -1,5 +1,6 @@
 'use client'
 
+import { UUID_RE } from '@/lib/invariants/uuid'
 import { useState, useEffect, useMemo, useRef, useCallback } from 'react'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import dynamic from 'next/dynamic'
@@ -145,7 +146,6 @@ const PERIOD_FILTER_STORAGE_PREFIX = 'Accounted:transactions-fy-scope:v1:'
 // string in the underlag-badge effect below. They come from journal_entries.id
 // (DB-sourced), but this guard keeps the interpolated list UUID-only, matching
 // /api/documents/counts.
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
 
 // A skattekonto row qualifies for bulk booking when the outcome is fully
 // deterministic: a rule matched (booking_suggestion), it is not a likely
@@ -381,8 +381,6 @@ export default function TransactionsPage() {
   // voucher (salary, Fortnox import, manual entry) with no new bokföring.
   const [matchVoucherTx, setMatchVoucherTx] = useState<TransactionWithInvoice | null>(null)
   const [bulkBookOpen, setBulkBookOpen] = useState(false)
-  const [isMatchingSupplierFromPicker, setIsMatchingSupplierFromPicker] = useState(false)
-  const [isMatchingFromPicker, setIsMatchingFromPicker] = useState(false)
 
   // Quick review dialog (suggestion review before booking)
   const [quickReviewOpen, setQuickReviewOpen] = useState(false)
@@ -2394,46 +2392,6 @@ export default function TransactionsPage() {
     }
   }, [refreshTransactions, t, toast])
 
-  async function handleMatchInvoice(transactionId: string, invoiceId: string): Promise<boolean> {
-    try {
-      const response = await fetch(`/api/transactions/${transactionId}/match-invoice`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ invoice_id: invoiceId }),
-      })
-      const result = await response.json()
-      if (!response.ok) {
-        toast({ title: 'Fakturamatchning misslyckades', description: getErrorMessage(result, { context: 'transaction' }), variant: 'destructive' })
-        return false
-      }
-
-      const transaction = transactions.find((t) => t.id === transactionId)
-      const invoiceNumber = transaction?.potential_invoice?.invoice_number || ''
-
-      setTransactions((prev) =>
-        prev.map((t) =>
-          t.id === transactionId
-            ? {
-                ...t,
-                invoice_id: invoiceId,
-                potential_invoice_id: null,
-                potential_invoice: undefined,
-                is_business: true,
-                category: 'income_services' as TransactionCategory,
-                journal_entry_id: result.journal_entry_id,
-              }
-            : t
-        )
-      )
-
-      toast({ title: 'Faktura matchad', description: `Faktura ${invoiceNumber} markerad som betald` })
-      return true
-    } catch {
-      toast({ title: t('match_failed_title'), description: t('match_failed_with_invoice'), variant: 'destructive' })
-      return false
-    }
-  }
-
   function handleSelectInvoiceFromPicker(invoice: Invoice & { customer?: Customer }) {
     if (!invoicePickerTransaction) return
     // Don't POST directly from the picker. Route through the confirm dialog
@@ -4264,7 +4222,6 @@ export default function TransactionsPage() {
       {invoicePickerOpen && <Dialog
         open
         onOpenChange={(open) => {
-          if (isMatchingFromPicker) return
           setInvoicePickerOpen(open)
           if (!open) setInvoicePickerTransaction(null)
         }}
@@ -4284,7 +4241,6 @@ export default function TransactionsPage() {
               <InvoicePicker
                 transaction={invoicePickerTransaction}
                 onSelect={handleSelectInvoiceFromPicker}
-                isProcessing={isMatchingFromPicker}
               />
             </>
           )}
@@ -4294,7 +4250,6 @@ export default function TransactionsPage() {
       {supplierInvoicePickerOpen && <Dialog
         open
         onOpenChange={(open) => {
-          if (isMatchingSupplierFromPicker) return
           setSupplierInvoicePickerOpen(open)
           if (!open) setSupplierInvoicePickerTransaction(null)
         }}
@@ -4314,7 +4269,6 @@ export default function TransactionsPage() {
               <SupplierInvoicePicker
                 transaction={supplierInvoicePickerTransaction}
                 onSelect={handleSelectSupplierInvoiceFromPicker}
-                isProcessing={isMatchingSupplierFromPicker}
               />
             </>
           )}
diff --git a/app/.well-known/skills/index.json/route.ts b/app/.well-known/skills/index.json/route.ts
index 591756dc..512f673e 100644
--- a/app/.well-known/skills/index.json/route.ts
+++ b/app/.well-known/skills/index.json/route.ts
@@ -8,7 +8,7 @@
  */
 
 import { NextResponse } from 'next/server'
-import { skills } from '@/extensions/general/mcp-server/skills'
+import { workflowSkills as skills } from '@/extensions/general/mcp-server/skills'
 import { API_V1_VERSION } from '@/lib/api/v1/version'
 import { withPublicSecurityHeaders } from '@/lib/api/v1/security-headers'
 import { getCanonicalBaseUrl } from '@/lib/api/v1/base-url'
diff --git a/app/api/bookkeeping/fiscal-periods/[id]/arsredovisning/signatures/[signatureId]/route.ts b/app/api/bookkeeping/fiscal-periods/[id]/arsredovisning/signatures/[signatureId]/route.ts
index 97d61e87..96d57209 100644
--- a/app/api/bookkeeping/fiscal-periods/[id]/arsredovisning/signatures/[signatureId]/route.ts
+++ b/app/api/bookkeeping/fiscal-periods/[id]/arsredovisning/signatures/[signatureId]/route.ts
@@ -4,6 +4,8 @@ import { withRouteContext } from '@/lib/api/with-route-context'
 import { errorResponse, errorResponseFromCode } from '@/lib/errors/get-structured-error'
 import { validateBody } from '@/lib/api/validate'
 import { markSignatureSigned } from '@/lib/bokslut/arsredovisning/signature-service'
+import { getSwedishLocalDate } from '@/lib/bookkeeping/engine'
+
 import { createServiceClient } from '@/lib/supabase/server'
 
 // PATCH transitions: pending → signed (manual entry for the paper / outside-
@@ -34,19 +36,11 @@ const PatchSchema = z.discriminatedUnion('status', [
   z.object({ status: z.literal('declined') }).strict(),
 ])
 
-function stockholmDate(instant: string | Date): string {
-  return new Intl.DateTimeFormat('sv-SE', {
-    timeZone: 'Europe/Stockholm',
-    year: 'numeric',
-    month: '2-digit',
-    day: '2-digit',
-  }).format(typeof instant === 'string' ? new Date(instant) : instant)
-}
-
 function isSignatureDateAllowed(signedAt: string, finalizedAt: string): boolean {
-  const signedDate = stockholmDate(signedAt)
-  const finalizedDate = stockholmDate(finalizedAt)
-  const today = stockholmDate(new Date())
+  const signedDate = getSwedishLocalDate(new Date(signedAt))
+  const finalizedDate = getSwedishLocalDate(new Date(finalizedAt))
+  const today = getSwedishLocalDate()
+
   return signedDate >= finalizedDate && signedDate <= today
 }
 
diff --git a/app/api/calendar/feed/[token]/route.ts b/app/api/calendar/feed/[token]/route.ts
index f09d33f5..31eeccce 100644
--- a/app/api/calendar/feed/[token]/route.ts
+++ b/app/api/calendar/feed/[token]/route.ts
@@ -4,24 +4,13 @@ import { generateCalendarFeed } from '@/lib/calendar/ics-generator'
 import { fetchAllRows } from '@/lib/supabase/fetch-all'
 import { createLogger } from '@/lib/logger'
 import type { Deadline, Invoice } from '@/types'
+import { createTokenRateLimiter } from '@/lib/api/token-rate-limit'
+import { UUID_RE } from '@/lib/invariants/uuid'
 
 const log = createLogger('api/calendar/feed-token')
 
-// In-memory rate limiting: token -> { count, resetAt }
-const rateLimitMap = new Map<string, { count: number; resetAt: number }>()
-const RATE_LIMIT_WINDOW_MS = 60_000 // 1 minute
-const RATE_LIMIT_MAX = 60 // 60 requests per minute per token
-
-// Periodic cleanup to prevent memory leaks (every 5 minutes)
-let lastCleanup = Date.now()
-function cleanupRateLimitMap() {
-  const now = Date.now()
-  if (now - lastCleanup < 5 * 60_000) return
-  lastCleanup = now
-  for (const [key, value] of rateLimitMap) {
-    if (now > value.resetAt) rateLimitMap.delete(key)
-  }
-}
+// 60 requests per minute per token, process-local.
+const rateLimiter = createTokenRateLimiter({ max: 60, windowMs: 60_000 })
 
 /**
  * GET /api/calendar/feed/[token]
@@ -35,22 +24,13 @@ export async function GET(
   const { token } = await params
 
   // Validate token format (UUID)
-  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-  if (!uuidRegex.test(token)) {
+  if (!UUID_RE.test(token)) {
     return new NextResponse('Invalid token', { status: 400 })
   }
 
   // Rate limiting per token
-  cleanupRateLimitMap()
-  const nowMs = Date.now()
-  const rateEntry = rateLimitMap.get(token)
-  if (rateEntry && nowMs < rateEntry.resetAt) {
-    if (rateEntry.count >= RATE_LIMIT_MAX) {
-      return new NextResponse('Too many requests', { status: 429 })
-    }
-    rateEntry.count++
-  } else {
-    rateLimitMap.set(token, { count: 1, resetAt: nowMs + RATE_LIMIT_WINDOW_MS })
+  if (!rateLimiter.allow(token)) {
+    return new NextResponse('Too many requests', { status: 429 })
   }
 
   // Create service client (no user auth required)
diff --git a/app/api/cash-accounts/route.ts b/app/api/cash-accounts/route.ts
index 478059c1..d181e2e3 100644
--- a/app/api/cash-accounts/route.ts
+++ b/app/api/cash-accounts/route.ts
@@ -6,8 +6,9 @@ import { listForCompany } from '@/lib/cash-accounts/service'
  * GET /api/cash-accounts
  *
  * Returns the active company's cash accounts (cash_accounts table). Used by the
- * reconciliation CashAccountSelector (Item 5) and any other surface that needs
- * the canonical list of routable cash accounts. UI panels that just display PSD2
+ * reconciliation surfaces (via useCashAccounts) and any other surface that needs
+ * the canonical list of routable cash accounts.
+ UI panels that just display PSD2
  * connection state may still read bank_connections.accounts_data until that
  * column is dropped in a follow-up migration.
  *
diff --git a/app/api/company/[id]/migration-reset/archive/route.ts b/app/api/company/[id]/migration-reset/archive/route.ts
index 372f2f7b..50ea0f59 100644
--- a/app/api/company/[id]/migration-reset/archive/route.ts
+++ b/app/api/company/[id]/migration-reset/archive/route.ts
@@ -1,5 +1,7 @@
 import { NextResponse } from 'next/server'
 import { withRouteContext } from '@/lib/api/with-route-context'
+import { privateNoStore } from '@/lib/api/private-no-store'
+import { utcDateStamp } from '@/lib/utils'
 import { errorResponseFromCode } from '@/lib/errors/get-structured-error'
 import {
   estimateArchiveSize,
@@ -19,11 +21,6 @@ interface ResetArchiveRow {
   created_at: string
 }
 
-function privateNoStore(response: NextResponse): NextResponse {
-  response.headers.set('Cache-Control', 'private, no-store')
-  return response
-}
-
 /**
  * GET /api/company/[id]/migration-reset/archive
  *
@@ -159,7 +156,7 @@ export const GET = withRouteContext<Params>(
       const zipBuffer = await generateBaseDataArchive(archiveClient, reset.source_company_id, {
         include_documents: includeDocuments,
       })
-      const filename = `migration_reset_archive_${formatDateStamp(new Date())}.zip`
+      const filename = `migration_reset_archive_${utcDateStamp(new Date())}.zip`
 
       log.info('migration reset source archive generated', {
         userId: user.id,
@@ -190,10 +187,3 @@ export const GET = withRouteContext<Params>(
     }
   },
 )
-
-function formatDateStamp(date: Date): string {
-  const year = date.getUTCFullYear()
-  const month = String(date.getUTCMonth() + 1).padStart(2, '0')
-  const day = String(date.getUTCDate()).padStart(2, '0')
-  return `${year}${month}${day}`
-}
diff --git a/app/api/company/[id]/migration-reset/route.ts b/app/api/company/[id]/migration-reset/route.ts
index c6c8304e..e8480095 100644
--- a/app/api/company/[id]/migration-reset/route.ts
+++ b/app/api/company/[id]/migration-reset/route.ts
@@ -1,5 +1,6 @@
 import { NextResponse } from 'next/server'
 import { withRouteContext } from '@/lib/api/with-route-context'
+import { privateNoStore } from '@/lib/api/private-no-store'
 import { validateBody } from '@/lib/api/validate'
 import { CompanyMigrationResetSchema } from '@/lib/api/schemas'
 import { errorResponseFromCode } from '@/lib/errors/get-structured-error'
@@ -30,11 +31,6 @@ function rpcFailure(
   })
 }
 
-function privateNoStore(response: NextResponse): NextResponse {
-  response.headers.set('Cache-Control', 'private, no-store')
-  return response
-}
-
 /**
  * GET /api/company/[id]/migration-reset
  *
diff --git a/app/api/extensions/enable-banking/callback/finalize-page.ts b/app/api/extensions/enable-banking/callback/finalize-page.ts
index 750fa817..9cdca510 100644
--- a/app/api/extensions/enable-banking/callback/finalize-page.ts
+++ b/app/api/extensions/enable-banking/callback/finalize-page.ts
@@ -27,14 +27,7 @@
  * the nonce is blocked on this response.
  */
 
-function escapeHtml(value: string): string {
-  return value
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;')
-}
+import { escapeHtml } from '@/lib/email/user-text'
 
 /**
  * Opening chunk: full document head, styles, spinner and heading, plus a
diff --git a/app/api/extensions/woocommerce/callback/route.ts b/app/api/extensions/woocommerce/callback/route.ts
index 2d441053..52ee7828 100644
--- a/app/api/extensions/woocommerce/callback/route.ts
+++ b/app/api/extensions/woocommerce/callback/route.ts
@@ -1,3 +1,4 @@
+import { UUID_RE } from '@/lib/invariants/uuid'
 import { NextResponse } from 'next/server'
 import { createServiceClient } from '@/lib/supabase/server'
 import { ensureInitialized } from '@/lib/init'
@@ -71,7 +72,7 @@ export async function POST(request: Request) {
   // the DB (the column is typed uuid and would error opaquely).
   const isUuid =
     state !== null &&
-    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(state)
+    UUID_RE.test(state)
   if (!isUuid || !consumerKey || !consumerSecret) {
     return NextResponse.json({ error: 'Missing parameters' }, { status: 400 })
   }
diff --git a/app/api/import/articles/execute/route.ts b/app/api/import/articles/execute/route.ts
index a6131fd9..3554ae2b 100644
--- a/app/api/import/articles/execute/route.ts
+++ b/app/api/import/articles/execute/route.ts
@@ -1,3 +1,4 @@
+import { normalizeNameKey as nameKey } from '@/lib/import/shared/column-utils'
 import { NextResponse } from 'next/server'
 import { ensureInitialized } from '@/lib/init'
 import { eventBus } from '@/lib/events'
@@ -20,11 +21,6 @@ interface ExistingArticle {
   article_number: string | null
 }
 
-function nameKey(value: string | null): string | null {
-  if (!value) return null
-  return value.trim().toLowerCase() || null
-}
-
 /**
  * POST /api/import/articles/execute
  *
diff --git a/app/api/import/articles/parse/route.ts b/app/api/import/articles/parse/route.ts
index c2ed0785..4b84fb9b 100644
--- a/app/api/import/articles/parse/route.ts
+++ b/app/api/import/articles/parse/route.ts
@@ -10,16 +10,11 @@ import type {
   DetectedArticleColumns,
 } from '@/lib/import/articles/types'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
+import { normalizeNameKey as nameKey } from '@/lib/import/shared/column-utils'
 
 const ALLOWED_EXTENSIONS = ['.xlsx', '.xls', '.csv', '.ods']
 const MAX_FILE_SIZE = 10 * 1024 * 1024 // 10 MB
 
-/** Lowercased dedup key for matching an article by name. */
-function nameKey(value: string | null): string | null {
-  if (!value) return null
-  return value.trim().toLowerCase() || null
-}
-
 /**
  * POST /api/import/articles/parse
  *
diff --git a/app/api/import/bank-file/execute/route.ts b/app/api/import/bank-file/execute/route.ts
index 07a3d807..9b55dd8d 100644
--- a/app/api/import/bank-file/execute/route.ts
+++ b/app/api/import/bank-file/execute/route.ts
@@ -1,7 +1,8 @@
 import { NextResponse } from 'next/server'
 import { eventBus } from '@/lib/events'
 import { ensureInitialized } from '@/lib/init'
-import { ingestTransactions, type RawTransaction } from '@/lib/transactions/ingest'
+import { ingestTransactions } from '@/lib/transactions/ingest'
+import type { RawTransaction } from '@/types'
 import { generateExternalId } from '@/lib/import/bank-file/parser'
 import type { IngestOptions } from '@/types'
 import { getCompanyRole } from '@/lib/auth/require-write'
diff --git a/app/api/invoices/[id]/pdf/route.ts b/app/api/invoices/[id]/pdf/route.ts
index 0c48004f..8e8a5755 100644
--- a/app/api/invoices/[id]/pdf/route.ts
+++ b/app/api/invoices/[id]/pdf/route.ts
@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server'
 import { renderToBuffer } from '@react-pdf/renderer'
 import { withRouteContext } from '@/lib/api/with-route-context'
+import { PRIVATE_NO_STORE_HEADERS, privateNoStore } from '@/lib/api/private-no-store'
 import { InvoicePDF } from '@/lib/invoices/pdf-template'
 import { prepareInvoicePdfRender, buildSwishQrDataUrl, buildPaymentLinkQrDataUrl } from '@/lib/invoices/pdf-render-helpers'
 import { invoicePdfFilename, paymentConfirmationPdfFilename } from '@/lib/invoices/pdf-filename'
@@ -14,8 +15,6 @@ import {
   invoiceRequiresPaymentAccount,
 } from '@/lib/invoices/payment-accounts'
 
-const PRIVATE_NO_STORE_HEADERS = { 'Cache-Control': 'private, no-store' }
-
 /**
  * `?disposition=inline` serves the PDF for in-browser review instead of forcing
  * a download (#1190): reviewing an invoice should not mean opening a file from
@@ -38,11 +37,6 @@ function resolveVariant(request: Request): 'invoice' | 'paid' {
   return requested === 'paid' ? 'paid' : 'invoice'
 }
 
-function privateNoStore(response: NextResponse): NextResponse {
-  response.headers.set('Cache-Control', 'private, no-store')
-  return response
-}
-
 export const GET = withRouteContext<{ params: Promise<{ id: string }> }>(
   'invoice.pdf',
   async (request, { supabase, companyId, log, requestId }, { params }) => {
diff --git a/app/api/invoices/[id]/refresh-exchange-rate/route.ts b/app/api/invoices/[id]/refresh-exchange-rate/route.ts
index a3cc9ca8..67641a1e 100644
--- a/app/api/invoices/[id]/refresh-exchange-rate/route.ts
+++ b/app/api/invoices/[id]/refresh-exchange-rate/route.ts
@@ -6,8 +6,7 @@ import { roundOre } from '@/lib/money'
 import { resolvePeriodStatusForDate } from '@/lib/core/bookkeeping/period-service'
 import { guardSandbox } from '@/lib/sandbox/guard'
 import type { Currency, Invoice } from '@/types'
-
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+import { UUID_RE } from '@/lib/invariants/uuid'
 
 /**
  * POST /api/invoices/[id]/refresh-exchange-rate
diff --git a/app/api/invoices/preview-pdf/route.ts b/app/api/invoices/preview-pdf/route.ts
index c2b2d688..94270672 100644
--- a/app/api/invoices/preview-pdf/route.ts
+++ b/app/api/invoices/preview-pdf/route.ts
@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server'
 import { renderToBuffer } from '@react-pdf/renderer'
 import { withRouteContext } from '@/lib/api/with-route-context'
+import { PRIVATE_NO_STORE_HEADERS, privateNoStore } from '@/lib/api/private-no-store'
 import { InvoicePDF, type InvoicePdfInvoice } from '@/lib/invoices/pdf-template'
 import { prepareInvoicePdfRender, buildSwishQrDataUrl, buildPaymentLinkQrDataUrl } from '@/lib/invoices/pdf-render-helpers'
 import { getVatRules } from '@/lib/invoices/vat-rules'
@@ -18,13 +19,6 @@ import {
   invoiceRequiresPaymentAccount,
 } from '@/lib/invoices/payment-accounts'
 
-const PRIVATE_NO_STORE_HEADERS = { 'Cache-Control': 'private, no-store' }
-
-function privateNoStore(response: NextResponse): NextResponse {
-  response.headers.set('Cache-Control', 'private, no-store')
-  return response
-}
-
 /** The per-line ROT/RUT fields the editor posts alongside the amounts. */
 interface PreviewItemInput {
   description: string
diff --git a/app/api/payslip/[token]/pdf/route.ts b/app/api/payslip/[token]/pdf/route.ts
index 521e13a3..1e95cfae 100644
--- a/app/api/payslip/[token]/pdf/route.ts
+++ b/app/api/payslip/[token]/pdf/route.ts
@@ -5,21 +5,10 @@ import { resolvePayslipToken, isValidPayslipTokenFormat } from '@/lib/salary/pay
 import { buildPayslipData, payslipFileName } from '@/lib/salary/payslips/build-payslip-data'
 import { PayslipPDF } from '@/lib/salary/pdf/payslip-template'
 import { contentDisposition } from '@/lib/api/content-disposition'
+import { createTokenRateLimiter } from '@/lib/api/token-rate-limit'
 
-// In-memory rate limiting per token (pattern from /api/calendar/feed).
-const rateLimitMap = new Map<string, { count: number; resetAt: number }>()
-const RATE_LIMIT_WINDOW_MS = 60_000
-const RATE_LIMIT_MAX = 20
-
-let lastCleanup = Date.now()
-function cleanupRateLimitMap() {
-  const now = Date.now()
-  if (now - lastCleanup < 5 * 60_000) return
-  lastCleanup = now
-  for (const [key, value] of rateLimitMap) {
-    if (now > value.resetAt) rateLimitMap.delete(key)
-  }
-}
+// 20 requests per minute per token, process-local (same limiter as /api/calendar/feed).
+const rateLimiter = createTokenRateLimiter({ max: 20, windowMs: 60_000 })
 
 /**
  * GET /api/payslip/[token]/pdf
@@ -39,16 +28,8 @@ export async function GET(
     return new NextResponse('Invalid token', { status: 400 })
   }
 
-  cleanupRateLimitMap()
-  const nowMs = Date.now()
-  const rateEntry = rateLimitMap.get(token)
-  if (rateEntry && nowMs < rateEntry.resetAt) {
-    if (rateEntry.count >= RATE_LIMIT_MAX) {
-      return new NextResponse('Too many requests', { status: 429 })
-    }
-    rateEntry.count++
-  } else {
-    rateLimitMap.set(token, { count: 1, resetAt: nowMs + RATE_LIMIT_WINDOW_MS })
+  if (!rateLimiter.allow(token)) {
+    return new NextResponse('Too many requests', { status: 429 })
   }
 
   const serviceClient = createServiceClientNoCookies()
diff --git a/app/api/reconciliation/accounts/[accountKey]/links/route.ts b/app/api/reconciliation/accounts/[accountKey]/links/route.ts
index 7e9b57c2..03beb0fd 100644
--- a/app/api/reconciliation/accounts/[accountKey]/links/route.ts
+++ b/app/api/reconciliation/accounts/[accountKey]/links/route.ts
@@ -2,31 +2,19 @@ import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import { withRouteContext } from '@/lib/api/with-route-context'
 import { validateBody } from '@/lib/api/validate'
-import { AccountKeySchema } from '@/lib/reconciliation/schemas'
+import {
+  AccountKeySchema,
+  reconciliationLinksBodyFields,
+  reconciliationLinksBodyRefinement,
+} from '@/lib/reconciliation/schemas'
 import { matchPairs } from '@/lib/reconciliation/actions'
 
-const PairSchema = z.object({
-  external_ids: z.array(z.string().uuid()).min(1).max(50),
-  journal_entry_ids: z.array(z.string().uuid()).min(1).max(50),
-  // Bank 1:N only: the signed slice per verifikat (transaction sign
-  // convention). Omitted: each slice defaults to the voucher's bank line.
-  allocations: z
-    .array(z.object({ journal_entry_id: z.string().uuid(), amount: z.number() }))
-    .min(2)
-    .max(50)
-    .optional(),
-})
-
 const ReconciliationLinksBodySchema = z
   .object({
-    pairs: z.array(PairSchema).max(200).optional(),
-    use_proposals: z.boolean().optional(),
-    confidence_threshold: z.number().min(0).max(1).optional(),
+    ...reconciliationLinksBodyFields,
     dry_run: z.boolean().optional(),
   })
-  .refine((b) => (b.pairs && b.pairs.length > 0) || b.use_proposals === true, {
-    message: 'Ange pairs eller use_proposals: true.',
-  })
+  .refine(...reconciliationLinksBodyRefinement)
 
 /**
  * POST /api/reconciliation/accounts/{accountKey}/links
diff --git a/app/api/reports/ar-ledger/xlsx/route.ts b/app/api/reports/ar-ledger/xlsx/route.ts
index 2367a262..cdc539a0 100644
--- a/app/api/reports/ar-ledger/xlsx/route.ts
+++ b/app/api/reports/ar-ledger/xlsx/route.ts
@@ -9,6 +9,7 @@ import {
   dateColumn,
   integerColumn,
   xlsxFilename,
+  parseCellDate,
 } from '@/lib/reports/xlsx-export'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
 
@@ -35,12 +36,6 @@ interface InvoiceRow {
   currency: string
 }
 
-function toDate(s: string): Date | null {
-  if (!s) return null
-  const d = new Date(s)
-  return isNaN(d.getTime()) ? null : d
-}
-
 export const GET = withRouteContext('report.ar_ledger.xlsx', async (request, { supabase, companyId }) => {
   const { searchParams } = new URL(request.url)
   const asOfDate = searchParams.get('as_of_date') || undefined
@@ -70,8 +65,8 @@ export const GET = withRouteContext('report.ar_ledger.xlsx', async (request, { s
         invoiceRows.push({
           customer_name: e.customer_name,
           invoice_number: inv.invoice_number,
-          invoice_date: toDate(inv.invoice_date) ?? inv.invoice_date,
-          due_date: toDate(inv.due_date) ?? inv.due_date,
+          invoice_date: parseCellDate(inv.invoice_date) ?? inv.invoice_date,
+          due_date: parseCellDate(inv.due_date) ?? inv.due_date,
           total: inv.total,
           paid_amount: inv.paid_amount,
           outstanding: inv.outstanding,
diff --git a/app/api/reports/full-archive/route.ts b/app/api/reports/full-archive/route.ts
index ae0f8865..4bf8a07b 100644
--- a/app/api/reports/full-archive/route.ts
+++ b/app/api/reports/full-archive/route.ts
@@ -5,6 +5,8 @@ import {
   type ArchiveScope,
 } from '@/lib/reports/full-archive-export'
 import { withRouteContext } from '@/lib/api/with-route-context'
+import { PRIVATE_NO_STORE_HEADERS, privateNoStore } from '@/lib/api/private-no-store'
+import { utcDateStamp } from '@/lib/utils'
 import { getErrorMessage } from '@/lib/errors/get-error-message'
 import { errorResponseFromCode } from '@/lib/errors/get-structured-error'
 import { createServiceClient } from '@/lib/supabase/server'
@@ -13,12 +15,6 @@ export const runtime = 'nodejs'
 export const maxDuration = 300
 
 const SIZE_LIMIT_BYTES = 80 * 1024 * 1024
-const PRIVATE_NO_STORE_HEADERS = { 'Cache-Control': 'private, no-store' }
-
-function privateNoStore(response: NextResponse): NextResponse {
-  response.headers.set('Cache-Control', 'private, no-store')
-  return response
-}
 
 export const GET = withRouteContext('report.full_archive', async (request, ctx) => {
   const { supabase, companyId, user, log, requestId } = ctx
@@ -138,7 +134,7 @@ export const GET = withRouteContext('report.full_archive', async (request, ctx)
     const filename =
       scope === 'period'
         ? `arkiv_${periodId}.zip`
-        : `arkiv_full_${companyId}_${formatDateStamp(new Date())}.zip`
+        : `arkiv_full_${companyId}_${utcDateStamp(new Date())}.zip`
 
     log.info('full archive generated', {
       userId: user.id,
@@ -172,10 +168,3 @@ export const GET = withRouteContext('report.full_archive', async (request, ctx)
     )
   }
 })
-
-function formatDateStamp(d: Date): string {
-  const y = d.getUTCFullYear()
-  const m = String(d.getUTCMonth() + 1).padStart(2, '0')
-  const day = String(d.getUTCDate()).padStart(2, '0')
-  return `${y}${m}${day}`
-}
diff --git a/app/api/reports/general-ledger/xlsx/route.ts b/app/api/reports/general-ledger/xlsx/route.ts
index d447aac9..6c4945f5 100644
--- a/app/api/reports/general-ledger/xlsx/route.ts
+++ b/app/api/reports/general-ledger/xlsx/route.ts
@@ -9,6 +9,7 @@ import {
   currencyColumn,
   dateColumn,
   xlsxFilename,
+  parseCellDate,
 } from '@/lib/reports/xlsx-export'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
 
@@ -24,13 +25,6 @@ interface FlatRow {
   balance: number
 }
 
-function toDate(s: string): Date | string {
-  // Preserve original ISO string in the cell if parsing fails (avoids NaN
-  // dates polluting the workbook).
-  const d = new Date(s)
-  return isNaN(d.getTime()) ? s : d
-}
-
 export const GET = withRouteContext('report.general_ledger.xlsx', async (request, { supabase, companyId }) => {
   const { searchParams } = new URL(request.url)
   const periodId = searchParams.get('period_id')
@@ -96,7 +90,9 @@ export const GET = withRouteContext('report.general_ledger.xlsx', async (request
         rows.push({
           account_number: acc.account_number,
           account_name: acc.account_name,
-          date: toDate(line.date),
+          // Preserve the original ISO string in the cell if parsing fails (avoids
+          // NaN dates polluting the workbook).
+          date: parseCellDate(line.date) ?? line.date,
           voucher: `${line.voucher_series}${line.voucher_number}`,
           description: line.description,
           source_type: line.source_type,
diff --git a/app/api/reports/journal-register/xlsx/route.ts b/app/api/reports/journal-register/xlsx/route.ts
index 13b51e6d..3306dacd 100644
--- a/app/api/reports/journal-register/xlsx/route.ts
+++ b/app/api/reports/journal-register/xlsx/route.ts
@@ -6,8 +6,10 @@ import {
   textColumn,
   currencyColumn,
   dateColumn,
+  parseCellDate,
   xlsxFilename,
 } from '@/lib/reports/xlsx-export'
+
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
 
 interface FlatRow {
@@ -22,11 +24,6 @@ interface FlatRow {
   credit: number
 }
 
-function toDate(s: string): Date | null {
-  if (!s) return null
-  const d = new Date(s)
-  return isNaN(d.getTime()) ? null : d
-}
 
 export const GET = withRouteContext('report.journal_register.xlsx', async (request, { supabase, companyId }) => {
   const { searchParams } = new URL(request.url)
@@ -53,7 +50,8 @@ export const GET = withRouteContext('report.journal_register.xlsx', async (reque
       for (const line of entry.lines) {
         rows.push({
           voucher: voucherLabel,
-          date: toDate(entry.date),
+          date: parseCellDate(entry.date),
+
           description: entry.description,
           source_type: entry.source_type,
           status: entry.status,
diff --git a/app/api/reports/salary-journal/xlsx/route.ts b/app/api/reports/salary-journal/xlsx/route.ts
index b681c2ff..5e659efc 100644
--- a/app/api/reports/salary-journal/xlsx/route.ts
+++ b/app/api/reports/salary-journal/xlsx/route.ts
@@ -8,15 +8,10 @@ import {
   dateColumn,
   integerColumn,
   xlsxFilename,
+  parseCellDate,
 } from '@/lib/reports/xlsx-export'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
 
-function toDate(s: string): Date | null {
-  if (!s) return null
-  const d = new Date(s)
-  return isNaN(d.getTime()) ? null : d
-}
-
 export const GET = withRouteContext('report.salary_journal.xlsx', async (request, { supabase, companyId }) => {
   const { searchParams } = new URL(request.url)
   const year = parseInt(searchParams.get('year') || new Date().getFullYear().toString())
@@ -62,7 +57,7 @@ export const GET = withRouteContext('report.salary_journal.xlsx', async (request
           r.employmentType,
           r.periodYear,
           r.periodMonth,
-          toDate(r.paymentDate),
+          parseCellDate(r.paymentDate),
           r.grossSalary,
           r.taxWithheld,
           r.netSalary,
diff --git a/app/api/sandbox/seed/date-utils.ts b/app/api/sandbox/seed/date-utils.ts
new file mode 100644
index 00000000..633e747a
--- /dev/null
+++ b/app/api/sandbox/seed/date-utils.ts
@@ -0,0 +1,13 @@
+/**
+ * Date helpers shared by the sandbox seed modules. Seed-internal: the seed
+ * works in local-calendar parts on purpose (no toISOString UTC shift).
+ */
+
+export function pad2(n: number): string {
+  return String(n).padStart(2, '0')
+}
+
+/** Last calendar day of a 1-12 month: day 0 of the next month, leap years included. */
+export function lastDayOfMonth(year: number, month: number): number {
+  return new Date(year, month, 0).getDate()
+}
diff --git a/app/api/sandbox/seed/ledger-history.ts b/app/api/sandbox/seed/ledger-history.ts
index a5e6ca43..3cfcd405 100644
--- a/app/api/sandbox/seed/ledger-history.ts
+++ b/app/api/sandbox/seed/ledger-history.ts
@@ -40,6 +40,7 @@
  */
 
 import { roundOre } from '@/lib/money'
+import { lastDayOfMonth } from './date-utils'
 
 /**
  * Every BAS account this builder can emit. Exported so the seed's
@@ -196,11 +197,6 @@ function vatOf(net: number, vatRate: number): number {
   return roundOre((net * vatRate) / 100)
 }
 
-/** Day 0 of the next month is the last day of this one, leap years included. */
-function lastDayOfMonth(year: number, month: number): number {
-  return new Date(year, month, 0).getDate()
-}
-
 /**
  * Deterministic per-month variation. `(month * factor) % cycle` walks the cycle
  * in a non-obvious order, so the amounts look hand-entered without any
diff --git a/app/api/sandbox/seed/salary.ts b/app/api/sandbox/seed/salary.ts
index 8e98d6ec..413d24f2 100644
--- a/app/api/sandbox/seed/salary.ts
+++ b/app/api/sandbox/seed/salary.ts
@@ -30,6 +30,7 @@
  */
 
 import { roundOre } from '@/lib/money'
+import { lastDayOfMonth, pad2 } from './date-utils'
 import { FALLBACK_TAX_TABLES_2026 } from '@/lib/salary/tax-tables-fallback'
 import { getLineItemAccount } from '@/lib/salary/account-mapping'
 import type { SalaryLineItemType } from '@/types'
@@ -155,20 +156,11 @@ export const SANDBOX_EMPLOYEE_LAST_NAMES = {
 // Date helpers (pure: every one takes its reference date as an argument)
 // ============================================================
 
-function pad2(n: number): string {
-  return String(n).padStart(2, '0')
-}
-
 /** Local-calendar YYYY-MM-DD, same convention as route.ts's toDateStr. */
 function toDateString(year: number, month: number, day: number): string {
   return `${year}-${pad2(month)}-${pad2(day)}`
 }
 
-/** Last calendar day of a 1-12 month. */
-function lastDayOfMonth(year: number, month: number): number {
-  return new Date(year, month, 0).getDate()
-}
-
 /**
  * Shift a date by whole calendar months, clamping the day to the target
  * month's length so 31 March minus 1 month is 28/29 February, never 3 March.
diff --git a/app/api/settings/booking-templates/[id]/route.ts b/app/api/settings/booking-templates/[id]/route.ts
index 87b21728..2a63a1a7 100644
--- a/app/api/settings/booking-templates/[id]/route.ts
+++ b/app/api/settings/booking-templates/[id]/route.ts
@@ -1,3 +1,4 @@
+import { BookingTemplateLineSchema, BookingTemplateCategorySchema, BookingTemplateEntityTypeSchema } from '@/lib/bookkeeping/booking-template-schemas'
 import { NextResponse } from 'next/server'
 import { withRouteContext } from '@/lib/api/with-route-context'
 import { z } from 'zod'
@@ -5,24 +6,11 @@ import { validateBody } from '@/lib/api/validate'
 import { sparsePatchBody } from '@/lib/api/sparse-patch'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
 
-const BookingTemplateLineSchema = z.object({
-  account: z.string().regex(/^\d{4}$/),
-  label: z.string().min(1),
-  side: z.enum(['debit', 'credit']),
-  type: z.enum(['business', 'vat', 'settlement']),
-  ratio: z.number().min(0).max(10).optional(),
-  vat_rate: z.number().min(0).max(1).optional(),
-})
-
 const UpdateBookingTemplateSchema = z.object({
   name: z.string().min(1).max(200).optional(),
   description: z.string().max(2000).optional(),
-  category: z.enum([
-    'eu_trade', 'tax_account', 'private_transfer',
-    'salary', 'representation', 'year_end',
-    'vat', 'financial', 'other',
-  ]).optional(),
-  entity_type: z.enum(['all', 'enskild_firma', 'aktiebolag']).optional(),
+  category: BookingTemplateCategorySchema.optional(),
+  entity_type: BookingTemplateEntityTypeSchema.optional(),
   lines: z.array(BookingTemplateLineSchema).min(2).optional(),
 })
 
diff --git a/app/api/settings/booking-templates/import/route.ts b/app/api/settings/booking-templates/import/route.ts
index b18cf51c..aed1e877 100644
--- a/app/api/settings/booking-templates/import/route.ts
+++ b/app/api/settings/booking-templates/import/route.ts
@@ -1,27 +1,15 @@
+import { BookingTemplateLineSchema, BookingTemplateCategorySchema, BookingTemplateEntityTypeSchema } from '@/lib/bookkeeping/booking-template-schemas'
 import { NextResponse } from 'next/server'
 import { withRouteContext } from '@/lib/api/with-route-context'
 import { z } from 'zod'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
 
-const ImportLineSchema = z.object({
-  account: z.string().regex(/^\d{4}$/),
-  label: z.string().min(1),
-  side: z.enum(['debit', 'credit']),
-  type: z.enum(['business', 'vat', 'settlement']),
-  ratio: z.number().min(0).max(10).optional(),
-  vat_rate: z.number().min(0).max(1).optional(),
-})
-
 const ImportTemplateSchema = z.object({
   name: z.string().min(1).max(200),
   description: z.string().max(2000).default(''),
-  category: z.enum([
-    'eu_trade', 'tax_account', 'private_transfer',
-    'salary', 'representation', 'year_end',
-    'vat', 'financial', 'other',
-  ]).default('other'),
-  entity_type: z.enum(['all', 'enskild_firma', 'aktiebolag']).default('all'),
-  lines: z.array(ImportLineSchema).min(2),
+  category: BookingTemplateCategorySchema.default('other'),
+  entity_type: BookingTemplateEntityTypeSchema.default('all'),
+  lines: z.array(BookingTemplateLineSchema).min(2),
 })
 
 const ImportPayloadSchema = z.object({
diff --git a/app/api/settings/booking-templates/route.ts b/app/api/settings/booking-templates/route.ts
index 15b47cfd..c74f38a3 100644
--- a/app/api/settings/booking-templates/route.ts
+++ b/app/api/settings/booking-templates/route.ts
@@ -3,31 +3,24 @@ import { withRouteContext } from '@/lib/api/with-route-context'
 import { z } from 'zod'
 import { validateBody } from '@/lib/api/validate'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
+import { UUID_RE } from '@/lib/invariants/uuid'
+import {
+  BookingTemplateCategorySchema,
+  BookingTemplateEntityTypeSchema,
+  BookingTemplateLineSchema,
+} from '@/lib/bookkeeping/booking-template-schemas'
 
 // The GET scope below builds a PostgREST .or() filter by string interpolation.
-// Guard every interpolated id against a strict UUID shape so a tainted value
-// can never inject filter syntax. Both ids are server-derived (companyId from
-// membership, teamId from a DB column), so this is defense-in-depth.
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-
-const BookingTemplateLineSchema = z.object({
-  account: z.string().regex(/^\d{4}$/),
-  label: z.string().min(1),
-  side: z.enum(['debit', 'credit']),
-  type: z.enum(['business', 'vat', 'settlement']),
-  ratio: z.number().min(0).max(10).optional(),
-  vat_rate: z.number().min(0).max(1).optional(),
-})
+// Guard every interpolated id against a strict UUID shape (UUID_RE) so a
+// tainted value can never inject filter syntax. Both ids are server-derived
+// (companyId from membership, teamId from a DB column), so this is
+// defense-in-depth.
 
 const CreateBookingTemplateSchema = z.object({
   name: z.string().min(1).max(200),
   description: z.string().max(2000).default(''),
-  category: z.enum([
-    'eu_trade', 'tax_account', 'private_transfer',
-    'salary', 'representation', 'year_end',
-    'vat', 'financial', 'other',
-  ]).default('other'),
-  entity_type: z.enum(['all', 'enskild_firma', 'aktiebolag']).default('all'),
+  category: BookingTemplateCategorySchema.default('other'),
+  entity_type: BookingTemplateEntityTypeSchema.default('all'),
   lines: z.array(BookingTemplateLineSchema).min(2),
   team_id: z.string().uuid().optional(),
 })
diff --git a/app/api/v1/companies/[companyId]/accounts/route.ts b/app/api/v1/companies/[companyId]/accounts/route.ts
index c64349ae..b765e90e 100644
--- a/app/api/v1/companies/[companyId]/accounts/route.ts
+++ b/app/api/v1/companies/[companyId]/accounts/route.ts
@@ -10,7 +10,7 @@ import { fetchAllRows } from '@/lib/supabase/fetch-all'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ValidationError } from '@/lib/api/v1/errors'
 
 const Account = z.object({
   account_number: z.string(),
@@ -92,17 +92,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       class: url.searchParams.get('class') ?? undefined,
       active: url.searchParams.get('active') ?? undefined,
     })
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const f = parsed.data
     const activeOnly = f.active !== 'false'
 
diff --git a/app/api/v1/companies/[companyId]/cash-accounts/route.ts b/app/api/v1/companies/[companyId]/cash-accounts/route.ts
index b4a88235..47c433da 100644
--- a/app/api/v1/companies/[companyId]/cash-accounts/route.ts
+++ b/app/api/v1/companies/[companyId]/cash-accounts/route.ts
@@ -9,7 +9,7 @@ import { z } from 'zod'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ValidationError } from '@/lib/api/v1/errors'
 import { listForCompany } from '@/lib/cash-accounts/service'
 
 const CashAccount = z.object({
@@ -84,17 +84,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
     const parsed = Filters.safeParse({
       enabled_only: url.searchParams.get('enabled_only') ?? undefined,
     })
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
 
     try {
       const rows = await listForCompany(ctx.supabase, ctx.companyId!, {
diff --git a/app/api/v1/companies/[companyId]/customers/[id]/route.ts b/app/api/v1/companies/[companyId]/customers/[id]/route.ts
index 72faa962..793b60a9 100644
--- a/app/api/v1/companies/[companyId]/customers/[id]/route.ts
+++ b/app/api/v1/companies/[companyId]/customers/[id]/route.ts
@@ -18,7 +18,8 @@ import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { parseExpand } from '@/lib/api/v1/expand'
 import { registerEndpoint, dataEnvelope, NoBodyResponse } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { UpdateCustomerSchema } from '@/lib/api/schemas'
 import { validateVatNumber } from '@/lib/vat/vies-client'
 import {
@@ -286,28 +287,12 @@ export const PATCH = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     const customerId = idParse.data
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = V1PatchCustomerSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // Mirrors the internal PATCH route: every read path returns the masked
diff --git a/app/api/v1/companies/[companyId]/customers/bulk-create/route.ts b/app/api/v1/companies/[companyId]/customers/bulk-create/route.ts
index 0f9ca975..6e243bba 100644
--- a/app/api/v1/companies/[companyId]/customers/bulk-create/route.ts
+++ b/app/api/v1/companies/[companyId]/customers/bulk-create/route.ts
@@ -19,7 +19,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { CreateCustomerSchema } from '@/lib/api/schemas'
 import { validateVatNumber } from '@/lib/vat/vies-client'
 import { encryptCustomerPersonalNumber } from '@/lib/customers/protect-personal-number'
@@ -266,28 +267,12 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = BulkCreateRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // Reject all_or_nothing: true loudly. Same contract as invoices/bulk-create.
diff --git a/app/api/v1/companies/[companyId]/customers/route.ts b/app/api/v1/companies/[companyId]/customers/route.ts
index 422ad8f9..4fa3a73c 100644
--- a/app/api/v1/companies/[companyId]/customers/route.ts
+++ b/app/api/v1/companies/[companyId]/customers/route.ts
@@ -18,7 +18,8 @@ import {
 } from '@/lib/api/v1/pagination'
 import { registerEndpoint, listEnvelope, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { CreateCustomerSchema } from '@/lib/api/schemas'
 import { validateVatNumber } from '@/lib/vat/vies-client'
 import {
@@ -118,15 +119,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       include_archived: url.searchParams.get('include_archived') ?? undefined,
     })
     if (!filtersResult.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: filtersResult.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
+      return v1ValidationError(ctx, filtersResult.error)
     }
     const filters = filtersResult.data
     const includeArchived = filters.include_archived === 'true'
@@ -322,27 +315,12 @@ registerEndpoint({
 export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'customers.create',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const raw = await readV1JsonBody(request, ctx)
+    if (!raw.ok) return raw.response
 
-    const parsed = CreateCustomerSchema.safeParse(rawBody)
+    const parsed = CreateCustomerSchema.safeParse(raw.body)
     if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
+      return v1ValidationError(ctx, parsed.error)
     }
     const body = parsed.data
 
diff --git a/app/api/v1/companies/[companyId]/dimensions/[id]/values/[valueId]/route.ts b/app/api/v1/companies/[companyId]/dimensions/[id]/values/[valueId]/route.ts
index 22d1d69c..33411b8c 100644
--- a/app/api/v1/companies/[companyId]/dimensions/[id]/values/[valueId]/route.ts
+++ b/app/api/v1/companies/[companyId]/dimensions/[id]/values/[valueId]/route.ts
@@ -17,7 +17,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { UpdateDimensionValueSchema } from '@/lib/api/schemas'
 
 const DimensionValueShape = z.object({
@@ -124,28 +125,12 @@ export const PATCH = withApiV1<ValueRouteParams>(
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = UpdateDimensionValueSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // Value dates only make sense on accumulating dimensions (projekt-style
diff --git a/app/api/v1/companies/[companyId]/dimensions/[id]/values/route.ts b/app/api/v1/companies/[companyId]/dimensions/[id]/values/route.ts
index ff53bd21..10c9605f 100644
--- a/app/api/v1/companies/[companyId]/dimensions/[id]/values/route.ts
+++ b/app/api/v1/companies/[companyId]/dimensions/[id]/values/route.ts
@@ -12,7 +12,8 @@ import { created } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { CreateDimensionValueSchema } from '@/lib/api/schemas'
 
 const DimensionValueCreated = z.object({
@@ -80,28 +81,12 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = CreateDimensionValueSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // The dimension must exist and belong to the company in the URL.
diff --git a/app/api/v1/companies/[companyId]/documents/[id]/link/route.ts b/app/api/v1/companies/[companyId]/documents/[id]/link/route.ts
index 2a503abb..e976aa45 100644
--- a/app/api/v1/companies/[companyId]/documents/[id]/link/route.ts
+++ b/app/api/v1/companies/[companyId]/documents/[id]/link/route.ts
@@ -25,7 +25,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { linkToJournalEntry } from '@/lib/core/documents/document-service'
 
 const Body = z
@@ -94,22 +95,11 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     const documentId = idParse.data
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = Body.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // Ownership pre-check: document AND target JE must both belong to the
diff --git a/app/api/v1/companies/[companyId]/employees/[id]/absence/route.ts b/app/api/v1/companies/[companyId]/employees/[id]/absence/route.ts
index ac607d2a..da7c87dd 100644
--- a/app/api/v1/companies/[companyId]/employees/[id]/absence/route.ts
+++ b/app/api/v1/companies/[companyId]/employees/[id]/absence/route.ts
@@ -18,7 +18,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope, listEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { AbsenceTypeSchema } from '@/lib/api/schemas'
 import {
   ABSENCE_RANGE_MAX_DAYS,
@@ -104,17 +105,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string; id: string }
       to: url.searchParams.get('to') ?? undefined,
       type: url.searchParams.get('type') ?? undefined,
     })
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const { from, to, type } = parsed.data
 
     // Same cap as writes: the bounded range is the pagination contract.
@@ -213,28 +204,12 @@ export const PUT = withApiV1<{ params: Promise<{ companyId: string; id: string }
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = UpsertRangeBody.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     const result = await upsertAbsenceRange(ctx.supabase, {
@@ -325,17 +300,7 @@ export const DELETE = withApiV1<{ params: Promise<{ companyId: string; id: strin
       to: url.searchParams.get('to') ?? undefined,
       type: url.searchParams.get('type') ?? undefined,
     })
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const { from, to, type } = parsed.data
 
     const result = await deleteAbsenceRange(ctx.supabase, {
diff --git a/app/api/v1/companies/[companyId]/employees/[id]/opening-balances/route.ts b/app/api/v1/companies/[companyId]/employees/[id]/opening-balances/route.ts
index f5810fc5..b64b44b5 100644
--- a/app/api/v1/companies/[companyId]/employees/[id]/opening-balances/route.ts
+++ b/app/api/v1/companies/[companyId]/employees/[id]/opening-balances/route.ts
@@ -20,7 +20,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { OpeningBalancesFieldsSchema } from '@/lib/api/schemas'
 import { getOpeningBalances, setOpeningBalancesBulk } from '@/lib/salary/opening-balances'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
@@ -164,28 +165,12 @@ export const PUT = withApiV1<{ params: Promise<{ companyId: string; id: string }
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = OpeningBalancesFieldsSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
 
     // The per-employee PUT is the bulk handler with one item: one validation
     // and one upsert path to maintain.
diff --git a/app/api/v1/companies/[companyId]/employees/[id]/route.ts b/app/api/v1/companies/[companyId]/employees/[id]/route.ts
index 18c69fb9..c24eb9a7 100644
--- a/app/api/v1/companies/[companyId]/employees/[id]/route.ts
+++ b/app/api/v1/companies/[companyId]/employees/[id]/route.ts
@@ -22,7 +22,8 @@ import { ok, noContent } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope, NoBodyResponse } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { UpdateEmployeeSchema } from '@/lib/api/schemas'
 import { maskPersonnummer } from '@/lib/api/v1/mask-personnummer'
 import { decryptPersonnummer } from '@/lib/salary/personnummer'
@@ -239,15 +240,9 @@ export const PATCH = withApiV1<{ params: Promise<{ companyId: string; id: string
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     // OWASP V4.5: require a plain JSON object. Zod would catch a non-object
     // body downstream, but the rawKeys filter below uses Object.keys on
@@ -283,17 +278,7 @@ export const PATCH = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
 
     const parsed = UpdateEmployeeSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // Fetch the existing row so dry-run + the eventual update see merged state
diff --git a/app/api/v1/companies/[companyId]/employees/opening-balances/route.ts b/app/api/v1/companies/[companyId]/employees/opening-balances/route.ts
index cf44c45d..66cf3998 100644
--- a/app/api/v1/companies/[companyId]/employees/opening-balances/route.ts
+++ b/app/api/v1/companies/[companyId]/employees/opening-balances/route.ts
@@ -14,7 +14,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { OpeningBalancesBulkSchema } from '@/lib/api/schemas'
 import { setOpeningBalancesBulk } from '@/lib/salary/opening-balances'
 
@@ -69,28 +70,12 @@ registerEndpoint({
 export const PUT = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'employees.opening-balances.bulk-set',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = OpeningBalancesBulkSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
 
     const result = await setOpeningBalancesBulk(ctx.supabase, {
       companyId: ctx.companyId!,
diff --git a/app/api/v1/companies/[companyId]/employees/route.ts b/app/api/v1/companies/[companyId]/employees/route.ts
index 4419cc1e..50cdd519 100644
--- a/app/api/v1/companies/[companyId]/employees/route.ts
+++ b/app/api/v1/companies/[companyId]/employees/route.ts
@@ -26,7 +26,8 @@ import {
 } from '@/lib/api/v1/pagination'
 import { registerEndpoint, listEnvelope, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { CreateEmployeeSchema } from '@/lib/api/schemas'
 import { maskPersonnummer } from '@/lib/api/v1/mask-personnummer'
 import { decryptPersonnummer, encryptPersonnummer, validatePersonnummer } from '@/lib/salary/personnummer'
@@ -126,17 +127,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       search: url.searchParams.get('search') ?? undefined,
       include_inactive: url.searchParams.get('include_inactive') ?? undefined,
     })
-    if (!filtersResult.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: filtersResult.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!filtersResult.success) return v1ValidationError(ctx, filtersResult.error)
     const filters = filtersResult.data
     const includeInactive = filters.include_inactive === 'true'
 
@@ -331,28 +322,12 @@ const EMPLOYEE_RESPONSE_COLUMNS =
 export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'employees.create',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = CreateEmployeeSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // CreateEmployeeSchema only checks the shape (12 digits), so on its own it
diff --git a/app/api/v1/companies/[companyId]/fiscal-periods/[id]/currency-revaluation/route.ts b/app/api/v1/companies/[companyId]/fiscal-periods/[id]/currency-revaluation/route.ts
index 542ad84d..594b7c04 100644
--- a/app/api/v1/companies/[companyId]/fiscal-periods/[id]/currency-revaluation/route.ts
+++ b/app/api/v1/companies/[companyId]/fiscal-periods/[id]/currency-revaluation/route.ts
@@ -14,7 +14,7 @@ import { z } from 'zod'
 import { accepted } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { ownsFiscalPeriod } from '@/lib/api/v1/owns-fiscal-period'
 import { startOperation, completeOperation, failOperation } from '@/lib/api/v1/operations'
 import { executeCurrencyRevaluation } from '@/lib/bookkeeping/currency-revaluation'
@@ -90,12 +90,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     if (rawBody) {
       const parsed = Body.safeParse(rawBody)
-      if (!parsed.success) {
-        return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-          requestId: ctx.requestId,
-          details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-        })
-      }
+      if (!parsed.success) return v1ValidationError(ctx, parsed.error)
       bodyAsOfDate = parsed.data.as_of_date
     }
 
diff --git a/app/api/v1/companies/[companyId]/fiscal-periods/[id]/opening-balances/route.ts b/app/api/v1/companies/[companyId]/fiscal-periods/[id]/opening-balances/route.ts
index dbbae0a9..2260c783 100644
--- a/app/api/v1/companies/[companyId]/fiscal-periods/[id]/opening-balances/route.ts
+++ b/app/api/v1/companies/[companyId]/fiscal-periods/[id]/opening-balances/route.ts
@@ -14,7 +14,7 @@ import { z } from 'zod'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { ownsFiscalPeriod } from '@/lib/api/v1/owns-fiscal-period'
 import { generateOpeningBalances } from '@/lib/core/bookkeeping/year-end-service'
 import { getErrorMessage } from '@/lib/errors/get-error-message'
@@ -81,12 +81,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
       })
     }
     const parsed = Body.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
 
     // Ownership pre-check on BOTH ids: the closed period (URL) and the next
     // period (body). The wrapper has already verified the user's membership
diff --git a/app/api/v1/companies/[companyId]/imports/bank/route.ts b/app/api/v1/companies/[companyId]/imports/bank/route.ts
index 1ac3b147..e2217974 100644
--- a/app/api/v1/companies/[companyId]/imports/bank/route.ts
+++ b/app/api/v1/companies/[companyId]/imports/bank/route.ts
@@ -36,7 +36,8 @@ import {
   generateFileHash,
   generateExternalId,
 } from '@/lib/import/bank-file/parser'
-import { ingestTransactions, type RawTransaction } from '@/lib/transactions/ingest'
+import { ingestTransactions } from '@/lib/transactions/ingest'
+import type { RawTransaction } from '@/types'
 import { decodeFileContent } from '@/lib/import/shared/encoding'
 import type { BankFileFormatId } from '@/lib/import/bank-file/types'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
diff --git a/app/api/v1/companies/[companyId]/imports/sie/route.ts b/app/api/v1/companies/[companyId]/imports/sie/route.ts
index 46b73e02..06a05cd0 100644
--- a/app/api/v1/companies/[companyId]/imports/sie/route.ts
+++ b/app/api/v1/companies/[companyId]/imports/sie/route.ts
@@ -26,7 +26,7 @@ import { z } from 'zod'
 import { accepted } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import {
   startOperation,
   completeOperation,
@@ -165,17 +165,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
       // belt-and-suspenders.
       .strict()
       .safeParse(parsedOptions)
-    if (!optionsParse.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: optionsParse.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!optionsParse.success) return v1ValidationError(ctx, optionsParse.error)
     const options = optionsParse.data
 
     // Decode + parse + hash. These are all sync / fast: done before
diff --git a/app/api/v1/companies/[companyId]/inbox-items/[id]/stamp/route.ts b/app/api/v1/companies/[companyId]/inbox-items/[id]/stamp/route.ts
index 76c1a0a0..d56d3c21 100644
--- a/app/api/v1/companies/[companyId]/inbox-items/[id]/stamp/route.ts
+++ b/app/api/v1/companies/[companyId]/inbox-items/[id]/stamp/route.ts
@@ -19,7 +19,8 @@ import { z } from 'zod'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 
 const Body = z
   .object({
@@ -80,22 +81,11 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     const itemId = idParse.data
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = Body.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     const [itemRes, jeRes] = await Promise.all([
diff --git a/app/api/v1/companies/[companyId]/invoices/[id]/credit/route.ts b/app/api/v1/companies/[companyId]/invoices/[id]/credit/route.ts
index 500a9137..5181205b 100644
--- a/app/api/v1/companies/[companyId]/invoices/[id]/credit/route.ts
+++ b/app/api/v1/companies/[companyId]/invoices/[id]/credit/route.ts
@@ -29,7 +29,7 @@ import { created } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { createCreditNoteJournalEntry } from '@/lib/bookkeeping/invoice-entries'
 import { eventBus } from '@/lib/events'
 import type { AccountingMethod, CreditNote, EntityType, Invoice } from '@/types'
@@ -138,17 +138,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     let reason: string | undefined
     if (rawBody) {
       const parsed = CreditNoteRequest.safeParse(rawBody)
-      if (!parsed.success) {
-        return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-          requestId: ctx.requestId,
-          details: {
-            issues: parsed.error.issues.map((i) => ({
-              field: i.path.join('.'),
-              message: i.message,
-            })),
-          },
-        })
-      }
+      if (!parsed.success) return v1ValidationError(ctx, parsed.error)
       reason = parsed.data.reason
     }
 
diff --git a/app/api/v1/companies/[companyId]/invoices/[id]/mark-paid/route.ts b/app/api/v1/companies/[companyId]/invoices/[id]/mark-paid/route.ts
index d0a79a2b..39e7e36b 100644
--- a/app/api/v1/companies/[companyId]/invoices/[id]/mark-paid/route.ts
+++ b/app/api/v1/companies/[companyId]/invoices/[id]/mark-paid/route.ts
@@ -31,7 +31,7 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { MarkInvoicePaidSchema } from '@/lib/api/schemas'
 import {
   createInvoiceCashEntry,
@@ -162,17 +162,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     let force = false
     if (rawBody) {
       const parsed = MarkInvoicePaidSchema.safeParse(rawBody)
-      if (!parsed.success) {
-        return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-          requestId: ctx.requestId,
-          details: {
-            issues: parsed.error.issues.map((i) => ({
-              field: i.path.join('.'),
-              message: i.message,
-            })),
-          },
-        })
-      }
+      if (!parsed.success) return v1ValidationError(ctx, parsed.error)
       exchangeRateDifference = parsed.data.exchange_rate_difference
       bodyPaymentDate = parsed.data.payment_date
       customLines = parsed.data.lines
diff --git a/app/api/v1/companies/[companyId]/invoices/[id]/route.ts b/app/api/v1/companies/[companyId]/invoices/[id]/route.ts
index 0a19ba06..9480384d 100644
--- a/app/api/v1/companies/[companyId]/invoices/[id]/route.ts
+++ b/app/api/v1/companies/[companyId]/invoices/[id]/route.ts
@@ -28,7 +28,8 @@ import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { parseExpand } from '@/lib/api/v1/expand'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { INVOICE_FULL_COLUMNS, INVOICE_ITEM_FULL_COLUMNS } from '@/lib/api/v1/invoice-columns'
 import { DimensionsBagSchema } from '@/lib/bookkeeping/dimension-resolver'
 import { CreateInvoiceItemSchema } from '@/lib/api/schemas'
@@ -255,28 +256,12 @@ export const PATCH = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     const invoiceId = idParse.data
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = V1PatchDraftInvoiceSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     const updateData: Record<string, unknown> = {}
diff --git a/app/api/v1/companies/[companyId]/invoices/[id]/send/route.ts b/app/api/v1/companies/[companyId]/invoices/[id]/send/route.ts
index 5c3a7c37..40e8e3a9 100644
--- a/app/api/v1/companies/[companyId]/invoices/[id]/send/route.ts
+++ b/app/api/v1/companies/[companyId]/invoices/[id]/send/route.ts
@@ -45,7 +45,7 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { InvoicePDF } from '@/lib/invoices/pdf-template'
 import { prepareInvoicePdfRender, buildSwishQrDataUrl, buildPaymentLinkQrDataUrl } from '@/lib/invoices/pdf-render-helpers'
 import { applyPaymentLinkToInvoice } from '@/lib/extensions/payment-links'
@@ -271,17 +271,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
 
     const bodyResult = InvoiceSendBody.safeParse(rawBody)
-    if (!bodyResult.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: bodyResult.error.issues.map((issue) => ({
-            field: issue.path.join('.'),
-            message: issue.message,
-          })),
-        },
-      })
-    }
+    if (!bodyResult.success) return v1ValidationError(ctx, bodyResult.error)
 
     // Reject delivery notes: they have a different (D-series) lifecycle.
     if (typed.document_type === 'delivery_note') {
diff --git a/app/api/v1/companies/[companyId]/invoices/bulk-create/route.ts b/app/api/v1/companies/[companyId]/invoices/bulk-create/route.ts
index 192927f2..77ffd0c5 100644
--- a/app/api/v1/companies/[companyId]/invoices/bulk-create/route.ts
+++ b/app/api/v1/companies/[companyId]/invoices/bulk-create/route.ts
@@ -38,7 +38,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { CreateInvoiceSchema } from '@/lib/api/schemas'
 import { getPermittedVatRates, getVatRules } from '@/lib/invoices/vat-rules'
 import { convertToSEK, fetchExchangeRate } from '@/lib/currency/riksbanken'
@@ -427,28 +428,12 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = BulkCreateRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // Reject all_or_nothing: true loudly. The schema accepts it for forward
diff --git a/app/api/v1/companies/[companyId]/invoices/route.ts b/app/api/v1/companies/[companyId]/invoices/route.ts
index 1078b15d..d6b7f74f 100644
--- a/app/api/v1/companies/[companyId]/invoices/route.ts
+++ b/app/api/v1/companies/[companyId]/invoices/route.ts
@@ -25,7 +25,8 @@ import {
 import { parseExpand } from '@/lib/api/v1/expand'
 import { registerEndpoint, listEnvelope, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1, type ApiV1Context } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { CreateInvoiceSchema } from '@/lib/api/schemas'
 import { INVOICE_FULL_COLUMNS, INVOICE_ITEM_FULL_COLUMNS } from '@/lib/api/v1/invoice-columns'
 import { buildInvoiceWriteData } from '@/lib/invoices/build-invoice-write'
@@ -229,15 +230,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       date_to: url.searchParams.get('date_to') ?? undefined,
     })
     if (!filtersResult.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: filtersResult.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
+      return v1ValidationError(ctx, filtersResult.error)
     }
     const filters = filtersResult.data
 
@@ -455,27 +448,12 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const raw = await readV1JsonBody(request, ctx)
+    if (!raw.ok) return raw.response
 
-    const parsed = CreateInvoiceSchema.safeParse(rawBody)
+    const parsed = CreateInvoiceSchema.safeParse(raw.body)
     if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
+      return v1ValidationError(ctx, parsed.error)
     }
     const input = parsed.data
 
@@ -622,8 +600,8 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
     const { invoiceFields, items: itemRows } = build
 
     // Dry-run: validation-only preview. Drafts have no journal-entry side
-    // effects yet, so no pending_operations staging needed; the
-    // dryRunStaged() variant lands in PR-B-2b for :send.
+    // effects yet, so no pending_operations staging needed; a staged
+    // preview variant belongs to :send.
     if (ctx.dryRun) {
       // Never echo the encrypted personnummer blob in a preview; last4 is
       // the display-safe representation the response columns expose too.
diff --git a/app/api/v1/companies/[companyId]/journal-entries/[id]/correct/route.ts b/app/api/v1/companies/[companyId]/journal-entries/[id]/correct/route.ts
index 90ebd767..5858b5bd 100644
--- a/app/api/v1/companies/[companyId]/journal-entries/[id]/correct/route.ts
+++ b/app/api/v1/companies/[companyId]/journal-entries/[id]/correct/route.ts
@@ -21,7 +21,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { checkPeriodLock } from '@/lib/api/v1/check-period-lock'
 import { CorrectJournalEntrySchema } from '@/lib/api/schemas'
 import { validateBalance } from '@/lib/bookkeeping/engine'
@@ -97,22 +98,11 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     const entryId = idParse.data
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = CorrectJournalEntrySchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const { lines, description, allow_deep_chain } = parsed.data
 
     const balance = validateBalance(lines)
diff --git a/app/api/v1/companies/[companyId]/journal-entries/[id]/reverse/route.ts b/app/api/v1/companies/[companyId]/journal-entries/[id]/reverse/route.ts
index ccfec185..52da09c5 100644
--- a/app/api/v1/companies/[companyId]/journal-entries/[id]/reverse/route.ts
+++ b/app/api/v1/companies/[companyId]/journal-entries/[id]/reverse/route.ts
@@ -18,7 +18,7 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { checkPeriodLock } from '@/lib/api/v1/check-period-lock'
 import { reverseEntry } from '@/lib/bookkeeping/engine'
 import { correctionChainDepth, CORRECTION_CHAIN_GUARD_DEPTH } from '@/lib/core/bookkeeping/correction-chain'
@@ -106,12 +106,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     if (rawBody) {
       const parsed = ReverseRequest.safeParse(rawBody)
-      if (!parsed.success) {
-        return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-          requestId: ctx.requestId,
-          details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-        })
-      }
+      if (!parsed.success) return v1ValidationError(ctx, parsed.error)
       bodyReversalDate = parsed.data.reversal_date
       bodyAllowDeepChain = parsed.data.allow_deep_chain === true
     }
diff --git a/app/api/v1/companies/[companyId]/journal-entries/batch-create/route.ts b/app/api/v1/companies/[companyId]/journal-entries/batch-create/route.ts
index f851f29e..6a2567b3 100644
--- a/app/api/v1/companies/[companyId]/journal-entries/batch-create/route.ts
+++ b/app/api/v1/companies/[companyId]/journal-entries/batch-create/route.ts
@@ -19,7 +19,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { ownsFiscalPeriod } from '@/lib/api/v1/owns-fiscal-period'
 import { CreateJournalEntrySchema } from '@/lib/api/schemas'
 import { createDraftEntry } from '@/lib/bookkeeping/engine'
@@ -158,22 +159,11 @@ async function createOne(
 export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'journal-entries.batch-create',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = BulkRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     if (body.all_or_nothing) {
diff --git a/app/api/v1/companies/[companyId]/journal-entries/route.ts b/app/api/v1/companies/[companyId]/journal-entries/route.ts
index 027932fd..d2e45279 100644
--- a/app/api/v1/companies/[companyId]/journal-entries/route.ts
+++ b/app/api/v1/companies/[companyId]/journal-entries/route.ts
@@ -23,7 +23,8 @@ import {
 } from '@/lib/api/v1/pagination'
 import { registerEndpoint, listEnvelope, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { checkPeriodLock } from '@/lib/api/v1/check-period-lock'
 import { ownsFiscalPeriod } from '@/lib/api/v1/owns-fiscal-period'
 import { CreateJournalEntrySchema } from '@/lib/api/schemas'
@@ -135,12 +136,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       date_from: url.searchParams.get('date_from') ?? undefined,
       date_to: url.searchParams.get('date_to') ?? undefined,
     })
-    if (!fr.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { issues: fr.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-      })
-    }
+    if (!fr.success) return v1ValidationError(ctx, fr.error)
     const filters = fr.data
 
     // Sort by (created_at DESC, id ASC). created_at is the stable cursor
@@ -267,23 +263,12 @@ registerEndpoint({
 export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'journal-entries.create-draft',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = CreateJournalEntrySchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const input = parsed.data
 
     // Ownership pre-check: the caller-supplied fiscal_period_id must belong
diff --git a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/items/[itemId]/ignore/route.ts b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/items/[itemId]/ignore/route.ts
index 757feb23..9b818ec1 100644
--- a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/items/[itemId]/ignore/route.ts
+++ b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/items/[itemId]/ignore/route.ts
@@ -10,7 +10,7 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { AccountKeySchema } from '@/lib/reconciliation/schemas'
 import { setItemIgnored } from '@/lib/reconciliation/actions'
 
@@ -69,14 +69,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; accountKey:
       })
     }
     const parsed = IgnoreRequest.safeParse(body)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const ignored = parsed.data.ignored ?? true
     try {
       if (ctx.dryRun) {
diff --git a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/items/route.ts b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/items/route.ts
index 354437c8..fde16873 100644
--- a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/items/route.ts
+++ b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/items/route.ts
@@ -8,7 +8,7 @@ import { z } from 'zod'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import {
   AccountKeySchema,
   ReconciliationItemBucketSchema,
@@ -127,14 +127,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string; accountKey:
       limit: url.searchParams.get('limit') ?? undefined,
       cursor: url.searchParams.get('cursor') ?? undefined,
     })
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const offset = decodeOffsetCursor(parsed.data.cursor)
     if (offset === null) {
       return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
diff --git a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/links/route.ts b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/links/route.ts
index dc9d15b1..c497f788 100644
--- a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/links/route.ts
+++ b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/links/route.ts
@@ -11,29 +11,17 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
-import { AccountKeySchema } from '@/lib/reconciliation/schemas'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
+import {
+  AccountKeySchema,
+  ReconciliationPairSchema as PairSchema,
+  reconciliationLinksBodyFields,
+  reconciliationLinksBodyRefinement,
+} from '@/lib/reconciliation/schemas'
 import { matchPairs } from '@/lib/reconciliation/actions'
 
-const PairSchema = z.object({
-  external_ids: z.array(z.string().uuid()).min(1).max(50),
-  journal_entry_ids: z.array(z.string().uuid()).min(1).max(50),
-  allocations: z
-    .array(z.object({ journal_entry_id: z.string().uuid(), amount: z.number() }))
-    .min(2)
-    .max(50)
-    .optional(),
-})
-
-const LinksRequest = z
-  .object({
-    pairs: z.array(PairSchema).max(200).optional(),
-    use_proposals: z.boolean().optional(),
-    confidence_threshold: z.number().min(0).max(1).optional(),
-  })
-  .refine((b) => (b.pairs && b.pairs.length > 0) || b.use_proposals === true, {
-    message: 'Ange pairs eller use_proposals: true.',
-  })
+const LinksRequest = z.object(reconciliationLinksBodyFields).refine(...reconciliationLinksBodyRefinement)
 
 const LinksResponse = z.object({
   dry_run: z.boolean(),
@@ -111,24 +99,11 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; accountKey:
         details: { field: 'accountKey', message: 'Okänt konto.' },
       })
     }
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = LinksRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     try {
       const result = await matchPairs(
         ctx.supabase,
diff --git a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/residual/route.ts b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/residual/route.ts
index c1588d1c..c05c9045 100644
--- a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/residual/route.ts
+++ b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/residual/route.ts
@@ -12,7 +12,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { AccountKeySchema } from '@/lib/reconciliation/schemas'
 import { bookResidualAndLink, ReconciliationResidualError, RESIDUAL_MAX_AMOUNT } from '@/lib/reconciliation/residual'
 import { getErrorMessage } from '@/lib/errors/get-error-message'
@@ -101,22 +102,11 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; accountKey:
         details: { field: 'accountKey', message: 'Okänt konto.' },
       })
     }
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = ResidualRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     try {
       const result = await bookResidualAndLink(ctx.supabase, ctx.companyId!, ctx.userId, accountKey, parsed.data, {
         dryRun: ctx.dryRun,
diff --git a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/route.ts b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/route.ts
index 8fe8a8ed..803eae85 100644
--- a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/route.ts
+++ b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/route.ts
@@ -8,7 +8,7 @@ import { z } from 'zod'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { ISO_DATE_RE } from '@/lib/invariants'
 import { AccountKeySchema, ReconciliationStatusSchema } from '@/lib/reconciliation/schemas'
 import { getAccountStatus } from '@/lib/reconciliation/service'
@@ -87,14 +87,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string; accountKey:
       date_from: url.searchParams.get('date_from') ?? undefined,
       date_to: url.searchParams.get('date_to') ?? undefined,
     })
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     try {
       const status = await getAccountStatus(ctx.supabase, ctx.companyId!, accountKey, {
         windowFrom: parsed.data.date_from ?? null,
diff --git a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/signoff/[signoffId]/reopen/route.ts b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/signoff/[signoffId]/reopen/route.ts
index 98353965..65350855 100644
--- a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/signoff/[signoffId]/reopen/route.ts
+++ b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/signoff/[signoffId]/reopen/route.ts
@@ -9,7 +9,7 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { AccountKeySchema, ReconciliationSignoffSchema } from '@/lib/reconciliation/schemas'
 import { ReconciliationSignoffError, reopenSignoff } from '@/lib/reconciliation/signoff'
 import { getErrorMessage } from '@/lib/errors/get-error-message'
@@ -82,14 +82,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; accountKey:
       })
     }
     const parsed = ReopenRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     try {
       if (ctx.dryRun) {
         return dryRunPreview(
diff --git a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/signoff/route.ts b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/signoff/route.ts
index 41758cb7..0c3e1be5 100644
--- a/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/signoff/route.ts
+++ b/app/api/v1/companies/[companyId]/reconciliation/accounts/[accountKey]/signoff/route.ts
@@ -13,7 +13,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { AccountKeySchema, ReconciliationSignoffSchema } from '@/lib/reconciliation/schemas'
 import { listSignoffs } from '@/lib/reconciliation/signoff-store'
 import { ReconciliationSignoffError, signOffAccount } from '@/lib/reconciliation/signoff'
@@ -146,24 +147,11 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; accountKey:
         details: { field: 'accountKey', message: 'Okänt konto.' },
       })
     }
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = SignoffRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     try {
       const result = await signOffAccount(
         ctx.supabase,
diff --git a/app/api/v1/companies/[companyId]/reconciliation/accounts/route.ts b/app/api/v1/companies/[companyId]/reconciliation/accounts/route.ts
index 8cda76c4..3095afc7 100644
--- a/app/api/v1/companies/[companyId]/reconciliation/accounts/route.ts
+++ b/app/api/v1/companies/[companyId]/reconciliation/accounts/route.ts
@@ -11,7 +11,7 @@ import { z } from 'zod'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ValidationError } from '@/lib/api/v1/errors'
 import { ISO_DATE_RE } from '@/lib/invariants'
 import { ReconciliationAccountSchema } from '@/lib/reconciliation/schemas'
 import { listReconciliationAccounts } from '@/lib/reconciliation/service'
@@ -100,14 +100,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       date_to: url.searchParams.get('date_to') ?? undefined,
       with_status: url.searchParams.get('with_status') ?? undefined,
     })
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     try {
       const accounts = await listReconciliationAccounts(ctx.supabase, ctx.companyId!, {
         windowFrom: parsed.data.date_from,
diff --git a/app/api/v1/companies/[companyId]/reconciliation/bank/run/route.ts b/app/api/v1/companies/[companyId]/reconciliation/bank/run/route.ts
index bfacb60d..74a8ba09 100644
--- a/app/api/v1/companies/[companyId]/reconciliation/bank/run/route.ts
+++ b/app/api/v1/companies/[companyId]/reconciliation/bank/run/route.ts
@@ -14,7 +14,7 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { runReconciliation } from '@/lib/reconciliation/bank-reconciliation'
 
 const RunRequest = z
@@ -117,17 +117,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
       rawBody = {}
     }
     const parsed = RunRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // Resolve the settlement account to its cash account (currency + id) so the
diff --git a/app/api/v1/companies/[companyId]/reconciliation/bank/status/route.ts b/app/api/v1/companies/[companyId]/reconciliation/bank/status/route.ts
index f98b1e34..d11ea57f 100644
--- a/app/api/v1/companies/[companyId]/reconciliation/bank/status/route.ts
+++ b/app/api/v1/companies/[companyId]/reconciliation/bank/status/route.ts
@@ -9,7 +9,7 @@ import { z } from 'zod'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { getReconciliationStatus } from '@/lib/reconciliation/bank-reconciliation'
 
 // Mirrors ReconciliationStatus from lib/reconciliation/bank-reconciliation.ts:
@@ -110,17 +110,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       date_to: url.searchParams.get('date_to') ?? undefined,
       account_number: url.searchParams.get('account_number') ?? undefined,
     })
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
 
     const accountNumber = parsed.data.account_number ?? '1930'
     const { data: cashAccount } = await ctx.supabase
diff --git a/app/api/v1/companies/[companyId]/reports/vat-declaration/route.ts b/app/api/v1/companies/[companyId]/reports/vat-declaration/route.ts
index ac2f58c5..de58f5dc 100644
--- a/app/api/v1/companies/[companyId]/reports/vat-declaration/route.ts
+++ b/app/api/v1/companies/[companyId]/reports/vat-declaration/route.ts
@@ -10,7 +10,7 @@ import { z } from 'zod'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ValidationError } from '@/lib/api/v1/errors'
 import { safeGenerate } from '@/lib/api/v1/report-period'
 import { calculateVatDeclaration } from '@/lib/reports/vat-declaration'
 import type { VatPeriodType } from '@/types'
@@ -112,17 +112,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       period: url.searchParams.get('period'),
       accounting_method: url.searchParams.get('accounting_method') ?? undefined,
     })
-    if (!filters.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: filters.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!filters.success) return v1ValidationError(ctx, filters.error)
     // accounting_method is still accepted (public API back-compat) but has no
     // effect: see the invariant note on calculateVatDeclaration.
     const { period_type, year, period } = filters.data
diff --git a/app/api/v1/companies/[companyId]/salary-runs/[id]/employees/[employeeId]/lines/route.ts b/app/api/v1/companies/[companyId]/salary-runs/[id]/employees/[employeeId]/lines/route.ts
index 515a0b91..b6d7c300 100644
--- a/app/api/v1/companies/[companyId]/salary-runs/[id]/employees/[employeeId]/lines/route.ts
+++ b/app/api/v1/companies/[companyId]/salary-runs/[id]/employees/[employeeId]/lines/route.ts
@@ -15,7 +15,8 @@ import { created } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { CreateSalaryLineItemSchema } from '@/lib/api/schemas'
 import { createPayslipLine } from '@/lib/salary/payslip-lines'
 
@@ -97,28 +98,12 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string;
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = CreateLineBody.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
 
     const result = await createPayslipLine(ctx.supabase, {
       companyId: ctx.companyId!,
diff --git a/app/api/v1/companies/[companyId]/salary-runs/[id]/employees/route.ts b/app/api/v1/companies/[companyId]/salary-runs/[id]/employees/route.ts
index dc4d29ee..a4f4c92a 100644
--- a/app/api/v1/companies/[companyId]/salary-runs/[id]/employees/route.ts
+++ b/app/api/v1/companies/[companyId]/salary-runs/[id]/employees/route.ts
@@ -24,7 +24,8 @@ import {
 } from '@/lib/api/v1/pagination'
 import { registerEndpoint, listEnvelope, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { maskPersonnummer } from '@/lib/api/v1/mask-personnummer'
 import { decryptPersonnummer } from '@/lib/salary/personnummer'
 import { AddEmployeeToRunSchema } from '@/lib/api/schemas'
@@ -300,28 +301,12 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = AddEmployeeToRunSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
 
     const result = await addEmployeeToRun(ctx.supabase, {
       companyId: ctx.companyId!,
diff --git a/app/api/v1/companies/[companyId]/salary-runs/[id]/lines/[lineId]/route.ts b/app/api/v1/companies/[companyId]/salary-runs/[id]/lines/[lineId]/route.ts
index 03f1f59b..cd175a35 100644
--- a/app/api/v1/companies/[companyId]/salary-runs/[id]/lines/[lineId]/route.ts
+++ b/app/api/v1/companies/[companyId]/salary-runs/[id]/lines/[lineId]/route.ts
@@ -15,7 +15,8 @@ import { ok, noContent } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope, NoBodyResponse } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { UpdateSalaryLineItemSchema } from '@/lib/api/schemas'
 import { updatePayslipLine, deletePayslipLine } from '@/lib/salary/payslip-lines'
 
@@ -100,28 +101,12 @@ export const PATCH = withApiV1<{ params: Promise<{ companyId: string; id: string
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = UpdateSalaryLineItemSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
 
     // Zod .default() materializes flags the caller never sent; strip anything
     // not explicitly present so a PATCH can't silently reset flags. (Same
diff --git a/app/api/v1/companies/[companyId]/salary-runs/[id]/route.ts b/app/api/v1/companies/[companyId]/salary-runs/[id]/route.ts
index 951a0c68..61ad713b 100644
--- a/app/api/v1/companies/[companyId]/salary-runs/[id]/route.ts
+++ b/app/api/v1/companies/[companyId]/salary-runs/[id]/route.ts
@@ -16,7 +16,8 @@ import { ok, noContent } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope, NoBodyResponse } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 
 // Inline; the project's shared isoDate is not exported from lib/api/schemas.
 const isoDate = z.string().regex(/^\d{4}-\d{2}-\d{2}$/, 'Expected YYYY-MM-DD date format')
@@ -177,15 +178,9 @@ export const PATCH = withApiV1<{ params: Promise<{ companyId: string; id: string
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     // OWASP V4.5: require a plain JSON object. Zod would catch a non-object
     // body downstream, but the rawKeys filter below uses Object.keys on
@@ -199,17 +194,7 @@ export const PATCH = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
 
     const parsed = UpdateSalaryRunSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     const { data: existing, error: fetchErr } = await ctx.supabase
diff --git a/app/api/v1/companies/[companyId]/salary-runs/route.ts b/app/api/v1/companies/[companyId]/salary-runs/route.ts
index 6498b5a7..7932762c 100644
--- a/app/api/v1/companies/[companyId]/salary-runs/route.ts
+++ b/app/api/v1/companies/[companyId]/salary-runs/route.ts
@@ -22,7 +22,8 @@ import {
 } from '@/lib/api/v1/pagination'
 import { registerEndpoint, listEnvelope, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { CreateSalaryRunSchema } from '@/lib/api/schemas'
 import { eventBus } from '@/lib/events'
 
@@ -112,17 +113,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       period_year: url.searchParams.get('period_year') ?? undefined,
       status: url.searchParams.get('status') ?? undefined,
     })
-    if (!filtersResult.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: filtersResult.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!filtersResult.success) return v1ValidationError(ctx, filtersResult.error)
     const filters = filtersResult.data
 
     let query = ctx.supabase
@@ -235,28 +226,12 @@ registerEndpoint({
 export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'salary-runs.create',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = CreateSalaryRunSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     if (ctx.dryRun) {
diff --git a/app/api/v1/companies/[companyId]/salary/vacation-year-close/route.ts b/app/api/v1/companies/[companyId]/salary/vacation-year-close/route.ts
index 752957a3..544f3b26 100644
--- a/app/api/v1/companies/[companyId]/salary/vacation-year-close/route.ts
+++ b/app/api/v1/companies/[companyId]/salary/vacation-year-close/route.ts
@@ -14,7 +14,7 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import {
   commitVacationYearClose,
   previewVacationYearClose,
@@ -91,17 +91,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
     }
 
     const parsed = CloseBody.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
 
     let yearStart = parsed.data.vacation_year_start
     if (!yearStart) {
diff --git a/app/api/v1/companies/[companyId]/settings/route.ts b/app/api/v1/companies/[companyId]/settings/route.ts
index 072d5912..ad6803f6 100644
--- a/app/api/v1/companies/[companyId]/settings/route.ts
+++ b/app/api/v1/companies/[companyId]/settings/route.ts
@@ -27,6 +27,7 @@ import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
 import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { InvoiceEmailTextsSchema, UpdateSettingsSchema } from '@/lib/api/schemas'
 import { UpdateCompanySettingsParamsSchema } from '@/lib/pending-operations/schemas/company-settings'
 
@@ -195,15 +196,9 @@ registerEndpoint({
 export const PATCH = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'companies.settings.update',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     if (rawBody === null || typeof rawBody !== 'object' || Array.isArray(rawBody)) {
       return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
diff --git a/app/api/v1/companies/[companyId]/skatteverket/vat-declarations/route.ts b/app/api/v1/companies/[companyId]/skatteverket/vat-declarations/route.ts
index b4827bbc..b4ced3df 100644
--- a/app/api/v1/companies/[companyId]/skatteverket/vat-declarations/route.ts
+++ b/app/api/v1/companies/[companyId]/skatteverket/vat-declarations/route.ts
@@ -19,7 +19,7 @@ import type { SkatteverketReadServices } from '@/lib/skatteverket/declaration-st
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 
 ensureInitialized()
 
@@ -108,17 +108,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       period: url.searchParams.get('period') ?? undefined,
       state: url.searchParams.get('state') ?? undefined,
     })
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
 
     // The skatteverket extension is opt-in (extensions.config.json) and the
     // registry is the runtime source of truth: absent registration means the
diff --git a/app/api/v1/companies/[companyId]/supplier-invoices/[id]/mark-paid/route.ts b/app/api/v1/companies/[companyId]/supplier-invoices/[id]/mark-paid/route.ts
index 5b02112d..b6f634ca 100644
--- a/app/api/v1/companies/[companyId]/supplier-invoices/[id]/mark-paid/route.ts
+++ b/app/api/v1/companies/[companyId]/supplier-invoices/[id]/mark-paid/route.ts
@@ -19,7 +19,7 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
 import { checkPeriodLock } from '@/lib/api/v1/check-period-lock'
 import { MarkSupplierInvoicePaidSchema } from '@/lib/api/schemas'
 import {
@@ -127,17 +127,7 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
       | undefined
     if (rawBody) {
       const parsed = MarkSupplierInvoicePaidSchema.safeParse(rawBody)
-      if (!parsed.success) {
-        return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-          requestId: ctx.requestId,
-          details: {
-            issues: parsed.error.issues.map((i) => ({
-              field: i.path.join('.'),
-              message: i.message,
-            })),
-          },
-        })
-      }
+      if (!parsed.success) return v1ValidationError(ctx, parsed.error)
       bodyAmount = parsed.data.amount
       bodyPaymentDate = parsed.data.payment_date
       exchangeRateDifference = parsed.data.exchange_rate_difference
diff --git a/app/api/v1/companies/[companyId]/supplier-invoices/[id]/route.ts b/app/api/v1/companies/[companyId]/supplier-invoices/[id]/route.ts
index 3b1ed5b6..e0ab4bd9 100644
--- a/app/api/v1/companies/[companyId]/supplier-invoices/[id]/route.ts
+++ b/app/api/v1/companies/[companyId]/supplier-invoices/[id]/route.ts
@@ -18,7 +18,8 @@ import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { parseExpand } from '@/lib/api/v1/expand'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { UpdateSupplierInvoiceSchema } from '@/lib/api/schemas'
 import {
   findChangedVerifikatFields,
@@ -218,28 +219,12 @@ export const PATCH = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     const invoiceId = idParse.data
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = V1PatchSupplierInvoiceSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     const updateData: Record<string, unknown> = {}
diff --git a/app/api/v1/companies/[companyId]/supplier-invoices/route.ts b/app/api/v1/companies/[companyId]/supplier-invoices/route.ts
index 6236cfbb..a8523d4e 100644
--- a/app/api/v1/companies/[companyId]/supplier-invoices/route.ts
+++ b/app/api/v1/companies/[companyId]/supplier-invoices/route.ts
@@ -31,7 +31,8 @@ import {
 } from '@/lib/api/v1/pagination'
 import { registerEndpoint, listEnvelope, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { checkPeriodLock } from '@/lib/api/v1/check-period-lock'
 import { CreateSupplierInvoiceSchema } from '@/lib/api/schemas'
 import {
@@ -158,17 +159,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       date_from: url.searchParams.get('date_from') ?? undefined,
       date_to: url.searchParams.get('date_to') ?? undefined,
     })
-    if (!filtersResult.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: filtersResult.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!filtersResult.success) return v1ValidationError(ctx, filtersResult.error)
     const filters = filtersResult.data
 
     // Sort by (created_at DESC, id ASC). created_at is the stable cursor
@@ -447,28 +438,12 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = CreateSupplierInvoiceSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // Särskild löneskatt (SLP): the 7533/2514 pair is only lawful on 741x
diff --git a/app/api/v1/companies/[companyId]/suppliers/[id]/route.ts b/app/api/v1/companies/[companyId]/suppliers/[id]/route.ts
index f11fe8f2..763be86e 100644
--- a/app/api/v1/companies/[companyId]/suppliers/[id]/route.ts
+++ b/app/api/v1/companies/[companyId]/suppliers/[id]/route.ts
@@ -18,7 +18,8 @@ import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { parseExpand } from '@/lib/api/v1/expand'
 import { registerEndpoint, dataEnvelope, NoBodyResponse } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { UpdateSupplierSchema } from '@/lib/api/schemas'
 
 // v1-only extension: allow PATCH to set archived_at back to null to
@@ -259,28 +260,12 @@ export const PATCH = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     const supplierId = idParse.data
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = V1PatchSupplierSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     const updateData: Record<string, unknown> = {}
diff --git a/app/api/v1/companies/[companyId]/suppliers/bulk-create/route.ts b/app/api/v1/companies/[companyId]/suppliers/bulk-create/route.ts
index 030dca89..12ff665f 100644
--- a/app/api/v1/companies/[companyId]/suppliers/bulk-create/route.ts
+++ b/app/api/v1/companies/[companyId]/suppliers/bulk-create/route.ts
@@ -19,7 +19,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { CreateSupplierSchema } from '@/lib/api/schemas'
 import { eventBus } from '@/lib/events'
 import type { Logger } from '@/lib/logger'
@@ -239,28 +240,12 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
       })
     }
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = BulkCreateRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     if (body.all_or_nothing) {
diff --git a/app/api/v1/companies/[companyId]/suppliers/route.ts b/app/api/v1/companies/[companyId]/suppliers/route.ts
index 3a74915d..8070ce17 100644
--- a/app/api/v1/companies/[companyId]/suppliers/route.ts
+++ b/app/api/v1/companies/[companyId]/suppliers/route.ts
@@ -23,7 +23,8 @@ import {
 } from '@/lib/api/v1/pagination'
 import { registerEndpoint, listEnvelope, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { CreateSupplierSchema } from '@/lib/api/schemas'
 import { eventBus } from '@/lib/events'
 import type { Supplier } from '@/types'
@@ -114,17 +115,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       search: url.searchParams.get('search') ?? undefined,
       include_archived: url.searchParams.get('include_archived') ?? undefined,
     })
-    if (!filtersResult.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: filtersResult.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!filtersResult.success) return v1ValidationError(ctx, filtersResult.error)
     const filters = filtersResult.data
     const includeArchived = filters.include_archived === 'true'
 
@@ -313,28 +304,12 @@ registerEndpoint({
 export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'suppliers.create',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = CreateSupplierSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     if (ctx.dryRun) {
diff --git a/app/api/v1/companies/[companyId]/transactions/[id]/categorize/route.ts b/app/api/v1/companies/[companyId]/transactions/[id]/categorize/route.ts
index e41c9f42..9f733b85 100644
--- a/app/api/v1/companies/[companyId]/transactions/[id]/categorize/route.ts
+++ b/app/api/v1/companies/[companyId]/transactions/[id]/categorize/route.ts
@@ -24,7 +24,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { checkPeriodLock } from '@/lib/api/v1/check-period-lock'
 import { CategorizeTransactionSchema } from '@/lib/api/schemas'
 import { buildMappingResultFromCategory } from '@/lib/bookkeeping/category-mapping'
@@ -120,27 +121,11 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     const txId = idParse.data
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = CategorizeTransactionSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
     const { is_business, category } = body
 
diff --git a/app/api/v1/companies/[companyId]/transactions/[id]/match-invoice/route.ts b/app/api/v1/companies/[companyId]/transactions/[id]/match-invoice/route.ts
index 9fa32f13..a6427c27 100644
--- a/app/api/v1/companies/[companyId]/transactions/[id]/match-invoice/route.ts
+++ b/app/api/v1/companies/[companyId]/transactions/[id]/match-invoice/route.ts
@@ -26,7 +26,8 @@ import { z } from 'zod'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { MatchInvoiceSchema } from '@/lib/api/schemas'
 import { createInvoiceCashEntry } from '@/lib/bookkeeping/invoice-entries'
 import { buildInvoicePaymentClearingLines } from '@/lib/bookkeeping/invoice-payment-lines'
@@ -114,27 +115,11 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     const txId = idParse.data
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = MatchInvoiceSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const { invoice_id, force, expected_journal_entry_id, lines: customLines } = parsed.data
     const txLog = ctx.log.child({ transactionId: txId, invoiceId: invoice_id })
 
diff --git a/app/api/v1/companies/[companyId]/transactions/[id]/match-supplier-invoice/route.ts b/app/api/v1/companies/[companyId]/transactions/[id]/match-supplier-invoice/route.ts
index 38a4f150..3c498388 100644
--- a/app/api/v1/companies/[companyId]/transactions/[id]/match-supplier-invoice/route.ts
+++ b/app/api/v1/companies/[companyId]/transactions/[id]/match-supplier-invoice/route.ts
@@ -9,7 +9,8 @@ import { z } from 'zod'
 import { ok } from '@/lib/api/v1/response'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { MatchSupplierInvoiceSchema } from '@/lib/api/schemas'
 import { cancelOrphanedPaymentEntry } from '@/lib/bookkeeping/cancel-orphaned-entry'
 import {
@@ -89,27 +90,11 @@ export const POST = withApiV1<{ params: Promise<{ companyId: string; id: string
     }
     const txId = idParse.data
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = MatchSupplierInvoiceSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const { supplier_invoice_id, lines: customLines } = parsed.data
     const txLog = ctx.log.child({ transactionId: txId, supplierInvoiceId: supplier_invoice_id })
 
diff --git a/app/api/v1/companies/[companyId]/transactions/batch-categorize/route.ts b/app/api/v1/companies/[companyId]/transactions/batch-categorize/route.ts
index 90aca06e..16eaa1b0 100644
--- a/app/api/v1/companies/[companyId]/transactions/batch-categorize/route.ts
+++ b/app/api/v1/companies/[companyId]/transactions/batch-categorize/route.ts
@@ -14,7 +14,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { checkPeriodLock } from '@/lib/api/v1/check-period-lock'
 import { CategorizeTransactionSchema } from '@/lib/api/schemas'
 import type { SupabaseClient } from '@supabase/supabase-js'
@@ -520,27 +521,11 @@ async function categorizeOne(
 export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'transactions.batch-categorize',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = BatchRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     if (body.all_or_nothing) {
diff --git a/app/api/v1/companies/[companyId]/transactions/ingest/route.ts b/app/api/v1/companies/[companyId]/transactions/ingest/route.ts
index 7b038519..26a40819 100644
--- a/app/api/v1/companies/[companyId]/transactions/ingest/route.ts
+++ b/app/api/v1/companies/[companyId]/transactions/ingest/route.ts
@@ -20,7 +20,8 @@ import { ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { ingestTransactions } from '@/lib/transactions/ingest'
 import { contentBucketKey, descriptionsBridge, normalizeImportedDescription } from '@/lib/transactions/external-id'
 import type { RawTransaction } from '@/types'
@@ -105,27 +106,11 @@ registerEndpoint({
 export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'transactions.ingest',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = IngestRequest.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     if (ctx.dryRun) {
diff --git a/app/api/v1/companies/[companyId]/transactions/route.ts b/app/api/v1/companies/[companyId]/transactions/route.ts
index e83c2dfa..823e73c2 100644
--- a/app/api/v1/companies/[companyId]/transactions/route.ts
+++ b/app/api/v1/companies/[companyId]/transactions/route.ts
@@ -15,7 +15,7 @@ import {
 } from '@/lib/api/v1/pagination'
 import { registerEndpoint, listEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ValidationError } from '@/lib/api/v1/errors'
 
 const TransactionSummary = z.object({
   id: z.string().uuid(),
@@ -115,17 +115,7 @@ export const GET = withApiV1<{ params: Promise<{ companyId: string }> }>(
       search: url.searchParams.get('search') ?? undefined,
       cash_account_id: url.searchParams.get('cash_account_id') ?? undefined,
     })
-    if (!filtersResult.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: filtersResult.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!filtersResult.success) return v1ValidationError(ctx, filtersResult.error)
     const f = filtersResult.data
 
     // Sort by (created_at DESC, id ASC). created_at is the stable cursor
diff --git a/app/api/v1/companies/[companyId]/voucher-gap-explanations/route.ts b/app/api/v1/companies/[companyId]/voucher-gap-explanations/route.ts
index 9dae67d1..f3102670 100644
--- a/app/api/v1/companies/[companyId]/voucher-gap-explanations/route.ts
+++ b/app/api/v1/companies/[companyId]/voucher-gap-explanations/route.ts
@@ -21,7 +21,8 @@ import { created } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 
 const CreateVoucherGapExplanation = z
   .object({
@@ -89,22 +90,11 @@ registerEndpoint({
 export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'voucher-gap-explanations.create',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = CreateVoucherGapExplanation.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // Ownership pre-check: the caller-supplied `fiscal_period_id` must belong
diff --git a/app/api/v1/companies/[companyId]/webhooks/[id]/route.ts b/app/api/v1/companies/[companyId]/webhooks/[id]/route.ts
index da3be5bf..d93cd3d4 100644
--- a/app/api/v1/companies/[companyId]/webhooks/[id]/route.ts
+++ b/app/api/v1/companies/[companyId]/webhooks/[id]/route.ts
@@ -21,7 +21,8 @@ import { ok, noContent } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope, NoBodyResponse } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { validateWebhookUrl } from '@/lib/webhooks/url-guard'
 
 const WEBHOOK_DETAIL_COLUMNS =
@@ -162,27 +163,11 @@ export const PATCH = withApiV1<{ params: Promise<{ companyId: string; id: string
   async (request, ctx, params) => {
     const { id } = await params.params
 
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
     const parsed = PatchWebhookSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // SSRF guard on webhook_url change: same DNS/IP-class validation as
diff --git a/app/api/v1/companies/[companyId]/webhooks/route.ts b/app/api/v1/companies/[companyId]/webhooks/route.ts
index 1965b639..fb01cd20 100644
--- a/app/api/v1/companies/[companyId]/webhooks/route.ts
+++ b/app/api/v1/companies/[companyId]/webhooks/route.ts
@@ -16,7 +16,8 @@ import { created, ok } from '@/lib/api/v1/response'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { registerEndpoint, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { generateWebhookSecret } from '@/lib/webhooks/signing'
 import { validateWebhookUrl } from '@/lib/webhooks/url-guard'
 import { API_V1_VERSION } from '@/lib/api/v1/version'
@@ -193,28 +194,12 @@ registerEndpoint({
 export const POST = withApiV1<{ params: Promise<{ companyId: string }> }>(
   'webhooks.create',
   async (request, ctx) => {
-    let rawBody: unknown
-    try {
-      rawBody = await request.json()
-    } catch {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: { field: 'body', message: 'Body is not valid JSON.' },
-      })
-    }
+    const rawBodyResult = await readV1JsonBody(request, ctx)
+    if (!rawBodyResult.ok) return rawBodyResult.response
+    const rawBody = rawBodyResult.body
 
     const parsed = CreateWebhookSchema.safeParse(rawBody)
-    if (!parsed.success) {
-      return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-        requestId: ctx.requestId,
-        details: {
-          issues: parsed.error.issues.map((i) => ({
-            field: i.path.join('.'),
-            message: i.message,
-          })),
-        },
-      })
-    }
+    if (!parsed.success) return v1ValidationError(ctx, parsed.error)
     const body = parsed.data
 
     // Elevated-scope check for high-sensitivity payloads. Subscribing to
diff --git a/app/api/v1/companies/route.ts b/app/api/v1/companies/route.ts
index 2c584340..6fd05a1b 100644
--- a/app/api/v1/companies/route.ts
+++ b/app/api/v1/companies/route.ts
@@ -18,7 +18,8 @@ import {
 } from '@/lib/api/v1/pagination'
 import { registerEndpoint, listEnvelope, dataEnvelope } from '@/lib/api/v1/registry'
 import { withApiV1 } from '@/lib/api/v1/with-api-v1'
-import { v1ErrorResponse, v1ErrorResponseFromCode } from '@/lib/api/v1/errors'
+import { v1ErrorResponse, v1ErrorResponseFromCode, v1ValidationError } from '@/lib/api/v1/errors'
+import { readV1JsonBody } from '@/lib/api/v1/body'
 import { dryRunPreview } from '@/lib/api/v1/dry-run'
 import { createCompanyCore } from '@/lib/company/create-company'
 import { CompanySetupSchema, planCompanySetup } from '@/lib/company/onboarding-input'
@@ -143,23 +144,12 @@ registerEndpoint({
 })
 
 export const POST = withApiV1('companies.create', async (request, ctx) => {
-  let rawBody: unknown
-  try {
-    rawBody = await request.json()
-  } catch {
-    return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-      requestId: ctx.requestId,
-      details: { field: 'body', message: 'Body is not valid JSON.' },
-    })
-  }
+  const rawBodyResult = await readV1JsonBody(request, ctx)
+  if (!rawBodyResult.ok) return rawBodyResult.response
+  const rawBody = rawBodyResult.body
 
   const parsed = CompanySetupSchema.safeParse(rawBody)
-  if (!parsed.success) {
-    return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
-      requestId: ctx.requestId,
-      details: { issues: parsed.error.issues.map((i) => ({ field: i.path.join('.'), message: i.message })) },
-    })
-  }
+  if (!parsed.success) return v1ValidationError(ctx, parsed.error)
   const setup = parsed.data
 
   const plan = planCompanySetup(setup)
diff --git a/components/agent-knowledge/LedgerGraph.tsx b/components/agent-knowledge/LedgerGraph.tsx
index 5600478a..7927eaca 100644
--- a/components/agent-knowledge/LedgerGraph.tsx
+++ b/components/agent-knowledge/LedgerGraph.tsx
@@ -6,7 +6,7 @@ import { RotateCw } from 'lucide-react'
 import { getAccountDescription } from '@/lib/bookkeeping/account-descriptions'
 import { useBasReference } from '@/lib/bookkeeping/use-bas-reference'
 import { useTranslations } from 'next-intl'
-import { formatCurrency } from '@/lib/utils'
+import { formatAmount, formatCurrency } from '@/lib/utils'
 import type { DeepEntity, DeepLedgerContext } from '@/lib/agent-context/ledger-deep'
 import { entityMagnitude, selectAccountRing, type RingBasis } from './ledger-graph-magnitude'
 
@@ -751,7 +751,7 @@ function DetailCard({ p, t }: { p: Payee; t: ReturnType<typeof useTranslations>
         <div className="flex justify-between gap-3">
           <span>{t('card_amount')}</span>
           <span className="tabular-nums" style={{ color: PAPER }}>
-            {e.total_amount.toLocaleString('sv-SE', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
+            {formatAmount(e.total_amount)}
           </span>
         </div>
         <div className="mt-2 border-t pt-2" style={{ borderColor: HAIR }}>
diff --git a/components/bookkeeping/ChartOfAccounts.tsx b/components/bookkeeping/ChartOfAccounts.tsx
deleted file mode 100644
index 732ea57f..00000000
--- a/components/bookkeeping/ChartOfAccounts.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { createClient } from '@/lib/supabase/client'
-import { guardBrowserWrite } from '@/lib/company/tab-guard'
-import { useAccounts } from '@/lib/reference-data/hooks'
-import { invalidateReferenceData } from '@/lib/reference-data/invalidate'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { ChevronDown, ChevronRight, Search } from 'lucide-react'
-import { AccountNumber } from '@/components/ui/account-number'
-import type { BASAccount } from '@/types'
-
-const CLASS_LABELS: Record<number, string> = {
-  1: 'Tillgångar',
-  2: 'Eget kapital och skulder',
-  3: 'Intäkter',
-  4: 'Varor och material',
-  5: 'Övriga externa kostnader',
-  6: 'Övriga externa kostnader',
-  7: 'Personal och avskrivningar',
-  8: 'Finansiella poster',
-}
-
-export default function ChartOfAccounts() {
-  // Session-cached chart (lib/reference-data), shared with every picker.
-  const { accounts, isLoading: loading } = useAccounts()
-  const [expandedClasses, setExpandedClasses] = useState<Set<number>>(new Set())
-  const [searchQuery, setSearchQuery] = useState('')
-  const [editingSRU, setEditingSRU] = useState<string | null>(null)
-  const [sruValue, setSruValue] = useState('')
-
-  async function updateSRUCode(accountId: string, newSruCode: string) {
-    // Cross-tab guard (WL-09): browser-direct Supabase write, outside the
-    // patched-fetch seam. The blocking dialog is the user feedback.
-    if (!guardBrowserWrite()) return
-    const supabase = createClient()
-    const trimmed = newSruCode.trim() || null
-    await supabase
-      .from('chart_of_accounts')
-      .update({ sru_code: trimmed })
-      .eq('id', accountId)
-
-    // Refresh the shared chart so this list and every picker show the code.
-    await invalidateReferenceData('ref:accounts')
-    setEditingSRU(null)
-  }
-
-  const toggleClass = (cls: number) => {
-    const next = new Set(expandedClasses)
-    if (next.has(cls)) {
-      next.delete(cls)
-    } else {
-      next.add(cls)
-    }
-    setExpandedClasses(next)
-  }
-
-  const filteredAccounts = accounts.filter((a) => {
-    if (!searchQuery) return true
-    const q = searchQuery.toLowerCase()
-    return (
-      a.account_number.includes(q) ||
-      a.account_name.toLowerCase().includes(q)
-    )
-  })
-
-  const groupedByClass = filteredAccounts.reduce(
-    (acc, account) => {
-      const cls = account.account_class
-      if (!acc[cls]) acc[cls] = []
-      acc[cls].push(account)
-      return acc
-    },
-    {} as Record<number, BASAccount[]>
-  )
-
-  if (loading) {
-    return (
-      <Card>
-        <CardContent className="p-8 text-center text-muted-foreground">
-          Laddar kontoplan...
-        </CardContent>
-      </Card>
-    )
-  }
-
-  return (
-    <div className="space-y-4">
-      <div className="relative">
-        <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
-        <Input
-          placeholder="Sök konto (nummer eller namn)..."
-          value={searchQuery}
-          onChange={(e) => setSearchQuery(e.target.value)}
-          className="pl-9"
-        />
-      </div>
-
-      <div className="space-y-2">
-        {Object.entries(groupedByClass)
-          .sort(([a], [b]) => Number(a) - Number(b))
-          .map(([cls, classAccounts]) => {
-            const classNum = Number(cls)
-            const isExpanded = expandedClasses.has(classNum) || !!searchQuery
-
-            return (
-              <Card key={cls}>
-                <button
-                  onClick={() => toggleClass(classNum)}
-                  className="w-full flex items-center justify-between p-4 hover:bg-muted/50 transition-colors"
-                >
-                  <div className="flex items-center gap-3">
-                    {isExpanded ? (
-                      <ChevronDown className="h-4 w-4" />
-                    ) : (
-                      <ChevronRight className="h-4 w-4" />
-                    )}
-                    <span className="font-semibold">
-                      Klass {cls}: {CLASS_LABELS[classNum] || ''}
-                    </span>
-                    <span className="text-sm text-muted-foreground">{classAccounts.length} konton</span>
-                  </div>
-                </button>
-
-                {isExpanded && (
-                  <CardContent className="pt-0 pb-4">
-                    <table className="w-full text-sm">
-                      <thead className="[&_th]:font-medium [&_th]:text-[11px] [&_th]:uppercase [&_th]:tracking-wider [&_th]:text-muted-foreground">
-                        <tr className="border-b text-left">
-                          <th className="py-2 w-24">Konto</th>
-                          <th className="py-2">Namn</th>
-                          <th className="py-2 w-20 text-center">SRU</th>
-                          <th className="py-2 w-24 text-center">Typ</th>
-                          <th className="py-2 w-24 text-center">Normal</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        {classAccounts.map((account) => (
-                          <tr
-                            key={account.id}
-                            className={`border-b last:border-0 ${
-                              !account.is_active ? 'opacity-50' : ''
-                            }`}
-                          >
-                            <td className="py-2"><AccountNumber number={account.account_number} name={account.account_name} /></td>
-                            <td className="py-2">{account.account_name}</td>
-                            <td className="py-2 text-center">
-                              {editingSRU === account.id ? (
-                                <Input
-                                  value={sruValue}
-                                  onChange={(e) => setSruValue(e.target.value)}
-                                  onBlur={() => updateSRUCode(account.id, sruValue)}
-                                  onKeyDown={(e) => {
-                                    if (e.key === 'Enter') updateSRUCode(account.id, sruValue)
-                                    if (e.key === 'Escape') setEditingSRU(null)
-                                  }}
-                                  className="h-7 w-16 text-xs text-center px-1"
-                                  autoFocus
-                                />
-                              ) : (
-                                <button
-                                  className="text-xs font-mono text-muted-foreground hover:text-foreground cursor-pointer min-w-[2rem]"
-                                  onClick={(e) => {
-                                    e.stopPropagation()
-                                    setEditingSRU(account.id)
-                                    setSruValue(account.sru_code || '')
-                                  }}
-                                >
-                                  {account.sru_code || '-'}
-                                </button>
-                              )}
-                            </td>
-                            <td className="py-2 text-center text-xs text-muted-foreground">
-                              {account.account_type === 'asset'
-                                ? 'Tillgång'
-                                : account.account_type === 'liability'
-                                  ? 'Skuld'
-                                  : account.account_type === 'equity'
-                                    ? 'EK'
-                                    : account.account_type === 'revenue'
-                                      ? 'Intäkt'
-                                      : 'Kostnad'}
-                            </td>
-                            <td className="py-2 text-center text-xs text-muted-foreground">
-                              {account.normal_balance === 'debit' ? 'Debet' : 'Kredit'}
-                            </td>
-                          </tr>
-                        ))}
-                      </tbody>
-                    </table>
-                  </CardContent>
-                )}
-              </Card>
-            )
-          })}
-      </div>
-    </div>
-  )
-}
diff --git a/components/bookkeeping/DocumentViewButton.tsx b/components/bookkeeping/DocumentViewButton.tsx
index dfb77715..5469c17e 100644
--- a/components/bookkeeping/DocumentViewButton.tsx
+++ b/components/bookkeeping/DocumentViewButton.tsx
@@ -1,5 +1,6 @@
 'use client'
 
+import { UUID_RE } from '@/lib/invariants/uuid'
 import { Eye } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { useToast } from '@/components/ui/use-toast'
@@ -11,7 +12,6 @@ interface DocumentViewButtonProps {
   className?: string
 }
 
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
 
 /**
  * Opens a document in the browser through the same-origin inline proxy
diff --git a/components/bookkeeping/FiscalPeriodDateFields.tsx b/components/bookkeeping/FiscalPeriodDateFields.tsx
index 3a25a75c..7e5f0d6f 100644
--- a/components/bookkeeping/FiscalPeriodDateFields.tsx
+++ b/components/bookkeeping/FiscalPeriodDateFields.tsx
@@ -1,9 +1,5 @@
 'use client'
 
-import { useMemo, type ReactNode } from 'react'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import { CalendarDays } from 'lucide-react'
 import {
   monthsBetween,
   parseDateParts,
@@ -11,16 +7,6 @@ import {
 } from '@/lib/bookkeeping/validate-period-duration'
 import type { EntityType } from '@/types'
 
-const monthNames = [
-  'januari', 'februari', 'mars', 'april', 'maj', 'juni',
-  'juli', 'augusti', 'september', 'oktober', 'november', 'december',
-]
-
-function formatSwedishDate(dateStr: string): string {
-  const { year, month, day } = parseDateParts(dateStr)
-  return `${day} ${monthNames[month - 1]} ${year}`
-}
-
 function endsOnDec31(end: string): boolean {
   const e = parseDateParts(end)
   return e.month === 12 && e.day === 31
@@ -47,8 +33,8 @@ export interface FiscalPeriodValidation {
 }
 
 /**
- * Shared validation for the first fiscal period: used by both onboarding Step 3
- * and the settings FiscalPeriodEditor. Returns Swedish error copy.
+ * Validation for the first fiscal period, used by the settings
+ * FiscalPeriodEditor. Returns Swedish error copy.
  */
 export function validateFirstPeriod(
   startDate: string,
@@ -89,91 +75,3 @@ export function validateFirstPeriod(
     canSummarise: true,
   }
 }
-
-interface FiscalPeriodDateFieldsProps {
-  startDate: string
-  onStartDateChange: (value: string) => void
-  startHelpText?: string
-  /**
-   * Render the end-date control. Onboarding passes its AB end-month <Select>
-   * + computed-option <Select>; settings passes a native <input type="date">.
-   */
-  endDateSlot: ReactNode
-  /** The raw end-date string (used for summary + validation). */
-  endDate: string
-  entityType: EntityType | undefined
-  /** Label for the summary card. Defaults to "Ditt första räkenskapsår". */
-  summaryTitle?: string
-  /** Optional override for start date <Label> content. */
-  startLabel?: ReactNode
-}
-
-/**
- * Shared first-fiscal-period date entry: day-level start (native date input),
- * caller-provided end-date control, and a Swedish summary card with inline
- * validation errors (max 18 months, EF calendar-year rule, last-day-of-month).
- *
- * Used by onboarding Step 3 and the settings FiscalPeriodEditor so the two
- * screens stay in lockstep.
- */
-export function FiscalPeriodDateFields({
-  startDate,
-  onStartDateChange,
-  startHelpText = 'Första räkenskapsåret kan börja valfri dag.',
-  endDateSlot,
-  endDate,
-  entityType,
-  summaryTitle = 'Ditt första räkenskapsår',
-  startLabel = 'Startdatum',
-}: FiscalPeriodDateFieldsProps) {
-  const validation = useMemo(
-    () => validateFirstPeriod(startDate, endDate, entityType),
-    [startDate, endDate, entityType],
-  )
-
-  return (
-    <div className="space-y-4">
-      <div className="space-y-2">
-        <Label htmlFor="fiscal-period-start">{startLabel}</Label>
-        <Input
-          id="fiscal-period-start"
-          type="date"
-          value={startDate}
-          onChange={(e) => onStartDateChange(e.target.value)}
-        />
-        <p className="text-xs text-muted-foreground">{startHelpText}</p>
-      </div>
-
-      {endDateSlot}
-
-      {validation.canSummarise && (
-        <div className="rounded-lg border border-primary/20 bg-primary/5 p-4 space-y-1">
-          <div className="flex items-center gap-2 text-sm font-medium">
-            <CalendarDays className="h-4 w-4 text-primary" />
-            {summaryTitle}
-          </div>
-          {startDate && endDate && (
-            <p className="text-sm text-muted-foreground">
-              {formatSwedishDate(startDate)}: {formatSwedishDate(endDate)}
-            </p>
-          )}
-          {validation.months !== null && (
-            <p
-              className={`text-xs ${validation.error ? 'text-destructive' : 'text-muted-foreground'}`}
-            >
-              {validation.months} månader
-              {validation.error ? `: ${validation.error}` : ''}
-            </p>
-          )}
-          {validation.error && validation.months === null && (
-            <p className="text-xs text-destructive">{validation.error}</p>
-          )}
-        </div>
-      )}
-
-      {validation.error && !validation.canSummarise && (
-        <p className="text-xs text-destructive">{validation.error}</p>
-      )}
-    </div>
-  )
-}
diff --git a/components/bookkeeping/JournalEntryReviewContent.tsx b/components/bookkeeping/JournalEntryReviewContent.tsx
index efcc13f8..3d1b99fc 100644
--- a/components/bookkeeping/JournalEntryReviewContent.tsx
+++ b/components/bookkeeping/JournalEntryReviewContent.tsx
@@ -3,7 +3,7 @@
 import { Badge } from '@/components/ui/badge'
 import { AccountNumber } from '@/components/ui/account-number'
 import { CheckCircle2, Paperclip } from 'lucide-react'
-import { formatDate } from '@/lib/utils'
+import { formatAmount, formatDate } from '@/lib/utils'
 
 interface ReviewLine {
   account_number: string
@@ -26,10 +26,6 @@ interface JournalEntryReviewContentProps {
   hideDate?: boolean
 }
 
-function formatAmount(amount: number): string {
-  return amount.toLocaleString('sv-SE', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-}
-
 export function JournalEntryReviewContent({
   periodName,
   entryDate,
diff --git a/components/bookkeeping/year-end/DepreciationPanel.tsx b/components/bookkeeping/year-end/DepreciationPanel.tsx
index 66a396de..52c82f2d 100644
--- a/components/bookkeeping/year-end/DepreciationPanel.tsx
+++ b/components/bookkeeping/year-end/DepreciationPanel.tsx
@@ -28,6 +28,10 @@ import {
 import { formatCurrency } from '@/lib/utils'
 import { useToast } from '@/components/ui/use-toast'
 import type { Asset } from '@/types'
+import type {
+  TaxDepreciationMethod as TaxMethod,
+  TaxDepreciationRule as TaxRule,
+} from '@/lib/bokslut/assets/tax-depreciation'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
 
 interface ProposalItem {
@@ -45,9 +49,6 @@ interface Proposal {
   totalAmount: number
 }
 
-type TaxMethod = 'rakenskapsenlig' | 'restvarde'
-type TaxRule = 'huvudregel_30' | 'kompletteringsregel_20'
-
 interface TaxAlternative {
   rule: TaxRule | 'restvarde_25'
   rate: number | null
diff --git a/components/common/CashAccountSelector.tsx b/components/common/CashAccountSelector.tsx
deleted file mode 100644
index ca4953d6..00000000
--- a/components/common/CashAccountSelector.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-'use client'
-
-import { useEffect, useRef } from 'react'
-import { useCashAccounts } from '@/lib/reference-data/hooks'
-import { Label } from '@/components/ui/label'
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select'
-import { useCompany } from '@/contexts/CompanyContext'
-
-const STORAGE_KEY_PREFIX = 'Accounted:cash-account:'
-
-interface Props {
-  /**
-   * Current selection: a BAS ledger account number ('1930', '1932', …).
-   * `null` would only be meaningful if "all accounts" were an option, which
-   * isn't currently supported (reconciliation is always single-account).
-   */
-  value: string
-  onChange: (accountNumber: string) => void
-  /**
-   * Optional label above the select. Pass null to render without a label.
-   */
-  label?: string | null
-  /**
-   * Called once after the initial fetch completes so callers can suppress a
-   * skeleton until the selector is ready.
-   */
-  onReady?: () => void
-  className?: string
-}
-
-/**
- * Cash account selector for reconciliation, drift, and any UI that scopes a
- * read to a particular settlement account (1930 SEK, 1932 EUR, …).
- *
- * Loads /api/cash-accounts for the active company, persists the last selection
- * per company in sessionStorage, and renders the same Select primitive as the
- * fiscal-year picker so the UX stays consistent.
- *
- * sessionStorage (not localStorage) so the selection clears when the tab/
- * session ends. The data is a UI preference, not a credential; persisting
- * which BAS account a company uses across sessions in browser storage would
- * couple company id + financial account reference for the lifetime of the
- * browser profile (GDPR Art. 25(2) data minimisation, ISO 27001 A.8.12).
- */
-export function CashAccountSelector({
-  value,
-  onChange,
-  label = 'Konto',
-  onReady,
-  className,
-}: Props) {
-  const { company } = useCompany()
-  // Session-cached and seeded by the dashboard layout (lib/reference-data):
-  // on a normal visit the list is here on the first render, so the restore
-  // below runs in the first effect tick and onReady fires without a round
-  // trip. Restore once per company load, not on every background refresh.
-  const { cashAccounts: accounts, isLoading } = useCashAccounts()
-  const loaded = !isLoading
-  const restoredForRef = useRef<string | null>(null)
-
-  useEffect(() => {
-    if (!company?.id) {
-      onReady?.()
-      return
-    }
-    if (!loaded || restoredForRef.current === company.id) return
-    restoredForRef.current = company.id
-
-    // Restore last selection or pick the primary as default.
-    if (typeof window !== 'undefined') {
-      const stored = window.sessionStorage.getItem(STORAGE_KEY_PREFIX + company.id)
-      const inFetched = (ledger: string) =>
-        accounts.some(a => a.ledger_account === ledger)
-
-      if (stored && inFetched(stored)) {
-        if (stored !== value) onChange(stored)
-      } else {
-        const primary = accounts.find(a => a.is_primary)
-        const fallback = primary ?? accounts[0]
-        if (fallback && fallback.ledger_account !== value) {
-          onChange(fallback.ledger_account)
-        }
-      }
-    }
-
-    onReady?.()
-  // onReady/onChange are lifecycle callbacks: fire once per load, not on
-  // parent re-renders that re-create them. `value` is read once at restore.
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [company?.id, loaded, accounts])
-
-  const handleChange = (next: string) => {
-    if (company?.id && typeof window !== 'undefined') {
-      window.sessionStorage.setItem(STORAGE_KEY_PREFIX + company.id, next)
-    }
-    onChange(next)
-  }
-
-  // Fallback when the table is empty (fresh company, no PSD2 connections yet):
-  // show a single hardcoded '1930' option so the rest of the UI still works.
-  const options = accounts.length > 0
-    ? accounts.map(a => ({
-        value: a.ledger_account,
-        label: `${a.ledger_account} ${a.name ?? a.iban ?? a.currency}`,
-      }))
-    : [{ value: '1930', label: '1930 Bankkonto' }]
-
-  return (
-    <div className={className}>
-      {label && <Label>{label}</Label>}
-      <div className={`flex items-center gap-2 ${label ? 'mt-1' : ''}`}>
-        <Select
-          value={value}
-          onValueChange={handleChange}
-          disabled={!loaded && accounts.length === 0}
-        >
-          <SelectTrigger className="w-full sm:w-[280px]">
-            <SelectValue placeholder={loaded ? 'Välj konto' : 'Laddar…'} />
-          </SelectTrigger>
-          <SelectContent>
-            {options.map(o => (
-              <SelectItem key={o.value} value={o.value}>
-                {o.label}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-      </div>
-    </div>
-  )
-}
diff --git a/components/common/DataState.tsx b/components/common/DataState.tsx
deleted file mode 100644
index 1bd2487f..00000000
--- a/components/common/DataState.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-'use client'
-
-import * as React from 'react'
-import { AlertCircle } from 'lucide-react'
-import { useTranslations } from 'next-intl'
-import { Button } from '@/components/ui/button'
-import { Skeleton } from '@/components/ui/skeleton'
-import { cn } from '@/lib/utils'
-
-interface DataStateProps {
-  loading: boolean
-  error: string | null
-  /** When true (and not loading/error), render `empty` instead of `children`. */
-  isEmpty?: boolean
-  /** Retry handler: typically `useFetch().refetch`. Shows a retry button. */
-  onRetry?: () => void
-  /** Loading placeholder. Defaults to three skeleton rows. */
-  skeleton?: React.ReactNode
-  /** Shown when `isEmpty`. Pass an `EmptyState` / preset (e.g. `<EmptyInvoices />`). */
-  empty?: React.ReactNode
-  children: React.ReactNode
-  className?: string
-}
-
-/**
- * Renders the loading / error / empty / ready states for a data-driven section,
- * so callers stop hand-rolling that branch every time.
- *
- * Pairs with `useFetch`:
- *
- * @example
- * const { data, loading, error, refetch } = useFetch<Account[]>(url, { select: b => b.data })
- * return (
- *   <DataState
- *     loading={loading}
- *     error={error}
- *     onRetry={refetch}
- *     isEmpty={!data?.length}
- *     empty={<EmptyState title={t('none_title')} description={t('none_desc')} />}
- *   >
- *     <AccountsTable accounts={data!} />
- *   </DataState>
- * )
- *
- * Loading uses the `Skeleton` primitive; empty expects an `EmptyState`; the
- * error branch uses the only chrome-permitted semantic colour (`destructive`).
- */
-export function DataState({
-  loading,
-  error,
-  isEmpty = false,
-  onRetry,
-  skeleton,
-  empty,
-  children,
-  className,
-}: DataStateProps) {
-  const t = useTranslations('common')
-
-  if (loading) {
-    return (
-      <div className={className}>
-        {skeleton ?? (
-          <div className="space-y-3" aria-busy="true" aria-live="polite">
-            <Skeleton className="h-8 w-full" />
-            <Skeleton className="h-8 w-full" />
-            <Skeleton className="h-8 w-3/4" />
-          </div>
-        )}
-      </div>
-    )
-  }
-
-  if (error) {
-    return (
-      <div
-        role="alert"
-        className={cn('flex flex-col items-center justify-center py-12 px-4 text-center', className)}
-      >
-        <AlertCircle className="h-8 w-8 text-destructive mb-3" aria-hidden="true" />
-        <p className="text-sm font-medium mb-1">{t('load_error')}</p>
-        <p className="text-sm text-muted-foreground max-w-sm mb-6 text-balance">{error}</p>
-        {onRetry && (
-          <Button variant="outline" onClick={onRetry}>
-            {t('retry')}
-          </Button>
-        )}
-      </div>
-    )
-  }
-
-  if (isEmpty) {
-    return <div className={className}>{empty}</div>
-  }
-
-  return <>{children}</>
-}
diff --git a/components/deadlines/TaxTodoWidget.tsx b/components/deadlines/TaxTodoWidget.tsx
deleted file mode 100644
index 8bd38a49..00000000
--- a/components/deadlines/TaxTodoWidget.tsx
+++ /dev/null
@@ -1,246 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import Link from 'next/link'
-import { useTranslations } from 'next-intl'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { useToast } from '@/components/ui/use-toast'
-import { Deadline, DeadlineStatus, TAX_DEADLINE_TYPE_LABELS, DEADLINE_STATUS_LABELS } from '@/types'
-import { getReportUrl } from '@/lib/tax/deadline-config'
-import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
-
-// Use the labels from types
-const STATUS_LABELS = DEADLINE_STATUS_LABELS
-import {
-  FileText,
-  ChevronRight,
-  AlertTriangle,
-  Clock,
-  Send,
-  Check,
-  Loader2,
-  ExternalLink,
-} from 'lucide-react'
-
-interface TaxTodoWidgetProps {
-  deadlines: Deadline[]
-  onStatusChange?: (deadlineId: string, newStatus: DeadlineStatus) => void
-}
-
-export function TaxTodoWidget({ deadlines, onStatusChange }: TaxTodoWidgetProps) {
-  const { toast } = useToast()
-  const t = useTranslations('tax_todo')
-  const [updatingId, setUpdatingId] = useState<string | null>(null)
-
-  // Filter to only tax deadlines needing attention
-  const taxDeadlines = deadlines.filter(
-    (d) =>
-      d.deadline_type === 'tax' &&
-      !d.is_completed &&
-      ['action_needed', 'overdue', 'in_progress'].includes(d.status)
-  )
-
-  // Sort by urgency: overdue first, then by date
-  const sortedDeadlines = taxDeadlines.sort((a, b) => {
-    if (a.status === 'overdue' && b.status !== 'overdue') return -1
-    if (b.status === 'overdue' && a.status !== 'overdue') return 1
-    return a.due_date.localeCompare(b.due_date)
-  })
-
-  const overdueCount = taxDeadlines.filter((d) => d.status === 'overdue').length
-  const actionNeededCount = taxDeadlines.filter((d) => d.status === 'action_needed').length
-
-  if (sortedDeadlines.length === 0) {
-    return null
-  }
-
-  const formatDate = (dateStr: string) => {
-    const date = new Date(dateStr)
-    const today = new Date()
-    today.setHours(0, 0, 0, 0)
-
-    const diffDays = Math.ceil(
-      (date.getTime() - today.getTime()) / (1000 * 60 * 60 * 24)
-    )
-
-    if (diffDays === 0) return t('today')
-    if (diffDays === 1) return t('tomorrow')
-    if (diffDays < 0) return t('days_ago', { count: Math.abs(diffDays) })
-    if (diffDays <= 7) return t('in_days', { count: diffDays })
-
-    return date.toLocaleDateString('sv-SE', { day: 'numeric', month: 'short' })
-  }
-
-  const handleStatusChange = async (deadlineId: string, newStatus: DeadlineStatus) => {
-    setUpdatingId(deadlineId)
-
-    try {
-      const response = await fetch(`/api/deadlines/${deadlineId}/status`, {
-        method: 'PATCH',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ status: newStatus }),
-      })
-
-      if (!response.ok) {
-        // Map the parsed body plus the status, never `new Error(data.error)`:
-        // the route answers thrown errors with the canonical envelope
-        // `{ error: { code, message } }`, and the Error constructor would
-        // stringify that object to "[object Object]", discarding the route's
-        // own Swedish reason.
-        const body = await response.json().catch(() => null)
-        toast({
-          title: getUserErrorMessage(body, { statusCode: response.status }),
-          variant: 'destructive',
-        })
-        return
-      }
-
-      toast({
-        title: t('toast_status_updated'),
-        description: t('toast_status_updated_description', { status: STATUS_LABELS[newStatus].toLowerCase() }),
-      })
-
-      onStatusChange?.(deadlineId, newStatus)
-    } catch (error) {
-      toast({
-        title: error instanceof Error ? getUserErrorMessage(error) : t('toast_status_update_failed'),
-        variant: 'destructive',
-      })
-    } finally {
-      setUpdatingId(null)
-    }
-  }
-
-  const getReportLink = (deadline: Deadline): string | null => {
-    if (!deadline.linked_report_type || !deadline.linked_report_period) {
-      return null
-    }
-
-    return getReportUrl(deadline.linked_report_type, deadline.linked_report_period)
-  }
-
-  return (
-    <Card>
-      <CardHeader className="pb-2">
-        <div className="flex items-center justify-between">
-          <CardTitle className="text-lg flex items-center gap-2">
-            <FileText className="h-5 w-5 text-attn" />
-            {t('title')}
-          </CardTitle>
-          <div className="flex gap-2">
-            {overdueCount > 0 && (
-              <Badge variant="destructive">{t('overdue_badge', { count: overdueCount })}</Badge>
-            )}
-            {actionNeededCount > 0 && (
-              <Badge variant="warning">{t('action_needed_badge', { count: actionNeededCount })}</Badge>
-            )}
-          </div>
-        </div>
-      </CardHeader>
-      <CardContent className="space-y-3">
-        {sortedDeadlines.slice(0, 5).map((deadline) => {
-          const isUpdating = updatingId === deadline.id
-          const reportLink = getReportLink(deadline)
-          const isOverdue = deadline.status === 'overdue'
-
-          return (
-            <div
-              key={deadline.id}
-              className={`p-3 rounded-lg ${isOverdue ? 'bg-destructive/5' : ''}`}
-            >
-              <div className="flex items-start justify-between gap-2">
-                <div className="flex items-start gap-2 min-w-0 flex-1">
-                  {isOverdue ? (
-                    <AlertTriangle className="h-4 w-4 text-destructive flex-shrink-0 mt-0.5" />
-                  ) : (
-                    <Clock className="h-4 w-4 text-attn flex-shrink-0 mt-0.5" />
-                  )}
-                  <div className="min-w-0 flex-1">
-                    <p className="text-sm font-medium">{deadline.title}</p>
-                    <div className="flex items-center gap-2 mt-1">
-                      <span
-                        className={`text-xs ${
-                          isOverdue ? 'text-destructive font-medium' : 'text-muted-foreground'
-                        }`}
-                      >
-                        {formatDate(deadline.due_date)}
-                      </span>
-                      {deadline.tax_deadline_type && (
-                        <span className="text-xs text-muted-foreground">
-                          · {TAX_DEADLINE_TYPE_LABELS[deadline.tax_deadline_type]}
-                        </span>
-                      )}
-                    </div>
-                  </div>
-                </div>
-
-                <div className="flex items-center gap-1 flex-shrink-0">
-                  {/* Link to report if available */}
-                  {reportLink && (
-                    <Link href={reportLink}>
-                      <Button variant="ghost" size="sm" className="h-9 px-2.5">
-                        <ExternalLink className="h-3.5 w-3.5" />
-                      </Button>
-                    </Link>
-                  )}
-
-                  {/* Mark as in progress */}
-                  {['action_needed', 'overdue'].includes(deadline.status) && (
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      className="h-9 px-3 text-xs"
-                      disabled={isUpdating}
-                      onClick={() => handleStatusChange(deadline.id, 'in_progress')}
-                    >
-                      {isUpdating ? (
-                        <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                      ) : (
-                        t('start')
-                      )}
-                    </Button>
-                  )}
-
-                  {/* Mark as submitted */}
-                  {deadline.status === 'in_progress' && (
-                    <Button
-                      variant="default"
-                      size="sm"
-                      className="h-9 px-3 text-xs gap-1"
-                      disabled={isUpdating}
-                      onClick={() => handleStatusChange(deadline.id, 'submitted')}
-                    >
-                      {isUpdating ? (
-                        <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                      ) : (
-                        <>
-                          <Send className="h-3.5 w-3.5" />
-                          {t('submitted')}
-                        </>
-                      )}
-                    </Button>
-                  )}
-                </div>
-              </div>
-            </div>
-          )
-        })}
-
-        {sortedDeadlines.length > 5 && (
-          <p className="text-xs text-muted-foreground text-center">
-            {t('more_tasks', { count: sortedDeadlines.length - 5 })}
-          </p>
-        )}
-
-        <Link href="/deadlines" className="block">
-          <Button variant="ghost" className="w-full justify-between">
-            {t('view_all')}
-            <ChevronRight className="h-4 w-4" />
-          </Button>
-        </Link>
-      </CardContent>
-    </Card>
-  )
-}
diff --git a/components/deadlines/UpcomingDeadlinesWidget.tsx b/components/deadlines/UpcomingDeadlinesWidget.tsx
deleted file mode 100644
index 5aeca46d..00000000
--- a/components/deadlines/UpcomingDeadlinesWidget.tsx
+++ /dev/null
@@ -1,222 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import Link from 'next/link'
-import { useTranslations } from 'next-intl'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { useToast } from '@/components/ui/use-toast'
-import { Deadline, DeadlineStatus } from '@/types'
-import {
-  getUpcomingDeadlines,
-  STATUS_LABELS,
-} from '@/lib/calendar/utils'
-import { Calendar, ChevronRight, AlertTriangle, Clock, Check, Send, Loader2 } from 'lucide-react'
-import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
-
-interface UpcomingDeadlinesWidgetProps {
-  deadlines: Deadline[]
-  maxItems?: number
-  onStatusChange?: (deadlineId: string, newStatus: DeadlineStatus) => void
-}
-
-export function UpcomingDeadlinesWidget({ deadlines, maxItems = 5, onStatusChange }: UpcomingDeadlinesWidgetProps) {
-  const { toast } = useToast()
-  const t = useTranslations('upcoming_deadlines')
-  const [updatingId, setUpdatingId] = useState<string | null>(null)
-
-  // Get upcoming deadlines (next 7 days) + any needing attention
-  const upcomingDeadlines = getUpcomingDeadlines(deadlines, 7)
-  const actionNeededDeadlines = deadlines.filter(
-    (d) => !d.is_completed && d.status === 'action_needed'
-  )
-  const overdueDeadlines = deadlines.filter(
-    (d) => !d.is_completed && d.status === 'overdue'
-  )
-
-  // Combine and sort (overdue first, then action_needed, then upcoming)
-  const displayDeadlines = [...overdueDeadlines, ...actionNeededDeadlines, ...upcomingDeadlines]
-    .filter((d, i, arr) => arr.findIndex((x) => x.id === d.id) === i) // Remove duplicates
-    .slice(0, maxItems)
-
-  const overdueCount = overdueDeadlines.length
-  const actionNeededCount = actionNeededDeadlines.length
-
-  if (displayDeadlines.length === 0) {
-    return null
-  }
-
-  const formatDate = (dateStr: string) => {
-    const date = new Date(dateStr)
-    const today = new Date()
-    const tomorrow = new Date(today)
-    tomorrow.setDate(tomorrow.getDate() + 1)
-
-    if (date.toDateString() === today.toDateString()) {
-      return t('today')
-    }
-    if (date.toDateString() === tomorrow.toDateString()) {
-      return t('tomorrow')
-    }
-    return date.toLocaleDateString('sv-SE', { day: 'numeric', month: 'short' })
-  }
-
-  const handleStatusChange = async (deadlineId: string, newStatus: DeadlineStatus) => {
-    setUpdatingId(deadlineId)
-
-    try {
-      const response = await fetch(`/api/deadlines/${deadlineId}/status`, {
-        method: 'PATCH',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ status: newStatus }),
-      })
-
-      if (!response.ok) {
-        // Map the parsed body plus the status, never `new Error(data.error)`:
-        // the route answers thrown errors with the canonical envelope
-        // `{ error: { code, message } }`, and the Error constructor would
-        // stringify that object to "[object Object]", discarding the route's
-        // own Swedish reason.
-        const body = await response.json().catch(() => null)
-        toast({
-          title: getUserErrorMessage(body, { statusCode: response.status }),
-          variant: 'destructive',
-        })
-        return
-      }
-
-      toast({
-        title: t('toast_status_updated'),
-        description: t('toast_status_updated_description', { status: STATUS_LABELS[newStatus].toLowerCase() }),
-      })
-
-      // Notify parent component
-      onStatusChange?.(deadlineId, newStatus)
-    } catch (error) {
-      toast({
-        title: error instanceof Error ? getUserErrorMessage(error) : t('toast_status_update_failed'),
-        variant: 'destructive',
-      })
-    } finally {
-      setUpdatingId(null)
-    }
-  }
-
-  const getStatusBadgeVariant = (status: DeadlineStatus): 'default' | 'secondary' | 'destructive' | 'warning' => {
-    switch (status) {
-      case 'overdue': return 'destructive'
-      case 'action_needed': return 'warning'
-      case 'submitted':
-      case 'confirmed': return 'default'
-      default: return 'secondary'
-    }
-  }
-
-  return (
-    <Card>
-      <CardHeader className="pb-2">
-        <div className="flex items-center justify-between">
-          <CardTitle className="text-lg flex items-center gap-2">
-            <Calendar className="h-5 w-5" />
-            {t('title')}
-          </CardTitle>
-          <div className="flex gap-2">
-            {overdueCount > 0 && (
-              <Badge variant="destructive">{t('overdue_badge', { count: overdueCount })}</Badge>
-            )}
-            {actionNeededCount > 0 && (
-              <Badge variant="warning">{t('action_needed_badge', { count: actionNeededCount })}</Badge>
-            )}
-          </div>
-        </div>
-      </CardHeader>
-      <CardContent className="space-y-2">
-        {displayDeadlines.map((deadline) => {
-          const isUpdating = updatingId === deadline.id
-
-          return (
-            <div
-              key={deadline.id}
-              className={`flex items-center justify-between p-2 rounded-lg ${
-                deadline.status === 'overdue' ? 'bg-destructive/5' : ''
-              }`}
-            >
-              <div className="flex items-center gap-2 min-w-0 flex-1">
-                {deadline.status === 'overdue' ? (
-                  <AlertTriangle className="h-4 w-4 text-destructive flex-shrink-0" />
-                ) : deadline.status === 'action_needed' ? (
-                  <Clock className="h-4 w-4 text-attn flex-shrink-0" />
-                ) : (
-                  <Clock className="h-4 w-4 text-muted-foreground flex-shrink-0" />
-                )}
-                <div className="min-w-0 flex-1">
-                  <p className="text-sm font-medium truncate">{deadline.title}</p>
-                  <p className="text-xs text-muted-foreground">
-                    {formatDate(deadline.due_date)}
-                    {deadline.due_time && ` ${t('time_prefix')} ${deadline.due_time.slice(0, 5)}`}
-                    {deadline.tax_deadline_type && (
-                      <>
-                        {' '}
-                        <span className="text-muted-foreground/30">·</span> {t('tax_badge')}
-                      </>
-                    )}
-                  </p>
-                </div>
-              </div>
-
-              <div className="flex items-center gap-2 flex-shrink-0">
-                {/* Status badge */}
-                <Badge variant={getStatusBadgeVariant(deadline.status)} className="text-xs">
-                  {STATUS_LABELS[deadline.status]}
-                </Badge>
-
-                {/* Quick action buttons for tax deadlines */}
-                {deadline.tax_deadline_type && !['submitted', 'confirmed'].includes(deadline.status) && (
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    className="h-9 px-2.5"
-                    disabled={isUpdating}
-                    onClick={() => handleStatusChange(deadline.id, 'submitted')}
-                    title={t('mark_as_submitted')}
-                  >
-                    {isUpdating ? (
-                      <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                    ) : (
-                      <Send className="h-3.5 w-3.5" />
-                    )}
-                  </Button>
-                )}
-
-                {deadline.status === 'submitted' && (
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    className="h-9 px-2.5"
-                    disabled={isUpdating}
-                    onClick={() => handleStatusChange(deadline.id, 'confirmed')}
-                    title={t('mark_as_confirmed')}
-                  >
-                    {isUpdating ? (
-                      <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                    ) : (
-                      <Check className="h-3.5 w-3.5" />
-                    )}
-                  </Button>
-                )}
-              </div>
-            </div>
-          )
-        })}
-
-        <Link href="/deadlines" className="block">
-          <Button variant="ghost" className="w-full justify-between mt-2">
-            {t('view_all')}
-            <ChevronRight className="h-4 w-4" />
-          </Button>
-        </Link>
-      </CardContent>
-    </Card>
-  )
-}
diff --git a/components/deadlines/index.ts b/components/deadlines/index.ts
deleted file mode 100644
index 7bfe3969..00000000
--- a/components/deadlines/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { DeadlineRow } from './DeadlineRow'
-export { DeadlineForm } from './DeadlineForm'
-export { DeadlineList } from './DeadlineList'
-export { UpcomingDeadlinesWidget } from './UpcomingDeadlinesWidget'
-export { TaxTodoWidget } from './TaxTodoWidget'
diff --git a/components/extensions/general/AiCategorizationWorkspace.tsx b/components/extensions/general/AiCategorizationWorkspace.tsx
deleted file mode 100644
index 073ec9b5..00000000
--- a/components/extensions/general/AiCategorizationWorkspace.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-'use client'
-
-import type { WorkspaceComponentProps } from '@/lib/extensions/workspace-registry'
-import EmptyExtensionState from '@/components/extensions/shared/EmptyExtensionState'
-import { Wand } from 'lucide-react'
-
-export default function AiCategorizationWorkspace({ userId }: WorkspaceComponentProps) {
-  return (
-    <EmptyExtensionState
-      title="Transaktionskategorisering"
-      description="Transaktioner kategoriseras automatiskt baserat på dina regler när nya synkas. Gå till Transaktioner för att se matchningar."
-      icon={<Wand className="h-12 w-12 text-muted-foreground/40 mb-4" />}
-    />
-  )
-}
diff --git a/components/extensions/general/InvoiceInboxWorkspace.tsx b/components/extensions/general/InvoiceInboxWorkspace.tsx
index be3305c9..e654c7e0 100644
--- a/components/extensions/general/InvoiceInboxWorkspace.tsx
+++ b/components/extensions/general/InvoiceInboxWorkspace.tsx
@@ -63,7 +63,7 @@ import { useCapability, useCompanyOptional } from '@/contexts/CompanyContext'
 import { CAPABILITY } from '@/lib/entitlements/keys'
 import { useBranding } from '@/lib/branding/brand-context'
 import type { WorkspaceComponentProps } from '@/lib/extensions/workspace-registry'
-import type { InboxChannelContext, InvoiceExtractionResult, InboxItemSource } from '@/types'
+import type { AccountingMethod, InboxChannelContext, InvoiceExtractionResult, InboxItemSource } from '@/types'
 import { renderChannelParticipant } from '@/lib/documents/channel-context-notes'
 import { selectInboxFields } from '@/lib/documents/inbox-field-visibility'
 import {
@@ -92,8 +92,6 @@ import {
 import { shrinkImageForUpload } from '@/lib/documents/shrink-image'
 import { uploadViaSignedUrl } from '@/lib/documents/direct-upload'
 
-type AccountingMethod = 'accrual' | 'cash'
-
 /**
  * A failure whose message is already the sentence to show the user, resolved
  * where the response was still in hand.
@@ -334,8 +332,6 @@ const EXTRACTED_FIELD_ACCESSORS: ((d: InvoiceExtractionResult) => unknown)[] = [
   (d) => d.totals?.total,
 ]
 
-export const EXTRACTED_FIELD_COUNT = EXTRACTED_FIELD_ACCESSORS.length
-
 /** How many of them the extraction actually filled in. */
 function countExtractedFields(data: InvoiceExtractionResult | null): number {
   if (!data) return 0
diff --git a/components/extensions/general/MailConnectionsPanel.tsx b/components/extensions/general/MailConnectionsPanel.tsx
index 9b5824f7..918fae6e 100644
--- a/components/extensions/general/MailConnectionsPanel.tsx
+++ b/components/extensions/general/MailConnectionsPanel.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { useTranslations } from 'next-intl'
 import { Loader2 } from 'lucide-react'
 import { Button } from '@/components/ui/button'
diff --git a/components/extensions/general/ReceiptOcrWorkspace.tsx b/components/extensions/general/ReceiptOcrWorkspace.tsx
deleted file mode 100644
index 8a9c85b0..00000000
--- a/components/extensions/general/ReceiptOcrWorkspace.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-'use client'
-
-import type { WorkspaceComponentProps } from '@/lib/extensions/workspace-registry'
-import EmptyExtensionState from '@/components/extensions/shared/EmptyExtensionState'
-import { Camera } from 'lucide-react'
-
-export default function ReceiptOcrWorkspace({ userId }: WorkspaceComponentProps) {
-  return (
-    <EmptyExtensionState
-      title="Kvittoscanning"
-      description="Ladda upp och skanna kvitton direkt från tillägets arbetsyta. Gå till Kvitton i sidomenyn för att komma igång."
-      icon={<Camera className="h-12 w-12 text-muted-foreground/40 mb-4" />}
-    />
-  )
-}
diff --git a/components/extensions/shared/ConfirmDeleteDialog.tsx b/components/extensions/shared/ConfirmDeleteDialog.tsx
deleted file mode 100644
index 50a77e3d..00000000
--- a/components/extensions/shared/ConfirmDeleteDialog.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-'use client'
-
-import {
-  Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter,
-} from '@/components/ui/dialog'
-import { Button } from '@/components/ui/button'
-import { Loader2, AlertTriangle } from 'lucide-react'
-
-interface ConfirmDeleteDialogProps {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  title?: string
-  description?: string
-  onConfirm: () => void | Promise<void>
-  isDeleting?: boolean
-}
-
-export default function ConfirmDeleteDialog({
-  open,
-  onOpenChange,
-  title = 'Bekräfta borttagning',
-  description = 'Är du säker på att du vill ta bort detta? Åtgärden kan inte ångras.',
-  onConfirm,
-  isDeleting = false,
-}: ConfirmDeleteDialogProps) {
-  const handleConfirm = async () => {
-    await onConfirm()
-    onOpenChange(false)
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-sm">
-        <DialogHeader>
-          <div className="flex items-center gap-3">
-            <div className="flex h-10 w-10 items-center justify-center rounded-full bg-destructive/10">
-              <AlertTriangle className="h-5 w-5 text-destructive" />
-            </div>
-            <div>
-              <DialogTitle>{title}</DialogTitle>
-              <DialogDescription>{description}</DialogDescription>
-            </div>
-          </div>
-        </DialogHeader>
-        <DialogFooter>
-          <Button variant="outline" onClick={() => onOpenChange(false)} disabled={isDeleting}>
-            Avbryt
-          </Button>
-          <Button variant="destructive" onClick={handleConfirm} disabled={isDeleting}>
-            {isDeleting ? (
-              <>
-                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-                Tar bort...
-              </>
-            ) : (
-              'Ta bort'
-            )}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  )
-}
diff --git a/components/extensions/shared/CsvImportWizard.tsx b/components/extensions/shared/CsvImportWizard.tsx
deleted file mode 100644
index 830e217d..00000000
--- a/components/extensions/shared/CsvImportWizard.tsx
+++ /dev/null
@@ -1,232 +0,0 @@
-'use client'
-
-import { useState, useCallback } from 'react'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Button } from '@/components/ui/button'
-import { Label } from '@/components/ui/label'
-import {
-  Select, SelectContent, SelectItem, SelectTrigger, SelectValue,
-} from '@/components/ui/select'
-import {
-  Table, TableBody, TableCell, TableHead, TableHeader, TableRow,
-} from '@/components/ui/table'
-import { Upload, FileText, Check } from 'lucide-react'
-
-interface CsvImportWizardProps {
-  targetFields: { key: string; label: string; required?: boolean }[]
-  defaultMappings?: Record<string, string>
-  onImport: (rows: Record<string, string>[]) => Promise<void>
-  className?: string
-}
-
-function parseCsv(text: string): { headers: string[]; rows: string[][] } {
-  const lines = text.split(/\r?\n/).filter(line => line.trim())
-  if (lines.length === 0) return { headers: [], rows: [] }
-
-  const separator = lines[0].includes(';') ? ';' : ','
-  const headers = lines[0].split(separator).map(h => h.trim().replace(/^"(.*)"$/, '$1'))
-  const rows = lines.slice(1).map(line =>
-    line.split(separator).map(cell => cell.trim().replace(/^"(.*)"$/, '$1'))
-  )
-  return { headers, rows }
-}
-
-export default function CsvImportWizard({
-  targetFields,
-  defaultMappings,
-  onImport,
-  className,
-}: CsvImportWizardProps) {
-  const [step, setStep] = useState<1 | 2 | 3>(1)
-  const [headers, setHeaders] = useState<string[]>([])
-  const [rows, setRows] = useState<string[][]>([])
-  const [mappings, setMappings] = useState<Record<string, string>>({})
-  const [isImporting, setIsImporting] = useState(false)
-  const [importCount, setImportCount] = useState(0)
-  const [fileName, setFileName] = useState('')
-
-  const handleFileSelect = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0]
-    if (!file) return
-    setFileName(file.name)
-
-    const reader = new FileReader()
-    reader.onload = (ev) => {
-      const text = ev.target?.result as string
-      const parsed = parseCsv(text)
-      setHeaders(parsed.headers)
-      setRows(parsed.rows)
-
-      // Auto-map using defaults
-      const autoMappings: Record<string, string> = {}
-      for (const field of targetFields) {
-        const defaultCsv = defaultMappings?.[field.key]
-        if (defaultCsv && parsed.headers.includes(defaultCsv)) {
-          autoMappings[field.key] = defaultCsv
-        } else {
-          const match = parsed.headers.find(
-            h => h.toLowerCase() === field.key.toLowerCase() ||
-                 h.toLowerCase() === field.label.toLowerCase()
-          )
-          if (match) autoMappings[field.key] = match
-        }
-      }
-      setMappings(autoMappings)
-      setStep(2)
-    }
-    reader.readAsText(file)
-  }, [targetFields, defaultMappings])
-
-  const handleImport = async () => {
-    setIsImporting(true)
-    try {
-      const mappedRows = rows.map(row => {
-        const obj: Record<string, string> = {}
-        for (const [fieldKey, csvCol] of Object.entries(mappings)) {
-          const colIdx = headers.indexOf(csvCol)
-          if (colIdx >= 0 && row[colIdx]) {
-            obj[fieldKey] = row[colIdx]
-          }
-        }
-        return obj
-      }).filter(row => Object.keys(row).length > 0)
-
-      await onImport(mappedRows)
-      setImportCount(mappedRows.length)
-      setStep(3)
-    } finally {
-      setIsImporting(false)
-    }
-  }
-
-  const reset = () => {
-    setStep(1)
-    setHeaders([])
-    setRows([])
-    setMappings({})
-    setFileName('')
-    setImportCount(0)
-  }
-
-  const requiredFieldsMapped = targetFields
-    .filter(f => f.required)
-    .every(f => mappings[f.key])
-
-  return (
-    <Card className={className}>
-      <CardHeader>
-        <CardTitle className="text-base flex items-center gap-2">
-          {step === 1 && <><Upload className="h-4 w-4" /> Steg 1: Välj fil</>}
-          {step === 2 && <><FileText className="h-4 w-4" /> Steg 2: Kolumnmappning</>}
-          {step === 3 && <><Check className="h-4 w-4" /> Import klar</>}
-        </CardTitle>
-      </CardHeader>
-      <CardContent>
-        {step === 1 && (
-          <div className="space-y-4">
-            <div className="border-2 border-dashed rounded-lg p-8 text-center">
-              <Upload className="h-8 w-8 mx-auto mb-2 text-muted-foreground" />
-              <p className="text-sm text-muted-foreground mb-3">
-                Välj en CSV-fil att importera
-              </p>
-              <Label htmlFor="csv-upload" className="cursor-pointer">
-                <Button variant="outline" size="sm" asChild>
-                  <span>Välj fil</span>
-                </Button>
-              </Label>
-              <input
-                id="csv-upload"
-                type="file"
-                accept=".csv,.txt"
-                onChange={handleFileSelect}
-                className="hidden"
-              />
-            </div>
-          </div>
-        )}
-
-        {step === 2 && (
-          <div className="space-y-4">
-            <p className="text-sm text-muted-foreground">
-              {fileName} - {rows.length} rader hittades. Mappa kolumner:
-            </p>
-            <div className="space-y-3">
-              {targetFields.map(field => (
-                <div key={field.key} className="flex items-center gap-3">
-                  <Label className="w-36 text-sm shrink-0">
-                    {field.label}{field.required && ' *'}
-                  </Label>
-                  <Select
-                    value={mappings[field.key] ?? ''}
-                    onValueChange={(val) => setMappings(prev => ({ ...prev, [field.key]: val }))}
-                  >
-                    <SelectTrigger className="w-full">
-                      <SelectValue placeholder="Välj kolumn..." />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {headers.map(h => (
-                        <SelectItem key={h} value={h}>{h}</SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </div>
-              ))}
-            </div>
-
-            {rows.length > 0 && (
-              <div className="rounded-lg border overflow-auto max-h-48">
-                <Table>
-                  <TableHeader>
-                    <TableRow>
-                      {headers.map(h => (
-                        /* data-ph-mask: CSV headers are user data */
-                        <TableHead key={h} data-ph-mask="" className="text-xs whitespace-nowrap">{h}</TableHead>
-                      ))}
-                    </TableRow>
-                  </TableHeader>
-                  <TableBody>
-                    {rows.slice(0, 5).map((row, i) => (
-                      <TableRow key={i}>
-                        {row.map((cell, j) => (
-                          <TableCell key={j} className="text-xs whitespace-nowrap">{cell}</TableCell>
-                        ))}
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                </Table>
-              </div>
-            )}
-
-            <div className="flex gap-2">
-              <Button variant="outline" size="sm" onClick={reset}>
-                Tillbaka
-              </Button>
-              <Button
-                size="sm"
-                onClick={handleImport}
-                disabled={!requiredFieldsMapped || isImporting}
-              >
-                {isImporting ? 'Importerar...' : `Importera ${rows.length} rader`}
-              </Button>
-            </div>
-          </div>
-        )}
-
-        {step === 3 && (
-          <div className="text-center py-4">
-            <div className="inline-flex items-center justify-center w-12 h-12 rounded-full bg-success/10 mb-3">
-              <Check className="h-6 w-6 text-success" />
-            </div>
-            <p className="font-medium">{importCount} rader importerades</p>
-            <p className="text-sm text-muted-foreground mt-1">
-              Från {fileName}
-            </p>
-            <Button variant="outline" size="sm" onClick={reset} className="mt-4">
-              Importera fler
-            </Button>
-          </div>
-        )}
-      </CardContent>
-    </Card>
-  )
-}
diff --git a/components/extensions/shared/DataEntryForm.tsx b/components/extensions/shared/DataEntryForm.tsx
deleted file mode 100644
index bc25cb25..00000000
--- a/components/extensions/shared/DataEntryForm.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-'use client'
-
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Button } from '@/components/ui/button'
-import { cn } from '@/lib/utils'
-
-interface DataEntryFormProps {
-  title: string
-  onSubmit: (e: React.FormEvent) => void
-  submitLabel?: string
-  isSubmitting?: boolean
-  children: React.ReactNode
-  className?: string
-}
-
-export default function DataEntryForm({
-  title,
-  onSubmit,
-  submitLabel = 'Spara',
-  isSubmitting = false,
-  children,
-  className,
-}: DataEntryFormProps) {
-  return (
-    <Card className={cn('', className)}>
-      <CardHeader>
-        <CardTitle className="text-base">{title}</CardTitle>
-      </CardHeader>
-      <CardContent>
-        <form onSubmit={onSubmit} className="space-y-4">
-          {children}
-          <Button type="submit" disabled={isSubmitting} size="sm">
-            {isSubmitting ? 'Sparar...' : submitLabel}
-          </Button>
-        </form>
-      </CardContent>
-    </Card>
-  )
-}
diff --git a/components/extensions/shared/DateRangeFilter.tsx b/components/extensions/shared/DateRangeFilter.tsx
deleted file mode 100644
index 319e24bd..00000000
--- a/components/extensions/shared/DateRangeFilter.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { Button } from '@/components/ui/button'
-import { cn } from '@/lib/utils'
-
-type Period = 'month' | 'quarter' | 'year' | 'custom'
-
-interface DateRangeFilterProps {
-  onRangeChange: (start: string, end: string) => void
-  className?: string
-}
-
-export default function DateRangeFilter({ onRangeChange, className }: DateRangeFilterProps) {
-  const [activePeriod, setActivePeriod] = useState<Period>('month')
-
-  const now = new Date()
-
-  const handlePeriod = (period: Period) => {
-    setActivePeriod(period)
-    const year = now.getFullYear()
-    const month = now.getMonth()
-
-    switch (period) {
-      case 'month': {
-        const start = new Date(year, month, 1).toISOString().slice(0, 10)
-        const end = new Date(year, month + 1, 0).toISOString().slice(0, 10)
-        onRangeChange(start, end)
-        break
-      }
-      case 'quarter': {
-        const qStart = Math.floor(month / 3) * 3
-        const start = new Date(year, qStart, 1).toISOString().slice(0, 10)
-        const end = new Date(year, qStart + 3, 0).toISOString().slice(0, 10)
-        onRangeChange(start, end)
-        break
-      }
-      case 'year': {
-        onRangeChange(`${year}-01-01`, `${year}-12-31`)
-        break
-      }
-    }
-  }
-
-  const periods: { key: Period; label: string }[] = [
-    { key: 'month', label: 'Månad' },
-    { key: 'quarter', label: 'Kvartal' },
-    { key: 'year', label: 'År' },
-  ]
-
-  return (
-    <div className={cn('flex items-center gap-1', className)}>
-      {periods.map(({ key, label }) => (
-        <Button
-          key={key}
-          variant={activePeriod === key ? 'default' : 'ghost'}
-          size="sm"
-          onClick={() => handlePeriod(key)}
-          className="text-xs"
-        >
-          {label}
-        </Button>
-      ))}
-    </div>
-  )
-}
diff --git a/components/extensions/shared/EditEntryDialog.tsx b/components/extensions/shared/EditEntryDialog.tsx
deleted file mode 100644
index f8d4e8d6..00000000
--- a/components/extensions/shared/EditEntryDialog.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-'use client'
-
-import { ReactNode } from 'react'
-import {
-  Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter,
-} from '@/components/ui/dialog'
-import { Button } from '@/components/ui/button'
-import { Loader2 } from 'lucide-react'
-
-interface EditEntryDialogProps {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  title: string
-  description?: string
-  onSave: () => void | Promise<void>
-  isSaving?: boolean
-  children: ReactNode
-}
-
-export default function EditEntryDialog({
-  open,
-  onOpenChange,
-  title,
-  description,
-  onSave,
-  isSaving = false,
-  children,
-}: EditEntryDialogProps) {
-  const handleSave = async () => {
-    await onSave()
-    onOpenChange(false)
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>{title}</DialogTitle>
-          {description && <DialogDescription>{description}</DialogDescription>}
-        </DialogHeader>
-        <div className="space-y-4">
-          {children}
-        </div>
-        <DialogFooter>
-          <Button variant="outline" onClick={() => onOpenChange(false)} disabled={isSaving}>
-            Avbryt
-          </Button>
-          <Button onClick={handleSave} disabled={isSaving}>
-            {isSaving ? (
-              <>
-                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-                Sparar...
-              </>
-            ) : (
-              'Spara'
-            )}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  )
-}
diff --git a/components/extensions/shared/ExtensionLoadingSkeleton.tsx b/components/extensions/shared/ExtensionLoadingSkeleton.tsx
deleted file mode 100644
index a1244e89..00000000
--- a/components/extensions/shared/ExtensionLoadingSkeleton.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Skeleton } from '@/components/ui/skeleton'
-
-export default function ExtensionLoadingSkeleton() {
-  return (
-    <div className="space-y-6">
-      {/* KPI cards skeleton */}
-      <div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
-        {[1, 2, 3].map(i => (
-          <div key={i} className="rounded-lg border p-6 space-y-2">
-            <Skeleton className="h-4 w-24" />
-            <Skeleton className="h-8 w-16" />
-            <Skeleton className="h-3 w-32" />
-          </div>
-        ))}
-      </div>
-      {/* Content skeleton */}
-      <div className="rounded-lg border p-6 space-y-4">
-        <Skeleton className="h-6 w-48" />
-        <Skeleton className="h-40 w-full" />
-      </div>
-    </div>
-  )
-}
diff --git a/components/extensions/shared/KPICard.tsx b/components/extensions/shared/KPICard.tsx
deleted file mode 100644
index 9e2583c3..00000000
--- a/components/extensions/shared/KPICard.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-'use client'
-
-import { Card, CardContent } from '@/components/ui/card'
-import { cn } from '@/lib/utils'
-
-interface KPICardProps {
-  label: string
-  value: string | number
-  suffix?: string
-  trend?: { value: number; label: string }
-  className?: string
-}
-
-export default function KPICard({ label, value, suffix, trend, className }: KPICardProps) {
-  return (
-    <Card className={cn('', className)}>
-      <CardContent className="pt-6">
-        <p className="text-sm text-muted-foreground">{label}</p>
-        <div className="flex items-baseline gap-1 mt-1">
-          <span className="text-2xl font-semibold tracking-tight tabular-nums">{value}</span>
-          {suffix && <span className="text-sm text-muted-foreground">{suffix}</span>}
-        </div>
-        {trend && (
-          <p className={cn(
-            'text-xs mt-1',
-            trend.value > 0 ? 'text-success' : trend.value < 0 ? 'text-destructive' : 'text-muted-foreground'
-          )}>
-            {trend.value > 0 ? '+' : ''}{trend.value}% {trend.label}
-          </p>
-        )}
-      </CardContent>
-    </Card>
-  )
-}
diff --git a/components/extensions/shared/MockDataBanner.tsx b/components/extensions/shared/MockDataBanner.tsx
deleted file mode 100644
index 5cc129d6..00000000
--- a/components/extensions/shared/MockDataBanner.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-'use client'
-
-import { Card, CardContent } from '@/components/ui/card'
-import { Button } from '@/components/ui/button'
-import { FlaskConical, X, Replace } from 'lucide-react'
-
-interface MockDataBannerProps {
-  importedAt: string | null
-  onClear: () => void
-  onReplace: () => void
-}
-
-export default function MockDataBanner({ importedAt, onClear, onReplace }: MockDataBannerProps) {
-  const formatted = importedAt
-    ? new Date(importedAt).toLocaleString('sv-SE', {
-        year: 'numeric', month: 'short', day: 'numeric',
-        hour: '2-digit', minute: '2-digit',
-      })
-    : null
-
-  return (
-    <Card className="border-l-4 border-l-warning bg-muted/30">
-      <CardContent className="pt-4 pb-4">
-        <div className="flex items-center gap-3">
-          <FlaskConical className="h-5 w-5 text-attn shrink-0" />
-          <div className="flex-1 min-w-0">
-            <p className="text-sm font-medium text-attn">
-              Testdata aktivt
-            </p>
-            <p className="text-xs text-attn mt-0.5">
-              Rapporten visar importerad testdata istället för bokföringsdata.
-              {formatted && <> Importerat {formatted}.</>}
-            </p>
-          </div>
-          <div className="flex gap-1.5 shrink-0">
-            <Button variant="outline" size="sm" onClick={onReplace} className="h-7 text-xs">
-              <Replace className="h-3.5 w-3.5 mr-1" />
-              Ersätt
-            </Button>
-            <Button variant="outline" size="sm" onClick={onClear} className="h-7 text-xs">
-              <X className="h-3.5 w-3.5 mr-1" />
-              Rensa
-            </Button>
-          </div>
-        </div>
-      </CardContent>
-    </Card>
-  )
-}
diff --git a/components/extensions/shared/MockDataImportDialog.tsx b/components/extensions/shared/MockDataImportDialog.tsx
deleted file mode 100644
index 79037ee0..00000000
--- a/components/extensions/shared/MockDataImportDialog.tsx
+++ /dev/null
@@ -1,406 +0,0 @@
-'use client'
-
-import { useState, useCallback, useRef } from 'react'
-import {
-  Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter,
-} from '@/components/ui/dialog'
-import { Button } from '@/components/ui/button'
-import { Label } from '@/components/ui/label'
-import {
-  Select, SelectContent, SelectItem, SelectTrigger, SelectValue,
-} from '@/components/ui/select'
-import {
-  Table, TableBody, TableCell, TableHead, TableHeader, TableRow,
-} from '@/components/ui/table'
-import {
-  Upload, FileJson, FileSpreadsheet, Download, AlertCircle, Check,
-} from 'lucide-react'
-import { cn } from '@/lib/utils'
-import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
-
-// ── Types ─────────────────────────────────────────────────────
-
-export interface CsvFieldDef {
-  key: string
-  label: string
-  required?: boolean
-}
-
-interface MockDataImportDialogProps<T> {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  csvFields: CsvFieldDef[]
-  defaultMappings?: Record<string, string>
-  parseCsvRows: (rows: Record<string, string>[]) => T
-  validateReport: (data: unknown) => { valid: boolean; error?: string }
-  templateCsvContent: string
-  templateFileName: string
-  onImport: (report: T, meta: { source: 'csv' | 'json'; fileName: string; rowCount: number }) => Promise<void>
-}
-
-function parseCsv(text: string): { headers: string[]; rows: string[][] } {
-  const lines = text.split(/\r?\n/).filter(line => line.trim())
-  if (lines.length === 0) return { headers: [], rows: [] }
-
-  const separator = lines[0].includes(';') ? ';' : ','
-  const headers = lines[0].split(separator).map(h => h.trim().replace(/^"(.*)"$/, '$1'))
-  const rows = lines.slice(1).map(line =>
-    line.split(separator).map(cell => cell.trim().replace(/^"(.*)"$/, '$1'))
-  )
-  return { headers, rows }
-}
-
-// ── Component ─────────────────────────────────────────────────
-
-type Step = 'upload' | 'map-csv' | 'preview-json' | 'importing'
-
-export default function MockDataImportDialog<T>({
-  open,
-  onOpenChange,
-  csvFields,
-  defaultMappings,
-  parseCsvRows,
-  validateReport,
-  templateCsvContent,
-  templateFileName,
-  onImport,
-}: MockDataImportDialogProps<T>) {
-  const [step, setStep] = useState<Step>('upload')
-  const [isDragging, setIsDragging] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-  const fileInputRef = useRef<HTMLInputElement>(null)
-
-  // CSV state
-  const [csvHeaders, setCsvHeaders] = useState<string[]>([])
-  const [csvRows, setCsvRows] = useState<string[][]>([])
-  const [mappings, setMappings] = useState<Record<string, string>>({})
-  const [fileName, setFileName] = useState('')
-
-  // JSON state
-  const [jsonReport, setJsonReport] = useState<T | null>(null)
-  const [jsonSummary, setJsonSummary] = useState('')
-
-  const reset = useCallback(() => {
-    setStep('upload')
-    setError(null)
-    setCsvHeaders([])
-    setCsvRows([])
-    setMappings({})
-    setFileName('')
-    setJsonReport(null)
-    setJsonSummary('')
-    setIsDragging(false)
-  }, [])
-
-  const handleOpenChange = useCallback((open: boolean) => {
-    if (!open) reset()
-    onOpenChange(open)
-  }, [onOpenChange, reset])
-
-  const processFile = useCallback((file: File) => {
-    setError(null)
-    setFileName(file.name)
-
-    const reader = new FileReader()
-    reader.onload = (ev) => {
-      const text = ev.target?.result as string
-
-      if (file.name.endsWith('.json')) {
-        // JSON path
-        try {
-          const parsed = JSON.parse(text)
-          const validation = validateReport(parsed)
-          if (!validation.valid) {
-            setError(validation.error || 'Ogiltig JSON-struktur')
-            return
-          }
-          setJsonReport(parsed as T)
-
-          // Build summary
-          const keys = Object.keys(parsed)
-          const lines = Array.isArray(parsed.lines) ? parsed.lines.length
-            : Array.isArray(parsed.receivables) ? parsed.receivables.length
-            : Array.isArray(parsed.boxes) ? parsed.boxes.length
-            : null
-          setJsonSummary(
-            `${keys.length} fält` + (lines !== null ? `, ${lines} rader` : '')
-          )
-          setStep('preview-json')
-        } catch {
-          setError('Kunde inte tolka JSON-filen. Kontrollera formatet.')
-        }
-      } else {
-        // CSV path
-        const parsed = parseCsv(text)
-        if (parsed.headers.length === 0 || parsed.rows.length === 0) {
-          setError('Ingen data hittades i CSV-filen.')
-          return
-        }
-
-        setCsvHeaders(parsed.headers)
-        setCsvRows(parsed.rows)
-
-        // Auto-map columns
-        const autoMappings: Record<string, string> = {}
-        for (const field of csvFields) {
-          const defaultCol = defaultMappings?.[field.key]
-          if (defaultCol && parsed.headers.includes(defaultCol)) {
-            autoMappings[field.key] = defaultCol
-          } else {
-            const match = parsed.headers.find(
-              h => h.toLowerCase() === field.key.toLowerCase() ||
-                   h.toLowerCase() === field.label.toLowerCase()
-            )
-            if (match) autoMappings[field.key] = match
-          }
-        }
-        setMappings(autoMappings)
-        setStep('map-csv')
-      }
-    }
-    reader.readAsText(file)
-  }, [csvFields, defaultMappings, validateReport])
-
-  const handleDrop = useCallback((e: React.DragEvent) => {
-    e.preventDefault()
-    setIsDragging(false)
-    const file = e.dataTransfer.files[0]
-    if (file) processFile(file)
-  }, [processFile])
-
-  const handleFileInput = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0]
-    if (file) processFile(file)
-  }, [processFile])
-
-  const handleCsvImport = useCallback(async () => {
-    setStep('importing')
-    setError(null)
-
-    try {
-      const mappedRows = csvRows.map(row => {
-        const obj: Record<string, string> = {}
-        for (const [fieldKey, csvCol] of Object.entries(mappings)) {
-          const colIdx = csvHeaders.indexOf(csvCol)
-          if (colIdx >= 0 && row[colIdx]) {
-            obj[fieldKey] = row[colIdx]
-          }
-        }
-        return obj
-      }).filter(row => Object.keys(row).length > 0)
-
-      const report = parseCsvRows(mappedRows)
-      await onImport(report, { source: 'csv', fileName, rowCount: mappedRows.length })
-      handleOpenChange(false)
-    } catch (e) {
-      setError(e instanceof Error ? getUserErrorMessage(e) : 'Import misslyckades')
-      setStep('map-csv')
-    }
-  }, [csvRows, csvHeaders, mappings, parseCsvRows, onImport, fileName, handleOpenChange])
-
-  const handleJsonImport = useCallback(async () => {
-    if (!jsonReport) return
-    setStep('importing')
-    setError(null)
-
-    try {
-      await onImport(jsonReport, { source: 'json', fileName, rowCount: 0 })
-      handleOpenChange(false)
-    } catch (e) {
-      setError(e instanceof Error ? getUserErrorMessage(e) : 'Import misslyckades')
-      setStep('preview-json')
-    }
-  }, [jsonReport, onImport, fileName, handleOpenChange])
-
-  const downloadTemplate = useCallback(() => {
-    const blob = new Blob([templateCsvContent], { type: 'text/csv;charset=utf-8;' })
-    const url = URL.createObjectURL(blob)
-    const a = document.createElement('a')
-    a.href = url
-    a.download = templateFileName
-    document.body.appendChild(a)
-    a.click()
-    document.body.removeChild(a)
-    URL.revokeObjectURL(url)
-  }, [templateCsvContent, templateFileName])
-
-  const requiredFieldsMapped = csvFields
-    .filter(f => f.required)
-    .every(f => mappings[f.key])
-
-  return (
-    <Dialog open={open} onOpenChange={handleOpenChange}>
-      <DialogContent className="sm:max-w-2xl max-h-[95dvh] sm:max-h-[85vh] overflow-y-auto">
-        <DialogHeader>
-          <DialogTitle>
-            {step === 'upload' && 'Importera testdata'}
-            {step === 'map-csv' && 'Kolumnmappning'}
-            {step === 'preview-json' && 'Förhandsgranska JSON'}
-            {step === 'importing' && 'Importerar...'}
-          </DialogTitle>
-        </DialogHeader>
-
-        {/* ── Error ─────────────────────────────────────── */}
-        {error && (
-          <div className="flex items-start gap-2 p-3 rounded-lg bg-destructive/5 text-destructive text-sm">
-            <AlertCircle className="h-4 w-4 mt-0.5 shrink-0" />
-            <span>{error}</span>
-          </div>
-        )}
-
-        {/* ── Step: Upload ──────────────────────────────── */}
-        {step === 'upload' && (
-          <div className="space-y-4">
-            <div
-              className={cn(
-                'border-2 border-dashed rounded-lg p-10 text-center transition-colors',
-                isDragging
-                  ? 'border-primary bg-primary/5'
-                  : 'border-muted-foreground/25 hover:border-muted-foreground/50'
-              )}
-              onDragOver={(e) => { e.preventDefault(); setIsDragging(true) }}
-              onDragLeave={() => setIsDragging(false)}
-              onDrop={handleDrop}
-            >
-              <Upload className="h-8 w-8 mx-auto mb-3 text-muted-foreground" />
-              <p className="text-sm font-medium mb-1">
-                Dra och släpp en fil här
-              </p>
-              <p className="text-xs text-muted-foreground mb-4">
-                CSV (.csv) eller JSON (.json)
-              </p>
-              <Button
-                variant="outline"
-                size="sm"
-                onClick={() => fileInputRef.current?.click()}
-              >
-                Välj fil
-              </Button>
-              <input
-                ref={fileInputRef}
-                type="file"
-                accept=".csv,.json"
-                onChange={handleFileInput}
-                className="hidden"
-              />
-            </div>
-
-            <div className="flex items-center justify-center">
-              <Button
-                variant="ghost"
-                size="sm"
-                onClick={downloadTemplate}
-                className="text-xs text-muted-foreground"
-              >
-                <Download className="h-3.5 w-3.5 mr-1.5" />
-                Ladda ner CSV-mall
-              </Button>
-            </div>
-          </div>
-        )}
-
-        {/* ── Step: Map CSV ─────────────────────────────── */}
-        {step === 'map-csv' && (
-          <div className="space-y-4">
-            <div className="flex items-center gap-2 text-sm text-muted-foreground">
-              <FileSpreadsheet className="h-4 w-4" />
-              <span>{fileName}: {csvRows.length} rader</span>
-            </div>
-
-            <div className="space-y-3">
-              {csvFields.map(field => (
-                <div key={field.key} className="flex items-center gap-3">
-                  <Label className="w-40 text-sm shrink-0">
-                    {field.label}{field.required && ' *'}
-                  </Label>
-                  <Select
-                    value={mappings[field.key] ?? '___none___'}
-                    onValueChange={(val) => setMappings(prev => ({
-                      ...prev,
-                      [field.key]: val === '___none___' ? '' : val,
-                    }))}
-                  >
-                    <SelectTrigger className="w-full">
-                      <SelectValue placeholder="Välj kolumn..." />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="___none___">- Välj kolumn -</SelectItem>
-                      {csvHeaders.map(h => (
-                        <SelectItem key={h} value={h}>{h}</SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </div>
-              ))}
-            </div>
-
-            {/* Preview first 5 rows */}
-            {csvRows.length > 0 && (
-              <div className="rounded-lg border overflow-auto max-h-48">
-                <Table>
-                  <TableHeader>
-                    <TableRow>
-                      {csvHeaders.map(h => (
-                        /* data-ph-mask: CSV headers are user data */
-                        <TableHead key={h} data-ph-mask="" className="text-xs whitespace-nowrap">{h}</TableHead>
-                      ))}
-                    </TableRow>
-                  </TableHeader>
-                  <TableBody>
-                    {csvRows.slice(0, 5).map((row, i) => (
-                      <TableRow key={i}>
-                        {row.map((cell, j) => (
-                          <TableCell key={j} className="text-xs whitespace-nowrap">{cell}</TableCell>
-                        ))}
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                </Table>
-              </div>
-            )}
-
-            <DialogFooter>
-              <Button variant="outline" onClick={reset}>Tillbaka</Button>
-              <Button
-                onClick={handleCsvImport}
-                disabled={!requiredFieldsMapped}
-              >
-                Importera {csvRows.length} rader
-              </Button>
-            </DialogFooter>
-          </div>
-        )}
-
-        {/* ── Step: Preview JSON ────────────────────────── */}
-        {step === 'preview-json' && (
-          <div className="space-y-4">
-            <div className="flex items-center gap-2 text-sm text-muted-foreground">
-              <FileJson className="h-4 w-4" />
-              <span>{fileName}</span>
-            </div>
-
-            <div className="flex items-center gap-2 p-3 rounded-lg bg-success/10 text-success text-sm">
-              <Check className="h-4 w-4 shrink-0" />
-              <span>Giltig JSON: {jsonSummary}</span>
-            </div>
-
-            <DialogFooter>
-              <Button variant="outline" onClick={reset}>Tillbaka</Button>
-              <Button onClick={handleJsonImport}>
-                Importera testdata
-              </Button>
-            </DialogFooter>
-          </div>
-        )}
-
-        {/* ── Step: Importing ───────────────────────────── */}
-        {step === 'importing' && (
-          <div className="py-8 text-center">
-            <div className="animate-spin h-8 w-8 border-2 border-primary border-t-transparent rounded-full mx-auto mb-3" />
-            <p className="text-sm text-muted-foreground">Importerar testdata...</p>
-          </div>
-        )}
-      </DialogContent>
-    </Dialog>
-  )
-}
diff --git a/components/extensions/shared/MonthlyTrendTable.tsx b/components/extensions/shared/MonthlyTrendTable.tsx
deleted file mode 100644
index 04e65e2d..00000000
--- a/components/extensions/shared/MonthlyTrendTable.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-'use client'
-
-import {
-  Table, TableBody, TableCell, TableHead, TableHeader, TableRow,
-} from '@/components/ui/table'
-import { cn } from '@/lib/utils'
-
-interface MonthlyRow {
-  month: string
-  value: number
-  label?: string
-}
-
-interface MonthlyTrendTableProps {
-  rows: MonthlyRow[]
-  valueLabel?: string
-  valueSuffix?: string
-  formatValue?: (v: number) => string
-  className?: string
-}
-
-export default function MonthlyTrendTable({
-  rows,
-  valueLabel = 'Belopp',
-  valueSuffix = 'kr',
-  formatValue,
-  className,
-}: MonthlyTrendTableProps) {
-  if (rows.length === 0) {
-    return (
-      <div className={cn('rounded-lg border p-6 text-center text-sm text-muted-foreground', className)}>
-        Ingen data att visa
-      </div>
-    )
-  }
-
-  const maxValue = Math.max(...rows.map(r => Math.abs(r.value)), 1)
-  const fmt = formatValue ?? ((v: number) => v.toLocaleString('sv-SE'))
-
-  return (
-    <div className={cn('rounded-lg border', className)}>
-      <Table>
-        <TableHeader>
-          <TableRow>
-            <TableHead>Period</TableHead>
-            <TableHead className="text-right">{valueLabel}</TableHead>
-            <TableHead className="w-[40%]"></TableHead>
-          </TableRow>
-        </TableHeader>
-        <TableBody>
-          {rows.map((row) => {
-            const barWidth = Math.round((Math.abs(row.value) / maxValue) * 100)
-            return (
-              <TableRow key={row.month}>
-                <TableCell className="font-medium">{row.label ?? row.month}</TableCell>
-                <TableCell className="text-right tabular-nums">
-                  {fmt(row.value)} {valueSuffix}
-                </TableCell>
-                <TableCell>
-                  <div className="h-4 w-full rounded-sm bg-muted overflow-hidden">
-                    <div
-                      className="h-full rounded-sm bg-primary/60 transition-all"
-                      style={{ width: `${barWidth}%` }}
-                    />
-                  </div>
-                </TableCell>
-              </TableRow>
-            )
-          })}
-        </TableBody>
-      </Table>
-    </div>
-  )
-}
diff --git a/components/extensions/shared/SetupPrompt.tsx b/components/extensions/shared/SetupPrompt.tsx
deleted file mode 100644
index f4cb7a6d..00000000
--- a/components/extensions/shared/SetupPrompt.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-'use client'
-
-import { Card, CardContent } from '@/components/ui/card'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import { Settings } from 'lucide-react'
-import { useState } from 'react'
-
-interface SetupField {
-  key: string
-  label: string
-  type?: 'number' | 'text'
-  placeholder?: string
-}
-
-interface SetupPromptProps {
-  title: string
-  description: string
-  fields: SetupField[]
-  onSave: (values: Record<string, string>) => Promise<void>
-}
-
-export default function SetupPrompt({ title, description, fields, onSave }: SetupPromptProps) {
-  const [values, setValues] = useState<Record<string, string>>({})
-  const [isSaving, setIsSaving] = useState(false)
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    setIsSaving(true)
-    try {
-      await onSave(values)
-    } finally {
-      setIsSaving(false)
-    }
-  }
-
-  const allFilled = fields.every(f => values[f.key]?.trim())
-
-  return (
-    <div className="flex items-center justify-center py-12">
-      <Card className="w-full max-w-md">
-        <CardContent className="pt-6">
-          <div className="text-center mb-6">
-            <div className="inline-flex items-center justify-center w-12 h-12 rounded-full bg-muted mb-3">
-              <Settings className="h-6 w-6 text-muted-foreground" />
-            </div>
-            <h3>{title}</h3>
-            <p className="text-sm text-muted-foreground mt-1">{description}</p>
-          </div>
-          <form onSubmit={handleSubmit} className="space-y-4">
-            {fields.map(field => (
-              <div key={field.key} className="space-y-2">
-                <Label htmlFor={`setup-${field.key}`}>{field.label}</Label>
-                <Input
-                  id={`setup-${field.key}`}
-                  type={field.type ?? 'text'}
-                  placeholder={field.placeholder}
-                  value={values[field.key] ?? ''}
-                  onChange={e => setValues(prev => ({ ...prev, [field.key]: e.target.value }))}
-                />
-              </div>
-            ))}
-            <Button type="submit" className="w-full" disabled={!allFilled || isSaving}>
-              {isSaving ? 'Sparar...' : 'Kom igång'}
-            </Button>
-          </form>
-        </CardContent>
-      </Card>
-    </div>
-  )
-}
diff --git a/components/import/BankFileResultStep.tsx b/components/import/BankFileResultStep.tsx
index 3032319d..0803bcbe 100644
--- a/components/import/BankFileResultStep.tsx
+++ b/components/import/BankFileResultStep.tsx
@@ -10,7 +10,7 @@ import {
   ArrowRight,
   RotateCcw,
 } from 'lucide-react'
-import type { IngestResult } from '@/lib/transactions/ingest'
+import type { IngestResult } from '@/types'
 
 interface BankFileResultStepProps {
   result: IngestResult
diff --git a/components/import/SIEUploadStep.tsx b/components/import/SIEUploadStep.tsx
index 5e5a89c7..cca22e86 100644
--- a/components/import/SIEUploadStep.tsx
+++ b/components/import/SIEUploadStep.tsx
@@ -4,7 +4,7 @@ import { useState, useCallback, useEffect } from 'react'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 import { Progress } from '@/components/ui/progress'
 import { Button } from '@/components/ui/button'
-import { Upload, FileText, AlertCircle, CheckCircle, Loader2, XCircle, RefreshCw } from 'lucide-react'
+import { Upload, AlertCircle, CheckCircle, Loader2, XCircle, RefreshCw } from 'lucide-react'
 
 const LOADING_PHASES = [
   { message: 'Läser fil...', progress: 10 },
diff --git a/components/invoices/PaymentBookingDialog.tsx b/components/invoices/PaymentBookingDialog.tsx
index 457be8e8..d3a459c8 100644
--- a/components/invoices/PaymentBookingDialog.tsx
+++ b/components/invoices/PaymentBookingDialog.tsx
@@ -26,7 +26,8 @@ import { formatCurrency, formatDate } from '@/lib/utils'
 import { useCompany } from '@/contexts/CompanyContext'
 import { Plus, Trash2, Loader2 } from 'lucide-react'
 import type { FormLine } from '@/components/bookkeeping/JournalEntryForm'
-import type { Invoice, InvoiceItem, Customer, EntityType } from '@/types'
+import type { EntityType } from '@/types'
+import type { InvoiceWithRelations } from '@/components/invoices/types'
 import { loadBasCatalog, type CatalogAccount } from '@/lib/bookkeeping/bas-catalog-client'
 
 type DuplicateMatchReason = 'ocr_exact' | 'name_amount_fuzzy' | 'amount_only'
@@ -42,14 +43,6 @@ interface DuplicateCandidate {
   match_confidence: number
 }
 
-interface InvoiceWithRelations extends Invoice {
-  customer: Customer
-  items: InvoiceItem[]
-  // Present once an issuance verifikat has been booked (faktureringsmetoden);
-  // absent on kontantmetoden invoices that recognise revenue at payment.
-  journal_entry_id?: string | null
-}
-
 interface PaymentBookingDialogProps {
   open: boolean
   onOpenChange: (open: boolean) => void
diff --git a/components/invoices/RotRutPayoutDialog.tsx b/components/invoices/RotRutPayoutDialog.tsx
index 298d8c28..892d8b7f 100644
--- a/components/invoices/RotRutPayoutDialog.tsx
+++ b/components/invoices/RotRutPayoutDialog.tsx
@@ -32,8 +32,8 @@ import {
   type ErrorLocale,
 } from '@/lib/errors/get-error-message'
 import { formatCurrency, formatDate } from '@/lib/utils'
+import type { DeductionType } from '@/lib/invoices/rot-rut-rules'
 
-type DeductionType = 'rot' | 'rut'
 type RequestStatus =
   | 'generated'
   | 'submitted'
diff --git a/components/invoices/SendInvoiceDialog.tsx b/components/invoices/SendInvoiceDialog.tsx
index 777c4f48..7e288797 100644
--- a/components/invoices/SendInvoiceDialog.tsx
+++ b/components/invoices/SendInvoiceDialog.tsx
@@ -30,7 +30,8 @@ import { creditNoteNeedsJournalEntry } from '@/lib/invoices/issue-credit-note'
 import { itemHasAccrual } from '@/lib/bookkeeping/accruals/account-suggestions'
 import { Loader2, Mail, Plus, Send, Trash2 } from 'lucide-react'
 import type { FormLine } from '@/components/bookkeeping/JournalEntryForm'
-import type { Invoice, InvoiceItem, Customer, EntityType } from '@/types'
+import type { EntityType } from '@/types'
+import type { InvoiceWithRelations } from '@/components/invoices/types'
 import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
 import { loadBasCatalog, type CatalogAccount } from '@/lib/bookkeeping/bas-catalog-client'
 import {
@@ -41,11 +42,6 @@ import {
   resolveInvoiceEmailRecipients,
 } from '@/lib/invoices/email-recipients'
 
-interface InvoiceWithRelations extends Invoice {
-  customer: Customer
-  items: InvoiceItem[]
-}
-
 interface SendInvoiceDialogProps {
   open: boolean
   onOpenChange: (open: boolean) => void
diff --git a/components/invoices/types.ts b/components/invoices/types.ts
new file mode 100644
index 00000000..d8df618d
--- /dev/null
+++ b/components/invoices/types.ts
@@ -0,0 +1,15 @@
+import type { Invoice, InvoiceItem, Customer } from '@/types'
+
+/**
+ * Invoice row joined with its customer and line items, as loaded by the
+ * invoice detail / credit pages and passed to the invoice dialogs.
+ */
+export interface InvoiceWithRelations extends Invoice {
+  customer: Customer
+  items: InvoiceItem[]
+  // Optional reference to the issuance verifikation. Populated by the
+  // backend when the invoice flow auto-books an entry on send; absent on
+  // older invoices, on kontantmetoden invoices that recognise revenue at
+  // payment, and on companies where issuance is not auto-booked.
+  journal_entry_id?: string | null
+}
diff --git a/components/reports/INK2DeclarationView.tsx b/components/reports/INK2DeclarationView.tsx
index d8bb9fe2..aa8df61e 100644
--- a/components/reports/INK2DeclarationView.tsx
+++ b/components/reports/INK2DeclarationView.tsx
@@ -16,16 +16,7 @@ import {
   INK2R_EQUITY_LIABILITY_CODES,
   INK2R_INCOME_CODES,
 } from '@/lib/reports/ink2/types'
-
-/** API errors may be a plain string or the canonical { code, message } envelope. */
-function parseApiError(error: unknown, fallback: string): string {
-  if (typeof error === 'string') return error
-  if (error && typeof error === 'object') {
-    const message = (error as { message?: unknown }).message
-    if (typeof message === 'string') return message
-  }
-  return fallback
-}
+import { parseApiError } from './api-error'
 
 export function INK2DeclarationView({ periodId }: { periodId: string }) {
   // Fetch outcome tagged with the key it was requested under: switching
diff --git a/components/reports/NEDeclarationView.tsx b/components/reports/NEDeclarationView.tsx
index 8e4fe6a1..dfef04b0 100644
--- a/components/reports/NEDeclarationView.tsx
+++ b/components/reports/NEDeclarationView.tsx
@@ -10,16 +10,7 @@ import {
   formatWholeKronor,
 } from '@/components/reports/DeclarationRutaRow'
 import type { NEDeclaration } from '@/lib/reports/ne-bilaga/types'
-
-/** API errors may be a plain string or the canonical { code, message } envelope. */
-function parseApiError(error: unknown, fallback: string): string {
-  if (typeof error === 'string') return error
-  if (error && typeof error === 'object') {
-    const message = (error as { message?: unknown }).message
-    if (typeof message === 'string') return message
-  }
-  return fallback
-}
+import { parseApiError } from './api-error'
 
 export function NEDeclarationView({ periodId }: { periodId: string }) {
   // Fetch outcome tagged with the key it was requested under: switching
diff --git a/components/reports/PeriodiskSammanstallningView.tsx b/components/reports/PeriodiskSammanstallningView.tsx
index 63aa6dbd..8e4c737a 100644
--- a/components/reports/PeriodiskSammanstallningView.tsx
+++ b/components/reports/PeriodiskSammanstallningView.tsx
@@ -32,27 +32,13 @@ import {
   ExternalLink,
   RefreshCw,
 } from 'lucide-react'
-import { formatCurrency } from '@/lib/utils'
+import { formatCurrency, formatWholeKr } from '@/lib/utils'
 import type {
   PeriodiskSammanstallningReport,
   PsPeriodType,
   PsWarning,
 } from '@/lib/reports/periodisk-sammanstallning'
-
-function formatAmount(amount: number): string {
-  // Hela kronor: SKV 5740 har inga öre.
-  return amount.toLocaleString('sv-SE', { maximumFractionDigits: 0 })
-}
-
-/** API errors may be a plain string or the canonical { code, message } envelope. */
-function parseApiError(error: unknown, fallback: string): string {
-  if (typeof error === 'string') return error
-  if (error && typeof error === 'object') {
-    const message = (error as { message?: unknown }).message
-    if (typeof message === 'string') return message
-  }
-  return fallback
-}
+import { parseApiError } from './api-error'
 
 function typeBadge(row: { services: number; goods: number; triangulation: number }) {
   const types: string[] = []
@@ -275,19 +261,19 @@ export function PeriodiskSammanstallningView() {
                 <div>
                   <div className="text-xs text-muted-foreground uppercase tracking-wider">Tjänster (typ 3)</div>
                   <div className="font-display text-xl tabular-nums">
-                    {formatAmount(data.totals.services)} kr
+                    {formatWholeKr(data.totals.services)} kr
                   </div>
                 </div>
                 <div>
                   <div className="text-xs text-muted-foreground uppercase tracking-wider">Varor (typ 1)</div>
                   <div className="font-display text-xl tabular-nums">
-                    {formatAmount(data.totals.goods)} kr
+                    {formatWholeKr(data.totals.goods)} kr
                   </div>
                 </div>
                 <div>
                   <div className="text-xs text-muted-foreground uppercase tracking-wider">Trepart (typ 2)</div>
                   <div className="font-display text-xl tabular-nums">
-                    {formatAmount(data.totals.triangulation)} kr
+                    {formatWholeKr(data.totals.triangulation)} kr
                   </div>
                 </div>
               </div>
@@ -300,9 +286,9 @@ export function PeriodiskSammanstallningView() {
                       <CheckCircle2 className="h-4 w-4 mt-1 shrink-0 text-success" />
                       <span>
                         Stämmer mot momsdeklarationen
-                        {' '}(Ruta 39: {formatAmount(data.reconciliation.ruta39 ?? 0)} kr,
-                        {' '}Ruta 35: {formatAmount(data.reconciliation.ruta35 ?? 0)} kr,
-                        {' '}Ruta 38: {formatAmount(data.reconciliation.ruta38 ?? 0)} kr)
+                        {' '}(Ruta 39: {formatWholeKr(data.reconciliation.ruta39 ?? 0)} kr,
+                        {' '}Ruta 35: {formatWholeKr(data.reconciliation.ruta35 ?? 0)} kr,
+                        {' '}Ruta 38: {formatWholeKr(data.reconciliation.ruta38 ?? 0)} kr)
                       </span>
                     </span>
                   ) : (
@@ -310,9 +296,9 @@ export function PeriodiskSammanstallningView() {
                       <AlertTriangle className="h-4 w-4 mt-1 shrink-0" />
                       <span>
                         Avviker från momsdeklarationen: kontrollera bokföringen.
-                        {' '}Ruta 39: {formatAmount(data.reconciliation.ruta39 ?? 0)} kr,
-                        {' '}Ruta 35: {formatAmount(data.reconciliation.ruta35 ?? 0)} kr,
-                        {' '}Ruta 38: {formatAmount(data.reconciliation.ruta38 ?? 0)} kr.
+                        {' '}Ruta 39: {formatWholeKr(data.reconciliation.ruta39 ?? 0)} kr,
+                        {' '}Ruta 35: {formatWholeKr(data.reconciliation.ruta35 ?? 0)} kr,
+                        {' '}Ruta 38: {formatWholeKr(data.reconciliation.ruta38 ?? 0)} kr.
                       </span>
                     </span>
                   )}
@@ -407,13 +393,13 @@ export function PeriodiskSammanstallningView() {
                         <TableCell className="tabular-nums font-mono text-xs">{row.country}</TableCell>
                         <TableCell className="tabular-nums font-mono text-xs">{row.vatNumber}</TableCell>
                         <TableCell className="text-right tabular-nums">
-                          {row.services !== 0 ? formatAmount(row.services) : '-'}
+                          {row.services !== 0 ? formatWholeKr(row.services) : '-'}
                         </TableCell>
                         <TableCell className="text-right tabular-nums">
-                          {row.goods !== 0 ? formatAmount(row.goods) : '-'}
+                          {row.goods !== 0 ? formatWholeKr(row.goods) : '-'}
                         </TableCell>
                         <TableCell className="text-right tabular-nums">
-                          {row.triangulation !== 0 ? formatAmount(row.triangulation) : '-'}
+                          {row.triangulation !== 0 ? formatWholeKr(row.triangulation) : '-'}
                         </TableCell>
                         <TableCell className="text-xs text-muted-foreground">{typeBadge(row)}</TableCell>
                         <TableCell className="text-xs">
@@ -426,9 +412,9 @@ export function PeriodiskSammanstallningView() {
                     ))}
                     <TableRow className="bg-muted/30 font-medium">
                       <TableCell colSpan={2}>Totalt</TableCell>
-                      <TableCell className="text-right tabular-nums">{formatAmount(data.totals.services)}</TableCell>
-                      <TableCell className="text-right tabular-nums">{formatAmount(data.totals.goods)}</TableCell>
-                      <TableCell className="text-right tabular-nums">{formatAmount(data.totals.triangulation)}</TableCell>
+                      <TableCell className="text-right tabular-nums">{formatWholeKr(data.totals.services)}</TableCell>
+                      <TableCell className="text-right tabular-nums">{formatWholeKr(data.totals.goods)}</TableCell>
+                      <TableCell className="text-right tabular-nums">{formatWholeKr(data.totals.triangulation)}</TableCell>
                       <TableCell colSpan={2} />
                     </TableRow>
                   </TableBody>
diff --git a/components/reports/ReportRowExpansion.tsx b/components/reports/ReportRowExpansion.tsx
index e7436cb9..069cbbe2 100644
--- a/components/reports/ReportRowExpansion.tsx
+++ b/components/reports/ReportRowExpansion.tsx
@@ -4,7 +4,7 @@ import React, { useState, useCallback, useMemo } from 'react'
 import Link from 'next/link'
 import { ChevronDown, ChevronRight, AlertCircle } from 'lucide-react'
 import { Skeleton } from '@/components/ui/skeleton'
-import { formatDate } from '@/lib/utils'
+import { formatAmount, formatDate } from '@/lib/utils'
 import { formatVoucher } from '@/lib/bookkeeping/voucher-series-resolver'
 import {
   createSourceLoader,
@@ -299,9 +299,3 @@ function ExpansionContent({
   )
 }
 
-function formatAmount(amount: number): string {
-  return amount.toLocaleString('sv-SE', {
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 2,
-  })
-}
diff --git a/components/reports/SkatteverketPanel.tsx b/components/reports/SkatteverketPanel.tsx
index bc8f1435..1a4ba5df 100644
--- a/components/reports/SkatteverketPanel.tsx
+++ b/components/reports/SkatteverketPanel.tsx
@@ -36,6 +36,7 @@ import { useCapability, useCompanyOptional } from '@/contexts/CompanyContext'
 import { CAPABILITY } from '@/lib/entitlements/keys'
 import { UpgradeNote } from '@/components/billing/UpgradeNote'
 import { InfoTooltip } from '@/components/ui/info-tooltip'
+import { formatAmount } from '@/lib/utils'
 
 interface SkatteverketStatus {
   connected: boolean
@@ -107,10 +108,6 @@ interface Notice {
   text: string
 }
 
-function formatAmount(amount: number): string {
-  return amount.toLocaleString('sv-SE', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-}
-
 const ORG_NUMBER_MISSING_NOTICE: Notice = {
   kind: 'error',
   text: 'Organisationsnummer saknas. Ange det under Inställningar innan du använder Skatteverket-kopplingen.',
diff --git a/components/reports/VatChecksCard.tsx b/components/reports/VatChecksCard.tsx
index 930efe4c..df139e07 100644
--- a/components/reports/VatChecksCard.tsx
+++ b/components/reports/VatChecksCard.tsx
@@ -28,25 +28,11 @@ import {
 import type { VatDeclarationCheck } from '@/lib/reports/vat-declaration-checks'
 import type { RcBasisGap } from '@/lib/reports/rc-basis-gaps'
 import type { VatPeriodType } from '@/types'
-import { formatDate } from '@/lib/utils'
+import { formatAmount, formatDate } from '@/lib/utils'
 import { useCanWrite } from '@/lib/hooks/use-can-write'
 import { QUIET_LINK_CLASS } from '@/components/ui/dry-table'
 import { cn } from '@/lib/utils'
-
-function formatAmount(amount: number): string {
-  return amount.toLocaleString('sv-SE', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-}
-
-/** API responses use the canonical envelope; error may be a string or an object. */
-function apiErrorMessage(json: unknown, fallback: string): string {
-  const err = (json as { error?: unknown } | null)?.error
-  if (typeof err === 'string') return err
-  if (err && typeof err === 'object') {
-    const message = (err as { message?: unknown }).message
-    if (typeof message === 'string') return message
-  }
-  return fallback
-}
+import { apiErrorMessage } from './api-error'
 
 type SupplierType = 'eu_business' | 'non_eu_business' | 'swedish_business'
 type SupplyType = 'service' | 'goods'
diff --git a/components/reports/api-error.ts b/components/reports/api-error.ts
new file mode 100644
index 00000000..81d7057b
--- /dev/null
+++ b/components/reports/api-error.ts
@@ -0,0 +1,20 @@
+/**
+ * Small, shared readers for the `{ error }` envelope the report API routes
+ * return. Deliberately NOT lib/errors getErrorMessage: that one rewrites known
+ * patterns into user-facing Swedish, these just pick the string out.
+ */
+
+/** A string error is itself; an object with a string `message` yields it; else the fallback. */
+export function parseApiError(error: unknown, fallback: string): string {
+  if (typeof error === 'string') return error
+  if (error && typeof error === 'object') {
+    const message = (error as { message?: unknown }).message
+    if (typeof message === 'string') return message
+  }
+  return fallback
+}
+
+/** parseApiError applied to a JSON body's `error` field. */
+export function apiErrorMessage(json: unknown, fallback: string): string {
+  return parseApiError((json as { error?: unknown } | null)?.error, fallback)
+}
diff --git a/components/reports/views/index.tsx b/components/reports/views/index.tsx
index 4740e8b7..b8c5cd5d 100644
--- a/components/reports/views/index.tsx
+++ b/components/reports/views/index.tsx
@@ -21,7 +21,8 @@ import { FyPicker } from '@/components/common/FyPicker'
 import { mostRecentEndedVatPeriod } from '@/lib/vat/period-defaults'
 import { resolveInitialVatPeriodSelection } from '@/lib/vat/period-selection'
 import { ContextPicker } from '@/components/common/ContextPicker'
-import { cn, formatDate } from '@/lib/utils'
+import { cn, formatAmount, formatDate } from '@/lib/utils'
+import { formatDateISO } from '@/lib/calendar/utils'
 import { getErrorMessage } from '@/lib/errors/get-error-message'
 import { roundOre } from '@/lib/money'
 import { formatLatestVouchers } from '@/lib/reports/latest-vouchers-format'
@@ -88,10 +89,6 @@ import type {
   VatPeriodType,
 } from '@/types'
 
-function formatAmount(amount: number): string {
-  return amount.toLocaleString('sv-SE', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-}
-
 // Shared shells for the report bodies, so all views read as the same
 // instrument: Skeleton while loading, EmptyState when the period has no data,
 // a quiet destructive card on fetch errors (design.md primitives).
@@ -1281,7 +1278,6 @@ function VatBookingCard({
   )
 }
 
-
 /** The Stegen header (concept Moms C): the filing pipeline as a clickable
  *  horizontal stepper with honest per-step status subs. Statutory surface,
  *  Swedish in both locales like the rest of the declaration. */
@@ -2434,11 +2430,6 @@ interface SupplierLedgerData {
 
 // Local calendar date (YYYY-MM-DD) for the reskontra "per datum" default:
 // toISOString() is UTC and rolls the date over an hour early in Sweden.
-function localIsoDate(): string {
-  const now = new Date()
-  return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`
-}
-
 // Shared "Per datum" control + export menu header for the two reskontra views
 // (#1020/#1021): pick an arbitrary as-of date and export PDF/Excel for it.
 function ReskontraToolbar({
@@ -2482,7 +2473,7 @@ export function SupplierLedgerView({ periodId }: { periodId: string }) {
   const [data, setData] = useState<SupplierLedgerData | null>(null)
   const [loading, setLoading] = useState(false)
   const [error, setError] = useState<string | null>(null)
-  const [asOfDate, setAsOfDate] = useState(localIsoDate)
+  const [asOfDate, setAsOfDate] = useState(() => formatDateISO(new Date()))
 
   const fetchData = async () => {
     setLoading(true)
@@ -3227,7 +3218,7 @@ export function ARLedgerView({ periodId }: { periodId: string }) {
   const [loading, setLoading] = useState(false)
   const [error, setError] = useState<string | null>(null)
   const [expandedCustomers, setExpandedCustomers] = useState<Set<string>>(new Set())
-  const [asOfDate, setAsOfDate] = useState(localIsoDate)
+  const [asOfDate, setAsOfDate] = useState(() => formatDateISO(new Date()))
 
   const fetchData = async () => {
     setLoading(true)
diff --git a/components/salary/NewSalaryRunDialog.tsx b/components/salary/NewSalaryRunDialog.tsx
deleted file mode 100644
index 8aae3242..00000000
--- a/components/salary/NewSalaryRunDialog.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { useRouter } from 'next/navigation'
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import { ArrowRight } from 'lucide-react'
-import { useToast } from '@/components/ui/use-toast'
-import { getErrorMessage } from '@/lib/errors/get-error-message'
-
-interface Props {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-}
-
-/**
- * "Ny lönekörning" as a modal: mirrors NewJournalEntryDialog. A successful
- * create navigates straight to the run detail page (the real workspace),
- * unmounting the host list page and this dialog with it.
- */
-export default function NewSalaryRunDialog({ open, onOpenChange }: Props) {
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent
-        className="sm:max-w-lg max-h-[95dvh] sm:max-h-[90vh] overflow-y-auto"
-        // Same convention as NewJournalEntryDialog: closing is explicit (the
-        // header X or Avbryt), never an accidental Escape or backdrop click.
-        onEscapeKeyDown={(e) => e.preventDefault()}
-        onPointerDownOutside={(e) => e.preventDefault()}
-        onInteractOutside={(e) => e.preventDefault()}
-      >
-        <DialogHeader>
-          <DialogTitle>Ny lönekörning</DialogTitle>
-        </DialogHeader>
-        <NewSalaryRunForm onCancel={() => onOpenChange(false)} />
-      </DialogContent>
-    </Dialog>
-  )
-}
-
-// Inner component so form state resets whenever the dialog reopens (Radix
-// unmounts DialogContent children on close).
-function NewSalaryRunForm({ onCancel }: { onCancel: () => void }) {
-  const router = useRouter()
-  const { toast } = useToast()
-  const [saving, setSaving] = useState(false)
-
-  const now = new Date()
-  const defaultYear = now.getFullYear()
-  const defaultMonth = now.getMonth() + 1
-  const defaultPayDate = `${defaultYear}-${String(defaultMonth).padStart(2, '0')}-25`
-
-  async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-    setSaving(true)
-
-    const form = new FormData(e.currentTarget)
-    const body = {
-      period_year: parseInt(form.get('period_year') as string),
-      period_month: parseInt(form.get('period_month') as string),
-      payment_date: form.get('payment_date') as string,
-      voucher_series: form.get('voucher_series') as string || 'A',
-    }
-
-    const res = await fetch('/api/salary/runs', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(body),
-    })
-
-    if (res.ok) {
-      const { data } = await res.json()
-      toast({ title: 'Lönekörning skapad' })
-      router.push(`/salary/runs/${data.id}`)
-    } else {
-      const result = await res.json()
-      toast({
-        title: 'Kunde inte skapa lönekörning',
-        description: getErrorMessage(result, { context: 'salary', statusCode: res.status }),
-        variant: 'destructive',
-      })
-    }
-
-    setSaving(false)
-  }
-
-  return (
-    <form onSubmit={handleSubmit} className="space-y-6">
-      <div className="space-y-4">
-        <div className="grid grid-cols-2 gap-4">
-          <div className="space-y-2">
-            <Label htmlFor="period_year">År</Label>
-            <Input id="period_year" name="period_year" type="number" defaultValue={defaultYear} required />
-          </div>
-          <div className="space-y-2">
-            <Label htmlFor="period_month">Månad (1-12)</Label>
-            <Input id="period_month" name="period_month" type="number" min="1" max="12" defaultValue={defaultMonth} required />
-          </div>
-        </div>
-        <div className="space-y-2">
-          <Label htmlFor="payment_date">Utbetalningsdag</Label>
-          <Input id="payment_date" name="payment_date" type="date" defaultValue={defaultPayDate} required />
-        </div>
-        <div className="space-y-2">
-          <Label htmlFor="voucher_series">Verifikationsserie</Label>
-          <Input id="voucher_series" name="voucher_series" defaultValue="A" maxLength={1} className="max-w-20" />
-          <p className="text-xs text-muted-foreground">En bokstav A-Z. Standard: A</p>
-        </div>
-      </div>
-
-      <div className="flex justify-end gap-3">
-        <Button type="button" variant="outline" onClick={onCancel}>
-          Avbryt
-        </Button>
-        <Button type="submit" disabled={saving}>
-          {saving ? 'Skapar...' : 'Skapa och fortsätt'}
-          <ArrowRight className="ml-2 h-4 w-4" />
-        </Button>
-      </div>
-    </form>
-  )
-}
diff --git a/components/salary/VacationBalanceCard.tsx b/components/salary/VacationBalanceCard.tsx
deleted file mode 100644
index f65dd4bd..00000000
--- a/components/salary/VacationBalanceCard.tsx
+++ /dev/null
@@ -1,242 +0,0 @@
-'use client'
-
-/**
- * Semester card on the salary dashboard (payroll gap-closure 3.5).
- *
- * Shows the open vacation-ledger totals (remaining + saved days across
- * active employees) and hosts the year-close dialog: dry-run report first,
- * a working confirm second (soft-guard convention).
- */
-
-import { useEffect, useState } from 'react'
-import { useTranslations } from 'next-intl'
-import { Card, CardContent } from '@/components/ui/card'
-import { Button } from '@/components/ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog'
-import { Palmtree, Loader2 } from 'lucide-react'
-import { useToast } from '@/components/ui/use-toast'
-import { formatCurrency } from '@/lib/utils'
-import { getErrorMessage } from '@/lib/errors/get-error-message'
-
-interface BalanceRow {
-  employee_vacation_balance_id: string
-  employee_name: string
-  remaining_days: number
-  saved_days_total: number
-  forced_payout_days: number
-}
-
-interface CloseReportRow {
-  employee_name: string
-  remaining_days: number
-  saveable_days: number
-  untaken_below_floor_days: number
-  expiring_days: number
-  next_year_entitled: number
-}
-
-interface CloseReport {
-  vacation_year_start: string
-  vacation_year_end: string
-  rows: CloseReportRow[]
-  sek: {
-    computed_liability: number
-    booked_2920: number
-    drift_2920: number
-    adjustment_needed: boolean
-  }
-}
-
-export function VacationBalanceCard({ canWrite }: { canWrite: boolean }) {
-  const t = useTranslations('salary')
-  const { toast } = useToast()
-  const [rows, setRows] = useState<BalanceRow[]>([])
-  const [loading, setLoading] = useState(true)
-  const [dialogOpen, setDialogOpen] = useState(false)
-  const [report, setReport] = useState<CloseReport | null>(null)
-  const [previewError, setPreviewError] = useState<string | null>(null)
-  const [previewing, setPreviewing] = useState(false)
-  const [closing, setClosing] = useState(false)
-
-  async function fetchBalances(): Promise<BalanceRow[] | null> {
-    const res = await fetch('/api/salary/vacation-balances')
-    if (!res.ok) return null
-    const { data } = await res.json()
-    return (data ?? []) as BalanceRow[]
-  }
-
-  useEffect(() => {
-    let cancelled = false
-    fetchBalances().then((data) => {
-      if (cancelled) return
-      if (data) setRows(data)
-      setLoading(false)
-    })
-    return () => {
-      cancelled = true
-    }
-  }, [])
-
-  const totalRemaining = rows.reduce((s, r) => s + r.remaining_days, 0)
-  const totalSaved = rows.reduce((s, r) => s + r.saved_days_total, 0)
-
-  async function openCloseDialog() {
-    setDialogOpen(true)
-    setPreviewing(true)
-    setReport(null)
-    setPreviewError(null)
-    const res = await fetch('/api/salary/vacation-year-close', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ dry_run: true }),
-    })
-    const body = await res.json().catch(() => null)
-    if (res.ok && body) {
-      setReport(body.data.report as CloseReport)
-    } else {
-      // Resolve via the parsed body plus the status: the route answers thrown
-      // errors with the canonical envelope `{ error: { code, message } }`,
-      // and rendering that object would crash React.
-      setPreviewError(getErrorMessage(body, { statusCode: res.status }))
-    }
-    setPreviewing(false)
-  }
-
-  async function confirmClose() {
-    setClosing(true)
-    const res = await fetch('/api/salary/vacation-year-close', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ book_adjustment: true }),
-    })
-    const body = await res.json().catch(() => null)
-    if (res.ok) {
-      toast({ title: t('vacation_close_done') })
-      setDialogOpen(false)
-      const refreshed = await fetchBalances()
-      if (refreshed) setRows(refreshed)
-    } else {
-      toast({
-        title: t('vacation_close_failed'),
-        description: getErrorMessage(body, { statusCode: res.status }),
-        variant: 'destructive',
-      })
-    }
-    setClosing(false)
-  }
-
-  return (
-    <Card>
-      <CardContent className="p-4">
-        <div className="flex items-center gap-2 mb-2">
-          <Palmtree className="h-4 w-4 text-muted-foreground" />
-          <p className="text-xs text-muted-foreground">{t('card_vacation_title')}</p>
-        </div>
-        {loading ? (
-          <p className="text-sm text-muted-foreground">…</p>
-        ) : rows.length > 0 ? (
-          <>
-            <p className="font-sans text-lg font-medium tabular-nums leading-tight">
-              {totalRemaining}
-            </p>
-            <p className="text-xs text-muted-foreground">
-              {t('card_vacation_detail', { employees: rows.length, saved: totalSaved })}
-            </p>
-            {canWrite && (
-              <Button variant="outline" size="sm" className="mt-2" onClick={openCloseDialog}>
-                {t('vacation_close_button')}
-              </Button>
-            )}
-          </>
-        ) : (
-          <p className="text-sm text-muted-foreground">{t('card_vacation_none')}</p>
-        )}
-      </CardContent>
-
-      <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
-        <DialogContent className="max-w-2xl">
-          <DialogHeader>
-            <DialogTitle>{t('vacation_close_title')}</DialogTitle>
-            <DialogDescription>{t('vacation_close_description')}</DialogDescription>
-          </DialogHeader>
-
-          {previewing && (
-            <div className="flex items-center gap-2 py-6 text-sm text-muted-foreground">
-              <Loader2 className="h-4 w-4 animate-spin" />
-              {t('vacation_close_previewing')}
-            </div>
-          )}
-
-          {previewError && <p className="text-sm text-destructive py-4">{previewError}</p>}
-
-          {report && (
-            <div className="space-y-4">
-              <p className="text-sm text-muted-foreground">
-                {t('vacation_close_period', {
-                  from: report.vacation_year_start,
-                  to: report.vacation_year_end,
-                })}
-              </p>
-              <div className="max-h-64 overflow-y-auto border border-border rounded-lg">
-                <table className="w-full text-sm">
-                  <thead>
-                    <tr className="text-[11px] font-medium uppercase tracking-wider text-muted-foreground">
-                      <th className="text-left px-3 py-2">{t('vacation_close_col_employee')}</th>
-                      <th className="text-right px-3 py-2">{t('vacation_close_col_saved')}</th>
-                      <th className="text-right px-3 py-2">{t('vacation_close_col_flagged')}</th>
-                      <th className="text-right px-3 py-2">{t('vacation_close_col_expiring')}</th>
-                      <th className="text-right px-3 py-2">{t('vacation_close_col_next')}</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    {report.rows.map((row, idx) => (
-                      <tr key={idx} className="border-t border-border">
-                        <td className="px-3 py-2">{row.employee_name}</td>
-                        <td className="px-3 py-2 text-right tabular-nums">{row.saveable_days}</td>
-                        <td className="px-3 py-2 text-right tabular-nums">{row.untaken_below_floor_days}</td>
-                        <td className="px-3 py-2 text-right tabular-nums">{row.expiring_days}</td>
-                        <td className="px-3 py-2 text-right tabular-nums">{row.next_year_entitled}</td>
-                      </tr>
-                    ))}
-                  </tbody>
-                </table>
-              </div>
-              <div className="text-sm space-y-1">
-                <p className="tabular-nums">
-                  {t('vacation_close_computed', {
-                    amount: formatCurrency(report.sek.computed_liability),
-                  })}
-                </p>
-                <p className="tabular-nums">
-                  {t('vacation_close_booked', { amount: formatCurrency(report.sek.booked_2920) })}
-                </p>
-                <p className="tabular-nums">
-                  {report.sek.adjustment_needed
-                    ? t('vacation_close_drift', { amount: formatCurrency(report.sek.drift_2920) })
-                    : t('vacation_close_no_drift')}
-                </p>
-              </div>
-            </div>
-          )}
-
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setDialogOpen(false)} disabled={closing}>
-              {t('vacation_close_cancel')}
-            </Button>
-            <Button onClick={confirmClose} disabled={!report || closing}>
-              {closing && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-              {t('vacation_close_confirm')}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </Card>
-  )
-}
diff --git a/components/settings/AgentMemoryPanel.tsx b/components/settings/AgentMemoryPanel.tsx
index 8f2bb644..85c6e1fc 100644
--- a/components/settings/AgentMemoryPanel.tsx
+++ b/components/settings/AgentMemoryPanel.tsx
@@ -24,8 +24,7 @@ import { useCanWrite } from '@/lib/hooks/use-can-write'
 import { cn, formatDateLong } from '@/lib/utils'
 import { getErrorMessage, type ErrorLocale } from '@/lib/errors/get-error-message'
 
-type Kind = 'fact' | 'preference' | 'pattern' | 'correction'
-type Source = 'composer' | 'user_taught' | 'agent_learned' | 'derived'
+import type { FactKind as Kind, FactSource as Source } from '@/lib/agent-context/agent-competence'
 
 interface AgentMemoryRow {
   id: string
diff --git a/components/settings/AgentSkillsPanel.tsx b/components/settings/AgentSkillsPanel.tsx
index 9214e704..250ce88e 100644
--- a/components/settings/AgentSkillsPanel.tsx
+++ b/components/settings/AgentSkillsPanel.tsx
@@ -15,7 +15,7 @@ import { SettingsGroup, SettingsRowNote } from '@/components/settings/SettingsRo
 import { cn } from '@/lib/utils'
 import { getErrorMessage, type ErrorLocale } from '@/lib/errors/get-error-message'
 
-type Tier = 'horizontal' | 'vertical' | 'modifier'
+import type { AtomTier as Tier } from '@/lib/agent-context/agent-competence'
 
 interface AtomMeta {
   id: string
diff --git a/components/settings/sections/index.ts b/components/settings/sections/index.ts
index eeb8d356..51a75f2c 100644
--- a/components/settings/sections/index.ts
+++ b/components/settings/sections/index.ts
@@ -87,5 +87,3 @@ export const SETTINGS_SECTIONS: Record<string, ComponentType> = {
   whatsapp: WhatsAppSettingsContent,
   mail: MailSettingsContent,
 }
-
-export type SettingsSectionId = keyof typeof SETTINGS_SECTIONS
diff --git a/components/supplier-invoices/NewSupplierInvoiceForm.tsx b/components/supplier-invoices/NewSupplierInvoiceForm.tsx
index c086781d..4fb209b2 100644
--- a/components/supplier-invoices/NewSupplierInvoiceForm.tsx
+++ b/components/supplier-invoices/NewSupplierInvoiceForm.tsx
@@ -31,7 +31,7 @@ import { formatCounterpartyName } from '@/lib/bookkeeping/counterparty-templates
 import { getErrorMessage } from '@/lib/errors/get-error-message'
 import { exceedsHostedUploadLimit } from '@/lib/documents/upload-size'
 import { uploadViaSignedUrl } from '@/lib/documents/direct-upload'
-import { cn, formatCurrency, formatDate } from '@/lib/utils'
+import { cn, formatAmount, formatCurrency, formatDate } from '@/lib/utils'
 import { getDisplayTotal } from '@/lib/invoices/rounding'
 import { useUnsavedChanges } from '@/lib/hooks/use-unsaved-changes'
 import { useCanWrite } from '@/lib/hooks/use-can-write'
@@ -78,10 +78,6 @@ function RequiredMark() {
   return <span className="text-destructive ml-0.5" aria-hidden="true">*</span>
 }
 
-function formatAmount(amount: number): string {
-  return amount.toLocaleString('sv-SE', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-}
-
 // Accepts sv-SE formatted numbers ("12 345,67" with regular, no-break or
 // narrow no-break group separators) as well as plain "12345.67".
 function parseFlexibleNumber(s: string): number | null {
diff --git a/components/suppliers/SupplierInvoiceReviewContent.tsx b/components/suppliers/SupplierInvoiceReviewContent.tsx
index c480cc5b..afca158a 100644
--- a/components/suppliers/SupplierInvoiceReviewContent.tsx
+++ b/components/suppliers/SupplierInvoiceReviewContent.tsx
@@ -5,7 +5,7 @@ import { CalendarClock } from 'lucide-react'
 import { Badge } from '@/components/ui/badge'
 import { Separator } from '@/components/ui/separator'
 import { AccountNumber } from '@/components/ui/account-number'
-import { formatCurrency, formatDate } from '@/lib/utils'
+import { formatAmount, formatCurrency, formatDate } from '@/lib/utils'
 import {
   resolveReverseChargeRate,
   isReverseChargeBasisAccount,
@@ -57,10 +57,6 @@ interface SupplierInvoiceReviewContentProps {
   total: number
 }
 
-function formatAmount(amount: number): string {
-  return amount.toLocaleString('sv-SE', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-}
-
 interface JournalPreviewLine {
   account_number: string
   description: string
diff --git a/components/transactions/CategoryExpandedDialog.tsx b/components/transactions/CategoryExpandedDialog.tsx
deleted file mode 100644
index 2d6c2e1c..00000000
--- a/components/transactions/CategoryExpandedDialog.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-'use client'
-
-import { useState, useEffect } from 'react'
-import { Button } from '@/components/ui/button'
-import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } from '@/components/ui/dialog'
-import { formatCurrency, formatDate } from '@/lib/utils'
-import { ArrowUpRight, ArrowDownRight } from 'lucide-react'
-import VatTreatmentSelect from './VatTreatmentSelect'
-import { EXPENSE_CATEGORIES, INCOME_CATEGORIES } from './transaction-types'
-import type { TransactionWithInvoice } from './transaction-types'
-import type { TransactionCategory, VatTreatment } from '@/types'
-
-interface CategoryExpandedDialogProps {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  transaction: TransactionWithInvoice | null
-  onSelectCategory: (category: TransactionCategory, vatTreatment?: VatTreatment) => void
-  isProcessing: boolean
-}
-
-export default function CategoryExpandedDialog({
-  open,
-  onOpenChange,
-  transaction,
-  onSelectCategory,
-  isProcessing,
-}: CategoryExpandedDialogProps) {
-  const [vatTreatment, setVatTreatment] = useState<VatTreatment | 'none'>('standard_25')
-
-  useEffect(() => {
-    if (open) {
-      setVatTreatment('standard_25')
-    }
-  }, [open, transaction?.id])
-
-  if (!transaction) return null
-
-  const isIncome = transaction.amount > 0
-
-  const handleSelectCategory = (category: TransactionCategory) => {
-    const resolvedVat = vatTreatment === 'none' ? undefined : vatTreatment
-    onSelectCategory(category, resolvedVat)
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={isProcessing ? undefined : onOpenChange}>
-      <DialogContent className="max-w-md">
-        <DialogHeader>
-          <DialogTitle>Välj kategori</DialogTitle>
-          <DialogDescription>
-            Välj rätt kategori för att bokföra transaktionen
-          </DialogDescription>
-        </DialogHeader>
-
-        {/* Transaction summary */}
-        <div className="flex items-center gap-3 rounded-lg border p-3">
-          <div
-            className={`h-9 w-9 rounded-full flex items-center justify-center flex-shrink-0 ${
-              isIncome
-                ? 'bg-success/10 text-success'
-                : 'bg-destructive/10 text-destructive'
-            }`}
-          >
-            {isIncome ? (
-              <ArrowUpRight className="h-4 w-4" />
-            ) : (
-              <ArrowDownRight className="h-4 w-4" />
-            )}
-          </div>
-          <div className="flex-1 min-w-0">
-            <p className="font-medium text-sm truncate">{transaction.description}</p>
-            <p className="text-xs text-muted-foreground">{formatDate(transaction.date)}</p>
-          </div>
-          <p className={`font-medium text-sm flex-shrink-0 ${isIncome ? 'text-success' : ''}`}>
-            {isIncome ? '+' : ''}
-            {formatCurrency(transaction.amount, transaction.currency)}
-          </p>
-        </div>
-
-        {/* VAT treatment selector */}
-        <div>
-          <h4 className="text-sm font-medium text-muted-foreground mb-2">Momsbehandling</h4>
-          <VatTreatmentSelect
-            value={vatTreatment}
-            onValueChange={setVatTreatment}
-          />
-        </div>
-
-        {/* Category grid */}
-        <div className="space-y-4 py-2">
-          <div>
-            <h4 className="text-sm font-medium text-muted-foreground mb-2">Kostnader</h4>
-            <div className="grid grid-cols-2 gap-1.5">
-              {EXPENSE_CATEGORIES.map((cat) => (
-                <Button
-                  key={cat.value}
-                  variant="outline"
-                  size="sm"
-                  className="justify-start text-xs h-auto py-1.5"
-                  onClick={() => handleSelectCategory(cat.value)}
-                  disabled={isProcessing}
-                >
-                  <div className="flex flex-col items-start">
-                    <span>{cat.label}</span>
-                    {cat.account && <span className="text-[10px] text-muted-foreground">{cat.account}</span>}
-                  </div>
-                </Button>
-              ))}
-            </div>
-          </div>
-          <div>
-            <h4 className="text-sm font-medium text-muted-foreground mb-2">Intäkter</h4>
-            <div className="grid grid-cols-2 gap-1.5">
-              {INCOME_CATEGORIES.map((cat) => (
-                <Button
-                  key={cat.value}
-                  variant="outline"
-                  size="sm"
-                  className="justify-start text-xs h-auto py-1.5"
-                  onClick={() => handleSelectCategory(cat.value)}
-                  disabled={isProcessing}
-                >
-                  <div className="flex flex-col items-start">
-                    <span>{cat.label}</span>
-                    {cat.account && <span className="text-[10px] text-muted-foreground">{cat.account}</span>}
-                  </div>
-                </Button>
-              ))}
-            </div>
-          </div>
-        </div>
-      </DialogContent>
-    </Dialog>
-  )
-}
diff --git a/components/transactions/InvoicePicker.tsx b/components/transactions/InvoicePicker.tsx
index 90ac43bf..cbfbaded 100644
--- a/components/transactions/InvoicePicker.tsx
+++ b/components/transactions/InvoicePicker.tsx
@@ -20,10 +20,9 @@ type OpenInvoice = Invoice & { customer?: Customer }
 interface InvoicePickerProps {
   transaction: TransactionWithInvoice
   onSelect: (invoice: OpenInvoice) => void
-  isProcessing: boolean
 }
 
-export default function InvoicePicker({ transaction, onSelect, isProcessing }: InvoicePickerProps) {
+export default function InvoicePicker({ transaction, onSelect }: InvoicePickerProps) {
   const t = useTranslations('tx_invoice_picker')
   const { company } = useCompany()
   const supabase = useMemo(() => createClient(), [])
@@ -160,13 +159,11 @@ export default function InvoicePicker({ transaction, onSelect, isProcessing }: I
               key={invoice.id}
               type="button"
               onClick={() => onSelect(invoice)}
-              disabled={isProcessing}
               className={cn(
                 'w-full text-left rounded-lg border px-3 py-2.5 transition-colors',
                 'hover:bg-muted/50 focus:outline-none focus:ring-2 focus:ring-ring',
                 exact && 'border-success/50 bg-success/5',
-                close && 'border-primary/30',
-                isProcessing && 'opacity-50 pointer-events-none'
+                close && 'border-primary/30'
               )}
             >
               <div className="flex items-start justify-between gap-3">
diff --git a/components/transactions/SupplierInvoicePicker.tsx b/components/transactions/SupplierInvoicePicker.tsx
index 6e92197d..94a8f9d6 100644
--- a/components/transactions/SupplierInvoicePicker.tsx
+++ b/components/transactions/SupplierInvoicePicker.tsx
@@ -19,13 +19,11 @@ type OpenSupplierInvoice = SupplierInvoice & { supplier?: Supplier }
 interface SupplierInvoicePickerProps {
   transaction: TransactionWithInvoice
   onSelect: (invoice: OpenSupplierInvoice) => void
-  isProcessing: boolean
 }
 
 export default function SupplierInvoicePicker({
   transaction,
   onSelect,
-  isProcessing,
 }: SupplierInvoicePickerProps) {
   const { company } = useCompany()
   const supabase = useMemo(() => createClient(), [])
@@ -155,13 +153,11 @@ export default function SupplierInvoicePicker({
               key={invoice.id}
               type="button"
               onClick={() => onSelect(invoice)}
-              disabled={isProcessing}
               className={cn(
                 'w-full text-left rounded-lg border px-3 py-2.5 transition-colors',
                 'hover:bg-muted/50 focus:outline-none focus:ring-2 focus:ring-ring',
                 exact && 'border-success/50 bg-success/5',
-                close && 'border-primary/30',
-                isProcessing && 'opacity-50 pointer-events-none'
+                close && 'border-primary/30'
               )}
             >
               <div className="flex items-start justify-between gap-3">
diff --git a/components/transactions/TemplatePicker.tsx b/components/transactions/TemplatePicker.tsx
index 650efd45..0922f4fb 100644
--- a/components/transactions/TemplatePicker.tsx
+++ b/components/transactions/TemplatePicker.tsx
@@ -239,8 +239,8 @@ interface TemplatePickerProps {
   direction: 'expense' | 'income'
   entityType?: EntityType
   suggestedTemplates?: SuggestedTemplate[]
-  recentTemplateIds?: string[]
   onSelect: (template: BookingTemplate) => void
+
   onSelectCounterparty?: (templateId: string) => void
   onPickLibraryTemplate?: (raw: BookingTemplateLibrary) => void
   // When provided, the search field also matches the company's active chart
diff --git a/components/transactions/transaction-types.ts b/components/transactions/transaction-types.ts
index ad77bf7d..55d06ac6 100644
--- a/components/transactions/transaction-types.ts
+++ b/components/transactions/transaction-types.ts
@@ -42,11 +42,6 @@ export type CategorizeHandler = (
   dimensions?: Record<string, string>
 ) => Promise<string | null>
 
-export type MatchInvoiceHandler = (
-  transactionId: string,
-  invoiceId: string
-) => Promise<boolean>
-
 // Category option type. `label` retains the Swedish text for back-compat and
 // non-React consumers; `labelKey` is the next-intl key under the `tx_categories`
 // namespace that React components should prefer.
diff --git a/components/ui/empty-state.tsx b/components/ui/empty-state.tsx
index 02b62947..15c703c9 100644
--- a/components/ui/empty-state.tsx
+++ b/components/ui/empty-state.tsx
@@ -6,12 +6,7 @@ import { useTranslations } from 'next-intl'
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 import {
-  ReceiptText,
   Users,
-  ArrowLeftRight,
-  Building2,
-  FileText,
-  Calendar,
   Plus,
   TrendingUp,
   type LucideIcon,
@@ -105,20 +100,6 @@ export function EmptyState({
 
 // Preset empty states for common pages
 
-export function EmptyInvoices({ onAction }: { onAction?: () => void } = {}) {
-  const t = useTranslations('empty')
-  return (
-    <EmptyState
-      icon={ReceiptText}
-      title={t('preset_invoices_title')}
-      description={t('preset_invoices_description')}
-      actionLabel={t('preset_invoices_action')}
-      actionHref={onAction ? undefined : '/invoices?new=1'}
-      onAction={onAction}
-    />
-  )
-}
-
 export function EmptyCustomers({ onAction }: { onAction?: () => void } = {}) {
   const t = useTranslations('empty')
   return (
@@ -133,60 +114,6 @@ export function EmptyCustomers({ onAction }: { onAction?: () => void } = {}) {
   )
 }
 
-export function EmptyTransactions() {
-  const t = useTranslations('empty')
-  return (
-    <EmptyState
-      icon={ArrowLeftRight}
-      title={t('preset_transactions_title')}
-      description={t('preset_transactions_description')}
-      actionLabel={t('preset_transactions_action')}
-      actionHref="/import"
-      supportHint
-    />
-  )
-}
-
-export function EmptyDeadlines() {
-  const t = useTranslations('empty')
-  return (
-    <EmptyState
-      icon={Calendar}
-      title={t('preset_deadlines_title')}
-      description={t('preset_deadlines_description')}
-    />
-  )
-}
-
-export function NoBankConnected() {
-  const t = useTranslations('empty')
-  return (
-    <EmptyState
-      icon={Building2}
-      title={t('preset_no_bank_title')}
-      description={t('preset_no_bank_description')}
-      actionLabel={t('preset_no_bank_action')}
-      actionHref="/import"
-      supportHint
-    />
-  )
-}
-
-export function EmptyReports() {
-  const t = useTranslations('empty')
-  return (
-    <EmptyState
-      icon={FileText}
-      title={t('preset_reports_title')}
-      description={t('preset_reports_description')}
-      actionLabel={t('preset_reports_action')}
-      actionHref="/invoices?new=1"
-      secondaryActionLabel={t('preset_reports_secondary')}
-      secondaryActionHref="/import"
-    />
-  )
-}
-
 /**
  * Byrå cockpit: no client companies yet. A preset, not a bare <EmptyState
  * icon={TrendingUp} />, because the only caller is a Server Component: a
diff --git a/components/ui/fallback-prompt.tsx b/components/ui/fallback-prompt.tsx
deleted file mode 100644
index 1aa2b02a..00000000
--- a/components/ui/fallback-prompt.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Upload } from 'lucide-react'
-import { Button } from '@/components/ui/button'
-import Link from 'next/link'
-
-interface FallbackPromptProps {
-  message: string
-  linkHref: string
-  linkLabel: string
-}
-
-export function FallbackPrompt({ message, linkHref, linkLabel }: FallbackPromptProps) {
-  return (
-    <div className="flex items-center gap-3 rounded-lg border border-border bg-muted/50 p-4">
-      <Upload className="h-5 w-5 shrink-0 text-muted-foreground" />
-      <p className="flex-1 text-sm text-muted-foreground">{message}</p>
-      <Button variant="outline" size="sm" asChild>
-        <Link href={linkHref}>{linkLabel}</Link>
-      </Button>
-    </div>
-  )
-}
diff --git a/components/ui/sheet.tsx b/components/ui/sheet.tsx
deleted file mode 100644
index 31198470..00000000
--- a/components/ui/sheet.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-"use client"
-
-import * as React from "react"
-import * as DialogPrimitive from "@radix-ui/react-dialog"
-import { X } from "lucide-react"
-import { cn } from "@/lib/utils"
-
-const Sheet = DialogPrimitive.Root
-
-const SheetTrigger = DialogPrimitive.Trigger
-
-const SheetClose = DialogPrimitive.Close
-
-const SheetPortal = DialogPrimitive.Portal
-
-const SheetOverlay = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Overlay>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
->(({ className, ...props }, ref) => (
-  <DialogPrimitive.Overlay
-    ref={ref}
-    className={cn(
-      "fixed inset-0 z-50 bg-black/50 dark:bg-black/60 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
-      className
-    )}
-    {...props}
-  />
-))
-SheetOverlay.displayName = DialogPrimitive.Overlay.displayName
-
-type SheetSide = "top" | "right" | "bottom" | "left"
-
-const sideClasses: Record<SheetSide, string> = {
-  top:
-    "inset-x-0 top-0 border-b data-[state=open]:slide-in-from-top data-[state=closed]:slide-out-to-top",
-  right:
-    "inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm data-[state=open]:slide-in-from-right data-[state=closed]:slide-out-to-right",
-  bottom:
-    "inset-x-0 bottom-0 border-t data-[state=open]:slide-in-from-bottom data-[state=closed]:slide-out-to-bottom",
-  left:
-    "inset-y-0 left-0 h-full w-3/4 border-r sm:max-w-sm data-[state=open]:slide-in-from-left data-[state=closed]:slide-out-to-left",
-}
-
-interface SheetContentProps
-  extends React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> {
-  side?: SheetSide
-}
-
-const SheetContent = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Content>,
-  SheetContentProps
->(({ className, children, side = "right", onInteractOutside, ...props }, ref) => (
-  <SheetPortal>
-    <SheetOverlay />
-    <DialogPrimitive.Content
-      ref={ref}
-      // Same companion-overlay guard as DialogContent: a portaled panel
-      // marked data-dialog-companion counts as an inside interaction.
-      onInteractOutside={(event) => {
-        onInteractOutside?.(event)
-        const target = event.target
-        if (target instanceof Element && target.closest('[data-dialog-companion]')) {
-          event.preventDefault()
-        }
-      }}
-      className={cn(
-        "fixed z-50 flex flex-col gap-4 bg-background p-6 transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-200 data-[state=open]:duration-300",
-        sideClasses[side],
-        className
-      )}
-      {...props}
-    >
-      {children}
-      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none">
-        <X className="h-4 w-4" />
-        <span className="sr-only">Close</span>
-      </DialogPrimitive.Close>
-    </DialogPrimitive.Content>
-  </SheetPortal>
-))
-SheetContent.displayName = DialogPrimitive.Content.displayName
-
-const SheetHeader = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
-  <div
-    className={cn("flex flex-col space-y-1.5 text-left", className)}
-    {...props}
-  />
-)
-SheetHeader.displayName = "SheetHeader"
-
-const SheetFooter = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
-  <div
-    className={cn(
-      "flex flex-col-reverse gap-2 sm:flex-row sm:justify-end sm:space-x-2 sm:gap-0",
-      className
-    )}
-    {...props}
-  />
-)
-SheetFooter.displayName = "SheetFooter"
-
-const SheetTitle = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Title>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
->(({ className, ...props }, ref) => (
-  // data-ph-unmask: sheet titles are static i18n chrome in session replays;
-  // a title carrying user data adds data-ph-mask at the call site.
-  <DialogPrimitive.Title
-    ref={ref}
-    data-ph-unmask=""
-    className={cn("break-words text-base tracking-tight", className)}
-    {...props}
-  />
-))
-SheetTitle.displayName = DialogPrimitive.Title.displayName
-
-const SheetDescription = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Description>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
->(({ className, ...props }, ref) => (
-  <DialogPrimitive.Description
-    ref={ref}
-    data-ph-unmask=""
-    className={cn("break-words text-sm text-muted-foreground", className)}
-    {...props}
-  />
-))
-SheetDescription.displayName = DialogPrimitive.Description.displayName
-
-export {
-  Sheet,
-  SheetPortal,
-  SheetOverlay,
-  SheetTrigger,
-  SheetClose,
-  SheetContent,
-  SheetHeader,
-  SheetFooter,
-  SheetTitle,
-  SheetDescription,
-}
diff --git a/extensions/general/arcim-migration/lib/arcim-client.ts b/extensions/general/arcim-migration/lib/arcim-client.ts
index 32794027..6cfb6052 100644
--- a/extensions/general/arcim-migration/lib/arcim-client.ts
+++ b/extensions/general/arcim-migration/lib/arcim-client.ts
@@ -8,13 +8,9 @@
 import type {
   ArcimProvider,
   ConsentRecord,
-  OtcResponse,
   PaginatedResponse,
   CompanyInformationDto,
   CustomerDto,
-  SupplierDto,
-  SalesInvoiceDto,
-  SupplierInvoiceDto,
 } from '../types'
 
 function getBaseUrl(): string {
@@ -105,70 +101,6 @@ export async function getConsent(consentId: string): Promise<ConsentRecord> {
   return request<ConsentRecord>(`/api/v1/consents/${consentId}`)
 }
 
-export async function generateOtc(
-  consentId: string,
-  expiresInMinutes: number = 60
-): Promise<OtcResponse> {
-  return request<OtcResponse>(`/api/v1/consents/${consentId}/otc`, {
-    method: 'POST',
-    body: JSON.stringify({ expiresInMinutes }),
-  })
-}
-
-export async function deleteConsent(consentId: string): Promise<void> {
-  await request(`/api/v1/consents/${consentId}`, { method: 'DELETE' })
-}
-
-// ── OAuth helpers ───────────────────────────────────────────────────
-
-export async function getAuthUrl(
-  provider: ArcimProvider,
-  state?: string,
-  redirectUri?: string
-): Promise<{ url: string }> {
-  const params = new URLSearchParams()
-  if (state) params.set('state', state)
-  if (redirectUri) params.set('redirectUri', redirectUri)
-  const qs = params.toString()
-  return request<{ url: string }>(`/api/v1/auth/${provider}/url${qs ? `?${qs}` : ''}`)
-}
-
-export async function exchangeAuthToken(
-  consentId: string,
-  provider: ArcimProvider,
-  otcCode: string,
-  oauthCode: string,
-  redirectUri?: string
-): Promise<{ success: boolean; consentId: string }> {
-  return request(`/api/v1/auth/${provider}/callback`, {
-    method: 'POST',
-    body: JSON.stringify({
-      code: oauthCode,
-      consentId,
-      otcCode,
-      ...(redirectUri ? { redirectUri } : {}),
-    }),
-  })
-}
-
-// ── Token-based auth (Bokio, Björn Lundén, Briox) ──────────────────
-
-export async function submitProviderToken(
-  consentId: string,
-  provider: ArcimProvider,
-  apiToken: string,
-  companyId?: string
-): Promise<{ success: boolean; consentId: string }> {
-  return request(`/api/v1/auth/${provider}/callback`, {
-    method: 'POST',
-    body: JSON.stringify({
-      code: apiToken,
-      consentId,
-      ...(companyId ? { companyId } : {}),
-    }),
-  })
-}
-
 // ── Resource fetching (paginated) ───────────────────────────────────
 
 async function fetchAllPages<T>(
@@ -215,24 +147,6 @@ export async function fetchCustomers(consentId: string): Promise<CustomerDto[]>
   return fetchAllPages<CustomerDto>(consentId, 'customers')
 }
 
-export async function fetchSuppliers(consentId: string): Promise<SupplierDto[]> {
-  return fetchAllPages<SupplierDto>(consentId, 'suppliers')
-}
-
-export async function fetchSalesInvoices(
-  consentId: string,
-  params?: Record<string, string>
-): Promise<SalesInvoiceDto[]> {
-  return fetchAllPages<SalesInvoiceDto>(consentId, 'salesinvoices', params)
-}
-
-export async function fetchSupplierInvoices(
-  consentId: string,
-  params?: Record<string, string>
-): Promise<SupplierInvoiceDto[]> {
-  return fetchAllPages<SupplierInvoiceDto>(consentId, 'supplierinvoices', params)
-}
-
 // The gateway SIE export path (fetchSIEExport/SIEExportFile) was deliberately
 // removed: it returned SIE as a pre-decoded string, and the gateway's decode of
 // CP437 bytes as windows-1252 caused the 2026-03-17 mojibake incident. Provider
diff --git a/extensions/general/arcim-migration/lib/migration-orchestrator.ts b/extensions/general/arcim-migration/lib/migration-orchestrator.ts
index 7452ef31..8b75bdaa 100644
--- a/extensions/general/arcim-migration/lib/migration-orchestrator.ts
+++ b/extensions/general/arcim-migration/lib/migration-orchestrator.ts
@@ -18,6 +18,7 @@
  * entities completes in a handful of Supabase requests per step.
  */
 
+import { chunk } from '@/lib/utils'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import type { MigrationProgress, MigrationResults, MigrationStepError, SkipReasons } from '../types'
 import type { ProviderName } from '@/lib/providers/types'
@@ -90,12 +91,6 @@ function emitProgress(options: MigrationOptions, progress: MigrationProgress) {
   options.onProgress?.(progress)
 }
 
-function chunk<T>(arr: T[], size: number): T[][] {
-  const out: T[][] = []
-  for (let i = 0; i < arr.length; i += size) out.push(arr.slice(i, i + size))
-  return out
-}
-
 /**
  * Codes that doom every remaining provider call in this run: dead/expired
  * grant, missing integration license, API module not activated. Continuing
diff --git a/extensions/general/arcim-migration/lib/provider-client.ts b/extensions/general/arcim-migration/lib/provider-client.ts
index 8ba36111..2f9092e0 100644
--- a/extensions/general/arcim-migration/lib/provider-client.ts
+++ b/extensions/general/arcim-migration/lib/provider-client.ts
@@ -99,13 +99,7 @@ export class ProviderCompanyMismatchError extends Error {
 
 // Re-export data fetching functions from the provider layer
 export { resolveConsent } from '@/lib/providers/resolve-consent'
-export {
-  fetchCompanyInfoDirect,
-  fetchCustomersDirect,
-  fetchSuppliersDirect,
-  fetchSalesInvoicesDirect,
-  fetchSupplierInvoicesDirect,
-} from '@/lib/providers/provider-data-fetcher'
+export { fetchCompanyInfoDirect } from '@/lib/providers/provider-data-fetcher'
 
 // ── Consent lifecycle (direct Supabase) ─────────────────────────────
 
diff --git a/extensions/general/arcim-migration/types.ts b/extensions/general/arcim-migration/types.ts
index eb8f99e1..95d1f940 100644
--- a/extensions/general/arcim-migration/types.ts
+++ b/extensions/general/arcim-migration/types.ts
@@ -7,30 +7,17 @@
 
 import type { HydrationReport } from '@/lib/providers/provider-data-fetcher'
 
-// Re-export canonical DTOs used by entity-mapper and migration-orchestrator
+// Re-export the canonical DTOs used by arcim-client (entity-mapper imports
+// its DTOs straight from '@/lib/providers/dto')
 export type {
-  AmountType,
-  PostalAddress,
-  Contact,
-  PartyIdentification,
-  PartyLegalEntity,
-  PartyDto,
   PaginatedResponse,
-  TaxSubtotalDto,
-  TaxTotalDto,
-  LegalMonetaryTotalDto,
-  PaymentStatusDto,
   CompanyInformationDto,
   CustomerDto,
   SupplierDto,
-  InvoiceStatusCode,
-  SalesInvoiceLineDto,
   SalesInvoiceDto,
-  SupplierInvoiceLineDto,
   SupplierInvoiceDto,
 } from '@/lib/providers/dto'
 
-export type { CustomerType as ArcimCustomerType } from '@/lib/providers/dto'
 
 // ── Supported providers ─────────────────────────────────────────────
 
diff --git a/extensions/general/bolagsverket/types.ts b/extensions/general/bolagsverket/types.ts
index 0327493a..beeac131 100644
--- a/extensions/general/bolagsverket/types.ts
+++ b/extensions/general/bolagsverket/types.ts
@@ -90,14 +90,6 @@ export interface KontrolleraSvar {
 
 // ---- inlamning (v2.1) ------------------------------------------------------
 
-export interface InlamningBegaran {
-  undertecknare: string
-  epostadresser: string[]
-  kvittensepostadresser?: string[]
-  notifieringEpostadresser?: string[]
-  handling: { fil: string; typ: HandlingTyp }
-}
-
 export interface InlamningSvar {
   orgnr: string
   avsandare: string
diff --git a/extensions/general/calendar/components/PaymentSummaryCard.tsx b/extensions/general/calendar/components/PaymentSummaryCard.tsx
deleted file mode 100644
index b92243f3..00000000
--- a/extensions/general/calendar/components/PaymentSummaryCard.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-'use client'
-
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Invoice } from '@/types'
-import { calculatePeriodSummary, SWEDISH_MONTHS } from '@/lib/calendar/utils'
-import { formatCurrency } from '@/lib/utils'
-import { TrendingUp, Clock, CheckCircle, AlertTriangle } from 'lucide-react'
-
-interface PaymentSummaryCardProps {
-  invoices: Invoice[]
-  year: number
-  month: number
-}
-
-export function PaymentSummaryCard({ invoices, year, month }: PaymentSummaryCardProps) {
-  const summary = calculatePeriodSummary(invoices)
-
-  return (
-    <Card>
-      <CardHeader className="pb-2">
-        <CardTitle className="text-lg">
-          Sammanfattning {SWEDISH_MONTHS[month]} {year}
-        </CardTitle>
-      </CardHeader>
-      <CardContent className="space-y-4">
-        {/* Expected */}
-        <div className="flex items-center justify-between">
-          <div className="flex items-center gap-2">
-            <div className="h-8 w-8 rounded-lg bg-muted flex items-center justify-center">
-              <TrendingUp className="h-4 w-4 text-muted-foreground" />
-            </div>
-            <div>
-              <p className="text-sm text-muted-foreground">Förväntat</p>
-              <p className="text-sm font-medium">{summary.pendingCount} fakturor</p>
-            </div>
-          </div>
-          <p className="text-lg font-semibold">{formatCurrency(summary.totalExpected)}</p>
-        </div>
-
-        {/* Overdue */}
-        {summary.overdueCount > 0 && (
-          <div className="flex items-center justify-between">
-            <div className="flex items-center gap-2">
-              <div className="h-8 w-8 rounded-lg bg-muted flex items-center justify-center">
-                <AlertTriangle className="h-4 w-4 text-muted-foreground" />
-              </div>
-              <div>
-                <p className="text-sm text-muted-foreground">Förfallen</p>
-                <p className="text-sm font-medium text-destructive">
-                  {summary.overdueCount} fakturor
-                </p>
-              </div>
-            </div>
-            <p className="text-lg font-semibold text-destructive">
-              {formatCurrency(summary.totalOverdue)}
-            </p>
-          </div>
-        )}
-
-        {/* Paid */}
-        <div className="flex items-center justify-between">
-          <div className="flex items-center gap-2">
-            <div className="h-8 w-8 rounded-lg bg-muted flex items-center justify-center">
-              <CheckCircle className="h-4 w-4 text-muted-foreground" />
-            </div>
-            <div>
-              <p className="text-sm text-muted-foreground">Betald</p>
-              <p className="text-sm font-medium">{summary.paidCount} fakturor</p>
-            </div>
-          </div>
-          <p className="text-lg font-semibold text-success">
-            {formatCurrency(summary.totalPaid)}
-          </p>
-        </div>
-
-        {/* Pending */}
-        {summary.pendingCount > 0 && summary.overdueCount < summary.pendingCount && (
-          <div className="flex items-center justify-between">
-            <div className="flex items-center gap-2">
-              <div className="h-8 w-8 rounded-lg bg-muted flex items-center justify-center">
-                <Clock className="h-4 w-4 text-muted-foreground" />
-              </div>
-              <div>
-                <p className="text-sm text-muted-foreground">Väntande</p>
-                <p className="text-sm font-medium">
-                  {summary.pendingCount - summary.overdueCount} fakturor
-                </p>
-              </div>
-            </div>
-            <p className="text-lg font-semibold">
-              {formatCurrency(summary.totalExpected - summary.totalOverdue)}
-            </p>
-          </div>
-        )}
-
-        {/* Foreign-currency invoices without a stored SEK conversion are
-            excluded from the sums above rather than silently mixed in. */}
-        {summary.unconvertedCount > 0 && (
-          <p className="text-xs text-warning">
-            {summary.unconvertedCount === 1
-              ? '1 faktura i utländsk valuta utan växelkurs ingår inte i beloppen.'
-              : `${summary.unconvertedCount} fakturor i utländsk valuta utan växelkurs ingår inte i beloppen.`}
-          </p>
-        )}
-      </CardContent>
-    </Card>
-  )
-}
diff --git a/extensions/general/cloud-backup/lib/backup-alert.ts b/extensions/general/cloud-backup/lib/backup-alert.ts
index fda7d0e0..8fb53ef6 100644
--- a/extensions/general/cloud-backup/lib/backup-alert.ts
+++ b/extensions/general/cloud-backup/lib/backup-alert.ts
@@ -15,6 +15,7 @@ import type { SupabaseClient } from '@supabase/supabase-js'
 import { getEmailService } from '@/lib/email/service'
 import { createLogger } from '@/lib/logger'
 import { resolveMemberEmail } from '@/lib/notifications/member-email'
+import { escapeHtml } from '@/lib/email/user-text'
 
 const log = createLogger('cloud-backup-alert')
 
@@ -127,11 +128,3 @@ async function fetchCompanyName(
   return (data?.company_name as string) || 'ditt företag'
 }
 
-function escapeHtml(input: string): string {
-  return input
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;')
-}
diff --git a/extensions/general/cloud-backup/lib/sync.ts b/extensions/general/cloud-backup/lib/sync.ts
index e00b576f..74cc9560 100644
--- a/extensions/general/cloud-backup/lib/sync.ts
+++ b/extensions/general/cloud-backup/lib/sync.ts
@@ -18,8 +18,6 @@ import type {
   CloudLastSync,
 } from '../types'
 
-export { ROOT_FOLDER_NAME } from './folder-names'
-
 /**
  * Google Drive's storage keys, re-exported for the call sites that predate
  * multi-provider support. Provider-aware code reads `provider.keys` instead:
@@ -27,7 +25,6 @@ export { ROOT_FOLDER_NAME } from './folder-names'
  */
 export const CONNECTION_KEY = 'google_drive_connection'
 export const LAST_SYNC_KEY = 'google_drive_last_sync'
-export const SCHEDULE_KEY = 'google_drive_schedule'
 /**
  * Per-FILE ceiling, not per-backup: the backup splits into one archive per
  * räkenskapsår plus Grunddata.zip, and uploads are resumable/chunked. The
diff --git a/extensions/general/cloud-backup/types.ts b/extensions/general/cloud-backup/types.ts
index 4396073a..bd1dd811 100644
--- a/extensions/general/cloud-backup/types.ts
+++ b/extensions/general/cloud-backup/types.ts
@@ -75,9 +75,6 @@ export interface CloudFileState {
   uploaded_at: string
 }
 
-/** @deprecated Use {@link CloudFileState}. Kept for existing call sites. */
-export type DriveFileState = CloudFileState
-
 /**
  * Last-sync snapshot stored under key `google_drive_last_sync` /
  * `dropbox_last_sync`.
diff --git a/extensions/general/enable-banking/lib/api-client.ts b/extensions/general/enable-banking/lib/api-client.ts
index a57854e7..03c49bf3 100644
--- a/extensions/general/enable-banking/lib/api-client.ts
+++ b/extensions/general/enable-banking/lib/api-client.ts
@@ -145,15 +145,6 @@ export interface TransactionsResponse {
  */
 export type TransactionsFetchStrategy = 'default' | 'longest'
 
-// Legacy types for backward compatibility
-export interface Bank {
-  id: string
-  name: string
-  bic?: string
-  countries: string[]
-  logo_url?: string
-}
-
 export interface BankTransaction {
   id: string
   date: string
@@ -456,32 +447,6 @@ export async function getPreferredAuthMethod(
   return method?.name
 }
 
-/**
- * Get list of supported banks (legacy format for backward compatibility)
- */
-export async function getSupportedBanks(): Promise<Bank[]> {
-  try {
-    const aspsps = await getASPSPs('SE')
-
-    return aspsps.map((aspsp) => ({
-      id: `${aspsp.name.toLowerCase().replace(/\s+/g, '-')}-se`,
-      name: aspsp.name,
-      bic: aspsp.bic,
-      countries: [aspsp.country],
-      logo_url: aspsp.logo,
-    }))
-  } catch (error) {
-    console.error('Error fetching banks:', error)
-    // Return fallback list
-    return [
-      { id: 'nordea-se', name: 'Nordea', bic: 'NDEASESS', countries: ['SE'] },
-      { id: 'seb-se', name: 'SEB', bic: 'ESSESESS', countries: ['SE'] },
-      { id: 'swedbank-se', name: 'Swedbank', bic: 'SWEDSESS', countries: ['SE'] },
-      { id: 'handelsbanken-se', name: 'Handelsbanken', bic: 'HANDSESS', countries: ['SE'] },
-    ]
-  }
-}
-
 /**
  * Start bank authorization flow
  *
@@ -1171,19 +1136,6 @@ export function convertTransaction(tx: Transaction, accountCurrency: string): Ba
   }
 }
 
-/**
- * Get transactions in legacy format
- */
-export async function getTransactions(
-  accountUid: string,
-  fromDate?: string,
-  toDate?: string,
-  accountCurrency: string = 'SEK'
-): Promise<BankTransaction[]> {
-  const transactions = await getAllTransactions(accountUid, fromDate, toDate)
-  return transactions.map(tx => convertTransaction(tx, accountCurrency))
-}
-
 /**
  * Whether the current configuration targets the sandbox API
  */
diff --git a/extensions/general/enable-banking/lib/jwt.ts b/extensions/general/enable-banking/lib/jwt.ts
index cb7eef1e..0fdbdc17 100644
--- a/extensions/general/enable-banking/lib/jwt.ts
+++ b/extensions/general/enable-banking/lib/jwt.ts
@@ -7,8 +7,4 @@
  * it here so its own imports and tests are unchanged. The re-import direction
  * (extension -> lib) is the allowed one.
  */
-export {
-  generateJWT,
-  getAuthorizationHeader,
-  _resetTokenCache,
-} from '@/lib/connect/upstreams/enable-banking-jwt'
+export { getAuthorizationHeader, _resetTokenCache } from '@/lib/connect/upstreams/enable-banking-jwt'
diff --git a/extensions/general/enable-banking/types.ts b/extensions/general/enable-banking/types.ts
index 525e32b4..8cdaf71b 100644
--- a/extensions/general/enable-banking/types.ts
+++ b/extensions/general/enable-banking/types.ts
@@ -42,18 +42,6 @@ export interface StoredAccount {
   deselected_elsewhere?: boolean
 }
 
-// Re-export API types from the client
-export type {
-  ASPSP,
-  AuthMethod,
-  AuthResponse,
-  SessionResponse,
-  AccountInfo,
-  Balance,
-  BalanceResponse,
-  Transaction as EnableBankingTransaction,
-  TransactionsResponse,
-  TransactionsFetchStrategy,
-  Bank,
-  BankTransaction,
-} from './lib/api-client'
+// Re-exported from the client for lib/sync.ts; every other api-client type
+// is imported from './lib/api-client' directly.
+export type { TransactionsFetchStrategy } from './lib/api-client'
diff --git a/extensions/general/invoice-inbox/lib/resend-inbound.ts b/extensions/general/invoice-inbox/lib/resend-inbound.ts
index da77fac1..7c569b27 100644
--- a/extensions/general/invoice-inbox/lib/resend-inbound.ts
+++ b/extensions/general/invoice-inbox/lib/resend-inbound.ts
@@ -1,8 +1,6 @@
 import { Resend } from 'resend'
 import type { EmailReceivedEvent, GetReceivingEmailResponseSuccess, WebhookEventPayload } from 'resend'
 
-export type ResendInboundEvent = EmailReceivedEvent
-
 export type ResendReceivedEmail = GetReceivingEmailResponseSuccess
 
 export interface ResendAttachmentDownload {
diff --git a/extensions/general/invoice-inbox/lib/upload-and-extract.ts b/extensions/general/invoice-inbox/lib/upload-and-extract.ts
index 369c9f8e..e7657bc2 100644
--- a/extensions/general/invoice-inbox/lib/upload-and-extract.ts
+++ b/extensions/general/invoice-inbox/lib/upload-and-extract.ts
@@ -12,6 +12,7 @@ import { matchSupplierId } from '@/lib/suppliers/match-supplier'
 import type { InvoiceExtractionResult } from '@/types'
 import { PDFDocument } from 'pdf-lib'
 import path from 'node:path'
+import { escapeHtml } from '@/lib/email/user-text'
 
 // Verdicts decidable before touching the file. `ai_unconfigured` is the
 // deployment-level "no AI backend" state (self-host without a key), distinct
@@ -139,15 +140,6 @@ export const UPLOAD_ALLOWED_MIME_TYPES = new Set([
 // inbound webhook, where the preview surfaces render it fully sandboxed.
 export const EMAIL_ALLOWED_MIME_TYPES = new Set([...UPLOAD_ALLOWED_MIME_TYPES, 'text/html'])
 
-function escapeHtml(raw: string): string {
-  return raw
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;')
-}
-
 /**
  * Wrap HTML in a minimal document shell unless it already is a full document.
  * Mail bodies are usually fragments (a bare <div>/<table>); the document
diff --git a/extensions/general/mcp-server/company-routing.ts b/extensions/general/mcp-server/company-routing.ts
index 9a3e787c..01430763 100644
--- a/extensions/general/mcp-server/company-routing.ts
+++ b/extensions/general/mcp-server/company-routing.ts
@@ -34,13 +34,13 @@ export function isOptionalCompanyTool(toolName: string): boolean {
   return OPTIONAL_COMPANY_TOOLS.has(toolName)
 }
 
-export const COMPANY_ID_INPUT_PROPERTY = {
+const COMPANY_ID_INPUT_PROPERTY = {
   type: 'string',
   format: 'uuid',
   description: 'Target company ID. Omit for default.',
 } as const
 
-export interface McpCompanyContext {
+interface McpCompanyContext {
   companyId: string
   role: CompanyRole
   isDefault: boolean
diff --git a/extensions/general/mcp-server/server.ts b/extensions/general/mcp-server/server.ts
index 37eb03e4..b6d14dbe 100644
--- a/extensions/general/mcp-server/server.ts
+++ b/extensions/general/mcp-server/server.ts
@@ -1,3 +1,4 @@
+import { UUID_RE } from '@/lib/invariants/uuid'
 import { NextResponse, after } from 'next/server'
 import {
   TASKS_EXTENSION_ID,
@@ -61,7 +62,7 @@ import { eventBus } from '@/lib/events/bus'
 import { getVatRules, getPermittedVatRates, getArticleVatRateAdoptionSet } from '@/lib/invoices/vat-rules'
 import { validateDeductionLines } from '@/lib/invoices/rot-rut-rules'
 import { computeLineNet } from '@/lib/invoices/line-amounts'
-import { fetchExchangeRate, convertToSEK } from '@/lib/currency/riksbanken'
+import { fetchExchangeRate } from '@/lib/currency/riksbanken'
 import { getBranding } from '@/lib/branding/service'
 import { generateIncomeStatement } from '@/lib/reports/income-statement'
 import {
@@ -172,9 +173,8 @@ import {
   checkIdempotencyKey,
   storeIdempotencyResponse,
   hashRequest,
-  IdempotencyKeyReuseError,
 } from '@/lib/api/idempotency'
-import { toToolError, withNext, type NextActionHint } from './tool-result'
+import { toToolError, type NextActionHint } from './tool-result'
 import {
   addCompanyToNextHint,
   addCompanyToTopLevelNext,
@@ -215,7 +215,6 @@ import {
 import { generateSupplierLedger } from '@/lib/reports/supplier-ledger'
 import { getReconciliationStatus } from '@/lib/reconciliation/bank-reconciliation'
 import { resolveCashAccountScope } from '@/lib/reconciliation/cash-account-scope'
-import { createInvoicePaymentJournalEntry, createInvoiceCashEntry, createInvoiceJournalEntry } from '@/lib/bookkeeping/invoice-entries'
 import { findMatchingInvoices } from '@/lib/invoices/invoice-matching'
 import { sanitizeDeliveryRecipientStatuses } from '@/lib/invoices/delivery-recipient-statuses'
 import { listRotRutCandidates, createRotRutPayoutRequest } from '@/lib/invoices/rot-rut-service'
@@ -229,8 +228,8 @@ import {
   findMatchingVouchersForSupplierInvoice,
   validateVoucherForSupplierInvoiceLink,
 } from '@/lib/invoices/supplier-voucher-matching'
-import { findFiscalPeriod, getSwedishLocalDate, reverseEntry, validateBalance } from '@/lib/bookkeeping/engine'
-import { closePeriod, countUnbookedInPeriod, findNextPeriod, lockPeriod, resolvePeriodStatusForDate, type PeriodStatusForDate } from '@/lib/core/bookkeeping/period-service'
+import { findFiscalPeriod, getSwedishLocalDate, validateBalance } from '@/lib/bookkeeping/engine'
+import { countUnbookedInPeriod, findNextPeriod, lockPeriod, resolvePeriodStatusForDate, type PeriodStatusForDate } from '@/lib/core/bookkeeping/period-service'
 import { validateYearEndReadiness, previewYearEndClosing } from '@/lib/core/bookkeeping/year-end-service'
 import {
   assessKontantmetodCutoff,
@@ -242,22 +241,15 @@ import {
 } from '@/lib/core/bookkeeping/kontantmetod-cutoff'
 import { generateSIEExport } from '@/lib/reports/sie-export'
 import { generateFullArchive, estimateArchiveSize } from '@/lib/reports/full-archive-export'
-import { bookkeepingErrorResponse, CorrectionChainTooDeepError } from '@/lib/bookkeeping/errors'
+import { CorrectionChainTooDeepError } from '@/lib/bookkeeping/errors'
 import { correctionChainDepth, CORRECTION_CHAIN_GUARD_DEPTH } from '@/lib/core/bookkeeping/correction-chain'
 import { getSuggestedCategories, buildMerchantHistory, merchantHistoryFor } from '@/lib/transactions/category-suggestions'
 import { detectBookingDuplicate } from '@/lib/transactions/booking-duplicate-detection'
 import { buildDuplicateBookingClaim } from '@/lib/transactions/categorize-core'
 import { findDuplicatePaymentCandidatesForInvoice } from '@/lib/invoices/duplicate-payment-candidates'
-import { renderToBuffer } from '@react-pdf/renderer'
-import { InvoicePDF } from '@/lib/invoices/pdf-template'
 import { getEmailService } from '@/lib/email/service'
 import { hasCapability, capabilityBlockedError } from '@/lib/entitlements/has-capability'
 import { MCP_TOOL_CAPABILITY_MAP } from '@/lib/entitlements/keys'
-import {
-  generateInvoiceEmailHtml,
-  generateInvoiceEmailText,
-  generateInvoiceEmailSubject,
-} from '@/lib/email/invoice-templates'
 import {
   completePendingDocumentUpload,
   createPendingDocumentUpload,
@@ -481,6 +473,56 @@ interface McpToolAnnotations {
   openWorldHint?: boolean
 }
 
+// Shared annotation sets. tools/list serialises `annotations` as-is, so a
+// shared frozen object emits exactly the JSON an inline literal did; nothing
+// mutates a tool's annotations after registration. Tools whose hints need
+// a per-tool explanation keep an inline block with comments.
+const ANNOTATIONS_READ_ONLY = {
+  readOnlyHint: true,
+  destructiveHint: false,
+  idempotentHint: true,
+  openWorldHint: false,
+} as const satisfies McpToolAnnotations
+/** Stages a pending operation or writes once; retries are not idempotent. */
+const ANNOTATIONS_STAGED_WRITE = {
+  readOnlyHint: false,
+  destructiveHint: false,
+  idempotentHint: false,
+  openWorldHint: false,
+} as const satisfies McpToolAnnotations
+const ANNOTATIONS_IDEMPOTENT_WRITE = {
+  readOnlyHint: false,
+  destructiveHint: false,
+  idempotentHint: true,
+  openWorldHint: false,
+} as const satisfies McpToolAnnotations
+const ANNOTATIONS_DESTRUCTIVE_WRITE = {
+  readOnlyHint: false,
+  destructiveHint: true,
+  idempotentHint: false,
+  openWorldHint: false,
+} as const satisfies McpToolAnnotations
+const ANNOTATIONS_DESTRUCTIVE_IDEMPOTENT_WRITE = {
+  readOnlyHint: false,
+  destructiveHint: true,
+  idempotentHint: true,
+  openWorldHint: false,
+} as const satisfies McpToolAnnotations
+/** Read-only tools that call an external system (Skatteverket, Riksbanken). */
+const ANNOTATIONS_READ_ONLY_OPEN_WORLD = {
+  readOnlyHint: true,
+  destructiveHint: false,
+  idempotentHint: true,
+  openWorldHint: true,
+} as const satisfies McpToolAnnotations
+/** Writes that also reach an external system. */
+const ANNOTATIONS_WRITE_OPEN_WORLD = {
+  readOnlyHint: false,
+  destructiveHint: false,
+  idempotentHint: false,
+  openWorldHint: true,
+} as const satisfies McpToolAnnotations
+
 interface McpTool {
   name: string
   // Top-level Tool.title per MCP spec 2025-06-18 (human-facing label for
@@ -1093,7 +1135,7 @@ async function resolveJournalEntryRef(
 
   // UUIDs pass through. If the UUID was hallucinated, the caller's own
   // lookup surfaces the "not found" diagnostic with the supplied value.
-  if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(trimmed)) {
+  if (UUID_RE.test(trimmed)) {
     return trimmed
   }
 
@@ -1582,11 +1624,9 @@ async function resolveSieToolContent(
     if (!sha256) return
     const actual = createHash('sha256').update(buffer).digest('hex')
     if (actual !== sha256) {
-      throw Object.assign(
-        new Error(
-          `sha256 mismatch on ${source}: expected ${sha256}, got ${actual}. The content was truncated or altered; re-send it.`
-        ),
-        { code: 'VALIDATION_ERROR' }
+      throw codedError(
+        'VALIDATION_ERROR',
+        `sha256 mismatch on ${source}: expected ${sha256}, got ${actual}. The content was truncated or altered; re-send it.`
       )
     }
   }
@@ -1596,19 +1636,15 @@ async function resolveSieToolContent(
   if (typeof args.upload_id === 'string' && args.upload_id.length > 0) {
     const fileName = typeof args.filename === 'string' ? args.filename : ''
     if (!fileName) {
-      throw Object.assign(new Error('filename is required together with upload_id'), {
-        code: 'VALIDATION_ERROR',
-      })
+      throw codedError('VALIDATION_ERROR', 'filename is required together with upload_id')
     }
     const service = createServiceClientNoCookies()
     const pendingPath = buildPendingDocumentStoragePath(companyId, userId, args.upload_id, fileName)
     const { data, error } = await service.storage.from(DOCUMENTS_BUCKET).download(pendingPath)
     if (error || !data) {
-      throw Object.assign(
-        new Error(
-          'No uploaded file found for this upload_id. PUT the raw file bytes to the upload_url from gnubok_create_sie_upload first (same upload_id and filename).'
-        ),
-        { code: 'NOT_FOUND' }
+      throw codedError(
+        'NOT_FOUND',
+        'No uploaded file found for this upload_id. PUT the raw file bytes to the upload_url from gnubok_create_sie_upload first (same upload_id and filename).'
       )
     }
     const buffer = Buffer.from(await data.arrayBuffer())
@@ -1623,11 +1659,9 @@ async function resolveSieToolContent(
     // always does) has byte-exact content and the hash check below IS the
     // truncation guard, so the cap does not apply.
     if (!sha256 && args.file_content_base64.length > MAX_INLINE_SIE_CHARS) {
-      throw Object.assign(
-        new Error(
-          'File too large to pass inline safely without a sha256. Use gnubok_create_sie_upload (drag-and-drop card / PUT to its upload_url) and pass the upload_id here, or include sha256 of the raw bytes.'
-        ),
-        { code: 'VALIDATION_ERROR' }
+      throw codedError(
+        'VALIDATION_ERROR',
+        'File too large to pass inline safely without a sha256. Use gnubok_create_sie_upload (drag-and-drop card / PUT to its upload_url) and pass the upload_id here, or include sha256 of the raw bytes.'
       )
     }
     const buffer = Buffer.from(args.file_content_base64, 'base64')
@@ -1638,11 +1672,9 @@ async function resolveSieToolContent(
 
   if (typeof args.file_content === 'string' && args.file_content.length > 0) {
     if (args.file_content.length > MAX_INLINE_SIE_CHARS) {
-      throw Object.assign(
-        new Error(
-          'File too large to pass inline safely (silent mid-verifikat truncation risk). Use gnubok_create_sie_upload, PUT the raw bytes to its upload_url, and pass the upload_id here instead.'
-        ),
-        { code: 'VALIDATION_ERROR' }
+      throw codedError(
+        'VALIDATION_ERROR',
+        'File too large to pass inline safely (silent mid-verifikat truncation risk). Use gnubok_create_sie_upload, PUT the raw bytes to its upload_url, and pass the upload_id here instead.'
       )
     }
     return args.file_content
@@ -1657,9 +1689,9 @@ async function resolveSieToolContent(
  */
 function connectLinkBaseUrl(): string {
   if (!process.env.NEXT_PUBLIC_APP_URL) {
-    throw Object.assign(
-      new Error('NEXT_PUBLIC_APP_URL is not configured on this installation; cannot build a connect link'),
-      { code: 'INTERNAL_ERROR' }
+    throw codedError(
+      'INTERNAL_ERROR',
+      'NEXT_PUBLIC_APP_URL is not configured on this installation; cannot build a connect link'
     )
   }
   return getCanonicalBaseUrl()
@@ -1860,7 +1892,7 @@ const RUTA_05_COMPATIBILITY_ACCOUNTS = [
   '3071', '3072', '3073', '3074', '3075', '3076', '3077', '3078',
 ] as const
 
-export interface VatReportResult {
+interface VatReportResult {
   period: { type: string; year: number; period: number; start: string; end: string }
   period_label: string
   rutor: {
@@ -1877,7 +1909,7 @@ export interface VatReportResult {
   warnings: string[]
 }
 
-export interface VatReportWithRutor {
+interface VatReportWithRutor {
   report: VatReportResult
   dynamicVatAccounts: Awaited<ReturnType<typeof fetchDynamicVatAccounts>>
   /**
@@ -1919,7 +1951,7 @@ export async function computeVatReport(
   return report
 }
 
-export async function computeVatReportWithRutor(
+async function computeVatReportWithRutor(
   args: Record<string, unknown>,
   companyId: string,
   supabase: SupabaseClient
@@ -2388,13 +2420,6 @@ function jaccardSimilarity(a: Set<string>, b: Set<string>): number {
  */
 const MISSING_UNDERLAG_MIN_GROSS_SEK = 4000
 
-/** ISO date one day after `isoDate`, in UTC so no local offset can shift it. */
-function dayAfter(isoDate: string): string {
-  const d = new Date(`${isoDate}T00:00:00Z`)
-  d.setUTCDate(d.getUTCDate() + 1)
-  return d.toISOString().slice(0, 10)
-}
-
 /** One `verifikat_without_documents` page-of-one, used only for its total. */
 async function totalMissingUnderlagSince(
   supabase: SupabaseClient,
@@ -2458,11 +2483,72 @@ async function countMissingUnderlagInPeriod(
 ): Promise<number> {
   const [fromStart, afterEnd] = await Promise.all([
     totalMissingUnderlagSince(supabase, companyId, start),
-    totalMissingUnderlagSince(supabase, companyId, dayAfter(end)),
+    totalMissingUnderlagSince(supabase, companyId, nextDay(end)),
   ])
   return Math.max(0, fromStart - afterEnd)
 }
 
+/**
+ * Resolve the fiscal period a report tool runs against: the caller's
+ * `period_id` when given, else the company's most recent period. The period
+ * is then re-read scoped to the company, so a foreign id never resolves.
+ */
+async function resolveReportPeriod(
+  supabase: SupabaseClient,
+  companyId: string,
+  periodIdArg: unknown,
+  noPeriodsMessage: string,
+) {
+  let periodId = periodIdArg as string | undefined
+
+  if (!periodId) {
+    const { data: periods } = await supabase
+      .from('fiscal_periods')
+      .select('id')
+      .eq('company_id', companyId)
+      .order('period_start', { ascending: false })
+      .limit(1)
+      .single()
+
+    if (!periods) throw new Error(noPeriodsMessage)
+    periodId = periods.id
+  }
+
+  const { data: period } = await supabase
+    .from('fiscal_periods')
+    .select('id, name, period_start, period_end')
+    .eq('id', periodId)
+    .eq('company_id', companyId)
+    .single()
+
+  if (!period) throw new Error('Fiscal period not found.')
+  return period
+}
+
+/** Invoice row plus its customer, scoped to the company; throws when absent. */
+async function fetchInvoiceWithCustomer(supabase: SupabaseClient, companyId: string, invoiceId: string) {
+  const { data: invoice, error: invoiceError } = await supabase
+    .from('invoices')
+    .select('*, customer:customers(*)')
+    .eq('id', invoiceId)
+    .eq('company_id', companyId)
+    .single()
+
+  if (invoiceError || !invoice) throw new Error('Invoice not found')
+  return invoice
+}
+
+/** Offset-pagination tail shared by the list tools: count/total/has_more/next_offset. */
+function pageTail(rows: unknown[], total: number, offset: number) {
+  const hasMore = offset + rows.length < total
+  return {
+    count: rows.length,
+    total_count: total,
+    has_more: hasMore,
+    ...(hasMore ? { next_offset: offset + rows.length } : {}),
+  }
+}
+
 /**
  * Resolve the cash-account identity before comparing its bank feed with the
  * ledger. The cashAccountId is what prevents another same-currency account
@@ -3004,12 +3090,7 @@ export const tools: McpTool[] = [
       additionalProperties: true,
       description: 'The inner tool\'s own result, unchanged.',
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute() {
       // Unreachable: the dispatcher rewrites the call before resolution. If
       // this ever throws, the rewrite was removed and every call would have
@@ -3048,12 +3129,7 @@ export const tools: McpTool[] = [
       },
       required: ['tools', 'count', 'total_matched', 'detail'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, _companyId, _userId, _supabase, _actor) {
       const namespace: McpToolNamespace =
         args.__toolNamespace === 'accounted' ? 'accounted' : 'gnubok'
@@ -3205,12 +3281,7 @@ export const tools: McpTool[] = [
       },
       required: ['companies', 'count', 'default_company_id'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(_args, defaultCompanyId, userId, supabase) {
       type CompanyRow = {
         id: string
@@ -3303,19 +3374,14 @@ export const tools: McpTool[] = [
       },
       required: ['status', 'company', 'suggested_create_company_input', 'still_to_ask', 'warnings', 'instructions'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: true,
-    },
+    annotations: ANNOTATIONS_READ_ONLY_OPEN_WORLD,
     async execute(args) {
       const raw = String((args as { org_number: string }).org_number ?? '')
       const normalized = normalizeOrgNumber(raw)
       if (!normalized) {
-        throw Object.assign(
-          new Error('Invalid organisationsnummer: expected 10 digits (hyphens and spaces are OK).'),
-          { code: 'VALIDATION_ERROR' }
+        throw codedError(
+          'VALIDATION_ERROR',
+          'Invalid organisationsnummer: expected 10 digits (hyphens and spaces are OK).'
         )
       }
 
@@ -3506,12 +3572,7 @@ export const tools: McpTool[] = [
         message: { type: 'string' },
       },
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, _companyId, userId, supabase) {
       const { confirm, ...setup } = args
       const parsed = CompanySetupSchema.safeParse(setup)
@@ -3519,11 +3580,11 @@ export const tools: McpTool[] = [
         const detail = parsed.error.issues
           .map((issue) => `${issue.path.join('.') || 'input'}: ${issue.message}`)
           .join('; ')
-        throw Object.assign(new Error(`Invalid company setup: ${detail}`), { code: 'VALIDATION_ERROR' })
+        throw codedError('VALIDATION_ERROR', `Invalid company setup: ${detail}`)
       }
       const plan = planCompanySetup(parsed.data)
       if (!plan.ok) {
-        throw Object.assign(new Error(`Invalid fiscal period: ${plan.error}`), { code: 'VALIDATION_ERROR' })
+        throw codedError('VALIDATION_ERROR', `Invalid fiscal period: ${plan.error}`)
       }
 
       const teamId = parsed.data.team_id ?? (await defaultTeamForUser(supabase, userId))
@@ -3649,12 +3710,7 @@ export const tools: McpTool[] = [
       required: ['connected', 'connections', 'connect_url', 'instructions'],
     },
     _meta: { ui: { resourceUri: 'ui://connect-card/app.html' } },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const { data, error } = await supabase
         .from('bank_connections')
@@ -3725,12 +3781,7 @@ export const tools: McpTool[] = [
       required: ['available', 'connected', 'token_expires_at', 'connect_url', 'instructions'],
     },
     _meta: { ui: { resourceUri: 'ui://connect-card/app.html' } },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(_args, companyId, _userId, supabase) {
       const enabled = process.env.SKATTEVERKET_ENABLED === 'true'
       const { data, error } = await supabase
@@ -3789,12 +3840,7 @@ export const tools: McpTool[] = [
       required: ['provider', 'provider_name', 'api_connected', 'connect_url', 'instructions'],
     },
     _meta: { ui: { resourceUri: 'ui://connect-card/app.html' } },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args) {
       const PROVIDERS: Record<string, { name: string; api: boolean }> = {
         fortnox: { name: 'Fortnox', api: true },
@@ -3807,9 +3853,9 @@ export const tools: McpTool[] = [
       const provider = String(args.provider ?? '')
       const info = PROVIDERS[provider]
       if (!info) {
-        throw Object.assign(
-          new Error(`Unknown provider "${provider}". Supported: ${Object.keys(PROVIDERS).join(', ')}.`),
-          { code: 'VALIDATION_ERROR' }
+        throw codedError(
+          'VALIDATION_ERROR',
+          `Unknown provider "${provider}". Supported: ${Object.keys(PROVIDERS).join(', ')}.`
         )
       }
       const connectUrl = `${connectLinkBaseUrl()}/import?mode=migration&provider=${provider}`
@@ -3897,12 +3943,7 @@ export const tools: McpTool[] = [
         'invoice_email_texts',
       ],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     catalogVisibility: 'search',
     async execute(_args, companyId, _userId, supabase) {
       const { data, error } = await supabase
@@ -3988,12 +4029,7 @@ export const tools: McpTool[] = [
         idempotency_key: { type: 'string', description: 'Random per-operation UUID. Reusing it with the same payload returns the original staged response.' },
       },
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     catalogVisibility: 'search',
     async execute(args, companyId, userId, supabase, actor) {
       const rawChanges: Record<string, unknown> = {}
@@ -4131,12 +4167,7 @@ export const tools: McpTool[] = [
       },
       required: ['skills', 'count', 'hidden_count', 'company_context'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const tag = (args.tag as string | undefined)?.toLowerCase().trim()
       const tier = (args.tier as SkillTier | undefined)
@@ -4232,12 +4263,7 @@ export const tools: McpTool[] = [
       },
       required: ['slug', 'name', 'body', 'tier'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase, actor) {
       const slug = (args.slug as string | undefined)?.trim()
       if (!slug) throw new Error('slug is required')
@@ -4311,12 +4337,7 @@ export const tools: McpTool[] = [
       },
       required: ['id', 'fact_id', 'kind', 'content', 'created_at'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase) {
       const content = (args.content as string | undefined)?.trim()
       if (!content || content.length < 2) throw new Error('content is required (min 2 chars)')
@@ -4411,12 +4432,7 @@ export const tools: McpTool[] = [
       },
       required: ['id', 'fact_id', 'is_active'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, _userId, supabase) {
       const id = (args.id as string | undefined)?.trim()
       if (!id) throw new Error('id is required')
@@ -4639,12 +4655,7 @@ export const tools: McpTool[] = [
       },
       required: ['company', 'user_name', 'profile_summary', 'atoms', 'memory', 'recommended_tools'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(_args, companyId, userId, supabase) {
       // Dimension registry is best-effort and cheap: one indexed read, skipped
       // output when empty (most companies never register dimensions: lazy
@@ -5018,12 +5029,7 @@ export const tools: McpTool[] = [
       },
       required: ['transactions'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const items = args.transactions as Array<Record<string, unknown>> | undefined
       if (!Array.isArray(items) || items.length === 0) {
@@ -5129,12 +5135,7 @@ export const tools: McpTool[] = [
         cash_account_ledger: { type: ['string', 'null'] },
       },
     }),
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 20), 100)
       const offset = Math.max(0, Number(args.offset) || 0)
@@ -5145,7 +5146,7 @@ export const tools: McpTool[] = [
       // The ledger number now sits next to the id in every row, so an agent
       // may well pass "1930" here: fail with a clear message instead of a
       // raw Postgres uuid cast error.
-      if (cashAccountId && !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(cashAccountId)) {
+      if (cashAccountId && !UUID_RE.test(cashAccountId)) {
         throw new Error('cash_account_id must be a cash account UUID (cash_accounts.id), not a ledger account number')
       }
 
@@ -5200,15 +5201,8 @@ export const tools: McpTool[] = [
         cash_account_ledger: t.cash_account_id ? ledgerByCashAccount.get(t.cash_account_id) ?? null : null,
       }))
       const total = totalCount ?? 0
-      const hasMore = total > offset + rows.length
 
-      return {
-        transactions: rows,
-        count: rows.length,
-        total_count: total,
-        has_more: hasMore,
-        ...(hasMore ? { next_offset: offset + rows.length } : {}),
-      }
+      return { transactions: rows, ...pageTail(rows, total, offset) }
     },
   },
 
@@ -5245,12 +5239,7 @@ export const tools: McpTool[] = [
         cash_account_ledger: { type: ['string', 'null'] },
       },
     }),
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 20), 100)
       const offset = Math.max(0, Number(args.offset) || 0)
@@ -5282,14 +5271,7 @@ export const tools: McpTool[] = [
 
       const rows = result.transactions ?? []
       const total = result.total_count ?? 0
-      const hasMore = offset + rows.length < total
-      return {
-        transactions: rows,
-        count: rows.length,
-        total_count: total,
-        has_more: hasMore,
-        ...(hasMore ? { next_offset: offset + rows.length } : {}),
-      }
+      return { transactions: rows, ...pageTail(rows, total, offset) }
     },
   },
 
@@ -5321,12 +5303,7 @@ export const tools: McpTool[] = [
         gross_amount: { type: 'number' },
       },
     }),
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 20), 100)
       const offset = Math.max(0, Number(args.offset) || 0)
@@ -5361,14 +5338,7 @@ export const tools: McpTool[] = [
 
       const rows = result.verifikat ?? []
       const total = result.total_count ?? 0
-      const hasMore = offset + rows.length < total
-      return {
-        verifikat: rows,
-        count: rows.length,
-        total_count: total,
-        has_more: hasMore,
-        ...(hasMore ? { next_offset: offset + rows.length } : {}),
-      }
+      return { verifikat: rows, ...pageTail(rows, total, offset) }
     },
   },
 
@@ -5406,12 +5376,7 @@ export const tools: McpTool[] = [
       ],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const vatAmount = typeof args.vat_amount === 'number' && Number.isFinite(args.vat_amount)
         ? args.vat_amount
@@ -5599,12 +5564,7 @@ export const tools: McpTool[] = [
       },
       required: ['transactions', 'categories', 'vat_treatments'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     _meta: { ui: { resourceUri: 'ui://receipt-matcher/app.html' } },
     async execute(args, companyId, userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 20), 50)
@@ -5650,12 +5610,7 @@ export const tools: McpTool[] = [
       },
       required: ['customers', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       // Archived rows (v1 API soft-delete) are hidden by default: same
       // `archived_at IS NULL` convention and opt-in flag as the v1 list.
@@ -5902,12 +5857,7 @@ export const tools: McpTool[] = [
       },
       required: ['customer_id'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const changes: Record<string, unknown> = {}
       for (const key of [
@@ -6075,12 +6025,7 @@ export const tools: McpTool[] = [
       },
       required: ['articles', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       // Strip PostgREST filter metacharacters before interpolating into .or():
       // commas/parens would otherwise let a query inject extra or-conditions, and
@@ -6140,12 +6085,7 @@ export const tools: McpTool[] = [
       },
       required: ['name', 'price_excl_vat'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const name = (args.name as string)?.trim()
       if (!name) throw new Error('Article name is required.')
@@ -6215,12 +6155,7 @@ export const tools: McpTool[] = [
       },
       required: ['article_id'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const articleId = args.article_id as string
       if (!articleId) throw new Error('article_id is required.')
@@ -6268,12 +6203,7 @@ export const tools: McpTool[] = [
       },
     },
     outputSchema: paginatedSchema('invoices', { type: 'object' }),
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 50), 100)
       const offset = Math.max(0, Math.floor(Number(args.offset) || 0))
@@ -6399,12 +6329,7 @@ export const tools: McpTool[] = [
       },
       required: ['invoice_id', 'status', 'currency', 'editable_draft', 'items', 'item_count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     // Round-trip read surface for gnubok_update_invoice (issue #1642). Kept
     // out of the default tools/list: payload-size.bench.test.ts sits at its
     // ceiling, and the update tool that needs it is search-only as well.
@@ -6569,12 +6494,7 @@ export const tools: McpTool[] = [
       },
       required: ['customer_id', 'items'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const customerId = args.customer_id as string
       const rawItems = args.items as StagedInvoiceLineInput[]
@@ -6785,40 +6705,9 @@ export const tools: McpTool[] = [
       },
       required: ['rows', 'total_debit', 'total_credit', 'is_balanced'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
-      let periodId = args.period_id as string | undefined
-
-      // If no period specified, find the most recent one
-      if (!periodId) {
-        const { data: periods } = await supabase
-          .from('fiscal_periods')
-          .select('id, name')
-          .eq('company_id', companyId)
-          .order('period_start', { ascending: false })
-          .limit(1)
-          .single()
-
-        if (!periods) {
-          throw new Error('No fiscal periods found. Categorize some transactions first to auto-create a period.')
-        }
-        periodId = periods.id
-      }
-
-      // Get period info
-      const { data: period } = await supabase
-        .from('fiscal_periods')
-        .select('id, name, period_start, period_end')
-        .eq('id', periodId)
-        .eq('company_id', companyId)
-        .single()
-
-      if (!period) throw new Error('Fiscal period not found.')
+      const period = await resolveReportPeriod(supabase, companyId, args.period_id, 'No fiscal periods found. Categorize some transactions first to auto-create a period.')
 
       // Optional dimensions filter: names resolve to registry codes first
       // (resolve-don't-select), then flow into the generator's jsonb
@@ -6833,7 +6722,7 @@ export const tools: McpTool[] = [
       const trialBalance = await generateTrialBalance(
         supabase,
         companyId,
-        periodId!,
+        period.id,
         // Saldobalans is the ledger as posted, resultatavslut included.
         dimFilter.filter
           ? { closingEntry: 'include' as const, dimensions: dimFilter.filter }
@@ -6896,12 +6785,7 @@ export const tools: McpTool[] = [
       },
       required: ['period_type', 'year', 'period'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     // Renders the VAT widget only when the caller passes render_ui=true (the
     // dispatcher emits result-level _meta in that case). This is the merged
     // report+widget surface; gnubok_vat_review_widget remains as an alias.
@@ -6927,12 +6811,7 @@ export const tools: McpTool[] = [
       required: ['period_type', 'year', 'period'],
     },
     outputSchema: VAT_REPORT_OUTPUT_SCHEMA,
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     _meta: { ui: { resourceUri: 'ui://vat-review/app.html' } },
     async execute(args, companyId, _userId, supabase) {
       return computeVatReport(args, companyId, supabase)
@@ -6983,12 +6862,7 @@ export const tools: McpTool[] = [
       },
       required: ['period', 'rutor', 'payment', 'blockers', 'declaration_checks', 'sanity', 'ready_to_close', 'summary'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       return computeVatCloseCheck(args, companyId, supabase)
     },
@@ -7013,47 +6887,17 @@ export const tools: McpTool[] = [
       examples: [{}, { period_id: '7c2b...' }],
     },
     outputSchema: { type: 'object' },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
-      let periodId = args.period_id as string | undefined
-
-      if (!periodId) {
-        const { data: periods } = await supabase
-          .from('fiscal_periods')
-          .select('id')
-          .eq('company_id', companyId)
-          .order('period_start', { ascending: false })
-          .limit(1)
-          .single()
-
-        if (!periods) {
-          throw new Error('No fiscal periods found. Categorize some transactions first.')
-        }
-        periodId = periods.id
-      }
-
-      // Verify period belongs to user
-      const { data: period } = await supabase
-        .from('fiscal_periods')
-        .select('id, name, period_start, period_end')
-        .eq('id', periodId)
-        .eq('company_id', companyId)
-        .single()
-
-      if (!period) throw new Error('Fiscal period not found.')
+      const period = await resolveReportPeriod(supabase, companyId, args.period_id, 'No fiscal periods found. Categorize some transactions first.')
 
       // Run queries in parallel (same as the KPI API route)
       const [incomeStatement, trialBalance, arLedger, monthlyBreakdown, paidInvoices] =
         await Promise.all([
-          generateIncomeStatement(supabase, companyId, periodId!),
-          generateTrialBalance(supabase, companyId, periodId!, { closingEntry: 'include' }),
+          generateIncomeStatement(supabase, companyId, period.id),
+          generateTrialBalance(supabase, companyId, period.id, { closingEntry: 'include' }),
           generateARLedger(supabase, companyId),
-          generateMonthlyBreakdown(supabase, companyId, periodId!),
+          generateMonthlyBreakdown(supabase, companyId, period.id),
           supabase
             .from('invoices')
             .select('invoice_date, paid_at')
@@ -7115,38 +6959,9 @@ export const tools: McpTool[] = [
       type: 'object',
       properties: { ...DIMENSION_FILTER_OUTPUT_PROPS },
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
-      let periodId = args.period_id as string | undefined
-
-      if (!periodId) {
-        const { data: periods } = await supabase
-          .from('fiscal_periods')
-          .select('id')
-          .eq('company_id', companyId)
-          .order('period_start', { ascending: false })
-          .limit(1)
-          .single()
-
-        if (!periods) {
-          throw new Error('No fiscal periods found. Categorize some transactions first.')
-        }
-        periodId = periods.id
-      }
-
-      const { data: period } = await supabase
-        .from('fiscal_periods')
-        .select('id, name, period_start, period_end')
-        .eq('id', periodId)
-        .eq('company_id', companyId)
-        .single()
-
-      if (!period) throw new Error('Fiscal period not found.')
+      const period = await resolveReportPeriod(supabase, companyId, args.period_id, 'No fiscal periods found. Categorize some transactions first.')
 
       rejectUnknownArgs(args, ['period_id', 'from_date', 'to_date', 'dimensions'])
       const range = parseReportRangeArgs(args, period, { from: 'from_date', to: 'to_date' })
@@ -7155,7 +6970,7 @@ export const tools: McpTool[] = [
       const result = await generateIncomeStatement(
         supabase,
         companyId,
-        periodId!,
+        period.id,
         {
           ...range,
           ...(dimFilter.filter ? { dimensions: dimFilter.filter } : {}),
@@ -7194,24 +7009,12 @@ export const tools: McpTool[] = [
       required: ['invoice_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const invoiceId = args.invoice_id as string
       if (!invoiceId) throw new Error('invoice_id is required')
 
-      const { data: invoice, error: invoiceError } = await supabase
-        .from('invoices')
-        .select('*, customer:customers(*)')
-        .eq('id', invoiceId)
-        .eq('company_id', companyId)
-        .single()
-
-      if (invoiceError || !invoice) throw new Error('Invoice not found')
+      const invoice = await fetchInvoiceWithCustomer(supabase, companyId, invoiceId)
       if (invoice.status !== 'sent' && invoice.status !== 'overdue') {
         throw new Error('Invoice can only be marked as paid when status is "sent" or "overdue"')
       }
@@ -7284,12 +7087,7 @@ export const tools: McpTool[] = [
       required: ['invoice_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: true,
-    },
+    annotations: ANNOTATIONS_WRITE_OPEN_WORLD,
     async execute(args, companyId, userId, supabase, actor) {
       const invoiceId = args.invoice_id as string
       if (!invoiceId) throw new Error('invoice_id is required')
@@ -7299,14 +7097,7 @@ export const tools: McpTool[] = [
         throw new Error('Email service not configured. Ensure RESEND_API_KEY and RESEND_FROM_EMAIL are set (or SMTP_HOST and SMTP_FROM_EMAIL with EMAIL_PROVIDER=smtp).')
       }
 
-      const { data: invoice, error: invoiceError } = await supabase
-        .from('invoices')
-        .select('*, customer:customers(*)')
-        .eq('id', invoiceId)
-        .eq('company_id', companyId)
-        .single()
-
-      if (invoiceError || !invoice) throw new Error('Invoice not found')
+      const invoice = await fetchInvoiceWithCustomer(supabase, companyId, invoiceId)
 
       const customer = invoice.customer as Customer
       if (!customer.email) throw new Error('Customer has no email address. Update customer details first.')
@@ -7399,12 +7190,7 @@ export const tools: McpTool[] = [
       },
       required: ['deliveries', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     // Specialized per-invoice diagnostic: keep it out of the default tools/list
     // (context budget, payload-size.bench.test.ts) and let agents chasing an
     // unpaid invoice find it via gnubok_search_tools (delivery, bounce, email).
@@ -7491,24 +7277,12 @@ export const tools: McpTool[] = [
       required: ['invoice_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const invoiceId = args.invoice_id as string
       if (!invoiceId) throw new Error('invoice_id is required')
 
-      const { data: invoice, error: invoiceError } = await supabase
-        .from('invoices')
-        .select('*, customer:customers(*)')
-        .eq('id', invoiceId)
-        .eq('company_id', companyId)
-        .single()
-
-      if (invoiceError || !invoice) throw new Error('Invoice not found')
+      const invoice = await fetchInvoiceWithCustomer(supabase, companyId, invoiceId)
       if (invoice.status !== 'draft') throw new Error('Only draft invoices can be marked as sent')
 
       return stagePendingOperation(supabase, companyId, userId, 'mark_invoice_sent',
@@ -7551,12 +7325,7 @@ export const tools: McpTool[] = [
       },
       required: ['suppliers', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       // Archived rows (v1 API soft-delete) are hidden by default: same
       // `archived_at IS NULL` convention and opt-in flag as the v1 list.
@@ -7677,12 +7446,7 @@ export const tools: McpTool[] = [
       },
       required: ['name'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       // Server-side validation (defense in depth): MCP transport already
       // checks the JSON Schema, but we re-validate with Zod so financial
@@ -7751,12 +7515,7 @@ export const tools: McpTool[] = [
       },
       required: ['invoices', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 50), 100)
       const status = (args.status as string) || 'all'
@@ -7780,7 +7539,7 @@ export const tools: McpTool[] = [
       }
       // Clear message instead of a raw Postgres uuid cast error: an agent may
       // well pass a supplier's name here; point it at supplier_name instead.
-      if (supplierId && !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(supplierId)) {
+      if (supplierId && !UUID_RE.test(supplierId)) {
         throw new Error('supplier_id must be a supplier UUID (suppliers.id). To filter by name, use supplier_name.')
       }
       for (const [key, value] of [['date_from', dateFrom], ['date_to', dateTo]] as const) {
@@ -7908,12 +7667,7 @@ export const tools: McpTool[] = [
       },
       required: ['templates', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 100), 200)
 
@@ -7968,12 +7722,7 @@ export const tools: McpTool[] = [
       },
       required: ['suggestions', 'counterparty_matches', 'no_signal_transaction_ids'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const ids = args.transaction_ids as string[]
       if (!ids || ids.length === 0) throw new Error('transaction_ids is required (non-empty array)')
@@ -8085,12 +7834,7 @@ export const tools: McpTool[] = [
       },
       required: ['accounts', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const activeOnly = args.active_only !== false
       const accountClass = args.account_class as number | undefined
@@ -8175,12 +7919,7 @@ export const tools: McpTool[] = [
       },
       required: ['account_number'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const accountNumber = String(args.account_number ?? '').trim()
       if (!/^\d{4}$/.test(accountNumber)) {
@@ -8299,12 +8038,7 @@ export const tools: McpTool[] = [
       },
       required: ['account_number'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const accountNumber = String(args.account_number ?? '').trim()
       if (!/^\d{4}$/.test(accountNumber)) {
@@ -8499,12 +8233,7 @@ export const tools: McpTool[] = [
       },
       required: ['dimension', 'values', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const sieDimNo = Number(args.sie_dim_no)
       if (!Number.isInteger(sieDimNo) || sieDimNo < 1) {
@@ -8601,12 +8330,7 @@ export const tools: McpTool[] = [
       },
       required: ['sie_dim_no', 'code', 'name'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       // Strip MCP control fields, then re-validate with the same Zod schema
       // the commit executor uses (defense in depth, mirrors create_supplier).
@@ -8737,12 +8461,7 @@ export const tools: McpTool[] = [
       },
       required: ['dimensions', 'reason', 'filters'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const { dry_run, idempotency_key } = args
 
@@ -9086,12 +8805,7 @@ export const tools: McpTool[] = [
       },
       required: ['dimension', 'columns', 'groups', 'net_per_column', 'net_total'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const sieDimNo = String(args.sie_dim_no ?? '').trim()
       // Positive-integer guard: the value is interpolated into a PostgREST
@@ -9141,41 +8855,14 @@ export const tools: McpTool[] = [
       },
     },
     outputSchema: { type: 'object' },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
-      let periodId = args.period_id as string | undefined
-
-      if (!periodId) {
-        const { data: periods } = await supabase
-          .from('fiscal_periods')
-          .select('id')
-          .eq('company_id', companyId)
-          .order('period_start', { ascending: false })
-          .limit(1)
-          .single()
-
-        if (!periods) throw new Error('No fiscal periods found. Create one first.')
-        periodId = periods.id
-      }
-
-      const { data: period } = await supabase
-        .from('fiscal_periods')
-        .select('id, name, period_start, period_end')
-        .eq('id', periodId)
-        .eq('company_id', companyId)
-        .single()
-
-      if (!period) throw new Error('Fiscal period not found.')
+      const period = await resolveReportPeriod(supabase, companyId, args.period_id, 'No fiscal periods found. Create one first.')
 
       rejectUnknownArgs(args, ['period_id', 'as_of_date'])
       const range = parseReportRangeArgs(args, period, { to: 'as_of_date' })
 
-      const result = await generateBalanceSheet(supabase, companyId, periodId!, {
+      const result = await generateBalanceSheet(supabase, companyId, period.id, {
         toDate: range.toDate,
       })
 
@@ -9207,12 +8894,7 @@ export const tools: McpTool[] = [
       type: 'object',
       properties: { ...DIMENSION_FILTER_OUTPUT_PROPS },
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       let periodId = args.period_id as string | undefined
 
@@ -9340,12 +9022,7 @@ export const tools: McpTool[] = [
       },
       required: ['lines', 'total_lines', 'returned_lines', 'totals', 'totals_scope'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 100), 500)
       // Default 'all' (posted + reversed): the same inclusion rule every
@@ -9786,12 +9463,7 @@ export const tools: McpTool[] = [
       },
     },
     outputSchema: { type: 'object' },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const asOfDate = args.as_of_date as string | undefined
       return await generateARLedger(supabase, companyId, asOfDate)
@@ -9811,12 +9483,7 @@ export const tools: McpTool[] = [
       },
     },
     outputSchema: { type: 'object' },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const asOfDate = args.as_of_date as string | undefined
       return await generateSupplierLedger(supabase, companyId, asOfDate)
@@ -9840,12 +9507,7 @@ export const tools: McpTool[] = [
       required: ['transaction_id', 'invoice_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const transactionId = args.transaction_id as string
       const invoiceId = args.invoice_id as string
@@ -9933,12 +9595,7 @@ export const tools: McpTool[] = [
       required: ['transaction_id', 'allocations'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const transactionId = args.transaction_id as string
       const allocations = args.allocations as Array<{
@@ -10113,12 +9770,7 @@ export const tools: McpTool[] = [
       required: ['transaction_id', 'journal_entry_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const transactionId = args.transaction_id as string
       const journalEntryId = args.journal_entry_id as string
@@ -10305,12 +9957,7 @@ export const tools: McpTool[] = [
       required: ['tx_ids'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const txIds = args.tx_ids as string[]
       const existingJeId = (args.existing_journal_entry_id as string | undefined) ?? null
@@ -10579,12 +10226,7 @@ export const tools: McpTool[] = [
       required: ['item_ids', 'category'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const itemIds = args.item_ids as string[]
       if (!Array.isArray(itemIds) || itemIds.length === 0) throw new Error('item_ids is required (non-empty)')
@@ -10727,12 +10369,7 @@ export const tools: McpTool[] = [
       },
       required: ['invoice_id', 'candidates'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const invoiceId = args.invoice_id as string
       if (!invoiceId) throw new Error('invoice_id is required')
@@ -10786,12 +10423,7 @@ export const tools: McpTool[] = [
       required: ['invoice_id', 'journal_entry_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const invoiceId = args.invoice_id as string
       const journalEntryId = args.journal_entry_id as string
@@ -10882,12 +10514,7 @@ export const tools: McpTool[] = [
       },
       required: ['supplier_invoice_id', 'candidates'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const supplierInvoiceId = args.supplier_invoice_id as string
       if (!supplierInvoiceId) throw new Error('supplier_invoice_id is required')
@@ -10941,12 +10568,7 @@ export const tools: McpTool[] = [
       required: ['supplier_invoice_id', 'journal_entry_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const supplierInvoiceId = args.supplier_invoice_id as string
       const journalEntryId = args.journal_entry_id as string
@@ -11220,12 +10842,7 @@ export const tools: McpTool[] = [
       },
       required: ['periods', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(_args, companyId, userId, supabase) {
       const { data, error } = await supabase
         .from('fiscal_periods')
@@ -11272,12 +10889,7 @@ export const tools: McpTool[] = [
       },
     },
     outputSchema: { type: 'object' },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const dateFrom = args.date_from as string | undefined
       const dateTo = args.date_to as string | undefined
@@ -11346,12 +10958,7 @@ export const tools: McpTool[] = [
         actions: { type: 'array', items: { type: 'string' } },
       },
     }),
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const accountKey = args.account_key as string
       const result = await listAccountItems(supabase, companyId, accountKey, {
@@ -11412,12 +11019,7 @@ export const tools: McpTool[] = [
       required: ['account_key'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const accountKey = args.account_key as string
       const pairs =
@@ -11522,12 +11124,7 @@ export const tools: McpTool[] = [
       required: ['account_key', 'external_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const accountKey = args.account_key as string
       const externalId = args.external_id as string
@@ -11576,12 +11173,7 @@ export const tools: McpTool[] = [
       required: ['account_key', 'through_date'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const accountKey = args.account_key as string
       const throughDate = args.through_date as string
@@ -11655,12 +11247,7 @@ export const tools: McpTool[] = [
       required: ['account_key', 'external_ids', 'journal_entry_id', 'kind'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const accountKey = args.account_key as string
       const externalIds = args.external_ids as string[]
@@ -11726,12 +11313,7 @@ export const tools: McpTool[] = [
       required: ['skattekonto_transaction_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const transactionId = args.skattekonto_transaction_id
       if (typeof transactionId !== 'string' || transactionId.length === 0) {
@@ -11826,12 +11408,7 @@ export const tools: McpTool[] = [
       required: ['skattekonto_transaction_ids'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const rawIds = args.skattekonto_transaction_ids
       if (!Array.isArray(rawIds) || rawIds.length === 0) {
@@ -11980,12 +11557,7 @@ export const tools: McpTool[] = [
       },
       required: ['cash_accounts', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     // Search-only: a discovery helper for the transaction listings and the
     // reconciliation tool, not part of the default catalog (tools/list budget).
     catalogVisibility: 'search',
@@ -12048,12 +11620,7 @@ export const tools: McpTool[] = [
       },
       required: ['upload_id', 'upload_url', 'expires_at'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase) {
       const fileName = args.file_name as string
       // Validation only: reject unsupported types before handing out a signed
@@ -12119,12 +11686,7 @@ export const tools: McpTool[] = [
       },
       required: ['document_id', 'inbox_item_id', 'status'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase) {
       const uploadId = args.upload_id as string
       const fileName = args.file_name as string
@@ -12188,12 +11750,7 @@ export const tools: McpTool[] = [
       },
       required: ['document_id', 'inbox_item_id', 'status'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase) {
       const fileName = args.file_name as string
       const base64Content = args.file_content_base64 as string
@@ -12263,12 +11820,7 @@ export const tools: McpTool[] = [
       },
       required: ['items', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 20), 50)
       const status = args.status as string | undefined
@@ -12406,12 +11958,7 @@ export const tools: McpTool[] = [
       required: ['inbox_item_id'],
     },
     outputSchema: { type: 'object' },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const id = args.inbox_item_id as string
 
@@ -12477,12 +12024,7 @@ export const tools: McpTool[] = [
       required: ['inbox_item_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const inboxItemId = args.inbox_item_id as string
       if (!inboxItemId) throw new Error('inbox_item_id is required')
@@ -12829,12 +12371,7 @@ export const tools: McpTool[] = [
       },
       required: ['items', 'count'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 20), 50)
       const cursor = typeof args.cursor === 'string' ? args.cursor : null
@@ -12991,12 +12528,7 @@ export const tools: McpTool[] = [
       },
       required: ['document_id', 'file_name', 'signed_url', 'expires_at'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const documentId = args.document_id as string
       if (!documentId) throw new Error('document_id is required')
@@ -13050,12 +12582,7 @@ export const tools: McpTool[] = [
       required: ['transaction_id', 'document_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const transactionId = args.transaction_id as string
       const documentId = args.document_id as string
@@ -13182,12 +12709,7 @@ export const tools: McpTool[] = [
       examples: [{ document_id: 'd0c1...', journal_entry_id: 'a44e...' }],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const documentId = args.document_id as string
       const journalEntryId = args.journal_entry_id as string
@@ -13286,12 +12808,7 @@ export const tools: McpTool[] = [
       required: ['links'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     // Search-only: a one-off bulk migration tool does not belong in the default
     // catalog, which every session pays for in context. The everyday
     // gnubok_link_document_to_voucher stays default; this one is discovered via
@@ -13550,7 +13067,7 @@ export const tools: McpTool[] = [
       },
       required: ['trips', 'count', 'total_km', 'draft_km'],
     },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const { listTrips } = await import('@/lib/mileage/mileage-service')
       const status = args.status as 'draft' | 'booked' | undefined
@@ -13615,7 +13132,7 @@ export const tools: McpTool[] = [
       required: ['trip_date', 'distance_km', 'from_location', 'to_location', 'purpose'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const tripDate = args.trip_date as string
       const distanceKm = args.distance_km as number
@@ -13701,7 +13218,7 @@ export const tools: McpTool[] = [
       required: ['from', 'to', 'entry_date'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const from = args.from as string
       const to = args.to as string
@@ -13787,7 +13304,7 @@ export const tools: McpTool[] = [
       },
       required: ['employees', 'count'],
     },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const activeOnly = args.active_only !== false
       let query = supabase
@@ -13821,7 +13338,7 @@ export const tools: McpTool[] = [
       required: ['salary_run_id'],
     },
     outputSchema: { type: 'object' },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const id = args.salary_run_id as string
       const { data: run, error } = await supabase
@@ -13854,7 +13371,7 @@ export const tools: McpTool[] = [
       required: ['year'],
     },
     outputSchema: { type: 'object' },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const { generateSalaryJournal } = await import('@/lib/reports/salary-journal')
       return generateSalaryJournal(supabase, companyId, args.year as number)
@@ -13876,7 +13393,7 @@ export const tools: McpTool[] = [
       required: ['period_year', 'period_month', 'payment_date'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const { period_year, period_month, payment_date } = args as { period_year: number; period_month: number; payment_date: string }
       if (!Number.isInteger(period_year) || period_year < 1900 || period_year > 9999) {
@@ -13931,7 +13448,7 @@ export const tools: McpTool[] = [
       required: ['salary_run_id'],
     },
     outputSchema: { type: 'object' },
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, _userId, supabase) {
       const id = args.salary_run_id as string
       if (!id) throw new Error('salary_run_id is required')
@@ -13978,7 +13495,7 @@ export const tools: McpTool[] = [
       required: ['salary_run_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const id = args.salary_run_id as string
       if (!id) throw new Error('salary_run_id is required')
@@ -14049,7 +13566,7 @@ export const tools: McpTool[] = [
       required: ['salary_run_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const id = args.salary_run_id as string
       if (!id) throw new Error('salary_run_id is required')
@@ -14106,7 +13623,7 @@ export const tools: McpTool[] = [
       required: ['period_type', 'year', 'period'],
     },
     outputSchema: SKV_VAT_VALIDATE_OUTPUT_SCHEMA,
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
+    annotations: ANNOTATIONS_READ_ONLY_OPEN_WORLD,
     async execute(args, companyId, userId, supabase) {
       assertSkatteverketEnabled()
       const periodType = args.period_type as VatPeriodType
@@ -14196,7 +13713,7 @@ export const tools: McpTool[] = [
       required: ['period_type', 'year', 'period'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: true },
+    annotations: ANNOTATIONS_WRITE_OPEN_WORLD,
     async execute(args, companyId, userId, supabase, actor) {
       assertSkatteverketEnabled()
       const periodType = args.period_type as VatPeriodType
@@ -14265,7 +13782,7 @@ export const tools: McpTool[] = [
       required: ['period_type', 'year', 'period'],
     },
     outputSchema: SKV_VAT_STATUS_OUTPUT_SCHEMA,
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
+    annotations: ANNOTATIONS_READ_ONLY_OPEN_WORLD,
     async execute(args, companyId, userId, supabase) {
       assertSkatteverketEnabled()
       const periodType = args.period_type as VatPeriodType
@@ -14327,7 +13844,7 @@ export const tools: McpTool[] = [
       required: ['salary_run_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: true },
+    annotations: ANNOTATIONS_WRITE_OPEN_WORLD,
     async execute(args, companyId, userId, supabase, actor) {
       assertSkatteverketEnabled()
       const salaryRunId = args.salary_run_id as string
@@ -14390,7 +13907,7 @@ export const tools: McpTool[] = [
       required: ['salary_run_id'],
     },
     outputSchema: SKV_AGI_STATUS_OUTPUT_SCHEMA,
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
+    annotations: ANNOTATIONS_READ_ONLY_OPEN_WORLD,
     async execute(args, companyId, userId, supabase) {
       assertSkatteverketEnabled()
       const salaryRunId = args.salary_run_id as string
@@ -14496,7 +14013,7 @@ export const tools: McpTool[] = [
       },
       required: ['employee_id', 'first_name', 'last_name', 'personnummer_masked', 'is_active'],
     },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const employeeId = args.employee_id as string
       if (!employeeId) throw new Error('employee_id is required')
@@ -14593,7 +14110,7 @@ export const tools: McpTool[] = [
       },
       required: ['salary_run_employee_id', 'salary_run_id', 'employee_id', 'employee_name', 'personnummer_masked', 'amounts', 'line_items'],
     },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const salaryRunId = args.salary_run_id as string
       const employeeId = args.employee_id as string
@@ -14685,7 +14202,7 @@ export const tools: McpTool[] = [
       },
       required: ['absence_days', 'count'],
     },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const { employee_id, from, to, absence_type } = args as {
         employee_id: string; from: string; to: string; absence_type?: string
@@ -14723,7 +14240,7 @@ export const tools: McpTool[] = [
       required: ['salary_run_id', 'salary_line_item_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const { salary_run_id, salary_line_item_id, amount, description, quantity, unit_price } = args as {
         salary_run_id: string; salary_line_item_id: string
@@ -14806,7 +14323,7 @@ export const tools: McpTool[] = [
       required: ['salary_run_id', 'employee_id', 'monthly_salary'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const { salary_run_id, employee_id, monthly_salary } = args as {
         salary_run_id: string; employee_id: string; monthly_salary: number
@@ -14891,7 +14408,7 @@ export const tools: McpTool[] = [
       required: ['salary_run_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const { salary_run_id, payment_date, voucher_series, notes } = args as {
         salary_run_id: string; payment_date?: string; voucher_series?: string; notes?: string | null
@@ -14990,7 +14507,7 @@ export const tools: McpTool[] = [
       required: ['employee_id', 'from', 'to', 'absence_type'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const { employee_id, from, to, absence_type, hours_per_day, notes, include_weekends } = args as {
         employee_id: string; from: string; to: string; absence_type: string
@@ -15073,7 +14590,7 @@ export const tools: McpTool[] = [
       required: ['employee_id', 'from', 'to'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_DESTRUCTIVE_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const { employee_id, from, to, absence_type } = args as {
         employee_id: string; from: string; to: string; absence_type?: string
@@ -15179,7 +14696,7 @@ export const tools: McpTool[] = [
       required: ['first_name', 'last_name', 'personnummer', 'employment_start'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       // Resolve-don't-select BEFORE schema validation: the bag may carry
       // registry value NAMES, which the strict DimensionsBagSchema inside
@@ -15293,7 +14810,7 @@ export const tools: McpTool[] = [
       required: ['employee_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const { employee_id, ...rest } = args as { employee_id: string } & Record<string, unknown>
       if (!employee_id) throw new Error('employee_id is required')
@@ -15388,7 +14905,7 @@ export const tools: McpTool[] = [
       required: ['items'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       // Sparse merge, NOT full replace. OpeningBalancesBulkSchema carries a
       // .default() on all nine non-key fields (and .partial() would not strip
@@ -15560,7 +15077,7 @@ export const tools: McpTool[] = [
       },
       required: ['employee_vacation_balance_id', 'employee_id', 'vacation_year_start', 'entitled_days', 'taken_days', 'remaining_days'],
     },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const employeeId = args.employee_id as string
       if (!employeeId) throw new Error('employee_id is required')
@@ -15620,7 +15137,7 @@ export const tools: McpTool[] = [
       },
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_DESTRUCTIVE_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const { previewVacationYearClose } = await import('@/lib/salary/semesterberedning')
       const { getVacationYearBasis } = await import('@/lib/salary/vacation-ledger')
@@ -15686,12 +15203,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: true,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_DESTRUCTIVE_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -15743,12 +15255,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -15844,12 +15351,7 @@ export const tools: McpTool[] = [
       required: ['transaction_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const transactionId = args.transaction_id as string
       if (!transactionId) throw new Error('transaction_id is required')
@@ -15917,7 +15419,7 @@ export const tools: McpTool[] = [
       required: ['transaction_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const transactionId = String(args.transaction_id ?? '').trim()
       if (!transactionId) throw new Error('transaction_id is required')
@@ -16009,12 +15511,7 @@ export const tools: McpTool[] = [
         generated_at: { type: 'string' },
       },
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -16435,12 +15932,7 @@ export const tools: McpTool[] = [
       },
       required: ['ready', 'blockers', 'warnings', 'summary'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const fiscalPeriodId = args.fiscal_period_id as string
       const includePreview = args.include_preview === true
@@ -16533,12 +16025,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: true,
-      idempotentHint: false,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_DESTRUCTIVE_WRITE,
     // Specialized cash-method year-end step. The year-end readiness blocker
     // and year-end skill name it exactly, while search-only visibility avoids
     // charging every MCP session for a schema most companies never need.
@@ -16721,7 +16208,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_DESTRUCTIVE_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -16768,7 +16255,7 @@ export const tools: McpTool[] = [
       required: ['closed_period_id', 'next_period_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const closedId = args.closed_period_id as string
       const nextId = args.next_period_id as string
@@ -16819,7 +16306,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id', 'closing_date'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       const closingDate = args.closing_date as string
@@ -16863,7 +16350,7 @@ export const tools: McpTool[] = [
       },
       required: ['gaps', 'total_gaps', 'unexplained_gaps'],
     },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase) {
       const fiscalPeriodId = args.fiscal_period_id as string
       const voucherSeries = args.voucher_series as string | undefined
@@ -16933,12 +16420,7 @@ export const tools: McpTool[] = [
       },
       required: ['journal_entry_id', 'notes'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const journalEntryId = String(args.journal_entry_id ?? '').trim()
       if (!journalEntryId) throw new Error('journal_entry_id is required')
@@ -17008,7 +16490,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id', 'voucher_series', 'gap_start', 'gap_end', 'explanation'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const explanation = args.explanation as string
       if (!explanation?.trim()) throw new Error('explanation is required')
@@ -17050,7 +16532,7 @@ export const tools: McpTool[] = [
       required: ['supplier_invoice_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const id = args.supplier_invoice_id as string
       if (!id) throw new Error('supplier_invoice_id is required')
@@ -17098,7 +16580,7 @@ export const tools: McpTool[] = [
       required: ['supplier_invoice_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_DESTRUCTIVE_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const id = args.supplier_invoice_id as string
       if (!id) throw new Error('supplier_invoice_id is required')
@@ -17141,7 +16623,7 @@ export const tools: McpTool[] = [
       required: ['invoice_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const id = args.invoice_id as string
       if (!id) throw new Error('invoice_id is required')
@@ -17187,7 +16669,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -17238,7 +16720,7 @@ export const tools: McpTool[] = [
       required: ['invoice_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_DESTRUCTIVE_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const id = args.invoice_id as string
       const reason = args.reason as string | undefined
@@ -17349,12 +16831,7 @@ export const tools: McpTool[] = [
       },
       required: ['invoice_id'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     catalogVisibility: 'search',
     async execute(args, companyId, userId, supabase, actor) {
       const invoiceId = args.invoice_id as string
@@ -17665,7 +17142,7 @@ export const tools: McpTool[] = [
       required: ['invoice_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_DESTRUCTIVE_WRITE,
     catalogVisibility: 'search',
     async execute(args, companyId, userId, supabase, actor) {
       const invoiceId = args.invoice_id as string
@@ -17771,9 +17248,7 @@ export const tools: McpTool[] = [
       const fileName = args.filename as string
       const lower = fileName.toLowerCase()
       if (!lower.endsWith('.se') && !lower.endsWith('.sie') && !lower.endsWith('.si')) {
-        throw Object.assign(new Error('filename must end in .se, .sie or .si'), {
-          code: 'VALIDATION_ERROR',
-        })
+        throw codedError('VALIDATION_ERROR', 'filename must end in .se, .sie or .si')
       }
       const uploadId = crypto.randomUUID()
       const reservation = await createPendingDocumentUpload(supabase, companyId, userId, uploadId, fileName)
@@ -17820,20 +17295,13 @@ export const tools: McpTool[] = [
       },
       required: ['verdict', 'file', 'validation', 'org_number_match', 'duplicate', 'mappings', 'mapping_stats', 'instructions'],
     },
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, userId, supabase) {
       const content = await resolveSieToolContent(args, companyId, userId)
       if (!content) {
-        throw Object.assign(
-          new Error(
-            'Provide the SIE file as upload_id (from gnubok_create_sie_upload), file_content_base64, or file_content.'
-          ),
-          { code: 'VALIDATION_ERROR' }
+        throw codedError(
+          'VALIDATION_ERROR',
+          'Provide the SIE file as upload_id (from gnubok_create_sie_upload), file_content_base64, or file_content.'
         )
       }
 
@@ -17847,9 +17315,9 @@ export const tools: McpTool[] = [
       try {
         parsed = parseSIEFile(content)
       } catch (e) {
-        throw Object.assign(
-          new Error(`SIE-filen kunde inte tolkas: ${e instanceof Error ? e.message : 'okänt fel'}`),
-          { code: 'VALIDATION_ERROR' }
+        throw codedError(
+          'VALIDATION_ERROR',
+          `SIE-filen kunde inte tolkas: ${e instanceof Error ? e.message : 'okänt fel'}`
         )
       }
 
@@ -17985,7 +17453,7 @@ export const tools: McpTool[] = [
       required: ['filename', 'mappings'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       // Decoded once here; the staged params carry the decoded text so
       // commitImportSie re-parses exactly what was previewed.
@@ -18114,7 +17582,7 @@ export const tools: McpTool[] = [
       required: ['import_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_DESTRUCTIVE_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const importId = args.import_id as string
       const reason = typeof args.reason === 'string' ? args.reason : undefined
@@ -18264,7 +17732,7 @@ export const tools: McpTool[] = [
       ],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const entryDate = args.entry_date as string
       // Normalize like line_description (and gnubok_create_transactions): coerce
@@ -18583,7 +18051,7 @@ export const tools: McpTool[] = [
       required: ['entry_id', 'lines'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const entryRef = args.entry_id as string
       const rawLines = args.lines as Array<Record<string, unknown>> | undefined
@@ -18783,7 +18251,7 @@ export const tools: McpTool[] = [
       required: ['entry_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const entryRef = args.entry_id as string
       const reversalDate = typeof args.reversal_date === 'string' ? args.reversal_date : undefined
@@ -18953,7 +18421,7 @@ export const tools: McpTool[] = [
     // /bokslutsdispositioner: surface as a permissive object so the
     // strict-schema test passes without duplicating the type tree here.
     outputSchema: { type: 'object', additionalProperties: true },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase, _actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -18977,7 +18445,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: { type: 'object', additionalProperties: true },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase, _actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -19005,7 +18473,7 @@ export const tools: McpTool[] = [
       },
     },
     outputSchema: { type: 'object', additionalProperties: true },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase, _actor) {
       const status = (args.status as string) || 'active'
       let query = supabase
@@ -19053,7 +18521,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: { type: 'object', additionalProperties: true },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase, _actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -19082,7 +18550,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: STAGED_OPERATION_SCHEMA,
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -19149,7 +18617,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: { type: 'object', additionalProperties: true },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase, _actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -19197,7 +18665,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: { type: 'object', additionalProperties: true },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase, _actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -19232,7 +18700,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: { type: 'object', additionalProperties: true },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase, _actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -19259,7 +18727,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: { type: 'object', additionalProperties: true },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase, _actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -19323,7 +18791,7 @@ export const tools: McpTool[] = [
       required: ['fiscal_period_id'],
     },
     outputSchema: { type: 'object', additionalProperties: true },
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     async execute(args, companyId, _userId, supabase, _actor) {
       const fiscalPeriodId = args.fiscal_period_id as string
       if (!fiscalPeriodId) throw new Error('fiscal_period_id is required')
@@ -19364,7 +18832,7 @@ export const tools: McpTool[] = [
       required: [],
     },
     outputSchema: paginatedSchema('operations'),
-    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_READ_ONLY,
     // Renders the approval-queue widget only when the caller passes
     // render_ui=true (the dispatcher emits result-level _meta in that case),
     // keeping the tool data-only by default.
@@ -19398,14 +18866,7 @@ export const tools: McpTool[] = [
 
       const operations = data ?? []
       const totalCount = count ?? operations.length
-      const hasMore = offset + operations.length < totalCount
-      return {
-        operations,
-        count: operations.length,
-        total_count: totalCount,
-        has_more: hasMore,
-        ...(hasMore ? { next_offset: offset + operations.length } : {}),
-      }
+      return { operations, ...pageTail(operations, totalCount, offset) }
     },
   },
 
@@ -19443,7 +18904,7 @@ export const tools: McpTool[] = [
       },
       required: ['status', 'operation_id'],
     },
-    annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_DESTRUCTIVE_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const operationId = args.operation_id as string
       if (!operationId) throw new Error('operation_id is required')
@@ -19591,7 +19052,7 @@ export const tools: McpTool[] = [
       },
       required: ['status', 'operation_id'],
     },
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
+    annotations: ANNOTATIONS_STAGED_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const operationId = args.operation_id as string
       if (!operationId) throw new Error('operation_id is required')
@@ -19707,7 +19168,7 @@ export const tools: McpTool[] = [
       },
       required: ['inbox_item_id', 'extracted_data'],
     },
-    annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     async execute(args, companyId, userId, supabase, actor) {
       const inboxItemId = args.inbox_item_id as string
       if (!inboxItemId) throw new Error('inbox_item_id is required')
@@ -19851,12 +19312,7 @@ export const tools: McpTool[] = [
         },
       },
     }),
-    annotations: {
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_READ_ONLY,
     catalogVisibility: 'search',
     async execute(args, companyId, userId, supabase) {
       const limit = Math.min(Math.max(1, Number(args.limit) || 50), 100)
@@ -20010,12 +19466,7 @@ export const tools: McpTool[] = [
       },
       required: ['customer_id', 'name', 'day_of_month', 'items'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     catalogVisibility: 'search',
     async execute(args, companyId, userId, supabase, actor) {
       // Resolve-don't-select: parse the schedule-level default bag + each
@@ -20204,12 +19655,7 @@ export const tools: McpTool[] = [
       },
       required: ['schedule_id'],
     },
-    annotations: {
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: false,
-    },
+    annotations: ANNOTATIONS_IDEMPOTENT_WRITE,
     catalogVisibility: 'search',
     async execute(args, companyId, userId, supabase, actor) {
       // Resolve-don't-select for both the replacement default bag and any
diff --git a/extensions/general/mcp-server/skills/index.ts b/extensions/general/mcp-server/skills/index.ts
index a15c7a08..a24c961e 100644
--- a/extensions/general/mcp-server/skills/index.ts
+++ b/extensions/general/mcp-server/skills/index.ts
@@ -26,11 +26,6 @@ export const workflowSkills: Skill[] = [
   onboardingSkill,
 ]
 
-/** @deprecated Use `workflowSkills` for the static set, or `loadAllSkills(supabase)`
- *  for the unified list (workflows + atoms). Kept for backwards compatibility
- *  with prior imports. */
-export const skills = workflowSkills
-
 /**
  * Resolve a skill by slug. Checks the static workflow array first (synchronous,
  * always available), then falls back to the registry-backed atom set
diff --git a/extensions/general/push-notifications/NotificationSettings.tsx b/extensions/general/push-notifications/NotificationSettings.tsx
deleted file mode 100644
index 8f6e187e..00000000
--- a/extensions/general/push-notifications/NotificationSettings.tsx
+++ /dev/null
@@ -1,386 +0,0 @@
-'use client'
-
-import { useState, useEffect } from 'react'
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
-import { Label } from '@/components/ui/label'
-import { Switch } from '@/components/ui/switch'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { useToast } from '@/components/ui/use-toast'
-import { createClient } from '@/lib/supabase/client'
-import { Bell, BellOff, Loader2, Mail, Moon } from 'lucide-react'
-import type { NotificationSettings as NotificationSettingsType } from '@/types'
-
-interface NotificationSettingsProps {
-  onSettingsChange?: () => void
-}
-
-export function NotificationSettings({ onSettingsChange }: NotificationSettingsProps) {
-  const { toast } = useToast()
-  const supabase = createClient()
-
-  const [isLoading, setIsLoading] = useState(true)
-  const [isSaving, setIsSaving] = useState(false)
-  const [settings, setSettings] = useState<NotificationSettingsType | null>(null)
-  const [isPushSupported, setIsPushSupported] = useState(false)
-  const [isPushSubscribed, setIsPushSubscribed] = useState(false)
-
-  useEffect(() => {
-    fetchSettings()
-    checkPushSupport()
-  }, [])
-
-  const checkPushSupport = async () => {
-    if ('serviceWorker' in navigator && 'PushManager' in window) {
-      setIsPushSupported(true)
-
-      try {
-        const registration = await navigator.serviceWorker.ready
-        const subscription = await registration.pushManager.getSubscription()
-        setIsPushSubscribed(!!subscription)
-      } catch (error) {
-        console.error('Error checking push subscription:', error)
-      }
-    }
-  }
-
-  const fetchSettings = async () => {
-    setIsLoading(true)
-
-    // Notification settings are per user, not per company: quiet hours and the
-    // per-category toggles belong to the person, and push_subscriptions are
-    // keyed on a device endpoint. Neither table carries a company_id.
-    const { data: { user } } = await supabase.auth.getUser()
-    if (!user) {
-      setIsLoading(false)
-      return
-    }
-
-    const { data, error } = await supabase
-      .from('notification_settings')
-      .select('*')
-      .eq('user_id', user.id)
-      .single()
-
-    if (!error && data) {
-      setSettings(data)
-    } else {
-      // Create default settings if not found
-      const { data: newSettings, error: insertError } = await supabase
-        .from('notification_settings')
-        .insert({
-          user_id: user.id,
-          tax_deadlines_enabled: true,
-          invoice_reminders_enabled: true,
-          push_enabled: true,
-          email_enabled: true,
-          quiet_start: '21:00',
-          quiet_end: '08:00',
-        })
-        .select()
-        .single()
-
-      if (!insertError && newSettings) {
-        setSettings(newSettings)
-      }
-    }
-
-    setIsLoading(false)
-  }
-
-  const updateSetting = async (key: keyof NotificationSettingsType, value: boolean | string) => {
-    if (!settings) return
-
-    setIsSaving(true)
-
-    const { error } = await supabase
-      .from('notification_settings')
-      .update({ [key]: value })
-      .eq('id', settings.id)
-
-    if (error) {
-      toast({
-        title: 'Fel',
-        description: 'Kunde inte spara inställning',
-        variant: 'destructive',
-      })
-    } else {
-      setSettings({ ...settings, [key]: value })
-      onSettingsChange?.()
-    }
-
-    setIsSaving(false)
-  }
-
-  const subscribeToPush = async () => {
-    try {
-      const permission = await Notification.requestPermission()
-      if (permission !== 'granted') {
-        toast({
-          title: 'Aviseringar avslagna',
-          description: 'Du behöver ge tillåtelse för push-aviseringar i webbläsaren.',
-        })
-        return
-      }
-
-      const vapidResponse = await fetch('/api/extensions/ext/push-notifications/subscribe')
-      const { vapidPublicKey } = await vapidResponse.json()
-
-      if (!vapidPublicKey) {
-        throw new Error('Push not configured')
-      }
-
-      const registration = await navigator.serviceWorker.ready
-      const subscription = await registration.pushManager.subscribe({
-        userVisibleOnly: true,
-        applicationServerKey: urlBase64ToUint8Array(vapidPublicKey),
-      })
-
-      const response = await fetch('/api/extensions/ext/push-notifications/subscribe', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(subscription.toJSON()),
-      })
-
-      if (!response.ok) {
-        throw new Error('Failed to save subscription')
-      }
-
-      setIsPushSubscribed(true)
-      toast({
-        title: 'Push-aviseringar aktiverade',
-        description: 'Du kommer nu få push-aviseringar.',
-      })
-    } catch (error) {
-      toast({
-        title: 'Fel',
-        description: 'Kunde inte aktivera push-aviseringar.',
-        variant: 'destructive',
-      })
-    }
-  }
-
-  const unsubscribeFromPush = async () => {
-    try {
-      const registration = await navigator.serviceWorker.ready
-      const subscription = await registration.pushManager.getSubscription()
-
-      if (subscription) {
-        await subscription.unsubscribe()
-
-        await fetch('/api/extensions/ext/push-notifications/subscribe', {
-          method: 'DELETE',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ endpoint: subscription.endpoint }),
-        })
-      }
-
-      setIsPushSubscribed(false)
-      toast({
-        title: 'Push-aviseringar inaktiverade',
-        description: 'Du kommer inte längre få push-aviseringar.',
-      })
-    } catch (error) {
-      toast({
-        title: 'Fel',
-        description: 'Kunde inte inaktivera push-aviseringar.',
-        variant: 'destructive',
-      })
-    }
-  }
-
-  if (isLoading) {
-    return (
-      <div className="flex items-center justify-center h-32">
-        <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
-      </div>
-    )
-  }
-
-  if (!settings) {
-    return null
-  }
-
-  return (
-    <div className="space-y-6">
-      {/* Push notification status */}
-      <Card>
-        <CardHeader>
-          <CardTitle className="flex items-center gap-2">
-            <Bell className="h-5 w-5" />
-            Push-aviseringar
-          </CardTitle>
-          <CardDescription>
-            Få påminnelser direkt i din webbläsare
-          </CardDescription>
-        </CardHeader>
-        <CardContent className="space-y-4">
-          {isPushSupported ? (
-            <div className="flex items-center justify-between">
-              <div>
-                <p className="font-medium">
-                  {isPushSubscribed ? 'Aktiverade' : 'Inaktiverade'}
-                </p>
-                <p className="text-sm text-muted-foreground">
-                  {isPushSubscribed
-                    ? 'Du får push-aviseringar på denna enhet'
-                    : 'Aktivera för att få push-aviseringar'}
-                </p>
-              </div>
-              <Button
-                variant={isPushSubscribed ? 'outline' : 'default'}
-                onClick={isPushSubscribed ? unsubscribeFromPush : subscribeToPush}
-              >
-                {isPushSubscribed ? (
-                  <>
-                    <BellOff className="mr-2 h-4 w-4" />
-                    Inaktivera
-                  </>
-                ) : (
-                  <>
-                    <Bell className="mr-2 h-4 w-4" />
-                    Aktivera
-                  </>
-                )}
-              </Button>
-            </div>
-          ) : (
-            <p className="text-sm text-muted-foreground">
-              Din webbläsare stöder inte push-aviseringar.
-            </p>
-          )}
-        </CardContent>
-      </Card>
-
-      {/* Category settings */}
-      <Card>
-        <CardHeader>
-          <CardTitle>Aviseringskategorier</CardTitle>
-          <CardDescription>
-            Välj vilka typer av aviseringar du vill få
-          </CardDescription>
-        </CardHeader>
-        <CardContent className="space-y-4">
-          <div className="flex items-center justify-between">
-            <div className="space-y-0.5">
-              <Label htmlFor="tax-deadlines">Skattedeadlines</Label>
-              <p className="text-sm text-muted-foreground">
-                Moms, F-skatt, inkomstdeklaration m.m.
-              </p>
-            </div>
-            <Switch
-              id="tax-deadlines"
-              checked={settings.tax_deadlines_enabled}
-              onCheckedChange={(checked) =>
-                updateSetting('tax_deadlines_enabled', checked)
-              }
-              disabled={isSaving}
-            />
-          </div>
-
-          <div className="flex items-center justify-between">
-            <div className="space-y-0.5">
-              <Label htmlFor="invoice-reminders">Fakturapåminnelser</Label>
-              <p className="text-sm text-muted-foreground">
-                Fakturor som förfaller eller är försenade
-              </p>
-            </div>
-            <Switch
-              id="invoice-reminders"
-              checked={settings.invoice_reminders_enabled}
-              onCheckedChange={(checked) =>
-                updateSetting('invoice_reminders_enabled', checked)
-              }
-              disabled={isSaving}
-            />
-          </div>
-
-        </CardContent>
-      </Card>
-
-      {/* Email digest */}
-      <Card>
-        <CardHeader>
-          <CardTitle className="flex items-center gap-2">
-            <Mail className="h-5 w-5" />
-            E-post
-          </CardTitle>
-          <CardDescription>
-            Sammanfattningar via e-post
-          </CardDescription>
-        </CardHeader>
-        <CardContent className="space-y-4">
-          <div className="flex items-center justify-between">
-            <div className="space-y-0.5">
-              <Label htmlFor="email-digest">Nytt att bokföra</Label>
-              <p className="text-sm text-muted-foreground">
-                Dagligt mejl när nya banktransaktioner eller underlag har kommit in
-              </p>
-            </div>
-            <Switch
-              id="email-digest"
-              checked={settings.email_digest_enabled}
-              onCheckedChange={(checked) =>
-                updateSetting('email_digest_enabled', checked)
-              }
-              disabled={isSaving}
-            />
-          </div>
-        </CardContent>
-      </Card>
-
-      {/* Quiet hours */}
-      <Card>
-        <CardHeader>
-          <CardTitle className="flex items-center gap-2">
-            <Moon className="h-5 w-5" />
-            Tysta timmar
-          </CardTitle>
-          <CardDescription>
-            Inga aviseringar skickas under dessa timmar
-          </CardDescription>
-        </CardHeader>
-        <CardContent className="space-y-4">
-          <div className="grid grid-cols-2 gap-4">
-            <div className="space-y-2">
-              <Label htmlFor="quiet-start">Från</Label>
-              <Input
-                id="quiet-start"
-                type="time"
-                value={settings.quiet_start}
-                onChange={(e) => updateSetting('quiet_start', e.target.value)}
-                disabled={isSaving}
-              />
-            </div>
-            <div className="space-y-2">
-              <Label htmlFor="quiet-end">Till</Label>
-              <Input
-                id="quiet-end"
-                type="time"
-                value={settings.quiet_end}
-                onChange={(e) => updateSetting('quiet_end', e.target.value)}
-                disabled={isSaving}
-              />
-            </div>
-          </div>
-          <p className="text-xs text-muted-foreground">
-            Standard: 21:00 - 08:00 (Sveriges tid)
-          </p>
-        </CardContent>
-      </Card>
-    </div>
-  )
-}
-
-function urlBase64ToUint8Array(base64String: string): ArrayBuffer {
-  const padding = '='.repeat((4 - (base64String.length % 4)) % 4)
-  const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/')
-  const rawData = window.atob(base64)
-  const outputArray = new Uint8Array(rawData.length)
-
-  for (let i = 0; i < rawData.length; ++i) {
-    outputArray[i] = rawData.charCodeAt(i)
-  }
-
-  return outputArray.buffer
-}
diff --git a/extensions/general/push-notifications/PushPrompt.tsx b/extensions/general/push-notifications/PushPrompt.tsx
deleted file mode 100644
index 4ac7ced5..00000000
--- a/extensions/general/push-notifications/PushPrompt.tsx
+++ /dev/null
@@ -1,211 +0,0 @@
-'use client'
-
-import { useState, useEffect } from 'react'
-import { Button } from '@/components/ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog'
-import { useToast } from '@/components/ui/use-toast'
-import { Bell, BellOff, Loader2 } from 'lucide-react'
-
-interface PushPromptProps {
-  onSubscribed?: () => void
-  onDismissed?: () => void
-}
-
-export function PushPrompt({ onSubscribed, onDismissed }: PushPromptProps) {
-  const { toast } = useToast()
-  const [isOpen, setIsOpen] = useState(false)
-  const [isLoading, setIsLoading] = useState(false)
-  const [isSupported, setIsSupported] = useState(false)
-  const [isSubscribed, setIsSubscribed] = useState(false)
-
-  useEffect(() => {
-    // Check if push notifications are supported
-    if ('serviceWorker' in navigator && 'PushManager' in window) {
-      setIsSupported(true)
-      checkSubscription()
-    }
-  }, [])
-
-  const checkSubscription = async () => {
-    try {
-      const registration = await navigator.serviceWorker.ready
-      const subscription = await registration.pushManager.getSubscription()
-      setIsSubscribed(!!subscription)
-    } catch (error) {
-      console.error('Error checking push subscription:', error)
-    }
-  }
-
-  const requestPermission = async () => {
-    if (!isSupported) return
-
-    setIsLoading(true)
-
-    try {
-      // Request notification permission
-      const permission = await Notification.requestPermission()
-
-      if (permission !== 'granted') {
-        toast({
-          title: 'Aviseringar avslagna',
-          description: 'Du kan aktivera aviseringar senare i inställningarna.',
-        })
-        setIsOpen(false)
-        onDismissed?.()
-        return
-      }
-
-      // Get VAPID public key
-      const vapidResponse = await fetch('/api/extensions/ext/push-notifications/subscribe')
-      const { vapidPublicKey } = await vapidResponse.json()
-
-      if (!vapidPublicKey) {
-        throw new Error('Push notifications not configured')
-      }
-
-      // Subscribe to push notifications
-      const registration = await navigator.serviceWorker.ready
-      const subscription = await registration.pushManager.subscribe({
-        userVisibleOnly: true,
-        applicationServerKey: urlBase64ToUint8Array(vapidPublicKey),
-      })
-
-      // Send subscription to server
-      const response = await fetch('/api/extensions/ext/push-notifications/subscribe', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(subscription.toJSON()),
-      })
-
-      if (!response.ok) {
-        throw new Error('Failed to save subscription')
-      }
-
-      setIsSubscribed(true)
-      setIsOpen(false)
-
-      toast({
-        title: 'Aviseringar aktiverade',
-        description: 'Du kommer få påminnelser om viktiga deadlines.',
-      })
-
-      onSubscribed?.()
-    } catch (error) {
-      console.error('Error subscribing to push:', error)
-      toast({
-        title: 'Fel',
-        description: 'Kunde inte aktivera aviseringar. Försök igen senare.',
-        variant: 'destructive',
-      })
-    } finally {
-      setIsLoading(false)
-    }
-  }
-
-  const handleDismiss = () => {
-    setIsOpen(false)
-    // Store dismissal in localStorage to not show again
-    localStorage.setItem('push-prompt-dismissed', 'true')
-    onDismissed?.()
-  }
-
-  // Don't show if not supported, already subscribed, or previously dismissed
-  if (!isSupported || isSubscribed) {
-    return null
-  }
-
-  // Show dialog after a delay or when triggered
-  return (
-    <>
-      {/* Floating button to show prompt */}
-      <Button
-        variant="outline"
-        size="sm"
-        className="fixed bottom-4 right-4 gap-2 shadow-lg z-50"
-        onClick={() => setIsOpen(true)}
-      >
-        <Bell className="h-4 w-4" />
-        Aktivera aviseringar
-      </Button>
-
-      <Dialog open={isOpen} onOpenChange={setIsOpen}>
-        <DialogContent>
-          <DialogHeader>
-            <DialogTitle className="flex items-center gap-2">
-              <Bell className="h-5 w-5 text-primary" />
-              Aktivera push-aviseringar
-            </DialogTitle>
-            <DialogDescription>
-              Få påminnelser om viktiga skattedeadlines, fakturor som förfaller och
-              kampanjleveranser direkt i din webbläsare.
-            </DialogDescription>
-          </DialogHeader>
-
-          <div className="space-y-4 py-4">
-            <div className="grid gap-2 text-sm">
-              <div className="flex items-center gap-2">
-                <div className="w-2 h-2 bg-primary rounded-full" />
-                <span>Skattedeadlines (7 och 1 dag innan)</span>
-              </div>
-              <div className="flex items-center gap-2">
-                <div className="w-2 h-2 bg-primary rounded-full" />
-                <span>Fakturor som förfaller</span>
-              </div>
-              <div className="flex items-center gap-2">
-                <div className="w-2 h-2 bg-primary rounded-full" />
-                <span>Kampanjleveranser</span>
-              </div>
-            </div>
-
-            <p className="text-xs text-muted-foreground">
-              Du kan när som helst stänga av aviseringar i inställningarna.
-              Vi respekterar tysta timmar (21:00-08:00).
-            </p>
-          </div>
-
-          <DialogFooter className="gap-2 sm:gap-0">
-            <Button variant="ghost" onClick={handleDismiss}>
-              Inte nu
-            </Button>
-            <Button onClick={requestPermission} disabled={isLoading}>
-              {isLoading ? (
-                <>
-                  <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-                  Aktiverar...
-                </>
-              ) : (
-                <>
-                  <Bell className="mr-2 h-4 w-4" />
-                  Aktivera
-                </>
-              )}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </>
-  )
-}
-
-/**
- * Convert base64 VAPID key to Uint8Array for subscription
- */
-function urlBase64ToUint8Array(base64String: string): ArrayBuffer {
-  const padding = '='.repeat((4 - (base64String.length % 4)) % 4)
-  const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/')
-  const rawData = window.atob(base64)
-  const outputArray = new Uint8Array(rawData.length)
-
-  for (let i = 0; i < rawData.length; ++i) {
-    outputArray[i] = rawData.charCodeAt(i)
-  }
-
-  return outputArray.buffer
-}
diff --git a/extensions/general/push-notifications/types.ts b/extensions/general/push-notifications/types.ts
deleted file mode 100644
index 55dc19b2..00000000
--- a/extensions/general/push-notifications/types.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// Re-export from canonical source: kept for backwards compatibility with extension-internal imports
-export type { PushSubscription, NotificationSettings, NotificationType, NotificationLog } from '@/types'
diff --git a/extensions/general/shopify/lib/api-client.ts b/extensions/general/shopify/lib/api-client.ts
index 9a8d9f0c..db81fe8b 100644
--- a/extensions/general/shopify/lib/api-client.ts
+++ b/extensions/general/shopify/lib/api-client.ts
@@ -1,5 +1,6 @@
 import { isUnsafeUrlError, safeFetch } from '@/lib/http/safe-fetch'
 import type { ShopifyOrder, ShopifyShopInfo } from '../types'
+import { sleep } from '@/lib/utils'
 
 /**
  * Minimal Shopify GraphQL Admin API client for the order feed.
@@ -141,10 +142,6 @@ function asTerminalGuardError(err: unknown): ShopifyApiError | null {
   return null
 }
 
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms))
-}
-
 async function postJson(url: string, body: unknown, headers: Record<string, string>) {
   // safeFetch: public address only (checked now, not at connect time), no
   // redirects. A 3xx from the host is a failure, never a hop.
diff --git a/extensions/general/shopify/lib/settings-actions.ts b/extensions/general/shopify/lib/settings-actions.ts
index 86f4bf5f..e993ec61 100644
--- a/extensions/general/shopify/lib/settings-actions.ts
+++ b/extensions/general/shopify/lib/settings-actions.ts
@@ -6,9 +6,11 @@
  * because component logic has no tests in this repo.
  */
 
-import { fetchWithTimeout, isTimeoutError } from '@/lib/http/fetch-with-timeout'
-import { getErrorMessage, type ErrorLocale } from '@/lib/errors/get-error-message'
-import type { ActionFailure } from '@/lib/browser/action-failure'
+import {
+  panelRequest,
+  type PanelRequestOptions,
+  type PanelRequestResult,
+} from '@/lib/browser/panel-request'
 
 /**
  * Deadline for the quick calls (status, toggle, disconnect). Connect probes
@@ -27,77 +29,14 @@ export const SHOPIFY_CONNECT_TIMEOUT_MS = 120_000
  */
 export const SHOPIFY_SYNC_TIMEOUT_MS = 310_000
 
-export type ShopifyRequestResult<T> =
-  /** 2xx. `data` is null when the body was not readable JSON. */
-  | { ok: true; data: T | null }
-  | ActionFailure
+export type ShopifyRequestResult<T> = PanelRequestResult<T>
+export type ShopifyRequestOptions = PanelRequestOptions
 
-export interface ShopifyRequestOptions {
-  url: string
-  method?: 'GET' | 'POST' | 'DELETE'
-  body?: unknown
-  locale?: ErrorLocale
-  timeoutMs?: number
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null
-}
-
-/** The one sentence for a non-2xx; route copy wins over the generic map. */
-export function serverErrorMessage(
-  body: unknown,
-  status: number,
-  locale: ErrorLocale,
-): string {
-  if (isRecord(body)) {
-    if (locale === 'en' && typeof body.error_en === 'string' && body.error_en.trim()) {
-      return body.error_en.trim()
-    }
-    if (typeof body.error === 'string' && body.error.trim()) {
-      return body.error.trim()
-    }
-  }
-  return getErrorMessage(body, { statusCode: status, locale })
-}
+export { serverErrorMessage } from '@/lib/browser/panel-request'
 
 /** Call one of the panel's endpoints and report exactly why it failed. */
-export async function shopifyRequest<T>({
-  url,
-  method = 'POST',
-  body,
-  locale = 'sv',
-  timeoutMs = SHOPIFY_ACTION_TIMEOUT_MS,
-}: ShopifyRequestOptions): Promise<ShopifyRequestResult<T>> {
-  try {
-    const res = await fetchWithTimeout(
-      url,
-      body === undefined
-        ? { method }
-        : {
-            method,
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(body),
-          },
-      { timeoutMs, description: `${method} ${url}` },
-    )
-
-    const payload = await res.json().catch(() => null)
-
-    if (!res.ok) {
-      return {
-        ok: false,
-        reason: 'server',
-        status: res.status,
-        message: serverErrorMessage(payload, res.status, locale),
-      }
-    }
-
-    return { ok: true, data: payload as T | null }
-  } catch (err) {
-    if (isTimeoutError(err)) return { ok: false, reason: 'timeout' }
-    return { ok: false, reason: 'network', message: getErrorMessage(err, { locale }) }
-  }
+export function shopifyRequest<T>(options: ShopifyRequestOptions): Promise<ShopifyRequestResult<T>> {
+  return panelRequest<T>({ timeoutMs: SHOPIFY_ACTION_TIMEOUT_MS, ...options })
 }
 
 /** Success body of POST /api/extensions/ext/shopify/sync. */
diff --git a/extensions/general/skatteverket/index.ts b/extensions/general/skatteverket/index.ts
index a8f430e5..a814ab9a 100644
--- a/extensions/general/skatteverket/index.ts
+++ b/extensions/general/skatteverket/index.ts
@@ -1,3 +1,4 @@
+import { sleep } from '@/lib/utils'
 import crypto from 'crypto'
 import { z } from 'zod'
 import type { SupabaseClient } from '@supabase/supabase-js'
@@ -2927,8 +2928,6 @@ function skatteverketEnabled(): boolean {
   return process.env.SKATTEVERKET_ENABLED === 'true'
 }
 
-const sleep = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms))
-
 const EXTENSION_DISABLED_RESULT: Extract<SkvSubmitResult, { ok: false }> = {
   ok: false,
   code: 'EXTENSION_DISABLED',
diff --git a/extensions/general/skatteverket/lib/connection-store.ts b/extensions/general/skatteverket/lib/connection-store.ts
index 02591e4d..ba72f976 100644
--- a/extensions/general/skatteverket/lib/connection-store.ts
+++ b/extensions/general/skatteverket/lib/connection-store.ts
@@ -313,8 +313,3 @@ export async function findContestedOrgNumbers(): Promise<Set<string>> {
 export async function isOrgNumberContested(orgNumber: string): Promise<boolean> {
   return (await findContestedOrgNumbers()).has(orgNumber)
 }
-
-/** Test hook: reset the memoized service client. */
-export function __resetConnectionStoreForTests(): void {
-  _serviceClient = null
-}
diff --git a/extensions/general/skatteverket/lib/kvittens-notification.ts b/extensions/general/skatteverket/lib/kvittens-notification.ts
index 95bc83c0..8fd45d97 100644
--- a/extensions/general/skatteverket/lib/kvittens-notification.ts
+++ b/extensions/general/skatteverket/lib/kvittens-notification.ts
@@ -27,6 +27,7 @@ import type { SupabaseClient } from '@supabase/supabase-js'
 import { getEmailService } from '@/lib/email/service'
 import { createLogger } from '@/lib/logger'
 import { resolveMemberEmail } from '@/lib/notifications/member-email'
+import { escapeHtml } from '@/lib/email/user-text'
 
 const log = createLogger('skv-kvittens-notification')
 
@@ -173,11 +174,3 @@ async function releaseClaim(
   }
 }
 
-function escapeHtml(input: string): string {
-  return input
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;')
-}
diff --git a/extensions/general/skatteverket/lib/skattekonto-booking.ts b/extensions/general/skatteverket/lib/skattekonto-booking.ts
index b9036ce9..ab5b40e3 100644
--- a/extensions/general/skatteverket/lib/skattekonto-booking.ts
+++ b/extensions/general/skatteverket/lib/skattekonto-booking.ts
@@ -7,6 +7,7 @@ import { getPrimary as getPrimaryCashAccount } from '@/lib/cash-accounts/service
 import type {
   CreateJournalEntryInput,
   CreateJournalEntryLineInput,
+  EntityType,
   JournalEntry,
 } from '@/types'
 import type {
@@ -43,7 +44,7 @@ import type {
 const PRIMARY_SEK_SENTINEL = '__PRIMARY_SEK__'
 const PRIMARY_SEK_FALLBACK = '1930'
 
-export type EntityType = 'enskild_firma' | 'aktiebolag'
+export type { EntityType } from '@/types'
 
 interface SkattekontoRuleRow {
   id: string
diff --git a/extensions/general/skatteverket/types.ts b/extensions/general/skatteverket/types.ts
index 82a73787..27ef8040 100644
--- a/extensions/general/skatteverket/types.ts
+++ b/extensions/general/skatteverket/types.ts
@@ -68,12 +68,6 @@ export interface SkatteverketInlamnatResponse {
   signerare?: string   // Personnummer of signer
 }
 
-/** Response from fetching decisions */
-export interface SkatteverketBeslutatResponse {
-  beslutsdatum?: string
-  momsBeslut?: SkatteverketMomsuppgift
-}
-
 /** Stored token pair (decrypted form) */
 export interface SkatteverketTokens {
   access_token: string
@@ -83,13 +77,6 @@ export interface SkatteverketTokens {
   scope: string
 }
 
-/** Declaration submission status tracking */
-export type DeclarationStatus =
-  | 'draft_saved'
-  | 'draft_locked'
-  | 'signed'
-  | 'decided'
-
 // ── AGI (Arbetsgivardeklaration) types ──────────────────────────
 //
 // Field shapes mirror the Skatteverket RAMLs in dev_docs/:
@@ -232,20 +219,6 @@ export interface SkatteverketAGIKontrollsvarFel {
   felmeddelande?: string
 }
 
-export interface SkatteverketSubmission {
-  id: string
-  user_id: string
-  redovisare: string         // 12-digit org/personnummer
-  redovisningsperiod: string // YYYYMM
-  status: DeclarationStatus
-  kvittensnummer: string | null
-  signeringslank: string | null
-  kontrollresultat: SkatteverketKontrollResultat | null
-  momsuppgift: SkatteverketMomsuppgift
-  created_at: string
-  updated_at: string
-}
-
 // ── Skattekonto (tax account) types ────────────────────────────
 //
 // Field names match Skatteverket's Skattekonto API v2.1.0 JSON schema.
@@ -323,8 +296,6 @@ export interface SkatteverketFel {
 // code continues to import from this module for backwards compatibility.
 export type {
   StoredSkattekontoTransaction,
-  SkattekontoMatchSuggestion,
-  SkattekontoBookingSuggestion,
   SkattekontoTransactionWithSuggestion,
 } from '@/types/skatteverket'
 
diff --git a/extensions/general/stripe/lib/settings-actions.ts b/extensions/general/stripe/lib/settings-actions.ts
index e6bf539d..448ca047 100644
--- a/extensions/general/stripe/lib/settings-actions.ts
+++ b/extensions/general/stripe/lib/settings-actions.ts
@@ -22,9 +22,11 @@
  * one is ever rendered. Every outcome below therefore resolves to one sentence.
  */
 
-import { fetchWithTimeout, isTimeoutError } from '@/lib/http/fetch-with-timeout'
-import { getErrorMessage, type ErrorLocale } from '@/lib/errors/get-error-message'
-import type { ActionFailure } from '@/lib/browser/action-failure'
+import {
+  panelRequest,
+  type PanelRequestOptions,
+  type PanelRequestResult,
+} from '@/lib/browser/panel-request'
 
 /**
  * Deadline for the panel's quick calls: the status read, the connect handshake,
@@ -50,107 +52,14 @@ export const STRIPE_ACTION_TIMEOUT_MS = 15_000
  */
 export const STRIPE_SYNC_TIMEOUT_MS = 310_000
 
-export type StripeRequestResult<T> =
-  /** 2xx. `data` is null when the body was not readable JSON. */
-  | { ok: true; data: T | null }
-  | ActionFailure
+export type StripeRequestResult<T> = PanelRequestResult<T>
+export type StripeRequestOptions = PanelRequestOptions
 
-export interface StripeRequestOptions {
-  url: string
-  /** Defaults to POST: three of the four calls are mutations. */
-  method?: 'GET' | 'POST' | 'DELETE'
-  /** JSON request body. Omitted entirely for the routes that ignore it. */
-  body?: unknown
-  /** UI locale, so a server error is reported in the language the user reads. */
-  locale?: ErrorLocale
-  timeoutMs?: number
-}
+export { serverErrorMessage } from '@/lib/browser/panel-request'
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null
-}
-
-/**
- * The one sentence for a non-2xx.
- *
- * The Stripe extension routes (extensions/general/stripe/index.ts) refuse with a
- * hand-written Swedish sentence in `{ error }`, and that sentence is the most
- * specific thing anyone can say: "Inget anslutet Stripe-konto." tells the user
- * to reconnect, where the status map's "Resursen kunde inte hittas." tells them
- * nothing. `getErrorMessage` keeps such a sentence only when it happens to carry
- * one of its Swedish trigger words, which this route copy does not, so the
- * string is preferred explicitly.
- *
- * `error_en` is honoured first for an English UI because the shared capability
- * guard emits both (`capabilityBlockedResponse` in
- * lib/entitlements/has-capability.ts), and `getErrorMessage` only reads
- * `message_en` inside a structured envelope, not a top-level `error_en`.
- *
- * Everything else is `getErrorMessage`'s: a structured envelope, an HTML 502
- * from the platform, a body that never parsed.
- */
-export function serverErrorMessage(
-  body: unknown,
-  status: number,
-  locale: ErrorLocale,
-): string {
-  if (isRecord(body)) {
-    if (locale === 'en' && typeof body.error_en === 'string' && body.error_en.trim()) {
-      return body.error_en.trim()
-    }
-    if (typeof body.error === 'string' && body.error.trim()) {
-      return body.error.trim()
-    }
-  }
-  return getErrorMessage(body, { statusCode: status, locale })
-}
-
-/**
- * Call one of the panel's endpoints and report exactly why it failed.
- *
- * Never throws: every arm resolves to a member of the union, so the call site
- * cannot have a silent path again by forgetting a `catch`.
- */
-export async function stripeRequest<T>({
-  url,
-  method = 'POST',
-  body,
-  locale = 'sv',
-  timeoutMs = STRIPE_ACTION_TIMEOUT_MS,
-}: StripeRequestOptions): Promise<StripeRequestResult<T>> {
-  try {
-    const res = await fetchWithTimeout(
-      url,
-      body === undefined
-        ? { method }
-        : {
-            method,
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(body),
-          },
-      { timeoutMs, description: `${method} ${url}` },
-    )
-
-    // Read the body on both arms: the failure arm needs the route's own
-    // sentence, the success arm needs the sync counts. A body that is not JSON
-    // (an HTML error page, an empty 502, a response truncated mid-stream) leaves
-    // null, and neither arm then claims anything it cannot support.
-    const payload = await res.json().catch(() => null)
-
-    if (!res.ok) {
-      return {
-        ok: false,
-        reason: 'server',
-        status: res.status,
-        message: serverErrorMessage(payload, res.status, locale),
-      }
-    }
-
-    return { ok: true, data: payload as T | null }
-  } catch (err) {
-    if (isTimeoutError(err)) return { ok: false, reason: 'timeout' }
-    return { ok: false, reason: 'network', message: getErrorMessage(err, { locale }) }
-  }
+/** Call one of the panel's endpoints and report exactly why it failed. */
+export function stripeRequest<T>(options: StripeRequestOptions): Promise<StripeRequestResult<T>> {
+  return panelRequest<T>({ timeoutMs: STRIPE_ACTION_TIMEOUT_MS, ...options })
 }
 
 /** Success body of POST /api/extensions/ext/stripe/sync. */
diff --git a/extensions/general/stripe/lib/transaction-sync.ts b/extensions/general/stripe/lib/transaction-sync.ts
index 3bc79c89..45451d30 100644
--- a/extensions/general/stripe/lib/transaction-sync.ts
+++ b/extensions/general/stripe/lib/transaction-sync.ts
@@ -1,3 +1,4 @@
+import { chunk as chunked } from '@/lib/utils'
 import type Stripe from 'stripe'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { getStripe } from '@/lib/stripe/client'
@@ -478,12 +479,6 @@ async function linkBookedPayouts(
   return linked
 }
 
-function chunked<T>(items: T[], size: number): T[][] {
-  const out: T[][] = []
-  for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size))
-  return out
-}
-
 export async function syncStripeBalanceTransactions(
   supabase: SupabaseClient,
   connection: StripeConnection,
diff --git a/extensions/general/tic/lib/bankid-types.ts b/extensions/general/tic/lib/bankid-types.ts
index 11998beb..9bc93dfc 100644
--- a/extensions/general/tic/lib/bankid-types.ts
+++ b/extensions/general/tic/lib/bankid-types.ts
@@ -134,26 +134,3 @@ export interface EnrichmentData {
   spar?: SparData
   companyRoles?: CompanyRole[]
 }
-
-// ---------------------------------------------------------------------------
-// Complete endpoint request/response (Accounted internal)
-// ---------------------------------------------------------------------------
-
-export interface BankIdCompleteRequest {
-  sessionId: string
-  mode: 'login' | 'signup'
-  email?: string
-}
-
-export interface BankIdCompleteResponse {
-  tokenHash: string
-  type: string
-  isNewUser: boolean
-  enrichmentData?: EnrichmentData
-}
-
-export interface BankIdCompleteErrorResponse {
-  error: 'no_account' | 'already_linked' | 'account_exists' | 'session_invalid' | 'session_expired'
-  givenName?: string
-  surname?: string
-}
diff --git a/extensions/general/tic/lib/tic-client.ts b/extensions/general/tic/lib/tic-client.ts
index bc1266ba..de810b7d 100644
--- a/extensions/general/tic/lib/tic-client.ts
+++ b/extensions/general/tic/lib/tic-client.ts
@@ -8,7 +8,6 @@ import type {
   TICCompanyPurpose,
   TICDocument,
   TICFiscalYear,
-  TICAccountingPeriod,
   TICPayrollSummary,
   TICSignatory,
   TICRepresentatives,
@@ -251,17 +250,6 @@ export async function getFiscalYears(companyId: number): Promise<TICFiscalYear[]
   return ticApiFetch<TICFiscalYear[]>(`/companies/${companyId}/fiscal-years`)
 }
 
-/**
- * Get accounting-period change history for a company. v2 endpoint with
- * no v1 equivalent: surfaces "this company has shifted its year-end"
- * during onboarding/customer-setup.
- */
-export async function getAccountingPeriods(
-  companyId: number
-): Promise<TICAccountingPeriod[] | null> {
-  return ticApiFetch<TICAccountingPeriod[]>(`/companies/${companyId}/accounting-periods`)
-}
-
 /**
  * Get payroll summary for a company. v2 endpoint: restructured from
  * v1's `/se/payroll`, returns `{ payroll2, payrolls }` where `payroll2`
diff --git a/extensions/general/tic/lib/tic-types.ts b/extensions/general/tic/lib/tic-types.ts
index f593af5b..70336b80 100644
--- a/extensions/general/tic/lib/tic-types.ts
+++ b/extensions/general/tic/lib/tic-types.ts
@@ -264,21 +264,6 @@ export interface TICFiscalYear {
   lastUpdatedAtUtc?: string | null
 }
 
-/**
- * v2 `/companies/{id}/accounting-periods` returns
- * `CompanyAccountingPeriod_Dto[]`: history of period-end changes
- * (e.g. shifted year-end). Useful as a "this company changed its books"
- * indicator during onboarding.
- */
-export interface TICAccountingPeriod {
-  companyAccountingPeriodId?: number
-  companyId?: number
-  endingDatePriorToChange?: string | null
-  endingDateAfterChange?: string | null
-  firstSeenAtUtc?: string | null
-  lastUpdatedAtUtc?: string | null
-}
-
 /**
  * v2 `/companies/{id}/payrolls` returns a wrapper with two arrays.
  * `payroll2` is the modern per-period breakdown with deviation vs the
diff --git a/extensions/general/whatsapp-inbox/lib/process-inbound.ts b/extensions/general/whatsapp-inbox/lib/process-inbound.ts
index e2dac5f1..05fed8d6 100644
--- a/extensions/general/whatsapp-inbox/lib/process-inbound.ts
+++ b/extensions/general/whatsapp-inbox/lib/process-inbound.ts
@@ -94,14 +94,7 @@ const STATE_FOR_QUESTION: Record<QuestionType, WhatsAppConversation['state']> =
   resend: 'awaiting_resend',
 }
 
-// Injectable sleep so tests never wait on real debounce windows.
-let sleepFn: (ms: number) => Promise<void> = (ms) =>
-  new Promise((resolve) => setTimeout(resolve, ms))
-
-/** Test-only: replace (or restore) the debounce sleep implementation. */
-export function __setSleepForTests(fn: ((ms: number) => Promise<void>) | null): void {
-  sleepFn = fn ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)))
-}
+const sleepFn = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms))
 
 function fallbackFilename(mime: string): string {
   const ext = EXTENSION_FOR_MIME[mime] ?? 'bin'
diff --git a/extensions/general/woocommerce/lib/api-client.ts b/extensions/general/woocommerce/lib/api-client.ts
index 14c99c1e..cfe5e931 100644
--- a/extensions/general/woocommerce/lib/api-client.ts
+++ b/extensions/general/woocommerce/lib/api-client.ts
@@ -1,3 +1,4 @@
+import { sleep } from '@/lib/utils'
 import { isUnsafeUrlError, safeFetch } from '@/lib/http/safe-fetch'
 import type { WooOrder, WooRefund, WooStoreInfo } from '../types'
 
@@ -133,10 +134,6 @@ function storeOriginOf(creds: WooCredentials): string {
   return normalized
 }
 
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms))
-}
-
 function buildUrl(
   creds: WooCredentials,
   path: string,
diff --git a/extensions/general/woocommerce/lib/settings-actions.ts b/extensions/general/woocommerce/lib/settings-actions.ts
index ba68a809..6a2d0f7f 100644
--- a/extensions/general/woocommerce/lib/settings-actions.ts
+++ b/extensions/general/woocommerce/lib/settings-actions.ts
@@ -6,9 +6,11 @@
  * tests in this repo.
  */
 
-import { fetchWithTimeout, isTimeoutError } from '@/lib/http/fetch-with-timeout'
-import { getErrorMessage, type ErrorLocale } from '@/lib/errors/get-error-message'
-import type { ActionFailure } from '@/lib/browser/action-failure'
+import {
+  panelRequest,
+  type PanelRequestOptions,
+  type PanelRequestResult,
+} from '@/lib/browser/panel-request'
 
 /**
  * Deadline for the quick calls (status, toggle, disconnect). Connect and
@@ -27,77 +29,14 @@ export const WOO_CONNECT_TIMEOUT_MS = 120_000
  */
 export const WOO_SYNC_TIMEOUT_MS = 310_000
 
-export type WooRequestResult<T> =
-  /** 2xx. `data` is null when the body was not readable JSON. */
-  | { ok: true; data: T | null }
-  | ActionFailure
+export type WooRequestResult<T> = PanelRequestResult<T>
+export type WooRequestOptions = PanelRequestOptions
 
-export interface WooRequestOptions {
-  url: string
-  method?: 'GET' | 'POST' | 'DELETE'
-  body?: unknown
-  locale?: ErrorLocale
-  timeoutMs?: number
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null
-}
-
-/** The one sentence for a non-2xx; route copy wins over the generic map. */
-export function serverErrorMessage(
-  body: unknown,
-  status: number,
-  locale: ErrorLocale,
-): string {
-  if (isRecord(body)) {
-    if (locale === 'en' && typeof body.error_en === 'string' && body.error_en.trim()) {
-      return body.error_en.trim()
-    }
-    if (typeof body.error === 'string' && body.error.trim()) {
-      return body.error.trim()
-    }
-  }
-  return getErrorMessage(body, { statusCode: status, locale })
-}
+export { serverErrorMessage } from '@/lib/browser/panel-request'
 
 /** Call one of the panel's endpoints and report exactly why it failed. */
-export async function wooRequest<T>({
-  url,
-  method = 'POST',
-  body,
-  locale = 'sv',
-  timeoutMs = WOO_ACTION_TIMEOUT_MS,
-}: WooRequestOptions): Promise<WooRequestResult<T>> {
-  try {
-    const res = await fetchWithTimeout(
-      url,
-      body === undefined
-        ? { method }
-        : {
-            method,
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(body),
-          },
-      { timeoutMs, description: `${method} ${url}` },
-    )
-
-    const payload = await res.json().catch(() => null)
-
-    if (!res.ok) {
-      return {
-        ok: false,
-        reason: 'server',
-        status: res.status,
-        message: serverErrorMessage(payload, res.status, locale),
-      }
-    }
-
-    return { ok: true, data: payload as T | null }
-  } catch (err) {
-    if (isTimeoutError(err)) return { ok: false, reason: 'timeout' }
-    return { ok: false, reason: 'network', message: getErrorMessage(err, { locale }) }
-  }
+export function wooRequest<T>(options: WooRequestOptions): Promise<WooRequestResult<T>> {
+  return panelRequest<T>({ timeoutMs: WOO_ACTION_TIMEOUT_MS, ...options })
 }
 
 /** Success body of POST /api/extensions/ext/woocommerce/sync. */
diff --git a/lib/agent-context/underlag-candidates.ts b/lib/agent-context/underlag-candidates.ts
index 6e4ba7cd..545b4a5a 100644
--- a/lib/agent-context/underlag-candidates.ts
+++ b/lib/agent-context/underlag-candidates.ts
@@ -37,9 +37,9 @@ import type { InboxChannelContext, InvoiceExtractionResult } from '@/types'
 
 /**
  * Confidence floor for surfacing an unmatched item as a probable underlag.
- * Deliberately above core-receipt-matcher's MIN_MATCH_CONFIDENCE (0.4): that
- * floor governs a picker where a human reads a ranked list and judges, whereas
- * a candidate named here is read by an agent that will reason from it. A wrong
+ * Deliberately stricter than the receipt picker, which ranks candidates without
+ * a hard floor: there a human reads a ranked list and judges, whereas a
+ * candidate named here is read by an agent that will reason from it. A wrong
  * receipt on the wrong transaction is a mis-booking, so this surface trades
  * recall for precision and leaves the rest to the picker.
  */
diff --git a/lib/agent/intents/registry.ts b/lib/agent/intents/registry.ts
index c2e947b9..c67062d8 100644
--- a/lib/agent/intents/registry.ts
+++ b/lib/agent/intents/registry.ts
@@ -40,8 +40,3 @@ const INTENTS: AgentIntent<any, any>[] = [
 export function getIntent(id: string): AgentIntent<any, any> | undefined {
   return INTENTS.find((i) => i.id === id)
 }
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function listIntents(): AgentIntent<any, any>[] {
-  return INTENTS
-}
diff --git a/lib/ai/index.ts b/lib/ai/index.ts
index 596236ec..4a9d6b2d 100644
--- a/lib/ai/index.ts
+++ b/lib/ai/index.ts
@@ -1,29 +1,18 @@
-import { getAiStatus, readAiConfig, type ResolvedAiConfig } from './config'
+import { readAiConfig, type ResolvedAiConfig } from './config'
 import { createAnthropicFamilyService } from './services/anthropic-family'
 import { createOpenAICompatibleService } from './services/openai-compatible'
 import type { AiService } from './types'
 
 export type {
-  AiCapabilities,
   AiChatTurn,
   AiDocumentInput,
   AiImageMediaType,
-  AiPdfMode,
-  AiProviderKind,
   AiService,
   AiToolDef,
-  AiStatus,
   AiTier,
-  AiUsage,
-  ExtractFromDocumentRequest,
-  ExtractFromDocumentResult,
   ExtractionSkipReason,
-  GenerateStructuredRequest,
-  GenerateStructuredResult,
-  GenerateTextRequest,
-  GenerateTextResult,
 } from './types'
-export { getAiStatus, readAiConfig, resolveTierModel } from './config'
+export { getAiStatus, readAiConfig } from './config'
 export { extractJsonObject } from './json'
 
 // One service per resolved configuration. Keyed on the non-secret parts of
@@ -61,8 +50,3 @@ export function getAiService(): AiService {
   cached = { key, service }
   return service
 }
-
-/** Tests only: drop the cached service so the next call re-reads the environment. */
-export function resetAiServiceForTests(): void {
-  cached = null
-}
diff --git a/lib/ai/provider.ts b/lib/ai/provider.ts
index 239fd35d..0f746d57 100644
--- a/lib/ai/provider.ts
+++ b/lib/ai/provider.ts
@@ -1,5 +1,7 @@
 import Anthropic from '@anthropic-ai/sdk'
 import AnthropicBedrock from '@anthropic-ai/bedrock-sdk'
+import type { AiProviderKind } from './types'
+
 
 /**
  * Which backend AI traffic goes to.
@@ -20,7 +22,8 @@ import AnthropicBedrock from '@anthropic-ai/bedrock-sdk'
  *
  * See https://github.com/erp-mafia/accounted/issues/1406.
  */
-export type AiProvider = 'bedrock' | 'anthropic' | 'openai-compatible'
+export type AiProvider = AiProviderKind
+
 
 /**
  * Thrown by createAiClient() when the resolved backend has no Anthropic
diff --git a/lib/api/__tests__/token-rate-limit.test.ts b/lib/api/__tests__/token-rate-limit.test.ts
new file mode 100644
index 00000000..697334b6
--- /dev/null
+++ b/lib/api/__tests__/token-rate-limit.test.ts
@@ -0,0 +1,41 @@
+import { describe, it, expect, vi, afterEach } from 'vitest'
+import { createTokenRateLimiter } from '../token-rate-limit'
+
+describe('createTokenRateLimiter', () => {
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('allows up to max requests per window, then refuses', () => {
+    const limiter = createTokenRateLimiter({ max: 3, windowMs: 60_000 })
+    expect(limiter.allow('a')).toBe(true)
+    expect(limiter.allow('a')).toBe(true)
+    expect(limiter.allow('a')).toBe(true)
+    expect(limiter.allow('a')).toBe(false)
+  })
+
+  it('keys the budget per token', () => {
+    const limiter = createTokenRateLimiter({ max: 1, windowMs: 60_000 })
+    expect(limiter.allow('a')).toBe(true)
+    expect(limiter.allow('b')).toBe(true)
+    expect(limiter.allow('a')).toBe(false)
+  })
+
+  it('resets the budget once the window has passed', () => {
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date('2026-01-01T00:00:00Z'))
+    const limiter = createTokenRateLimiter({ max: 1, windowMs: 60_000 })
+    expect(limiter.allow('a')).toBe(true)
+    expect(limiter.allow('a')).toBe(false)
+    vi.setSystemTime(new Date('2026-01-01T00:01:00.001Z'))
+    expect(limiter.allow('a')).toBe(true)
+  })
+
+  it('keeps separate limiters isolated', () => {
+    const one = createTokenRateLimiter({ max: 1, windowMs: 60_000 })
+    const two = createTokenRateLimiter({ max: 1, windowMs: 60_000 })
+    expect(one.allow('a')).toBe(true)
+    expect(two.allow('a')).toBe(true)
+    expect(one.allow('a')).toBe(false)
+  })
+})
diff --git a/lib/api/private-no-store.ts b/lib/api/private-no-store.ts
index 03c7769b..596daabf 100644
--- a/lib/api/private-no-store.ts
+++ b/lib/api/private-no-store.ts
@@ -1,5 +1,7 @@
 import type { NextResponse } from 'next/server'
 
+export const PRIVATE_NO_STORE_HEADERS = { 'Cache-Control': 'private, no-store' } as const
+
 export function privateNoStore(response: NextResponse): NextResponse {
   response.headers.set('Cache-Control', 'private, no-store')
   return response
diff --git a/lib/api/schemas.ts b/lib/api/schemas.ts
index 4206065b..e3145546 100644
--- a/lib/api/schemas.ts
+++ b/lib/api/schemas.ts
@@ -221,18 +221,10 @@ export const SupplierTypeSchema = z.enum([
   'non_eu_business',
 ])
 
-export const InvoiceStatusSchema = z.enum([
-  'draft', 'sent', 'paid', 'overdue', 'cancelled', 'credited',
-])
-
 export const InvoiceDocumentTypeSchema = z.enum([
   'invoice', 'proforma', 'delivery_note',
 ])
 
-export const SupplierInvoiceStatusSchema = z.enum([
-  'registered', 'approved', 'paid', 'partially_paid', 'overdue', 'disputed', 'credited',
-])
-
 export const VatTreatmentSchema = z.enum([
   'standard_25', 'reduced_12', 'reduced_6', 'reverse_charge', 'export', 'exempt',
 ])
@@ -1775,7 +1767,6 @@ export const BulkBookInboxSchema = z.object({
   // staged-params reason as the fields above.
   dimensions: DimensionsBagSchema.nullish().transform((v) => v ?? undefined),
 })
-export type BulkBookInboxInput = z.infer<typeof BulkBookInboxSchema>
 
 export const MatchInvoiceSchema = z
   .object({
@@ -2531,12 +2522,6 @@ export const VatDeclarationQuerySchema = z.object({
   period: z.coerce.number().int().min(1).max(12),
 })
 
-export const ReportPeriodQuerySchema = z.object({
-  fiscal_period_id: uuid.optional(),
-  year: z.coerce.number().int().min(2000).max(2100).optional(),
-  month: z.coerce.number().int().min(1).max(12).optional(),
-})
-
 export const AccountBalancesQuerySchema = z.object({
   accounts: z
     .string()
@@ -2814,7 +2799,6 @@ export const EmploymentTypeSchema = z.enum(['employee', 'company_owner', 'board_
 export const SalaryTypeSchema = z.enum(['monthly', 'hourly'])
 export const FSkattStatusSchema = z.enum(['a_skatt', 'f_skatt', 'fa_skatt', 'not_verified'])
 export const VacationRuleSchema = z.enum(['procentregeln', 'sammaloneregeln', 'none', 'semesterersattning'])
-export const SalaryRunStatusSchema = z.enum(['draft', 'review', 'approved', 'paid', 'booked', 'corrected'])
 
 export const SalaryLineItemTypeSchema = z.enum([
   'monthly_salary', 'hourly_salary',
@@ -3409,90 +3393,6 @@ export const BatchUpsertWorkedDaysSchema = z
     },
   )
 
-// ============================================================
-// AI agent flow schemas
-// ============================================================
-
-const BookingProposalLineSchema = z.object({
-  account_number: accountNumber,
-  debit_amount: nonNegativeAmount,
-  credit_amount: nonNegativeAmount,
-  description: z.string().min(1).max(500),
-})
-
-const BookingProposalCounterpartyTemplateSchema = z.object({
-  counterparty_name: z.string().min(1).max(200),
-  debit_account: accountNumber,
-  credit_account: accountNumber,
-  vat_treatment: VatTreatmentSchema.nullable(),
-  category: TransactionCategorySchema.nullable(),
-})
-
-// Edit payload: the user's edited version of a booking proposal. Used in
-// the /accept endpoint when the user adjusted accounts/VAT before approving.
-export const EditBookingProposalSchema = z.object({
-  lines: z.array(BookingProposalLineSchema).min(2),
-  vat_treatment: VatTreatmentSchema.nullable(),
-  default_private: z.boolean(),
-  counterparty_template_proposal: BookingProposalCounterpartyTemplateSchema.nullable(),
-  fiscal_period_id: uuid,
-  entry_date: isoDate,
-  description: z.string().min(1).max(500),
-})
-
-// For match proposals, editing just means picking a different transaction.
-export const EditMatchProposalSchema = z.object({
-  matched_transaction_id: uuid,
-})
-
-export const AcceptProposalSchema = z.object({
-  version: z.number().int().nonnegative(),
-  edits: z.union([EditBookingProposalSchema, EditMatchProposalSchema]).optional(),
-})
-
-// Change the matched transaction on a pending match proposal without
-// accepting it. Source tells us whether the user picked one of the AI's
-// own alternatives, an AI-regenerated suggestion, or a manually-chosen
-// transaction: kept on edit_diff for learning signal.
-export const ChangeMatchProposalSchema = z.object({
-  version: z.number().int().nonnegative(),
-  matched_transaction_id: uuid,
-  source: z.enum(['user_alternative', 'user_manual', 'ai_regenerated']),
-})
-
-export const RejectProposalSchema = z.object({
-  version: z.number().int().nonnegative(),
-  reason: z.string().max(500).optional(),
-})
-
-export const BatchAcceptSchema = z.object({
-  proposal_ids: z.array(uuid).min(1).max(50),
-})
-
-export const ResolveRequestSchema = z.object({
-  response: z.record(z.string(), z.unknown()).optional(),
-})
-
-export const StartBackfillSchema = z.object({}).strict()
-
-export const RememberLearningSchema = z.object({
-  proposal_id: uuid,
-  counterparty_name: z.string().min(1).max(200),
-  debit_account: accountNumber,
-  credit_account: accountNumber,
-  vat_treatment: VatTreatmentSchema.nullable(),
-  category: TransactionCategorySchema.nullable(),
-})
-
-export const ListProposalsQuerySchema = z.object({
-  status: z
-    .enum(['pending', 'accepted', 'rejected', 'skipped', 'invalidated'])
-    .optional(),
-  step_type: z.enum(['match', 'booking']).optional(),
-  limit: z.coerce.number().int().min(1).max(100).default(20),
-  offset: z.coerce.number().int().min(0).default(0),
-})
-
 export const AttachDocumentSchema = z.object({
   document_id: uuid,
 })
@@ -3518,71 +3418,6 @@ export const UnderlagImportPreviewSchema = z.object({
   fiscal_period_id: uuid,
 })
 
-// ============================================================
-// Shift-premium rules (OB-tillägg och övertid)
-// ============================================================
-
-export const ShiftPremiumItemTypeSchema = z.enum([
-  'overtime_50',
-  'overtime_100',
-  'ob_weekday_evening',
-  'ob_weekend',
-  'ob_night',
-  'ob_holiday',
-])
-
-const dayOfWeekArray = z
-  .array(z.number().int().min(1).max(7))
-  .min(1, 'Välj minst en veckodag')
-  .max(7, 'Högst sju veckodagar tillåtna')
-
-export const CreateShiftPremiumRuleSchema = z
-  .object({
-    name: z.string().min(1).max(120),
-    applies_to_all_employees: z.boolean().default(true),
-    applies_to_employee_ids: z.array(uuid).default([]),
-    day_of_week: dayOfWeekArray,
-    start_time: timeString,
-    end_time: timeString,
-    premium_percent: z.number().min(0).max(500),
-    item_type: ShiftPremiumItemTypeSchema,
-    priority: z.number().int().min(0).max(1000).default(0),
-    is_active: z.boolean().default(true),
-  })
-  .refine(
-    (data) => data.applies_to_all_employees || data.applies_to_employee_ids.length > 0,
-    {
-      message: 'Välj minst en anställd när regeln inte gäller alla',
-      path: ['applies_to_employee_ids'],
-    },
-  )
-
-export const UpdateShiftPremiumRuleSchema = z
-  .object({
-    name: z.string().min(1).max(120).optional(),
-    applies_to_all_employees: z.boolean().optional(),
-    applies_to_employee_ids: z.array(uuid).optional(),
-    day_of_week: dayOfWeekArray.optional(),
-    start_time: timeString.optional(),
-    end_time: timeString.optional(),
-    premium_percent: z.number().min(0).max(500).optional(),
-    item_type: ShiftPremiumItemTypeSchema.optional(),
-    priority: z.number().int().min(0).max(1000).optional(),
-    is_active: z.boolean().optional(),
-  })
-  .refine(
-    (data) => {
-      if (data.applies_to_all_employees === false && data.applies_to_employee_ids !== undefined) {
-        return data.applies_to_employee_ids.length > 0
-      }
-      return true
-    },
-    {
-      message: 'Välj minst en anställd när regeln inte gäller alla',
-      path: ['applies_to_employee_ids'],
-    },
-  )
-
 /**
  * Per-employee override on a salary run (advanced mode).
  *
diff --git a/lib/api/token-rate-limit.ts b/lib/api/token-rate-limit.ts
new file mode 100644
index 00000000..77956257
--- /dev/null
+++ b/lib/api/token-rate-limit.ts
@@ -0,0 +1,40 @@
+/**
+ * In-memory per-token rate limiter for the public token-authenticated routes
+ * (calendar feed, payslip PDF). The token IS the authentication on those
+ * routes, so the limit is keyed by token, not by user.
+ *
+ * Process-local by design: a multi-instance deploy limits per instance, which
+ * is acceptable for these low-value endpoints. Each route creates its own
+ * limiter so the maps stay isolated.
+ */
+export function createTokenRateLimiter(options: { max: number; windowMs: number; cleanupEveryMs?: number }) {
+  const { max, windowMs, cleanupEveryMs = 5 * 60_000 } = options
+  const entries = new Map<string, { count: number; resetAt: number }>()
+  let lastCleanup = Date.now()
+
+  // Periodic sweep of expired entries so the map cannot grow without bound.
+  function cleanup() {
+    const now = Date.now()
+    if (now - lastCleanup < cleanupEveryMs) return
+    lastCleanup = now
+    for (const [key, value] of entries) {
+      if (now > value.resetAt) entries.delete(key)
+    }
+  }
+
+  return {
+    /** Count one request for `token`; false when the window's budget is spent. */
+    allow(token: string): boolean {
+      cleanup()
+      const nowMs = Date.now()
+      const entry = entries.get(token)
+      if (entry && nowMs < entry.resetAt) {
+        if (entry.count >= max) return false
+        entry.count++
+      } else {
+        entries.set(token, { count: 1, resetAt: nowMs + windowMs })
+      }
+      return true
+    },
+  }
+}
diff --git a/lib/api/v1/body.ts b/lib/api/v1/body.ts
new file mode 100644
index 00000000..7ffd0f50
--- /dev/null
+++ b/lib/api/v1/body.ts
@@ -0,0 +1,35 @@
+/**
+ * JSON body reader for v1 routes.
+ *
+ * Every v1 write route parses its body the same way: read JSON, and on a
+ * malformed body answer with the VALIDATION_ERROR envelope pointing at
+ * `body`. This helper is that block, so routes do:
+ *
+ *   const raw = await readV1JsonBody(request, ctx)
+ *   if (!raw.ok) return raw.response
+ *   const parsed = Schema.safeParse(raw.body)
+ */
+
+import type { NextResponse } from 'next/server'
+import { v1ErrorResponseFromCode, type V1ValidationContext } from './errors'
+
+export type V1JsonBodyResult =
+  | { ok: true; body: unknown }
+  | { ok: false; response: NextResponse }
+
+export async function readV1JsonBody(
+  request: Request,
+  ctx: V1ValidationContext,
+): Promise<V1JsonBodyResult> {
+  try {
+    return { ok: true, body: await request.json() }
+  } catch {
+    return {
+      ok: false,
+      response: await v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
+        requestId: ctx.requestId,
+        details: { field: 'body', message: 'Body is not valid JSON.' },
+      }),
+    }
+  }
+}
diff --git a/lib/api/v1/dry-run.ts b/lib/api/v1/dry-run.ts
index ed367ee8..2fcc4a86 100644
--- a/lib/api/v1/dry-run.ts
+++ b/lib/api/v1/dry-run.ts
@@ -47,32 +47,6 @@ export interface DryRunPreviewBase<T> {
   preview: T
 }
 
-export interface DryRunPreviewStaged<T> extends DryRunPreviewBase<T> {
-  /** `pending_operations.id`. Use with POST /v1/operations/{id}:commit. */
-  staged_operation_id: string
-  /**
-   * Journal lines this write WOULD produce on commit. Absent for
-   * non-financial writes. Each item: `{ account, debit, credit, description? }`.
-   */
-  journal_lines?: Array<{
-    account: string
-    debit: number
-    credit: number
-    description?: string
-  }>
-  /**
-   * The voucher number that WOULD be assigned on commit. Present only
-   * when the write produces a posted journal entry. Voucher numbers are
-   * sequential, so this is a *projection*: the actual number could differ
-   * by one or two if another committer beat the agent to the next number.
-   */
-  voucher_number_assigned_on_commit?: string
-  /** Effect on account balances. Absent for non-financial writes. */
-  account_deltas?: Array<{ account: string; delta: number }>
-}
-
-export type DryRunPreview<T> = DryRunPreviewBase<T> | DryRunPreviewStaged<T>
-
 interface DryRunResponseOptions {
   requestId: string
   log: Logger
@@ -90,37 +64,3 @@ export function dryRunPreview<T>(preview: T, opts: DryRunResponseOptions): NextR
   opts.log.info('dry-run preview returned', { stage: 'validation-only' })
   return ok(body, { requestId: opts.requestId, dryRun: true })
 }
-
-/**
- * Return a 200 OK dry-run response for a staged preview (financial writes).
- *
- * Phase 2 PR-B-1 does not yet exercise this path; the helper is in place so
- * Phase 2 PR-B-2 (invoice writes) and later phases (journal entries,
- * year-end, etc.) reuse it without redefining the shape.
- */
-export function dryRunStaged<T>(
-  data: {
-    preview: T
-    stagedOperationId: string
-    journalLines?: DryRunPreviewStaged<T>['journal_lines']
-    voucherNumberAssignedOnCommit?: string
-    accountDeltas?: DryRunPreviewStaged<T>['account_deltas']
-  },
-  opts: DryRunResponseOptions,
-): NextResponse {
-  const body: DryRunPreviewStaged<T> = {
-    dry_run: true,
-    preview: data.preview,
-    staged_operation_id: data.stagedOperationId,
-    ...(data.journalLines ? { journal_lines: data.journalLines } : {}),
-    ...(data.voucherNumberAssignedOnCommit
-      ? { voucher_number_assigned_on_commit: data.voucherNumberAssignedOnCommit }
-      : {}),
-    ...(data.accountDeltas ? { account_deltas: data.accountDeltas } : {}),
-  }
-  opts.log.info('dry-run preview returned', {
-    stage: 'staged',
-    stagedOperationId: data.stagedOperationId,
-  })
-  return ok(body, { requestId: opts.requestId, dryRun: true })
-}
diff --git a/lib/api/v1/errors.ts b/lib/api/v1/errors.ts
index 151eb6fe..391b94d5 100644
--- a/lib/api/v1/errors.ts
+++ b/lib/api/v1/errors.ts
@@ -28,7 +28,6 @@ import {
   errorResponse as legacyErrorResponse,
   errorResponseFromCode as legacyErrorResponseFromCode,
 } from '@/lib/errors/get-structured-error'
-import { getErrorEntry } from '@/lib/errors/structured-errors'
 import type { Logger } from '@/lib/logger'
 import { API_V1_VERSION, API_V1_VERSION_HEADER } from './version'
 
@@ -177,10 +176,42 @@ export async function v1ErrorResponseFromCode(
   return rewriteEnvelope(legacy, ctx)
 }
 
+/** Minimal slice of the v1 route context the validation helpers need. */
+export interface V1ValidationContext {
+  requestId: string
+  log: Logger
+}
+
+/** Structural view of a ZodError: enough to render the v1 issues list. */
+export interface V1ZodErrorLike {
+  issues: ReadonlyArray<{ path: ReadonlyArray<PropertyKey>; message: string }>
+}
+
 /**
- * Quick check: does this code map to a registered entry? Used by callers that
- * want to validate a code before throwing it (e.g. registry-driven dispatch).
+ * Map Zod issues into the `{ field, message }` list the v1 envelope carries
+ * under `details.issues`.
  */
-export function isRegisteredV1Code(code: string): boolean {
-  return getErrorEntry(code) !== undefined
+export function v1ZodIssues(err: V1ZodErrorLike): Array<{ field: string; message: string }> {
+  return err.issues.map((i) => ({
+    field: i.path.join('.'),
+    message: i.message,
+  }))
+}
+
+/**
+ * VALIDATION_ERROR envelope for a failed Zod parse:
+ *
+ *   const parsed = Schema.safeParse(rawBody)
+ *   if (!parsed.success) return v1ValidationError(ctx, parsed.error)
+ */
+export async function v1ValidationError(
+  ctx: V1ValidationContext,
+  err: V1ZodErrorLike,
+): Promise<NextResponse> {
+  return v1ErrorResponseFromCode('VALIDATION_ERROR', ctx.log, {
+    requestId: ctx.requestId,
+    details: {
+      issues: v1ZodIssues(err),
+    },
+  })
 }
diff --git a/lib/api/v1/pagination.ts b/lib/api/v1/pagination.ts
index 760c5bbe..a52232fc 100644
--- a/lib/api/v1/pagination.ts
+++ b/lib/api/v1/pagination.ts
@@ -14,7 +14,7 @@
  * pagination hints, not security tokens.
  */
 
-import { z } from 'zod'
+import { UUID_RE as UUID } from '@/lib/invariants/uuid'
 
 export const DEFAULT_LIMIT = 50
 export const MAX_LIMIT = 100
@@ -47,14 +47,6 @@ export function parsePaginationParams(url: URL): PaginationParams {
   return { limit, cursor: cursor && cursor.length > 0 ? cursor : null }
 }
 
-/**
- * Schema for query-param validation when a route already uses Zod for inputs.
- */
-export const PaginationQuerySchema = z.object({
-  limit: z.coerce.number().int().min(1).max(MAX_LIMIT).optional(),
-  cursor: z.string().min(1).optional(),
-})
-
 // ─────────────────────────────────────────────────────────────────
 // Default (created_at, id) keyset cursor
 // ─────────────────────────────────────────────────────────────────
@@ -82,7 +74,6 @@ export function encodeDefaultCursor(row: { created_at: string; id: string } | nu
 // PostgREST would likely reject these, but validating here keeps the failure
 // mode predictable (stale cursor → "start over") rather than 400-ing.
 const ISO_TIMESTAMP = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:?\d{2})$/
-const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
 
 /**
  * Decode a cursor produced by encodeDefaultCursor. Returns null when the
diff --git a/lib/api/v1/registry.ts b/lib/api/v1/registry.ts
index 6b446fb2..5f4e1c09 100644
--- a/lib/api/v1/registry.ts
+++ b/lib/api/v1/registry.ts
@@ -205,9 +205,6 @@ export function listEndpoints(): EndpointDefinition[] {
   return Array.from(ENDPOINTS.values())
 }
 
-export function getEndpoint(method: HttpMethod, path: string): EndpointDefinition | undefined {
-  return ENDPOINTS.get(`${method} ${path}`)
-}
 
 /**
  * Resolve the registered endpoint for a CONCRETE request path (e.g.
@@ -510,10 +507,3 @@ export function generateOpenApiSpec(serverUrl: string): OpenApiSpec {
   }
 }
 
-/**
- * Test-only escape hatch. Clears the registry: used in unit tests so a test
- * that registers a fake endpoint doesn't leak into the next test.
- */
-export function _resetRegistryForTests(): void {
-  ENDPOINTS.clear()
-}
diff --git a/lib/api/v1/report-period.ts b/lib/api/v1/report-period.ts
index 4f50e174..a7c20a27 100644
--- a/lib/api/v1/report-period.ts
+++ b/lib/api/v1/report-period.ts
@@ -14,8 +14,7 @@ import type { SupabaseClient } from '@supabase/supabase-js'
 import type { Logger } from '@/lib/logger'
 import { parseReportDateRange, type DateRange } from '@/lib/reports/date-range'
 import { v1ErrorResponse, v1ErrorResponseFromCode } from './errors'
-
-const UUID_RE = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/
+import { UUID_RE } from '@/lib/invariants/uuid'
 
 export interface FiscalPeriodRow {
   id: string
diff --git a/lib/auth/api-keys.ts b/lib/auth/api-keys.ts
index 06a005f7..34853654 100644
--- a/lib/auth/api-keys.ts
+++ b/lib/auth/api-keys.ts
@@ -25,7 +25,7 @@ export {
   TOOL_SCOPE_MAP,
   TOOL_COUNT_BY_SCOPE,
 } from './scope-catalog'
-export type { ApiKeyScope, ScopeGroup } from './scope-catalog'
+export type { ApiKeyScope } from './scope-catalog'
 import { API_KEY_SCOPES, DEFAULT_SCOPES, type ApiKeyScope } from './scope-catalog'
 
 export function validateScopes(scopes: unknown): ApiKeyScope[] | null {
diff --git a/lib/auth/turnstile.ts b/lib/auth/turnstile.ts
index 73df97ba..c6bcd06e 100644
--- a/lib/auth/turnstile.ts
+++ b/lib/auth/turnstile.ts
@@ -8,8 +8,6 @@
  * fail open as "disabled" rather than render a broken widget.
  */
 
-export const TURNSTILE_SITE_KEY_ENV = 'NEXT_PUBLIC_TURNSTILE_SITE_KEY'
-
 const UNCONFIGURED_SITE_KEYS = new Set([
   '',
   '__NEXT_PUBLIC_TURNSTILE_SITE_KEY__',
diff --git a/lib/bokslut/accruals/auto-detect.ts b/lib/bokslut/accruals/auto-detect.ts
index cff8cfdc..dcbe915d 100644
--- a/lib/bokslut/accruals/auto-detect.ts
+++ b/lib/bokslut/accruals/auto-detect.ts
@@ -1,13 +1,13 @@
 import type { SupabaseClient } from '@supabase/supabase-js'
+import type { EntityType } from '@/types'
 import { roundOre } from '@/lib/money'
 import { parseInvoiceDateRange } from './date-range-parser'
 
 export type PeriodiseringSource = 'invoice' | 'supplier_invoice'
 export type PeriodiseringConfidence = 'high' | 'medium' | 'low'
 
-/** The entity types the materiality wording distinguishes between. Mirrors
- *  `EntityType` in `@/types` without importing app types into lib/. */
-export type PeriodiseringEntityType = 'enskild_firma' | 'aktiebolag'
+/** The entity types the materiality wording distinguishes between. */
+export type PeriodiseringEntityType = EntityType
 
 /**
  * Materiality floor for auto-detected periodiseringar, in SEK.
diff --git a/lib/bokslut/accruals/templates.ts b/lib/bokslut/accruals/templates.ts
index 440ab67a..b4c65e15 100644
--- a/lib/bokslut/accruals/templates.ts
+++ b/lib/bokslut/accruals/templates.ts
@@ -1,15 +1,7 @@
-import type { AccrualProposal } from './types'
-import {
-  proposeManualAccrued,
-  proposeManualPrepaid,
-  proposeRevenueDeferral,
-  proposeAccruedInterest,
-  proposeAccruedUtility,
-} from './accrual-detector'
-
 /**
- * Pre-filled patterns the wizard offers as one-click templates. Each maps
- * to one of the proposeManual* / proposeAccrued* helpers in
+ * Pre-filled patterns the wizard offers as one-click templates. Each names
+ * the engine side (prepaid / accrued / deferred revenue / ...) that the
+ * wizard maps onto the proposeManual* / proposeAccrued* helpers in
  * accrual-detector.ts. The wizard renders these as "Lägg till" buttons.
  *
  * BAS account choices follow the standard 2026 chart:
@@ -17,8 +9,8 @@ import {
  *   - 29xx upplupna kostnader (accrued expenses + förutbetalda intäkter)
  *   - 2970 förutbetalda intäkter (deferred revenue specifically)
  *
- * Adding a new template means: 1) extend this array, 2) add a wrapper in
- * accrual-detector if needed, 3) the wizard picks it up automatically.
+ * Adding a new template means: 1) extend this array, 2) the wizard picks
+ * it up automatically.
  */
 
 export type PeriodiseringTemplateKind =
@@ -95,69 +87,3 @@ export const PERIODISERING_TEMPLATES: PeriodiseringTemplate[] = [
     expense_account: '5020',
   },
 ]
-
-export interface TemplateApplyParams {
-  amount: number
-  description: string
-  closingDate: string
-  /** Caller-overridable account numbers. Falls back to template defaults. */
-  prepaidAccount?: string
-  expenseAccount?: string
-  deferredAccount?: string
-  revenueAccount?: string
-  accruedAccount?: string
-}
-
-/**
- * Build an AccrualProposal from a template + caller-supplied amount/desc.
- * Throws if the template kind is unknown or the resulting accounts violate
- * the 17xx/29xx range checks in the underlying engine functions.
- */
-export function applyTemplate(
-  template: PeriodiseringTemplate,
-  params: TemplateApplyParams,
-): AccrualProposal | null {
-  const { amount, description, closingDate } = params
-  switch (template.side) {
-    case 'prepaid':
-      return proposeManualPrepaid({
-        amount,
-        description,
-        closingDate,
-        prepaidAccount: params.prepaidAccount ?? template.prepaid_account!,
-        expenseAccount: params.expenseAccount ?? template.expense_account!,
-      })
-    case 'accrued':
-      return proposeManualAccrued({
-        amount,
-        description,
-        closingDate,
-        accruedAccount: params.accruedAccount ?? template.accrued_account!,
-        expenseAccount: params.expenseAccount ?? template.expense_account!,
-      })
-    case 'deferred_revenue':
-      return proposeRevenueDeferral({
-        amount,
-        description,
-        closingDate,
-        deferredAccount: params.deferredAccount ?? template.deferred_account!,
-        revenueAccount: params.revenueAccount ?? template.revenue_account!,
-      })
-    case 'accrued_interest':
-      return proposeAccruedInterest({
-        amount,
-        description,
-        closingDate,
-        accruedAccount: params.accruedAccount ?? template.accrued_account!,
-        expenseAccount: params.expenseAccount ?? template.expense_account!,
-      })
-    case 'accrued_utility':
-      return proposeAccruedUtility({
-        amount,
-        description,
-        closingDate,
-        accruedAccount: params.accruedAccount ?? template.accrued_account!,
-        expenseAccount: params.expenseAccount ?? template.expense_account!,
-      })
-  }
-}
diff --git a/lib/bokslut/arsredovisning/compliance-types.ts b/lib/bokslut/arsredovisning/compliance-types.ts
index 0e67bc2d..d4cd7938 100644
--- a/lib/bokslut/arsredovisning/compliance-types.ts
+++ b/lib/bokslut/arsredovisning/compliance-types.ts
@@ -1,10 +1,10 @@
 import type { ArsredovisningData } from './types'
 import type { IxbrlArsredovisningInput } from '@/lib/bokslut/ixbrl/types'
+import type { AccountingFramework } from '@/types'
 
 export const ANNUAL_REPORT_SCHEMA_VERSION = '1.0' as const
 
-export type AnnualReportFramework = 'k2' | 'k3'
-export type AnnualReportFilingMode = 'paper' | 'digital'
+export type AnnualReportFramework = AccountingFramework
 export type AnnualReportValidationStage = 'draft' | 'signing' | 'filing'
 
 export type ParentGroupSize = 'none' | 'small' | 'large'
@@ -165,12 +165,3 @@ export function emptyAnnualReportProfile(
     updated_at: null,
   }
 }
-
-export const EMPTY_DISCLOSURE_STATE: AnnualReportDisclosureState = {
-  long_term_debt_over_five_years_confirmed: false,
-  securities_pledged_confirmed: false,
-  contingent_liabilities_confirmed: false,
-  parent_company_confirmed: false,
-  agm_disposition_outcome: null,
-  agm_disposition_decision: null,
-}
diff --git a/lib/bokslut/arsredovisning/k3-noter-builder.ts b/lib/bokslut/arsredovisning/k3-noter-builder.ts
index 621c9af3..97f7833c 100644
--- a/lib/bokslut/arsredovisning/k3-noter-builder.ts
+++ b/lib/bokslut/arsredovisning/k3-noter-builder.ts
@@ -413,6 +413,3 @@ export function anyAssetHasComponents(assets: AssetWithComponents[]): boolean {
   )
 }
 
-// Re-export so the type-guard signature can be reused by build-data and
-// tests without exposing the local AssetWithComponents structural type.
-export { isComponentArray as isK3ComponentArray }
diff --git a/lib/bokslut/arsredovisning/signature-service.ts b/lib/bokslut/arsredovisning/signature-service.ts
index b1aef372..15fd1f30 100644
--- a/lib/bokslut/arsredovisning/signature-service.ts
+++ b/lib/bokslut/arsredovisning/signature-service.ts
@@ -128,17 +128,3 @@ export async function markSignatureSigned(
   }
   return data as SignatureRequest
 }
-
-/**
- * True when every signature request for the period is signed. The UI uses
- * this to enable the "Ladda ner fastställd PDF" button and to gate filing.
- */
-export async function isFullySignedOff(
-  supabase: SupabaseClient,
-  companyId: string,
-  fiscalPeriodId: string,
-): Promise<boolean> {
-  const requests = await listSignatureRequests(supabase, companyId, fiscalPeriodId)
-  if (requests.length === 0) return false
-  return requests.every((r) => r.status === 'signed')
-}
diff --git a/lib/bokslut/assets/asset-service.ts b/lib/bokslut/assets/asset-service.ts
index 24c6fb16..f35a84f2 100644
--- a/lib/bokslut/assets/asset-service.ts
+++ b/lib/bokslut/assets/asset-service.ts
@@ -968,70 +968,3 @@ function disposalAccounts(category: AssetCategory): { gain: string; loss: string
   }
   return { gain: '3973', loss: '7973' }
 }
-
-/**
- * Sum prior depreciation booked against an asset's 78xx avskrivningskonto
- * up to and including `asOfDate`. Reads from journal_entry_lines so manually-
- * posted avskrivningsverifikationer (i.e. not driven by depreciation_schedules)
- * are also counted: the declining-balance engine needs the most accurate
- * net book value to compute the next period's charge.
- *
- * Only counts posted entries against the asset's `bas_expense_account`
- * (the 78xx avskrivningskonto), and only debits (since avskrivning = debit
- * 78xx / credit 12x9). Returns 0 if the asset has never been depreciated.
- *
- * Why we look at the expense account rather than the accumulated account:
- * the expense account is asset-specific by convention (7831 for machinery,
- * 7832 for equipment, etc.) so we can scope per-asset accurately, whereas
- * the accumulated account (12x9) may aggregate across assets in the same
- * category. Limitation: when multiple assets share the same bas_expense_account
- * we cannot disambiguate at the journal line level. The depreciation_schedules
- * sum (see `sumPostedDepreciation`) is the safer fallback in that case.
- * Callers that need exact per-asset accuracy should prefer the schedules sum.
- */
-export async function getAccumulatedDepreciationAsOf(
-  supabase: SupabaseClient,
-  assetId: string,
-  asOfDate: string,
-): Promise<number> {
-  // 1. Resolve the asset and its expense account first so we can target the
-  //    correct 78xx code.
-  const { data: asset, error: assetError } = await supabase
-    .from('assets')
-    .select('bas_expense_account, company_id')
-    .eq('id', assetId)
-    .maybeSingle()
-
-  if (assetError) {
-    throw new Error(`Failed to load asset for accumulated depreciation: ${assetError.message}`)
-  }
-  if (!asset) return 0
-
-  // Two-step entry-lines fetch (see lib/bookkeeping/entry-lines.ts).
-  type Row = { debit_amount: number | string | null; credit_amount: number | string | null }
-  let data: Row[]
-  try {
-    data = await fetchEntryLines<Row>({
-      supabase,
-      lineColumns: 'debit_amount, credit_amount',
-      filterEntries: (q: EntryLinesQuery) =>
-        q
-          .eq('company_id', asset.company_id)
-          .eq('status', 'posted')
-          .lte('entry_date', asOfDate),
-      filterLines: (q: EntryLinesQuery) =>
-        q.eq('account_number', asset.bas_expense_account),
-      attachEntriesAs: null,
-    })
-  } catch (err) {
-    throw new Error(
-      `Failed to sum accumulated depreciation for asset ${assetId}: ${err instanceof Error ? err.message : String(err)}`,
-    )
-  }
-
-  return data.reduce((sum, row) => {
-    // Expense account: normal balance is debit. Net = debit − credit so
-    // any storno (reversal) is netted out.
-    return sum + ((Number(row.debit_amount) || 0) - (Number(row.credit_amount) || 0))
-  }, 0)
-}
diff --git a/lib/bokslut/assets/jamkning.ts b/lib/bokslut/assets/jamkning.ts
index 05bd45c0..633cc9e6 100644
--- a/lib/bokslut/assets/jamkning.ts
+++ b/lib/bokslut/assets/jamkning.ts
@@ -7,9 +7,9 @@
  * deducted at acquisition.
  */
 
-import type { AssetCategory, VatTreatment } from '@/types'
+import type { AssetCategory, AssetJamkningDirection, VatTreatment } from '@/types'
 
-export type JamkningDirection = 'increase' | 'decrease' | 'none' | 'transferred'
+export type JamkningDirection = AssetJamkningDirection
 
 export interface JamkningAssessmentInput {
   acquisitionDate: string
diff --git a/lib/bokslut/reserves/overavskrivningar-service.ts b/lib/bokslut/reserves/overavskrivningar-service.ts
index cb5d25df..64761b2b 100644
--- a/lib/bokslut/reserves/overavskrivningar-service.ts
+++ b/lib/bokslut/reserves/overavskrivningar-service.ts
@@ -5,10 +5,6 @@ import { roundOre } from '@/lib/money'
  *  bokfört värde plus årets anskaffningar minus årets försäljningar. */
 export const OVERAVSKRIVNING_30_RULE = 0.7
 
-/** 20-rule (kompletteringsregel, IL 18 kap 17 §): restvärde minst 0 % efter
- *  5 år (20 % avskrivning per år, raklinje). */
-export const OVERAVSKRIVNING_20_RULE_YEARS = 5
-
 export interface Compute30RuleInput {
   /** IB skattemässigt värde maskiner & inventarier. */
   openingBookValue: number
@@ -20,6 +16,8 @@ export interface Compute30RuleInput {
   fiscalPeriodMonths?: number
 }
 
+/** 20-rule (kompletteringsregel, IL 18 kap 17 §): restvärde minst 0 % efter
+ *  5 år (20 % avskrivning per år, raklinje), hence the five-slot input. */
 export interface Compute20RuleInput {
   /** Anskaffningskostnad per anskaffningsår, från innevarande år minus 4 till
    *  innevarande år. Index 0 = innevarande år. */
diff --git a/lib/bookkeeping/__tests__/template-embeddings.test.ts b/lib/bookkeeping/__tests__/template-embeddings.test.ts
index 09394fa4..876204a6 100644
--- a/lib/bookkeeping/__tests__/template-embeddings.test.ts
+++ b/lib/bookkeeping/__tests__/template-embeddings.test.ts
@@ -1,19 +1,19 @@
 import { describe, it, expect } from 'vitest'
 import { makeTransaction } from '@/tests/helpers'
-import { findSimilarTemplates } from '../template-embeddings'
+import { findMatchingTemplates } from '../booking-templates'
 
-describe('template-embeddings facade', () => {
-  describe('findSimilarTemplates', () => {
+describe('template keyword matching', () => {
+  describe('findMatchingTemplates', () => {
     it('returns keyword-based matches', async () => {
       const tx = makeTransaction({ description: 'SPOTIFY', amount: -109 })
-      const results = await findSimilarTemplates(tx)
+      const results = await findMatchingTemplates(tx)
 
       expect(Array.isArray(results)).toBe(true)
     })
 
     it('accepts entityType parameter', async () => {
       const tx = makeTransaction({ description: 'SPOTIFY', amount: -109 })
-      const results = await findSimilarTemplates(tx, 'enskild_firma')
+      const results = await findMatchingTemplates(tx, 'enskild_firma')
 
       expect(Array.isArray(results)).toBe(true)
     })
diff --git a/lib/bookkeeping/account-classifier-heuristic.ts b/lib/bookkeeping/account-classifier-heuristic.ts
index 8167e146..fd512612 100644
--- a/lib/bookkeeping/account-classifier-heuristic.ts
+++ b/lib/bookkeeping/account-classifier-heuristic.ts
@@ -5,15 +5,9 @@
  * (account-classifier-client.ts) uses the lazily loaded chart the same way.
  */
 
-export type AccountType =
-  | 'asset'
-  | 'liability'
-  | 'equity'
-  | 'revenue'
-  | 'expense'
-  | 'untaxed_reserves'
+import type { AccountType, NormalBalance } from '@/types'
 
-export type NormalBalance = 'debit' | 'credit'
+export type { AccountType, NormalBalance }
 
 export interface ClassifiedAccount {
   account_type: AccountType
diff --git a/lib/bookkeeping/account-classifier.ts b/lib/bookkeeping/account-classifier.ts
index dd558e97..b570ab09 100644
--- a/lib/bookkeeping/account-classifier.ts
+++ b/lib/bookkeeping/account-classifier.ts
@@ -1,9 +1,6 @@
 import { getBASReference } from './bas-reference'
 import { classifyAccountHeuristic, type ClassifiedAccount } from './account-classifier-heuristic'
 
-export type { AccountType, ClassifiedAccount, NormalBalance } from './account-classifier-heuristic'
-
-
 /**
  * Map a 4-digit BAS account number to its account_type and normal_balance.
  *
diff --git a/lib/bookkeeping/account-descriptions.ts b/lib/bookkeeping/account-descriptions.ts
index e0267742..10101756 100644
--- a/lib/bookkeeping/account-descriptions.ts
+++ b/lib/bookkeeping/account-descriptions.ts
@@ -1,7 +1,8 @@
 import { ACCOUNT_CLASS_LABELS } from './bas-labels'
 import { getBasLoadedByNumber } from './bas-lazy'
+import type { AccountType } from '@/types'
 
-export type AccountType = 'asset' | 'liability' | 'equity' | 'revenue' | 'expense' | 'untaxed_reserves'
+export type { AccountType }
 
 export interface AccountDescription {
   name: string
diff --git a/lib/bookkeeping/accruals/service.ts b/lib/bookkeeping/accruals/service.ts
index 957d5b8f..7678dd04 100644
--- a/lib/bookkeeping/accruals/service.ts
+++ b/lib/bookkeeping/accruals/service.ts
@@ -46,6 +46,7 @@ import {
 import { coerceDimensionsBag } from '@/lib/bookkeeping/dimension-resolver'
 import { roundOre, sumOre } from '@/lib/money'
 import { createLogger } from '@/lib/logger'
+import { todayIsoUtc } from '@/lib/dates/iso'
 
 const log = createLogger('bookkeeping.accruals')
 
@@ -82,10 +83,6 @@ export interface PostDueResult {
 type ScheduleRow = AccrualSchedule
 type InstallmentRow = AccrualScheduleInstallment & { schedule?: ScheduleRow | null }
 
-function todayIso(): string {
-  return new Date().toISOString().slice(0, 10)
-}
-
 function getErrorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error)
 }
@@ -286,7 +283,7 @@ export async function postDueInstallments(
     today?: string
   } = {},
 ): Promise<PostDueResult> {
-  const today = options.today ?? todayIso()
+  const today = options.today ?? todayIsoUtc()
   const result: PostDueResult = { posted: 0, failed: 0, skipped: 0, errors: [] }
 
   let query = supabase
@@ -477,7 +474,7 @@ export async function dissolveScheduleNow(
   scheduleId: string,
   options: { today?: string } = {},
 ): Promise<{ journalEntryId: string; amount: number }> {
-  const today = options.today ?? todayIso()
+  const today = options.today ?? todayIsoUtc()
 
   const { data: scheduleData, error: scheduleError } = await supabase
     .from('accrual_schedules')
diff --git a/lib/bookkeeping/booking-template-schemas.ts b/lib/bookkeeping/booking-template-schemas.ts
new file mode 100644
index 00000000..aa5a2c5c
--- /dev/null
+++ b/lib/bookkeeping/booking-template-schemas.ts
@@ -0,0 +1,24 @@
+import { z } from 'zod'
+import { PACK_CATEGORIES, PACK_ENTITY_TYPES } from '@/lib/packs/schema'
+
+/**
+ * Request-body schemas shared by the booking-template routes
+ * (/api/settings/booking-templates, its [id] and import siblings).
+ *
+ * The category / entity_type enums mirror `booking_template_library`'s CHECK
+ * constraints via the pack contract. The line schema is deliberately looser
+ * than `PackLineSchema`: user templates may carry both `ratio` and `vat_rate`
+ * on a line, which the pack validator rejects.
+ */
+export const BookingTemplateLineSchema = z.object({
+  account: z.string().regex(/^\d{4}$/),
+  label: z.string().min(1),
+  side: z.enum(['debit', 'credit']),
+  type: z.enum(['business', 'vat', 'settlement']),
+  ratio: z.number().min(0).max(10).optional(),
+  vat_rate: z.number().min(0).max(1).optional(),
+})
+
+export const BookingTemplateCategorySchema = z.enum(PACK_CATEGORIES)
+
+export const BookingTemplateEntityTypeSchema = z.enum(PACK_ENTITY_TYPES)
diff --git a/lib/bookkeeping/counterparty-templates.ts b/lib/bookkeeping/counterparty-templates.ts
index 02389665..0e7bd758 100644
--- a/lib/bookkeeping/counterparty-templates.ts
+++ b/lib/bookkeeping/counterparty-templates.ts
@@ -442,14 +442,15 @@ export async function findCounterpartyTemplatesBatch(
 // ── Build MappingResult ────────────────────────────────────────
 
 /** Which side of a template the money settles on. */
-type TemplateDirection = 'expense' | 'income' | 'unknown'
+export type TemplateDirection = 'expense' | 'income' | 'unknown'
 
 /**
  * Learned direction of a legacy (single debit/credit) template: expenses
  * settle on the credit side (credit bank, debit cost), income settles on the
  * debit side. 'unknown' when neither or both accounts look like settlement.
  */
-function legacyTemplateDirection(debitAccount: string, creditAccount: string): TemplateDirection {
+export function legacyTemplateDirection(debitAccount: string, creditAccount: string): TemplateDirection {
+
   const debitSettles = isSettlementAccount(debitAccount)
   const creditSettles = isSettlementAccount(creditAccount)
   if (creditSettles && !debitSettles) return 'expense'
@@ -458,7 +459,8 @@ function legacyTemplateDirection(debitAccount: string, creditAccount: string): T
 }
 
 /** Learned direction of a multi-line pattern: read off the business sides. */
-function patternDirection(pattern: LinePatternEntry[]): TemplateDirection {
+export function patternDirection(pattern: LinePatternEntry[]): TemplateDirection {
+
   const business = pattern.filter((e) => e.type === 'business')
   if (business.length === 0) return 'unknown'
   const debitCount = business.filter((b) => b.side === 'debit').length
@@ -999,7 +1001,8 @@ function toDateString(d: Date): string {
 }
 
 /** Settlement accounts: bank/cash (19xx), receivables (1510), payables (2440), credit card (2890) */
-function isSettlementAccount(account: string): boolean {
+export function isSettlementAccount(account: string): boolean {
+
   return account.startsWith('19') || account === '1510' || account === '2440' || account === '2890'
 }
 
diff --git a/lib/bookkeeping/dimension-errors.ts b/lib/bookkeeping/dimension-errors.ts
index bb691ff6..cc2c982e 100644
--- a/lib/bookkeeping/dimension-errors.ts
+++ b/lib/bookkeeping/dimension-errors.ts
@@ -94,10 +94,6 @@ export class DimensionValidationError extends Error {
   }
 }
 
-export function isDimensionValidationError(err: unknown): err is DimensionValidationError {
-  return err instanceof DimensionValidationError
-}
-
 // ============================================================================
 // Mandatory dimension enforcement (dimensions PR10)
 // ============================================================================
@@ -132,9 +128,3 @@ export class MandatoryDimensionMissingError extends Error {
     this.name = 'MandatoryDimensionMissingError'
   }
 }
-
-export function isMandatoryDimensionMissingError(
-  err: unknown,
-): err is MandatoryDimensionMissingError {
-  return err instanceof MandatoryDimensionMissingError
-}
diff --git a/lib/bookkeeping/engine.ts b/lib/bookkeeping/engine.ts
index 69891d09..1cff21a0 100644
--- a/lib/bookkeeping/engine.ts
+++ b/lib/bookkeeping/engine.ts
@@ -1031,11 +1031,13 @@ export async function replaceOpeningBalanceEntry(
 /**
  * Get the current date in Swedish timezone (Europe/Stockholm).
  * Avoids UTC date shift when server runs in a different timezone.
+ * Pass `now` to format a specific instant instead of the current time.
  */
-export function getSwedishLocalDate(): string {
-  return new Intl.DateTimeFormat('sv-SE', { timeZone: 'Europe/Stockholm' }).format(new Date())
+export function getSwedishLocalDate(now: Date = new Date()): string {
+  return new Intl.DateTimeFormat('sv-SE', { timeZone: 'Europe/Stockholm' }).format(now)
 }
 
+
 /**
  * Create a reversal entry for an existing journal entry
  * Sets reversed_by_id/reverses_id links for compliance tracking
diff --git a/lib/bookkeeping/errors.ts b/lib/bookkeeping/errors.ts
index 52a6ac95..9f6624b5 100644
--- a/lib/bookkeeping/errors.ts
+++ b/lib/bookkeeping/errors.ts
@@ -2,28 +2,15 @@ import { NextResponse } from 'next/server'
 import { DimensionValidationError, MandatoryDimensionMissingError } from './dimension-errors'
 
 // ============================================================================
-// Dimension validation error: class lives in ./dimension-errors.ts (pure
-// module, no next/server) because dimension-resolver.ts is reachable from
-// client bundles via lib/api/schemas.ts. Re-exported here so this file stays
-// the single import surface for all typed bookkeeping errors.
+// Dimension validation errors: the classes live in ./dimension-errors.ts
+// (pure module, no next/server) because dimension-resolver.ts is reachable
+// from client bundles via lib/api/schemas.ts. The two error classes are
+// re-exported here so this file stays the import surface for typed
+// bookkeeping errors; codes, formatters and issue types are imported from
+// ./dimension-errors directly.
 // ============================================================================
 
-export {
-  DIMENSION_VALIDATION_FAILED,
-  DimensionValidationError,
-  formatDimensionValidationIssue,
-  formatDimensionValidationIssues,
-  isDimensionValidationError,
-  MANDATORY_DIMENSION_MISSING,
-  MandatoryDimensionMissingError,
-  formatMandatoryDimensionViolation,
-  isMandatoryDimensionMissingError,
-} from './dimension-errors'
-export type {
-  DimensionValidationIssue,
-  DimensionValidationReason,
-  MandatoryDimensionViolation,
-} from './dimension-errors'
+export { DimensionValidationError, MandatoryDimensionMissingError } from './dimension-errors'
 
 // ============================================================================
 // Error codes
diff --git a/lib/bookkeeping/invoice-entries.ts b/lib/bookkeeping/invoice-entries.ts
index 026d7645..f17dd06a 100644
--- a/lib/bookkeeping/invoice-entries.ts
+++ b/lib/bookkeeping/invoice-entries.ts
@@ -30,12 +30,7 @@ const log = createLogger('invoice-entries')
 // the client-side proposal helpers (propose-send-lines, propose-payment-lines)
 // need only those, and importing them from here dragged the engine, the
 // account backfill and with it the full BAS chart into the browser bundle.
-export {
-  INVOICE_FX_RATE_MISSING,
-  InvoiceFxRateMissingError,
-  getOutputVatAccount,
-  getRevenueAccount,
-} from './invoice-accounts'
+export { getOutputVatAccount, getRevenueAccount } from './invoice-accounts'
 import { InvoiceFxRateMissingError, getOutputVatAccount, getRevenueAccount } from './invoice-accounts'
 
 /**
diff --git a/lib/bookkeeping/own-account-detector.ts b/lib/bookkeeping/own-account-detector.ts
index ca0d5d05..a69c9b6c 100644
--- a/lib/bookkeeping/own-account-detector.ts
+++ b/lib/bookkeeping/own-account-detector.ts
@@ -2,6 +2,7 @@ import type { SupabaseClient } from '@supabase/supabase-js'
 import type { Transaction } from '@/types'
 import { findPairableCashAccountByIban } from '@/lib/cash-accounts/service'
 import { createLogger } from '@/lib/logger'
+import { addDaysIso as addDays } from '@/lib/dates/iso'
 
 const log = createLogger('own-account-detector')
 
@@ -141,9 +142,3 @@ export async function detectOwnAccountTransfer(
     pairTransactionId: pair?.id ?? null,
   }
 }
-
-function addDays(iso: string, days: number): string {
-  const d = new Date(iso + 'T00:00:00Z')
-  d.setUTCDate(d.getUTCDate() + days)
-  return d.toISOString().slice(0, 10)
-}
diff --git a/lib/bookkeeping/proposal-lines.ts b/lib/bookkeeping/proposal-lines.ts
index 9b30f088..297c5637 100644
--- a/lib/bookkeeping/proposal-lines.ts
+++ b/lib/bookkeeping/proposal-lines.ts
@@ -36,6 +36,12 @@ import { getVatRate } from '@/lib/bookkeeping/vat-entries'
 import { getCategoryAccountMapping } from '@/lib/bookkeeping/category-mapping'
 import { buildCurrencyMetadata } from '@/lib/bookkeeping/currency-utils'
 import { roundOre } from '@/lib/money'
+import {
+  legacyTemplateDirection as legacyDirection,
+  patternDirection,
+} from '@/lib/bookkeeping/counterparty-templates'
+
+
 import type { FormLine } from '@/components/bookkeeping/JournalEntryForm'
 import type { TransactionCategory, VatTreatment, EntityType, LinePatternEntry } from '@/types'
 
@@ -115,35 +121,6 @@ export interface ProposalLinesInput {
   settlementAccount?: string
 }
 
-type LearnedDirection = 'expense' | 'income' | 'unknown'
-
-/**
- * Settlement-account predicate, mirroring the private isSettlementAccount in
- * counterparty-templates.ts (bank/cash 19xx, receivables 1510, payables 2440,
- * credit card 2890). Keep the two in sync.
- */
-function isSettlementAccount(account: string): boolean {
-  return account.startsWith('19') || account === '1510' || account === '2440' || account === '2890'
-}
-
-/** Mirrors legacyTemplateDirection in counterparty-templates.ts. */
-function legacyDirection(debitAccount: string, creditAccount: string): LearnedDirection {
-  const debitSettles = isSettlementAccount(debitAccount)
-  const creditSettles = isSettlementAccount(creditAccount)
-  if (creditSettles && !debitSettles) return 'expense'
-  if (debitSettles && !creditSettles) return 'income'
-  return 'unknown'
-}
-
-/** Mirrors patternDirection in counterparty-templates.ts. */
-function patternDirection(pattern: LinePatternEntry[]): LearnedDirection {
-  const business = pattern.filter((e) => e.type === 'business')
-  if (business.length === 0) return 'unknown'
-  const debitCount = business.filter((b) => b.side === 'debit').length
-  if (debitCount === business.length) return 'expense'
-  if (debitCount === 0) return 'income'
-  return 'unknown'
-}
 
 /**
  * Resolve a static template's accounts for the company's entity type: the
diff --git a/lib/bookkeeping/suggest-fiscal-period.ts b/lib/bookkeeping/suggest-fiscal-period.ts
index 92e0ad9b..b8ce8b09 100644
--- a/lib/bookkeeping/suggest-fiscal-period.ts
+++ b/lib/bookkeeping/suggest-fiscal-period.ts
@@ -10,6 +10,7 @@
  */
 
 import type { FiscalPeriod } from '@/types'
+import { addDaysIso as addDays } from '@/lib/dates/iso'
 
 /** Minimal shape needed for the date math: `FiscalPeriod` satisfies it. */
 type PeriodRange = Pick<FiscalPeriod, 'period_start' | 'period_end'>
@@ -23,13 +24,6 @@ export interface SuggestedPeriod {
   period_end: string
 }
 
-/** Add `days` to a YYYY-MM-DD date string, returning a YYYY-MM-DD string. */
-function addDays(date: string, days: number): string {
-  const d = new Date(date + 'T00:00:00Z')
-  d.setUTCDate(d.getUTCDate() + days)
-  return d.toISOString().split('T')[0]
-}
-
 /**
  * A fiscal-year name: `Räkenskapsår 2025`, or `Räkenskapsår 2024/2025` when it
  * straddles two calendar years. Swedish by default to match the app's existing
diff --git a/lib/bookkeeping/template-embeddings.ts b/lib/bookkeeping/template-embeddings.ts
deleted file mode 100644
index d94d496d..00000000
--- a/lib/bookkeeping/template-embeddings.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Template Embeddings: Core Facade
- *
- * Provides template matching via keyword-based search.
- */
-
-import {
-  findMatchingTemplates,
-  type TemplateMatch,
-} from './booking-templates'
-import type { Transaction, EntityType } from '@/types'
-
-/**
- * Find similar templates via keyword matching.
- */
-export async function findSimilarTemplates(
-  transaction: Transaction,
-  entityType?: EntityType,
-): Promise<TemplateMatch[]> {
-  return findMatchingTemplates(transaction, entityType)
-}
diff --git a/lib/branding/team-brands.ts b/lib/branding/team-brands.ts
index 41a1371c..1c8bd2fa 100644
--- a/lib/branding/team-brands.ts
+++ b/lib/branding/team-brands.ts
@@ -26,11 +26,6 @@ interface CacheEntry {
 
 const cache = new Map<string, CacheEntry>()
 
-/** Test hook: drop every cached team brand. */
-export function clearTeamBrandCache(): void {
-  cache.clear()
-}
-
 /**
  * Resolve brands for a set of team ids. Returns a map containing ONLY teams
  * that have a brand; brandless teams are absent (and negatively cached).
diff --git a/lib/browser/panel-request.ts b/lib/browser/panel-request.ts
new file mode 100644
index 00000000..519b7ada
--- /dev/null
+++ b/lib/browser/panel-request.ts
@@ -0,0 +1,112 @@
+/**
+ * The settings panels' server calls (Stripe, Shopify, WooCommerce), each
+ * classified into exactly one outcome. Never throws: every arm resolves to a
+ * member of the union, so a call site cannot have a silent path by forgetting
+ * a `catch`. One toast sentence per click; the classification lives outside
+ * the component because component logic has no tests in this repo.
+ */
+
+import { fetchWithTimeout, isTimeoutError } from '@/lib/http/fetch-with-timeout'
+import { getErrorMessage, type ErrorLocale } from '@/lib/errors/get-error-message'
+import type { ActionFailure } from '@/lib/browser/action-failure'
+
+/** Deadline for the quick calls (status, toggle, disconnect). */
+export const PANEL_ACTION_TIMEOUT_MS = 15_000
+
+export type PanelRequestResult<T> =
+  /** 2xx. `data` is null when the body was not readable JSON. */
+  | { ok: true; data: T | null }
+  | ActionFailure
+
+export interface PanelRequestOptions {
+  url: string
+  /** Defaults to POST: most of the panel calls are mutations. */
+  method?: 'GET' | 'POST' | 'DELETE'
+  /** JSON request body. Omitted entirely for the routes that ignore it. */
+  body?: unknown
+  /** UI locale, so a server error is reported in the language the user reads. */
+  locale?: ErrorLocale
+  timeoutMs?: number
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null
+}
+
+/**
+ * The one sentence for a non-2xx.
+ *
+ * The extension routes refuse with a hand-written Swedish sentence in
+ * `{ error }`, and that sentence is the most specific thing anyone can say:
+ * "Inget anslutet Stripe-konto." tells the user to reconnect, where the status
+ * map's "Resursen kunde inte hittas." tells them nothing. `getErrorMessage`
+ * keeps such a sentence only when it happens to carry one of its Swedish
+ * trigger words, which this route copy does not, so the string is preferred
+ * explicitly.
+ *
+ * `error_en` is honoured first for an English UI because the shared capability
+ * guard emits both (`capabilityBlockedResponse` in
+ * lib/entitlements/has-capability.ts), and `getErrorMessage` only reads
+ * `message_en` inside a structured envelope, not a top-level `error_en`.
+ *
+ * Everything else is `getErrorMessage`'s: a structured envelope, an HTML 502
+ * from the platform, a body that never parsed.
+ */
+export function serverErrorMessage(
+  body: unknown,
+  status: number,
+  locale: ErrorLocale,
+): string {
+  if (isRecord(body)) {
+    if (locale === 'en' && typeof body.error_en === 'string' && body.error_en.trim()) {
+      return body.error_en.trim()
+    }
+    if (typeof body.error === 'string' && body.error.trim()) {
+      return body.error.trim()
+    }
+  }
+  return getErrorMessage(body, { statusCode: status, locale })
+}
+
+/** Call one of a panel's endpoints and report exactly why it failed. */
+export async function panelRequest<T>({
+  url,
+  method = 'POST',
+  body,
+  locale = 'sv',
+  timeoutMs = PANEL_ACTION_TIMEOUT_MS,
+}: PanelRequestOptions): Promise<PanelRequestResult<T>> {
+  try {
+    const res = await fetchWithTimeout(
+      url,
+      body === undefined
+        ? { method }
+        : {
+            method,
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(body),
+          },
+      { timeoutMs, description: `${method} ${url}` },
+    )
+
+    // Read the body on both arms: the failure arm needs the route's own
+    // sentence, the success arm needs the sync counts. A body that is not JSON
+    // (an HTML error page, an empty 502, a response truncated mid-stream) leaves
+    // null, and neither arm then claims anything it cannot support.
+    const payload = await res.json().catch(() => null)
+
+    if (!res.ok) {
+      return {
+        ok: false,
+        reason: 'server',
+        status: res.status,
+        message: serverErrorMessage(payload, res.status, locale),
+      }
+    }
+
+    return { ok: true, data: payload as T | null }
+  } catch (err) {
+    if (isTimeoutError(err)) return { ok: false, reason: 'timeout' }
+    return { ok: false, reason: 'network', message: getErrorMessage(err, { locale }) }
+  }
+}
diff --git a/lib/byra/kpi-overview.ts b/lib/byra/kpi-overview.ts
index 39eacba8..842e46ca 100644
--- a/lib/byra/kpi-overview.ts
+++ b/lib/byra/kpi-overview.ts
@@ -14,6 +14,7 @@
  * RPC taking uuid[] (see DECISIONS.md).
  */
 
+import { chunk as chunked } from '@/lib/utils'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { createLogger } from '@/lib/logger'
 import { fetchAllRows } from '@/lib/supabase/fetch-all'
@@ -48,12 +49,6 @@ const log = createLogger('byra:kpi-overview')
 /** Max ids per PostgREST .in() filter (mirrors lib/clients/fetch-client-overview.ts). */
 const IN_CLAUSE_CHUNK = 150
 
-function chunked<T>(items: T[], size: number): T[][] {
-  const out: T[][] = []
-  for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size))
-  return out
-}
-
 export interface ByraKpiClientRow {
   companyId: string
   name: string
diff --git a/lib/cash-accounts/service.ts b/lib/cash-accounts/service.ts
index b7c5af8e..d8a679d9 100644
--- a/lib/cash-accounts/service.ts
+++ b/lib/cash-accounts/service.ts
@@ -1,3 +1,4 @@
+import { chunk as chunkIds } from '@/lib/utils'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import type { CashAccount, CashAccountSource, MappingResult } from '@/types'
 import { createLogger } from '@/lib/logger'
@@ -994,12 +995,6 @@ export async function resolvePsd2LedgerAccount(
 /** Max transaction ids per `.in()` filter when rebinding: keeps the request URL short. */
 const REBIND_ID_CHUNK_SIZE = 100
 
-function chunkIds(ids: readonly string[], size: number): string[][] {
-  const out: string[][] = []
-  for (let i = 0; i < ids.length; i += size) out.push(ids.slice(i, i + size))
-  return out
-}
-
 /**
  * Rebind the MOVABLE transactions of one cash_accounts row onto another.
  *
diff --git a/lib/clients/fetch-client-overview.ts b/lib/clients/fetch-client-overview.ts
index 88870c0b..416db7af 100644
--- a/lib/clients/fetch-client-overview.ts
+++ b/lib/clients/fetch-client-overview.ts
@@ -18,6 +18,7 @@
  * fetchAllRows guards every query that can exceed PostgREST's 1000-row cap.
  */
 
+import { chunk as chunked } from '@/lib/utils'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { fetchAllRows } from '@/lib/supabase/fetch-all'
 import {
@@ -38,12 +39,6 @@ export interface ClientOverview {
 /** Max ids per PostgREST .in() filter (mirrors lib/worklist IN_CLAUSE_CHUNK). */
 const IN_CLAUSE_CHUNK = 150
 
-function chunked<T>(items: T[], size: number): T[][] {
-  const out: T[][] = []
-  for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size))
-  return out
-}
-
 interface ByraMembershipRow {
   team_id: string
   role: string
diff --git a/lib/connect/hosted/ledger.ts b/lib/connect/hosted/ledger.ts
index 84b23c17..396ccd34 100644
--- a/lib/connect/hosted/ledger.ts
+++ b/lib/connect/hosted/ledger.ts
@@ -25,24 +25,6 @@ export interface LedgerRow {
   status: 'pending' | 'active' | 'revoked'
 }
 
-/** Active connections for one company under one key and service. Enforces the per-company limit. */
-export async function countActiveConnections(
-  supabase: SupabaseClient,
-  keyId: string,
-  service: ConnectorService,
-  companyRef: string,
-): Promise<number> {
-  const { count, error } = await supabase
-    .from('connector_connections')
-    .select('id', { count: 'exact', head: true })
-    .eq('connector_key_id', keyId)
-    .eq('service', service)
-    .eq('company_ref', companyRef)
-    .eq('status', 'active')
-  if (error) throw new Error(`ledger count failed: ${error.message}`)
-  return count ?? 0
-}
-
 /**
  * Pending rows count toward quota only while their consent window is open:
  * the signed connector state expires after 15 minutes, so an abandoned
diff --git a/lib/connect/hosted/upstream-budget.ts b/lib/connect/hosted/upstream-budget.ts
index ce72a0f2..bee4b398 100644
--- a/lib/connect/hosted/upstream-budget.ts
+++ b/lib/connect/hosted/upstream-budget.ts
@@ -1,4 +1,5 @@
 import type { SupabaseClient } from '@supabase/supabase-js'
+import type { ConnectorService } from './ledger'
 
 /**
  * Global upstream rate budget for the connector proxy.
@@ -15,7 +16,7 @@ import type { SupabaseClient } from '@supabase/supabase-js'
  * per-minute quota.
  */
 
-export type UpstreamService = 'bank' | 'skatteverket'
+export type UpstreamService = ConnectorService
 
 interface Budget {
   minuteMax: number
diff --git a/lib/core/audit/audit-service.ts b/lib/core/audit/audit-service.ts
index 81cf1fa2..30bcb01b 100644
--- a/lib/core/audit/audit-service.ts
+++ b/lib/core/audit/audit-service.ts
@@ -69,83 +69,3 @@ export async function getAuditLog(
     count: includeCount ? count ?? 0 : 0,
   }
 }
-
-/**
- * Get full history of a single record (all mutations)
- */
-export async function getEntityHistory(
-  supabase: SupabaseClient,
-  companyId: string,
-  tableName: string,
-  recordId: string
-): Promise<AuditLogEntry[]> {
-
-  const { data, error } = await supabase
-    .from('audit_log')
-    .select('*')
-    .eq('company_id', companyId)
-    .eq('table_name', tableName)
-    .eq('record_id', recordId)
-    .order('created_at', { ascending: true })
-
-  if (error) {
-    throw new Error(`Failed to fetch entity history: ${error.message}`)
-  }
-
-  return (data as AuditLogEntry[]) || []
-}
-
-/**
- * Trace the correction chain for a journal entry:
- * original → storno (reversal) → corrected entry
- */
-export async function getCorrectionChain(
-  supabase: SupabaseClient,
-  companyId: string,
-  journalEntryId: string
-): Promise<AuditLogEntry[]> {
-
-  // First, find the entry and its linked entries
-  const { data: entry, error: entryError } = await supabase
-    .from('journal_entries')
-    .select('id, reverses_id, reversed_by_id, correction_of_id')
-    .eq('id', journalEntryId)
-    .eq('company_id', companyId)
-    .single()
-
-  if (entryError || !entry) {
-    throw new Error('Journal entry not found')
-  }
-
-  // Collect all related entry IDs
-  const relatedIds = new Set<string>([entry.id])
-  if (entry.reverses_id) relatedIds.add(entry.reverses_id)
-  if (entry.reversed_by_id) relatedIds.add(entry.reversed_by_id)
-  if (entry.correction_of_id) relatedIds.add(entry.correction_of_id)
-
-  // Also look for entries that reference this one
-  const { data: referencing } = await supabase
-    .from('journal_entries')
-    .select('id')
-    .eq('company_id', companyId)
-    .or(`reverses_id.eq.${journalEntryId},reversed_by_id.eq.${journalEntryId},correction_of_id.eq.${journalEntryId}`)
-
-  for (const ref of referencing || []) {
-    relatedIds.add(ref.id)
-  }
-
-  // Fetch audit log entries for all related IDs
-  const { data, error } = await supabase
-    .from('audit_log')
-    .select('*')
-    .eq('company_id', companyId)
-    .eq('table_name', 'journal_entries')
-    .in('record_id', Array.from(relatedIds))
-    .order('created_at', { ascending: true })
-
-  if (error) {
-    throw new Error(`Failed to fetch correction chain: ${error.message}`)
-  }
-
-  return (data as AuditLogEntry[]) || []
-}
diff --git a/lib/core/bookkeeping/period-service.ts b/lib/core/bookkeeping/period-service.ts
index 669592ec..00b01d30 100644
--- a/lib/core/bookkeeping/period-service.ts
+++ b/lib/core/bookkeeping/period-service.ts
@@ -3,7 +3,8 @@ import { eventBus } from '@/lib/events'
 import { createLogger } from '@/lib/logger'
 import { fetchAllRows } from '@/lib/supabase/fetch-all'
 import { validatePeriodDuration } from '@/lib/bookkeeping/validate-period-duration'
-import type { FiscalPeriod, PeriodStatus } from '@/types'
+import { addDaysIso } from '@/lib/dates/iso'
+import type { FiscalPeriod } from '@/types'
 
 const log = createLogger('period-service')
 
@@ -760,7 +761,7 @@ export async function createNextPeriod(
     .select('id')
     .eq('company_id', companyId)
     .eq('previous_period_id', currentPeriodId)
-    .eq('period_start', addDaysUTC(nextEndStr, 1))
+    .eq('period_start', addDaysIso(nextEndStr, 1))
   if (mischained && mischained.length > 0) {
     const successorIds = mischained.map((row: { id: string }) => row.id)
     const { error: relinkError } = await supabase
@@ -819,7 +820,7 @@ export async function findNextPeriod(
   // off-by-one on servers in TZ+ when the day after period_end crosses a
   // DST spring-forward, because setDate(local) writes local-time fields
   // and toISOString() converts back through the shifted offset.
-  const expectedStartStr = addDaysUTC(current.period_end, 1)
+  const expectedStartStr = addDaysIso(current.period_end, 1)
 
   // The chain is only trusted when it is date-adjacent. SIE import used to
   // point previous_period_id at the NEAREST later period regardless of the
@@ -852,102 +853,6 @@ export async function findNextPeriod(
   return (byDate as FiscalPeriod | null) ?? null
 }
 
-/** Add `days` to a YYYY-MM-DD string in pure UTC and return YYYY-MM-DD. */
-function addDaysUTC(isoDate: string, days: number): string {
-  const d = new Date(isoDate + 'T00:00:00Z')
-  d.setUTCDate(d.getUTCDate() + days)
-  return d.toISOString().slice(0, 10)
-}
-
-/**
- * Create a previous fiscal period before the given one.
- * Computes a 12-month period ending the day before the given period starts.
- * Updates previous_period_id chain so the given period points to the new one.
- */
-export async function createPreviousPeriod(
-  supabase: SupabaseClient,
-  companyId: string,
-  userId: string,
-  currentPeriodId: string
-): Promise<FiscalPeriod> {
-
-  const { data: current, error: fetchError } = await supabase
-    .from('fiscal_periods')
-    .select('*')
-    .eq('id', currentPeriodId)
-    .eq('company_id', companyId)
-    .single()
-
-  if (fetchError || !current) {
-    throw new Error('Current fiscal period not found')
-  }
-
-  // Compute previous period end (day before current start)
-  const prevEnd = new Date(current.period_start + 'T12:00:00Z')
-  prevEnd.setUTCDate(prevEnd.getUTCDate() - 1)
-
-  // Compute previous period start (1st of month, 12 months before prevEnd)
-  const prevStart = new Date(prevEnd)
-  prevStart.setUTCMonth(prevStart.getUTCMonth() - 11)
-  prevStart.setUTCDate(1)
-
-  const prevStartStr = prevStart.toISOString().split('T')[0]
-  const prevEndStr = prevEnd.toISOString().split('T')[0]
-
-  // Validate period duration
-  const durationError = validatePeriodDuration(prevStartStr, prevEndStr, { isFirstPeriod: false })
-  if (durationError) {
-    throw new Error(durationError)
-  }
-
-  // Check for overlapping periods
-  const { data: overlapping } = await supabase
-    .from('fiscal_periods')
-    .select('id')
-    .eq('company_id', companyId)
-    .lte('period_start', prevEndStr)
-    .gte('period_end', prevStartStr)
-    .limit(1)
-
-  if (overlapping && overlapping.length > 0) {
-    throw new Error('Previous fiscal period already exists or overlaps with an existing period')
-  }
-
-  // Generate name
-  const startYear = prevStart.getFullYear()
-  const endYear = prevEnd.getFullYear()
-  const name = startYear === endYear ? `FY ${startYear}` : `FY ${startYear}/${endYear}`
-
-  const { data: newPeriod, error: insertError } = await supabase
-    .from('fiscal_periods')
-    .insert({
-      company_id: companyId,
-      user_id: userId,
-      name,
-      period_start: prevStartStr,
-      period_end: prevEndStr,
-    })
-    .select()
-    .single()
-
-  if (insertError || !newPeriod) {
-    throw new Error(`Failed to create previous period: ${insertError?.message}`)
-  }
-
-  // Update the current period to point to the new one
-  const { error: updateError } = await supabase
-    .from('fiscal_periods')
-    .update({ previous_period_id: newPeriod.id })
-    .eq('id', currentPeriodId)
-    .eq('company_id', companyId)
-
-  if (updateError) {
-    throw new Error(`Failed to update period chain: ${updateError.message}`)
-  }
-
-  return newPeriod as FiscalPeriod
-}
-
 export type PeriodStatusValue = 'open' | 'locked' | 'closed'
 
 export interface PeriodStatusForDate {
@@ -1084,50 +989,3 @@ export async function resolvePeriodStatusForDate(
   }
   return { period_id: period.id, status: 'open', lock_date: null }
 }
-
-/**
- * Get status summary for a fiscal period.
- */
-export async function getPeriodStatus(
-  supabase: SupabaseClient,
-  companyId: string,
-  userId: string,
-  fiscalPeriodId: string
-): Promise<PeriodStatus> {
-
-  const { data: period, error: fetchError } = await supabase
-    .from('fiscal_periods')
-    .select('*')
-    .eq('id', fiscalPeriodId)
-    .eq('company_id', companyId)
-    .single()
-
-  if (fetchError || !period) {
-    throw new Error('Fiscal period not found')
-  }
-
-  // Count draft entries in this period
-  const { count: draftCount } = await supabase
-    .from('journal_entries')
-    .select('id', { count: 'exact', head: true })
-    .eq('company_id', companyId)
-    .eq('fiscal_period_id', fiscalPeriodId)
-    .eq('status', 'draft')
-
-  // Check if next period exists via the chain pointer
-  const { data: nextPeriod } = await supabase
-    .from('fiscal_periods')
-    .select('id')
-    .eq('company_id', companyId)
-    .eq('previous_period_id', fiscalPeriodId)
-    .maybeSingle()
-
-  return {
-    is_locked: !!period.locked_at,
-    is_closed: period.is_closed,
-    has_closing_entry: !!period.closing_entry_id,
-    has_opening_balances: period.opening_balances_set,
-    draft_count: draftCount ?? 0,
-    next_period_exists: !!nextPeriod,
-  }
-}
diff --git a/lib/dates/iso.ts b/lib/dates/iso.ts
new file mode 100644
index 00000000..b9241342
--- /dev/null
+++ b/lib/dates/iso.ts
@@ -0,0 +1,32 @@
+/**
+ * Pure UTC arithmetic on `YYYY-MM-DD` strings.
+ *
+ * Every helper here is deliberately UTC: accounting dates are calendar dates
+ * with no wall-clock component, and doing the arithmetic at `T00:00:00Z`
+ * means no DST edge can shift a day. None of these is a substitute for
+ * `getSwedishLocalDate()` / `swedishToday()` (Europe/Stockholm), which differ
+ * from `todayIsoUtc()` around midnight Swedish time.
+ */
+
+/** Add `days` to a `YYYY-MM-DD` string in pure UTC and return `YYYY-MM-DD`. */
+export function addDaysIso(iso: string, days: number): string {
+  const d = new Date(iso + 'T00:00:00Z')
+  d.setUTCDate(d.getUTCDate() + days)
+  return d.toISOString().slice(0, 10)
+}
+
+/** Whole days from `from` to `to` (both `YYYY-MM-DD`); negative when `to` is earlier. */
+export function daysBetweenIso(from: string, to: string): number {
+  const ms = new Date(to + 'T00:00:00Z').getTime() - new Date(from + 'T00:00:00Z').getTime()
+  return Math.round(ms / 86_400_000)
+}
+
+/** The UTC calendar date of `d` as `YYYY-MM-DD`. */
+export function toIsoDate(d: Date): string {
+  return d.toISOString().slice(0, 10)
+}
+
+/** Today's UTC calendar date as `YYYY-MM-DD`. */
+export function todayIsoUtc(): string {
+  return new Date().toISOString().slice(0, 10)
+}
diff --git a/lib/documents/core-receipt-matcher.ts b/lib/documents/core-receipt-matcher.ts
index 030a020d..cb2ede2c 100644
--- a/lib/documents/core-receipt-matcher.ts
+++ b/lib/documents/core-receipt-matcher.ts
@@ -35,7 +35,6 @@ export const AMOUNT_TOLERANCE_PERCENT = 0.05
  * against real statements, the spread ran 1.2% to 3%.
  */
 export const CONVERTED_AMOUNT_TOLERANCE_PERCENT = 0.09
-export const MIN_MATCH_CONFIDENCE = 0.4
 
 /**
  * Flat discount on a confidence scored from a prominentAmounts fallback
diff --git a/lib/email/invoice-templates.ts b/lib/email/invoice-templates.ts
index e25705b5..db306a52 100644
--- a/lib/email/invoice-templates.ts
+++ b/lib/email/invoice-templates.ts
@@ -1,5 +1,5 @@
 import type { Invoice, Customer, CompanySettings, InvoiceDocumentType } from '@/types'
-import { formatDate, getCompanyDisplayName, getCompanyPrimaryName } from '@/lib/utils'
+import { formatDate, getCompanyDisplayName } from '@/lib/utils'
 import { getAmountToPay } from '@/lib/invoices/rounding'
 import { companyWithInvoicePaymentAccount } from '@/lib/invoices/payment-accounts'
 import { applyPlaceholders, escapeHtml, sanitizeSubjectLine, userTextToHtml } from './user-text'
@@ -165,7 +165,7 @@ function buildPlaceholderValues(data: InvoiceEmailData, lang: EmailLang): Record
     fakturanummer: invoice.invoice_number ?? '',
     kundnamn: fullName,
     förnamn: fullName ? fullName.split(' ')[0] : '',
-    företag: getCompanyPrimaryName(company),
+    företag: getCompanyDisplayName(company),
     förfallodatum: formatDate(invoice.due_date),
     belopp: formatCurrencyForCustomer(getAmountToPay(invoice, company).toPay, invoice.currency, lang),
   }
@@ -245,7 +245,7 @@ export function generateInvoiceEmailHtml(data: InvoiceEmailData): string {
     <!-- Header -->
     <div style="margin-bottom: 30px; border-bottom: 2px solid ${primaryColor}; padding-bottom: 16px;">
       <h1 style="margin: 0 0 10px 0; font-size: 24px; font-weight: 600; color: ${primaryColor};">
-        ${L.documentFrom(documentType, getCompanyPrimaryName(company))}
+        ${L.documentFrom(documentType, getCompanyDisplayName(company))}
       </h1>
       <p style="margin: 0; color: #666; font-size: 14px;">
         ${L.documentNumber(documentType)} ${invoice.invoice_number}
@@ -348,7 +348,7 @@ export function generateInvoiceEmailHtml(data: InvoiceEmailData): string {
       </p>
       <p style="margin: 0; color: #666; font-size: 14px;">
         ${custom.signoff !== undefined ? userTextToHtml(custom.signoff) : L.sincerely}<br>
-        <strong style="color: ${primaryColor};">${getCompanyPrimaryName(company)}</strong>
+        <strong style="color: ${primaryColor};">${getCompanyDisplayName(company)}</strong>
       </p>
       ${company.org_number ? `
       <p style="margin: 10px 0 0 0; color: #999; font-size: 12px;">
@@ -382,7 +382,7 @@ export function generateInvoiceEmailText(data: InvoiceEmailData): string {
   const firstName = customer.name ? customer.name.split(' ')[0] : ''
   const custom = resolveCustomTexts(data, lang)
 
-  let text = `${L.documentFrom(documentType, getCompanyPrimaryName(company))}\n`
+  let text = `${L.documentFrom(documentType, getCompanyDisplayName(company))}\n`
   text += `${L.documentNumber(documentType)} ${invoice.invoice_number}\n\n`
 
   text += `${custom.greeting ?? L.greeting(firstName)}\n\n`
@@ -437,7 +437,7 @@ export function generateInvoiceEmailSubject(data: InvoiceEmailData): string {
   if (custom.subject !== undefined) return sanitizeSubjectLine(custom.subject)
 
   const documentType = getDocumentLabel(invoice, lang)
-  return L.subjectFrom(documentType, invoice.invoice_number ?? '', getCompanyPrimaryName(company))
+  return L.subjectFrom(documentType, invoice.invoice_number ?? '', getCompanyDisplayName(company))
 }
 
 // ---------------------------------------------------------------------------
@@ -462,7 +462,7 @@ export function generatePaymentConfirmationEmailSubject(data: InvoiceEmailData):
   const { invoice, customer, company } = data
   const L = LABELS[resolveLang(customer)]
   return sanitizeSubjectLine(
-    L.confirmationSubject(invoice.invoice_number ?? '', getCompanyPrimaryName(company)),
+    L.confirmationSubject(invoice.invoice_number ?? '', getCompanyDisplayName(company)),
   )
 }
 
@@ -482,13 +482,13 @@ export function generatePaymentConfirmationEmailHtml(data: InvoiceEmailData): st
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>${escapeHtml(L.confirmationSubject(invoice.invoice_number ?? '', getCompanyPrimaryName(company)))}</title>
+  <title>${escapeHtml(L.confirmationSubject(invoice.invoice_number ?? '', getCompanyDisplayName(company)))}</title>
 </head>
 <body style="margin: 0; padding: 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; line-height: 1.6; color: #333;">
   <div style="max-width: 600px; margin: 0 auto; padding: 40px 20px;">
     <div style="margin-bottom: 30px; border-bottom: 2px solid ${primaryColor}; padding-bottom: 16px;">
       <h1 style="margin: 0 0 10px 0; font-size: 24px; font-weight: 600; color: ${primaryColor};">
-        ${escapeHtml(L.confirmationHeading(getCompanyPrimaryName(company)))}
+        ${escapeHtml(L.confirmationHeading(getCompanyDisplayName(company)))}
       </h1>
       <p style="margin: 0; color: #666; font-size: 14px;">
         ${L.documentNumber(L.docInvoice)} ${invoiceNumber}
@@ -532,7 +532,7 @@ export function generatePaymentConfirmationEmailHtml(data: InvoiceEmailData): st
       <p style="margin: 0 0 10px 0; color: #666; font-size: 14px;">${L.confirmationQuestions}</p>
       <p style="margin: 0; color: #666; font-size: 14px;">
         ${L.sincerely}<br>
-        <strong style="color: ${primaryColor};">${escapeHtml(getCompanyPrimaryName(company))}</strong>
+        <strong style="color: ${primaryColor};">${escapeHtml(getCompanyDisplayName(company))}</strong>
       </p>
       ${company.org_number ? `
       <p style="margin: 10px 0 0 0; color: #999; font-size: 12px;">
@@ -556,7 +556,7 @@ export function generatePaymentConfirmationEmailText(data: InvoiceEmailData): st
   const paidDate = paidDateForCustomer(invoice)
   const number = invoice.invoice_number ?? ''
 
-  let text = `${L.confirmationHeading(getCompanyPrimaryName(company))}\n`
+  let text = `${L.confirmationHeading(getCompanyDisplayName(company))}\n`
   text += `${L.documentNumber(L.docInvoice)} ${number}\n\n`
   text += `${L.greeting(firstName)}\n\n`
   text += `${L.confirmationBody(number)}\n\n`
diff --git a/lib/email/reminder-templates.ts b/lib/email/reminder-templates.ts
index 94d5792c..62ec1934 100644
--- a/lib/email/reminder-templates.ts
+++ b/lib/email/reminder-templates.ts
@@ -1,5 +1,5 @@
 import type { Invoice, Customer, CompanySettings, ReminderTextOverrides } from '@/types'
-import { formatCurrency, formatDate, getCompanyDisplayName, getCompanyPrimaryName } from '@/lib/utils'
+import { formatCurrency, formatDate, getCompanyDisplayName } from '@/lib/utils'
 import { getAmountToPay } from '@/lib/invoices/rounding'
 import { companyWithInvoicePaymentAccount } from '@/lib/invoices/payment-accounts'
 import { applyPlaceholders, escapeHtml, sanitizeSubjectLine } from './user-text'
@@ -208,7 +208,7 @@ function buildReminderPlaceholderValues(data: ReminderEmailData): Record<string,
     fakturanummer: invoice.invoice_number ?? '',
     kundnamn: fullName,
     förnamn: fullName ? fullName.split(' ')[0] : '',
-    företag: getCompanyPrimaryName(company),
+    företag: getCompanyDisplayName(company),
     fakturadatum: formatDate(invoice.invoice_date),
     förfallodatum: formatDate(invoice.due_date),
     belopp: formatReminderTotalDue(amounts),
@@ -454,7 +454,7 @@ export function generateReminderEmailHtml(data: ReminderEmailData): string {
         </p>
         <p style="margin: 0; color: #666; font-size: 14px;">
           Med vänliga hälsningar,<br>
-          <strong>${getCompanyPrimaryName(company)}</strong>
+          <strong>${getCompanyDisplayName(company)}</strong>
         </p>
         ${company.org_number ? `
         <p style="margin: 10px 0 0 0; color: #999; font-size: 12px;">
diff --git a/lib/entitlements/has-capability.ts b/lib/entitlements/has-capability.ts
index 2ec67819..961fd5b5 100644
--- a/lib/entitlements/has-capability.ts
+++ b/lib/entitlements/has-capability.ts
@@ -1,3 +1,4 @@
+import { chunk as chunksOf } from '@/lib/utils'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { NextResponse } from 'next/server'
 import { isSelfHosted } from '@/lib/env/public-flags'
@@ -8,6 +9,7 @@ import {
   type MultiUserAccess,
   type MultiUserGrantRow,
 } from './multi-user-state'
+import { isUuid } from '@/lib/invariants/uuid'
 
 /**
  * Entitlement gate: the single primitive behind the paywall ("non-payer loses
@@ -99,25 +101,13 @@ function isPaywallBypassed(): boolean {
   return isDevBypass()
 }
 
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-/**
- * Only server-resolved UUIDs may be interpolated into the PostgREST `.or()`
- * filter below: commas/dots/parens are filter syntax. companyId/teamId always
- * come from the DB, but we validate at this boundary as defense in depth.
- */
-function isUuid(v: string): boolean {
-  return UUID_RE.test(v)
-}
+// Only server-resolved UUIDs may be interpolated into the PostgREST `.or()`
+// filter below: commas/dots/parens are filter syntax. companyId/teamId always
+// come from the DB, but we validate with isUuid at this boundary as defense
+// in depth.
 
 const CAPABILITY_SCOPE_CHUNK_SIZE = 100
 
-function chunksOf<T>(values: T[], size: number): T[][] {
-  const chunks: T[][] = []
-  for (let index = 0; index < values.length; index += size) {
-    chunks.push(values.slice(index, index + size))
-  }
-  return chunks
-}
 
 function grantIsActive(expiresAt: string | null, now: number): boolean {
   return expiresAt === null || new Date(expiresAt).getTime() > now
@@ -611,11 +601,3 @@ export async function getCompanyEntitlements(
     multiUser,
   }
 }
-
-/** Capability list only; see getCompanyEntitlements for the full shape. */
-export async function getCompanyCapabilities(
-  supabase: SupabaseClient,
-  companyId: string,
-): Promise<CapabilityKey[]> {
-  return (await getCompanyEntitlements(supabase, companyId)).capabilities
-}
diff --git a/lib/entitlements/metering.ts b/lib/entitlements/metering.ts
deleted file mode 100644
index ea97ff3d..00000000
--- a/lib/entitlements/metering.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import type { SupabaseClient } from '@supabase/supabase-js'
-import type { CapabilityKey } from './keys'
-
-/**
- * Append a usage event to metered_events. Best-effort and non-blocking:
- * metering must never break the feature it measures, so failures are swallowed.
- *
- * Usage cannot be backfilled, so we capture it from day one even though no
- * usage-based pricing exists yet: it is the raw material for future firm-level
- * "active company" / consumption billing.
- */
-export async function recordMeteredEvent(
-  supabase: SupabaseClient,
-  params: {
-    companyId: string
-    teamId?: string | null
-    key: CapabilityKey
-    eventType: string
-    attribution?: Record<string, unknown>
-  },
-): Promise<void> {
-  try {
-    await supabase.from('metered_events').insert({
-      company_id: params.companyId,
-      team_id: params.teamId ?? null,
-      capability_key: params.key,
-      event_type: params.eventType,
-      attribution: params.attribution ?? {},
-    })
-  } catch {
-    // best-effort; never block the metered operation
-  }
-}
diff --git a/lib/entitlements/multi-user.ts b/lib/entitlements/multi-user.ts
index ab045900..e692a92c 100644
--- a/lib/entitlements/multi-user.ts
+++ b/lib/entitlements/multi-user.ts
@@ -16,9 +16,7 @@ export {
   type MultiUserAccess,
   type MultiUserGrantRow,
 } from './multi-user-state'
-export type { MultiUserState } from './multi-user-state'
-
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+import { UUID_RE } from '@/lib/invariants/uuid'
 
 /**
  * Whether the owner-only dormancy rule is enforced at all in this
diff --git a/lib/events/index.ts b/lib/events/index.ts
index b898c3e1..7080c9ca 100644
--- a/lib/events/index.ts
+++ b/lib/events/index.ts
@@ -1,8 +1 @@
 export { eventBus } from './bus'
-export type {
-  CoreEvent,
-  CoreEventType,
-  EventPayload,
-  EventHandler,
-  EventSubscription,
-} from './types'
diff --git a/lib/events/types.ts b/lib/events/types.ts
index 33b8f5ff..7629bf86 100644
--- a/lib/events/types.ts
+++ b/lib/events/types.ts
@@ -368,8 +368,3 @@ export type EventPayload<T extends CoreEventType> = Extract<CoreEvent, { type: T
 /** Handler function for a specific event type */
 export type EventHandler<T extends CoreEventType> = (payload: EventPayload<T>) => Promise<void> | void
 
-/** Subscription: event type + handler */
-export interface EventSubscription<T extends CoreEventType = CoreEventType> {
-  eventType: T
-  handler: EventHandler<T>
-}
diff --git a/lib/export/register-export.ts b/lib/export/register-export.ts
index 80e452ef..42846ed1 100644
--- a/lib/export/register-export.ts
+++ b/lib/export/register-export.ts
@@ -42,6 +42,4 @@ export function buildRegisterExport(
 }
 
 /** Today's date as `YYYY-MM-DD` for export filenames. */
-export function todayIso(): string {
-  return new Date().toISOString().slice(0, 10)
-}
+export { todayIsoUtc as todayIso } from '@/lib/dates/iso'
diff --git a/lib/extensions/index.ts b/lib/extensions/index.ts
deleted file mode 100644
index ebfd200a..00000000
--- a/lib/extensions/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export { extensionRegistry } from './registry'
-export { loadExtensions } from './loader'
-export type {
-  Extension,
-  ApiRouteDefinition,
-  MappingRuleTypeDefinition,
-  ExtensionEventHandler,
-  ExtensionContext,
-  SettingsPanelDefinition,
-} from './types'
diff --git a/lib/extensions/validation.ts b/lib/extensions/validation.ts
index ff27e357..d7fcd057 100644
--- a/lib/extensions/validation.ts
+++ b/lib/extensions/validation.ts
@@ -1,3 +1,5 @@
+import { luhnValidate } from '@/lib/bankgiro/luhn'
+
 /**
  * Validates a Swedish personal number (YYYYMMDD-XXXX) using Luhn checksum.
  * Returns an error message string, or null if valid.
@@ -21,17 +23,7 @@ export function validateSwedishPersonalNumber(pnr: string): string | null {
 
   // Luhn check on the last 10 digits (YYMMDDXXXX)
   const luhnDigits = cleaned.slice(2)
-  let sum = 0
-  for (let i = 0; i < 10; i++) {
-    let digit = parseInt(luhnDigits[i])
-    if (i % 2 === 0) {
-      digit *= 2
-      if (digit > 9) digit -= 9
-    }
-    sum += digit
-  }
-
-  if (sum % 10 !== 0) return 'Ogiltig kontrollsiffra'
+  if (!luhnValidate(luhnDigits)) return 'Ogiltig kontrollsiffra'
 
   return null
 }
diff --git a/lib/hooks/use-fetch.ts b/lib/hooks/use-fetch.ts
index 6c8156c9..f801fcff 100644
--- a/lib/hooks/use-fetch.ts
+++ b/lib/hooks/use-fetch.ts
@@ -24,7 +24,8 @@ import { getErrorMessage, type ErrorLocale } from '@/lib/errors/get-error-messag
  *    don't blank out on refresh. Read `loading` to show a pending indicator.
  *  - When `url`/`enabled` start inactive and later become active, `loading`
  *    flips true on the effect tick, not synchronously on the activating render.
- *    Pair with `DataState` (which branches on `loading` first) to avoid a flash.
+ *    Branch on `loading` first to avoid a flash.
+
  *
  * Response convention: the JSON body is returned as-is, typed as `T`. Most
  * Accounted routes wrap payloads as `{ data: ... }`, so the common usage is
diff --git a/lib/import/articles/types.ts b/lib/import/articles/types.ts
index a47b1d0c..4e9ae3e7 100644
--- a/lib/import/articles/types.ts
+++ b/lib/import/articles/types.ts
@@ -72,12 +72,6 @@ export interface ArticleImportParseResult {
   warnings: string[]
 }
 
-/** Input for executing the article import. */
-export interface ArticleImportExecuteInput {
-  rows: ParsedArticleRow[]
-  update_duplicates: boolean
-}
-
 /** Result of executing the article import. */
 export interface ArticleImportExecuteResult {
   success: boolean
diff --git a/lib/import/bank-file/formats/generic-csv.ts b/lib/import/bank-file/formats/generic-csv.ts
index 643920f9..6f2b88f9 100644
--- a/lib/import/bank-file/formats/generic-csv.ts
+++ b/lib/import/bank-file/formats/generic-csv.ts
@@ -165,15 +165,6 @@ export function parseGenericCSV(
   }
 }
 
-/**
- * Get column headers from a CSV file for the mapping UI
- */
-export function getCSVHeaders(content: string, delimiter: string = ','): string[] {
-  const prepared = prepareContent(content)
-  const firstLine = prepared.split('\n')[0] || ''
-  return parseCSVLine(firstLine, delimiter).map((h) => h.trim().replace(/^"|"$/g, ''))
-}
-
 /**
  * Get a preview of the first few rows of a CSV file
  */
diff --git a/lib/import/bank-file/types.ts b/lib/import/bank-file/types.ts
index 0fa43dfc..2c921b7d 100644
--- a/lib/import/bank-file/types.ts
+++ b/lib/import/bank-file/types.ts
@@ -79,25 +79,6 @@ export interface BankFileFormat {
   parse: (content: string) => BankFileParseResult
 }
 
-/** Import tracking record stored in DB */
-export interface BankFileImport {
-  id: string
-  user_id: string
-  filename: string
-  file_hash: string
-  file_format: string
-  transaction_count: number
-  imported_count: number
-  duplicate_count: number
-  matched_count: number
-  date_from: string | null
-  date_to: string | null
-  status: 'pending' | 'processing' | 'completed' | 'failed'
-  error_message: string | null
-  created_at: string
-  updated_at: string
-}
-
 /** Column mapping for generic CSV format */
 export interface GenericCSVColumnMapping {
   date: number
diff --git a/lib/import/customers/types.ts b/lib/import/customers/types.ts
index ad4144cd..a8e56b40 100644
--- a/lib/import/customers/types.ts
+++ b/lib/import/customers/types.ts
@@ -61,12 +61,6 @@ export interface CustomerImportParseResult {
   warnings: string[]
 }
 
-/** Input for executing the customer import. */
-export interface CustomerImportExecuteInput {
-  rows: ParsedCustomerRow[]
-  update_duplicates: boolean
-}
-
 /** Result of executing the customer import. */
 export interface CustomerImportExecuteResult {
   success: boolean
diff --git a/lib/import/opening-balance/types.ts b/lib/import/opening-balance/types.ts
index 28a9d4eb..9ec29303 100644
--- a/lib/import/opening-balance/types.ts
+++ b/lib/import/opening-balance/types.ts
@@ -52,16 +52,6 @@ export interface OpeningBalanceParseResult {
   detected_bank_format: string | null
 }
 
-/** Input for executing the opening balance import */
-export interface OpeningBalanceExecuteInput {
-  fiscal_period_id: string
-  lines: {
-    account_number: string
-    debit_amount: number
-    credit_amount: number
-  }[]
-}
-
 /** Result of executing the opening balance import */
 export interface OpeningBalanceExecuteResult {
   success: boolean
diff --git a/lib/import/shared/column-utils.ts b/lib/import/shared/column-utils.ts
index 2b474721..e7c47bdd 100644
--- a/lib/import/shared/column-utils.ts
+++ b/lib/import/shared/column-utils.ts
@@ -66,3 +66,12 @@ export function normalizeEmail(value: string | null): string | null {
   if (!value) return null
   return value.trim().toLowerCase() || null
 }
+
+/**
+ * Lowercased dedup key for matching a row by name (articles, and any other
+ * importer that dedupes on a free-text name). Same rule as normalizeEmail.
+ */
+export function normalizeNameKey(value: string | null): string | null {
+  if (!value) return null
+  return value.trim().toLowerCase() || null
+}
diff --git a/lib/import/sie-import.ts b/lib/import/sie-import.ts
index 4c8829e5..970f29ad 100644
--- a/lib/import/sie-import.ts
+++ b/lib/import/sie-import.ts
@@ -541,7 +541,7 @@ export async function ensureFiscalPeriod(
   // lib/bookkeeping/validate-period-duration.ts, the same arithmetic and the
   // same threshold validatePeriodDuration() applies on every other
   // period-creation path (fiscal-periods POST/PATCH, period-service's
-  // createNextPeriod/createPreviousPeriod, onboarding's computeFiscalPeriod),
+  // createNextPeriod, onboarding's computeFiscalPeriod),
   // so an 18-month förlängt räkenskapsår imports exactly as it does there and
   // a 19-month one does not. 18 is the ceiling for an extended or re-laid
   // year; ongoing years are 12. BFL sets no minimum, so there is no floor here.
diff --git a/lib/import/suppliers/types.ts b/lib/import/suppliers/types.ts
index a4b6d9d3..018ebd6d 100644
--- a/lib/import/suppliers/types.ts
+++ b/lib/import/suppliers/types.ts
@@ -73,11 +73,6 @@ export interface SupplierImportParseResult {
   warnings: string[]
 }
 
-/** Input for executing the supplier import. */
-export interface SupplierImportExecuteInput {
-  rows: ParsedSupplierRow[]
-  update_duplicates: boolean
-}
 
 /** Result of executing the supplier import. */
 export interface SupplierImportExecuteResult {
diff --git a/lib/import/types.ts b/lib/import/types.ts
index 97a639d0..19d15058 100644
--- a/lib/import/types.ts
+++ b/lib/import/types.ts
@@ -192,14 +192,6 @@ export interface AccountMapping {
   requiresVatTreatmentReview?: boolean
 }
 
-/**
- * Account mapping context for the mapper
- */
-export interface MappingContext {
-  sourceAccounts: SIEAccount[]
-  existingMappings?: Map<string, AccountMapping>
-}
-
 /**
  * SIE import record (matches database table)
  */
@@ -243,39 +235,6 @@ export interface SIEAccountMappingRecord {
   updated_at: string
 }
 
-/**
- * Options for executing an import
- */
-export interface ImportOptions {
-  // The parsed SIE data
-  parsed: ParsedSIEFile
-
-  // Account mappings to use
-  mappings: AccountMapping[]
-
-  // Whether to create a new fiscal period
-  createFiscalPeriod: boolean
-
-  // Whether to import opening balances as a journal entry
-  importOpeningBalances: boolean
-
-  // Whether to import transactions (SIE4 only)
-  importTransactions: boolean
-
-  // Voucher series to use for imported entries
-  voucherSeries?: string
-
-  // Voucher series for the opening-balance (Ingående balanser) entry.
-  // Defaults to a series the file's own vouchers do not use (see
-  // lib/import/opening-balance-defaults.ts) so the IB voucher never shifts
-  // the numbering of the file's series (issue #1882).
-  openingBalanceSeries?: string
-
-  // Opt-in: mark imported verifikat as "Inget underlag krävs" so a migration
-  // doesn't flood "Att hantera: saknade underlag". OFF by default.
-  markImportedNoDocRequired?: boolean
-}
-
 /**
  * Structured import details for UI display.
  * Provides machine-readable data so the UI can render proper explanations
@@ -495,17 +454,3 @@ export interface MigrationDocumentation {
  * Wizard step state
  */
 export type ImportWizardStep = 'upload' | 'preview' | 'mapping' | 'review' | 'result'
-
-/**
- * Full wizard state
- */
-export interface ImportWizardState {
-  step: ImportWizardStep
-  file: File | null
-  parsed: ParsedSIEFile | null
-  mappings: AccountMapping[]
-  preview: ImportPreview | null
-  importResult: ImportResult | null
-  isLoading: boolean
-  error: string | null
-}
diff --git a/lib/invariants/__tests__/uuid.test.ts b/lib/invariants/__tests__/uuid.test.ts
new file mode 100644
index 00000000..13be8983
--- /dev/null
+++ b/lib/invariants/__tests__/uuid.test.ts
@@ -0,0 +1,24 @@
+import { describe, it, expect } from 'vitest'
+import { UUID_RE, isUuid } from '../uuid'
+
+describe('UUID_RE / isUuid', () => {
+  it('accepts lower- and upper-case hex layouts', () => {
+    expect(isUuid('123e4567-e89b-12d3-a456-426614174000')).toBe(true)
+    expect(isUuid('123E4567-E89B-12D3-A456-426614174000')).toBe(true)
+    expect(UUID_RE.test('00000000-0000-0000-0000-000000000000')).toBe(true)
+  })
+
+  it('rejects anything that is not exactly the 8-4-4-4-12 shape', () => {
+    expect(isUuid('123e4567e89b12d3a456426614174000')).toBe(false)
+    expect(isUuid('123e4567-e89b-12d3-a456-42661417400')).toBe(false)
+    expect(isUuid('123e4567-e89b-12d3-a456-426614174000,x.eq.1')).toBe(false)
+    expect(isUuid(' 123e4567-e89b-12d3-a456-426614174000')).toBe(false)
+    expect(isUuid('')).toBe(false)
+  })
+
+  it('narrows non-strings to false', () => {
+    expect(isUuid(null)).toBe(false)
+    expect(isUuid(undefined)).toBe(false)
+    expect(isUuid(42)).toBe(false)
+  })
+})
diff --git a/lib/invariants/index.ts b/lib/invariants/index.ts
index 67807d78..387478de 100644
--- a/lib/invariants/index.ts
+++ b/lib/invariants/index.ts
@@ -34,8 +34,8 @@ export {
 } from './fiscal-year'
 
 export {
-  ORG_NUMBER_LENGTH,
   stripOrgNumberFormatting,
+
   isOrgNumberShaped,
   normalizeOrgNumber,
   isValidOrgNumber,
diff --git a/lib/invariants/org-number.ts b/lib/invariants/org-number.ts
index f2da068a..9483d333 100644
--- a/lib/invariants/org-number.ts
+++ b/lib/invariants/org-number.ts
@@ -38,8 +38,6 @@ import { luhnValidate } from '@/lib/bankgiro/luhn'
  * with its own message. Tighten the intake, not the outflow.
  */
 
-/** Digits-only canonical storage length. */
-export const ORG_NUMBER_LENGTH = 10
 
 /**
  * Strip the separators Swedish users and provider APIs put in org numbers.
diff --git a/lib/invariants/uuid.ts b/lib/invariants/uuid.ts
new file mode 100644
index 00000000..8ae254a4
--- /dev/null
+++ b/lib/invariants/uuid.ts
@@ -0,0 +1,12 @@
+/**
+ * UUID shape, as stored in every `id` column. Anchored and case-insensitive;
+ * version/variant nibbles are NOT checked (Postgres accepts any hex layout, and
+ * fixtures use non-RFC ids). Consumers use it as an injection guard before
+ * interpolating a server-resolved id into a PostgREST filter, or to validate a
+ * route parameter before hitting the database.
+ */
+export const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+
+export function isUuid(value: unknown): value is string {
+  return typeof value === 'string' && UUID_RE.test(value)
+}
diff --git a/lib/invariants/zod.ts b/lib/invariants/zod.ts
index 3ad64714..da18419e 100644
--- a/lib/invariants/zod.ts
+++ b/lib/invariants/zod.ts
@@ -2,7 +2,7 @@ import { z } from 'zod'
 import { ACCOUNT_NUMBER_RE, ACCOUNT_NUMBER_MESSAGE } from './account-number'
 import { ISO_DATE_RE, ISO_DATE_MESSAGE, SANE_DATE_MESSAGE, isSaneDateString } from './iso-date'
 import { FISCAL_YEAR_RE, FISCAL_YEAR_MESSAGE } from './fiscal-year'
-import { isValidOrgNumber, normalizeOrgNumber } from './org-number'
+import { isValidOrgNumber } from './org-number'
 
 /**
  * Zod primitives built from the shared rules.
@@ -41,8 +41,3 @@ export const fiscalYearSchema = z.string().regex(FISCAL_YEAR_RE, FISCAL_YEAR_MES
 export const orgNumberSchema = z
   .string()
   .refine(isValidOrgNumber, 'Ogiltigt organisationsnummer (10 eller 12 siffror, giltig kontrollsiffra)')
-
-/** Org number that is normalized to the canonical 10-digit storage form on parse. */
-export const normalizedOrgNumberSchema = orgNumberSchema.transform(
-  (v) => normalizeOrgNumber(v) as string,
-)
diff --git a/lib/invoices/link-migrated-registration-vouchers.ts b/lib/invoices/link-migrated-registration-vouchers.ts
index 9f438755..759e5ccf 100644
--- a/lib/invoices/link-migrated-registration-vouchers.ts
+++ b/lib/invoices/link-migrated-registration-vouchers.ts
@@ -47,6 +47,7 @@
  * by lib/invoices/bulk-reconcile-supplier-vouchers.ts.
  */
 
+import { chunk } from '@/lib/utils'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { createLogger } from '@/lib/logger'
 import { ORE_TOLERANCE, roundOre } from '@/lib/money'
@@ -175,12 +176,6 @@ function daysBetween(from: string, to: string): number | null {
   return Math.round((b - a) / MS_PER_DAY)
 }
 
-function chunk<T>(items: T[], size: number): T[][] {
-  const out: T[][] = []
-  for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size))
-  return out
-}
-
 function emptyCounts(): RegistrationLinkCounts {
   return {
     scanned: 0,
diff --git a/lib/invoices/pdf-template.tsx b/lib/invoices/pdf-template.tsx
index 479421b3..53c7cd80 100644
--- a/lib/invoices/pdf-template.tsx
+++ b/lib/invoices/pdf-template.tsx
@@ -1,3 +1,4 @@
+import { formatOrgNumber } from '@/lib/utils'
 import { roundOre } from '@/lib/money'
 import {
   Document,
@@ -675,15 +676,6 @@ function formatDate(date: string): string {
   return date.slice(0, 10)
 }
 
-// Format org number
-function formatOrgNumber(orgNumber: string): string {
-  const cleaned = orgNumber.replace(/\D/g, '')
-  if (cleaned.length === 10) {
-    return `${cleaned.slice(0, 6)}-${cleaned.slice(6)}`
-  }
-  return orgNumber
-}
-
 /**
  * Payment state the PDF prints for a real faktura (#1693): the BETALD stamp
  * and the "Betalt / Att betala" rows. Null for every other document or status,
diff --git a/lib/invoices/peppol-bis-billing.ts b/lib/invoices/peppol-bis-billing.ts
index 37423c77..8af03508 100644
--- a/lib/invoices/peppol-bis-billing.ts
+++ b/lib/invoices/peppol-bis-billing.ts
@@ -1,3 +1,4 @@
+import { escapeXml } from '@/lib/xml/escape'
 import {
   generateOcrReference,
   validateBankgiroNumber,
@@ -111,15 +112,6 @@ function formatDecimal(value: number): string {
   return fraction ? `${sign}${whole}.${fraction}` : `${sign}${whole}`
 }
 
-function escapeXml(value: string): string {
-  return value
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&apos;')
-}
-
 function hasText(value: string | null | undefined): value is string {
   return typeof value === 'string' && value.trim().length > 0
 }
diff --git a/lib/invoices/peppol-delivery-sync.ts b/lib/invoices/peppol-delivery-sync.ts
index 61f8fd71..98aa3240 100644
--- a/lib/invoices/peppol-delivery-sync.ts
+++ b/lib/invoices/peppol-delivery-sync.ts
@@ -9,7 +9,7 @@
 
 import type { SupabaseClient } from '@supabase/supabase-js'
 import type { Logger } from '@/lib/logger'
-import { persistPeppolEvidence, persistVerifiedPeppolEvent } from '@/lib/invoices/peppol-delivery'
+import { persistPeppolEvidence, persistVerifiedPeppolEvent, describeError } from '@/lib/invoices/peppol-delivery'
 import type { PeppolTransport } from '@/lib/invoices/peppol-transport'
 
 /** Deliveries the provider may still say something new about. */
@@ -42,10 +42,6 @@ export interface PeppolDeliveryPollResult {
   errors: Array<{ providerSubmissionId: string; reason: string }>
 }
 
-function describeError(err: unknown): string {
-  return (err instanceof Error ? err.message : String(err)).slice(0, 500)
-}
-
 /** Open deliveries for a provider, oldest status first; default horizon 45 days. */
 export async function listOpenPeppolDeliveries(args: {
   service: SupabaseClient
diff --git a/lib/invoices/peppol-delivery.ts b/lib/invoices/peppol-delivery.ts
index d54b2d2b..3e2823a3 100644
--- a/lib/invoices/peppol-delivery.ts
+++ b/lib/invoices/peppol-delivery.ts
@@ -33,6 +33,11 @@ export interface StagedPeppolDelivery extends PeppolDeliverySummary {
   filename: string
 }
 
+/** Error text for a peppol_* row's failure column: message or String(err), capped at 500 chars. */
+export function describeError(err: unknown): string {
+  return (err instanceof Error ? err.message : String(err)).slice(0, 500)
+}
+
 export function sha256Hex(value: string | Uint8Array): string {
   return createHash('sha256').update(value).digest('hex')
 }
diff --git a/lib/invoices/peppol-inbound.ts b/lib/invoices/peppol-inbound.ts
index b2393915..36ae741c 100644
--- a/lib/invoices/peppol-inbound.ts
+++ b/lib/invoices/peppol-inbound.ts
@@ -12,7 +12,7 @@ import type { SupabaseClient } from '@supabase/supabase-js'
 import type { Logger } from '@/lib/logger'
 import { ISO_DATE_RE } from '@/lib/invariants'
 import { roundOre } from '@/lib/money'
-import { sha256Hex } from '@/lib/invoices/peppol-delivery'
+import { describeError, sha256Hex } from '@/lib/invoices/peppol-delivery'
 import {
   parseUblJsonDocument,
   type PeppolInboundDocument,
@@ -88,10 +88,6 @@ function roundMoney(value: number | null): number | null {
   return value === null ? null : roundOre(value)
 }
 
-function describeError(err: unknown): string {
-  return (err instanceof Error ? err.message : String(err)).slice(0, 500)
-}
-
 /** Company for a recipient identifier, via a live registration; null when nobody is registered. */
 export async function resolvePeppolRecipientCompany(args: {
   service: SupabaseClient
diff --git a/lib/invoices/rot-rut-file.ts b/lib/invoices/rot-rut-file.ts
index 50703b56..9b57a76c 100644
--- a/lib/invoices/rot-rut-file.ts
+++ b/lib/invoices/rot-rut-file.ts
@@ -1,3 +1,4 @@
+import { escapeXml } from '@/lib/xml/escape'
 import type { Invoice, InvoiceItem } from '@/types'
 import { truncateToWholeKronor } from '@/lib/money'
 import { decryptPersonnummer } from '@/lib/salary/personnummer'
@@ -431,15 +432,6 @@ export function evaluateInvoiceForFile(
   }
 }
 
-function escapeXml(str: string): string {
-  return str
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&apos;')
-}
-
 /**
  * The 31 January deadline: a begäran must reach Skatteverket no later than
  * 31 January the year AFTER the buyer paid. Returns true when `paidDate`'s
diff --git a/lib/invoices/supplier-voucher-matching.ts b/lib/invoices/supplier-voucher-matching.ts
index abc24087..2732b4b9 100644
--- a/lib/invoices/supplier-voucher-matching.ts
+++ b/lib/invoices/supplier-voucher-matching.ts
@@ -29,6 +29,18 @@ import { clearSettledInvoiceSuggestions } from './clear-settled-invoice-suggesti
 import { documentCurrency, ledgerLineSideAmountIn } from '@/lib/bookkeeping/ledger-line-amount'
 import type { SupplierInvoice, Supplier } from '@/types'
 import { fetchEntryLines, type EntryLinesQuery } from '@/lib/bookkeeping/entry-lines'
+import {
+  AMOUNT_TOLERANCE,
+  DATE_PROXIMITY_BUMP,
+  DEFAULT_DATE_WINDOW_DAYS,
+  EXCLUDED_SOURCE_TYPES,
+  isDateWithinDays,
+  round2,
+  type FiscalPeriodRow,
+  type VoucherMatchLineRow as JournalEntryLine,
+  type VoucherRow,
+} from './voucher-matching-shared'
+import { formatAmount as formatNumber } from '@/lib/utils'
 
 const log = createLogger('supplier-voucher-matching')
 
@@ -40,15 +52,6 @@ const log = createLogger('supplier-voucher-matching')
  *  the 244x range catches that. PR #602 Swedish-compliance fix. */
 const AP_ACCOUNT_PREFIX = '244'
 
-/** ±90 days from the invoice's due_date as the default search window. */
-const DEFAULT_DATE_WINDOW_DAYS = 90
-
-/** Tolerance for floating-point comparisons on monetary amounts (0.5 öre). */
-const AMOUNT_TOLERANCE = 0.005
-
-/** Date-proximity bump applied when entry_date is within ±7 days of due_date. */
-const DATE_PROXIMITY_BUMP = 0.05
-
 export interface SupplierVoucherCandidate {
   journal_entry_id: string
   voucher_series: string | null
@@ -73,46 +76,11 @@ export interface SupplierVoucherCandidate {
   match_reason: string
 }
 
-interface JournalEntryLine {
-  id: string
-  journal_entry_id: string
-  account_number: string
-  debit_amount: number | null
-  credit_amount: number | null
-  /** Labels the DOCUMENT, NOT the unit of debit_amount/credit_amount. */
-  currency: string | null
-  /** The line's amount in `currency`: the only non-SEK figure on the row. */
-  amount_in_currency: number | string | null
-}
-
-interface VoucherRow {
-  id: string
-  voucher_series: string | null
-  voucher_number: number | null
-  entry_date: string
-  description: string
-  status: string
-  source_type: string | null
-  fiscal_period_id: string
-}
-
-/** fiscal_periods carries no `status` column: lock state is the (is_closed,
- *  locked_at) pair, which is exactly what enforce_period_lock() reads in
- *  migration 20240101000017 and what resolvePeriodStatusForDate() uses in
- *  lib/core/bookkeeping/period-service.ts. */
-interface FiscalPeriodRow {
-  id: string
-  is_closed: boolean | null
-  locked_at: string | null
-}
-
 interface CandidateContext {
   invoice: SupplierInvoice & { supplier?: Supplier }
   remainingAmount: number
 }
 
-const EXCLUDED_SOURCE_TYPES = ['opening_balance', 'storno']
-
 /**
  * Find posted journal entries whose lines debit 2440 and could plausibly be
  * the payment for this supplier invoice. Ranking mirrors the customer side:
@@ -797,17 +765,6 @@ function computeRemaining(invoice: SupplierInvoice): number {
   return Math.max(0, round2(invoice.total - paid))
 }
 
-function round2(n: number): number {
-  return Math.round(n * 100) / 100
-}
-
-function isDateWithinDays(a: string, b: string, days: number): boolean {
-  const ad = new Date(a).getTime()
-  const bd = new Date(b).getTime()
-  if (Number.isNaN(ad) || Number.isNaN(bd)) return false
-  return Math.abs(ad - bd) <= days * 24 * 3600 * 1000
-}
-
 function descriptionMentionsToken(description: string | null, token: string): boolean {
   if (!description || !token) return false
   const normalizedDesc = description.replace(/\s+/g, '').toLowerCase()
@@ -815,10 +772,3 @@ function descriptionMentionsToken(description: string | null, token: string): bo
   if (normalizedTok.length < 2) return false
   return normalizedDesc.includes(normalizedTok)
 }
-
-function formatNumber(n: number): string {
-  return new Intl.NumberFormat('sv-SE', {
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 2,
-  }).format(n)
-}
diff --git a/lib/invoices/transports/qvalia.ts b/lib/invoices/transports/qvalia.ts
index 84645bd4..71a3c33b 100644
--- a/lib/invoices/transports/qvalia.ts
+++ b/lib/invoices/transports/qvalia.ts
@@ -53,7 +53,6 @@ import {
 
 export const QVALIA_PROVIDER = 'qvalia'
 export const QVALIA_PRODUCTION_BASE_URL = 'https://api.qvalia.com'
-export const QVALIA_SANDBOX_BASE_URL = 'https://api-test.qvalia.com'
 export const QVALIA_DEFAULT_WEBHOOK_HEADER = 'x-accounted-webhook-key'
 
 export type QvaliaAuthScheme = 'apikey' | 'raw'
@@ -143,10 +142,6 @@ export class QvaliaApiError extends PeppolTransportError {
   }
 }
 
-export function isQvaliaApiError(error: unknown): error is QvaliaApiError {
-  return error instanceof QvaliaApiError
-}
-
 function authorizationHeader(config: QvaliaConfig): string {
   return config.authScheme === 'raw' ? config.apiKey : `ApiKey ${config.apiKey}`
 }
diff --git a/lib/invoices/voucher-matching-shared.ts b/lib/invoices/voucher-matching-shared.ts
new file mode 100644
index 00000000..9f83ef8f
--- /dev/null
+++ b/lib/invoices/voucher-matching-shared.ts
@@ -0,0 +1,62 @@
+/**
+ * Row shapes, tolerances and helpers shared by the customer-side
+ * (voucher-matching.ts) and supplier-side (supplier-voucher-matching.ts)
+ * "link an existing verifikat as the payment" flows. Both files read the same
+ * journal tables and rank candidates the same way; only the account side
+ * (151x credits vs 244x debits) and the invoice type differ.
+ */
+
+/** ±90 days from the invoice's due_date as the default search window. */
+export const DEFAULT_DATE_WINDOW_DAYS = 90
+
+/** Tolerance for floating-point comparisons on monetary amounts (0.5 öre). */
+export const AMOUNT_TOLERANCE = 0.005
+
+/** Date-proximity bump applied when entry_date is within ±7 days of due_date. */
+export const DATE_PROXIMITY_BUMP = 0.05
+
+export interface VoucherMatchLineRow {
+  id: string
+  journal_entry_id: string
+  account_number: string
+  debit_amount: number | null
+  credit_amount: number | null
+  /** Labels the DOCUMENT, NOT the unit of debit_amount/credit_amount. */
+  currency: string | null
+  /** The line's amount in `currency`: the only non-SEK figure on the row. */
+  amount_in_currency: number | string | null
+}
+
+export interface VoucherRow {
+  id: string
+  voucher_series: string | null
+  voucher_number: number | null
+  entry_date: string
+  description: string
+  status: string
+  source_type: string | null
+  fiscal_period_id: string
+}
+
+/** `fiscal_periods` has no `status` column: open/locked/closed is derived from
+ *  `is_closed` + `locked_at`, exactly as the `enforce_period_lock` trigger
+ *  (migration 017) and `resolvePeriodStatusForDate()` do it. */
+export interface FiscalPeriodRow {
+  id: string
+  is_closed: boolean | null
+  locked_at: string | null
+}
+
+/** SQL-side filter for posted, non-storno, non-opening entries. */
+export const EXCLUDED_SOURCE_TYPES = ['opening_balance', 'storno']
+
+export function round2(n: number): number {
+  return Math.round(n * 100) / 100
+}
+
+export function isDateWithinDays(a: string, b: string, days: number): boolean {
+  const ad = new Date(a).getTime()
+  const bd = new Date(b).getTime()
+  if (Number.isNaN(ad) || Number.isNaN(bd)) return false
+  return Math.abs(ad - bd) <= days * 24 * 3600 * 1000
+}
diff --git a/lib/invoices/voucher-matching.ts b/lib/invoices/voucher-matching.ts
index 68d29524..3fd627e8 100644
--- a/lib/invoices/voucher-matching.ts
+++ b/lib/invoices/voucher-matching.ts
@@ -32,6 +32,18 @@ import { autoReconcileTransactionForLinkedVoucher } from '@/lib/reconciliation/b
 import { clearSettledInvoiceSuggestions } from './clear-settled-invoice-suggestions'
 import { documentCurrency, ledgerLineSideAmountIn } from '@/lib/bookkeeping/ledger-line-amount'
 import type { Invoice, Customer } from '@/types'
+import {
+  AMOUNT_TOLERANCE,
+  DATE_PROXIMITY_BUMP,
+  DEFAULT_DATE_WINDOW_DAYS,
+  EXCLUDED_SOURCE_TYPES,
+  isDateWithinDays,
+  round2,
+  type FiscalPeriodRow,
+  type VoucherMatchLineRow as JournalEntryLine,
+  type VoucherRow,
+} from './voucher-matching-shared'
+import { formatAmount as formatNumber } from '@/lib/utils'
 
 const log = createLogger('voucher-matching')
 
@@ -71,15 +83,6 @@ async function resolveAccountingMethod(
     : 'accrual'
 }
 
-/** ±90 days from the invoice's due_date as the default search window. */
-const DEFAULT_DATE_WINDOW_DAYS = 90
-
-/** Tolerance for floating-point comparisons on monetary amounts (0.5 öre). */
-const AMOUNT_TOLERANCE = 0.005
-
-/** Date-proximity bump applied when entry_date is within ±7 days of due_date. */
-const DATE_PROXIMITY_BUMP = 0.05
-
 export interface VoucherCandidate {
   journal_entry_id: string
   voucher_series: string | null
@@ -104,46 +107,11 @@ export interface VoucherCandidate {
   match_reason: string
 }
 
-interface JournalEntryLine {
-  id: string
-  journal_entry_id: string
-  account_number: string
-  debit_amount: number | null
-  credit_amount: number | null
-  /** Labels the DOCUMENT, NOT the unit of debit_amount/credit_amount. */
-  currency: string | null
-  /** The line's amount in `currency`: the only non-SEK figure on the row. */
-  amount_in_currency: number | string | null
-}
-
-interface VoucherRow {
-  id: string
-  voucher_series: string | null
-  voucher_number: number | null
-  entry_date: string
-  description: string
-  status: string
-  source_type: string | null
-  fiscal_period_id: string
-}
-
-/** `fiscal_periods` has no `status` column: open/locked/closed is derived from
- *  `is_closed` + `locked_at`, exactly as the `enforce_period_lock` trigger
- *  (migration 017) and `resolvePeriodStatusForDate()` do it. */
-interface FiscalPeriodRow {
-  id: string
-  is_closed: boolean | null
-  locked_at: string | null
-}
-
 interface CandidateContext {
   invoice: Invoice & { customer?: Customer }
   remainingAmount: number
 }
 
-/** Internal: SQL-side filter for posted, non-storno, non-opening entries. */
-const EXCLUDED_SOURCE_TYPES = ['opening_balance', 'storno']
-
 /**
  * Find posted journal entries that could plausibly be the payment for this
  * invoice and return up to `limit` ranked candidates. On faktureringsmetoden
@@ -891,27 +859,9 @@ function computeRemaining(invoice: Invoice): number {
   return Math.max(0, round2(invoice.total - paid))
 }
 
-function round2(n: number): number {
-  return Math.round(n * 100) / 100
-}
-
-function isDateWithinDays(a: string, b: string, days: number): boolean {
-  const ad = new Date(a).getTime()
-  const bd = new Date(b).getTime()
-  if (Number.isNaN(ad) || Number.isNaN(bd)) return false
-  return Math.abs(ad - bd) <= days * 24 * 3600 * 1000
-}
-
 function descriptionMentionsInvoice(description: string | null, invoiceNumber: string): boolean {
   if (!description || !invoiceNumber) return false
   const normalizedDesc = description.replace(/\s+/g, '').toLowerCase()
   const normalizedNum = invoiceNumber.replace(/\s+/g, '').toLowerCase()
   return normalizedDesc.includes(normalizedNum)
 }
-
-function formatNumber(n: number): string {
-  return new Intl.NumberFormat('sv-SE', {
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 2,
-  }).format(n)
-}
diff --git a/lib/notifications/bookkeeping-digest.ts b/lib/notifications/bookkeeping-digest.ts
index fea34e04..4fd69b46 100644
--- a/lib/notifications/bookkeeping-digest.ts
+++ b/lib/notifications/bookkeeping-digest.ts
@@ -33,6 +33,8 @@ import { getSenderForBrand, getBaseUrlForBrand } from '@/lib/email/brand-sender'
 import { resolveBrandForCompany } from '@/lib/branding/resolve'
 import { createLogger } from '@/lib/logger'
 import { fetchAllRows } from '@/lib/supabase/fetch-all'
+import { chunk } from '@/lib/utils'
+import { escapeHtml } from '@/lib/email/user-text'
 
 const log = createLogger('bookkeeping-digest')
 
@@ -482,13 +484,6 @@ function toReferenceUuid(referenceKey: string): string {
   return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`
 }
 
-/** Split ids into .in()-safe chunks (see IN_CLAUSE_CHUNK). */
-function chunk<T>(items: T[], size: number): T[][] {
-  const out: T[][] = []
-  for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size))
-  return out
-}
-
 /**
  * Company names are user-controlled and reach the Subject header: strip
  * CR/LF and other control characters so the value can never smuggle extra
@@ -499,11 +494,3 @@ function sanitizeHeaderText(input: string): string {
   return input.replace(/[\u0000-\u001f\u007f]+/g, ' ').replace(/\s+/g, ' ').trim()
 }
 
-function escapeHtml(input: string): string {
-  return input
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;')
-}
diff --git a/lib/observability/index.ts b/lib/observability/index.ts
index e98641e0..71991a12 100644
--- a/lib/observability/index.ts
+++ b/lib/observability/index.ts
@@ -28,17 +28,8 @@
 export {
   captureException,
   captureMessage,
-  flushObservability,
-  getEnvironment,
-  getObservabilitySink,
-  getRelease,
-  isObservabilityConfigured,
-  noopSink,
   registerObservabilitySink,
-  resetObservabilitySink,
   type ObservabilityContext,
   type ObservabilityLevel,
   type ObservabilitySink,
 } from './sink'
-
-export { REDACTED, REDACT_KEYS, redact, redactString } from './redact'
diff --git a/lib/packs/schema.ts b/lib/packs/schema.ts
index d842e96b..1f7cdca8 100644
--- a/lib/packs/schema.ts
+++ b/lib/packs/schema.ts
@@ -136,5 +136,3 @@ export const PackSchema = z
   .strict()
 
 export type Pack = z.infer<typeof PackSchema>
-export type PackLine = z.infer<typeof PackLineSchema>
-export type PackMeta = z.infer<typeof PackMetaSchema>
diff --git a/lib/payments/pain001-supplier.ts b/lib/payments/pain001-supplier.ts
index c2ba712a..214cc47d 100644
--- a/lib/payments/pain001-supplier.ts
+++ b/lib/payments/pain001-supplier.ts
@@ -57,6 +57,7 @@
  * payments it initiates. Subject to 7-year retention.
  */
 
+import { escapeXml } from '@/lib/xml/escape'
 import { roundOre } from '@/lib/money'
 import { splitDomesticBankAccount } from '@/lib/salary/payment/bank-account'
 import type { PaymentReference, SupplierPayee } from './supplier-payee'
@@ -345,15 +346,6 @@ function sanitizeText(value: string): string {
   return transliterated.replace(DISALLOWED_TEXT, '?')
 }
 
-function escapeXml(str: string): string {
-  return str
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&apos;')
-}
-
 function formatDecimal(amount: number): string {
   return roundOre(amount).toFixed(2)
 }
diff --git a/lib/pdf/number-text.ts b/lib/pdf/number-text.ts
index 8c1ae33d..831f6bc9 100644
--- a/lib/pdf/number-text.ts
+++ b/lib/pdf/number-text.ts
@@ -38,3 +38,23 @@ export function pdfNumberText(text: string): string {
 export function pdfText(text: string): string {
   return text.replaceAll(UNICODE_MINUS, '-')
 }
+
+/**
+ * Two-decimal sv-SE amount for a react-pdf <Text>: the same Intl call as
+ * lib/utils formatAmount, run through pdfNumberText so a negative årets
+ * resultat or a credit note never prints unsigned (issue #1982).
+ */
+export function pdfAmount(amount: number): string {
+  return pdfNumberText(
+    new Intl.NumberFormat('sv-SE', {
+      minimumFractionDigits: 2,
+      maximumFractionDigits: 2,
+    }).format(amount),
+  )
+}
+
+/** ISO date string as sv-SE (YYYY-MM-DD in the server timezone); empty input stays empty. */
+export function formatDateSv(iso: string): string {
+  if (!iso) return ''
+  return new Date(iso).toLocaleDateString('sv-SE')
+}
diff --git a/lib/pending-operations/commit.ts b/lib/pending-operations/commit.ts
index 9d2fb492..00850e8b 100644
--- a/lib/pending-operations/commit.ts
+++ b/lib/pending-operations/commit.ts
@@ -82,10 +82,13 @@ import {
   createSupplierCreditNoteEntry,
   createSupplierInvoiceRegistrationEntry,
 } from '@/lib/bookkeeping/supplier-invoice-entries'
-import { linkInvoiceToVoucher } from '@/lib/invoices/voucher-matching'
+import { linkInvoiceToVoucher, type LinkInvoiceToVoucherResult } from '@/lib/invoices/voucher-matching'
 import { planInvoicePayment } from '@/lib/invoices/apply-invoice-payment'
 import { findDuplicatePaymentCandidatesForInvoice } from '@/lib/invoices/duplicate-payment-candidates'
-import { linkSupplierInvoiceToVoucher } from '@/lib/invoices/supplier-voucher-matching'
+import {
+  linkSupplierInvoiceToVoucher,
+  type LinkSupplierInvoiceToVoucherResult,
+} from '@/lib/invoices/supplier-voucher-matching'
 import { clearSettledInvoiceSuggestions } from '@/lib/invoices/clear-settled-invoice-suggestions'
 import { paidAtFromDate } from '@/lib/invoices/paid-at'
 import {
@@ -176,7 +179,7 @@ import { deleteDraftInvoice } from '@/lib/invoices/delete-draft-invoice'
 import { isEditableInvoiceDraft } from '@/lib/invoices/is-editable-draft'
 import { replaceInvoiceItems } from '@/lib/invoices/replace-invoice-items'
 import { applyRecurringScheduleUpdate } from '@/lib/invoices/apply-recurring-schedule-update'
-import { BulkBookInboxSchema } from '@/lib/api/schemas'
+import { BulkBookInboxSchema, OpeningBalancesBulkSchema } from '@/lib/api/schemas'
 import { ensureArticleNumber } from '@/lib/articles/ensure-article-number'
 import { isValidRevenueAccount } from '@/lib/articles/validate-revenue-account'
 import { z } from 'zod'
@@ -200,6 +203,7 @@ import type {
   CreditNote,
   CreateJournalEntryLineInput,
   JournalEntrySourceType,
+  FiscalPeriod,
 } from '@/types'
 
 const log = createLogger('pending-operations/commit')
@@ -300,6 +304,34 @@ async function recordSkippedInvoiceJournalEntry(
 
 // ── Executors ────────────────────────────────────────────────────
 
+/**
+ * The company's booking context for invoice-shaped executors: accounting
+ * method and entity type with the engine defaults when the settings row is
+ * missing or the read fails (errors are deliberately ignored, as before).
+ */
+async function loadBookingContext(
+  supabase: SupabaseClient,
+  companyId: string
+): Promise<{ accountingMethod: AccountingMethod; entityType: EntityType }> {
+  const { data: settings } = await supabase
+    .from('company_settings').select('accounting_method, entity_type').eq('company_id', companyId).single()
+
+  return {
+    accountingMethod: (settings?.accounting_method as AccountingMethod) || 'accrual',
+    entityType: (settings?.entity_type as EntityType) || 'enskild_firma',
+  }
+}
+
+/**
+ * Catch-body shared by the ledger-writing executors: a BookkeepingError is
+ * rethrown so the dispatcher maps it to a structured code; anything else
+ * becomes a plain failure with the executor's fallback text and status.
+ */
+function failUnlessBookkeepingError(err: unknown, fallback: string, status: number): ExecutorResult {
+  if (isBookkeepingError(err)) throw err
+  return { error: err instanceof Error ? err.message : fallback, status }
+}
+
 type ExecutorResult = {
   data?: Record<string, unknown>
   error?: string
@@ -2253,11 +2285,7 @@ async function commitMarkInvoicePaid(
     }
   }
 
-  const { data: settings } = await supabase
-    .from('company_settings').select('accounting_method, entity_type').eq('company_id', companyId).single()
-
-  const accountingMethod = settings?.accounting_method || 'accrual'
-  const entityType = (settings?.entity_type as EntityType) || 'enskild_firma'
+  const { accountingMethod, entityType } = await loadBookingContext(supabase, companyId)
   const isRealInvoice = !invoice.document_type || invoice.document_type === 'invoice'
   let journalEntryId: string | null = null
 
@@ -2911,11 +2939,7 @@ async function commitMatchTransactionInvoice(
   // (BookkeepingDatabaseError on a failed cash_accounts lookup), and a throw
   // here must reject the op with NOTHING posted. Behavior-preserving on the
   // happy path: these are pure reads.
-  const { data: settings } = await supabase
-    .from('company_settings').select('accounting_method, entity_type').eq('company_id', companyId).single()
-
-  const accountingMethod = settings?.accounting_method || 'accrual'
-  const entityType = (settings?.entity_type as EntityType) || 'enskild_firma'
+  const { accountingMethod, entityType } = await loadBookingContext(supabase, companyId)
 
   // Route on invoice state, not the company's current setting. Mirror of
   // the match-invoice route fix: see that handler for the full rationale.
@@ -3137,6 +3161,38 @@ async function commitMatchTransactionInvoice(
   return { data: { invoice_status: newStatus, paid_amount: newPaidAmount, journal_entry_id: journalEntryId } }
 }
 
+type VoucherLinkOutcome =
+  | { ok: true; result: LinkInvoiceToVoucherResult | LinkSupplierInvoiceToVoucherResult }
+  | { ok: false; code: string }
+
+/**
+ * Map a voucher-link outcome (customer or supplier invoice) to the executor
+ * result. 404/409 are auto-rejected by the dispatcher (the user can re-stage
+ * with adjusted inputs); 400 surfaces as a normal failure so the UI can
+ * explain what went wrong.
+ */
+function voucherLinkOutcomeToResult(outcome: VoucherLinkOutcome): ExecutorResult {
+  if (!outcome.ok) {
+    const entry = getErrorEntry(outcome.code)
+    return {
+      error: entry?.message_en ?? outcome.code,
+      status: entry?.httpStatus ?? 500,
+    }
+  }
+
+  return {
+    data: {
+      invoice_status: outcome.result.invoiceStatus,
+      paid_amount: outcome.result.paidAmount,
+      remaining_amount: outcome.result.remainingAmount,
+      payment_amount: outcome.result.paymentAmount,
+      payment_id: outcome.result.paymentId,
+      journal_entry_id: outcome.result.journalEntryId,
+      reconciled_transaction_id: outcome.result.reconciledTransactionId,
+    },
+  }
+}
+
 async function commitLinkInvoiceVoucher(
   supabase: SupabaseClient,
   userId: string,
@@ -3157,29 +3213,7 @@ async function commitLinkInvoiceVoucher(
     notes,
   })
 
-  if (!outcome.ok) {
-    const entry = getErrorEntry(outcome.code)
-    const httpStatus = entry?.httpStatus ?? 500
-    // 404/409 are auto-rejected by the dispatcher (the user can re-stage with
-    // adjusted inputs); 400 surfaces as a normal failure so the UI can
-    // explain what went wrong.
-    return {
-      error: entry?.message_en ?? outcome.code,
-      status: httpStatus,
-    }
-  }
-
-  return {
-    data: {
-      invoice_status: outcome.result.invoiceStatus,
-      paid_amount: outcome.result.paidAmount,
-      remaining_amount: outcome.result.remainingAmount,
-      payment_amount: outcome.result.paymentAmount,
-      payment_id: outcome.result.paymentId,
-      journal_entry_id: outcome.result.journalEntryId,
-      reconciled_transaction_id: outcome.result.reconciledTransactionId,
-    },
-  }
+  return voucherLinkOutcomeToResult(outcome)
 }
 
 async function commitLinkSupplierInvoiceVoucher(
@@ -3202,45 +3236,43 @@ async function commitLinkSupplierInvoiceVoucher(
     notes,
   })
 
-  if (!outcome.ok) {
-    const entry = getErrorEntry(outcome.code)
-    // 404/409 are auto-rejected by the dispatcher (the user can re-stage with
-    // adjusted inputs); 400 surfaces as a normal failure so the UI can explain.
-    return {
-      error: entry?.message_en ?? outcome.code,
-      status: entry?.httpStatus ?? 500,
-    }
-  }
-
-  return {
-    data: {
-      invoice_status: outcome.result.invoiceStatus,
-      paid_amount: outcome.result.paidAmount,
-      remaining_amount: outcome.result.remainingAmount,
-      payment_amount: outcome.result.paymentAmount,
-      payment_id: outcome.result.paymentId,
-      journal_entry_id: outcome.result.journalEntryId,
-      reconciled_transaction_id: outcome.result.reconciledTransactionId,
-    },
-  }
+  return voucherLinkOutcomeToResult(outcome)
 }
 
 // ── Stream 1 Phase 1 + follow-up executors ───────────────────────
 
+/**
+ * Close / lock / unlock share one shape: require fiscal_period_id, run the
+ * period-service transition, answer with the period id plus the timestamp
+ * the transition set (closed_at or locked_at), and turn any throw into a
+ * 400 with the service's message.
+ */
+async function runPeriodTransition(
+  supabase: SupabaseClient,
+  userId: string,
+  companyId: string,
+  params: Record<string, unknown>,
+  transition: (supabase: SupabaseClient, companyId: string, userId: string, id: string) => Promise<FiscalPeriod>,
+  timestampKey: 'closed_at' | 'locked_at',
+  fallback: string
+): Promise<ExecutorResult> {
+  const id = params.fiscal_period_id as string
+  if (!id) return { error: 'fiscal_period_id is required', status: 400 }
+  try {
+    const period = await transition(supabase, companyId, userId, id)
+    return { data: { period_id: period.id, [timestampKey]: period[timestampKey] } }
+  } catch (err) {
+    return { error: err instanceof Error ? err.message : fallback, status: 400 }
+  }
+}
+
 async function commitClosePeriod(
   supabase: SupabaseClient,
   userId: string,
   companyId: string,
   params: Record<string, unknown>
 ): Promise<ExecutorResult> {
-  const id = params.fiscal_period_id as string
-  if (!id) return { error: 'fiscal_period_id is required', status: 400 }
-  try {
-    const period = await closePeriod(supabase, companyId, userId, id)
-    return { data: { period_id: period.id, closed_at: period.closed_at } }
-  } catch (err) {
-    return { error: err instanceof Error ? err.message : 'Close failed', status: 400 }
-  }
+  return runPeriodTransition(supabase, userId, companyId, params, closePeriod, 'closed_at', 'Close failed')
 }
 
 async function commitLockPeriod(
@@ -3249,14 +3281,7 @@ async function commitLockPeriod(
   companyId: string,
   params: Record<string, unknown>
 ): Promise<ExecutorResult> {
-  const id = params.fiscal_period_id as string
-  if (!id) return { error: 'fiscal_period_id is required', status: 400 }
-  try {
-    const period = await lockPeriod(supabase, companyId, userId, id)
-    return { data: { period_id: period.id, locked_at: period.locked_at } }
-  } catch (err) {
-    return { error: err instanceof Error ? err.message : 'Lock failed', status: 400 }
-  }
+  return runPeriodTransition(supabase, userId, companyId, params, lockPeriod, 'locked_at', 'Lock failed')
 }
 
 async function commitUnlockPeriod(
@@ -3265,14 +3290,7 @@ async function commitUnlockPeriod(
   companyId: string,
   params: Record<string, unknown>
 ): Promise<ExecutorResult> {
-  const id = params.fiscal_period_id as string
-  if (!id) return { error: 'fiscal_period_id is required', status: 400 }
-  try {
-    const period = await unlockPeriod(supabase, companyId, userId, id)
-    return { data: { period_id: period.id, locked_at: period.locked_at } }
-  } catch (err) {
-    return { error: err instanceof Error ? err.message : 'Unlock failed', status: 400 }
-  }
+  return runPeriodTransition(supabase, userId, companyId, params, unlockPeriod, 'locked_at', 'Unlock failed')
 }
 
 async function commitUncategorizeTransaction(
@@ -3288,8 +3306,7 @@ async function commitUncategorizeTransaction(
   try {
     await reverseEntry(supabase, companyId, userId, journalEntryId)
   } catch (err) {
-    if (isBookkeepingError(err)) throw err
-    return { error: err instanceof Error ? err.message : 'Reversal failed', status: 500 }
+    return failUnlessBookkeepingError(err, 'Reversal failed', 500)
   }
 
   const { error: updateError } = await supabase
@@ -3716,8 +3733,7 @@ async function commitRunYearEnd(
       },
     }
   } catch (err) {
-    if (isBookkeepingError(err)) throw err
-    return { error: err instanceof Error ? err.message : 'Year-end failed', status: 400 }
+    return failUnlessBookkeepingError(err, 'Year-end failed', 400)
   }
 }
 
@@ -3831,11 +3847,7 @@ async function commitPostKontantmetodCutoff(
     if (err instanceof KontantmetodCutoffPartialError) {
       throw new PartialCommitError(err.message, err.postedIds, err.cause)
     }
-    if (isBookkeepingError(err)) throw err
-    return {
-      error: err instanceof Error ? err.message : 'Kontantmetodens bokslutsavgränsning misslyckades',
-      status: 400,
-    }
+    return failUnlessBookkeepingError(err, 'Kontantmetodens bokslutsavgränsning misslyckades', 400)
   }
 }
 
@@ -3853,8 +3865,7 @@ async function commitSetOpeningBalances(
     const entry = await generateOpeningBalances(supabase, companyId, userId, closedId, nextId)
     return { data: { opening_balance_entry_id: entry.id } }
   } catch (err) {
-    if (isBookkeepingError(err)) throw err
-    return { error: err instanceof Error ? err.message : 'Opening balances failed', status: 400 }
+    return failUnlessBookkeepingError(err, 'Opening balances failed', 400)
   }
 }
 
@@ -3876,8 +3887,7 @@ async function commitRunCurrencyRevaluation(
         : { entry_id: null, items_revalued: 0, message: 'No foreign-currency items to revalue' },
     }
   } catch (err) {
-    if (isBookkeepingError(err)) throw err
-    return { error: err instanceof Error ? err.message : 'Revaluation failed', status: 400 }
+    return failUnlessBookkeepingError(err, 'Revaluation failed', 400)
   }
 }
 
@@ -3910,8 +3920,7 @@ async function commitPostAnnualDepreciation(
       },
     }
   } catch (err) {
-    if (isBookkeepingError(err)) throw err
-    return { error: err instanceof Error ? err.message : 'Depreciation posting failed', status: 400 }
+    return failUnlessBookkeepingError(err, 'Depreciation posting failed', 400)
   }
 }
 
@@ -4517,8 +4526,7 @@ async function commitCreditSupplierInvoice(
       }
     } catch (err) {
       await supabase.from('supplier_invoices').delete().eq('id', creditNote.id).eq('company_id', companyId)
-      if (isBookkeepingError(err)) throw err
-      return { error: err instanceof Error ? err.message : 'Failed to book credit note', status: 500 }
+      return failUnlessBookkeepingError(err, 'Failed to book credit note', 500)
     }
   }
 
@@ -4660,14 +4668,7 @@ async function commitCreditInvoice(
     .eq('id', creditNote.id)
     .single()
 
-  const { data: settings } = await supabase
-    .from('company_settings')
-    .select('entity_type, accounting_method')
-    .eq('company_id', companyId)
-    .single()
-
-  const entityType = (settings?.entity_type as EntityType) || 'enskild_firma'
-  const accountingMethod = (settings?.accounting_method as AccountingMethod) || 'accrual'
+  const { accountingMethod, entityType } = await loadBookingContext(supabase, companyId)
 
   // Resolve the original verifikation reference so the credit-note JE can
   // point back to the corrected entry per BFL 5 kap. 5 §. We tolerate
@@ -4959,8 +4960,7 @@ async function commitImportSie(
       },
     }
   } catch (err) {
-    if (isBookkeepingError(err)) throw err
-    return { error: err instanceof Error ? err.message : 'SIE import failed', status: 500 }
+    return failUnlessBookkeepingError(err, 'SIE import failed', 500)
   }
 }
 
@@ -5216,8 +5216,7 @@ async function commitCreateVoucher(
       },
     }
   } catch (err) {
-    if (isBookkeepingError(err)) throw err
-    return { error: err instanceof Error ? err.message : 'Failed to create voucher', status: 500 }
+    return failUnlessBookkeepingError(err, 'Failed to create voucher', 500)
   }
 }
 
@@ -5309,8 +5308,7 @@ async function commitCorrectEntry(
       },
     }
   } catch (err) {
-    if (isBookkeepingError(err)) throw err
-    return { error: err instanceof Error ? err.message : 'Failed to correct entry', status: 500 }
+    return failUnlessBookkeepingError(err, 'Failed to correct entry', 500)
   }
 }
 
@@ -5394,8 +5392,7 @@ async function commitReverseEntry(
       },
     }
   } catch (err) {
-    if (isBookkeepingError(err)) throw err
-    return { error: err instanceof Error ? err.message : 'Failed to reverse entry', status: 500 }
+    return failUnlessBookkeepingError(err, 'Failed to reverse entry', 500)
   }
 }
 
@@ -5597,7 +5594,6 @@ async function commitUpdatePayslipLine(
 
   try {
     const { updatePayslipLine } = await import('@/lib/salary/payslip-lines')
-    const { getErrorEntry } = await import('@/lib/errors/structured-errors')
     const result = await updatePayslipLine(supabase, {
       companyId,
       salaryRunId,
@@ -5642,7 +5638,6 @@ async function commitSetRunSalary(
 
   try {
     const { setRunEmployeeSalary } = await import('@/lib/salary/run-employees')
-    const { getErrorEntry } = await import('@/lib/errors/structured-errors')
     const result = await setRunEmployeeSalary(supabase, {
       companyId,
       salaryRunId,
@@ -5686,7 +5681,6 @@ async function commitUpdateSalaryRun(
 
   try {
     const { updateDraftSalaryRun } = await import('@/lib/salary/update-run')
-    const { getErrorEntry } = await import('@/lib/errors/structured-errors')
     const result = await updateDraftSalaryRun(supabase, {
       companyId,
       salaryRunId,
@@ -5724,7 +5718,6 @@ async function commitCreateEmployee(
 ): Promise<ExecutorResult> {
   try {
     const { createEmployee } = await import('@/lib/salary/employee-commands')
-    const { getErrorEntry } = await import('@/lib/errors/structured-errors')
     const result = await createEmployee(supabase, {
       companyId,
       userId,
@@ -5761,7 +5754,6 @@ async function commitUpdateEmployee(
 
   try {
     const { updateEmployee } = await import('@/lib/salary/employee-commands')
-    const { getErrorEntry } = await import('@/lib/errors/structured-errors')
     const result = await updateEmployee(supabase, { companyId, employeeId, patch })
     if (!result.ok) {
       const entry = getErrorEntry(result.code)
@@ -5796,7 +5788,6 @@ async function commitRegisterAbsence(
 
   try {
     const { upsertAbsenceRange } = await import('@/lib/salary/absence')
-    const { getErrorEntry } = await import('@/lib/errors/structured-errors')
     const result = await upsertAbsenceRange(supabase, {
       companyId,
       employeeId,
@@ -5856,7 +5847,6 @@ async function commitBookSalaryRun(
 
   try {
     const { advanceAndBookSalaryRun } = await import('@/lib/salary/book-run')
-    const { getErrorEntry } = await import('@/lib/errors/structured-errors')
     const result = await advanceAndBookSalaryRun(supabase, {
       companyId,
       userId,
@@ -5912,7 +5902,6 @@ async function commitDeleteAbsence(
 
   try {
     const { deleteAbsenceRange } = await import('@/lib/salary/absence')
-    const { getErrorEntry } = await import('@/lib/errors/structured-errors')
     const result = await deleteAbsenceRange(supabase, {
       companyId,
       employeeId,
@@ -5966,13 +5955,11 @@ async function commitSetEmployeeOpeningBalances(
   }
 
   try {
-    const { OpeningBalancesBulkSchema } = await import('@/lib/api/schemas')
     const parsed = OpeningBalancesBulkSchema.safeParse({ items })
     if (!parsed.success) {
       return { error: 'Ogiltiga ingående saldon i den godkända operationen', status: 400 }
     }
     const { setOpeningBalancesBulk } = await import('@/lib/salary/opening-balances')
-    const { getErrorEntry } = await import('@/lib/errors/structured-errors')
     const result = await setOpeningBalancesBulk(supabase, {
       companyId,
       userId,
@@ -6014,7 +6001,6 @@ async function commitVacationYearClose(
 
   try {
     const { commitVacationYearClose: runClose } = await import('@/lib/salary/semesterberedning')
-    const { getErrorEntry } = await import('@/lib/errors/structured-errors')
     const result = await runClose(supabase, companyId, userId, yearStart, { bookAdjustment })
     if (!result.ok) {
       const entry = getErrorEntry(result.code)
@@ -6049,20 +6035,25 @@ async function commitVacationYearClose(
 // Error, which the dispatcher catch releases back to 'pending'; a non-recoverable
 // failure becomes a plain { error, status } that rejects the op.
 
-function getSkatteverketServices(): SkatteverketCommitServices {
-  const services = extensionRegistry.get('skatteverket')?.services as
-    | Partial<SkatteverketCommitServices>
-    | undefined
-  if (!services?.commitSubmitVatDeclaration || !services?.commitSubmitAgi) {
-    // Extension absent or not wired. Recoverable: leave the op pending so a
-    // re-enable + re-approve works without re-staging.
+/**
+ * Resolve the Skatteverket extension's services and require the given keys
+ * to be wired. Extension absent or not wired is recoverable: the op is left
+ * pending so a re-enable + re-approve works without re-staging.
+ */
+function requireSkatteverketServices<T extends object>(keys: ReadonlyArray<keyof T>): T {
+  const services = extensionRegistry.get('skatteverket')?.services as Partial<T> | undefined
+  if (!services || keys.some((key) => !services[key])) {
     throw new SkatteverketRecoverableError(
       'Skatteverket-integrationen är inte tillgänglig.',
       'EXTENSION_DISABLED',
       503,
     )
   }
-  return services as SkatteverketCommitServices
+  return services as T
+}
+
+function getSkatteverketServices(): SkatteverketCommitServices {
+  return requireSkatteverketServices<SkatteverketCommitServices>(['commitSubmitVatDeclaration', 'commitSubmitAgi'])
 }
 
 function handleSkvSubmitResult(result: SkvSubmitResult): ExecutorResult {
@@ -6115,19 +6106,7 @@ async function commitSubmitAgi(
 // work (or fail recoverable) independently of the SKV filing services.
 
 function getSkattekontoBookingService(): SkattekontoBookingCommitService {
-  const services = extensionRegistry.get('skatteverket')?.services as
-    | Partial<SkattekontoBookingCommitService>
-    | undefined
-  if (!services?.commitBookSkattekontoRows) {
-    // Extension absent or not wired. Recoverable: leave the op pending so a
-    // re-enable + re-approve works without re-staging.
-    throw new SkatteverketRecoverableError(
-      'Skatteverket-integrationen är inte tillgänglig.',
-      'EXTENSION_DISABLED',
-      503,
-    )
-  }
-  return services as SkattekontoBookingCommitService
+  return requireSkatteverketServices<SkattekontoBookingCommitService>(['commitBookSkattekontoRows'])
 }
 
 async function commitBookSkattekontoRows(
diff --git a/lib/pending-operations/errors.ts b/lib/pending-operations/errors.ts
index e3b0571a..c4ac4bff 100644
--- a/lib/pending-operations/errors.ts
+++ b/lib/pending-operations/errors.ts
@@ -29,7 +29,3 @@ export class PartialCommitError extends Error {
     this.cause = cause
   }
 }
-
-export function isPartialCommitError(err: unknown): err is PartialCommitError {
-  return err instanceof PartialCommitError
-}
diff --git a/lib/pending-operations/schemas/account.ts b/lib/pending-operations/schemas/account.ts
index c5b819b8..c4758ac4 100644
--- a/lib/pending-operations/schemas/account.ts
+++ b/lib/pending-operations/schemas/account.ts
@@ -137,6 +137,3 @@ export const UpdateAccountParamsSchema = z.object({
     })
   }
 })
-
-export type CreateAccountParams = z.infer<typeof CreateAccountParamsSchema>
-export type UpdateAccountParams = z.infer<typeof UpdateAccountParamsSchema>
diff --git a/lib/pending-operations/schemas/article.ts b/lib/pending-operations/schemas/article.ts
index 9091f22a..012ae5e3 100644
--- a/lib/pending-operations/schemas/article.ts
+++ b/lib/pending-operations/schemas/article.ts
@@ -89,5 +89,3 @@ export const UpdateArticleParamsSchema = z.object({
   active: z.boolean().optional(),
 })
 
-export type CreateArticleParams = z.infer<typeof CreateArticleParamsSchema>
-export type UpdateArticleParams = z.infer<typeof UpdateArticleParamsSchema>
diff --git a/lib/pending-operations/schemas/company-settings.ts b/lib/pending-operations/schemas/company-settings.ts
index 7ce8eaa2..0299c659 100644
--- a/lib/pending-operations/schemas/company-settings.ts
+++ b/lib/pending-operations/schemas/company-settings.ts
@@ -94,6 +94,3 @@ export const UpdateCompanySettingsParamsSchema = z
   })
   .strict()
 
-export type UpdateCompanySettingsParams = z.infer<
-  typeof UpdateCompanySettingsParamsSchema
->
diff --git a/lib/pending-operations/schemas/create-supplier.ts b/lib/pending-operations/schemas/create-supplier.ts
index f0ef182c..9d54b88d 100644
--- a/lib/pending-operations/schemas/create-supplier.ts
+++ b/lib/pending-operations/schemas/create-supplier.ts
@@ -168,5 +168,3 @@ export const CreateSupplierParamsSchema = z
 // An EU supplier below its national registration threshold has no VAT number at
 // all, so requiring one refused legitimate suppliers on the staged/agent path
 // while the dashboard form created the very same company without complaint.
-
-export type CreateSupplierParams = z.infer<typeof CreateSupplierParamsSchema>
diff --git a/lib/pending-operations/schemas/customer.ts b/lib/pending-operations/schemas/customer.ts
index 90785b5a..06674b75 100644
--- a/lib/pending-operations/schemas/customer.ts
+++ b/lib/pending-operations/schemas/customer.ts
@@ -49,4 +49,3 @@ export const UpdateCustomerParamsSchema = z
   })
   .strict()
 
-export type UpdateCustomerParams = z.infer<typeof UpdateCustomerParamsSchema>
diff --git a/lib/pending-operations/schemas/dimension-value.ts b/lib/pending-operations/schemas/dimension-value.ts
index b4d792e1..dbdbc188 100644
--- a/lib/pending-operations/schemas/dimension-value.ts
+++ b/lib/pending-operations/schemas/dimension-value.ts
@@ -69,5 +69,3 @@ export const CreateDimensionValueParamsSchema = z
       })
     }
   })
-
-export type CreateDimensionValueParams = z.infer<typeof CreateDimensionValueParamsSchema>
diff --git a/lib/pending-operations/schemas/ignore-transaction.ts b/lib/pending-operations/schemas/ignore-transaction.ts
index 0865f2df..33ee3f58 100644
--- a/lib/pending-operations/schemas/ignore-transaction.ts
+++ b/lib/pending-operations/schemas/ignore-transaction.ts
@@ -15,5 +15,3 @@ export const IgnoreTransactionParamsSchema = z.object({
   // true = ignore (default), false = restore a previously ignored row.
   ignored: z.boolean().default(true),
 })
-
-export type IgnoreTransactionParams = z.infer<typeof IgnoreTransactionParamsSchema>
diff --git a/lib/pending-operations/schemas/recurring-schedule.ts b/lib/pending-operations/schemas/recurring-schedule.ts
index f70f4e91..5307337e 100644
--- a/lib/pending-operations/schemas/recurring-schedule.ts
+++ b/lib/pending-operations/schemas/recurring-schedule.ts
@@ -34,6 +34,3 @@ export const UpdateRecurringScheduleParamsSchema = z
     changes: RecurringScheduleChangesSchema,
   })
   .strict()
-
-export type CreateRecurringScheduleParams = z.infer<typeof CreateRecurringScheduleParamsSchema>
-export type UpdateRecurringScheduleParams = z.infer<typeof UpdateRecurringScheduleParamsSchema>
diff --git a/lib/pending-operations/schemas/retag-line-dimensions.ts b/lib/pending-operations/schemas/retag-line-dimensions.ts
index 691d307c..ad29f8d3 100644
--- a/lib/pending-operations/schemas/retag-line-dimensions.ts
+++ b/lib/pending-operations/schemas/retag-line-dimensions.ts
@@ -56,5 +56,3 @@ export const RetagLineDimensionsParamsSchema = z
     filter_summary: z.string().max(500).optional(),
   })
   .strict()
-
-export type RetagLineDimensionsParams = z.infer<typeof RetagLineDimensionsParamsSchema>
diff --git a/lib/pending-operations/schemas/update-invoice.ts b/lib/pending-operations/schemas/update-invoice.ts
index 4bac1210..ef1e6a55 100644
--- a/lib/pending-operations/schemas/update-invoice.ts
+++ b/lib/pending-operations/schemas/update-invoice.ts
@@ -46,4 +46,3 @@ export const UpdateInvoiceParamsSchema = z
   })
   .strict()
 
-export type UpdateInvoiceParams = z.infer<typeof UpdateInvoiceParamsSchema>
diff --git a/lib/pending-operations/schemas/voucher-note.ts b/lib/pending-operations/schemas/voucher-note.ts
index 92ef8ac3..6d3f1855 100644
--- a/lib/pending-operations/schemas/voucher-note.ts
+++ b/lib/pending-operations/schemas/voucher-note.ts
@@ -17,5 +17,3 @@ export const SetVoucherNoteParamsSchema = z.object({
     z.string().max(2000).nullable(),
   ),
 })
-
-export type SetVoucherNoteParams = z.infer<typeof SetVoucherNoteParamsSchema>
diff --git a/lib/providers/bjornlunden/oauth.ts b/lib/providers/bjornlunden/oauth.ts
index 4974f936..2cf6dbdc 100644
--- a/lib/providers/bjornlunden/oauth.ts
+++ b/lib/providers/bjornlunden/oauth.ts
@@ -49,4 +49,3 @@ export async function refreshBjornLundenToken(): Promise<TokenResponse> {
   return fetchBjornLundenToken(clientId, clientSecret);
 }
 
-export const storeBjornLundenToken = refreshBjornLundenToken;
diff --git a/lib/providers/bokio/oauth.ts b/lib/providers/bokio/oauth.ts
deleted file mode 100644
index dac68554..00000000
--- a/lib/providers/bokio/oauth.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { TokenResponse } from '../types';
-
-export function storeBokioToken(apiToken: string): TokenResponse {
-  return {
-    access_token: apiToken,
-    refresh_token: '',
-    token_type: 'Bearer',
-    expires_in: 0,
-  };
-}
diff --git a/lib/providers/dto.ts b/lib/providers/dto.ts
index 576139cc..ffb140b7 100644
--- a/lib/providers/dto.ts
+++ b/lib/providers/dto.ts
@@ -368,107 +368,3 @@ export interface PaymentDto {
   updatedAt?: string;
   _raw?: Record<string, unknown>;
 }
-
-// ============================================
-// Accounting Period
-// ============================================
-
-export type PeriodStatus = 'open' | 'closed' | 'locked';
-
-export interface AccountingPeriodDto {
-  id: string;
-  fiscalYear: number;
-  fromDate: string;
-  toDate: string;
-  status?: PeriodStatus;
-  description?: string;
-  _raw?: Record<string, unknown>;
-}
-
-// ============================================
-// Financial Dimension
-// ============================================
-
-export interface FinancialDimensionValueDto {
-  id: string;
-  code: string;
-  name: string;
-  active: boolean;
-}
-
-export interface FinancialDimensionDto {
-  id: string;
-  name: string;
-  description?: string;
-  values: FinancialDimensionValueDto[];
-  _raw?: Record<string, unknown>;
-}
-
-// ============================================
-// Reports
-// ============================================
-
-export interface FinancialReportCategoryDto {
-  name: string;
-  amount: AmountType;
-  children?: FinancialReportCategoryDto[];
-  accounts?: { accountNumber: string; name?: string; amount: AmountType }[];
-}
-
-export interface BalanceSheetDto {
-  fiscalYear: number;
-  periodEnd: string;
-  baseCurrency: string;
-  assets: FinancialReportCategoryDto;
-  liabilities: FinancialReportCategoryDto;
-  equity: FinancialReportCategoryDto;
-  _raw?: Record<string, unknown>;
-}
-
-export interface IncomeStatementDto {
-  fiscalYear: number;
-  periodStart: string;
-  periodEnd: string;
-  baseCurrency: string;
-  revenue: FinancialReportCategoryDto;
-  expenses: FinancialReportCategoryDto;
-  netIncome: AmountType;
-  _raw?: Record<string, unknown>;
-}
-
-export interface TrialBalanceEntryDto {
-  accountNumber: string;
-  accountName?: string;
-  openingDebit: number;
-  openingCredit: number;
-  periodDebit: number;
-  periodCredit: number;
-  closingDebit: number;
-  closingCredit: number;
-}
-
-export interface TrialBalanceDto {
-  fiscalYear: number;
-  periodStart: string;
-  periodEnd: string;
-  baseCurrency: string;
-  entries: TrialBalanceEntryDto[];
-  _raw?: Record<string, unknown>;
-}
-
-// ============================================
-// Attachment
-// ============================================
-
-export type AttachmentType = 'pdf' | 'image' | 'xml' | 'other';
-
-export interface AttachmentDto {
-  id: string;
-  fileName: string;
-  mimeType?: string;
-  type?: AttachmentType;
-  size?: number;
-  downloadUrl?: string;
-  createdAt?: string;
-  _raw?: Record<string, unknown>;
-}
diff --git a/lib/providers/fortnox/mapper.ts b/lib/providers/fortnox/mapper.ts
index 6f3be5e5..8fdf6cc1 100644
--- a/lib/providers/fortnox/mapper.ts
+++ b/lib/providers/fortnox/mapper.ts
@@ -6,7 +6,6 @@ import type {
   JournalDto, AccountingEntryDto,
   AccountingAccountDto, AccountType,
   CompanyInformationDto,
-  PaymentDto,
   AmountType, PartyDto,
 } from '../dto';
 import { readNumber, resolveVatTriple, lineVatFromPercent } from '../amounts';
@@ -379,15 +378,3 @@ export function mapFortnoxToCompanyInformation(raw: Record<string, unknown>): Co
     _raw: raw,
   };
 }
-
-export function mapFortnoxToPayment(raw: Record<string, unknown>, invoiceId?: string): PaymentDto {
-  return {
-    id: String(raw['Number'] ?? ''),
-    paymentNumber: String(raw['Number'] ?? ''),
-    invoiceId: invoiceId ?? String(raw['InvoiceNumber'] ?? ''),
-    paymentDate: (raw['PaymentDate'] as string) ?? '',
-    amount: amount(raw['Amount'] as number ?? 0, (raw['Currency'] as string) ?? 'SEK'),
-    reference: raw['Reference'] as string | undefined,
-    _raw: raw,
-  };
-}
diff --git a/lib/providers/fortnox/oauth.ts b/lib/providers/fortnox/oauth.ts
index 19e1aea1..0a9a1991 100644
--- a/lib/providers/fortnox/oauth.ts
+++ b/lib/providers/fortnox/oauth.ts
@@ -3,7 +3,6 @@ import type { OAuthConfig, TokenResponse } from '../types';
 import {
   fetchWithTimeout,
   OAUTH_TIMEOUT_MS,
-  OAUTH_REVOKE_TIMEOUT_MS,
 } from '@/lib/http/fetch-with-timeout';
 
 const BASE_SCOPES = [
@@ -187,26 +186,3 @@ export async function refreshFortnoxToken(
 
   return response.json() as Promise<TokenResponse>;
 }
-
-export async function revokeFortnoxToken(
-  config: OAuthConfig,
-  refreshToken: string,
-): Promise<boolean> {
-  const response = await fetchWithTimeout(
-    FORTNOX_TOKEN_URL,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Authorization: basicAuthHeader(config),
-      },
-      body: new URLSearchParams({
-        token: refreshToken,
-        token_type_hint: 'refresh_token',
-      }).toString(),
-    },
-    { timeoutMs: OAUTH_REVOKE_TIMEOUT_MS, description: 'Fortnox token revoke' },
-  );
-
-  return response.ok;
-}
diff --git a/lib/providers/oauth-config.ts b/lib/providers/oauth-config.ts
index fd175ba6..a7e035ed 100644
--- a/lib/providers/oauth-config.ts
+++ b/lib/providers/oauth-config.ts
@@ -49,7 +49,3 @@ export function getOAuthConfig(provider: string): OAuthConfig {
   }
   throw new Error(`Unknown provider: ${provider}`);
 }
-
-export function validateProvider(provider: string): boolean {
-  return provider === 'fortnox' || provider === 'visma' || provider === 'briox' || provider === 'bokio' || provider === 'bjornlunden' || provider === 'wint';
-}
diff --git a/lib/providers/visma/config.ts b/lib/providers/visma/config.ts
index 6aa32fb1..8a7ac706 100644
--- a/lib/providers/visma/config.ts
+++ b/lib/providers/visma/config.ts
@@ -13,7 +13,6 @@ import {
 export const VISMA_BASE_URL = 'https://eaccountingapi.vismaonline.com/v2';
 export const VISMA_AUTH_URL = 'https://identity.vismaonline.com/connect/authorize';
 export const VISMA_TOKEN_URL = 'https://identity.vismaonline.com/connect/token';
-export const VISMA_REVOKE_URL = 'https://identity.vismaonline.com/connect/revocation';
 export const VISMA_RATE_LIMIT: RateLimitConfig = { maxRequests: 10, windowMs: 1000 };
 
 export const VISMA_RESOURCE_CONFIGS: Partial<Record<ResourceType, VismaResourceConfig>> = {
diff --git a/lib/providers/visma/oauth.ts b/lib/providers/visma/oauth.ts
index 90110ce0..396adaeb 100644
--- a/lib/providers/visma/oauth.ts
+++ b/lib/providers/visma/oauth.ts
@@ -1,9 +1,8 @@
-import { VISMA_AUTH_URL, VISMA_TOKEN_URL, VISMA_REVOKE_URL } from './config';
+import { VISMA_AUTH_URL, VISMA_TOKEN_URL } from './config';
 import type { OAuthConfig, TokenResponse } from '../types';
 import {
   fetchWithTimeout,
   OAUTH_TIMEOUT_MS,
-  OAUTH_REVOKE_TIMEOUT_MS,
 } from '@/lib/http/fetch-with-timeout';
 
 const DEFAULT_SCOPES = [
@@ -105,25 +104,3 @@ export async function refreshVismaToken(
   return response.json() as Promise<TokenResponse>;
 }
 
-export async function revokeVismaToken(
-  config: OAuthConfig,
-  refreshToken: string,
-): Promise<boolean> {
-  const response = await fetchWithTimeout(
-    VISMA_REVOKE_URL,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Authorization: basicAuthHeader(config),
-      },
-      body: new URLSearchParams({
-        token: refreshToken,
-        token_type_hint: 'refresh_token',
-      }).toString(),
-    },
-    { timeoutMs: OAUTH_REVOKE_TIMEOUT_MS, description: 'Visma token revoke' },
-  );
-
-  return response.ok;
-}
diff --git a/lib/providers/wint/client.ts b/lib/providers/wint/client.ts
index af72494a..21ec08af 100644
--- a/lib/providers/wint/client.ts
+++ b/lib/providers/wint/client.ts
@@ -47,12 +47,6 @@ export interface WintListResponse<T> {
   TotalItemsWithOutFilter?: number;
 }
 
-export interface WintFinancialYear {
-  Id: number;
-  Start: string;
-  End: string;
-}
-
 const DEFAULT_PAGE_SIZE = 200;
 
 export class WintClient {
diff --git a/lib/providers/with-provider-call.ts b/lib/providers/with-provider-call.ts
index e9f25f89..0265fa31 100644
--- a/lib/providers/with-provider-call.ts
+++ b/lib/providers/with-provider-call.ts
@@ -47,10 +47,6 @@ export class ProviderCallError extends Error {
   }
 }
 
-export function isProviderCallError(err: unknown): err is ProviderCallError {
-  return err instanceof ProviderCallError
-}
-
 interface ProviderCallOptions {
   /** Provider id ('fortnox', 'bokio', 'visma', etc.). */
   provider: string
diff --git a/lib/reconciliation/bank-reconciliation.ts b/lib/reconciliation/bank-reconciliation.ts
index 474ba371..b609a393 100644
--- a/lib/reconciliation/bank-reconciliation.ts
+++ b/lib/reconciliation/bank-reconciliation.ts
@@ -1887,7 +1887,8 @@ export async function autoReconcileTransactionForLinkedVoucher(
  * Fetch unlinked GL lines for a settlement account. `accountNumber` defaults to
  * '1930' for back-compat; multi-account customers (Plusgiro 1920, kreditkort
  * 1940, EUR-konto 1932, etc.) pass the BAS code of the account they're
- * reconciling. The CashAccountSelector populates this from cash_accounts.
+ * reconciling. The reconciliation UI populates this from cash_accounts.
+
  */
 export async function fetchUnlinkedGLLines(
   supabase: SupabaseClient,
diff --git a/lib/reconciliation/schemas.ts b/lib/reconciliation/schemas.ts
index 9b8828ed..c6f015c6 100644
--- a/lib/reconciliation/schemas.ts
+++ b/lib/reconciliation/schemas.ts
@@ -21,10 +21,35 @@ export const ACCOUNT_KEY_REGEX =
   /^(bank:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}|skattekonto|manual:\d{4})$/
 
 export const AccountKeySchema = z.string().regex(ACCOUNT_KEY_REGEX, 'Ogiltig account_key')
-export type AccountKey = z.infer<typeof AccountKeySchema>
 
 export const ReconciliationKindSchema = z.enum(['bank', 'skattekonto', 'manual'])
-export type ReconciliationKind = z.infer<typeof ReconciliationKindSchema>
+
+/** One link request: outside rows against verifikat (N:1), or a bank 1:N with allocations. */
+export const ReconciliationPairSchema = z.object({
+  external_ids: z.array(z.string().uuid()).min(1).max(50),
+  journal_entry_ids: z.array(z.string().uuid()).min(1).max(50),
+  // Bank 1:N only: the signed slice per verifikat (transaction sign
+  // convention). Omitted: each slice defaults to the voucher's bank line.
+  allocations: z
+    .array(z.object({ journal_entry_id: z.string().uuid(), amount: z.number() }))
+    .min(2)
+    .max(50)
+    .optional(),
+})
+
+/** Body fields shared by the dashboard and v1 POST .../links routes (spread into z.object). */
+export const reconciliationLinksBodyFields = {
+  pairs: z.array(ReconciliationPairSchema).max(200).optional(),
+  use_proposals: z.boolean().optional(),
+  confidence_threshold: z.number().min(0).max(1).optional(),
+}
+
+/** The links body must carry explicit pairs or opt into the persisted proposals. */
+export const reconciliationLinksBodyRefinement = [
+  (b: { pairs?: unknown[]; use_proposals?: boolean }) =>
+    (b.pairs && b.pairs.length > 0) || b.use_proposals === true,
+  { message: 'Ange pairs eller use_proposals: true.' },
+] as const
 
 export type ParsedAccountKey =
   | { kind: 'bank'; cashAccountId: string }
diff --git a/lib/reconciliation/service.ts b/lib/reconciliation/service.ts
index c751805e..824fccb1 100644
--- a/lib/reconciliation/service.ts
+++ b/lib/reconciliation/service.ts
@@ -1,6 +1,7 @@
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { createLogger } from '@/lib/logger'
 import { roundOre } from '@/lib/money'
+import { daysBetweenIso, toIsoDate } from '@/lib/dates/iso'
 import { getReconciliationStatus as getBankReconciliationStatus } from './bank-reconciliation'
 import { getSkattekontoReconciliationStatus } from './skattekonto-reconciliation'
 import {
@@ -59,15 +60,6 @@ interface CashAccountRow {
   updated_at: string | null
 }
 
-function isoDate(d: Date): string {
-  return d.toISOString().slice(0, 10)
-}
-
-function daysBetween(a: string, b: string): number {
-  const ms = new Date(a + 'T00:00:00Z').getTime() - new Date(b + 'T00:00:00Z').getTime()
-  return Math.round(ms / 86_400_000)
-}
-
 function defaultWindow(today: string): { from: string; to: string } {
   return { from: `${today.slice(0, 4)}-01-01`, to: today }
 }
@@ -158,7 +150,7 @@ async function bankStatus(
     Boolean(account.is_primary),
   )
   const syncedAt = await latestBankSyncAt(supabase, companyId, account.id)
-  const stale = !syncedAt || daysBetween(today, syncedAt.slice(0, 10)) > STALE_AFTER_DAYS
+  const stale = !syncedAt || daysBetweenIso(syncedAt.slice(0, 10), today) > STALE_AFTER_DAYS
   // The bank-reported (booked) balance, mirrored from the last PSD2 balance
   // refresh. Point-in-time and dated by balance_updated_at, NOT by any
   // through-date a caller asks for. It therefore lives ONLY in the bank block
@@ -240,7 +232,7 @@ export async function listReconciliationAccounts(
   companyId: string,
   options: ListAccountsOptions = {},
 ): Promise<ReconciliationAccount[]> {
-  const today = options.today ?? isoDate(new Date())
+  const today = options.today ?? toIsoDate(new Date())
   const withStatus = options.withStatus ?? true
   const window = {
     from: options.windowFrom ?? defaultWindow(today).from,
@@ -320,7 +312,7 @@ export async function listReconciliationAccounts(
       } catch {
         syncedAt = null
       }
-      const stale = !syncedAt || daysBetween(today, syncedAt.slice(0, 10)) > STALE_AFTER_DAYS
+      const stale = !syncedAt || daysBetweenIso(syncedAt.slice(0, 10), today) > STALE_AFTER_DAYS
       return {
         account_key: bankAccountKey(a.id),
         kind: 'bank',
@@ -406,7 +398,7 @@ export async function getAccountStatus(
 ): Promise<ReconciliationStatus | null> {
   const parsed = parseAccountKey(accountKey)
   if (!parsed) return null
-  const today = options.today ?? isoDate(new Date())
+  const today = options.today ?? toIsoDate(new Date())
 
   let status: ReconciliationStatus | null = null
   if (parsed.kind === 'skattekonto') {
diff --git a/lib/reconciliation/signoff.ts b/lib/reconciliation/signoff.ts
index a383e506..8392c9f0 100644
--- a/lib/reconciliation/signoff.ts
+++ b/lib/reconciliation/signoff.ts
@@ -3,6 +3,7 @@ import { ISO_DATE_RE } from '@/lib/invariants'
 import { eventBus } from '@/lib/events/bus'
 import { createLogger } from '@/lib/logger'
 import { roundOre } from '@/lib/money'
+import { todayIsoUtc } from '@/lib/dates/iso'
 import { parseAccountKey, type ReconciliationSignoff, type ReconciliationStatus } from './schemas'
 import { getAccountStatus } from './service'
 import { getLatestSignoff, getSignoffById, insertSignoff, stampReopen } from './signoff-store'
@@ -81,10 +82,6 @@ export type SignoffResult =
   | { dry_run: true; would_sign: SignoffPreview }
   | { dry_run: false; signoff: ReconciliationSignoff }
 
-function isoToday(): string {
-  return new Date().toISOString().slice(0, 10)
-}
-
 /**
  * Sign one account off through a date. Returns null when the account key does
  * not resolve for this company (callers map that to 404); throws
@@ -100,7 +97,7 @@ export async function signOffAccount(
 ): Promise<SignoffResult | null> {
   const parsed = parseAccountKey(accountKey)
   if (!parsed) return null
-  const today = options.today ?? isoToday()
+  const today = options.today ?? todayIsoUtc()
   const throughDate = input.through_date
   if (!ISO_DATE_RE.test(throughDate) || Number.isNaN(Date.parse(throughDate))) {
     throw new ReconciliationSignoffError('Ogiltigt datum. Ange ÅÅÅÅ-MM-DD.', 'INVALID_DATE')
diff --git a/lib/reconciliation/skattekonto-reconciliation.ts b/lib/reconciliation/skattekonto-reconciliation.ts
index f9995a7d..57c17327 100644
--- a/lib/reconciliation/skattekonto-reconciliation.ts
+++ b/lib/reconciliation/skattekonto-reconciliation.ts
@@ -1,9 +1,11 @@
+import { chunk } from '@/lib/utils'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { fetchAllRows } from '@/lib/supabase/fetch-all'
 import { fetchEntryLines, type EntryLinesQuery } from '@/lib/bookkeeping/entry-lines'
 import { SKATTEKONTO_ACCOUNT } from '@/lib/skatteverket/manual-verifikat-prefill'
 import { createLogger } from '@/lib/logger'
 import { roundOre } from '@/lib/money'
+import { addDaysIso, daysBetweenIso, toIsoDate } from '@/lib/dates/iso'
 import { LEDGER_BALANCE_STATUSES, sumAccountBalance } from './gl-balance'
 import {
   AWAITING_EXTERNAL_DAYS,
@@ -95,20 +97,6 @@ export interface SkattekontoReconciliationResult extends ReconciliationStatus {
   ledger_read_failed: boolean
 }
 
-function round2(n: number): number {
-  return roundOre(n)
-}
-
-function addDays(iso: string, days: number): string {
-  const d = new Date(iso + 'T00:00:00Z')
-  d.setUTCDate(d.getUTCDate() + days)
-  return d.toISOString().slice(0, 10)
-}
-
-function isoDate(d: Date): string {
-  return d.toISOString().slice(0, 10)
-}
-
 function parseFetchedAt(value: unknown): Date | null {
   if (typeof value === 'number' && Number.isFinite(value)) return new Date(value)
   if (typeof value === 'string') {
@@ -119,12 +107,6 @@ function parseFetchedAt(value: unknown): Date | null {
   return null
 }
 
-function chunk<T>(xs: T[], size: number): T[][] {
-  const out: T[][] = []
-  for (let i = 0; i < xs.length; i += size) out.push(xs.slice(i, i + size))
-  return out
-}
-
 async function readSnapshot(
   supabase: SupabaseClient,
   companyId: string,
@@ -141,7 +123,7 @@ async function readSnapshot(
   const fetchedAt = parseFetchedAt(value.fetchedAt)
   const saldo = Number(value.saldo?.saldoSkatteverket)
   if (!fetchedAt || !Number.isFinite(saldo)) return null
-  return { saldo: round2(saldo), fetchedAt }
+  return { saldo: roundOre(saldo), fetchedAt }
 }
 
 async function fetchRows(supabase: SupabaseClient, companyId: string): Promise<SkattekontoRow[]> {
@@ -209,8 +191,8 @@ async function fetchLedgerEntries(
     if (!head) continue
     const amount = Number(line.debit_amount || 0) - Number(line.credit_amount || 0)
     const existing = byEntry.get(head.id)
-    if (existing) existing.amount = round2(existing.amount + amount)
-    else byEntry.set(head.id, { head, amount: round2(amount) })
+    if (existing) existing.amount = roundOre(existing.amount + amount)
+    else byEntry.set(head.id, { head, amount: roundOre(amount) })
   }
   return byEntry
 }
@@ -226,16 +208,11 @@ function proposalFrom(head: EntryHead, row: SkattekontoRow): ReconciliationPropo
     confidence: head.status === 'posted' ? 0.95 : 0.8,
     reasons: [
       'exakt belopp på 1630',
-      `${Math.abs(daysBetween(head.entry_date, row.transaktionsdatum))} dagars avstånd`,
+      `${Math.abs(daysBetweenIso(row.transaktionsdatum, head.entry_date))} dagars avstånd`,
     ],
   }
 }
 
-function daysBetween(a: string, b: string): number {
-  const ms = new Date(a + 'T00:00:00Z').getTime() - new Date(b + 'T00:00:00Z').getTime()
-  return Math.round(ms / 86_400_000)
-}
-
 function inWindow(date: string, from: string | null | undefined, to: string | null | undefined): boolean {
   if (from && date < from) return false
   if (to && date > to) return false
@@ -275,16 +252,16 @@ export async function getSkattekontoReconciliationStatus(
   companyId: string,
   options: SkattekontoReconciliationOptions = {},
 ): Promise<SkattekontoReconciliationResult | null> {
-  const today = options.today ?? isoDate(new Date())
+  const today = options.today ?? toIsoDate(new Date())
   const [snapshot, rows] = await Promise.all([
     readSnapshot(supabase, companyId),
     fetchRows(supabase, companyId),
   ])
   if (!snapshot && rows.length === 0) return null
 
-  const cutoffDate = snapshot ? isoDate(snapshot.fetchedAt) : today
+  const cutoffDate = snapshot ? toIsoDate(snapshot.fetchedAt) : today
   const asOf = snapshot ? snapshot.fetchedAt.toISOString() : new Date(today + 'T00:00:00Z').toISOString()
-  const stale = !snapshot || daysBetween(today, cutoffDate) > STALE_AFTER_DAYS
+  const stale = !snapshot || daysBetweenIso(cutoffDate, today) > STALE_AFTER_DAYS
 
   const booked = rows.filter((r) => r.status === 'booked' && r.transaktionsdatum <= cutoffDate)
   const upcoming = rows.filter((r) => r.status === 'upcoming' && !r.is_ignored)
@@ -340,7 +317,7 @@ export async function getSkattekontoReconciliationStatus(
   const olderThanWindow = (date: string) => !!options.windowFrom && date < options.windowFrom
 
   for (const row of booked) {
-    const amount = round2(Number(row.belopp_skatteverket))
+    const amount = roundOre(Number(row.belopp_skatteverket))
     const base = {
       item_id: row.id,
       item_type: 'skattekonto_transaction' as const,
@@ -352,7 +329,7 @@ export async function getSkattekontoReconciliationStatus(
     }
 
     if (row.is_ignored) {
-      ignoredTotal = round2(ignoredTotal + amount)
+      ignoredTotal = roundOre(ignoredTotal + amount)
       counts.ignored++
       if (visible(row.transaktionsdatum)) {
         pushCapped('ignored', { ...base, bucket: 'ignored', actions: ['unignore'] })
@@ -389,7 +366,7 @@ export async function getSkattekontoReconciliationStatus(
     }
 
     // Unlinked (or dead link): counts toward the bridge either way.
-    unlinkedExternalTotal = round2(unlinkedExternalTotal + amount)
+    unlinkedExternalTotal = roundOre(unlinkedExternalTotal + amount)
     if (olderThanWindow(row.transaktionsdatum)) olderUnmatched++
 
     const suggestedHead = row.suggested_journal_entry_id
@@ -429,14 +406,14 @@ export async function getSkattekontoReconciliationStatus(
 
   // Ledger entries in the comparable history that no live link settles.
   let unlinkedLedgerTotal = 0
-  const awaitingFrom = addDays(cutoffDate, -AWAITING_EXTERNAL_DAYS)
+  const awaitingFrom = addDaysIso(cutoffDate, -AWAITING_EXTERNAL_DAYS)
   const sortedLedger = Array.from(ledgerEntries.values()).sort((a, b) =>
     a.head.entry_date < b.head.entry_date ? -1 : a.head.entry_date > b.head.entry_date ? 1 : 0,
   )
   for (const { head, amount } of sortedLedger) {
     if (liveLinkedEntryIds.has(head.id)) continue
     if (amount === 0) continue
-    unlinkedLedgerTotal = round2(unlinkedLedgerTotal + amount)
+    unlinkedLedgerTotal = roundOre(unlinkedLedgerTotal + amount)
     counts.unmatched_ledger++
     if (olderThanWindow(head.entry_date)) olderUnmatched++
     if (!visible(head.entry_date)) continue
@@ -459,8 +436,8 @@ export async function getSkattekontoReconciliationStatus(
 
   let upcomingTotal = 0
   for (const row of upcoming) {
-    const amount = round2(Number(row.belopp_skatteverket))
-    upcomingTotal = round2(upcomingTotal + amount)
+    const amount = roundOre(Number(row.belopp_skatteverket))
+    upcomingTotal = roundOre(upcomingTotal + amount)
     pushCapped('upcoming', {
       item_id: row.id,
       item_type: 'skattekonto_transaction',
@@ -475,16 +452,16 @@ export async function getSkattekontoReconciliationStatus(
   }
 
   // Totals and the identity.
-  const allBookedTotal = booked.reduce((s, r) => round2(s + Number(r.belopp_skatteverket)), 0)
+  const allBookedTotal = booked.reduce((s, r) => roundOre(s + Number(r.belopp_skatteverket)), 0)
   const saldo = snapshot?.saldo ?? null
-  const saldoAtStart = saldo === null ? null : round2(saldo - allBookedTotal)
+  const saldoAtStart = saldo === null ? null : roundOre(saldo - allBookedTotal)
   const openingDifference =
-    saldoAtStart === null || ledgerBefore === null ? null : round2(saldoAtStart - ledgerBefore)
-  const difference = saldo === null || ledgerBalance === null ? null : round2(saldo - ledgerBalance)
+    saldoAtStart === null || ledgerBefore === null ? null : roundOre(saldoAtStart - ledgerBefore)
+  const difference = saldo === null || ledgerBalance === null ? null : roundOre(saldo - ledgerBalance)
   const unexplained =
     difference === null || openingDifference === null
       ? null
-      : round2(
+      : roundOre(
           difference - openingDifference - unlinkedExternalTotal - ignoredTotal + unlinkedLedgerTotal,
         )
 
@@ -510,7 +487,7 @@ export async function getSkattekontoReconciliationStatus(
       key: 'unmatched_external',
       label_sv: 'Händelser som saknas i bokföringen',
       label_en: 'Events missing from the ledger',
-      amount: round2(-unlinkedExternalTotal),
+      amount: roundOre(-unlinkedExternalTotal),
       count: counts.unmatched_external + counts.proposed,
       items_bucket: 'unmatched_external',
     },
@@ -528,7 +505,7 @@ export async function getSkattekontoReconciliationStatus(
       key: 'ignored',
       label_sv: 'Ignorerade händelser',
       label_en: 'Ignored events',
-      amount: round2(-ignoredTotal),
+      amount: roundOre(-ignoredTotal),
       count: counts.ignored,
       items_bucket: 'ignored',
     })
@@ -538,7 +515,7 @@ export async function getSkattekontoReconciliationStatus(
       key: 'opening_difference',
       label_sv: `Ingående skillnad per ${historyStart ?? cutoffDate}`,
       label_en: `Opening difference at ${historyStart ?? cutoffDate}`,
-      amount: round2(-openingDifference),
+      amount: roundOre(-openingDifference),
       count: null,
       items_bucket: null,
     })
diff --git a/lib/reference-data/fiscal-scope.ts b/lib/reference-data/fiscal-scope.ts
index acd4c058..8facddb6 100644
--- a/lib/reference-data/fiscal-scope.ts
+++ b/lib/reference-data/fiscal-scope.ts
@@ -7,16 +7,13 @@
 
 import type { FiscalPeriod } from '@/types'
 import { ALL_YEARS_VALUE } from '@/components/common/fiscal-year-storage'
-
-export function todayIso(): string {
-  return new Date().toISOString().split('T')[0]
-}
+import { todayIsoUtc } from '@/lib/dates/iso'
 
 /** Newest first; optionally drops periods that have not started yet. */
 export function prepareFiscalPeriods(
   periods: readonly FiscalPeriod[],
   hideFuturePeriods: boolean,
-  today: string = todayIso(),
+  today: string = todayIsoUtc(),
 ): FiscalPeriod[] {
   return periods
     .filter((p) => !hideFuturePeriods || p.period_start <= today)
@@ -52,7 +49,7 @@ export function resolveInitialFiscalScope(
   const newest = periods[0] ?? null
 
   if (options.preferLatestEnded) {
-    const today = options.today ?? todayIso()
+    const today = options.today ?? todayIsoUtc()
     const pick = periods.find((p) => p.period_end < today) ?? newest
     return pick ? { periodId: pick.id, period: pick } : null
   }
diff --git a/lib/reports/behandlingshistorik-pdf-template.tsx b/lib/reports/behandlingshistorik-pdf-template.tsx
index c633a44e..bb9ce928 100644
--- a/lib/reports/behandlingshistorik-pdf-template.tsx
+++ b/lib/reports/behandlingshistorik-pdf-template.tsx
@@ -1,3 +1,4 @@
+import { formatOrgNumber } from '@/lib/utils'
 import { Document, Page, StyleSheet, Text, View } from '@react-pdf/renderer'
 import {
   BEHANDLINGSHISTORIK_CATEGORIES,
@@ -125,11 +126,6 @@ export function pdfText(value: string): string {
   return value.replace(/→/g, '->').replace(/−/g, '-')
 }
 
-function formatOrgNumber(orgNumber: string): string {
-  const cleaned = orgNumber.replace(/\D/g, '')
-  return cleaned.length === 10 ? `${cleaned.slice(0, 6)}-${cleaned.slice(6)}` : orgNumber
-}
-
 function EventRow({ event }: { event: BehandlingshistorikEvent }) {
   return (
     <View style={styles.row} wrap={false}>
diff --git a/lib/reports/bokslutsbilagor-pdf-template.tsx b/lib/reports/bokslutsbilagor-pdf-template.tsx
index be3532eb..12f85190 100644
--- a/lib/reports/bokslutsbilagor-pdf-template.tsx
+++ b/lib/reports/bokslutsbilagor-pdf-template.tsx
@@ -1,3 +1,4 @@
+import { formatOrgNumber } from '@/lib/utils'
 import { Document, Page, StyleSheet, Text, View } from '@react-pdf/renderer'
 import type { BilagaAccount, BilagaChecklistItem, BokslutsbilagorReport } from '@/lib/reports/bokslutsbilagor-types'
 import { formatStockholmTimestamp } from '@/lib/reports/behandlingshistorik'
@@ -72,11 +73,6 @@ function amount(n: number | null): string {
   return n == null ? '-' : pdfText(NUMBER.format(n))
 }
 
-function formatOrgNumber(orgNumber: string): string {
-  const cleaned = orgNumber.replace(/\D/g, '')
-  return cleaned.length === 10 ? `${cleaned.slice(0, 6)}-${cleaned.slice(6)}` : orgNumber
-}
-
 const STATE_LABEL: Record<BilagaChecklistItem['state'], string> = {
   done: '[x] Klart',
   not_applicable: '[-] Ej tillämpl.',
diff --git a/lib/reports/catalog.ts b/lib/reports/catalog.ts
index 68ca6710..718d8447 100644
--- a/lib/reports/catalog.ts
+++ b/lib/reports/catalog.ts
@@ -84,15 +84,6 @@ export interface ReportDescriptor {
   standalone?: boolean
 }
 
-/** Categories shown in the legacy desktop rail, in order. */
-export const NAV_CATEGORIES: ReportCategory[] = [
-  'interim',
-  'year_end',
-  'tax_vat',
-  'ledgers',
-  'reconciliation',
-]
-
 /** All categories shown on the library landing, in order. */
 export const LIBRARY_CATEGORIES: ReportCategory[] = [
   'interim',
@@ -385,23 +376,6 @@ export interface ReportSection {
   items: ReportDescriptor[]
 }
 
-/** Grouped reports for the legacy desktop rail (excludes library-only items). */
-export function getNavSections(
-  entityType?: EntityType,
-  dimensionsEnabled?: boolean,
-): ReportSection[] {
-  return NAV_CATEGORIES.map((category) => ({
-    category,
-    labelKey: CATEGORY_LABEL_KEY[category],
-    items: REPORT_CATALOG.filter(
-      (r) =>
-        r.category === category &&
-        !r.libraryOnly &&
-        isVisible(r, entityType, undefined, dimensionsEnabled),
-    ),
-  })).filter((s) => s.items.length > 0)
-}
-
 /** Grouped reports for the library landing (includes everything visible). */
 export function getLibrarySections(
   entityType?: EntityType,
diff --git a/lib/reports/financial-statement-pdf-template.tsx b/lib/reports/financial-statement-pdf-template.tsx
index 23ab1f26..30b4ceb0 100644
--- a/lib/reports/financial-statement-pdf-template.tsx
+++ b/lib/reports/financial-statement-pdf-template.tsx
@@ -5,7 +5,8 @@ import {
   View,
   StyleSheet,
 } from '@react-pdf/renderer'
-import { pdfNumberText } from '@/lib/pdf/number-text'
+import { formatDateSv, pdfAmount } from '@/lib/pdf/number-text'
+import { formatOrgNumber } from '@/lib/utils'
 import type { CompanySettings } from '@/types'
 
 const styles = StyleSheet.create({
@@ -209,30 +210,6 @@ const styles = StyleSheet.create({
   },
 })
 
-function formatAmount(amount: number): string {
-  // pdfNumberText: Intl's U+2212 has no glyph in the bundled Helvetica/Courier,
-  // so a negative årets resultat would print as a profit (issue #1982).
-  return pdfNumberText(
-    new Intl.NumberFormat('sv-SE', {
-      minimumFractionDigits: 2,
-      maximumFractionDigits: 2,
-    }).format(amount),
-  )
-}
-
-function formatOrgNumber(orgNumber: string): string {
-  const cleaned = orgNumber.replace(/\D/g, '')
-  if (cleaned.length === 10) {
-    return `${cleaned.slice(0, 6)}-${cleaned.slice(6)}`
-  }
-  return orgNumber
-}
-
-function formatDateSv(iso: string): string {
-  if (!iso) return ''
-  return new Date(iso).toLocaleDateString('sv-SE')
-}
-
 export interface FinancialStatementSection {
   title: string
   rows: { account_number: string; account_name: string; amount: number }[]
@@ -321,7 +298,7 @@ export function FinancialStatementPDF({
                       <View key={ri} style={styles.row}>
                         <Text style={styles.colAccount}>{row.account_number}</Text>
                         <Text style={styles.colName}>{row.account_name}</Text>
-                        <Text style={styles.colAmount}>{formatAmount(displayAmount)}</Text>
+                        <Text style={styles.colAmount}>{pdfAmount(displayAmount)}</Text>
                       </View>
                     )
                   })}
@@ -329,7 +306,7 @@ export function FinancialStatementPDF({
                     <View style={styles.sectionSubtotalRow}>
                       <Text style={styles.sectionSubtotalLabel}>Summa {section.title.toLowerCase()}</Text>
                       <Text style={styles.sectionSubtotalAmount}>
-                        {formatAmount(group.negate ? -section.subtotal : section.subtotal)}
+                        {pdfAmount(group.negate ? -section.subtotal : section.subtotal)}
                       </Text>
                     </View>
                   )}
@@ -340,7 +317,7 @@ export function FinancialStatementPDF({
             <View style={styles.groupTotalRow}>
               <Text style={styles.groupTotalLabel}>{group.totalLabel}</Text>
               <Text style={styles.groupTotalAmount}>
-                {formatAmount(group.negate ? -group.total : group.total)}
+                {pdfAmount(group.negate ? -group.total : group.total)}
               </Text>
             </View>
           </View>
@@ -354,7 +331,7 @@ export function FinancialStatementPDF({
                   {row.label}
                 </Text>
                 <Text style={row.emphasis ? styles.summaryEmphasisAmount : styles.summaryAmount}>
-                  {formatAmount(row.amount)}
+                  {pdfAmount(row.amount)}
                 </Text>
               </View>
             ))}
diff --git a/lib/reports/ink2/sru-generator.ts b/lib/reports/ink2/sru-generator.ts
index 8c7eed41..e7639136 100644
--- a/lib/reports/ink2/sru-generator.ts
+++ b/lib/reports/ink2/sru-generator.ts
@@ -1,3 +1,4 @@
+import { sruAmount as formatAmount, sruDate as formatDate, sruTime as formatTime } from '@/lib/reports/sru/format'
 import { getBranding } from '@/lib/branding/service'
 import type {
   INK2Declaration,
@@ -63,34 +64,6 @@ function formatOrgNumber12(orgNumber: string): string {
   return `16${clean}`
 }
 
-/**
- * Format a Date as YYYYMMDD
- */
-function formatDate(date: Date): string {
-  const y = date.getFullYear()
-  const m = String(date.getMonth() + 1).padStart(2, '0')
-  const d = String(date.getDate()).padStart(2, '0')
-  return `${y}${m}${d}`
-}
-
-/**
- * Format a Date as HHMMSS
- */
-function formatTime(date: Date): string {
-  const h = String(date.getHours()).padStart(2, '0')
-  const m = String(date.getMinutes()).padStart(2, '0')
-  const s = String(date.getSeconds()).padStart(2, '0')
-  return `${h}${m}${s}`
-}
-
-/**
- * Format integer amount for SRU. No decimals, no thousands separator.
- * Truncated to hela kronor by the engine.
- */
-function formatAmount(amount: number): string {
-  return Math.trunc(amount).toString()
-}
-
 /**
  * Generate the INFO.SRU file content
  */
diff --git a/lib/reports/kassaflodesanalys-pdf-template.tsx b/lib/reports/kassaflodesanalys-pdf-template.tsx
index 1039731f..4e45a286 100644
--- a/lib/reports/kassaflodesanalys-pdf-template.tsx
+++ b/lib/reports/kassaflodesanalys-pdf-template.tsx
@@ -1,3 +1,4 @@
+import { formatOrgNumber } from '@/lib/utils'
 import {
   Document,
   Page,
@@ -5,7 +6,7 @@ import {
   View,
   StyleSheet,
 } from '@react-pdf/renderer'
-import { pdfNumberText } from '@/lib/pdf/number-text'
+import { pdfNumberText, formatDateSv } from '@/lib/pdf/number-text'
 import type { KassaflodesanalysReport } from './kassaflodesanalys'
 import type { CompanySettings } from '@/types'
 
@@ -173,19 +174,6 @@ function formatAmount(n: number): string {
   )
 }
 
-function formatOrgNumber(orgNumber: string): string {
-  const cleaned = orgNumber.replace(/\D/g, '')
-  if (cleaned.length === 10) {
-    return `${cleaned.slice(0, 6)}-${cleaned.slice(6)}`
-  }
-  return orgNumber
-}
-
-function formatDateSv(iso: string): string {
-  if (!iso) return ''
-  return new Date(iso).toLocaleDateString('sv-SE')
-}
-
 interface KassaflodePDFProps {
   report: KassaflodesanalysReport
   company: CompanySettings
diff --git a/lib/reports/kpi-definitions.ts b/lib/reports/kpi-definitions.ts
index 5b7eca55..417e1103 100644
--- a/lib/reports/kpi-definitions.ts
+++ b/lib/reports/kpi-definitions.ts
@@ -73,10 +73,6 @@ export const KPI_DEFINITIONS: KPIDefinition[] = [
 
 export const ALL_KPI_IDS = KPI_DEFINITIONS.map((d) => d.id)
 
-export function getKPIDefinition(id: string): KPIDefinition | undefined {
-  return KPI_DEFINITIONS.find((d) => d.id === id)
-}
-
 export function getDefaultPreferences(): KPIPreferences {
   return {
     visibleKpis: KPI_DEFINITIONS.filter((d) => d.defaultVisible).map((d) => d.id),
diff --git a/lib/reports/ne-bilaga/ne-engine.ts b/lib/reports/ne-bilaga/ne-engine.ts
index 7bc19e40..9b0417d5 100644
--- a/lib/reports/ne-bilaga/ne-engine.ts
+++ b/lib/reports/ne-bilaga/ne-engine.ts
@@ -318,20 +318,3 @@ export async function generateNEDeclaration(
     warnings,
   }
 }
-
-/**
- * Get totals for display
- */
-export function getNEDeclarationTotals(declaration: NEDeclaration): {
-  totalRevenue: number
-  totalExpenses: number
-  netResult: number
-} {
-  const { rutor } = declaration
-
-  return {
-    totalRevenue: rutor.R1 + rutor.R2 + rutor.R3 + rutor.R4,
-    totalExpenses: rutor.R5 + rutor.R6 + rutor.R7 + rutor.R8 + rutor.R9 + rutor.R10,
-    netResult: rutor.R11,
-  }
-}
diff --git a/lib/reports/ne-bilaga/sru-generator.ts b/lib/reports/ne-bilaga/sru-generator.ts
index 68beef9b..a1a1f748 100644
--- a/lib/reports/ne-bilaga/sru-generator.ts
+++ b/lib/reports/ne-bilaga/sru-generator.ts
@@ -1,4 +1,5 @@
 import { getBranding } from '@/lib/branding/service'
+import { sruAmount as formatAmount, sruDate as formatDate, sruTime as formatTime } from '@/lib/reports/sru/format'
 import type { NEDeclaration, NEDeclarationRutor, SRUSubmission } from '@/lib/reports/ne-bilaga/types'
 
 /**
@@ -87,32 +88,11 @@ function formatIdentityNumber12(raw: string | null, incomeYear: number): string
   return '000000000000'
 }
 
-/** Format a Date as YYYYMMDD. */
-function formatDate(date: Date): string {
-  const y = date.getFullYear()
-  const m = String(date.getMonth() + 1).padStart(2, '0')
-  const d = String(date.getDate()).padStart(2, '0')
-  return `${y}${m}${d}`
-}
-
-/** Format a Date as HHMMSS. */
-function formatTime(date: Date): string {
-  const h = String(date.getHours()).padStart(2, '0')
-  const m = String(date.getMinutes()).padStart(2, '0')
-  const s = String(date.getSeconds()).padStart(2, '0')
-  return `${h}${m}${s}`
-}
-
 /** Convert a YYYY-MM-DD string to SRU date format YYYYMMDD. */
 function dateStringToSRU(dateStr: string): string {
   return dateStr.replace(/-/g, '')
 }
 
-/** Format an integer amount: hela kronor, no decimals/thousands separators, öre truncated. */
-function formatAmount(amount: number): string {
-  return Math.trunc(amount).toString()
-}
-
 /** Sanitize string for SRU: '#' is reserved, strip newlines, cap at 250 chars (STR_250). */
 function sanitizeString(str: string): string {
   return str.replace(/#/g, '').replace(/[\r\n]/g, ' ').substring(0, 250)
diff --git a/lib/reports/ne-bilaga/types.ts b/lib/reports/ne-bilaga/types.ts
index e11ee80a..b3855551 100644
--- a/lib/reports/ne-bilaga/types.ts
+++ b/lib/reports/ne-bilaga/types.ts
@@ -64,17 +64,3 @@ export interface SRUSubmission {
   generatedAt: string
 }
 
-// Labels for NE rutor
-export const NE_RUTA_LABELS: Record<keyof NEDeclarationRutor, string> = {
-  R1: 'Försäljning med moms (25%)',
-  R2: 'Momsfria intäkter',
-  R3: 'Bil/bostadsförmån',
-  R4: 'Ränteintäkter',
-  R5: 'Varuinköp',
-  R6: 'Övriga kostnader',
-  R7: 'Lönekostnader',
-  R8: 'Räntekostnader',
-  R9: 'Avskrivningar fastighet',
-  R10: 'Avskrivningar övriga tillgångar',
-  R11: 'Årets resultat'
-}
diff --git a/lib/reports/operational-report-pdf-template.tsx b/lib/reports/operational-report-pdf-template.tsx
index 91f0bd84..edacb0f6 100644
--- a/lib/reports/operational-report-pdf-template.tsx
+++ b/lib/reports/operational-report-pdf-template.tsx
@@ -1,3 +1,4 @@
+import { formatOrgNumber } from '@/lib/utils'
 import {
   Document,
   Page,
@@ -5,7 +6,7 @@ import {
   View,
   StyleSheet,
 } from '@react-pdf/renderer'
-import { pdfNumberText } from '@/lib/pdf/number-text'
+import { pdfNumberText, formatDateSv } from '@/lib/pdf/number-text'
 import type {
   CompanySettings,
   LatestVoucherPerSeries,
@@ -237,19 +238,6 @@ function formatAmount(amount: number): string {
   )
 }
 
-function formatOrgNumber(orgNumber: string): string {
-  const cleaned = orgNumber.replace(/\D/g, '')
-  if (cleaned.length === 10) {
-    return `${cleaned.slice(0, 6)}-${cleaned.slice(6)}`
-  }
-  return orgNumber
-}
-
-function formatDateSv(iso: string): string {
-  if (!iso) return ''
-  return new Date(iso).toLocaleDateString('sv-SE')
-}
-
 interface CommonHeaderProps {
   title: string
   company: CompanySettings
diff --git a/lib/reports/period-dates.ts b/lib/reports/period-dates.ts
index 827b01a1..482150ae 100644
--- a/lib/reports/period-dates.ts
+++ b/lib/reports/period-dates.ts
@@ -4,7 +4,9 @@
  * specific belongs in the calling module.
  */
 
-export type PeriodType = 'monthly' | 'quarterly' | 'yearly'
+import type { MomsPeriod } from '@/types'
+
+export type PeriodType = MomsPeriod
 
 /**
  * Calculate inclusive start and end dates for a fiscal-calendar period.
diff --git a/lib/reports/reskontra-pdf-template.tsx b/lib/reports/reskontra-pdf-template.tsx
index e0e1d2fc..f3597b6d 100644
--- a/lib/reports/reskontra-pdf-template.tsx
+++ b/lib/reports/reskontra-pdf-template.tsx
@@ -5,7 +5,8 @@ import {
   View,
   StyleSheet,
 } from '@react-pdf/renderer'
-import { pdfNumberText } from '@/lib/pdf/number-text'
+import { formatDateSv, pdfAmount } from '@/lib/pdf/number-text'
+import { formatOrgNumber } from '@/lib/utils'
 import type { CompanySettings } from '@/types'
 
 const styles = StyleSheet.create({
@@ -201,30 +202,6 @@ const styles = StyleSheet.create({
   },
 })
 
-function formatAmount(amount: number): string {
-  // pdfNumberText: Intl's U+2212 has no glyph in the bundled Helvetica/Courier,
-  // so a credit note or overpayment would print unsigned (issue #1982).
-  return pdfNumberText(
-    new Intl.NumberFormat('sv-SE', {
-      minimumFractionDigits: 2,
-      maximumFractionDigits: 2,
-    }).format(amount),
-  )
-}
-
-function formatOrgNumber(orgNumber: string): string {
-  const cleaned = orgNumber.replace(/\D/g, '')
-  if (cleaned.length === 10) {
-    return `${cleaned.slice(0, 6)}-${cleaned.slice(6)}`
-  }
-  return orgNumber
-}
-
-function formatDateSv(iso: string): string {
-  if (!iso) return ''
-  return new Date(iso).toLocaleDateString('sv-SE')
-}
-
 export interface ReskontraAgingRow {
   name: string
   current: number
@@ -323,16 +300,16 @@ export function ReskontraPDF({
         <View style={styles.summaryRow}>
           <View style={styles.summaryItem}>
             <Text style={styles.summaryLabel}>TOTALT UTESTÅENDE</Text>
-            <Text style={styles.summaryValue}>{formatAmount(totals.total_outstanding)} kr</Text>
+            <Text style={styles.summaryValue}>{pdfAmount(totals.total_outstanding)} kr</Text>
           </View>
           <View style={styles.summaryItem}>
             <Text style={styles.summaryLabel}>EJ FÖRFALLET</Text>
-            <Text style={styles.summaryValue}>{formatAmount(totals.current)} kr</Text>
+            <Text style={styles.summaryValue}>{pdfAmount(totals.current)} kr</Text>
           </View>
           <View style={styles.summaryItem}>
             <Text style={styles.summaryLabel}>FÖRFALLET</Text>
             <Text style={styles.summaryValue}>
-              {formatAmount(totals.total_outstanding - totals.current)} kr
+              {pdfAmount(totals.total_outstanding - totals.current)} kr
             </Text>
           </View>
           <View style={styles.summaryItem}>
@@ -365,7 +342,7 @@ export function ReskontraPDF({
                 <Text style={styles.colName}>{row.name}</Text>
                 {AGING_COLUMNS.map((col) => (
                   <Text key={col.key} style={styles.colAmount}>
-                    {formatAmount(row[col.key] as number)}
+                    {pdfAmount(row[col.key] as number)}
                   </Text>
                 ))}
               </View>
@@ -374,7 +351,7 @@ export function ReskontraPDF({
               <Text style={[styles.colName, styles.bold]}>Summa</Text>
               {AGING_COLUMNS.map((col) => (
                 <Text key={col.key} style={[styles.colAmount, styles.bold]}>
-                  {formatAmount(totals[col.key] as number)}
+                  {pdfAmount(totals[col.key] as number)}
                 </Text>
               ))}
             </View>
@@ -415,12 +392,12 @@ export function ReskontraPDF({
                 <Text style={styles.colInvNumber}>{inv.invoice_number}</Text>
                 <Text style={styles.colInvDate}>{inv.invoice_date}</Text>
                 <Text style={styles.colInvDate}>{inv.due_date}</Text>
-                <Text style={styles.colInvAmount}>{formatAmount(inv.outstanding)}</Text>
+                <Text style={styles.colInvAmount}>{pdfAmount(inv.outstanding)}</Text>
                 {hasForeignCurrency &&
                   (inv.outstanding_sek === null ? (
                     <Text style={styles.colInvSekMissing}>saknas</Text>
                   ) : (
-                    <Text style={styles.colInvSek}>{formatAmount(inv.outstanding_sek)}</Text>
+                    <Text style={styles.colInvSek}>{pdfAmount(inv.outstanding_sek)}</Text>
                   ))}
                 <Text style={styles.colInvDays}>{inv.days_overdue > 0 ? inv.days_overdue : ''}</Text>
                 <Text style={styles.colInvCurrency}>{inv.currency}</Text>
@@ -434,7 +411,7 @@ export function ReskontraPDF({
                 <Text style={styles.colInvDate} />
                 {/* Deliberately blank: mixed currencies do not add up. */}
                 <Text style={styles.colInvAmount} />
-                <Text style={[styles.colInvSek, styles.bold]}>{formatAmount(invoiceSekTotal)}</Text>
+                <Text style={[styles.colInvSek, styles.bold]}>{pdfAmount(invoiceSekTotal)}</Text>
                 <Text style={styles.colInvDays} />
                 <Text style={styles.colInvCurrency}>SEK</Text>
               </View>
diff --git a/lib/reports/sru/format.ts b/lib/reports/sru/format.ts
new file mode 100644
index 00000000..3f3896c9
--- /dev/null
+++ b/lib/reports/sru/format.ts
@@ -0,0 +1,26 @@
+/**
+ * Field formatters shared by the SRU generators (INK2 and NE-bilaga). SRU is a
+ * Skatteverket line format: dates are YYYYMMDD, times HHMMSS, amounts are hela
+ * kronor with the öre truncated and no separators.
+ */
+
+/** Format a Date as YYYYMMDD (local time, as the files are stamped on the user's clock). */
+export function sruDate(date: Date): string {
+  const y = date.getFullYear()
+  const m = String(date.getMonth() + 1).padStart(2, '0')
+  const d = String(date.getDate()).padStart(2, '0')
+  return `${y}${m}${d}`
+}
+
+/** Format a Date as HHMMSS. */
+export function sruTime(date: Date): string {
+  const h = String(date.getHours()).padStart(2, '0')
+  const m = String(date.getMinutes()).padStart(2, '0')
+  const s = String(date.getSeconds()).padStart(2, '0')
+  return `${h}${m}${s}`
+}
+
+/** Format an integer amount: hela kronor, no decimals/thousands separators, öre truncated. */
+export function sruAmount(amount: number): string {
+  return Math.trunc(amount).toString()
+}
diff --git a/lib/reports/vat-declaration-pdf-template.tsx b/lib/reports/vat-declaration-pdf-template.tsx
index c03cf8bd..c97a621c 100644
--- a/lib/reports/vat-declaration-pdf-template.tsx
+++ b/lib/reports/vat-declaration-pdf-template.tsx
@@ -1,3 +1,4 @@
+import { formatOrgNumber } from '@/lib/utils'
 import {
   Document,
   Page,
@@ -5,7 +6,7 @@ import {
   View,
   StyleSheet,
 } from '@react-pdf/renderer'
-import { pdfNumberText } from '@/lib/pdf/number-text'
+import { pdfNumberText, formatDateSv } from '@/lib/pdf/number-text'
 import type { CompanySettings } from '@/types'
 import type { ManualFilingRow } from '@/lib/reports/vat-manual-filing'
 
@@ -100,19 +101,6 @@ function formatKr(amount: number): string {
   return pdfNumberText(new Intl.NumberFormat('sv-SE', { maximumFractionDigits: 0 }).format(amount))
 }
 
-function formatOrgNumber(orgNumber: string): string {
-  const cleaned = orgNumber.replace(/\D/g, '')
-  if (cleaned.length === 10) {
-    return `${cleaned.slice(0, 6)}-${cleaned.slice(6)}`
-  }
-  return orgNumber
-}
-
-function formatDateSv(iso: string): string {
-  if (!iso) return ''
-  return new Date(iso).toLocaleDateString('sv-SE')
-}
-
 interface VatDeclarationPDFProps {
   rows: ManualFilingRow[]
   period: { start: string; end: string }
diff --git a/lib/reports/vat-revenue-accounts.ts b/lib/reports/vat-revenue-accounts.ts
index 78bd7620..73436874 100644
--- a/lib/reports/vat-revenue-accounts.ts
+++ b/lib/reports/vat-revenue-accounts.ts
@@ -176,17 +176,3 @@ export async function fetchDynamicVatAccounts(
   }
   return result
 }
-
-export async function fetchDynamicRuta05Accounts(
-  supabase: SupabaseClient,
-  companyId: string,
-): Promise<Pick<DynamicVatAccounts, 'accounts' | 'rateByAccount' | 'staticRateByAccount'>> {
-  const resolved = await fetchDynamicVatAccounts(supabase, companyId)
-  return {
-    accounts: [...resolved.mappingByAccount]
-      .filter(([account, mapping]) => mapping.box === 'ruta05' && !ACCOUNT_TO_BOX[account])
-      .map(([account]) => account),
-    rateByAccount: resolved.rateByAccount,
-    staticRateByAccount: resolved.staticRateByAccount,
-  }
-}
diff --git a/lib/reports/xlsx-export.ts b/lib/reports/xlsx-export.ts
index 5a943cd3..37db833f 100644
--- a/lib/reports/xlsx-export.ts
+++ b/lib/reports/xlsx-export.ts
@@ -219,6 +219,17 @@ export function dateColumn(header: string): ColumnSpec {
   return { header, format: 'date' }
 }
 
+/**
+ * Parse an ISO date string into a Date for a `date` column cell. Returns null
+ * for an empty or unparseable string so the cell is left blank.
+ */
+export function parseCellDate(s: string): Date | null {
+  if (!s) return null
+  const d = new Date(s)
+  return isNaN(d.getTime()) ? null : d
+}
+
+
 export function integerColumn(header: string): ColumnSpec {
   return { header, format: 'integer' }
 }
diff --git a/lib/salary/agi/kontrollera-schemas.ts b/lib/salary/agi/kontrollera-schemas.ts
index 93f77bb5..3eb30930 100644
--- a/lib/salary/agi/kontrollera-schemas.ts
+++ b/lib/salary/agi/kontrollera-schemas.ts
@@ -48,8 +48,6 @@ export const AGIKontrolleraHUSchema = z
   })
   .strict()
 
-export type AGIKontrolleraHU = z.infer<typeof AGIKontrolleraHUSchema>
-
 export const AGIKontrolleraIUSchema = z
   .object({
     agRegistreradId: IDENTITET,
@@ -95,8 +93,6 @@ export const AGIKontrolleraIUSchema = z
     },
   )
 
-export type AGIKontrolleraIU = z.infer<typeof AGIKontrolleraIUSchema>
-
 /**
  * Hard cap on the raw JSON body for kontrollera endpoints. Even a fully
  * legal IU is < 4 KB serialised; 64 KB is a generous safety margin that
diff --git a/lib/salary/agi/xml-generator.ts b/lib/salary/agi/xml-generator.ts
index cf915f98..315da6a6 100644
--- a/lib/salary/agi/xml-generator.ts
+++ b/lib/salary/agi/xml-generator.ts
@@ -1,6 +1,7 @@
 import { decryptPersonnummer } from '../personnummer'
 import { isOrgNumberShaped } from '@/lib/invariants/org-number'
 import { truncateToWholeKronor } from '@/lib/money'
+import { escapeXml } from '@/lib/xml/escape'
 
 /**
  * AGI XML generator: Arbetsgivardeklaration på individnivå.
@@ -578,10 +579,6 @@ export function generateAGIXml(
     //   - VAB and parental leave are reported via the top-level
     //     <Franvarouppgift> section (FK820-827) as per-event date records,
     //     not as per-IU day counts. Not implemented in this generator yet.
-    void emp.sickDays
-    void emp.vabDays
-    void emp.parentalDays
-
     lines.push('      </gem:IU>')
     lines.push('    </gem:Blankettinnehall>')
     lines.push('  </gem:Blankett>')
@@ -684,15 +681,6 @@ export function buildIndividuppgifterSnapshot(
 // Helpers
 // ============================================================
 
-function escapeXml(str: string): string {
-  return str
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&apos;')
-}
-
 // AGI amounts are stated in whole kronor with the öre dropped (öretal
 // bortfaller, SFF 2011:1261 22 kap. 1 §): truncation, never rounding.
 // Math.round here would declare 16 074 kr for an underlag-computed
diff --git a/lib/salary/derive-absence-line-items.ts b/lib/salary/derive-absence-line-items.ts
index 4a02b77c..e5d37b5c 100644
--- a/lib/salary/derive-absence-line-items.ts
+++ b/lib/salary/derive-absence-line-items.ts
@@ -1,5 +1,6 @@
 import type { SupabaseClient } from '@supabase/supabase-js'
 import type { PayrollConfig } from './payroll-config'
+import { daysBetweenIso } from '@/lib/dates/iso'
 import {
   calculateVabDeduction,
   calculateParentalLeaveDeduction,
@@ -87,10 +88,6 @@ function dateOnly(s: string): Date {
   return new Date(`${s}T00:00:00Z`)
 }
 
-function daysBetween(a: string, b: string): number {
-  return Math.round((dateOnly(b).getTime() - dateOnly(a).getTime()) / ONE_DAY_MS)
-}
-
 function addDays(d: string, n: number): string {
   const t = new Date(dateOnly(d).getTime() + n * ONE_DAY_MS)
   return t.toISOString().slice(0, 10)
@@ -124,7 +121,7 @@ export function buildSjukloneperioder(sickDates: string[]): SjukloneperiodSegmen
 
   for (let i = 1; i < sorted.length; i++) {
     const date = sorted[i]
-    const gap = daysBetween(endDate, date)
+    const gap = daysBetweenIso(endDate, date)
     if (gap === 0) continue
     if (gap >= 1 && gap <= 5) {
       // Within 5 calendar days: same period (contiguous OR återinsjuknande)
@@ -269,7 +266,7 @@ export function deriveAbsenceLineItems(input: DeriveInput): DeriveResult {
       // index (calendar days from segment start, 1-based).
       for (const d of periodSickDates) {
         if (d < seg.startDate || d > seg.endDate) continue
-        const segDayIndex = daysBetween(seg.startDate, d) + 1
+        const segDayIndex = daysBetweenIso(seg.startDate, d) + 1
         if (segDayIndex === 1 && segmentStartsInPeriod) {
           // already accounted for as karens (or suppressed); skip
           continue
diff --git a/lib/salary/ku/ku10-generator.ts b/lib/salary/ku/ku10-generator.ts
index b932b0f6..e22bb8b0 100644
--- a/lib/salary/ku/ku10-generator.ts
+++ b/lib/salary/ku/ku10-generator.ts
@@ -1,3 +1,4 @@
+import { escapeXml } from '@/lib/xml/escape'
 import { decryptPersonnummer } from '../personnummer'
 import { getBranding } from '@/lib/branding/service'
 import { stripOrgNumberFormatting } from '@/lib/invariants/org-number'
@@ -163,11 +164,3 @@ export function generateKU10Xml(
   return lines.join('\n')
 }
 
-function escapeXml(str: string): string {
-  return str
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&apos;')
-}
diff --git a/lib/salary/payment/pain001-generator.ts b/lib/salary/payment/pain001-generator.ts
index 19a194d5..7dd394a6 100644
--- a/lib/salary/payment/pain001-generator.ts
+++ b/lib/salary/payment/pain001-generator.ts
@@ -30,6 +30,7 @@
  * the salary journal entry. Subject to 7-year retention.
  */
 
+import { escapeXml } from '@/lib/xml/escape'
 import { splitDomesticBankAccount } from './bank-account'
 
 export interface Pain001CompanyData {
@@ -188,15 +189,6 @@ export function generatePain001(
 // Helpers
 // ============================================================
 
-function escapeXml(str: string): string {
-  return str
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&apos;')
-}
-
 /** Format number as decimal with 2 decimal places (ISO 20022 requires dot separator) */
 function formatDecimal(amount: number): string {
   return (Math.round(amount * 100) / 100).toFixed(2)
diff --git a/lib/salary/personnummer-format.ts b/lib/salary/personnummer-format.ts
index ace73948..e124a41f 100644
--- a/lib/salary/personnummer-format.ts
+++ b/lib/salary/personnummer-format.ts
@@ -9,6 +9,8 @@
 /**
  * Extract the last 4 digits of a personnummer for display.
  */
+import { luhnValidate } from '@/lib/bankgiro/luhn'
+
 export function extractLast4(personnummer: string): string {
   const digits = personnummer.replace(/\D/g, '')
   return digits.slice(-4)
@@ -60,30 +62,13 @@ export function validatePersonnummer(personnummer: string): { valid: boolean; er
 
   // Luhn check on digits 3-12 (YYMMDDNNNN, 10 digits)
   const luhnDigits = digits.slice(2)
-  if (!luhnCheck(luhnDigits)) {
+  if (!luhnValidate(luhnDigits)) {
     return { valid: false, error: 'Ogiltigt kontrollnummer (Luhn)' }
   }
 
   return { valid: true }
 }
 
-/**
- * Luhn checksum validation for 10-digit string.
- */
-function luhnCheck(digits: string): boolean {
-  let sum = 0
-  for (let i = 0; i < digits.length; i++) {
-    let d = parseInt(digits[i])
-    // Multiply every other digit by 2, starting from the first
-    if (i % 2 === 0) {
-      d *= 2
-      if (d > 9) d -= 9
-    }
-    sum += d
-  }
-  return sum % 10 === 0
-}
-
 /**
  * Extract birth date from a 12-digit personnummer or samordningsnummer.
  *
diff --git a/lib/salary/traktamente.ts b/lib/salary/traktamente.ts
index 3dd0a0ec..eead1097 100644
--- a/lib/salary/traktamente.ts
+++ b/lib/salary/traktamente.ts
@@ -1,4 +1,5 @@
 import type { PayrollConfig } from './payroll-config'
+import type { MileageVehicleType } from '@/types'
 
 /**
  * Traktamente (per diem) and milersättning (mileage) calculations.
@@ -111,7 +112,7 @@ export function calculateTraktamente(params: {
 // Milersättning (Mileage Allowance)
 // ============================================================
 
-export type VehicleType = 'own_car' | 'company_car_fossil' | 'company_car_electric'
+export type VehicleType = MileageVehicleType
 
 /**
  * Calculate milersättning.
diff --git a/lib/skatteverket/manual-verifikat-prefill.ts b/lib/skatteverket/manual-verifikat-prefill.ts
index a1181eb7..8318bd5a 100644
--- a/lib/skatteverket/manual-verifikat-prefill.ts
+++ b/lib/skatteverket/manual-verifikat-prefill.ts
@@ -23,6 +23,7 @@
  */
 
 import { isIsoDateShaped } from '@/lib/invariants'
+import { UUID_RE } from '@/lib/invariants/uuid'
 import { roundOre } from '@/lib/money'
 
 /**
@@ -31,7 +32,6 @@ import { roundOre } from '@/lib/money'
  */
 export const SKATTEKONTO_ACCOUNT = '1630'
 
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
 const STORAGE_KEY = 'accounted.skv-manual-prefill'
 
 export interface SkvManualPrefill {
diff --git a/lib/supabase/proxy-timing.ts b/lib/supabase/proxy-timing.ts
index 7e8d946c..f5948a17 100644
--- a/lib/supabase/proxy-timing.ts
+++ b/lib/supabase/proxy-timing.ts
@@ -1,3 +1,5 @@
+import { UUID_RE } from '@/lib/invariants/uuid'
+
 /**
  * Per-request timing for the auth proxy (lib/supabase/middleware.ts).
  *
@@ -72,8 +74,6 @@ export function classifyProxyRequest(
   return 'page'
 }
 
-const UUID_RE =
-  /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
 const NUMERIC_RE = /^\d+$/
 /** Prefixes whose tail is a secret (invite tokens, payslip links, PKCE). */
 const TOKEN_PREFIXES = ['/invite', '/payslip', '/auth']
diff --git a/lib/tax/deadline-config.ts b/lib/tax/deadline-config.ts
index 0b01726b..c08e28f5 100644
--- a/lib/tax/deadline-config.ts
+++ b/lib/tax/deadline-config.ts
@@ -853,38 +853,3 @@ export function getApplicableDeadlineConfigs(
 ): TaxDeadlineConfig[] {
   return TAX_DEADLINE_CONFIGS.filter((config) => config.condition(settings))
 }
-
-/**
- * Map from tax deadline type to report URL generator
- */
-export const REPORT_URLS: Record<string, (period: { year: number; quarter?: number; month?: number }) => string> = {
-  vat: (p) => {
-    if (p.quarter) {
-      return `/reports?tab=vat&year=${p.year}&period=${p.quarter}`
-    }
-    if (p.month) {
-      return `/reports?tab=vat&year=${p.year}&period=${p.month}`
-    }
-    return `/reports?tab=vat&year=${p.year}`
-  },
-  'ne-declaration': () => '/reports?tab=ne-declaration',
-}
-
-/**
- * Get the report URL for a deadline
- */
-export function getReportUrl(
-  linkedReportType: string | null,
-  linkedReportPeriod: Record<string, unknown> | null
-): string | null {
-  if (!linkedReportType || !linkedReportPeriod) {
-    return null
-  }
-
-  const urlGenerator = REPORT_URLS[linkedReportType]
-  if (!urlGenerator) {
-    return null
-  }
-
-  return urlGenerator(linkedReportPeriod as { year: number; quarter?: number; month?: number })
-}
diff --git a/lib/tax/deadline-generator.ts b/lib/tax/deadline-generator.ts
index 3ac43237..8a69410e 100644
--- a/lib/tax/deadline-generator.ts
+++ b/lib/tax/deadline-generator.ts
@@ -15,6 +15,7 @@ import {
   type TaxAssessmentNoticeForDeadline,
 } from './deadline-config'
 import { adjustDeadlineToNextBankingDay } from './swedish-holidays'
+import { formatDateISO } from '@/lib/calendar/utils'
 
 /**
  * Rolling generation horizons. Recurring skattekonto obligations (monthly
@@ -86,21 +87,6 @@ export const TAX_RELEVANT_FIELDS = [
 export const DEADLINE_SETTINGS_SELECT =
   'company_id, entity_type, moms_period, f_skatt, preliminary_tax_monthly, vat_registered, pays_salaries, employer_registered, employer_seasonal, fiscal_year_start_month, vat_taxable_base_over_40m, vat_has_eu_trade, vat_filing_method, periodisk_sammanstallning_enabled, periodisk_sammanstallning_period, periodisk_sammanstallning_filing_method, kontrolluppgifter_enabled, rot_rut_enabled, oss_enabled, ioss_enabled, intrastat_enabled, punktskatt_enabled, fyllnadsinbetalning_enabled' as const
 
-/**
- * Check if any tax-relevant fields changed
- */
-export function didTaxFieldsChange(
-  oldSettings: Partial<CompanySettingsForDeadlines>,
-  newSettings: Partial<CompanySettingsForDeadlines>
-): boolean {
-  for (const field of TAX_RELEVANT_FIELDS) {
-    if (oldSettings[field] !== newSettings[field]) {
-      return true
-    }
-  }
-  return false
-}
-
 export function hasTaxRelevantFields(body: Record<string, unknown>): boolean {
   return TAX_RELEVANT_FIELDS.some((field) => Object.prototype.hasOwnProperty.call(body, field))
 }
@@ -277,16 +263,6 @@ interface SupersededDeadlineRow {
  */
 const MANUAL_STATUSES = new Set<DeadlineStatus>(['in_progress', 'submitted', 'confirmed'])
 
-/**
- * Format date to YYYY-MM-DD
- */
-function formatDateISO(date: Date): string {
-  const year = date.getFullYear()
-  const month = String(date.getMonth() + 1).padStart(2, '0')
-  const day = String(date.getDate()).padStart(2, '0')
-  return `${year}-${month}-${day}`
-}
-
 /**
  * Generate all tax deadlines for a user based on their company settings
  */
diff --git a/lib/tax/swedish-holidays.ts b/lib/tax/swedish-holidays.ts
index cdaadc92..5b16155a 100644
--- a/lib/tax/swedish-holidays.ts
+++ b/lib/tax/swedish-holidays.ts
@@ -2,6 +2,7 @@
  * Swedish holidays including Easter calculation
  * Used for adjusting tax deadlines that fall on weekends or holidays
  */
+import { formatDateISO } from '@/lib/calendar/utils'
 
 /**
  * Calculate Easter Sunday using the Anonymous Gregorian algorithm
@@ -121,16 +122,6 @@ function getAllaHelgonsDag(year: number): Date {
   throw new Error('Could not calculate Alla helgons dag')
 }
 
-/**
- * Format date to YYYY-MM-DD
- */
-function formatDateISO(date: Date): string {
-  const year = date.getFullYear()
-  const month = String(date.getMonth() + 1).padStart(2, '0')
-  const day = String(date.getDate()).padStart(2, '0')
-  return `${year}-${month}-${day}`
-}
-
 /**
  * Check if a date is a Swedish holiday
  */
@@ -181,21 +172,6 @@ export function getNextBankingDay(date: Date): Date {
   return result
 }
 
-/**
- * Get the previous banking day from a given date
- * If the date is already a banking day, return it
- * Otherwise, find the previous banking day
- */
-export function getPreviousBankingDay(date: Date): Date {
-  const result = new Date(date)
-
-  while (!isBankingDay(result)) {
-    result.setDate(result.getDate() - 1)
-  }
-
-  return result
-}
-
 /**
  * Adjust a deadline date to the next banking day if it falls on a weekend or holiday
  * Skatteverket deadlines that fall on non-banking days are moved to the next banking day
@@ -203,45 +179,3 @@ export function getPreviousBankingDay(date: Date): Date {
 export function adjustDeadlineToNextBankingDay(date: Date): Date {
   return getNextBankingDay(date)
 }
-
-/**
- * Get the month name in Swedish
- */
-export function getSwedishMonthName(month: number): string {
-  const months = [
-    'januari',
-    'februari',
-    'mars',
-    'april',
-    'maj',
-    'juni',
-    'juli',
-    'augusti',
-    'september',
-    'oktober',
-    'november',
-    'december',
-  ]
-  return months[month]
-}
-
-/**
- * Get quarter number (1-4) from month (0-11)
- */
-export function getQuarterFromMonth(month: number): number {
-  return Math.floor(month / 3) + 1
-}
-
-/**
- * Get the first month of a quarter (0-indexed)
- */
-export function getFirstMonthOfQuarter(quarter: number): number {
-  return (quarter - 1) * 3
-}
-
-/**
- * Get the last month of a quarter (0-indexed)
- */
-export function getLastMonthOfQuarter(quarter: number): number {
-  return quarter * 3 - 1
-}
diff --git a/lib/transactions/__tests__/ingest.test.ts b/lib/transactions/__tests__/ingest.test.ts
index 2cc86cd9..51c62371 100644
--- a/lib/transactions/__tests__/ingest.test.ts
+++ b/lib/transactions/__tests__/ingest.test.ts
@@ -5,7 +5,8 @@
  * and result aggregation.
  */
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { ingestTransactions, type RawTransaction } from '../ingest'
+import { ingestTransactions } from '../ingest'
+import type { RawTransaction } from '@/types'
 import { makeJournalEntry, makeTransaction } from '@/tests/helpers'
 
 // ---------------------------------------------------------------------------
diff --git a/lib/transactions/ingest.ts b/lib/transactions/ingest.ts
index 085df1b1..a9baf5c2 100644
--- a/lib/transactions/ingest.ts
+++ b/lib/transactions/ingest.ts
@@ -13,9 +13,6 @@ import { isImportedTransaction } from '@/lib/transactions/origin'
 import { createLogger } from '@/lib/logger'
 import type { Transaction, RawTransaction, IngestResult, IngestOptions, SupplierInvoice, Currency, ExchangeRate } from '@/types'
 
-// Re-export types for backward compatibility
-export type { RawTransaction, IngestResult } from '@/types'
-
 /**
  * Sentinel for a (date, öre) bucket whose incoming rows carry more than one
  * currency: the booked-hand-entered mirror's per-bucket currency gate cannot be
diff --git a/lib/transactions/period-filter.ts b/lib/transactions/period-filter.ts
index 4e03e928..4e8f03a5 100644
--- a/lib/transactions/period-filter.ts
+++ b/lib/transactions/period-filter.ts
@@ -1,4 +1,5 @@
 import type { FiscalPeriod } from '@/types'
+import { addDaysIso as addDays } from '@/lib/dates/iso'
 
 /** Inclusive ISO date bounds (yyyy-MM-dd) for a period filter. */
 export interface PeriodBounds {
@@ -28,12 +29,6 @@ function addMonths(iso: string, months: number): string {
   return toIso(year, monthIndex + 1, Math.min(d, lastDay))
 }
 
-function addDays(iso: string, days: number): string {
-  const date = new Date(`${iso}T00:00:00Z`)
-  date.setUTCDate(date.getUTCDate() + days)
-  return date.toISOString().slice(0, 10)
-}
-
 /**
  * Date bounds for one quarter of a fiscal period. Quarters follow the fiscal
  * year, not the calendar: Q1 starts at period_start, so a brutet rakenskapsar
diff --git a/lib/utils.ts b/lib/utils.ts
index 68410157..4e5d9385 100644
--- a/lib/utils.ts
+++ b/lib/utils.ts
@@ -178,19 +178,30 @@ export function formatOrgNumber(orgNumber: string): string {
   return orgNumber
 }
 
+/** UTC YYYYMMDD stamp (e.g. for archive download filenames). */
+export function utcDateStamp(date: Date): string {
+  const year = date.getUTCFullYear()
+  const month = String(date.getUTCMonth() + 1).padStart(2, '0')
+  const day = String(date.getUTCDate()).padStart(2, '0')
+  return `${year}${month}${day}`
+}
+
+/** Resolve after `ms` milliseconds (setTimeout as a promise). */
+export function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
+/** Split `items` into consecutive slices of at most `size` elements. */
+export function chunk<T>(items: readonly T[], size: number): T[][] {
+  const out: T[][] = []
+  for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size))
+  return out
+}
+
 export function getCompanyDisplayName(settings: { company_name?: string | null }): string {
   return settings.company_name?.trim() || ''
 }
 
-export function getCompanyPrimaryName(settings: { company_name?: string | null }): string {
-  return settings.company_name?.trim() || ''
-}
-
-export function generateInvoiceNumber(): string {
-  const year = new Date().getFullYear()
-  const random = Math.floor(Math.random() * 10000).toString().padStart(4, '0')
-  return `${year}-${random}`
-}
 
 // Shared FX-rate validator: keeps UI, RPC (>= 100000 / <= 0), and the
 // invoices/supplier_invoices CHECK constraints in sync. Single source
diff --git a/lib/vat/moms-box-mapping.ts b/lib/vat/moms-box-mapping.ts
index 406c1ee2..51abb4a3 100644
--- a/lib/vat/moms-box-mapping.ts
+++ b/lib/vat/moms-box-mapping.ts
@@ -201,15 +201,3 @@ export function getBoxForAccount(accountNumber: string): MomsBox | undefined {
 export function getBoxLabel(box: MomsBox): string {
   return BOX_LABELS[box]
 }
-
-/** Boxes that represent VAT-exempt export/EU sales (no output VAT) */
-export const EXPORT_BOXES: MomsBox[] = ['35', '36', '38', '39', '40']
-
-/** Boxes that represent taxable domestic sales (have output VAT) */
-export const DOMESTIC_BOXES: MomsBox[] = ['05', '06', '07', '08']
-
-/** Boxes that represent output VAT */
-export const OUTPUT_VAT_BOXES: MomsBox[] = ['10', '11', '12']
-
-/** Boxes that represent input VAT */
-export const INPUT_VAT_BOXES: MomsBox[] = ['48']
diff --git a/lib/webhooks/signing.ts b/lib/webhooks/signing.ts
index 22fe7196..bf91e836 100644
--- a/lib/webhooks/signing.ts
+++ b/lib/webhooks/signing.ts
@@ -8,8 +8,10 @@
  *   `${t}.${rawBody}`
  *
  * The `t` (unix timestamp in seconds) is included in the signed payload
- * so receivers can implement replay-window checks. We default to a 5-minute
- * tolerance on the verify side; receivers can pick their own.
+ * so receivers can implement replay-window checks. The receiver-side
+ * verification (parse the header, recompute the HMAC, apply a 5-minute
+ * tolerance) is documented in the docs cookbook (lib/docs/content/webhooks.ts);
+ * receivers can pick their own tolerance.
  *
  * Why HMAC-SHA256 (not Ed25519): every Node/Python/Go/Ruby stdlib has it,
  * receivers can verify without adding a dep. Asymmetric signing buys nothing
@@ -49,74 +51,6 @@ export function signPayload(args: {
   }
 }
 
-/**
- * Parse a signature header into its components. Returns null if malformed.
- * Used by the receiver-side example in the docs cookbook (Phase 6 PR-2);
- * exported here so a single canonical implementation lives in this file.
- */
-export function parseSignatureHeader(header: string): SignedHeaderParts | null {
-  const parts = header.split(',').map((s) => s.trim())
-  let t: number | null = null
-  let v1: string | null = null
-  for (const p of parts) {
-    const eq = p.indexOf('=')
-    if (eq === -1) continue
-    const k = p.slice(0, eq)
-    const v = p.slice(eq + 1)
-    if (k === 't') {
-      const parsed = Number.parseInt(v, 10)
-      if (Number.isFinite(parsed)) t = parsed
-    } else if (k === 'v1') {
-      v1 = v
-    }
-  }
-  if (t === null || !v1) return null
-  return { t, v1 }
-}
-
-/**
- * Verify a signature against a raw body. Constant-time comparison.
- * Returns true if the signature is valid AND within the tolerance window.
- *
- * Use this in the cookbook examples and in the :test endpoint's loopback
- * verification.
- */
-export function verifySignature(args: {
-  body: string
-  header: string
-  secret: string
-  /** Tolerance window in seconds. Defaults to 300 (5 min). */
-  toleranceSeconds?: number
-  /** Override for tests. Defaults to current unix-seconds. */
-  now?: number
-}): boolean {
-  const parsed = parseSignatureHeader(args.header)
-  if (!parsed) return false
-
-  const tolerance = args.toleranceSeconds ?? 300
-  const now = args.now ?? Math.floor(Date.now() / 1000)
-  if (Math.abs(now - parsed.t) > tolerance) return false
-
-  const expected = crypto
-    .createHmac(ALGORITHM, args.secret)
-    .update(`${parsed.t}.${args.body}`)
-    .digest('hex')
-
-  // timingSafeEqual requires equal-length buffers: return false (not throw)
-  // for length mismatch, the common case for a forged signature.
-  //
-  // Compare buffer lengths AFTER decoding rather than hex-string lengths:
-  // `Buffer.from(v1, 'hex')` silently drops invalid hex bytes, so a v1 that
-  // is the right hex length (64 chars for SHA-256) but contains non-hex
-  // characters decodes to a SHORTER buffer than `expected`. Without this
-  // check the timingSafeEqual call throws RangeError instead of returning
-  // false, exposing a crash path to any caller passing a malformed header.
-  const expectedBuf = Buffer.from(expected, 'hex')
-  const actualBuf = Buffer.from(parsed.v1, 'hex')
-  if (expectedBuf.length !== actualBuf.length) return false
-  return crypto.timingSafeEqual(expectedBuf, actualBuf)
-}
-
 /**
  * Generate a fresh webhook secret. 32 bytes of crypto-random hex (256 bits
  * of entropy, 64-character output). Returned to the caller exactly once on
diff --git a/lib/webhooks/url-guard.ts b/lib/webhooks/url-guard.ts
index db1defb7..24ed4230 100644
--- a/lib/webhooks/url-guard.ts
+++ b/lib/webhooks/url-guard.ts
@@ -182,5 +182,3 @@ function classifyAddress(address: string): AddressClass {
   if (/^fe[89ab]/.test(v6)) return 'link_local_address'
   return 'public'
 }
-
-export const __TESTING__ = { classifyAddress }
diff --git a/lib/webshop-orders/booking-lines.ts b/lib/webshop-orders/booking-lines.ts
index 152e6935..1531978a 100644
--- a/lib/webshop-orders/booking-lines.ts
+++ b/lib/webshop-orders/booking-lines.ts
@@ -37,8 +37,6 @@ import type {
  * it is a claim on the payment provider, not on the customer.
  */
 export const DEFAULT_PAYMENT_ACCOUNT = '1686'
-/** BAS 2026 name for DEFAULT_PAYMENT_ACCOUNT; used when adding it to a chart. */
-export const DEFAULT_PAYMENT_ACCOUNT_NAME = 'Fordringar för kontokort och kuponger'
 
 /**
  * Default revenue account per Swedish VAT rate: the standard BAS 2026
diff --git a/lib/webshop-orders/ingest.ts b/lib/webshop-orders/ingest.ts
index 9096676f..ac1a58b9 100644
--- a/lib/webshop-orders/ingest.ts
+++ b/lib/webshop-orders/ingest.ts
@@ -1,3 +1,4 @@
+import { chunk } from '@/lib/utils'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { fetchExchangeRate } from '@/lib/currency/riksbanken'
 import { roundOre as round } from '@/lib/money'
@@ -85,12 +86,6 @@ type ExistingRow = Pick<
   | 'line_items'
 >
 
-function chunk<T>(items: T[], size: number): T[][] {
-  const out: T[][] = []
-  for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size))
-  return out
-}
-
 /**
  * Rows whose financials must not be silently refreshed. Booked/invoiced rows
  * are frozen by the DB trigger; manually marked rows (#1879) are treated the
diff --git a/lib/xml/escape.ts b/lib/xml/escape.ts
new file mode 100644
index 00000000..13f92a6f
--- /dev/null
+++ b/lib/xml/escape.ts
@@ -0,0 +1,14 @@
+/**
+ * Escape a string for use as XML text or attribute content. Used by every
+ * XML-emitting generator (AGI, KU10, pain.001, Peppol BIS, ROT/RUT). The
+ * replace order matters: `&` first, so the entities it produces are not
+ * re-escaped.
+ */
+export function escapeXml(str: string): string {
+  return str
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&apos;')
+}
diff --git a/messages/en.json b/messages/en.json
index 01e541bb..bef56716 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -7,69 +7,28 @@
     "save": "Save",
     "saving": "Saving...",
     "cancel": "Cancel",
-    "create": "Create",
-    "add": "Add",
     "delete": "Delete",
     "edit": "Edit",
     "back": "Back",
-    "next": "Next",
-    "previous": "Previous",
     "pager_previous": "Previous record",
     "pager_next": "Next record",
     "pager_position": "{index} of {total}",
     "close": "Close",
-    "search": "Search",
-    "filter": "Filter",
     "loading": "Loading...",
     "load_more": "Load more",
     "retry": "Try again",
     "load_error": "Could not load data",
-    "confirm": "Confirm",
-    "yes": "Yes",
-    "no": "No",
-    "remove": "Remove",
-    "submit": "Submit",
-    "send": "Send",
-    "download": "Download",
-    "upload": "Upload",
-    "copy": "Copy",
-    "copied": "Copied",
     "open": "Open",
-    "select": "Select",
-    "all": "All",
-    "none": "None",
-    "more": "More",
-    "less": "Less",
-    "show": "Show",
-    "hide": "Hide",
-    "actions": "Actions",
-    "settings": "Settings",
-    "language": "Language",
     "language_swedish": "Swedish",
     "language_english": "English",
-    "appearance": "Appearance",
     "theme_light": "Light",
     "theme_dark": "Dark",
     "theme_system": "System",
     "logout": "Sign out",
     "logout_description": "Sign out of your account",
-    "account_settings": "Account settings",
     "status": {
-      "posted": "Posted",
-      "draft": "Draft",
-      "pending": "Pending",
-      "approved": "Approved",
-      "archived": "Archived",
-      "paid": "Paid",
-      "unpaid": "Unpaid",
-      "overdue": "Overdue",
-      "cancelled": "Cancelled",
-      "sent": "Sent",
-      "matched": "Matched",
-      "unmatched": "Unmatched"
     },
     "more_options": "More options",
-    "popup_blocked_title": "The browser blocked the tab",
     "popup_blocked_description": "Allow pop-ups for {appName} in your browser and try again.",
     "source_code": "Source code"
   },
@@ -406,14 +365,9 @@
     "team": "Members and roles",
     "brand": "Brand",
     "banking": "Bank (PSD2)",
-    "skatteverket": "Skatteverket",
     "salary": "Payroll",
     "templates": "Templates",
-    "agent_profile": "Company profile",
-    "agent_memory": "Assistant memory",
-    "agent_skills": "Assistant knowledge",
     "assistant": "Assistant",
-    "backup": "Backup",
     "account": "Account",
     "api": "API & MCP",
     "billing": "Subscription",
@@ -583,7 +537,6 @@
   },
   "settings": {
     "group_profile": "Profile",
-    "section_name": "Name",
     "digest_group": "Notifications",
     "digest_label": "New items to book",
     "digest_description": "A daily email when new bank transactions or inbox documents are waiting to be booked. Counts only, never amounts.",
@@ -801,12 +754,9 @@
     "generate_none_title": "No deadlines created",
     "generate_none_description": "No new deadlines to create. Check that your tax settings are filled in if you expected more.",
     "generate_failed_title": "Could not create deadlines",
-    "generate_failed_description": "Tax deadlines could not be created right now.",
     "group_skattekonto_title": "Skattekonto",
     "group_same_day": "{count} deadlines on the same day",
     "group_mark_done": "Mark as done",
-    "group_confirm_question": "Mark <hl>{title}</hl> as done?",
-    "group_cancel": "Cancel",
     "group_confirm": "Confirm",
     "new_deadline": "New deadline",
     "subscribe_calendar": "Subscribe in your calendar",
@@ -836,68 +786,6 @@
     "empty_filtered": "No deadlines match the filter.",
     "confirm_done_title": "Mark as done?"
   },
-  "bureau": {
-    "title": "Bureau",
-    "subtitle": "Overview of every client company you have access to",
-    "section_title": "Bureau mode",
-    "enable_setting": "Enable bureau mode",
-    "enable_setting_description": "Shows an aggregated overview of every client company you have access to",
-    "toggle_saved": "Bureau mode updated",
-    "toggle_save_failed": "Could not save bureau setting",
-    "tiles": {
-      "clients": "Clients total",
-      "pending": "Awaiting approval",
-      "deadlines": "Deadlines this week",
-      "overdue_ar": "Overdue invoices"
-    },
-    "action": {
-      "open": "Open"
-    },
-    "pending_label": "Pending operations",
-    "deadlines_label": "Upcoming deadlines",
-    "no_pending": "No pending operations",
-    "no_deadlines": "No deadlines this week",
-    "show_pending": "Show pending",
-    "high_risk": "{count} high risk",
-    "kpi": {
-      "revenue_mtd": "Revenue MTD",
-      "cash": "Cash",
-      "overdue_ar": "Overdue AR"
-    },
-    "role": {
-      "owner": "owner",
-      "admin": "admin",
-      "member": "member",
-      "viewer": "viewer"
-    },
-    "deadline_status": {
-      "overdue": "overdue"
-    },
-    "empty": {
-      "title": "No client companies yet",
-      "description": "Once you are added to a company it will appear here."
-    }
-  },
-  "insights": {
-    "title": "Insights",
-    "empty": "No anomalies found",
-    "severity_flag": "Address",
-    "severity_warn": "Review",
-    "severity_info": "Info",
-    "action_dismiss": "Dismiss",
-    "action_snooze": "Snooze 7d",
-    "subject_open": "Open source",
-    "dashboard_tile_title": "Anomalies",
-    "dashboard_tile_subtitle": "{count} to address",
-    "rules": {
-      "outlier_amount": "Unusual amount for counterparty",
-      "missing_recurring": "Missing recurring vendor",
-      "duplicate_suspect": "Possible duplicate",
-      "stale_uncategorized": "Old uncategorized transaction",
-      "vat_rate_outlier": "Unusual VAT rate",
-      "stale_customer_balance": "Stale customer balance"
-    }
-  },
   "supplier_invoices": {
     "title": "Supplier invoices",
     "load_failed_title": "Could not load supplier invoices",
@@ -1010,34 +898,6 @@
     "mark_all_result_failed": "{count} could not be booked. Open the invoices and try again.",
     "mark_all_result_settled": "{count} were already paid."
   },
-  "purchase_orders": {
-    "title": "Purchase orders",
-    "new": "New purchase order",
-    "empty_title": "No purchase orders yet",
-    "empty_description": "Create a purchase order to plan a purchase, record goods receipts, and reconcile against the supplier invoice.",
-    "filter_open": "Open",
-    "filter_all": "All",
-    "th_number": "Number",
-    "th_supplier": "Supplier",
-    "th_order_date": "Order date",
-    "th_status": "Status",
-    "th_expected_delivery": "Expected delivery",
-    "th_amount": "Amount",
-    "status_draft": "Draft",
-    "status_sent": "Sent",
-    "status_partially_received": "Partially received",
-    "status_received": "Received",
-    "status_partially_invoiced": "Partially invoiced",
-    "status_closed": "Closed",
-    "status_cancelled": "Cancelled",
-    "send": "Mark as sent",
-    "receive": "Receive goods",
-    "cancel": "Cancel order",
-    "three_way_match_failed": "Three-way match failed. Verify quantities and prices against the purchase order.",
-    "po_link_required": "Company settings require supplier invoices to be linked to a purchase order.",
-    "match_within_tolerance": "Within tolerance",
-    "match_out_of_tolerance": "Outside tolerance"
-  },
   "suppliers": {
     "title": "Suppliers",
     "new_supplier": "New supplier",
@@ -1258,26 +1118,11 @@
     "password_signup_unavailable": "Password sign-up is not available on this installation."
   },
   "mfa": {
-    "enroll_title": "Set up two-step verification",
-    "enroll_subtitle": "Secure your account with an authenticator app",
     "verify_title": "Two-step verification",
-    "verify_subtitle": "Enter the code from your authenticator app",
     "verify_code_label": "Verification code",
     "verify_button": "Verify",
     "verifying": "Verifying...",
-    "enroll_step_qr": "Scan the QR code",
-    "enroll_step_qr_hint": "Use an authenticator app like Google Authenticator, Authy, or 1Password.",
-    "enroll_show_secret": "Show secret manually",
-    "enroll_step_verify": "Verify code",
-    "enroll_step_verify_hint": "Enter the code from your app to complete enrollment.",
-    "enroll_finish": "Enable",
-    "enroll_finishing": "Enabling...",
-    "enroll_failed_title": "Could not enable two-step verification",
     "verify_failed_title": "Verification failed",
-    "verify_failed_description": "The code is incorrect or has expired.",
-    "enrolled_title": "Two-step verification enabled",
-    "enrolled_description": "Your account is now protected.",
-    "back": "Back",
     "verify_subtitle_full": "Enter the 6-digit code from your authenticator app",
     "verify_challenge_failed_description": "Could not start verification. Please try again.",
     "wrong_code_title": "Wrong code",
@@ -1449,7 +1294,6 @@
     "type_swedish_business": "Swedish company or organization",
     "type_eu_business": "EU business",
     "type_non_eu_business": "Business outside EU",
-    "type_hint": "Supplier type affects how VAT is handled on purchases",
     "email_label": "Email",
     "email_placeholder": "contact@company.com",
     "email_invalid": "Invalid email address",
@@ -1463,14 +1307,7 @@
     "org_number_label": "Org. number",
     "org_number_placeholder": "XXXXXX-XXXX",
     "vat_label": "VAT number",
-    "vat_placeholder_eu": "DE123456789",
     "vat_placeholder_se": "SE123456789001",
-    "vat_verify": "Verify",
-    "vat_verified_title": "VAT number verified",
-    "vat_verified_description": "Company: {name}",
-    "vat_failed_title": "Verification failed",
-    "vat_failed_default": "The VAT number could not be verified",
-    "vat_error_title": "Could not verify VAT number",
     "payment_section": "Payment details",
     "bankgiro_label": "Bankgiro",
     "bankgiro_placeholder": "123-4567",
@@ -1478,12 +1315,10 @@
     "iban_label": "IBAN",
     "iban_placeholder": "SE45 5000 0000 0583 9825 7466",
     "swift_label": "SWIFT/BIC",
-    "bank_account_label": "Bank account",
     "clearing_label": "Clearing number",
     "account_number_label": "Account number",
     "default_payment_terms_label": "Payment terms (days)",
     "default_account_label": "Default account",
-    "default_account_placeholder": "e.g. 5410",
     "default_account_clear": "Clear default account",
     "default_currency_label": "Default currency",
     "notes_label": "Notes",
@@ -1492,37 +1327,6 @@
     "submit_saving": "Saving...",
     "viewer_disabled_tooltip": "You only have viewer access in this company"
   },
-  "upcoming_deadlines": {
-    "title": "Upcoming deadlines",
-    "overdue_badge": "{count} overdue",
-    "action_needed_badge": "{count} to act on",
-    "today": "Today",
-    "tomorrow": "Tomorrow",
-    "time_prefix": "at",
-    "tax_badge": "Tax",
-    "mark_as_submitted": "Mark as submitted",
-    "mark_as_confirmed": "Mark as confirmed",
-    "view_all": "View all deadlines",
-    "toast_status_updated": "Status updated",
-    "toast_status_updated_description": "Deadline marked as {status}",
-    "toast_status_update_failed": "Could not update status"
-  },
-  "tax_todo": {
-    "title": "To do: Tax",
-    "overdue_badge": "{count} overdue",
-    "action_needed_badge": "{count} soon",
-    "today": "Today",
-    "tomorrow": "Tomorrow",
-    "days_ago": "{count} days ago",
-    "in_days": "In {count} days",
-    "start": "Start",
-    "submitted": "Submitted",
-    "more_tasks": "+{count} more tasks",
-    "view_all": "View all deadlines",
-    "toast_status_updated": "Status updated",
-    "toast_status_updated_description": "Marked as {status}",
-    "toast_status_update_failed": "Could not update status"
-  },
   "initial_setup": {
     "completed_verdict": "Your bookkeeping is up and running.",
     "title": "{count} steps and your bookkeeping is running",
@@ -1536,10 +1340,6 @@
     "step_bank_description": "Fetch transactions automatically, or import a bank statement.",
     "step_bank_sweep_note": "{matched, plural, one {# matched against the import} other {# matched against the import}}, {toReview, plural, one {# to review} other {# to review}}",
     "step_bank_action": "Connect the bank",
-    "step_assistant_title": "Build your bookkeeping assistant",
-    "step_assistant_beta": "Beta",
-    "step_assistant_description": "A few questions about your business calibrate an assistant that suggests bookkeeping for you.",
-    "step_assistant_action": "Get started",
     "dismiss": "Hide",
     "step_skv_title": "Connect Skatteverket",
     "step_skv_description": "See the tax account and file VAT and employer declarations right from here. Connects with BankID in a couple of minutes.",
@@ -1812,7 +1612,6 @@
     "phone_label": "Phone",
     "email_label": "Email",
     "website_label": "Website",
-    "members_invite_title": "Invite to {companyName}",
     "members_invite_description": "The person gets access to this company only.",
     "members_invite_email_label": "Email address",
     "members_invite_email_placeholder": "name@example.com",
@@ -1843,7 +1642,6 @@
     "members_remove_failed": "Could not remove member.",
     "members_invite_revoked": "Invitation revoked",
     "members_invite_revoke_failed": "Could not revoke invitation.",
-    "invitations_pending_title": "Pending invitations",
     "invitations_expires": "Expires {date}",
     "logo_heading": "Logo",
     "logo_help": "Shown in the header of your invoices. Max 10 MB, PNG/JPG/WebP.",
@@ -1968,9 +1766,6 @@
     "wrapper_save_changes": "Save changes",
     "wrapper_readonly_tooltip": "You have read-only access to this company"
   },
-  "settings_invoicing": {
-    "bank_validation_title": "Check bank details"
-  },
   "settings_invoicing_preview": {
     "title": "Preview",
     "preview_button": "Preview invoice",
@@ -2056,7 +1851,6 @@
   "settings_team": {},
   "settings_templates": {},
   "settings_salary": {
-    "title": "Payroll settings",
     "payments_heading": "Payment",
     "pay_day_label": "Pay day",
     "pay_day_help": "Day of the month salaries are paid (1–28). Used as the default for new payroll runs and for reminders.",
@@ -2076,21 +1870,11 @@
     "vacation_info_link": "Manage employees",
     "accounting_heading": "Bookkeeping",
     "voucher_series_label": "Default voucher series for payroll",
-    "voucher_series_a": "A: Standard",
-    "voucher_series_l": "L: Löner",
     "voucher_series_help": "Can be changed per payroll run. Each series has unbroken voucher numbers per fiscal year.",
     "tax_tables_heading": "Skattetabeller",
     "tax_tables_help": "Tax tables and municipal tax rates are fetched automatically from Skatteverket's open data on every payroll run. No manual update is needed. If Skatteverket's API is unavailable, an embedded fallback copy is used until the service is back.",
     "vacation_heading": "Vacation",
     "vacation_rule_label": "Default vacation rule",
-    "vacation_rule_percentage": "Procentregeln (12%)",
-    "vacation_rule_same_pay": "Sammalöneregeln",
-    "vacation_rule_none": "No vacation accrual",
-    "vacation_supplement_label": "Vacation supplement",
-    "vacation_supplement_min": "0.43% (statutory minimum)",
-    "vacation_supplement_cba": "0.80% (common collective agreement level)",
-    "vacation_supplement_help": "Applied with sammalöneregeln. Can be overridden per employee.",
-    "info_heading": "Information",
     "info_payroll_scope": "The payroll module handles salaries for your employees: tax deductions, employer contributions, vacation pay liability and the employer declaration (AGI). If you run a sole proprietorship (enskild firma), you as the owner take money out via owner's drawings (account 2013), not salary.",
     "info_current_year": "<strong>Current year:</strong> 2026 (Arbetsgivaravgifter 31.42%, prisbasbelopp 59,200 SEK)"
   },
@@ -2147,10 +1931,6 @@
     "tax_mark_paid_timeout": "The server did not respond in time. Reload the page and check whether the change was saved.",
     "tax_mark_paid_network": "No connection to the server. Check your internet connection and try again."
   },
-  "settings_backup": {
-    "heading": "Backup",
-    "intro": "Download your own copy of all accounting data (SIE files, receipts, supporting documents and processing history) in a single ZIP file. {appName} archives all accounting data for at least 7 years per BFL 7 kap. 2 §, so your backup does not replace our legal obligation; it complements it."
-  },
   "settings_api": {},
   "settings_banking": {
     "connect_failed_title": "Connection failed",
@@ -2199,28 +1979,6 @@
     "blockers_load_failed": "The list of companies you own could not be loaded, so the account cannot be deleted right now.",
     "blockers_load_retry": "Try again"
   },
-  "settings_bank_details_form": {
-    "heading": "Bank details",
-    "subheading": "Shown on your invoices",
-    "bank_label": "Bank",
-    "clearing_label": "Clearing",
-    "clearing_error": "Must be 4-5 digits",
-    "account_number_label": "Account number",
-    "account_number_error": "Must be 6-12 digits",
-    "bankgiro_label": "Bankgiro",
-    "bankgiro_error": "Invalid bankgiro number",
-    "plusgiro_label": "Plusgiro",
-    "plusgiro_error": "Invalid plusgiro number",
-    "swish_label": "Swish",
-    "swish_placeholder": "123 XXX XX XX or 07X XXX XX XX",
-    "swish_error": "Invalid Swish number (business number 123XXXXXXX or mobile number 07XXXXXXXX)",
-    "iban_label": "IBAN",
-    "iban_error": "Invalid IBAN (SE followed by 22 digits)",
-    "iban_hint": "Required for the payment file (ISO 20022) when paying salaries",
-    "bic_label": "BIC/SWIFT",
-    "bic_placeholder": "Filled in automatically",
-    "bic_error": "Invalid BIC/SWIFT (8 or 11 characters)"
-  },
   "settings_billing": {
     "load_failed": "The subscription details could not be loaded, so your status cannot be shown right now.",
     "load_retry": "Try again",
@@ -2369,7 +2127,6 @@
     "access_enabled_send_only": "Enabled for sending e-invoices. Receiving is not included; write to support if you want to receive."
   },
   "settings_pdf_print": {
-    "coming_soon": "Coming soon",
     "heading": "Print & PDF",
     "toast_save_failed": "Could not save",
     "font_label": "Invoice font",
@@ -2573,7 +2330,6 @@
   "settings_voucher_series": {
     "heading": "Verifikationsserier",
     "empty_state": "No voucher series yet. Series {series} is created automatically with the first voucher.",
-    "active_series_label": "Active series",
     "series_prefix": "Series",
     "default_badge": "default",
     "latest_number": "Latest no.",
@@ -3017,7 +2773,6 @@
     "confirm_unlink": "Unlink BankID from your account?",
     "toast_unlinked": "BankID unlinked",
     "toast_unlink_failed": "Could not unlink BankID",
-    "link_bankid_title": "Link BankID",
     "link_bankid_description": "Scan the QR code with the BankID app",
     "linked_description": "Your account is linked to BankID.",
     "not_linked_description": "Link BankID for more secure sign-in.",
@@ -3051,7 +2806,6 @@
     "toast_unenroll_failed_title": "Could not disable 2FA",
     "toast_mfa_disabled_title": "Two-factor authentication disabled",
     "toast_mfa_disabled_description": "2FA has been removed from your account.",
-    "change_password_title": "Change password",
     "change_password_description": "Update your password. If you sign in with an email link, you can set a password here.",
     "new_password_label": "New password",
     "new_password_placeholder": "At least 8 characters",
@@ -3112,7 +2866,6 @@
     "skv_counterpart_body": "There is a skattekonto event on {date} that matches: post this voucher first, then link the skattekonto row to the same voucher instead of posting it twice.",
     "match_invoice_btn": "Match invoice {number}",
     "match_supplier_invoice_btn": "Match supplier invoice {number}",
-    "choose_template_btn": "Choose template...",
     "match_voucher_btn": "Match to existing voucher",
     "attach_document_btn": "Match to document",
     "more_actions_aria": "More actions",
@@ -3157,7 +2910,6 @@
     "adjustment": "Adjustment"
   },
   "tx_quick_review": {
-    "open_attached_failed": "Could not open the receipt",
     "exchange_rate_fetch_failed": "Could not fetch the exchange rate.",
     "title": "Review posting",
     "description_template": "Review the journal entry before posting",
@@ -3177,17 +2929,10 @@
     "no_vat_liability_account": "No VAT for liability/equity accounts",
     "no_vat_default": "No VAT",
     "change": "Change",
-    "attached_doc_label": "Receipt attached",
-    "attached_doc_source": "from document inbox",
-    "opening": "Opening…",
-    "view": "View",
     "doc_label": "Receipt",
     "doc_attached_count": "{count} attached",
-    "doc_pick_existing": "Choose from the inbox",
     "doc_pick_existing_inline": "or choose an existing document from the inbox",
     "doc_picked_remove": "Remove document",
-    "doc_link_failed_title": "Receipt could not be attached",
-    "doc_link_failed_description": "{count} file(s) could not be linked to the journal entry.",
     "doc_link_failed_booked_title": "Booked, but documents are missing",
     "doc_link_failed_booked_description": "The transaction was booked, but {count} document(s) could not be attached to the journal entry: {files}. Open the entry to attach them again.",
     "doc_link_open_entry": "Open the entry",
@@ -3200,8 +2945,6 @@
   "tx_booking_dialog": {
     "title": "Post transaction",
     "description": "Create a journal entry for the transaction",
-    "doc_label": "Receipt (optional)",
-    "doc_attached_count": "{count} attached",
     "doc_pick_existing": "Choose existing document",
     "doc_pick_existing_inline": "or choose an existing document from the inbox",
     "doc_picked_remove": "Remove document",
@@ -3257,54 +3000,11 @@
     "income_label": "Income"
   },
   "tx_inbox_zero": {
-    "empty_title": "No transactions",
-    "empty_description": "Import a bank statement or add transactions manually to get started.",
-    "import_btn": "Import transactions",
-    "add_manual_btn": "Add manually",
     "done_title": "All transactions posted!",
     "done_description": "Nice work! All your transactions are posted. Import more or switch to history.",
     "import_more_btn": "Import more",
     "new_btn": "New transaction"
   },
-  "tx_swipe_view": {
-    "doc_link_failed_title": "Receipt could not be attached",
-    "doc_link_failed_description": "{count} file(s) could not be linked to the journal entry.",
-    "booking_failed_skip": "Could not post. Tap \"Skip\" to continue.",
-    "generic_error_skip": "An error occurred. Tap \"Skip\" to continue.",
-    "match_failed_skip": "Could not match the invoice. Tap \"Skip\" to continue.",
-    "done_title": "Done!",
-    "done_subtitle": "All transactions are now posted",
-    "back_to_transactions": "Back to transactions",
-    "choose_template": "Choose template",
-    "skip": "Skip",
-    "review_title": "Review posting",
-    "label_template": "Template",
-    "label_category": "Category",
-    "change_template": "Change template",
-    "reverse_charge_warning": "Reverse charge requires the supplier's VAT registration number and country.",
-    "label_account": "Account",
-    "label_vat_treatment": "VAT treatment",
-    "no_vat_liability_account": "No VAT for liability/equity accounts",
-    "no_vat_default": "No VAT",
-    "change": "Change",
-    "doc_label": "Receipt",
-    "doc_attached_count": "{count} attached",
-    "booking": "Posting...",
-    "book": "Post",
-    "progress_label": "{current} of {total}",
-    "instr_skip": "Skip",
-    "instr_book": "Post",
-    "indicator_skip": "Skip",
-    "indicator_business": "Business",
-    "badge_receipt": "Receipt",
-    "badge_attachment": "Attachment",
-    "invoice_match_title": "Invoice match found",
-    "invoice_match_badge": "Match",
-    "invoice_label": "Invoice {number}",
-    "unknown_customer": "Unknown customer",
-    "match_invoice_btn": "Match with invoice {number}",
-    "suggested_categories": "Suggested categories"
-  },
   "tx_template_picker": {
     "group_premises": "Premises",
     "group_vehicle": "Vehicle",
@@ -3441,9 +3141,6 @@
     "preview_truncated": "+ {remaining} more lines on booking",
     "col_account": "Account",
     "col_description": "Description",
-    "accounts_loading": "Loading chart of accounts...",
-    "accounts_load_failed": "The chart of accounts could not be loaded. Try again to change the account.",
-    "accounts_retry": "Try again",
     "col_debit": "Debit",
     "col_credit": "Credit",
     "total_label": "Total",
@@ -3704,7 +3401,6 @@
     "skv_badge": "Skatteverket",
     "duplicate_title_with_voucher": "Possible duplicate of voucher {label}",
     "duplicate_title_draft": "Possible duplicate of voucher (draft)",
-    "duplicate_body": "This looks like the same cash flow: link instead of re-posting.",
     "link_to_voucher": "Link to voucher",
     "book_anyway": "Post anyway",
     "book": "Post",
@@ -3839,9 +3535,7 @@
     "vat_none_desc": "Not VAT-liable (e.g. wages, private withdrawals)"
   },
   "tx_skattekonto_match": {
-    "search_failed_default": "Could not search candidates",
     "fetch_candidates_failed_title": "Could not fetch candidates",
-    "match_failed_default": "Match failed",
     "match_success_title": "Transaction linked to voucher",
     "match_failed_title": "Could not link the transaction",
     "title": "Match against existing voucher",
@@ -3943,7 +3637,6 @@
     "load_customers_failed_title": "Could not load customers",
     "load_customers_failed_description": "Check your connection and try again.",
     "items_card_title": "Invoice lines",
-    "more_references": "References & more",
     "description_label": "Description",
     "description_placeholder": "E.g. Instagram campaign",
     "quantity_label": "Quantity",
@@ -4050,8 +3743,6 @@
     "deduction_housing_label": "Property designation (fastighetsbeteckning)",
     "deduction_housing_placeholder": "e.g. Stockholm Vasastan 1:23",
     "deduction_housing_hint": "Required for ROT deductions (not needed for RUT).",
-    "deduction_cap_over": "The invoice's deduction exceeds the annual cap",
-    "deduction_cap_check": "The customer needs to check their remaining allowance themselves.",
     "deduction_summary_label": "Tax reduction ROT/RUT",
     "deduction_work_type_required": "Choose a work type for the ROT/RUT row.",
     "deduction_work_type_mismatch": "The work type does not belong to the selected tax reduction (ROT/RUT).",
@@ -4458,14 +4149,12 @@
     "created_toast_title": "Credit note created",
     "created_toast_description": "Credit note {number} was created as a draft.",
     "create_failed_title": "Could not create credit note",
-    "create_failed_fallback": "Failed to create credit note",
     "try_again": "Try again."
   },
   "invoice_recurring": {
     "title": "Recurring invoices",
     "new_schedule": "New schedule",
     "viewer_disabled_tooltip": "You only have read-only access to this company",
-    "loading": "Loading...",
     "load_failed_title": "Could not load recurring invoices",
     "load_failed_description": "Check your connection and try again.",
     "empty_title": "No recurring invoices",
@@ -4503,7 +4192,6 @@
     "interval_every_n": "Every {n} months"
   },
   "invoice_recurring_new": {
-    "back": "Back",
     "title": "New recurring schedule",
     "edit_title": "Edit schedule",
     "save_changes": "Save changes",
@@ -4883,18 +4571,6 @@
     "debit_short": "D {amount}",
     "credit_short": "C {amount}",
     "debit_credit_short": "D {debit} / C {credit}",
-    "account_2440": "Accounts payable",
-    "account_2641": "Input VAT",
-    "account_2645": "Calculated input VAT, foreign purchase",
-    "account_2647": "Calculated input VAT, domestic reverse charge",
-    "account_2614": "Output VAT, reverse charge 25%",
-    "account_2624": "Output VAT, reverse charge 12%",
-    "account_2634": "Output VAT, reverse charge 6%",
-    "account_1710": "Prepaid rent",
-    "account_1720": "Prepaid leasing fees",
-    "account_1730": "Prepaid insurance premiums",
-    "account_1740": "Prepaid interest",
-    "account_1790": "Other prepaid expenses",
     "review_accrual_line_info": "Accrued {from} to {to}"
   },
   "supplier_invoice_detail": {
@@ -5017,7 +4693,6 @@
     "type_swedish": "Swedish company or organisation",
     "type_eu": "EU company",
     "type_non_eu": "Outside EU",
-    "org_number_inline": " | Org. no.: {number}",
     "edit": "Edit",
     "edit_dialog_title": "Edit supplier",
     "load_failed_title": "Could not load supplier",
@@ -5034,17 +4709,7 @@
     "total_paid": "Total paid",
     "invoice_count": "Invoice count",
     "contact_section_title": "Contact details",
-    "email_inline": "Email: {email}",
-    "phone_inline": "Phone: {phone}",
-    "vat_inline": "VAT: {vat}",
     "payment_section_title": "Payment details",
-    "bankgiro_inline": "Bankgiro: {value}",
-    "plusgiro_inline": "Plusgiro: {value}",
-    "iban_inline": "IBAN: {value}",
-    "bic_inline": "BIC: {value}",
-    "payment_terms_inline": "Payment terms: {days} days",
-    "currency_inline": "Currency: {currency}",
-    "expense_account_inline": "Expense account: {account}",
     "delete": "Delete",
     "kicker_org": "Org. no. {number}",
     "def_email": "Email",
@@ -5111,9 +4776,7 @@
     "import_attn_action": "Show import history",
     "mode_vouchers": "Vouchers",
     "mode_drafts": "Drafts",
-    "density_compact": "Compact view",
     "show_correction_chain": "Show storno & corrected entries",
-    "loading": "Loading journal entries...",
     "empty_title": "No journal entries",
     "empty_description": "Journal entries are created automatically from invoicing and transaction posting, or manually via the \"New entry\" tab.",
     "empty_drafts_title": "No drafts",
@@ -5138,25 +4801,19 @@
     "filter_dialog_title": "Filter journal entries",
     "filter_clear_all": "Clear all filters",
     "filter_done": "Done",
-    "filter_section_period": "Fiscal year",
     "filter_section_sort": "Sort order",
     "filter_section_series": "Voucher series",
     "filter_section_date": "Date range",
     "clear_date_filter": "Clear date filter",
-    "scope_label": "Showing:",
-    "scope_all_years": "All fiscal years",
     "out_of_period_label": "Subsequent",
     "rattelse_badge": "Corrected",
     "rattelse_badge_tooltip": "The voucher was corrected after posting: see the correction history on the voucher page",
     "out_of_period_tooltip": "Posted in a later fiscal year, but relates to the selected year (e.g. payment of an invoice issued in the selected year).",
-    "out_of_period_tooltip_mobile": "Posted in a later fiscal year, but relates to the selected year.",
     "attachment_count_tooltip": "{count} documents",
     "missing_attachment_tooltip": "Document missing",
     "no_lines": "No entry lines found for this journal entry.",
     "debit": "Debit",
     "credit": "Credit",
-    "sum_debit": "Total debit",
-    "sum_credit": "Total credit",
     "post": "Post",
     "show_details": "Show details",
     "create_correction": "Create correction entry",
@@ -5207,7 +4864,6 @@
     "sum_label": "Total",
     "batch_select_all": "Select all ({count})",
     "batch_select_row": "Select entry",
-    "batch_selected_count": "{count} selected",
     "batch_mark_no_doc": "Mark as no document required",
     "batch_clear_selection": "Clear",
     "batch_no_doc_done_title": "Marked as no document required",
@@ -5265,9 +4921,6 @@
     "download": "Download",
     "remove": "Remove",
     "replace": "Replace with new version",
-    "remove_confirm_title": "Remove document",
-    "remove_confirm_body": "Remove {file}? This cannot be undone.",
-    "remove_confirm_cta": "Remove",
     "remove_blocked_title": "Document cannot be removed",
     "remove_blocked_body": "This document is attached to a verifikation and constitutes räkenskapsinformation under the Swedish Bookkeeping Act (BFL 7 kap 2§). Räkenskapsinformation must be retained for at least 7 years and cannot be deleted.",
     "remove_blocked_hint": "If the document needs correction, upload a new version. The existing one is preserved in the version history.",
@@ -5278,7 +4931,6 @@
     "detaching": "Detaching...",
     "detach_failed": "Could not detach the document.",
     "replace_uploading": "Replacing...",
-    "remove_failed": "Could not remove the document.",
     "replace_failed": "Could not upload new version.",
     "choose_from_inbox": "Choose from inbox",
     "picker_title": "Choose a document from the inbox",
@@ -5340,7 +4992,6 @@
     "accounts_retry": "Try again",
     "edit_draft": "Edit",
     "back": "Back to bookkeeping",
-    "loading": "Loading journal entry...",
     "error_not_found": "Journal entry not found",
     "error_load_failed": "Could not fetch journal entry",
     "post": "Post",
@@ -5349,9 +5000,7 @@
     "confirm_post_description_generic": "The voucher \"{description}\" will be posted with the next available voucher number and can then only be corrected or reversed.",
     "delete_draft": "Delete draft",
     "delete_entry": "Delete journal entry",
-    "create_correction": "Create correction entry",
     "copy_entry": "Copy journal entry",
-    "edit_entry": "Edit",
     "correct_menu": "Correct",
     "correct_lines": "Correct lines (correction entry)",
     "correct_date": "Correct date",
@@ -5731,12 +5380,10 @@
     "col_audited": "Audited",
     "col_audit_opinion": "Audit opinion",
     "status_section": "Status",
-    "status_no_entries": "No status entries on file.",
     "fiscal_year_section": "Fiscal year",
     "fiscal_year_current": "Current: {start}-{end}",
     "fiscal_year_changed": "Fiscal year has been changed {n, plural, one {# time} other {# times}}.",
     "signatory_section": "Authorised signatories",
-    "signatory_empty": "No signatory rules on file at TIC.",
     "board_section": "Board & officers",
     "board_summary_members": "{n, plural, one {# board member} other {# board members}}",
     "board_summary_deputies": "{n, plural, one {# deputy} other {# deputies}}",
@@ -5748,7 +5395,6 @@
     "col_position": "Role",
     "col_since": "Since",
     "payroll_section": "Payroll history",
-    "payroll_empty": "No payroll history reported to Skatteverket.",
     "col_payroll_period": "Period",
     "col_payroll_employees": "Employees",
     "col_payroll_tax": "Tax withheld",
@@ -6132,30 +5778,17 @@
     "counterparty_suggestion_gone_title": "That counterparty is no longer available",
     "counterparty_suggestion_gone_description": "The suggestion was refreshed. Close the dialog, open it again and pick the counterparty once more.",
     "page_title": "Transactions",
-    "subtitle_to_post": "to post",
-    "subtitle_matches": "{count} invoice matches",
-    "history_subtitle": "All your transactions",
     "action_import": "Import",
-    "action_review_all": "Review all",
-    "action_review_loading": "Loading...",
     "action_new_transaction": "New transaction",
     "viewer_disabled_tooltip": "You only have viewer access in this company",
     "mode_inbox": "To record",
-    "mode_history": "All transactions",
-    "source_label": "Source:",
-    "source_all": "All ({count})",
-    "source_bank": "Bank ({count})",
-    "source_skatteverket": "Skatteverket ({count})",
-    "search_placeholder": "Search transactions...",
     "no_search_results": "No transactions match your search.",
     "source_empty": "The selected source has no transactions. Choose All to show the other sources.",
     "period_empty": "The selected period has no transactions. Choose All fiscal years to show everything.",
     "period_pending_outside": "{count, plural, one {# transaction to record outside the selected period.} other {# transactions to record outside the selected period.}}",
     "period_show_all": "Show all",
-    "skv_reconnect_title": "The Skatteverket connection needs to be renewed",
     "skv_reconnect_body": "Tax account transactions are not fetched until you reconnect with BankID and approve all permissions.",
     "skv_reconnect_cta": "Reconnect",
-    "dialog_choose_template": "Choose template",
     "dialog_match_invoice": "Match with invoice",
     "dialog_add_transaction": "Add transaction",
     "dialog_match_supplier_invoice": "Match with supplier invoice?",
@@ -6199,8 +5832,6 @@
     "match_failed_transaction": "The transaction could not be matched. Please try again.",
     "match_failed_with_invoice": "The transaction could not be matched with the invoice. Please try again.",
     "voucher_link_failed_description": "The journal entry could not be linked. Please try again.",
-    "login_required_title": "Sign in required",
-    "login_required_description": "You must be signed in to add transactions.",
     "deleted_title": "Deleted",
     "deleted_description": "The transaction has been deleted",
     "delete_failed_description": "The transaction could not be deleted. Please try again.",
@@ -6208,7 +5839,6 @@
     "edit_title_failed": "Could not update the title",
     "move_account_saved": "Transaction moved",
     "move_account_failed": "Could not move the transaction",
-    "review_in_bookkeeping_description": "Review and post the journal entry in Bookkeeping.",
     "bank_sync_attention_one": "1 bank connection needs renewal",
     "bank_sync_attention_many": "{count} bank connections need renewal",
     "bank_sync_auto_nightly": "Synced automatically each night",
@@ -6335,10 +5965,6 @@
     "toast_post_failed_generic": "Could not post journal entry",
     "edit_draft_dialog_title": "Edit draft",
     "title": "Bookkeeping",
-    "year_end": "Year-end (Årsbokslut)",
-    "tab_journal": "Journal entries",
-    "tab_new_entry": "New journal entry",
-    "tab_accounts": "Chart of accounts",
     "new_entry_dialog_title": "New journal entry",
     "create_with_assistant": "Create with assistant",
     "loading_source_voucher": "Loading source voucher...",
@@ -6457,7 +6083,6 @@
   },
   "form_article": {
     "type_label": "Type *",
-    "type_placeholder": "Choose type",
     "type_vara": "Goods",
     "type_tjanst": "Service",
     "number_label": "Article number",
@@ -6480,17 +6105,14 @@
     "summary_booked_on": "Posted to",
     "summary_unnamed": "Untitled article",
     "revenue_account_label": "Posting account",
-    "revenue_account_placeholder": "e.g. 2897",
     "revenue_account_hint": "Leave empty to derive the sales account automatically from VAT. You may select an active class 1-3 account.",
     "posting_account_invalid": "Enter a four-digit class 1-3 account.",
     "cost_price_label": "Cost price",
     "cost_price_hint": "Margin display only, never posted.",
     "currency_label": "Currency",
-    "currency_hint": "Pre-fills a new invoice's currency when the article is added.",
     "ean_label": "EAN/barcode",
     "ean_placeholder": "e.g. 7350000000000",
     "housework_label": "ROT/RUT",
-    "housework_placeholder": "Choose work type",
     "housework_none": "None",
     "housework_rot": "ROT",
     "housework_rut": "RUT",
@@ -6529,52 +6151,6 @@
     "col_created": "Created",
     "count_summary": "{count, plural, one {1 customer} other {# customers}}"
   },
-  "products": {
-    "title": "Products",
-    "new_product": "New product",
-    "back_to_list": "Back to products",
-    "viewer_disabled_tooltip": "You only have viewer access in this company",
-    "load_failed_title": "Could not load products",
-    "load_failed_description": "Check your connection and try again.",
-    "create_failed_title": "Could not create product",
-    "update_failed_title": "Could not update product",
-    "archive_failed_title": "Could not archive product",
-    "created_title": "Product created",
-    "created_description": "{name} was added",
-    "updated_title": "Product updated",
-    "archived_title": "Product archived",
-    "archive": "Archive",
-    "archive_confirm": "Archive this product? Existing invoices that reference it are unaffected.",
-    "archived_badge": "Archived",
-    "search_placeholder": "Search products",
-    "no_search_results_title": "No matches",
-    "no_search_results_description": "No products match \"{term}\".",
-    "empty_title": "No products yet",
-    "empty_description": "Create your first product so you can add it to invoices.",
-    "section_basics": "Basics",
-    "section_pricing": "Price & VAT",
-    "type_goods": "Goods",
-    "type_service": "Service",
-    "field_name": "Product name",
-    "field_name_placeholder": "e.g. LED bulb 9W",
-    "field_sku": "SKU",
-    "field_sku_placeholder": "e.g. LED-9W-E27",
-    "field_description": "Description",
-    "field_type": "Product type",
-    "field_type_hint": "Goods update stock levels when invoiced. Services don't.",
-    "field_category": "Category",
-    "field_default_price": "Default price (excl. VAT)",
-    "field_default_unit": "Unit",
-    "field_default_vat": "Default VAT rate",
-    "validation_name_required": "Product name is required",
-    "save": "Save",
-    "cancel": "Cancel",
-    "col_name": "Name",
-    "col_sku": "SKU",
-    "col_type": "Type",
-    "col_default_price": "Default price",
-    "col_unit": "Unit"
-  },
   "webshop_orders": {
     "title": "Orders",
     "all_stores": "All stores",
@@ -6688,179 +6264,22 @@
     "bulk_none_bookable": "None of the selected orders can be booked in a sweep. Book them individually.",
     "bulk_skipped_unsupported_rate": "Skipped (non-Swedish VAT rate, book individually): {numbers}"
   },
-  "sales_orders": {
-    "title": "Sales orders",
-    "back_to_list": "Back to orders",
-    "new_order": "New order",
-    "viewer_disabled_tooltip": "You only have read access in this company",
-    "load_failed_title": "Could not load orders",
-    "load_failed_description": "Check your connection and try again.",
-    "search_placeholder": "Search order number or customer",
-    "empty_title": "No orders yet",
-    "empty_description": "Create your first order when a customer accepts a quote, or start one from scratch.",
-    "no_category_title": "No orders in this category",
-    "no_category_description": "Try a different filter or create a new order.",
-    "tab_all": "All",
-    "tab_draft": "Drafts",
-    "tab_confirmed": "Confirmed",
-    "tab_partially_shipped": "Partially shipped",
-    "tab_shipped": "Shipped",
-    "tab_partially_invoiced": "Partially invoiced",
-    "tab_invoiced": "Invoiced",
-    "tab_cancelled": "Cancelled",
-    "status_draft": "Draft",
-    "status_confirmed": "Confirmed",
-    "status_partially_shipped": "Partially shipped",
-    "status_shipped": "Shipped",
-    "status_partially_invoiced": "Partially invoiced",
-    "status_invoiced": "Invoiced",
-    "status_cancelled": "Cancelled",
-    "col_number": "Number",
-    "col_customer": "Customer",
-    "col_date": "Date",
-    "col_expected_delivery": "Expected delivery",
-    "col_status": "Status",
-    "col_amount": "Amount",
-    "col_description": "Description",
-    "col_quantity": "Quantity",
-    "col_quantity_shipped": "Shipped",
-    "col_quantity_invoiced": "Invoiced",
-    "col_unit_price": "Unit price",
-    "col_line_total": "Line total",
-    "section_header": "Order details",
-    "section_lines": "Order lines",
-    "section_progress": "Shipment and invoicing progress",
-    "field_customer": "Customer",
-    "field_order_date": "Order date",
-    "field_expected_delivery": "Expected delivery date",
-    "field_currency": "Currency",
-    "field_notes": "Notes",
-    "field_our_reference": "Our reference",
-    "field_your_reference": "Your reference",
-    "field_product": "Product",
-    "field_unit": "Unit",
-    "field_vat_rate": "VAT",
-    "action_confirm": "Confirm order",
-    "action_ship": "Ship",
-    "action_invoice": "Invoice",
-    "action_cancel": "Cancel",
-    "action_delete": "Delete draft",
-    "confirm_dialog_title": "Confirm the order?",
-    "confirm_dialog_description": "The customer commits to receiving the shipment. You can then create a delivery note and invoice.",
-    "ship_dialog_title": "Ship the order",
-    "ship_dialog_description": "A delivery note is created and stock levels are updated automatically for products that track inventory.",
-    "invoice_dialog_title": "Invoice the order",
-    "invoice_dialog_description": "An invoice is created for the remaining quantities. You can edit it before sending it to the customer.",
-    "cancel_dialog_title": "Cancel the order?",
-    "cancel_dialog_description": "An order can only be cancelled before the first shipment. Cancelled orders cannot be restored.",
-    "delete_dialog_title": "Delete draft?",
-    "delete_dialog_description": "Drafts can be removed without a trace: confirmed orders must be cancelled instead.",
-    "confirmed_toast": "Order is confirmed",
-    "shipped_toast": "Delivery note created",
-    "invoiced_toast": "Invoice created",
-    "cancelled_toast": "Order is cancelled",
-    "deleted_toast": "Draft removed",
-    "from_quote": "From quote",
-    "summary_total": "Total",
-    "summary_subtotal": "Subtotal",
-    "summary_vat": "VAT",
-    "stock_warnings_title": "Some stock movements could not be recorded",
-    "validation_at_least_one_line": "At least one order line is required",
-    "remaining_to_ship": "{remaining} left to ship",
-    "remaining_to_invoice": "{remaining} left to invoice"
-  },
-  "inventory": {
-    "title": "Inventory",
-    "back_to_inventory": "Back to inventory",
-    "view_movements": "View movements",
-    "movements_title": "Stock movements",
-    "load_failed_title": "Could not load inventory",
-    "no_locations_title": "No location configured",
-    "no_locations_description": "Create a primary location to start tracking stock levels.",
-    "create_primary_location": "Create primary location",
-    "default_location_name": "Main warehouse",
-    "location_created": "Location created",
-    "location_create_failed": "Could not create location",
-    "locations_title": "Locations",
-    "primary": "Primary",
-    "inactive": "Inactive",
-    "stock_levels_title": "Current stock",
-    "no_levels_title": "No stock movements yet",
-    "no_levels_description": "Stock movements are created automatically when you send invoices or approve supplier invoices that reference a 'Goods' product.",
-    "no_movements_title": "No movements yet",
-    "no_movements_description": "All inbound and outbound movements will appear here once recorded.",
-    "col_location_name": "Name",
-    "col_location_status": "Status",
-    "col_product": "Product",
-    "col_sku": "SKU",
-    "col_location": "Location",
-    "col_quantity": "Quantity",
-    "col_unit": "Unit",
-    "col_when": "When",
-    "col_reason": "Reason",
-    "col_delta": "Change",
-    "col_reference": "Source",
-    "reason_purchase": "Purchase",
-    "reason_sale": "Sale",
-    "reason_adjustment": "Adjustment",
-    "reason_transfer_in": "Transfer in",
-    "reason_transfer_out": "Transfer out",
-    "reason_return": "Return",
-    "reason_disposal": "Disposal",
-    "reason_opening": "Opening balance",
-    "ref_invoice": "Invoice",
-    "ref_supplier_invoice": "Supplier invoice",
-    "ref_transfer": "Stock transfer",
-    "ref_transfer_rollback": "Rollback",
-    "ref_manual": "Manual"
-  },
   "self_billing": {
     "title": "Register self-billing invoice",
-    "subtitle": "A self-billing invoice you received: the customer invoiced in your name. For you it is a sale with output VAT.",
-    "back": "Back",
-    "issuer_card_title": "Issuer and invoice reference",
     "issuer_card_description": "The customer who issued the self-billing invoice, and the number they assigned.",
     "customer_label": "Customer (issuer)",
-    "select_customer_placeholder": "Select customer",
     "external_number_label": "Invoice number (customer's)",
     "external_number_placeholder": "e.g. SF-2026-014",
     "agreement_ref_label": "Agreement reference",
     "agreement_ref_placeholder": "Self-billing agreement",
-    "items_card_title": "Lines",
-    "items_card_description": "The amounts from the received self-billing invoice.",
-    "description_label": "Description",
-    "description_placeholder": "Description",
-    "quantity_label": "Qty",
-    "unit_label": "Unit",
-    "unit_price_label": "Unit price",
-    "vat_label": "VAT",
-    "row_label": "Row {index}",
-    "add_row": "Add row",
-    "notes_card_title": "Notes",
-    "notes_placeholder": "Internal notes (optional)",
-    "details_card_title": "Details",
-    "currency_label": "Currency",
     "invoice_date_label": "Invoice date",
     "received_date_label": "Received date",
-    "due_date_label": "Due date",
-    "summary_card_title": "Summary",
-    "subtotal_label": "Net",
-    "output_vat_label": "Output VAT",
-    "total_label": "Total",
     "register": "Register self-billing invoice",
-    "viewer_disabled_tooltip": "You only have viewer access in this company",
-    "load_customers_failed": "Could not load customers",
     "created_title": "Self-billing invoice registered",
     "created_description": "Self-billing invoice {number} has been booked as a sale",
     "create_failed_title": "Could not register the self-billing invoice",
-    "validation_customer_required": "Select a customer",
     "validation_external_number_required": "Invoice number is required",
-    "validation_invoice_date_required": "Invoice date is required",
-    "validation_received_date_required": "Received date is required",
-    "validation_due_date_required": "Due date is required",
-    "validation_description_required": "Description is required",
-    "validation_quantity_min": "Quantity must be at least 0.01",
-    "validation_min_one_row": "At least one row is required"
+    "validation_received_date_required": "Received date is required"
   },
   "invoices": {
     "rot_rut_payout_action": "ROT/RUT file",
@@ -7274,28 +6693,7 @@
     "card_blockers_title": "Needs attention",
     "card_blockers_detail": "{bank} missing bank account · {email} missing email",
     "card_blockers_none": "No blockers — all employees are complete.",
-    "card_vacation_title": "Vacation days left",
-    "card_vacation_detail": "{employees} employees, {saved} saved days",
-    "card_vacation_none": "Vacation balances are created on the first booked salary run.",
-    "vacation_close_button": "Close vacation year",
-    "vacation_close_title": "Vacation year close",
-    "vacation_close_description": "Review the transition before confirming: saved days roll (max 5 years), expired days are flagged for payout, and the vacation pay liability is reconciled against the booked balance.",
-    "vacation_close_previewing": "Preparing the review report…",
     "vacation_close_preview_failed": "Could not prepare the report",
-    "vacation_close_period": "Vacation year {from} to {to}",
-    "vacation_close_col_employee": "Employee",
-    "vacation_close_col_saved": "Saved",
-    "vacation_close_col_flagged": "Flagged",
-    "vacation_close_col_expiring": "Expiring",
-    "vacation_close_col_next": "Next year",
-    "vacation_close_computed": "Computed vacation pay liability: {amount}",
-    "vacation_close_booked": "Booked on 2920: {amount}",
-    "vacation_close_drift": "Adjustment to book: {amount}",
-    "vacation_close_no_drift": "No adjustment needed (difference under 1 kr).",
-    "vacation_close_cancel": "Cancel",
-    "vacation_close_confirm": "Close the vacation year",
-    "vacation_close_done": "Vacation year closed",
-    "vacation_close_failed": "Vacation year close failed",
     "status_draft": "Draft",
     "status_review": "Review",
     "status_approved": "Approved",
@@ -7315,7 +6713,6 @@
     "not_found": "Payroll run not found",
     "more_actions": "More actions",
     "unknown_error": "Unknown error",
-    "rail_title": "This month's steps",
     "rail_calculate": "Calculate",
     "rail_calculate_hint": "Calculate wages, tax, and contributions, then send for review.",
     "rail_approve": "Approve",
@@ -7391,7 +6788,6 @@
     "th_vacation": "Vacation",
     "th_payslip": "Payslip",
     "diff_new_employee": "New",
-    "view_pdf": "View PDF",
     "view_payslip_title": "View payslip",
     "salary_input_aria": "Monthly salary for {name}",
     "degree_hint": "× {degree} % = {amount}",
@@ -7863,19 +7259,6 @@
     "source_unavailable": "Tax tables for {year} could not be fetched",
     "recheck": "Check again"
   },
-  "time_tracking": {
-    "title": "Time tracking",
-    "billable_inbox": "Billable hours by customer",
-    "create_invoice": "Create invoice",
-    "hourly_rate": "Hourly rate",
-    "project_required": "Select a project to bill",
-    "no_project": "No project",
-    "no_billable_hours": "No billable hours to invoice. Mark days as billable to collect them here.",
-    "log_hours": "Log hours",
-    "billable": "Billable",
-    "invoiced": "Invoiced",
-    "missing_rate": "Missing rate"
-  },
   "import": {
     "title": "Import / export",
     "subtitle": "Import bank transactions or bookkeeping data into your company",
@@ -8201,36 +7584,11 @@
     "k3_draft_notice": "K3-dokumentet är ännu ett granskningsutkast och kan inte låsas eller lämnas in via Accounted. Upprätta och lämna in årsredovisningen på papper tills hela upplysningsmatrisen är implementerad och granskad."
   },
   "empty": {
-    "invoices_title": "No invoices yet",
-    "invoices_description": "Create your first invoice to get started.",
-    "customers_title": "No customers yet",
-    "customers_description": "Add your first customer to start invoicing.",
-    "transactions_title": "No transactions",
-    "transactions_description": "Transactions will appear here once your bank connection syncs.",
-    "suppliers_title": "No suppliers yet",
-    "suppliers_description": "Add your first supplier.",
-    "no_results": "No results",
-    "no_data": "No data to display",
     "support_hint_subject": "Need help getting started",
     "support_hint_label": "Need help? Contact support",
-    "preset_invoices_title": "No invoices yet",
-    "preset_invoices_description": "Create your first invoice in under 60 seconds. We fill in your details automatically.",
-    "preset_invoices_action": "Create invoice",
     "preset_customers_title": "No customers yet",
     "preset_customers_description": "Add your customers to easily create invoices and track payments.",
-    "preset_customers_action": "Add customer",
-    "preset_transactions_title": "No transactions",
-    "preset_transactions_description": "Import bank statements to automatically post entries and stay on top of your finances.",
-    "preset_transactions_action": "Import transactions",
-    "preset_deadlines_title": "No upcoming deadlines",
-    "preset_deadlines_description": "Great work! You have no immediate deadlines to handle.",
-    "preset_no_bank_title": "No transactions imported",
-    "preset_no_bank_description": "Import bank statements to automatically post entries and get a better view of your finances.",
-    "preset_no_bank_action": "Import transactions",
-    "preset_reports_title": "No reports available",
-    "preset_reports_description": "Reports are generated automatically once you have enough data. Start by creating invoices or importing transactions.",
-    "preset_reports_action": "Create invoice",
-    "preset_reports_secondary": "Import transactions"
+    "preset_customers_action": "Add customer"
   },
   "start_cards": {
     "invoices_title": "Your first invoice takes two minutes.",
@@ -8432,7 +7790,6 @@
     "action_show_voucher": "Show voucher",
     "action_match": "Match",
     "action_book": "Book",
-    "action_booking": "Booking…",
     "ignore_action": "Ignore",
     "action_unignore": "Restore",
     "band_ignored": "Ignored",
diff --git a/messages/sv.json b/messages/sv.json
index 1568d506..c2918999 100644
--- a/messages/sv.json
+++ b/messages/sv.json
@@ -7,69 +7,28 @@
     "save": "Spara",
     "saving": "Sparar...",
     "cancel": "Avbryt",
-    "create": "Skapa",
-    "add": "Lägg till",
     "delete": "Ta bort",
     "edit": "Redigera",
     "back": "Tillbaka",
-    "next": "Nästa",
-    "previous": "Föregående",
     "pager_previous": "Föregående post",
     "pager_next": "Nästa post",
     "pager_position": "{index} av {total}",
     "close": "Stäng",
-    "search": "Sök",
-    "filter": "Filtrera",
     "loading": "Laddar...",
     "load_more": "Ladda fler",
     "retry": "Försök igen",
     "load_error": "Kunde inte ladda data",
-    "confirm": "Bekräfta",
-    "yes": "Ja",
-    "no": "Nej",
-    "remove": "Ta bort",
-    "submit": "Skicka",
-    "send": "Skicka",
-    "download": "Hämta",
-    "upload": "Ladda upp",
-    "copy": "Kopiera",
-    "copied": "Kopierat",
     "open": "Öppna",
-    "select": "Välj",
-    "all": "Alla",
-    "none": "Inga",
-    "more": "Mer",
-    "less": "Mindre",
-    "show": "Visa",
-    "hide": "Dölj",
-    "actions": "Åtgärder",
-    "settings": "Inställningar",
-    "language": "Språk",
     "language_swedish": "Svenska",
     "language_english": "Engelska",
-    "appearance": "Utseende",
     "theme_light": "Ljust",
     "theme_dark": "Mörkt",
     "theme_system": "System",
     "logout": "Logga ut",
     "logout_description": "Logga ut från ditt konto",
-    "account_settings": "Kontoinställningar",
     "status": {
-      "posted": "Bokförd",
-      "draft": "Utkast",
-      "pending": "Väntande",
-      "approved": "Godkänd",
-      "archived": "Arkiverad",
-      "paid": "Betald",
-      "unpaid": "Obetald",
-      "overdue": "Förfallen",
-      "cancelled": "Annullerad",
-      "sent": "Skickad",
-      "matched": "Matchad",
-      "unmatched": "Omatchad"
     },
     "more_options": "Fler alternativ",
-    "popup_blocked_title": "Webbläsaren blockerade fliken",
     "popup_blocked_description": "Tillåt popupfönster för {appName} i webbläsaren och försök igen.",
     "source_code": "Källkod"
   },
@@ -406,14 +365,9 @@
     "team": "Medlemmar och roller",
     "brand": "Varumärke",
     "banking": "Bank (PSD2)",
-    "skatteverket": "Skatteverket",
     "salary": "Löner",
     "templates": "Mallar",
-    "agent_profile": "Företagsprofil",
-    "agent_memory": "Assistentens minne",
-    "agent_skills": "Assistentens kunskap",
     "assistant": "Assistenten",
-    "backup": "Säkerhetsbackup",
     "account": "Konto",
     "api": "API & MCP",
     "billing": "Abonnemang",
@@ -583,7 +537,6 @@
   },
   "settings": {
     "group_profile": "Profil",
-    "section_name": "Namn",
     "digest_group": "Aviseringar",
     "digest_label": "Nytt att bokföra",
     "digest_description": "Ett dagligt mejl när nya banktransaktioner eller underlag i inkorgen väntar på bokföring. Endast antal, aldrig belopp.",
@@ -801,12 +754,9 @@
     "generate_none_title": "Inga deadlines skapades",
     "generate_none_description": "Inga nya deadlines att skapa. Kontrollera att skatteinställningarna är ifyllda om du väntade dig fler.",
     "generate_failed_title": "Kunde inte skapa deadlines",
-    "generate_failed_description": "Det gick inte att skapa skattedeadlines just nu.",
     "group_skattekonto_title": "Skattekonto",
     "group_same_day": "{count} deadlines samma dag",
     "group_mark_done": "Markera klar",
-    "group_confirm_question": "Markera <hl>{title}</hl> som klar?",
-    "group_cancel": "Avbryt",
     "group_confirm": "Bekräfta",
     "new_deadline": "Ny deadline",
     "subscribe_calendar": "Prenumerera i din kalender",
@@ -836,68 +786,6 @@
     "empty_filtered": "Inga deadlines matchar filtret.",
     "confirm_done_title": "Markera som klar?"
   },
-  "bureau": {
-    "title": "Byrå",
-    "subtitle": "Översikt över alla klientbolag du har tillgång till",
-    "section_title": "Byrå-läge",
-    "enable_setting": "Aktivera byrå-läge",
-    "enable_setting_description": "Visar en samlad översikt över alla klientbolag du har tillgång till",
-    "toggle_saved": "Byrå-läge uppdaterat",
-    "toggle_save_failed": "Kunde inte spara byrå-inställning",
-    "tiles": {
-      "clients": "Klienter totalt",
-      "pending": "Väntar på godkännande",
-      "deadlines": "Deadlines denna vecka",
-      "overdue_ar": "Förfallna fakturor"
-    },
-    "action": {
-      "open": "Öppna"
-    },
-    "pending_label": "Väntande operationer",
-    "deadlines_label": "Kommande deadlines",
-    "no_pending": "Inga väntande operationer",
-    "no_deadlines": "Inga deadlines denna vecka",
-    "show_pending": "Visa pending",
-    "high_risk": "{count} hög risk",
-    "kpi": {
-      "revenue_mtd": "Intäkter MTD",
-      "cash": "Bank/Kassa",
-      "overdue_ar": "Förfallna fakt."
-    },
-    "role": {
-      "owner": "ägare",
-      "admin": "administratör",
-      "member": "medlem",
-      "viewer": "läsare"
-    },
-    "deadline_status": {
-      "overdue": "förfallen"
-    },
-    "empty": {
-      "title": "Inga klientbolag ännu",
-      "description": "När du läggs till som medlem i ett bolag dyker det upp här."
-    }
-  },
-  "insights": {
-    "title": "Insikter",
-    "empty": "Inga avvikelser hittade",
-    "severity_flag": "Åtgärda",
-    "severity_warn": "Granska",
-    "severity_info": "Information",
-    "action_dismiss": "Avfärda",
-    "action_snooze": "Snooze 7d",
-    "subject_open": "Öppna källan",
-    "dashboard_tile_title": "Avvikelser",
-    "dashboard_tile_subtitle": "{count} att åtgärda",
-    "rules": {
-      "outlier_amount": "Ovanligt belopp för motpart",
-      "missing_recurring": "Återkommande leverantör saknas",
-      "duplicate_suspect": "Möjlig dubblett",
-      "stale_uncategorized": "Gammal okategoriserad transaktion",
-      "vat_rate_outlier": "Avvikande momssats",
-      "stale_customer_balance": "Förfallen kundfordran"
-    }
-  },
   "supplier_invoices": {
     "title": "Leverantörsfakturor",
     "load_failed_title": "Kunde inte ladda leverantörsfakturor",
@@ -1010,34 +898,6 @@
     "mark_all_result_failed": "{count} kunde inte bokföras. Öppna fakturorna och försök igen.",
     "mark_all_result_settled": "{count} var redan betalda."
   },
-  "purchase_orders": {
-    "title": "Inköpsorder",
-    "new": "Ny inköpsorder",
-    "empty_title": "Inga inköpsorder än",
-    "empty_description": "Skapa en inköpsorder för att planera ett inköp, ta emot gods, och stämma av mot leverantörsfakturan.",
-    "filter_open": "Öppna",
-    "filter_all": "Alla",
-    "th_number": "Nummer",
-    "th_supplier": "Leverantör",
-    "th_order_date": "Orderdatum",
-    "th_status": "Status",
-    "th_expected_delivery": "Beräknad lev.",
-    "th_amount": "Belopp",
-    "status_draft": "Utkast",
-    "status_sent": "Skickad",
-    "status_partially_received": "Delvis mottagen",
-    "status_received": "Mottagen",
-    "status_partially_invoiced": "Delvis fakturerad",
-    "status_closed": "Stängd",
-    "status_cancelled": "Annullerad",
-    "send": "Markera som skickad",
-    "receive": "Ta emot gods",
-    "cancel": "Avbryt order",
-    "three_way_match_failed": "Trevägs-matchningen misslyckades. Kontrollera kvantiteter och priser mot inköpsordern.",
-    "po_link_required": "Företaget kräver att leverantörsfakturor länkas till en inköpsorder.",
-    "match_within_tolerance": "Avvikelse inom tolerans",
-    "match_out_of_tolerance": "Avvikelse utanför tolerans"
-  },
   "suppliers": {
     "title": "Leverantörer",
     "new_supplier": "Ny leverantör",
@@ -1258,26 +1118,11 @@
     "password_signup_unavailable": "Lösenordsregistrering är inte tillgänglig på den här installationen."
   },
   "mfa": {
-    "enroll_title": "Aktivera tvåstegsverifiering",
-    "enroll_subtitle": "Skydda ditt konto med en autentiseringsapp",
     "verify_title": "Tvåstegsverifiering",
-    "verify_subtitle": "Ange koden från din autentiseringsapp",
     "verify_code_label": "Verifieringskod",
     "verify_button": "Verifiera",
     "verifying": "Verifierar...",
-    "enroll_step_qr": "Skanna QR-koden",
-    "enroll_step_qr_hint": "Använd en autentiseringsapp som Google Authenticator, Authy eller 1Password.",
-    "enroll_show_secret": "Visa nyckel manuellt",
-    "enroll_step_verify": "Verifiera kod",
-    "enroll_step_verify_hint": "Ange koden från din app för att slutföra registreringen.",
-    "enroll_finish": "Aktivera",
-    "enroll_finishing": "Aktiverar...",
-    "enroll_failed_title": "Kunde inte aktivera tvåstegsverifiering",
     "verify_failed_title": "Verifiering misslyckades",
-    "verify_failed_description": "Koden är felaktig eller har gått ut.",
-    "enrolled_title": "Tvåstegsverifiering aktiverad",
-    "enrolled_description": "Ditt konto är nu skyddat.",
-    "back": "Tillbaka",
     "verify_subtitle_full": "Ange den 6-siffriga koden från din autentiseringsapp",
     "verify_challenge_failed_description": "Kunde inte starta verifiering. Försök igen.",
     "wrong_code_title": "Fel kod",
@@ -1449,7 +1294,6 @@
     "type_swedish_business": "Svenskt företag eller organisation",
     "type_eu_business": "EU-företag",
     "type_non_eu_business": "Företag utanför EU",
-    "type_hint": "Leverantörstypen påverkar hur moms hanteras på inköp",
     "email_label": "E-post",
     "email_placeholder": "kontakt@foretag.se",
     "email_invalid": "Ogiltig e-postadress",
@@ -1463,14 +1307,7 @@
     "org_number_label": "Organisationsnummer",
     "org_number_placeholder": "XXXXXX-XXXX",
     "vat_label": "VAT-nummer (momsreg.nr)",
-    "vat_placeholder_eu": "DE123456789",
     "vat_placeholder_se": "SE123456789001",
-    "vat_verify": "Verifiera",
-    "vat_verified_title": "VAT-nummer verifierat",
-    "vat_verified_description": "Företag: {name}",
-    "vat_failed_title": "Verifiering misslyckades",
-    "vat_failed_default": "VAT-numret kunde inte verifieras",
-    "vat_error_title": "Kunde inte verifiera VAT-nummer",
     "payment_section": "Betalningsuppgifter",
     "bankgiro_label": "Bankgiro",
     "bankgiro_placeholder": "123-4567",
@@ -1478,12 +1315,10 @@
     "iban_label": "IBAN",
     "iban_placeholder": "SE45 5000 0000 0583 9825 7466",
     "swift_label": "SWIFT/BIC",
-    "bank_account_label": "Bankkonto",
     "clearing_label": "Clearingnummer",
     "account_number_label": "Kontonummer",
     "default_payment_terms_label": "Betalningsvillkor (dagar)",
     "default_account_label": "Standardkonto",
-    "default_account_placeholder": "T.ex. 5410",
     "default_account_clear": "Rensa standardkonto",
     "default_currency_label": "Standardvaluta",
     "notes_label": "Anteckningar",
@@ -1492,37 +1327,6 @@
     "submit_saving": "Sparar...",
     "viewer_disabled_tooltip": "Du har endast läsbehörighet i detta företag"
   },
-  "upcoming_deadlines": {
-    "title": "Kommande deadlines",
-    "overdue_badge": "{count} försenad",
-    "action_needed_badge": "{count} åtgärd",
-    "today": "Idag",
-    "tomorrow": "Imorgon",
-    "time_prefix": "kl.",
-    "tax_badge": "Skatt",
-    "mark_as_submitted": "Markera som inskickad",
-    "mark_as_confirmed": "Markera som bekräftad",
-    "view_all": "Visa alla deadlines",
-    "toast_status_updated": "Status uppdaterad",
-    "toast_status_updated_description": "Deadline markerad som {status}",
-    "toast_status_update_failed": "Kunde inte uppdatera status"
-  },
-  "tax_todo": {
-    "title": "Att göra - Skatt",
-    "overdue_badge": "{count} försenad",
-    "action_needed_badge": "{count} snart",
-    "today": "Idag",
-    "tomorrow": "Imorgon",
-    "days_ago": "{count} dagar sedan",
-    "in_days": "Om {count} dagar",
-    "start": "Påbörja",
-    "submitted": "Inskickad",
-    "more_tasks": "+{count} fler uppgifter",
-    "view_all": "Visa alla deadlines",
-    "toast_status_updated": "Status uppdaterad",
-    "toast_status_updated_description": "Markerad som {status}",
-    "toast_status_update_failed": "Kunde inte uppdatera status"
-  },
   "initial_setup": {
     "completed_verdict": "Bokföringen är igång.",
     "title": "{count} steg så är bokföringen igång",
@@ -1536,10 +1340,6 @@
     "step_bank_description": "Hämta transaktioner automatiskt, eller importera ett kontoutdrag.",
     "step_bank_sweep_note": "{matched, plural, one {# matchad mot importen} other {# matchade mot importen}}, {toReview, plural, one {# att granska} other {# att granska}}",
     "step_bank_action": "Koppla banken",
-    "step_assistant_title": "Bygg din bokföringsassistent",
-    "step_assistant_beta": "Beta",
-    "step_assistant_description": "Några frågor om din verksamhet kalibrerar en assistent som föreslår bokföring åt dig.",
-    "step_assistant_action": "Kom igång",
     "dismiss": "Dölj",
     "step_skv_title": "Anslut Skatteverket",
     "step_skv_description": "Se skattekontot och lämna moms- och arbetsgivardeklarationer direkt härifrån. Ansluts med BankID på ett par minuter.",
@@ -1812,7 +1612,6 @@
     "phone_label": "Telefon",
     "email_label": "E-post",
     "website_label": "Webbplats",
-    "members_invite_title": "Bjud in till {companyName}",
     "members_invite_description": "Personen får tillgång till enbart detta företag.",
     "members_invite_email_label": "E-postadress",
     "members_invite_email_placeholder": "namn@example.com",
@@ -1843,7 +1642,6 @@
     "members_remove_failed": "Kunde inte ta bort medlem.",
     "members_invite_revoked": "Inbjudan återkallad",
     "members_invite_revoke_failed": "Kunde inte återkalla inbjudan.",
-    "invitations_pending_title": "Väntande inbjudningar",
     "invitations_expires": "Går ut {date}",
     "logo_heading": "Logotyp",
     "logo_help": "Visas i sidhuvudet på dina fakturor. Max 10 MB, PNG/JPG/WebP.",
@@ -1968,9 +1766,6 @@
     "wrapper_save_changes": "Spara ändringar",
     "wrapper_readonly_tooltip": "Du har endast läsbehörighet i detta företag"
   },
-  "settings_invoicing": {
-    "bank_validation_title": "Kontrollera bankuppgifter"
-  },
   "settings_invoicing_preview": {
     "title": "Förhandsvisning",
     "preview_button": "Förhandsvisa faktura",
@@ -2056,7 +1851,6 @@
   "settings_team": {},
   "settings_templates": {},
   "settings_salary": {
-    "title": "Löneinställningar",
     "payments_heading": "Utbetalning",
     "pay_day_label": "Utbetalningsdag",
     "pay_day_help": "Dag i månaden då lönen betalas ut (1–28). Används som standard vid nya lönekörningar och för påminnelser.",
@@ -2076,21 +1870,11 @@
     "vacation_info_link": "Hantera anställda",
     "accounting_heading": "Bokföring",
     "voucher_series_label": "Standard verifikationsserie för löner",
-    "voucher_series_a": "A: Standard",
-    "voucher_series_l": "L: Löner",
     "voucher_series_help": "Kan ändras per lönekörning. Varje serie har obrutna verifikationsnummer per räkenskapsår.",
     "tax_tables_heading": "Skattetabeller",
     "tax_tables_help": "Skattetabeller och kommunala skattesatser hämtas automatiskt från Skatteverkets öppna data vid varje lönekörning. Ingen manuell uppdatering krävs. Om Skatteverkets API är otillgängligt används en inbäddad reservkopia tills tjänsten är uppe igen.",
     "vacation_heading": "Semester",
     "vacation_rule_label": "Standard semesterregel",
-    "vacation_rule_percentage": "Procentregeln (12 %)",
-    "vacation_rule_same_pay": "Sammalöneregeln",
-    "vacation_rule_none": "Ingen semesteravsättning",
-    "vacation_supplement_label": "Semestertillägg",
-    "vacation_supplement_min": "0,43% (lagstadgat minimum)",
-    "vacation_supplement_cba": "0,80% (vanligt kollektivavtalsbelopp)",
-    "vacation_supplement_help": "Tillämpas vid sammalöneregeln. Kan ändras per anställd.",
-    "info_heading": "Information",
     "info_payroll_scope": "Lönemodulen hanterar löner till dina anställda: skatteavdrag, arbetsgivaravgifter, semesterlöneskuld och arbetsgivardeklaration (AGI). Driver du enskild firma tar du som ägare ut pengar via eget uttag (konto 2013), inte lön.",
     "info_current_year": "<strong>Aktuellt år:</strong> 2026 (Arbetsgivaravgifter 31,42 %, prisbasbelopp 59 200 SEK)"
   },
@@ -2147,10 +1931,6 @@
     "tax_mark_paid_timeout": "Servern svarade inte i tid. Ladda om sidan och kontrollera om markeringen sparades.",
     "tax_mark_paid_network": "Ingen kontakt med servern. Kontrollera din internetanslutning och försök igen."
   },
-  "settings_backup": {
-    "heading": "Säkerhetsbackup",
-    "intro": "Ladda ner en egen kopia av all räkenskapsinformation (SIE-filer, kvitton, underlag och behandlingshistorik) i en enda ZIP-fil. {appName} arkiverar all räkenskapsinformation i minst 7 år enligt BFL 7 kap. 2 §, så din backup ersätter inte vårt lagkrav; den kompletterar det."
-  },
   "settings_api": {},
   "settings_banking": {
     "connect_failed_title": "Anslutning misslyckades",
@@ -2199,28 +1979,6 @@
     "blockers_load_failed": "Listan över företag du äger kunde inte läsas in, så kontot kan inte raderas just nu.",
     "blockers_load_retry": "Försök igen"
   },
-  "settings_bank_details_form": {
-    "heading": "Bankuppgifter",
-    "subheading": "Visas på dina fakturor",
-    "bank_label": "Bank",
-    "clearing_label": "Clearing",
-    "clearing_error": "Måste vara 4-5 siffror",
-    "account_number_label": "Kontonummer",
-    "account_number_error": "Måste vara 6-12 siffror",
-    "bankgiro_label": "Bankgiro",
-    "bankgiro_error": "Ogiltigt bankgironummer",
-    "plusgiro_label": "Plusgiro",
-    "plusgiro_error": "Ogiltigt plusgironummer",
-    "swish_label": "Swish",
-    "swish_placeholder": "123 XXX XX XX eller 07X XXX XX XX",
-    "swish_error": "Ogiltigt Swish-nummer (företagsnummer 123XXXXXXX eller mobilnummer 07XXXXXXXX)",
-    "iban_label": "IBAN",
-    "iban_error": "Ogiltigt IBAN (SE följt av 22 siffror)",
-    "iban_hint": "Krävs för betalfil (ISO 20022) vid löneutbetalning",
-    "bic_label": "BIC/SWIFT",
-    "bic_placeholder": "Fylls i automatiskt",
-    "bic_error": "Ogiltig BIC/SWIFT (8 eller 11 tecken)"
-  },
   "settings_billing": {
     "load_failed": "Abonnemangsuppgifterna kunde inte läsas in, så din status kan inte visas just nu.",
     "load_retry": "Försök igen",
@@ -2369,7 +2127,6 @@
     "access_enabled_send_only": "Aktiverat för att skicka e-fakturor. Mottagning ingår inte; skriv till support om ni vill ta emot."
   },
   "settings_pdf_print": {
-    "coming_soon": "Kommer snart",
     "heading": "Utskrift & PDF",
     "toast_save_failed": "Kunde inte spara",
     "font_label": "Typsnitt på fakturan",
@@ -2573,7 +2330,6 @@
   "settings_voucher_series": {
     "heading": "Verifikationsserier",
     "empty_state": "Inga verifikationsserier ännu. Serie {series} skapas automatiskt vid första verifikationen.",
-    "active_series_label": "Aktiva serier",
     "series_prefix": "Serie",
     "default_badge": "standard",
     "latest_number": "Senaste nr",
@@ -3017,7 +2773,6 @@
     "confirm_unlink": "Vill du koppla bort BankID från ditt konto?",
     "toast_unlinked": "BankID bortkopplat",
     "toast_unlink_failed": "Kunde inte koppla bort BankID",
-    "link_bankid_title": "Koppla BankID",
     "link_bankid_description": "Skanna QR-koden med BankID-appen",
     "linked_description": "Ditt konto är kopplat till BankID.",
     "not_linked_description": "Koppla BankID för säkrare inloggning.",
@@ -3051,7 +2806,6 @@
     "toast_unenroll_failed_title": "Kunde inte inaktivera 2FA",
     "toast_mfa_disabled_title": "Tvåfaktorsautentisering inaktiverad",
     "toast_mfa_disabled_description": "2FA har tagits bort från ditt konto.",
-    "change_password_title": "Ändra lösenord",
     "change_password_description": "Uppdatera ditt lösenord. Om du loggar in med e-postlänk kan du sätta ett lösenord här.",
     "new_password_label": "Nytt lösenord",
     "new_password_placeholder": "Minst 8 tecken",
@@ -3112,7 +2866,6 @@
     "skv_counterpart_body": "Det finns en skattekonto-händelse den {date} som matchar: bokför detta verifikat först, koppla sedan skattekonto-raden mot samma verifikat istället för att bokföra två gånger.",
     "match_invoice_btn": "Matcha Faktura {number}",
     "match_supplier_invoice_btn": "Matcha Leverantörsfaktura {number}",
-    "choose_template_btn": "Välj mall...",
     "match_voucher_btn": "Matcha mot befintlig verifikation",
     "attach_document_btn": "Matcha mot underlag",
     "more_actions_aria": "Fler åtgärder",
@@ -3157,7 +2910,6 @@
     "adjustment": "Justering"
   },
   "tx_quick_review": {
-    "open_attached_failed": "Kunde inte öppna underlaget",
     "exchange_rate_fetch_failed": "Kunde inte hämta växelkursen.",
     "title": "Granska bokföring",
     "description_template": "Granska verifikationen innan du bokför",
@@ -3177,17 +2929,10 @@
     "no_vat_liability_account": "Ingen moms för skuld-/eget kapital-konton",
     "no_vat_default": "Ingen moms",
     "change": "Ändra",
-    "attached_doc_label": "Underlag bifogat",
-    "attached_doc_source": "från dokumentinkorgen",
-    "opening": "Öppnar…",
-    "view": "Visa",
     "doc_label": "Underlag",
     "doc_attached_count": "{count} bifogade",
-    "doc_pick_existing": "Välj från inkorgen",
     "doc_pick_existing_inline": "eller välj befintligt underlag från inkorgen",
     "doc_picked_remove": "Ta bort underlag",
-    "doc_link_failed_title": "Underlag kunde inte bifogas",
-    "doc_link_failed_description": "{count} fil(er) kunde inte länkas till verifikationen.",
     "doc_link_failed_booked_title": "Bokförd, men underlag saknas",
     "doc_link_failed_booked_description": "Transaktionen bokfördes, men {count} underlag kunde inte bifogas verifikatet: {files}. Öppna verifikatet för att bifoga på nytt.",
     "doc_link_open_entry": "Öppna verifikatet",
@@ -3200,8 +2945,6 @@
   "tx_booking_dialog": {
     "title": "Bokför transaktion",
     "description": "Skapa en verifikation för transaktionen",
-    "doc_label": "Underlag (valfritt)",
-    "doc_attached_count": "{count} bifogade",
     "doc_pick_existing": "Välj befintligt underlag",
     "doc_pick_existing_inline": "eller välj befintligt underlag från inkorgen",
     "doc_picked_remove": "Ta bort underlag",
@@ -3257,54 +3000,11 @@
     "income_label": "Intäkter"
   },
   "tx_inbox_zero": {
-    "empty_title": "Inga transaktioner",
-    "empty_description": "Importera kontoutdrag från din bank eller lägg till transaktioner manuellt för att komma igång.",
-    "import_btn": "Importera transaktioner",
-    "add_manual_btn": "Lägg till manuellt",
     "done_title": "Alla transaktioner bokförda!",
     "done_description": "Bra jobbat! Alla dina transaktioner är bokförda. Importera fler eller växla till historik.",
     "import_more_btn": "Importera fler",
     "new_btn": "Ny transaktion"
   },
-  "tx_swipe_view": {
-    "doc_link_failed_title": "Underlag kunde inte bifogas",
-    "doc_link_failed_description": "{count} fil(er) kunde inte länkas till verifikationen.",
-    "booking_failed_skip": "Kunde inte bokföra. Tryck \"Hoppa över\" för att gå vidare.",
-    "generic_error_skip": "Ett fel uppstod. Tryck \"Hoppa över\" för att gå vidare.",
-    "match_failed_skip": "Kunde inte matcha faktura. Tryck \"Hoppa över\" för att gå vidare.",
-    "done_title": "Klart!",
-    "done_subtitle": "Alla transaktioner är nu bokförda",
-    "back_to_transactions": "Tillbaka till transaktioner",
-    "choose_template": "Välj mall",
-    "skip": "Hoppa över",
-    "review_title": "Granska bokföring",
-    "label_template": "Mall",
-    "label_category": "Kategori",
-    "change_template": "Byt mall",
-    "reverse_charge_warning": "Omvänd skattskyldighet kräver leverantörens momsregistreringsnummer och land.",
-    "label_account": "Konto",
-    "label_vat_treatment": "Momsbehandling",
-    "no_vat_liability_account": "Ingen moms för skuld-/eget kapital-konton",
-    "no_vat_default": "Ingen moms",
-    "change": "Ändra",
-    "doc_label": "Underlag",
-    "doc_attached_count": "{count} bifogade",
-    "booking": "Bokför...",
-    "book": "Bokför",
-    "progress_label": "{current} av {total}",
-    "instr_skip": "Hoppa över",
-    "instr_book": "Bokför",
-    "indicator_skip": "Hoppa över",
-    "indicator_business": "Företag",
-    "badge_receipt": "Kvitto",
-    "badge_attachment": "Bilaga",
-    "invoice_match_title": "Fakturamatchning hittad",
-    "invoice_match_badge": "Match",
-    "invoice_label": "Faktura {number}",
-    "unknown_customer": "Okänd kund",
-    "match_invoice_btn": "Matcha med Faktura {number}",
-    "suggested_categories": "Föreslagna kategorier"
-  },
   "tx_template_picker": {
     "group_premises": "Lokalkostnader",
     "group_vehicle": "Fordon",
@@ -3441,9 +3141,6 @@
     "preview_truncated": "+ {remaining} fler rader visas vid bokföring",
     "col_account": "Konto",
     "col_description": "Beskrivning",
-    "accounts_loading": "Laddar kontoplan...",
-    "accounts_load_failed": "Kontoplanen kunde inte laddas. Försök igen för att ändra konto.",
-    "accounts_retry": "Försök igen",
     "col_debit": "Debet",
     "col_credit": "Kredit",
     "total_label": "Totalt",
@@ -3704,7 +3401,6 @@
     "skv_badge": "Skatteverket",
     "duplicate_title_with_voucher": "Möjlig dublett av verifikat {label}",
     "duplicate_title_draft": "Möjlig dublett av verifikat (utkast)",
-    "duplicate_body": "Det här ser ut som samma kassaflöde: koppla istället för att bokföra om.",
     "link_to_voucher": "Koppla till verifikat",
     "book_anyway": "Bokför ändå",
     "book": "Bokför",
@@ -3839,9 +3535,7 @@
     "vat_none_desc": "Ej momspliktigt (t.ex. lön, privata uttag)"
   },
   "tx_skattekonto_match": {
-    "search_failed_default": "Kunde inte söka kandidater",
     "fetch_candidates_failed_title": "Kunde inte hämta kandidater",
-    "match_failed_default": "Matchning misslyckades",
     "match_success_title": "Transaktion kopplad till verifikat",
     "match_failed_title": "Kunde inte koppla transaktionen",
     "title": "Matcha mot befintligt verifikat",
@@ -3943,7 +3637,6 @@
     "load_customers_failed_title": "Kunde inte ladda kunder",
     "load_customers_failed_description": "Kontrollera din anslutning och försök igen.",
     "items_card_title": "Fakturarader",
-    "more_references": "Referenser & mer",
     "description_label": "Beskrivning",
     "description_placeholder": "T.ex. Instagram-kampanj",
     "quantity_label": "Antal",
@@ -4050,8 +3743,6 @@
     "deduction_housing_label": "Fastighetsbeteckning",
     "deduction_housing_placeholder": "t.ex. Stockholm Vasastan 1:23",
     "deduction_housing_hint": "Krävs för ROT-avdrag (RUT behöver inte detta fält).",
-    "deduction_cap_over": "Fakturans avdrag överstiger årstaket",
-    "deduction_cap_check": "Kunden behöver kontrollera sitt återstående utrymme själv.",
     "deduction_summary_label": "Skattereduktion ROT/RUT",
     "deduction_work_type_required": "Välj arbetstyp för ROT/RUT-raden.",
     "deduction_work_type_mismatch": "Arbetstypen hör inte till vald skattereduktion (ROT/RUT).",
@@ -4458,14 +4149,12 @@
     "created_toast_title": "Kreditfaktura skapad",
     "created_toast_description": "Kreditfaktura {number} har skapats som utkast.",
     "create_failed_title": "Kunde inte skapa kreditfaktura",
-    "create_failed_fallback": "Kunde inte skapa kreditfaktura",
     "try_again": "Försök igen."
   },
   "invoice_recurring": {
     "title": "Återkommande fakturor",
     "new_schedule": "Nytt schema",
     "viewer_disabled_tooltip": "Du har endast läsbehörighet i detta företag",
-    "loading": "Laddar...",
     "load_failed_title": "Kunde inte ladda återkommande fakturor",
     "load_failed_description": "Kontrollera din anslutning och försök igen.",
     "empty_title": "Inga återkommande fakturor",
@@ -4503,7 +4192,6 @@
     "interval_every_n": "Var {n}:e månad"
   },
   "invoice_recurring_new": {
-    "back": "Tillbaka",
     "title": "Nytt återkommande schema",
     "edit_title": "Redigera schema",
     "save_changes": "Spara ändringar",
@@ -4883,18 +4571,6 @@
     "debit_short": "D {amount}",
     "credit_short": "K {amount}",
     "debit_credit_short": "D {debit} / K {credit}",
-    "account_2440": "Leverantörsskulder",
-    "account_2641": "Ingående moms",
-    "account_2645": "Beräknad ing. moms förvärv utlandet",
-    "account_2647": "Beräknad ing. moms omvänd i Sverige",
-    "account_2614": "Utg. moms omvänd 25%",
-    "account_2624": "Utg. moms omvänd 12%",
-    "account_2634": "Utg. moms omvänd 6%",
-    "account_1710": "Förutbetalda hyreskostnader",
-    "account_1720": "Förutbetalda leasingavgifter",
-    "account_1730": "Förutbetalda försäkringspremier",
-    "account_1740": "Förutbetalda räntekostnader",
-    "account_1790": "Övriga förutbetalda kostnader",
     "review_accrual_line_info": "Periodiseras {from} till {to}"
   },
   "supplier_invoice_detail": {
@@ -5017,7 +4693,6 @@
     "type_swedish": "Svenskt företag eller organisation",
     "type_eu": "EU-företag",
     "type_non_eu": "Utanför EU",
-    "org_number_inline": " | Org.nr: {number}",
     "edit": "Redigera",
     "edit_dialog_title": "Redigera leverantör",
     "load_failed_title": "Kunde inte ladda leverantör",
@@ -5034,17 +4709,7 @@
     "total_paid": "Totalt betalt",
     "invoice_count": "Antal fakturor",
     "contact_section_title": "Kontaktuppgifter",
-    "email_inline": "E-post: {email}",
-    "phone_inline": "Telefon: {phone}",
-    "vat_inline": "VAT: {vat}",
     "payment_section_title": "Betalningsuppgifter",
-    "bankgiro_inline": "Bankgiro: {value}",
-    "plusgiro_inline": "Plusgiro: {value}",
-    "iban_inline": "IBAN: {value}",
-    "bic_inline": "BIC: {value}",
-    "payment_terms_inline": "Betalningsvillkor: {days} dagar",
-    "currency_inline": "Valuta: {currency}",
-    "expense_account_inline": "Kostnadskonto: {account}",
     "delete": "Ta bort",
     "kicker_org": "Org.nr {number}",
     "def_email": "E-post",
@@ -5111,9 +4776,7 @@
     "import_attn_action": "Visa importhistorik",
     "mode_vouchers": "Verifikat",
     "mode_drafts": "Utkast",
-    "density_compact": "Kompakt visning",
     "show_correction_chain": "Visa storno- och rättade poster",
-    "loading": "Laddar verifikationer...",
     "empty_title": "Inga verifikationer",
     "empty_description": "Verifikationer skapas automatiskt vid fakturering och transaktionsbokföring, eller manuellt via fliken \"Ny verifikation\".",
     "empty_drafts_title": "Inga utkast",
@@ -5138,25 +4801,19 @@
     "filter_dialog_title": "Filtrera verifikat",
     "filter_clear_all": "Rensa alla filter",
     "filter_done": "Klar",
-    "filter_section_period": "Räkenskapsår",
     "filter_section_sort": "Sortering",
     "filter_section_series": "Verifikationsserie",
     "filter_section_date": "Datumintervall",
     "clear_date_filter": "Rensa datumfilter",
-    "scope_label": "Visar:",
-    "scope_all_years": "Alla räkenskapsår",
     "out_of_period_label": "Efterföljande",
     "rattelse_badge": "Rättad",
     "rattelse_badge_tooltip": "Verifikatet har rättats i efterhand: se rättelsehistoriken på verifikatsidan",
     "out_of_period_tooltip": "Bokförd i ett senare räkenskapsår, men avser det valda året (t.ex. betalning av en faktura utställd i det valda året).",
-    "out_of_period_tooltip_mobile": "Bokförd i ett senare räkenskapsår, men avser det valda året.",
     "attachment_count_tooltip": "{count} underlag",
     "missing_attachment_tooltip": "Underlag saknas",
     "no_lines": "Inga kontorader hittades för denna verifikation.",
     "debit": "Debet",
     "credit": "Kredit",
-    "sum_debit": "Summa debet",
-    "sum_credit": "Summa kredit",
     "post": "Bokför",
     "show_details": "Visa detaljer",
     "create_correction": "Skapa ändringsverifikation",
@@ -5207,7 +4864,6 @@
     "sum_label": "Summa",
     "batch_select_all": "Markera alla ({count})",
     "batch_select_row": "Markera verifikat",
-    "batch_selected_count": "{count} markerade",
     "batch_mark_no_doc": "Markera som inget underlag krävs",
     "batch_clear_selection": "Avmarkera",
     "batch_no_doc_done_title": "Markerade som inget underlag krävs",
@@ -5265,9 +4921,6 @@
     "download": "Ladda ner",
     "remove": "Ta bort",
     "replace": "Ersätt med ny version",
-    "remove_confirm_title": "Ta bort underlag",
-    "remove_confirm_body": "Vill du ta bort {file}? Detta går inte att ångra.",
-    "remove_confirm_cta": "Ta bort",
     "remove_blocked_title": "Underlaget kan inte tas bort",
     "remove_blocked_body": "Detta underlag är knutet till en verifikation och utgör räkenskapsinformation enligt Bokföringslagen 7 kap 2§. Räkenskapsinformation måste bevaras i minst 7 år och får inte raderas.",
     "remove_blocked_hint": "Behöver underlaget korrigeras: ladda upp en ny version. Den befintliga bevaras då i versionshistoriken.",
@@ -5278,7 +4931,6 @@
     "detaching": "Kopplar bort...",
     "detach_failed": "Underlaget kunde inte kopplas bort.",
     "replace_uploading": "Ersätter...",
-    "remove_failed": "Kunde inte ta bort underlaget.",
     "replace_failed": "Kunde inte ladda upp ny version.",
     "choose_from_inbox": "Välj från inkorgen",
     "picker_title": "Välj underlag från inkorgen",
@@ -5340,7 +4992,6 @@
     "accounts_retry": "Försök igen",
     "edit_draft": "Redigera",
     "back": "Tillbaka till bokföring",
-    "loading": "Laddar verifikation...",
     "error_not_found": "Verifikation hittades inte",
     "error_load_failed": "Kunde inte hämta verifikation",
     "post": "Bokför",
@@ -5349,9 +5000,7 @@
     "confirm_post_description_generic": "Verifikatet \"{description}\" bokförs med nästa lediga verifikationsnummer och kan därefter inte ändras, bara rättas eller stornas.",
     "delete_draft": "Radera utkast",
     "delete_entry": "Radera verifikat",
-    "create_correction": "Skapa ändringsverifikation",
     "copy_entry": "Kopiera verifikat",
-    "edit_entry": "Redigera",
     "correct_menu": "Rätta",
     "correct_lines": "Rätta rader (ändringsverifikat)",
     "correct_date": "Rätta datum",
@@ -5731,12 +5380,10 @@
     "col_audited": "Reviderad",
     "col_audit_opinion": "Revisionsutlåtande",
     "status_section": "Status",
-    "status_no_entries": "Inga statusposter registrerade.",
     "fiscal_year_section": "Räkenskapsår",
     "fiscal_year_current": "Nuvarande: {start}-{end}",
     "fiscal_year_changed": "Räkenskapsåret har ändrats {n, plural, one {# gång} other {# gånger}}.",
     "signatory_section": "Firmateckning",
-    "signatory_empty": "Ingen firmateckning registrerad hos TIC.",
     "board_section": "Företrädare",
     "board_summary_members": "{n, plural, one {# styrelseledamot} other {# styrelseledamöter}}",
     "board_summary_deputies": "{n, plural, one {# suppleant} other {# suppleanter}}",
@@ -5748,7 +5395,6 @@
     "col_position": "Roll",
     "col_since": "Sedan",
     "payroll_section": "Lönehistorik",
-    "payroll_empty": "Ingen lönehistorik registrerad hos Skatteverket.",
     "col_payroll_period": "Period",
     "col_payroll_employees": "Anställda",
     "col_payroll_tax": "Avdragen skatt",
@@ -6132,30 +5778,17 @@
     "counterparty_suggestion_gone_title": "Motparten är inte längre tillgänglig",
     "counterparty_suggestion_gone_description": "Förslaget hann uppdateras. Stäng rutan, öppna den igen och välj motparten på nytt.",
     "page_title": "Transaktioner",
-    "subtitle_to_post": "att bokföra",
-    "subtitle_matches": "{count} fakturamatchningar",
-    "history_subtitle": "Alla dina transaktioner",
     "action_import": "Importera",
-    "action_review_all": "Gå igenom alla",
-    "action_review_loading": "Laddar...",
     "action_new_transaction": "Ny transaktion",
     "viewer_disabled_tooltip": "Du har endast läsbehörighet i detta företag",
     "mode_inbox": "Att bokföra",
-    "mode_history": "Alla transaktioner",
-    "source_label": "Källa:",
-    "source_all": "Alla ({count})",
-    "source_bank": "Bank ({count})",
-    "source_skatteverket": "Skatteverket ({count})",
-    "search_placeholder": "Sök transaktion...",
     "no_search_results": "Inga transaktioner matchar din sökning.",
     "source_empty": "Den valda källan har inga transaktioner. Välj Alla för att visa övriga källor.",
     "period_empty": "Den valda perioden har inga transaktioner. Välj Alla räkenskapsår för att visa allt.",
     "period_pending_outside": "{count, plural, one {# transaktion att bokföra utanför vald period.} other {# transaktioner att bokföra utanför vald period.}}",
     "period_show_all": "Visa alla",
-    "skv_reconnect_title": "Anslutningen till Skatteverket behöver förnyas",
     "skv_reconnect_body": "Skattekontots transaktioner hämtas inte förrän du anslutit igen med BankID och godkänt alla behörigheter.",
     "skv_reconnect_cta": "Anslut igen",
-    "dialog_choose_template": "Välj mall",
     "dialog_match_invoice": "Matcha med faktura",
     "dialog_add_transaction": "Lägg till transaktion",
     "dialog_match_supplier_invoice": "Matcha mot leverantörsfaktura?",
@@ -6199,8 +5832,6 @@
     "match_failed_transaction": "Transaktionen kunde inte matchas. Försök igen.",
     "match_failed_with_invoice": "Transaktionen kunde inte matchas med fakturan. Försök igen.",
     "voucher_link_failed_description": "Verifikationen kunde inte kopplas. Försök igen.",
-    "login_required_title": "Inloggning krävs",
-    "login_required_description": "Du måste vara inloggad för att lägga till transaktioner.",
     "deleted_title": "Borttagen",
     "deleted_description": "Transaktionen har tagits bort",
     "delete_failed_description": "Transaktionen kunde inte tas bort. Försök igen.",
@@ -6208,7 +5839,6 @@
     "edit_title_failed": "Kunde inte uppdatera titeln",
     "move_account_saved": "Transaktionen flyttades",
     "move_account_failed": "Kunde inte flytta transaktionen",
-    "review_in_bookkeeping_description": "Granska och bokför verifikatet i Bokföring.",
     "bank_sync_attention_one": "1 bankanslutning behöver förnyas",
     "bank_sync_attention_many": "{count} bankanslutningar behöver förnyas",
     "bank_sync_auto_nightly": "Synkas automatiskt varje natt",
@@ -6335,10 +5965,6 @@
     "toast_post_failed_generic": "Kunde inte bokföra verifikat",
     "edit_draft_dialog_title": "Redigera utkast",
     "title": "Bokföring",
-    "year_end": "Årsbokslut",
-    "tab_journal": "Verifikationer",
-    "tab_new_entry": "Ny verifikation",
-    "tab_accounts": "Kontoplan",
     "new_entry_dialog_title": "Ny verifikation",
     "create_with_assistant": "Skapa med assistent",
     "loading_source_voucher": "Laddar källverifikat...",
@@ -6457,7 +6083,6 @@
   },
   "form_article": {
     "type_label": "Typ *",
-    "type_placeholder": "Välj typ",
     "type_vara": "Vara",
     "type_tjanst": "Tjänst",
     "number_label": "Artikelnummer",
@@ -6480,17 +6105,14 @@
     "summary_booked_on": "Bokförs på",
     "summary_unnamed": "Namnlös artikel",
     "revenue_account_label": "Bokföringskonto",
-    "revenue_account_placeholder": "t.ex. 2897",
     "revenue_account_hint": "Lämna tomt för att härleda försäljningskontot automatiskt utifrån momsen. Du kan välja ett aktivt konto i klass 1-3.",
     "posting_account_invalid": "Ange ett fyrsiffrigt konto i klass 1-3.",
     "cost_price_label": "Inköpspris",
     "cost_price_hint": "Endast för marginalberäkning, bokförs aldrig.",
     "currency_label": "Valuta",
-    "currency_hint": "Förifyller en ny fakturas valuta när artikeln läggs till.",
     "ean_label": "EAN/streckkod",
     "ean_placeholder": "t.ex. 7350000000000",
     "housework_label": "ROT/RUT",
-    "housework_placeholder": "Välj arbetstyp",
     "housework_none": "Ingen",
     "housework_rot": "ROT",
     "housework_rut": "RUT",
@@ -6529,52 +6151,6 @@
     "col_created": "Skapad",
     "count_summary": "{count, plural, one {1 kund} other {# kunder}}"
   },
-  "products": {
-    "title": "Produkter",
-    "new_product": "Ny produkt",
-    "back_to_list": "Tillbaka till produkter",
-    "viewer_disabled_tooltip": "Du har endast läsbehörighet i detta företag",
-    "load_failed_title": "Kunde inte ladda produkter",
-    "load_failed_description": "Kontrollera din anslutning och försök igen.",
-    "create_failed_title": "Kunde inte skapa produkt",
-    "update_failed_title": "Kunde inte uppdatera produkt",
-    "archive_failed_title": "Kunde inte arkivera produkt",
-    "created_title": "Produkt skapad",
-    "created_description": "{name} har lagts till",
-    "updated_title": "Produkt uppdaterad",
-    "archived_title": "Produkten arkiverades",
-    "archive": "Arkivera",
-    "archive_confirm": "Är du säker på att du vill arkivera produkten? Befintliga fakturor med produkten påverkas inte.",
-    "archived_badge": "Arkiverad",
-    "search_placeholder": "Sök produkter",
-    "no_search_results_title": "Inga träffar",
-    "no_search_results_description": "Inga produkter matchar \"{term}\".",
-    "empty_title": "Inga produkter ännu",
-    "empty_description": "Skapa din första produkt för att kunna lägga till den på fakturor.",
-    "section_basics": "Grunduppgifter",
-    "section_pricing": "Pris & moms",
-    "type_goods": "Vara",
-    "type_service": "Tjänst",
-    "field_name": "Produktnamn",
-    "field_name_placeholder": "T.ex. Glödlampa LED 9W",
-    "field_sku": "Artikelnummer (SKU)",
-    "field_sku_placeholder": "T.ex. LED-9W-E27",
-    "field_description": "Beskrivning",
-    "field_type": "Produkttyp",
-    "field_type_hint": "Varor påverkar lagersaldot vid fakturering. Tjänster gör det inte.",
-    "field_category": "Kategori",
-    "field_default_price": "Standardpris (exkl. moms)",
-    "field_default_unit": "Enhet",
-    "field_default_vat": "Standardmomssats",
-    "validation_name_required": "Produktnamn krävs",
-    "save": "Spara",
-    "cancel": "Avbryt",
-    "col_name": "Namn",
-    "col_sku": "SKU",
-    "col_type": "Typ",
-    "col_default_price": "Standardpris",
-    "col_unit": "Enhet"
-  },
   "webshop_orders": {
     "title": "Order",
     "all_stores": "Alla butiker",
@@ -6688,179 +6264,22 @@
     "bulk_none_bookable": "Inga av de markerade ordrarna kan bokföras i svep. Bokför dem enskilt.",
     "bulk_skipped_unsupported_rate": "Hoppas över (momssats som inte är svensk, bokför enskilt): {numbers}"
   },
-  "sales_orders": {
-    "title": "Order",
-    "back_to_list": "Tillbaka till order",
-    "new_order": "Ny order",
-    "viewer_disabled_tooltip": "Du har endast läsbehörighet i detta företag",
-    "load_failed_title": "Kunde inte ladda ordrar",
-    "load_failed_description": "Kontrollera din anslutning och försök igen.",
-    "search_placeholder": "Sök ordernummer eller kund",
-    "empty_title": "Inga ordrar ännu",
-    "empty_description": "Skapa din första order när en kund godkänner en offert eller direkt från grunden.",
-    "no_category_title": "Inga ordrar i denna kategori",
-    "no_category_description": "Prova ett annat filter eller skapa en ny order.",
-    "tab_all": "Alla",
-    "tab_draft": "Utkast",
-    "tab_confirmed": "Bekräftade",
-    "tab_partially_shipped": "Delvis levererade",
-    "tab_shipped": "Levererade",
-    "tab_partially_invoiced": "Delvis fakturerade",
-    "tab_invoiced": "Fakturerade",
-    "tab_cancelled": "Avbrutna",
-    "status_draft": "Utkast",
-    "status_confirmed": "Bekräftad",
-    "status_partially_shipped": "Delvis levererad",
-    "status_shipped": "Levererad",
-    "status_partially_invoiced": "Delvis fakturerad",
-    "status_invoiced": "Fakturerad",
-    "status_cancelled": "Avbruten",
-    "col_number": "Nummer",
-    "col_customer": "Kund",
-    "col_date": "Datum",
-    "col_expected_delivery": "Önskad leverans",
-    "col_status": "Status",
-    "col_amount": "Belopp",
-    "col_description": "Beskrivning",
-    "col_quantity": "Antal",
-    "col_quantity_shipped": "Levererat",
-    "col_quantity_invoiced": "Fakturerat",
-    "col_unit_price": "À-pris",
-    "col_line_total": "Radsumma",
-    "section_header": "Orderuppgifter",
-    "section_lines": "Orderrader",
-    "section_progress": "Leverans- och faktureringsstatus",
-    "field_customer": "Kund",
-    "field_order_date": "Orderdatum",
-    "field_expected_delivery": "Önskad leveransdatum",
-    "field_currency": "Valuta",
-    "field_notes": "Anteckningar",
-    "field_our_reference": "Vår referens",
-    "field_your_reference": "Er referens",
-    "field_product": "Produkt",
-    "field_unit": "Enhet",
-    "field_vat_rate": "Moms",
-    "action_confirm": "Bekräfta order",
-    "action_ship": "Leverera",
-    "action_invoice": "Fakturera",
-    "action_cancel": "Avbryt",
-    "action_delete": "Ta bort utkast",
-    "confirm_dialog_title": "Bekräfta ordern?",
-    "confirm_dialog_description": "Kunden förbinder sig att ta emot leveransen. Du kan därefter skapa följesedel och faktura.",
-    "ship_dialog_title": "Leverera ordern",
-    "ship_dialog_description": "En följesedel skapas och lagersaldot uppdateras automatiskt för produkter som spårar lager.",
-    "invoice_dialog_title": "Fakturera ordern",
-    "invoice_dialog_description": "En faktura skapas för återstående mängd. Du kan redigera den innan du skickar den till kund.",
-    "cancel_dialog_title": "Avbryta ordern?",
-    "cancel_dialog_description": "Ordern kan endast avbrytas innan första leverans. Avbrutna ordrar går inte att återställa.",
-    "delete_dialog_title": "Ta bort utkast?",
-    "delete_dialog_description": "Utkast kan tas bort utan spår: bekräftade ordrar måste avbrytas istället.",
-    "confirmed_toast": "Ordern är bekräftad",
-    "shipped_toast": "Följesedel skapad",
-    "invoiced_toast": "Faktura skapad",
-    "cancelled_toast": "Ordern är avbruten",
-    "deleted_toast": "Utkastet är borttaget",
-    "from_quote": "Från offert",
-    "summary_total": "Total",
-    "summary_subtotal": "Delsumma",
-    "summary_vat": "Moms",
-    "stock_warnings_title": "Vissa lagerrörelser kunde inte registreras",
-    "validation_at_least_one_line": "Minst en orderrad krävs",
-    "remaining_to_ship": "{remaining} kvar att leverera",
-    "remaining_to_invoice": "{remaining} kvar att fakturera"
-  },
-  "inventory": {
-    "title": "Lager",
-    "back_to_inventory": "Tillbaka till lager",
-    "view_movements": "Visa lagerrörelser",
-    "movements_title": "Lagerrörelser",
-    "load_failed_title": "Kunde inte ladda lagerdata",
-    "no_locations_title": "Inget lager konfigurerat",
-    "no_locations_description": "Skapa ett primärt lager för att börja registrera lagersaldon.",
-    "create_primary_location": "Skapa primärt lager",
-    "default_location_name": "Huvudlager",
-    "location_created": "Lager skapat",
-    "location_create_failed": "Kunde inte skapa lager",
-    "locations_title": "Lagerplatser",
-    "primary": "Primär",
-    "inactive": "Inaktiv",
-    "stock_levels_title": "Aktuellt lagersaldo",
-    "no_levels_title": "Inga lagerrörelser ännu",
-    "no_levels_description": "Lagerrörelser skapas automatiskt när du skickar fakturor eller godkänner leverantörsfakturor som länkar till produkter av typen 'Vara'.",
-    "no_movements_title": "Inga lagerrörelser ännu",
-    "no_movements_description": "Här visas alla in- och utleveranser så snart de börjar registreras.",
-    "col_location_name": "Namn",
-    "col_location_status": "Status",
-    "col_product": "Produkt",
-    "col_sku": "SKU",
-    "col_location": "Plats",
-    "col_quantity": "Saldo",
-    "col_unit": "Enhet",
-    "col_when": "När",
-    "col_reason": "Anledning",
-    "col_delta": "Förändring",
-    "col_reference": "Källa",
-    "reason_purchase": "Inköp",
-    "reason_sale": "Försäljning",
-    "reason_adjustment": "Justering",
-    "reason_transfer_in": "Inflyttning",
-    "reason_transfer_out": "Utflyttning",
-    "reason_return": "Retur",
-    "reason_disposal": "Kassation",
-    "reason_opening": "Ingående saldo",
-    "ref_invoice": "Faktura",
-    "ref_supplier_invoice": "Leverantörsfaktura",
-    "ref_transfer": "Lageröverföring",
-    "ref_transfer_rollback": "Återställning",
-    "ref_manual": "Manuell"
-  },
   "self_billing": {
     "title": "Registrera självfaktura",
-    "subtitle": "En självfaktura du tagit emot: kunden har fakturerat i ditt namn. För dig är det en försäljning med utgående moms.",
-    "back": "Tillbaka",
-    "issuer_card_title": "Utställare och fakturareferens",
     "issuer_card_description": "Kunden som ställt ut självfakturan, och fakturanumret de tilldelat.",
     "customer_label": "Kund (utställare)",
-    "select_customer_placeholder": "Välj kund",
     "external_number_label": "Fakturanummer (kundens)",
     "external_number_placeholder": "t.ex. SF-2026-014",
     "agreement_ref_label": "Avtalsreferens",
     "agreement_ref_placeholder": "Självfaktureringsavtal",
-    "items_card_title": "Rader",
-    "items_card_description": "Beloppen från den mottagna självfakturan.",
-    "description_label": "Beskrivning",
-    "description_placeholder": "Beskrivning",
-    "quantity_label": "Antal",
-    "unit_label": "Enhet",
-    "unit_price_label": "À-pris",
-    "vat_label": "Moms",
-    "row_label": "Rad {index}",
-    "add_row": "Lägg till rad",
-    "notes_card_title": "Anteckningar",
-    "notes_placeholder": "Interna anteckningar (valfritt)",
-    "details_card_title": "Uppgifter",
-    "currency_label": "Valuta",
     "invoice_date_label": "Fakturadatum",
     "received_date_label": "Mottaget datum",
-    "due_date_label": "Förfallodatum",
-    "summary_card_title": "Sammanfattning",
-    "subtotal_label": "Netto",
-    "output_vat_label": "Utgående moms",
-    "total_label": "Totalt",
     "register": "Registrera självfaktura",
-    "viewer_disabled_tooltip": "Du har endast läsbehörighet i detta företag",
-    "load_customers_failed": "Kunde inte ladda kunder",
     "created_title": "Självfaktura registrerad",
     "created_description": "Självfaktura {number} har bokförts som försäljning",
     "create_failed_title": "Kunde inte registrera självfakturan",
-    "validation_customer_required": "Välj en kund",
     "validation_external_number_required": "Fakturanummer krävs",
-    "validation_invoice_date_required": "Fakturadatum krävs",
-    "validation_received_date_required": "Mottaget datum krävs",
-    "validation_due_date_required": "Förfallodatum krävs",
-    "validation_description_required": "Beskrivning krävs",
-    "validation_quantity_min": "Antal måste vara minst 0,01",
-    "validation_min_one_row": "Minst en rad krävs"
+    "validation_received_date_required": "Mottaget datum krävs"
   },
   "invoices": {
     "rot_rut_payout_action": "ROT/RUT-fil",
@@ -7274,28 +6693,7 @@
     "card_blockers_title": "Att åtgärda",
     "card_blockers_detail": "{bank} saknar bankkonto · {email} saknar e-post",
     "card_blockers_none": "Inga blockerare — alla anställda är kompletta.",
-    "card_vacation_title": "Semesterdagar kvar",
-    "card_vacation_detail": "{employees} anställda, {saved} sparade dagar",
-    "card_vacation_none": "Semestersaldon skapas vid första bokförda lönekörningen.",
-    "vacation_close_button": "Stäng semesterår",
-    "vacation_close_title": "Semesterårsavslut",
-    "vacation_close_description": "Granska övergången innan du bekräftar: sparade dagar rullas (max 5 år), utgångna dagar flaggas för utbetalning och semesterlöneskulden stäms av mot bokfört saldo.",
-    "vacation_close_previewing": "Förbereder granskningsrapport…",
     "vacation_close_preview_failed": "Kunde inte förbereda rapporten",
-    "vacation_close_period": "Semesterår {from} till {to}",
-    "vacation_close_col_employee": "Anställd",
-    "vacation_close_col_saved": "Sparas",
-    "vacation_close_col_flagged": "Flaggade",
-    "vacation_close_col_expiring": "Utgår",
-    "vacation_close_col_next": "Nästa år",
-    "vacation_close_computed": "Beräknad semesterlöneskuld: {amount}",
-    "vacation_close_booked": "Bokfört på 2920: {amount}",
-    "vacation_close_drift": "Justering bokförs: {amount}",
-    "vacation_close_no_drift": "Ingen justering behövs (differens under 1 kr).",
-    "vacation_close_cancel": "Avbryt",
-    "vacation_close_confirm": "Stäng semesteråret",
-    "vacation_close_done": "Semesteråret stängt",
-    "vacation_close_failed": "Semesterårsavslutet misslyckades",
     "status_draft": "Utkast",
     "status_review": "Granskning",
     "status_approved": "Godkänd",
@@ -7315,7 +6713,6 @@
     "not_found": "Lönekörning hittades inte",
     "more_actions": "Fler åtgärder",
     "unknown_error": "Okänt fel",
-    "rail_title": "Månadens steg",
     "rail_calculate": "Beräkna",
     "rail_calculate_hint": "Beräkna löner, skatt och avgifter, och skicka sedan till granskning.",
     "rail_approve": "Godkänn",
@@ -7391,7 +6788,6 @@
     "th_vacation": "Semester",
     "th_payslip": "Lönespec",
     "diff_new_employee": "Ny",
-    "view_pdf": "Visa PDF",
     "view_payslip_title": "Visa lönespecifikation",
     "salary_input_aria": "Månadslön för {name}",
     "degree_hint": "× {degree} % = {amount}",
@@ -7863,19 +7259,6 @@
     "source_unavailable": "Skattetabeller för {year} kunde inte hämtas",
     "recheck": "Kontrollera igen"
   },
-  "time_tracking": {
-    "title": "Tidrapportering",
-    "billable_inbox": "Fakturerbar tid per kund",
-    "create_invoice": "Skapa faktura",
-    "hourly_rate": "Timpris",
-    "project_required": "Välj projekt för att fakturera",
-    "no_project": "Inget projekt",
-    "no_billable_hours": "Ingen fakturerbar tid att fakturera. Markera dagar som fakturerbara för att samla dem här.",
-    "log_hours": "Logga tid",
-    "billable": "Fakturerbar",
-    "invoiced": "Fakturerad",
-    "missing_rate": "Saknar timpris"
-  },
   "import": {
     "title": "Importera / exportera",
     "subtitle": "Importera banktransaktioner eller bokföringsdata till ditt företag",
@@ -8201,36 +7584,11 @@
     "k3_draft_notice": "K3-dokumentet är ännu ett granskningsutkast och kan inte låsas eller lämnas in via Accounted. Upprätta och lämna in årsredovisningen på papper tills hela upplysningsmatrisen är implementerad och granskad."
   },
   "empty": {
-    "invoices_title": "Inga fakturor ännu",
-    "invoices_description": "Skapa din första faktura för att komma igång.",
-    "customers_title": "Inga kunder ännu",
-    "customers_description": "Lägg till din första kund för att börja fakturera.",
-    "transactions_title": "Inga transaktioner",
-    "transactions_description": "När bankkopplingen synkar dyker transaktionerna upp här.",
-    "suppliers_title": "Inga leverantörer ännu",
-    "suppliers_description": "Lägg till din första leverantör.",
-    "no_results": "Inga resultat",
-    "no_data": "Inga uppgifter att visa",
     "support_hint_subject": "Behöver hjälp att komma igång",
     "support_hint_label": "Behöver du hjälp? Kontakta support",
-    "preset_invoices_title": "Inga fakturor ännu",
-    "preset_invoices_description": "Skapa din första faktura på under 60 sekunder. Vi fyller i dina uppgifter automatiskt.",
-    "preset_invoices_action": "Skapa faktura",
     "preset_customers_title": "Inga kunder ännu",
     "preset_customers_description": "Lägg till dina kunder för att enkelt skapa fakturor och hålla koll på betalningar.",
-    "preset_customers_action": "Lägg till kund",
-    "preset_transactions_title": "Inga transaktioner",
-    "preset_transactions_description": "Importera kontoutdrag från din bank för att automatiskt bokföra och få koll på ekonomin.",
-    "preset_transactions_action": "Importera transaktioner",
-    "preset_deadlines_title": "Inga kommande deadlines",
-    "preset_deadlines_description": "Bra jobbat! Du har inga omedelbara deadlines att ta hand om.",
-    "preset_no_bank_title": "Inga transaktioner importerade",
-    "preset_no_bank_description": "Importera kontoutdrag från din bank för att automatiskt bokföra och få bättre koll på ekonomin.",
-    "preset_no_bank_action": "Importera transaktioner",
-    "preset_reports_title": "Inga rapporter tillgängliga",
-    "preset_reports_description": "Rapporter genereras automatiskt när du har tillräckligt med data. Börja med att skapa fakturor eller importera transaktioner.",
-    "preset_reports_action": "Skapa faktura",
-    "preset_reports_secondary": "Importera transaktioner"
+    "preset_customers_action": "Lägg till kund"
   },
   "start_cards": {
     "invoices_title": "Din första faktura tar två minuter.",
@@ -8432,7 +7790,6 @@
     "action_show_voucher": "Visa verifikat",
     "action_match": "Matcha",
     "action_book": "Bokför",
-    "action_booking": "Bokför…",
     "ignore_action": "Ignorera",
     "action_unignore": "Återställ",
     "band_ignored": "Ignorerade",
diff --git a/package-lock.json b/package-lock.json
index 0040ff13..dd82c27c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,10 +28,8 @@
         "@supabase/ssr": "^0.12.1",
         "@supabase/supabase-js": "^2.110.1",
         "@tailwindcss/typography": "^0.5.20",
-        "@types/qrcode": "^1.5.6",
         "@upstash/ratelimit": "^2.0.8",
         "@upstash/redis": "^1.38.0",
-        "@use-gesture/react": "^10.3.1",
         "@vercel/speed-insights": "^2.0.0",
         "ai": "6.0.259",
         "class-variance-authority": "^0.7.1",
@@ -62,7 +60,6 @@
         "server-only": "^0.0.1",
         "sharp": "^0.35.3",
         "stripe": "^22.3.1",
-        "svix": "^1.85.0",
         "swr": "^2.4.2",
         "tailwind-merge": "^3.6.0",
         "web-push": "^3.6.7",
@@ -76,9 +73,9 @@
         "@types/node": "^20",
         "@types/nodemailer": "8.0.1",
         "@types/pg": "^8.20.0",
+        "@types/qrcode": "^1.5.6",
         "@types/react": "^19",
         "@types/react-dom": "^19",
-        "@types/sharp": "^0.32.0",
         "@types/web-push": "^3.6.4",
         "dotenv": "^17.4.2",
         "eslint": "^9",
@@ -7779,6 +7776,7 @@
       "version": "20.19.30",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.30.tgz",
       "integrity": "sha512-WJtwWJu7UdlvzEAUm484QNg5eAoq5QR08KDNx7g45Usrs2NtOPiX8ugDqmKdXkyL03rBqU5dYNYVQetEpBHq2g==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -7810,6 +7808,7 @@
       "version": "1.5.6",
       "resolved": "https://registry.npmjs.org/@types/qrcode/-/qrcode-1.5.6.tgz",
       "integrity": "sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -7834,17 +7833,6 @@
         "@types/react": "^19.2.0"
       }
     },
-    "node_modules/@types/sharp": {
-      "version": "0.32.0",
-      "resolved": "https://registry.npmjs.org/@types/sharp/-/sharp-0.32.0.tgz",
-      "integrity": "sha512-OOi3kL+FZDnPhVzsfD37J88FNeZh6gQsGcLc95NbeURRGvmSjeXiDcyWzF2o3yh/gQAUn2uhh/e+CPCa5nwAxw==",
-      "deprecated": "This is a stub types definition. sharp provides its own type definitions, so you do not need this installed.",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sharp": "*"
-      }
-    },
     "node_modules/@types/trusted-types": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
@@ -8451,24 +8439,6 @@
         "uncrypto": "^0.1.3"
       }
     },
-    "node_modules/@use-gesture/core": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.3.1.tgz",
-      "integrity": "sha512-WcINiDt8WjqBdUXye25anHiNxPc0VOrlT8F6LLkU6cycrOGUDyY/yyFmsg3k8i5OLvv25llc0QC45GhR/C8llw==",
-      "license": "MIT"
-    },
-    "node_modules/@use-gesture/react": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.3.1.tgz",
-      "integrity": "sha512-Yy19y6O2GJq8f7CHf7L0nxL8bf4PZCPaVOCgJrusOeFHY1LvHgYXnmnXg6N5iwAnbgbZCDjo60SiM6IPJi9C5g==",
-      "license": "MIT",
-      "dependencies": {
-        "@use-gesture/core": "10.3.1"
-      },
-      "peerDependencies": {
-        "react": ">= 16.8.0"
-      }
-    },
     "node_modules/@vercel/oidc": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@vercel/oidc/-/oidc-3.2.0.tgz",
@@ -15943,15 +15913,6 @@
       "integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==",
       "license": "ISC"
     },
-    "node_modules/svix": {
-      "version": "1.96.1",
-      "resolved": "https://registry.npmjs.org/svix/-/svix-1.96.1.tgz",
-      "integrity": "sha512-l+GyPS6gjL0okiXplLazEY2GbBsv1jZ4UIwtjp553YkDDv635xMKbM5sABpIdiWy1BYxgyV8M6tHeTwY0gyXlQ==",
-      "license": "MIT",
-      "dependencies": {
-        "standardwebhooks": "1.0.0"
-      }
-    },
     "node_modules/swr": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/swr/-/swr-2.4.2.tgz",
@@ -16876,6 +16837,7 @@
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/unicode-properties": {
diff --git a/package.json b/package.json
index ec1beabd..b06812ea 100644
--- a/package.json
+++ b/package.json
@@ -49,10 +49,8 @@
     "@supabase/ssr": "^0.12.1",
     "@supabase/supabase-js": "^2.110.1",
     "@tailwindcss/typography": "^0.5.20",
-    "@types/qrcode": "^1.5.6",
     "@upstash/ratelimit": "^2.0.8",
     "@upstash/redis": "^1.38.0",
-    "@use-gesture/react": "^10.3.1",
     "@vercel/speed-insights": "^2.0.0",
     "ai": "6.0.259",
     "class-variance-authority": "^0.7.1",
@@ -83,7 +81,6 @@
     "server-only": "^0.0.1",
     "sharp": "^0.35.3",
     "stripe": "^22.3.1",
-    "svix": "^1.85.0",
     "swr": "^2.4.2",
     "tailwind-merge": "^3.6.0",
     "web-push": "^3.6.7",
@@ -97,9 +94,9 @@
     "@types/node": "^20",
     "@types/nodemailer": "8.0.1",
     "@types/pg": "^8.20.0",
+    "@types/qrcode": "^1.5.6",
     "@types/react": "^19",
     "@types/react-dom": "^19",
-    "@types/sharp": "^0.32.0",
     "@types/web-push": "^3.6.4",
     "dotenv": "^17.4.2",
     "eslint": "^9",
@@ -112,7 +109,6 @@
   },
   "overrides": {
     "html-to-text": "10.0.1",
-    "ws": "^8.21.0",
     "sharp": "^0.35.3",
     "postcss": "^8.5.18"
   }
diff --git a/scripts/backfill-tax-deadlines.ts b/scripts/backfill-tax-deadlines.ts
index c7493371..b5c1daa0 100644
--- a/scripts/backfill-tax-deadlines.ts
+++ b/scripts/backfill-tax-deadlines.ts
@@ -4,7 +4,7 @@
  *
  * Root cause (bug): tax deadlines only ever regenerated when a tax-relevant
  * settings field CHANGED value (app/api/settings/route.ts, gated on
- * didTaxFieldsChange). Companies fill these fields once at onboarding, so a
+ * the since-removed didTaxFieldsChange). Companies fill these fields once at onboarding, so a
  * later save changed nothing and generated nothing. The annual cron
  * (generateNewYearDeadlines) is the only unconditional trigger and runs Jan 2,
  * so the installed base sat empty. Result before this backfill: only ~5 of ~776
diff --git a/scripts/checks/antipatterns-baseline.json b/scripts/checks/antipatterns-baseline.json
index 29336a5b..814276df 100644
--- a/scripts/checks/antipatterns-baseline.json
+++ b/scripts/checks/antipatterns-baseline.json
@@ -7,10 +7,10 @@
     ]
   },
   "naiveOreRound": {
-    "count": 622
+    "count": 620
   },
   "handRolledInvariants": {
-    "count": 115
+    "count": 113
   },
   "ledgerScanningReports": {
     "count": 4,
diff --git a/scripts/checks/no-new-antipatterns.mjs b/scripts/checks/no-new-antipatterns.mjs
index fc7c6a56..fbeb0b24 100644
--- a/scripts/checks/no-new-antipatterns.mjs
+++ b/scripts/checks/no-new-antipatterns.mjs
@@ -547,8 +547,6 @@ function findFoldedPublicFlags() {
 // Files whose whitespace-nowrap cells are fixed-width numeric/tabular columns
 // living inside their OWN overflow-x-auto scroll container, so they cannot
 // widen the dialog itself:
-// - MockDataImportDialog: CSV preview built on the Table primitive, which
-//   self-wraps in overflow-auto (components/ui/table.tsx).
 // - PaymentFileDialog: payment-line table wrapped in an overflow-x-auto div.
 // 11. direct-ai-client. Every model call goes through the job-shaped service
 // in lib/ai (getAiService): that is what lets hosted stay on Bedrock while a
@@ -596,7 +594,6 @@ function findDirectAiClients() {
 }
 
 const DIALOG_NOWRAP_ALLOWED = new Set([
-  'components/extensions/shared/MockDataImportDialog.tsx',
   'components/supplier-invoices/PaymentFileDialog.tsx',
 ])
 
diff --git a/tests/helpers.ts b/tests/helpers.ts
index c7dd7590..639dbb8f 100644
--- a/tests/helpers.ts
+++ b/tests/helpers.ts
@@ -9,17 +9,13 @@ import type {
   JournalEntry,
   JournalEntryLine,
   DocumentAttachment,
-  TaxCode,
   Invoice,
-  InvoicePayment,
   Customer,
   Supplier,
   SupplierInvoice,
   CompanySettings,
   InvoiceInboxItem,
   CategorizationTemplate,
-  Company,
-  CompanyMember,
 } from '@/types'
 import type { SIEVoucher, SIETransactionLine } from '@/lib/import/types'
 
@@ -105,37 +101,6 @@ export function createMockSupabase() {
 let _counter = 0
 const nextId = () => `test-${++_counter}`
 
-export function makeCompany(overrides: Partial<Company> = {}): Company {
-  const { team_id = null, ...rest } = overrides
-  return {
-    id: 'company-1',
-    name: 'Test Company',
-    org_number: null,
-    entity_type: 'enskild_firma',
-    accounting_framework: 'k2',
-    created_by: 'user-1',
-    team_id,
-    archived_at: null,
-    created_at: '2024-01-01T00:00:00Z',
-    updated_at: '2024-01-01T00:00:00Z',
-    ...rest,
-  }
-}
-
-export function makeCompanyMember(overrides: Partial<CompanyMember> = {}): CompanyMember {
-  return {
-    id: 'member-1',
-    company_id: 'company-1',
-    user_id: 'user-1',
-    role: 'owner',
-    invited_by: null,
-    joined_at: '2024-01-01T00:00:00Z',
-    created_at: '2024-01-01T00:00:00Z',
-    updated_at: '2024-01-01T00:00:00Z',
-    ...overrides,
-  }
-}
-
 export function makeReceipt(overrides: Partial<Receipt> = {}): Receipt {
   return {
     id: nextId(),
@@ -319,28 +284,6 @@ export function makeDocumentAttachment(
   }
 }
 
-export function makeTaxCode(overrides: Partial<TaxCode> = {}): TaxCode {
-  return {
-    id: nextId(),
-    user_id: null,
-    code: 'MP1',
-    description: 'Utgående moms 25%',
-    rate: 25,
-    moms_basis_boxes: ['05'],
-    moms_tax_boxes: ['10'],
-    moms_input_boxes: [],
-    is_output_vat: true,
-    is_reverse_charge: false,
-    is_eu: false,
-    is_export: false,
-    is_oss: false,
-    is_system: true,
-    created_at: '2024-01-01T00:00:00Z',
-    updated_at: '2024-01-01T00:00:00Z',
-    ...overrides,
-  }
-}
-
 export function makeInvoice(overrides: Partial<Invoice> = {}): Invoice {
   return {
     id: nextId(),
@@ -381,27 +324,6 @@ export function makeInvoice(overrides: Partial<Invoice> = {}): Invoice {
   }
 }
 
-export function makeInvoicePayment(
-  overrides: Partial<InvoicePayment> = {}
-): InvoicePayment {
-  return {
-    id: nextId(),
-    user_id: 'user-1',
-    company_id: 'company-1',
-    invoice_id: 'invoice-1',
-    payment_date: '2024-07-01',
-    amount: 12500,
-    currency: 'SEK',
-    exchange_rate: null,
-    exchange_rate_difference: 0,
-    journal_entry_id: null,
-    transaction_id: null,
-    notes: null,
-    created_at: '2024-07-01T00:00:00Z',
-    ...overrides,
-  }
-}
-
 export function makeCustomer(overrides: Partial<Customer> = {}): Customer {
   return {
     id: nextId(),
diff --git a/types/chat.ts b/types/chat.ts
deleted file mode 100644
index 337a71e6..00000000
--- a/types/chat.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-// Chat types for AI chatbot
-
-export interface ChatMessage {
-  id: string
-  session_id: string
-  user_id: string
-  role: 'user' | 'assistant'
-  content: string
-  sources: SourceReference[]
-  artifact?: ArtifactSpec | null
-  created_at: string
-}
-
-export interface ChatSession {
-  id: string
-  user_id: string
-  title: string | null
-  created_at: string
-}
-
-export interface SourceReference {
-  id: string
-  source_file: string
-  title: string
-  section_title: string | null
-  similarity: number
-}
-
-export interface KnowledgeDocument {
-  id: string
-  source_file: string
-  title: string
-  section_title: string | null
-  content: string
-  content_hash: string
-  embedding: number[] | null
-  metadata: Record<string, unknown>
-  created_at: string
-}
-
-export interface ChatRequest {
-  message: string
-  session_id?: string
-}
-
-export interface ChatResponse {
-  message: ChatMessage
-  session_id: string
-}
-
-export interface StreamChunk {
-  type: 'content' | 'sources' | 'done' | 'error' | 'tool_start' | 'artifact'
-  content?: string
-  sources?: SourceReference[]
-  error?: string
-  toolName?: string
-  artifact?: ArtifactSpec
-}
-
-// ── Artifact Types ──────────────────────────────────────────────
-
-export type ArtifactSpec =
-  | ChartArtifact
-  | TableArtifact
-  | KpiCardsArtifact
-  | AgingBucketsArtifact
-
-export interface ChartArtifact {
-  type: 'bar_chart' | 'line_chart' | 'pie_chart' | 'stacked_bar'
-  title: string
-  data: { label: string; value: number; color?: string }[]
-  unit?: string
-  subtitle?: string
-}
-
-export interface TableArtifact {
-  type: 'table'
-  title: string
-  columns: { key: string; label: string; align?: 'left' | 'right' }[]
-  rows: Record<string, string | number>[]
-  summary_row?: Record<string, string | number>
-}
-
-export interface KpiCardsArtifact {
-  type: 'kpi_cards'
-  title?: string
-  cards: { label: string; value: string; trend?: 'up' | 'down' | 'flat'; change?: string }[]
-}
-
-export interface AgingBucketsArtifact {
-  type: 'aging_buckets'
-  title: string
-  buckets: { label: string; amount: number; count: number }[]
-  total: number
-}
diff --git a/types/index.ts b/types/index.ts
index 0e18f83c..8a5acdbe 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -10,10 +10,6 @@ export type AccountingFramework = 'k2' | 'k3'
 // Company role for multi-tenant access
 export type CompanyRole = 'owner' | 'admin' | 'member' | 'viewer'
 
-// Team (consulting firm) roles and source tracking
-export type TeamRole = 'owner' | 'admin' | 'member'
-export type MemberSource = 'direct' | 'team'
-
 // Team (consulting firm grouping). 'personal' teams are the implicit
 // one-per-user grouping; 'byra' teams are ops-created accounting-firm
 // tenants (WL-08) with invites, a brand, and cockpit access.
@@ -163,18 +159,6 @@ export interface FiscalYearResetRpcResult {
   period_name?: string
 }
 
-// User preferences (cross-company)
-export interface UserPreferences {
-  id: string
-  user_id: string
-  active_company_id: string | null
-  // Client-driven UI preferences (nav collapse/fold state, last-used create
-  // modes). jsonb DEFAULT '{}'. Cosmetic only, never load-bearing.
-  ui_state?: UserUiState
-  created_at: string
-  updated_at: string
-}
-
 // Shape of user_preferences.ui_state. All fields optional: the bag grows
 // as UI surfaces add preferences (UI migration plan PR 2/3).
 export interface UserUiState {
@@ -296,23 +280,6 @@ export type ProcessingHistoryAggregateType =
   | 'Migration'
   | 'System'
 
-export interface ProcessingHistoryEvent {
-  event_id: string
-  seq: number
-  company_id: string
-  correlation_id: string
-  causation_id: string | null
-  aggregate_type: ProcessingHistoryAggregateType
-  aggregate_id: string
-  event_type: string // open type: validated at runtime against processing_event_types registry
-  payload: Record<string, unknown>
-  payload_schema_version: number
-  actor: ProcessingHistoryActor
-  rubric_version: string | null
-  occurred_at: string
-  appended_at: string
-}
-
 // Bank connection status
 // 'pending_selection' = PSD2 consent granted, awaiting user to pick which
 // accounts to actually sync. No transactions are pulled in this state.
@@ -340,16 +307,6 @@ export interface InvoicePaymentAccount {
   foreign_account_number?: string | null
 }
 
-// Profile (extends auth.users)
-export interface Profile {
-  id: string
-  email: string
-  full_name: string | null
-  avatar_url: string | null
-  created_at: string
-  updated_at: string
-}
-
 // Editable invoice email texts (standard invoices only; sv + en).
 // Missing / whitespace-only fields fall back to the hardcoded defaults in
 // lib/email/invoice-templates.ts. Supports the fixed placeholder set
@@ -694,17 +651,6 @@ export interface CashAccount {
   updated_at: string
 }
 
-// Import source identifiers
-export type ImportSource =
-  | 'enable_banking'
-  | 'csv_nordea'
-  | 'csv_seb'
-  | 'csv_swedbank'
-  | 'csv_handelsbanken'
-  | 'csv_generic'
-  | 'camt053'
-  | 'manual'
-
 /**
  * Closed vocabulary for HOW money moved (the payment rail), classified at
  * ingest by classifyTransactionMethod() (lib/transactions/transaction-method.ts).
@@ -845,25 +791,6 @@ export interface Transaction {
 // (upsert on company_id + file_hash) and moves it back to 'processing'.
 export type BankFileImportStatus = 'pending' | 'processing' | 'completed' | 'failed' | 'undone'
 
-export interface BankFileImport {
-  id: string
-  user_id: string
-  company_id: string
-  filename: string
-  file_hash: string
-  file_format: string
-  transaction_count: number
-  imported_count: number
-  duplicate_count: number
-  matched_count: number
-  date_from: string | null
-  date_to: string | null
-  status: BankFileImportStatus
-  error_message: string | null
-  created_at: string
-  updated_at: string
-}
-
 // Customer
 export interface Customer {
   id: string
@@ -1508,41 +1435,6 @@ export type RotRutPayoutRequestStatus =
   | 'rejected'
   | 'cancelled'
 
-export interface RotRutPayoutRequest {
-  id: string
-  company_id: string
-  user_id: string
-  deduction_type: 'rot' | 'rut'
-  /** NamnPaBegaran in the file: 1-16 chars, shown in Skatteverkets e-tjänst. */
-  name: string
-  status: RotRutPayoutRequestStatus
-  requested_total: number
-  decided_total: number | null
-  file_name: string
-  file_document_id: string | null
-  settlement_journal_entry_id: string | null
-  submitted_at: string | null
-  decided_at: string | null
-  created_at: string
-  updated_at: string
-
-  // Relations (populated when fetched)
-  items?: RotRutPayoutRequestItem[]
-}
-
-export interface RotRutPayoutRequestItem {
-  id: string
-  request_id: string
-  invoice_id: string
-  requested_amount: number
-  decided_amount: number | null
-  created_at: string
-  updated_at: string
-
-  // Relations (populated when fetched)
-  invoice?: Invoice
-}
-
 // Recurring Invoice Schedule (template + monthly cadence)
 export type RecurringInvoiceScheduleStatus = 'active' | 'paused'
 
@@ -1607,24 +1499,6 @@ export interface RecurringInvoiceScheduleItem {
   created_at: string
 }
 
-// Tax Rates (reference table)
-export interface TaxRate {
-  id: string
-
-  // Type
-  rate_type: 'egenavgifter' | 'bolagsskatt' | 'arbetsgivaravgifter' | 'vat' | 'municipal'
-
-  // Rate
-  rate: number
-
-  // Validity
-  valid_from: string
-  valid_to: string | null
-
-  // Description
-  description: string
-}
-
 // Form types for creating/updating
 
 export interface CreateCustomerInput {
@@ -1674,91 +1548,6 @@ export interface CreateSupplierInput {
   notes?: string
 }
 
-export interface CreateSupplierInvoiceInput {
-  supplier_id: string
-  supplier_invoice_number: string
-  invoice_date: string
-  due_date: string
-  delivery_date?: string
-  currency?: string
-  exchange_rate?: number
-  vat_treatment?: VatTreatment
-  reverse_charge?: boolean
-  payment_reference?: string
-  notes?: string
-  /** Per-invoice öresavrundning override (display-only). Omitted = null (off). */
-  ore_rounding?: boolean
-  items: CreateSupplierInvoiceItemInput[]
-}
-
-export interface CreateSupplierInvoiceItemInput {
-  description: string
-  amount: number
-  account_number: string
-  vat_rate?: number
-  // Manual override. See CreateSupplierInvoiceItemSchema for rationale.
-  vat_amount?: number
-  // Self-assessed VAT rate for omvänd skattskyldighet (0.06/0.12/0.25). When
-  // set, the engine books fiktiv moms at this rate while vat_rate stays 0.
-  reverse_charge_rate?: number
-  // Särskild löneskatt på pensionskostnader: injects 7533 D / 2514 K at
-  // 24.26 % of the line amount. Only valid on 741x pension accounts.
-  apply_slp?: boolean
-  vat_code?: string
-  // Legacy fields (backward compat, ignored when amount is set)
-  quantity?: number
-  unit?: string
-  unit_price?: number
-}
-
-export interface CreateInvoiceInput {
-  customer_id: string
-  invoice_date: string
-  due_date: string
-  currency: Currency
-  document_type?: InvoiceDocumentType
-  your_reference?: string
-  our_reference?: string
-  /** Fakturamärkning: buyer-required marking, separate from your_reference. */
-  invoice_marking?: string
-  notes?: string
-  /** Optional https link where the customer can pay online (e.g. a Stripe Payment Link). */
-  payment_link_url?: string
-  /** Plaintext personnummer: encrypted server-side before storage. */
-  deduction_personnummer?: string
-  /** Fastighetsbeteckning. Required when any item carries deduction_type === 'rot'. */
-  deduction_housing_designation?: string
-  /** Save as an unnumbered draft (no F-number, no invoice.created) until the
-   *  user finalizes via "Granska & skapa". Lets the draft be hard-deleted. */
-  save_as_draft?: boolean
-  /** Per-invoice öresavrundning override (display-only). Omitted = null (inherit company setting). */
-  ore_rounding?: boolean
-  items: CreateInvoiceItemInput[]
-}
-
-export interface CreateInvoiceItemInput {
-  /** 'text' rows carry only a description (may be empty for a spacer) and are
-   *  excluded from totals and bookkeeping. Defaults to 'product'. */
-  line_type?: 'product' | 'text'
-  description: string
-  quantity: number
-  unit: string
-  unit_price: number
-  /** Percentage discount on the line (0-100). Omitted/null = 0. */
-  discount_percent?: number | null
-  vat_rate?: number
-  /** Source article (optional). Free-text lines omit it. */
-  article_id?: string | null
-  /** BAS class 1-3 posting account override copied from the article. null = derive from VAT treatment. */
-  revenue_account?: string | null
-  /** ROT/RUT toggle. null/undefined = no deduction. */
-  deduction_type?: 'rot' | 'rut' | null
-  labor_hours?: number | null
-  work_type?: string | null
-  housing_designation?: string | null
-  apartment_number?: string | null
-}
-
 export interface CreateTransactionInput {
   date: string
   description: string
@@ -1783,14 +1572,6 @@ export interface ArchiveEstimate {
   within_limit: boolean
 }
 
-export interface PaginatedResponse<T> {
-  data: T[]
-  count: number
-  page: number
-  pageSize: number
-  totalPages: number
-}
-
 // VAT validation response
 export interface VatValidationResult {
   valid: boolean
@@ -1808,54 +1589,6 @@ export interface ExchangeRate {
   date: string
 }
 
-// Dashboard summary types
-export interface DashboardSummary {
-  // Income
-  total_income_ytd: number
-  total_income_mtd: number
-
-  // Expenses
-  total_expenses_ytd: number
-  total_expenses_mtd: number
-
-  // Net
-  net_income_ytd: number
-  net_income_mtd: number
-
-  // Tax estimates
-  estimated_tax: TaxEstimate
-
-  // Alerts
-  uncategorized_count: number
-  unpaid_invoices_count: number
-  unpaid_invoices_total: number
-  overdue_invoices_count: number
-
-  // Bank
-  bank_balance: number | null
-  available_balance: number | null  // After tax reservations
-}
-
-export interface TaxEstimate {
-  // For EF
-  egenavgifter?: number
-  income_tax?: number // Municipal tax (kommunalskatt)
-  state_tax?: number // State tax (statlig skatt) - 20% on high incomes
-  grundavdrag?: number // Basic deduction applied
-
-  // For AB
-  bolagsskatt?: number
-
-  // Common
-  moms_to_pay: number
-  total_tax_liability: number
-
-  // Comparison with preliminary
-  preliminary_paid_ytd: number
-  difference: number  // Positive = underpaying
-
-}
-
 // ============================================================
 // BAS Kontoplan & Bookkeeping Types
 // ============================================================
@@ -2245,24 +1978,6 @@ export interface BookingTemplateLibrary {
   updated_at: string
 }
 
-// Account Balance (cached)
-export interface AccountBalance {
-  id: string
-  user_id: string
-  company_id: string
-  fiscal_period_id: string
-  account_number: string
-  account_id: string | null
-  opening_debit: number
-  opening_credit: number
-  period_debit: number
-  period_credit: number
-  closing_debit: number
-  closing_credit: number
-  created_at: string
-  updated_at: string
-}
-
 // Report types
 export interface TrialBalanceRow {
   account_number: string
@@ -2477,12 +2192,6 @@ export interface CreateJournalEntryLineInput {
   project?: string
 }
 
-export interface CreateFiscalPeriodInput {
-  name: string
-  period_start: string
-  period_end: string
-}
-
 // ── Pending Operations ────────────────────────────────────────
 
 export type PendingOperationType =
@@ -2703,44 +2412,6 @@ export interface InitialSetupState {
   dismissedAt: string | null
 }
 
-// Onboarding step data
-export interface OnboardingStepData {
-  step1?: {
-    entity_type: EntityType
-  }
-  step2?: {
-    company_name: string
-    org_number?: string
-    address_line1?: string
-    postal_code?: string
-    city?: string
-  }
-  step3?: {
-    f_skatt: boolean
-    fiscal_year_start_month: number
-    is_first_fiscal_year?: boolean
-    first_year_start?: string
-    first_year_end?: string
-    vat_registered: boolean
-    vat_number?: string
-    moms_period?: MomsPeriod
-  }
-  step4?: {
-    preliminary_tax_monthly?: number
-  }
-  step5?: {
-    bank_name?: string
-    clearing_number?: string
-    account_number?: string
-    iban?: string
-    bic?: string
-  }
-  step6?: {
-    bank_connected: boolean
-    bank_connection_id?: string
-  }
-}
-
 // ============================================================
 // Calendar & Deadline Types
 // ============================================================
@@ -2846,40 +2517,10 @@ export interface Deadline {
   customer?: Customer
 }
 
-// Input for creating a deadline
-export interface CreateDeadlineInput {
-  title: string
-  due_date: string
-  due_time?: string
-  deadline_type: DeadlineType
-  priority?: DeadlinePriority
-  customer_id?: string
-  notes?: string
-  // Tax deadline fields
-  tax_deadline_type?: TaxDeadlineType
-  tax_period?: string
-  source?: DeadlineSource
-  linked_report_type?: string
-  linked_report_period?: Record<string, unknown>
-}
-
 // ============================================================
 // Push Notification Types
 // ============================================================
 
-// Push subscription for Web Push API
-export interface PushSubscription {
-  id: string
-  user_id: string
-  endpoint: string
-  p256dh: string
-  auth: string
-  user_agent: string | null
-  is_active: boolean
-  last_used_at: string | null
-  created_at: string
-}
-
 // Notification settings per user
 export interface NotificationSettings {
   id: string
@@ -2916,18 +2557,6 @@ export type NotificationType =
   | 'skv_connection_expired'
   | 'bookkeeping_digest'
 
-// Notification log entry
-export interface NotificationLog {
-  id: string
-  user_id: string
-  company_id: string | null
-  notification_type: NotificationType
-  reference_id: string
-  days_before: number
-  sent_at: string
-  delivery_status: 'pending' | 'sent' | 'delivered' | 'failed'
-}
-
 // ============================================================
 // Calendar Feed Types (ICS)
 // ============================================================
@@ -2947,90 +2576,6 @@ export interface CalendarFeed {
   updated_at: string
 }
 
-// Input for creating/updating calendar feed
-export interface UpdateCalendarFeedInput {
-  include_tax_deadlines?: boolean
-  include_invoices?: boolean
-}
-
-// Swedish labels for deadline status
-export const DEADLINE_STATUS_LABELS: Record<DeadlineStatus, string> = {
-  upcoming: 'Kommande',
-  action_needed: 'Åtgärd krävs',
-  in_progress: 'Pågår',
-  submitted: 'Inskickad',
-  confirmed: 'Bekräftad',
-  overdue: 'Försenad'
-}
-
-// Swedish labels for tax deadline types
-export const TAX_DEADLINE_TYPE_LABELS: Record<TaxDeadlineType, string> = {
-  moms_monthly: 'Momsdeklaration (månad)',
-  moms_quarterly: 'Momsdeklaration (kvartal)',
-  moms_yearly: 'Momsdeklaration (år)',
-  f_skatt: 'Preliminärskatt (F-skatt)',
-  arbetsgivardeklaration: 'Arbetsgivardeklaration',
-  skatteinbetalning: 'Skatteinbetalning (storföretag)',
-  inkomstdeklaration_ef: 'Inkomstdeklaration EF',
-  inkomstdeklaration_ab: 'Inkomstdeklaration AB',
-  arsredovisning: 'Årsredovisning',
-  arsstamma: 'Årsstämma',
-  periodisk_sammanstallning: 'Periodisk sammanställning',
-  kontrolluppgifter: 'Kontrolluppgifter (KU)',
-  rot_rut_begaran: 'ROT/RUT-begäran om utbetalning',
-  oss_quarterly: 'OSS-deklaration',
-  ioss_monthly: 'IOSS-deklaration',
-  intrastat_monthly: 'Intrastat',
-  punktskatt_monthly: 'Punktskattedeklaration',
-  fyllnadsinbetalning: 'Fyllnadsinbetalning',
-  kvarskatt: 'Kvarskatt'
-}
-
-// ============================================================
-// SIE Import Types
-// ============================================================
-
-// SIE import status
-export type SIEImportStatus = 'pending' | 'mapped' | 'completed' | 'failed'
-
-// SIE import record
-export interface SIEImport {
-  id: string
-  user_id: string
-  company_id: string
-  filename: string
-  file_hash: string
-  org_number: string | null
-  company_name: string | null
-  sie_type: number
-  fiscal_year_start: string | null
-  fiscal_year_end: string | null
-  accounts_count: number
-  transactions_count: number
-  opening_balance_total: number | null
-  status: SIEImportStatus
-  error_message: string | null
-  fiscal_period_id: string | null
-  opening_balance_entry_id: string | null
-  imported_at: string | null
-  created_at: string
-  updated_at: string
-}
-
-// SIE account mapping record
-export interface SIEAccountMapping {
-  id: string
-  user_id: string
-  company_id: string
-  source_account: string
-  source_name: string | null
-  target_account: string
-  confidence: number
-  match_type: 'exact' | 'name' | 'class' | 'manual'
-  created_at: string
-  updated_at: string
-}
-
 // ============================================================
 // Invoice Inbox Types
 // ============================================================
@@ -3411,68 +2956,12 @@ export interface ExtractedLineItem {
   confidence?: number
 }
 
-// Match candidate for receipt-to-transaction matching
-export interface ReceiptMatchCandidate {
-  transaction: Transaction
-  confidence: number
-  matchReasons: string[]
-  dateVariance: number
-  amountVariance: number
-}
-
-// Input for creating a receipt
-export interface CreateReceiptInput {
-  image_url: string
-  image_thumbnail_url?: string
-}
-
-// Input for confirming receipt line items
-export interface ConfirmReceiptInput {
-  line_items: ConfirmLineItemInput[]
-  matched_transaction_id?: string
-  representation_persons?: number
-  representation_purpose?: string
-}
-
-export interface ConfirmLineItemInput {
-  id: string
-  is_business: boolean
-  category?: TransactionCategory
-  bas_account?: string
-}
-
-// Receipt queue summary
-export interface ReceiptQueueSummary {
-  unmatched_receipts_count: number
-  unmatched_transactions_count: number
-  pending_review_count: number
-  streak_count: number
-}
-
-// Camera quality feedback
-export interface CameraQualityFeedback {
-  lightingOk: boolean
-  distanceOk: boolean
-  focusOk: boolean
-  readyToCapture: boolean
-  message?: string
-}
-
-// Swedish labels for receipt status
-export const RECEIPT_STATUS_LABELS: Record<ReceiptStatus, string> = {
-  pending: 'Väntar',
-  processing: 'Analyserar',
-  extracted: 'Extraherat',
-  confirmed: 'Bekräftat',
-  error: 'Fel'
-}
-
 // ============================================================
 // VAT Declaration Types (Momsdeklaration)
 // ============================================================
 
 // VAT period type
-export type VatPeriodType = 'monthly' | 'quarterly' | 'yearly'
+export type VatPeriodType = MomsPeriod
 
 // VAT declaration rutor (boxes) according to SKV 4700
 // Complete set of all 30 boxes in the momsdeklaration form.
@@ -3606,13 +3095,6 @@ export interface VatDeclaration {
   }
 }
 
-// VAT declaration request parameters
-export interface VatDeclarationRequest {
-  periodType: VatPeriodType
-  year: number
-  period: number
-}
-
 // Labels for VAT rutor
 export const VAT_RUTA_LABELS: Record<keyof VatDeclarationRutor, string> = {
   ruta05: 'Momspliktig försäljning',
@@ -3655,52 +3137,6 @@ export interface CreditNote extends Invoice {
   credited_invoice_id: string
 }
 
-/** Generic key-value store record for extensions */
-export interface ExtensionDataRecord {
-  id: string
-  user_id: string
-  company_id: string
-  extension_id: string
-  key: string
-  value: Record<string, unknown>
-  created_at: string
-  updated_at: string
-}
-
-// ============================================================
-// Tax Code Types
-// ============================================================
-
-// Tax code identifiers (standard Swedish codes)
-export type TaxCodeId =
-  | 'MP1' | 'MP2' | 'MP3'       // Output VAT 25%, 12%, 6%
-  | 'MPI' | 'MPI12' | 'MPI6'    // Input VAT 25%, 12%, 6%
-  | 'IV'                          // Intra-EU acquisition
-  | 'EUS'                         // EU sale (reverse charge)
-  | 'IP'                          // Import
-  | 'EXP'                         // Export outside EU
-  | 'OSS'                         // One Stop Shop
-  | 'NONE'                        // VAT exempt
-
-export interface TaxCode {
-  id: string
-  user_id: string | null
-  code: string
-  description: string
-  rate: number
-  moms_basis_boxes: string[]
-  moms_tax_boxes: string[]
-  moms_input_boxes: string[]
-  is_output_vat: boolean
-  is_reverse_charge: boolean
-  is_eu: boolean
-  is_export: boolean
-  is_oss: boolean
-  is_system: boolean
-  created_at: string
-  updated_at: string
-}
-
 // ============================================================
 // Document Archive Types
 // ============================================================
@@ -3741,17 +3177,6 @@ export interface DocumentAttachment {
   updated_at: string
 }
 
-export interface CreateDocumentAttachmentInput {
-  storage_path: string
-  file_name: string
-  file_size_bytes?: number
-  mime_type?: string
-  sha256_hash: string
-  upload_source?: DocumentUploadSource
-  journal_entry_id?: string
-  journal_entry_line_id?: string
-}
-
 // ============================================================
 // Audit Log Types
 // ============================================================
@@ -3791,32 +3216,6 @@ export interface AuditLogEntry {
   created_at: string
 }
 
-// ============================================================
-// Dimension Types (Kostnadsställen & Projekt)
-// ============================================================
-
-export interface CostCenter {
-  id: string
-  company_id: string
-  code: string
-  name: string
-  is_active: boolean
-  created_at: string
-  updated_at: string
-}
-
-export interface Project {
-  id: string
-  company_id: string
-  code: string
-  name: string
-  is_active: boolean
-  start_date: string | null
-  end_date: string | null
-  created_at: string
-  updated_at: string
-}
-
 // ============================================================
 // Voucher Gap Detection
 // ============================================================
@@ -3827,19 +3226,6 @@ export interface VoucherGap {
   series: string
 }
 
-export interface VoucherGapExplanation {
-  id: string
-  company_id: string
-  user_id: string
-  fiscal_period_id: string
-  voucher_series: string
-  gap_start: number
-  gap_end: number
-  explanation: string
-  created_at: string
-  updated_at: string
-}
-
 export interface SequenceMismatch {
   series: string
   sequenceCounter: number
@@ -4057,19 +3443,6 @@ export interface Asset {
   updated_at: string
 }
 
-export interface DepreciationSchedule {
-  id: string
-  user_id: string
-  company_id: string
-  asset_id: string
-  fiscal_period_id: string
-  planned_depreciation: number
-  journal_entry_id: string | null
-  posted_at: string | null
-  created_at: string
-  updated_at: string
-}
-
 // ============================================================
 // IB/UB Continuity Check Types (Avstämning ingående/utgående balans)
 // ============================================================
@@ -4121,15 +3494,6 @@ export interface CurrencyRevaluationResult {
   preview: CurrencyRevaluationPreview
 }
 
-export interface PeriodStatus {
-  is_locked: boolean
-  is_closed: boolean
-  has_closing_entry: boolean
-  has_opening_balances: boolean
-  draft_count: number
-  next_period_exists: boolean
-}
-
 // ============================================================
 // Invoice Reminder Types (Betalningspåminnelser)
 // ============================================================
@@ -4160,20 +3524,6 @@ export interface InvoiceReminder {
   fee_journal_entry_id: string | null
 }
 
-// Swedish labels for reminder levels
-export const REMINDER_LEVEL_LABELS: Record<1 | 2 | 3, string> = {
-  1: 'Vänlig påminnelse',
-  2: 'Andra påminnelsen',
-  3: 'Slutlig påminnelse'
-}
-
-// Reminder level descriptions
-export const REMINDER_LEVEL_DESCRIPTIONS: Record<1 | 2 | 3, string> = {
-  1: '15 dagar efter förfallodatum',
-  2: '30 dagar efter förfallodatum',
-  3: '45 dagar efter förfallodatum'
-}
-
 // ============================================================
 // Transaction Ingestion Types (re-exported for extension use)
 // ============================================================
@@ -4504,13 +3854,6 @@ export type SalaryType = 'monthly' | 'hourly'
 export type FSkattStatus = 'a_skatt' | 'f_skatt' | 'fa_skatt' | 'not_verified'
 export type VacationRule = 'procentregeln' | 'sammaloneregeln' | 'none' | 'semesterersattning'
 export type SalaryRunStatus = 'draft' | 'review' | 'approved' | 'paid' | 'booked' | 'corrected'
-export type AGIStatus =
-  | 'generated'         // XML built from a salary run; nothing sent to SKV yet
-  | 'pending_signature' // underlag accepted into Eget utrymme; awaiting BankID
-  | 'exported'          // legacy: manual XML download path
-  | 'submitted'         // kvittens received; AGI is filed
-  | 'accepted'          // reserved (SKV does not currently expose this)
-  | 'rejected'          // reserved (kontrollresultat DONE_REJECTED could land here)
 
 export type SalaryLineItemType =
   | 'monthly_salary' | 'hourly_salary'
@@ -4722,31 +4065,6 @@ export interface SalaryLineItem {
   updated_at: string
 }
 
-export interface AGIDeclaration {
-  id: string
-  company_id: string
-  user_id: string
-  salary_run_id: string | null
-  period_year: number
-  period_month: number
-  xml_content: string
-  status: AGIStatus
-  individuppgifter: Record<string, unknown>[]
-  total_gross: number
-  total_tax: number
-  total_avgifter_basis: number
-  total_avgifter: number
-  employee_count: number
-  kvittensnummer: string | null
-  submitted_at: string | null
-  submitted_by: string | null
-  response_data: Record<string, unknown> | null
-  is_correction: boolean
-  corrects_agi_id: string | null
-  created_at: string
-  updated_at: string
-}
-
 /**
  * A `pending_operations` row a chat conversation staged and nobody has answered
  * yet, as returned by GET /api/agent/conversations/[id] and by the /chat/[id]
diff --git a/types/skatteverket.ts b/types/skatteverket.ts
index 683292b0..d4d2cc1d 100644
--- a/types/skatteverket.ts
+++ b/types/skatteverket.ts
@@ -41,28 +41,6 @@ export interface StoredSkattekontoTransaction {
   suggested_at?: string | null
 }
 
-/** Row shape for the `skattekonto_file_imports` tracking table (DB → app). */
-export interface SkattekontoFileImportRecord {
-  id: string
-  company_id: string
-  /** Importing user; null after that user's account is deleted. */
-  user_id: string | null
-  filename: string
-  file_hash: string
-  file_variant: 'csv' | 'skv'
-  row_count: number
-  imported_count: number
-  duplicate_count: number
-  promoted_count: number
-  date_from: string | null
-  date_to: string | null
-  closing_saldo: number | null
-  status: 'pending' | 'processing' | 'completed' | 'failed'
-  error_message: string | null
-  created_at: string
-  updated_at: string
-}
-
 /**
  * Single best candidate verifikat for an unmatched SKV row. Attached by
  * the `/skattekonto/transaktioner` endpoint when exactly one strong match