chore: rename aelis to freya

oxfmt was reformatting generated drizzle migration snapshots and
crashing on .ona/review/comments.json. Also runs the formatter
across the full codebase.

Co-authored-by: Ona <no-reply@ona.com>

.devcontainer/devcontainer.json

@@ -11,7 +11,7 @@
 		"dockerfile": "Dockerfile"
 	},
 	"postCreateCommand": "bun install",
-	"postStartCommand": "./scripts/setup-git.sh && ./scripts/setup-nvim.sh",
+	"postStartCommand": "./scripts/setup-git.sh && ./scripts/setup-nvim.sh && ./scripts/setup-tailscale.sh",
 	// Features add additional features to your environment. See https://containers.dev/features
 	// Beware: features are not supported on all platforms and may have unintended side-effects.
 	"features": {

.github/workflows/build-waitlist-website.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   REGISTRY: cr.nym.sh
-  IMAGE_NAME: aelis-waitlist-website
+  IMAGE_NAME: freya-waitlist-website
 
 jobs:
   build:

.ona/automations.yaml

@@ -1,39 +0,0 @@
-services:
-  expo:
-    name: Expo Dev Server
-    description: Expo development server for aelis-client
-    triggeredBy:
-      - postDevcontainerStart
-    commands:
-      start: cd apps/aelis-client && ./scripts/run-dev-server.sh
-
-  drizzle-studio:
-    name: Drizzle Studio
-    description: Drizzle Studio database browser for aelis-backend
-    triggeredBy:
-      - manual
-    commands:
-      start: |
-        FORWARD_URL=$(gitpod environment port open 4983 --name drizzle-studio-server | sed 's|https://||')
-        echo "Drizzle Studio: https://local.drizzle.studio/?host=${FORWARD_URL}&port=443"
-        cd apps/aelis-backend && bunx drizzle-kit studio --host 0.0.0.0 --port 4983
-
-  aelis-backend:
-    name: Aelis Backend
-    description: Hono API server for aelis-backend (port 3000)
-    triggeredBy:
-      - manual
-    commands:
-      start: |
-        gitpod --context environment environment port open 3000 --name "Aelis Backend" --protocol https
-        cd apps/aelis-backend && bun run dev
-
-  admin-dashboard:
-    name: Admin Dashboard
-    description: Vite dev server for admin-dashboard (port 5174)
-    triggeredBy:
-      - manual
-    commands:
-      start: |
-        gitpod --context environment environment port open 5174 --name "Admin Dashboard" --protocol https
-        cd apps/admin-dashboard && bun run dev

.oxfmtrc.json

@@ -8,5 +8,5 @@
 		"ignoreCase": true,
 		"newlinesBetween": true
 	},
-	"ignorePatterns": [".claude", "fixtures"]
+	"ignorePatterns": [".claude", ".ona", "drizzle", "fixtures"]
 }

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+	"js/ts.experimental.useTsgo": true
+}

AGENTS.md

@@ -2,7 +2,7 @@
 
 ## Project
 
-AELIS is an AI-powered personal assistant that aggregates data from various sources into a contextual feed. Monorepo with `packages/` (shared libraries) and `apps/` (applications).
+FREYA is an AI-powered personal assistant that aggregates data from various sources into a contextual feed. Monorepo with `packages/` (shared libraries) and `apps/` (applications).
 
 ## Commands
 

README.md

@@ -1,4 +1,4 @@
-# aelis
+# freya
 
 To install dependencies:
 
@@ -8,14 +8,14 @@ bun install
 
 ## Packages
 
-### @aelis/source-tfl
+### @freya/source-tfl
 
 TfL (Transport for London) feed source for tube, overground, and Elizabeth line alerts.
 
 #### Testing
 
 ```bash
-cd packages/aelis-source-tfl
+cd packages/freya-source-tfl
 bun run test
 ```
 

apps/admin-dashboard/.prettierignore

@@ -1,7 +0,0 @@
-node_modules/
-coverage/
-.pnpm-store/
-pnpm-lock.yaml
-package-lock.json
-pnpm-lock.yaml
-yarn.lock

apps/admin-dashboard/.prettierrc

@@ -1,11 +0,0 @@
-{
-  "endOfLine": "lf",
-  "semi": false,
-  "singleQuote": false,
-  "tabWidth": 2,
-  "trailingComma": "es5",
-  "printWidth": 80,
-  "plugins": ["prettier-plugin-tailwindcss"],
-  "tailwindStylesheet": "src/index.css",
-  "tailwindFunctions": ["cn", "cva"]
-}

apps/admin-dashboard/components.json

@@ -1,25 +1,25 @@
 {
-  "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "radix-mira",
-  "rsc": false,
-  "tsx": true,
-  "tailwind": {
-    "config": "",
-    "css": "src/index.css",
-    "baseColor": "neutral",
-    "cssVariables": true,
-    "prefix": ""
-  },
-  "iconLibrary": "lucide",
-  "rtl": false,
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils",
-    "ui": "@/components/ui",
-    "lib": "@/lib",
-    "hooks": "@/hooks"
-  },
-  "menuColor": "default",
-  "menuAccent": "subtle",
-  "registries": {}
+	"$schema": "https://ui.shadcn.com/schema.json",
+	"style": "radix-mira",
+	"rsc": false,
+	"tsx": true,
+	"tailwind": {
+		"config": "",
+		"css": "src/index.css",
+		"baseColor": "neutral",
+		"cssVariables": true,
+		"prefix": ""
+	},
+	"iconLibrary": "lucide",
+	"rtl": false,
+	"aliases": {
+		"components": "@/components",
+		"utils": "@/lib/utils",
+		"ui": "@/components/ui",
+		"lib": "@/lib",
+		"hooks": "@/hooks"
+	},
+	"menuColor": "default",
+	"menuAccent": "subtle",
+	"registries": {}
 }

apps/admin-dashboard/eslint.config.js

@@ -1,23 +0,0 @@
-import js from '@eslint/js'
-import globals from 'globals'
-import reactHooks from 'eslint-plugin-react-hooks'
-import reactRefresh from 'eslint-plugin-react-refresh'
-import tseslint from 'typescript-eslint'
-import { defineConfig, globalIgnores } from 'eslint/config'
-
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      js.configs.recommended,
-      tseslint.configs.recommended,
-      reactHooks.configs.flat.recommended,
-      reactRefresh.configs.vite,
-    ],
-    languageOptions: {
-      ecmaVersion: 2020,
-      globals: globals.browser,
-    },
-  },
-])

apps/admin-dashboard/index.html

@@ -1,13 +1,13 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>vite-app</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
+	<head>
+		<meta charset="UTF-8" />
+		<link rel="icon" type="image/svg+xml" href="/vite.svg" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>vite-app</title>
+	</head>
+	<body>
+		<div id="root"></div>
+		<script type="module" src="/src/main.tsx"></script>
+	</body>
 </html>

apps/admin-dashboard/package.json

@@ -1,48 +1,40 @@
 {
-  "name": "admin-dashboard",
-  "private": true,
-  "version": "0.0.1",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "tsc -b && vite build",
-    "lint": "eslint .",
-    "format": "prettier --write \"**/*.{ts,tsx}\"",
-    "typecheck": "tsc --noEmit",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "@fontsource-variable/inter": "^5.2.8",
-    "@tailwindcss/vite": "^4.1.17",
-    "@tanstack/react-query": "^5.95.0",
-    "@tanstack/react-router": "^1.168.2",
-    "class-variance-authority": "^0.7.1",
-    "clsx": "^2.1.1",
-    "lucide-react": "^0.577.0",
-    "next-themes": "^0.4.6",
-    "radix-ui": "^1.4.3",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
-    "shadcn": "^4.0.8",
-    "sonner": "^2.0.7",
-    "tailwind-merge": "^3.5.0",
-    "tailwindcss": "^4.1.17",
-    "tw-animate-css": "^1.4.0"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.39.1",
-    "@types/node": "^24.10.1",
-    "@types/react": "^19.2.5",
-    "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^5.1.1",
-    "eslint": "^9.39.1",
-    "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.4.24",
-    "globals": "^16.5.0",
-    "prettier": "^3.8.1",
-    "prettier-plugin-tailwindcss": "^0.7.2",
-    "typescript": "~5.9.3",
-    "typescript-eslint": "^8.46.4",
-    "vite": "^7.2.4"
-  }
+	"name": "admin-dashboard",
+	"version": "0.0.1",
+	"private": true,
+	"type": "module",
+	"scripts": {
+		"dev": "vite",
+		"build": "tsc -b && vite build",
+		"lint": "oxlint .",
+		"format": "oxfmt --write .",
+		"typecheck": "tsc --noEmit",
+		"preview": "vite preview"
+	},
+	"dependencies": {
+		"@fontsource-variable/inter": "^5.2.8",
+		"@tailwindcss/vite": "^4.1.17",
+		"@tanstack/react-query": "^5.95.0",
+		"@tanstack/react-router": "^1.168.2",
+		"class-variance-authority": "^0.7.1",
+		"clsx": "^2.1.1",
+		"lucide-react": "^0.577.0",
+		"next-themes": "^0.4.6",
+		"radix-ui": "^1.4.3",
+		"react": "^19.2.0",
+		"react-dom": "^19.2.0",
+		"shadcn": "^4.0.8",
+		"sonner": "^2.0.7",
+		"tailwind-merge": "^3.5.0",
+		"tailwindcss": "^4.1.17",
+		"tw-animate-css": "^1.4.0"
+	},
+	"devDependencies": {
+		"@types/node": "^24.10.1",
+		"@types/react": "^19.2.5",
+		"@types/react-dom": "^19.2.3",
+		"@vitejs/plugin-react": "^5.1.1",
+		"typescript": "^6",
+		"vite": "^7.2.4"
+	}
 }

apps/admin-dashboard/src/App.tsx

@@ -1,25 +1,25 @@
-import { createRouter, RouterProvider } from "@tanstack/react-router"
 import { useQueryClient, type QueryClient } from "@tanstack/react-query"
+import { createRouter, RouterProvider } from "@tanstack/react-router"
 
 import { routeTree } from "./route-tree.gen"
 
 const router = createRouter({
-  routeTree,
-  defaultPreload: "intent",
-  context: {
-    queryClient: undefined! as QueryClient,
-  },
+	routeTree,
+	defaultPreload: "intent",
+	context: {
+		queryClient: undefined! as QueryClient,
+	},
 })
 
 declare module "@tanstack/react-router" {
-  interface Register {
-    router: typeof router
-  }
+	interface Register {
+		router: typeof router
+	}
 }
 
 export function App() {
-  const queryClient = useQueryClient()
-  return <RouterProvider router={router} context={{ queryClient }} />
+	const queryClient = useQueryClient()
+	return <RouterProvider router={router} context={{ queryClient }} />
 }
 
 export default App

apps/admin-dashboard/src/components/feed-panel.tsx

@@ -1,146 +1,144 @@
 import { useQuery } from "@tanstack/react-query"
-import { useState } from "react"
 import { Loader2, RefreshCw, TriangleAlert } from "lucide-react"
+import { useState } from "react"
 
 import type { FeedItem } from "@/lib/api"
-import { fetchFeed } from "@/lib/api"
 
 import { Badge } from "@/components/ui/badge"
 import { Button } from "@/components/ui/button"
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+import { fetchFeed } from "@/lib/api"
 
 export function FeedPanel() {
-  const {
-    data: feed,
-    error: feedError,
-    isFetching,
-    refetch,
-  } = useQuery({
-    queryKey: ["feed"],
-    queryFn: fetchFeed,
-    enabled: false,
-  })
+	const {
+		data: feed,
+		error: feedError,
+		isFetching,
+		refetch,
+	} = useQuery({
+		queryKey: ["feed"],
+		queryFn: fetchFeed,
+		enabled: false,
+	})
 
-  const error = feedError?.message ?? null
+	const error = feedError?.message ?? null
 
-  return (
-    <div className="mx-auto max-w-2xl space-y-6">
-      <div className="flex items-center justify-between gap-4">
-        <div className="space-y-1">
-          <h2 className="text-lg font-semibold tracking-tight">Feed</h2>
-          <p className="text-sm text-muted-foreground">
-            Query the feed as the current user.
-          </p>
-        </div>
-        <Button onClick={() => refetch()} disabled={isFetching} size="sm">
-          {isFetching ? (
-            <Loader2 className="size-3.5 animate-spin" />
-          ) : (
-            <RefreshCw className="size-3.5" />
-          )}
-          {feed ? "Refresh" : "Fetch"}
-        </Button>
-      </div>
+	return (
+		<div className="mx-auto max-w-2xl space-y-6">
+			<div className="flex items-center justify-between gap-4">
+				<div className="space-y-1">
+					<h2 className="text-lg font-semibold tracking-tight">Feed</h2>
+					<p className="text-sm text-muted-foreground">Query the feed as the current user.</p>
+				</div>
+				<Button onClick={() => refetch()} disabled={isFetching} size="sm">
+					{isFetching ? (
+						<Loader2 className="size-3.5 animate-spin" />
+					) : (
+						<RefreshCw className="size-3.5" />
+					)}
+					{feed ? "Refresh" : "Fetch"}
+				</Button>
+			</div>
 
-      {error && (
-        <Card className="-mx-4 border-destructive">
-          <CardContent className="flex items-center gap-2 text-sm text-destructive">
-            <TriangleAlert className="size-4 shrink-0" />
-            {error}
-          </CardContent>
-        </Card>
-      )}
+			{error && (
+				<Card className="-mx-4 border-destructive">
+					<CardContent className="flex items-center gap-2 text-sm text-destructive">
+						<TriangleAlert className="size-4 shrink-0" />
+						{error}
+					</CardContent>
+				</Card>
+			)}
 
-      {feed && feed.errors.length > 0 && (
-        <Card className="-mx-4">
-          <CardHeader className="pb-3">
-            <CardTitle className="text-sm">Source Errors</CardTitle>
-          </CardHeader>
-          <CardContent className="space-y-2">
-            {feed.errors.map((e) => (
-              <div key={e.sourceId} className="flex items-start gap-2 text-sm">
-                <Badge variant="outline" className="shrink-0 font-mono text-xs">
-                  {e.sourceId}
-                </Badge>
-                <span className="select-text text-muted-foreground">{e.error}</span>
-              </div>
-            ))}
-          </CardContent>
-        </Card>
-      )}
+			{feed && feed.errors.length > 0 && (
+				<Card className="-mx-4">
+					<CardHeader className="pb-3">
+						<CardTitle className="text-sm">Source Errors</CardTitle>
+					</CardHeader>
+					<CardContent className="space-y-2">
+						{feed.errors.map((e) => (
+							<div key={e.sourceId} className="flex items-start gap-2 text-sm">
+								<Badge variant="outline" className="shrink-0 font-mono text-xs">
+									{e.sourceId}
+								</Badge>
+								<span className="select-text text-muted-foreground">{e.error}</span>
+							</div>
+						))}
+					</CardContent>
+				</Card>
+			)}
 
-      {feed && (
-        <div className="space-y-3">
-          <p className="text-xs text-muted-foreground">
-            {feed.items.length} {feed.items.length === 1 ? "item" : "items"}
-          </p>
-          {feed.items.length === 0 && (
-            <p className="text-sm text-muted-foreground">No items in feed.</p>
-          )}
-          {feed.items.map((item) => (
-            <FeedItemCard key={item.id} item={item} />
-          ))}
-        </div>
-      )}
-    </div>
-  )
+			{feed && (
+				<div className="space-y-3">
+					<p className="text-xs text-muted-foreground">
+						{feed.items.length} {feed.items.length === 1 ? "item" : "items"}
+					</p>
+					{feed.items.length === 0 && (
+						<p className="text-sm text-muted-foreground">No items in feed.</p>
+					)}
+					{feed.items.map((item) => (
+						<FeedItemCard key={item.id} item={item} />
+					))}
+				</div>
+			)}
+		</div>
+	)
 }
 
 function FeedItemCard({ item }: { item: FeedItem }) {
-  const [expanded, setExpanded] = useState(false)
+	const [expanded, setExpanded] = useState(false)
 
-  return (
-    <Card className="-mx-4">
-      <CardHeader className="pb-3">
-        <div className="flex items-center justify-between gap-2">
-          <div className="flex items-center gap-2">
-            <CardTitle className="text-sm">{item.type}</CardTitle>
-            <Badge variant="secondary" className="font-mono text-xs">
-              {item.sourceId}
-            </Badge>
-          </div>
-          <div className="flex items-center gap-2">
-            {item.signals?.timeRelevance && (
-              <Badge variant="outline" className="text-xs">
-                {item.signals.timeRelevance}
-              </Badge>
-            )}
-            {item.signals?.urgency !== undefined && (
-              <Badge variant="outline" className="text-xs">
-                urgency: {item.signals.urgency}
-              </Badge>
-            )}
-          </div>
-        </div>
-        <p className="select-text font-mono text-xs text-muted-foreground">{item.id}</p>
-      </CardHeader>
-      <CardContent className="space-y-3">
-        {item.slots && Object.keys(item.slots).length > 0 && (
-          <div className="space-y-1.5">
-            {Object.entries(item.slots).map(([name, slot]) => (
-              <div key={name} className="text-sm">
-                <span className="font-medium">{name}: </span>
-                <span className="select-text text-muted-foreground">
-                  {slot.content ?? <span className="italic">pending</span>}
-                </span>
-              </div>
-            ))}
-          </div>
-        )}
-        <Button
-          variant="ghost"
-          size="sm"
-          className="h-auto px-0 text-xs text-muted-foreground"
-          onClick={() => setExpanded(!expanded)}
-        >
-          {expanded ? "Hide" : "Show"} raw data
-        </Button>
-        {expanded && (
-          <pre className="select-text overflow-auto rounded-md bg-muted p-3 font-mono text-xs">
-            {JSON.stringify(item.data, null, 2)}
-          </pre>
-        )}
-      </CardContent>
-    </Card>
-  )
+	return (
+		<Card className="-mx-4">
+			<CardHeader className="pb-3">
+				<div className="flex items-center justify-between gap-2">
+					<div className="flex items-center gap-2">
+						<CardTitle className="text-sm">{item.type}</CardTitle>
+						<Badge variant="secondary" className="font-mono text-xs">
+							{item.sourceId}
+						</Badge>
+					</div>
+					<div className="flex items-center gap-2">
+						{item.signals?.timeRelevance && (
+							<Badge variant="outline" className="text-xs">
+								{item.signals.timeRelevance}
+							</Badge>
+						)}
+						{item.signals?.urgency !== undefined && (
+							<Badge variant="outline" className="text-xs">
+								urgency: {item.signals.urgency}
+							</Badge>
+						)}
+					</div>
+				</div>
+				<p className="select-text font-mono text-xs text-muted-foreground">{item.id}</p>
+			</CardHeader>
+			<CardContent className="space-y-3">
+				{item.slots && Object.keys(item.slots).length > 0 && (
+					<div className="space-y-1.5">
+						{Object.entries(item.slots).map(([name, slot]) => (
+							<div key={name} className="text-sm">
+								<span className="font-medium">{name}: </span>
+								<span className="select-text text-muted-foreground">
+									{slot.content ?? <span className="italic">pending</span>}
+								</span>
+							</div>
+						))}
+					</div>
+				)}
+				<Button
+					variant="ghost"
+					size="sm"
+					className="h-auto px-0 text-xs text-muted-foreground"
+					onClick={() => setExpanded(!expanded)}
+				>
+					{expanded ? "Hide" : "Show"} raw data
+				</Button>
+				{expanded && (
+					<pre className="select-text overflow-auto rounded-md bg-muted p-3 font-mono text-xs">
+						{JSON.stringify(item.data, null, 2)}
+					</pre>
+				)}
+			</CardContent>
+		</Card>
+	)
 }

apps/admin-dashboard/src/components/general-settings-panel.tsx

@@ -1,75 +1,70 @@
 import { useQuery } from "@tanstack/react-query"
 import { CircleCheck, CircleX, Loader2 } from "lucide-react"
 
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
 import { getServerUrl } from "@/lib/server-url"
 
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
-
 async function checkHealth(serverUrl: string): Promise<boolean> {
-  const res = await fetch(`${serverUrl}/health`)
-  if (!res.ok) throw new Error(`HTTP ${res.status}`)
-  const data = (await res.json()) as { status: string }
-  if (data.status !== "ok") throw new Error("Unexpected response")
-  return true
+	const res = await fetch(`${serverUrl}/health`)
+	if (!res.ok) throw new Error(`HTTP ${res.status}`)
+	const data = (await res.json()) as { status: string }
+	if (data.status !== "ok") throw new Error("Unexpected response")
+	return true
 }
 
 export function GeneralSettingsPanel() {
-  const serverUrl = getServerUrl()
+	const serverUrl = getServerUrl()
 
-  const { isLoading, isError, error } = useQuery({
-    queryKey: ["health", serverUrl],
-    queryFn: () => checkHealth(serverUrl),
-  })
+	const { isLoading, isError, error } = useQuery({
+		queryKey: ["health", serverUrl],
+		queryFn: () => checkHealth(serverUrl),
+	})
 
-  const status = isLoading ? "checking" : isError ? "error" : "ok"
-  const errorMsg = error instanceof Error ? error.message : null
+	const status = isLoading ? "checking" : isError ? "error" : "ok"
+	const errorMsg = error instanceof Error ? error.message : null
 
-  return (
-    <div className="mx-auto max-w-xl space-y-6">
-      <div className="space-y-1">
-        <h2 className="text-lg font-semibold tracking-tight">General</h2>
-        <p className="text-sm text-muted-foreground">
-          Backend server information.
-        </p>
-      </div>
+	return (
+		<div className="mx-auto max-w-xl space-y-6">
+			<div className="space-y-1">
+				<h2 className="text-lg font-semibold tracking-tight">General</h2>
+				<p className="text-sm text-muted-foreground">Backend server information.</p>
+			</div>
 
-      <Card className="-mx-4">
-        <CardHeader className="pb-4">
-          <CardTitle className="text-sm">Server</CardTitle>
-          <CardDescription>
-            Connected backend instance.
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <div className="space-y-3 text-sm">
-            <div className="flex items-center justify-between gap-4">
-              <span className="shrink-0 text-muted-foreground">URL</span>
-              <span className="select-text truncate font-mono text-xs">{serverUrl}</span>
-            </div>
-            <div className="flex items-center justify-between">
-              <span className="text-muted-foreground">Status</span>
-              {status === "checking" && (
-                <span className="flex items-center gap-1.5 text-xs text-muted-foreground">
-                  <Loader2 className="size-3 animate-spin" />
-                  Checking…
-                </span>
-              )}
-              {status === "ok" && (
-                <span className="flex items-center gap-1.5 text-xs text-muted-foreground">
-                  <CircleCheck className="size-3.5 text-primary" />
-                  Connected
-                </span>
-              )}
-              {status === "error" && (
-                <span className="flex items-center gap-1.5 text-xs text-destructive">
-                  <CircleX className="size-3.5" />
-                  {errorMsg ?? "Unreachable"}
-                </span>
-              )}
-            </div>
-          </div>
-        </CardContent>
-      </Card>
-    </div>
-  )
+			<Card className="-mx-4">
+				<CardHeader className="pb-4">
+					<CardTitle className="text-sm">Server</CardTitle>
+					<CardDescription>Connected backend instance.</CardDescription>
+				</CardHeader>
+				<CardContent>
+					<div className="space-y-3 text-sm">
+						<div className="flex items-center justify-between gap-4">
+							<span className="shrink-0 text-muted-foreground">URL</span>
+							<span className="select-text truncate font-mono text-xs">{serverUrl}</span>
+						</div>
+						<div className="flex items-center justify-between">
+							<span className="text-muted-foreground">Status</span>
+							{status === "checking" && (
+								<span className="flex items-center gap-1.5 text-xs text-muted-foreground">
+									<Loader2 className="size-3 animate-spin" />
+									Checking…
+								</span>
+							)}
+							{status === "ok" && (
+								<span className="flex items-center gap-1.5 text-xs text-muted-foreground">
+									<CircleCheck className="size-3.5 text-primary" />
+									Connected
+								</span>
+							)}
+							{status === "error" && (
+								<span className="flex items-center gap-1.5 text-xs text-destructive">
+									<CircleX className="size-3.5" />
+									{errorMsg ?? "Unreachable"}
+								</span>
+							)}
+						</div>
+					</div>
+				</CardContent>
+			</Card>
+		</div>
+	)
 }

apps/admin-dashboard/src/components/login-page.tsx

@@ -1,100 +1,98 @@
 import { useMutation } from "@tanstack/react-query"
-import { useState } from "react"
 import { Loader2, Settings2 } from "lucide-react"
+import { useState } from "react"
 import { toast } from "sonner"
 
 import type { AuthSession } from "@/lib/auth"
-import { signIn } from "@/lib/auth"
-import { getServerUrl, setServerUrl } from "@/lib/server-url"
 
 import { Button } from "@/components/ui/button"
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
+import { signIn } from "@/lib/auth"
+import { getServerUrl, setServerUrl } from "@/lib/server-url"
 
 interface LoginPageProps {
-  onLogin: (session: AuthSession) => void
+	onLogin: (session: AuthSession) => void
 }
 
 export function LoginPage({ onLogin }: LoginPageProps) {
-  const [serverUrlInput, setServerUrlInput] = useState(getServerUrl)
-  const [email, setEmail] = useState("")
-  const [password, setPassword] = useState("")
+	const [serverUrlInput, setServerUrlInput] = useState(getServerUrl)
+	const [email, setEmail] = useState("")
+	const [password, setPassword] = useState("")
 
-  const loginMutation = useMutation({
-    mutationFn: async () => {
-      setServerUrl(serverUrlInput)
-      return signIn(email, password)
-    },
-    onSuccess(session) {
-      onLogin(session)
-    },
-    onError(err) {
-      toast.error(err.message)
-    },
-  })
+	const loginMutation = useMutation({
+		mutationFn: async () => {
+			setServerUrl(serverUrlInput)
+			return signIn(email, password)
+		},
+		onSuccess(session) {
+			onLogin(session)
+		},
+		onError(err) {
+			toast.error(err.message)
+		},
+	})
 
-  function handleSubmit(e: React.FormEvent) {
-    e.preventDefault()
-    loginMutation.mutate()
-  }
+	function handleSubmit(e: React.FormEvent) {
+		e.preventDefault()
+		loginMutation.mutate()
+	}
 
-  const loading = loginMutation.isPending
+	const loading = loginMutation.isPending
 
-  return (
-    <div className="flex min-h-svh items-center justify-center bg-background p-4">
-      <Card className="w-full max-w-sm">
-        <CardHeader className="text-center">
-          <div className="mx-auto mb-2 flex size-10 items-center justify-center rounded-lg bg-primary/10">
-            <Settings2 className="size-5 text-primary" />
-          </div>
-          <CardTitle>Admin Dashboard</CardTitle>
-          <CardDescription>Sign in to manage source configuration.</CardDescription>
-        </CardHeader>
-        <CardContent>
-          <form onSubmit={handleSubmit} className="space-y-4">
-            <div className="space-y-2">
-              <Label htmlFor="server-url">Server URL</Label>
-              <Input
-                id="server-url"
-                type="url"
-                value={serverUrlInput}
-                onChange={(e) => setServerUrlInput(e.target.value)}
-                placeholder="http://localhost:3000"
-                required
-              />
-            </div>
-            <div className="space-y-2">
-              <Label htmlFor="email">Email</Label>
-              <Input
-                id="email"
-                type="email"
-                value={email}
-                onChange={(e) => setEmail(e.target.value)}
-                placeholder="admin@aelis.local"
-                required
-              />
-            </div>
-            <div className="space-y-2">
-              <Label htmlFor="password">Password</Label>
-              <Input
-                id="password"
-                type="password"
-                value={password}
-                onChange={(e) => setPassword(e.target.value)}
-                required
-              />
-            </div>
+	return (
+		<div className="flex min-h-svh items-center justify-center bg-background p-4">
+			<Card className="w-full max-w-sm">
+				<CardHeader className="text-center">
+					<div className="mx-auto mb-2 flex size-10 items-center justify-center rounded-lg bg-primary/10">
+						<Settings2 className="size-5 text-primary" />
+					</div>
+					<CardTitle>Admin Dashboard</CardTitle>
+					<CardDescription>Sign in to manage source configuration.</CardDescription>
+				</CardHeader>
+				<CardContent>
+					<form onSubmit={handleSubmit} className="space-y-4">
+						<div className="space-y-2">
+							<Label htmlFor="server-url">Server URL</Label>
+							<Input
+								id="server-url"
+								type="url"
+								value={serverUrlInput}
+								onChange={(e) => setServerUrlInput(e.target.value)}
+								placeholder="http://localhost:3000"
+								required
+							/>
+						</div>
+						<div className="space-y-2">
+							<Label htmlFor="email">Email</Label>
+							<Input
+								id="email"
+								type="email"
+								value={email}
+								onChange={(e) => setEmail(e.target.value)}
+								placeholder="admin@freya.local"
+								required
+							/>
+						</div>
+						<div className="space-y-2">
+							<Label htmlFor="password">Password</Label>
+							<Input
+								id="password"
+								type="password"
+								value={password}
+								onChange={(e) => setPassword(e.target.value)}
+								required
+							/>
+						</div>
 
-
-            <Button type="submit" className="w-full" disabled={loading}>
-              {loading && <Loader2 className="size-4 animate-spin" />}
-              {loading ? "Signing in…" : "Sign in"}
-            </Button>
-
-          </form>
-        </CardContent>
-      </Card>
-    </div>
-  )
+						<Button type="submit" className="w-full" disabled={loading}>
+							{loading && <Loader2 className="size-4 animate-spin" />}
+							{loading ? "Signing in…" : "Sign in"}
+						</Button>
+					</form>
+				</CardContent>
+			</Card>
+		</div>
+	)
 }

apps/admin-dashboard/src/components/source-config-panel.tsx

@@ -1,10 +1,9 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
-import { useState } from "react"
 import { Info, Loader2, MapPin, Trash2 } from "lucide-react"
+import { useState } from "react"
 import { toast } from "sonner"
 
 import type { ConfigFieldDef, SourceDefinition } from "@/lib/api"
-import { fetchSourceConfig, pushLocation, replaceSource, updateProviderConfig } from "@/lib/api"
 
 import { Badge } from "@/components/ui/badge"
 import { Button } from "@/components/ui/button"
@@ -12,453 +11,494 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
 } from "@/components/ui/select"
 import { Separator } from "@/components/ui/separator"
 import { Switch } from "@/components/ui/switch"
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"
+import { fetchSourceConfig, pushLocation, replaceSource, updateProviderConfig } from "@/lib/api"
 
 interface SourceConfigPanelProps {
-  source: SourceDefinition
-  onUpdate: () => void
+	source: SourceDefinition
+	onUpdate: () => void
 }
 
 export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps) {
-  const queryClient = useQueryClient()
-  const [dirty, setDirty] = useState<Record<string, unknown>>({})
+	const queryClient = useQueryClient()
+	const [dirty, setDirty] = useState<Record<string, unknown>>({})
 
-  const { data: serverConfig, isLoading } = useQuery({
-    queryKey: ["sourceConfig", source.id],
-    queryFn: () => fetchSourceConfig(source.id),
-  })
+	const { data: serverConfig, isLoading } = useQuery({
+		queryKey: ["sourceConfig", source.id],
+		queryFn: () => fetchSourceConfig(source.id),
+	})
 
-  const enabled = serverConfig?.enabled ?? false
-  const serverValues = buildInitialValues(source.fields, serverConfig?.config)
-  const formValues = { ...serverValues, ...dirty }
+	const enabled = serverConfig?.enabled ?? false
+	const serverValues = buildInitialValues(source.fields, serverConfig?.config)
+	const formValues = { ...serverValues, ...dirty }
 
-  function isCredentialField(field: ConfigFieldDef): boolean {
-    return !!(field.secret && field.required)
-  }
+	function isCredentialField(field: ConfigFieldDef): boolean {
+		return !!(field.secret && field.required)
+	}
 
-  function getUserConfig(): Record<string, unknown> {
-    const result: Record<string, unknown> = {}
-    for (const [name, value] of Object.entries(formValues)) {
-      const field = source.fields[name]
-      if (field && !isCredentialField(field)) {
-        result[name] = value
-      }
-    }
-    return result
-  }
+	function getUserConfig(): Record<string, unknown> {
+		const result: Record<string, unknown> = {}
+		for (const [name, value] of Object.entries(formValues)) {
+			const field = source.fields[name]
+			if (field && !isCredentialField(field)) {
+				result[name] = value
+			}
+		}
+		return result
+	}
 
-  function getCredentialFields(): Record<string, unknown> {
-    const creds: Record<string, unknown> = {}
-    for (const [name, value] of Object.entries(formValues)) {
-      const field = source.fields[name]
-      if (field && isCredentialField(field)) {
-        creds[name] = value
-      }
-    }
-    return creds
-  }
+	function getCredentialFields(): Record<string, unknown> {
+		const creds: Record<string, unknown> = {}
+		for (const [name, value] of Object.entries(formValues)) {
+			const field = source.fields[name]
+			if (field && isCredentialField(field)) {
+				creds[name] = value
+			}
+		}
+		return creds
+	}
 
-  function invalidate() {
-    queryClient.invalidateQueries({ queryKey: ["sourceConfig", source.id] })
-    queryClient.invalidateQueries({ queryKey: ["configs"] })
-    onUpdate()
-  }
+	function invalidate() {
+		queryClient.invalidateQueries({ queryKey: ["sourceConfig", source.id] })
+		queryClient.invalidateQueries({ queryKey: ["configs"] })
+		onUpdate()
+	}
 
-  const saveMutation = useMutation({
-    mutationFn: async () => {
-      const promises: Promise<void>[] = [
-        replaceSource(source.id, { enabled, config: getUserConfig() }),
-      ]
+	const saveMutation = useMutation({
+		mutationFn: async () => {
+			const credentialFields = getCredentialFields()
+			const hasCredentials = Object.values(credentialFields).some(
+				(v) => typeof v === "string" && v.length > 0,
+			)
 
-      const credentialFields = getCredentialFields()
-      const hasCredentials = Object.values(credentialFields).some(
-        (v) => typeof v === "string" && v.length > 0,
-      )
-      if (hasCredentials) {
-        promises.push(
-          updateProviderConfig(source.id, { credentials: credentialFields }),
-        )
-      }
+			const body: Parameters<typeof replaceSource>[1] = {
+				enabled,
+				config: getUserConfig(),
+			}
+			if (hasCredentials && source.perUserCredentials) {
+				body.credentials = credentialFields
+			}
+			await replaceSource(source.id, body)
 
-      await Promise.all(promises)
-    },
-    onSuccess() {
-      setDirty({})
-      invalidate()
-      toast.success("Configuration saved")
-    },
-    onError(err) {
-      toast.error(err.message)
-    },
-  })
+			// For non-per-user credentials (provider-level), still use the admin endpoint.
+			if (hasCredentials && !source.perUserCredentials) {
+				await updateProviderConfig(source.id, { credentials: credentialFields })
+			}
+		},
+		onSuccess() {
+			setDirty({})
+			invalidate()
+			toast.success("Configuration saved")
+		},
+		onError(err) {
+			toast.error(err.message)
+		},
+	})
 
-  const toggleMutation = useMutation({
-    mutationFn: (checked: boolean) =>
-      replaceSource(source.id, { enabled: checked, config: getUserConfig() }),
-    onSuccess(_data, checked) {
-      invalidate()
-      toast.success(`Source ${checked ? "enabled" : "disabled"}`)
-    },
-    onError(err) {
-      toast.error(err.message)
-    },
-  })
+	const toggleMutation = useMutation({
+		mutationFn: (checked: boolean) =>
+			replaceSource(source.id, { enabled: checked, config: getUserConfig() }),
+		onSuccess(_data, checked) {
+			invalidate()
+			toast.success(`Source ${checked ? "enabled" : "disabled"}`)
+		},
+		onError(err) {
+			toast.error(err.message)
+		},
+	})
 
-  const deleteMutation = useMutation({
-    mutationFn: () => replaceSource(source.id, { enabled: false, config: {} }),
-    onSuccess() {
-      setDirty({})
-      invalidate()
-      toast.success("Configuration deleted")
-    },
-    onError(err) {
-      toast.error(err.message)
-    },
-  })
+	const deleteMutation = useMutation({
+		mutationFn: () => replaceSource(source.id, { enabled: false, config: {} }),
+		onSuccess() {
+			setDirty({})
+			invalidate()
+			toast.success("Configuration deleted")
+		},
+		onError(err) {
+			toast.error(err.message)
+		},
+	})
 
-  function handleFieldChange(fieldName: string, value: unknown) {
-    setDirty((prev) => ({ ...prev, [fieldName]: value }))
-  }
+	function handleFieldChange(fieldName: string, value: unknown) {
+		setDirty((prev) => ({ ...prev, [fieldName]: value }))
+	}
 
-  const fieldEntries = Object.entries(source.fields)
-  const hasFields = fieldEntries.length > 0
-  const busy = saveMutation.isPending || toggleMutation.isPending || deleteMutation.isPending
+	const fieldEntries = Object.entries(source.fields)
+	const hasFields = fieldEntries.length > 0
+	const busy = saveMutation.isPending || toggleMutation.isPending || deleteMutation.isPending
 
-  const requiredFields = fieldEntries.filter(([, f]) => f.required)
-  const optionalFields = fieldEntries.filter(([, f]) => !f.required)
+	const requiredFields = fieldEntries.filter(([, f]) => f.required)
+	const optionalFields = fieldEntries.filter(([, f]) => !f.required)
 
-  if (isLoading) {
-    return (
-      <div className="flex items-center justify-center py-12">
-        <Loader2 className="size-5 animate-spin text-muted-foreground" />
-      </div>
-    )
-  }
+	if (isLoading) {
+		return (
+			<div className="flex items-center justify-center py-12">
+				<Loader2 className="size-5 animate-spin text-muted-foreground" />
+			</div>
+		)
+	}
 
-  return (
-    <div className="mx-auto max-w-xl space-y-6">
-      {/* Header */}
-      <div className="flex items-center justify-between gap-4">
-        <div className="space-y-1">
-          <div className="flex items-center gap-3">
-            <h2 className="text-lg font-semibold tracking-tight">{source.name}</h2>
-            {source.alwaysEnabled ? (
-              <Badge variant="secondary">Always on</Badge>
-            ) : enabled ? (
-              <Badge className="bg-primary/10 text-primary">Enabled</Badge>
-            ) : (
-              <Badge variant="outline">Disabled</Badge>
-            )}
+	return (
+		<div className="mx-auto max-w-xl space-y-6">
+			{/* Header */}
+			<div className="flex items-center justify-between gap-4">
+				<div className="space-y-1">
+					<div className="flex items-center gap-3">
+						<h2 className="text-lg font-semibold tracking-tight">{source.name}</h2>
+						{source.alwaysEnabled ? (
+							<Badge variant="secondary">Always on</Badge>
+						) : enabled ? (
+							<Badge className="bg-primary/10 text-primary">Enabled</Badge>
+						) : (
+							<Badge variant="outline">Disabled</Badge>
+						)}
+					</div>
+					<p className="text-sm text-muted-foreground">{source.description}</p>
+				</div>
+				{!source.alwaysEnabled && (
+					<Switch
+						checked={enabled}
+						onCheckedChange={(checked) => toggleMutation.mutate(checked)}
+						disabled={busy}
+					/>
+				)}
+			</div>
 
-          </div>
-          <p className="text-sm text-muted-foreground">{source.description}</p>
-        </div>
-        {!source.alwaysEnabled && (
-          <Switch
-            checked={enabled}
-            onCheckedChange={(checked) => toggleMutation.mutate(checked)}
-            disabled={busy}
-          />
-        )}
-      </div>
+			{/* Config form */}
+			{hasFields && !source.alwaysEnabled && (
+				<>
+					{/* Required fields */}
+					{requiredFields.length > 0 && (
+						<Card className="-mx-4">
+							<CardHeader className="pb-4">
+								<CardTitle className="text-sm">Credentials</CardTitle>
+								<CardDescription>Required fields to connect this source.</CardDescription>
+							</CardHeader>
+							<CardContent className="space-y-4">
+								{requiredFields.map(([name, field]) => (
+									<FieldInput
+										key={name}
+										name={name}
+										field={field}
+										value={formValues[name]}
+										onChange={(v) => handleFieldChange(name, v)}
+										disabled={busy}
+									/>
+								))}
+							</CardContent>
+						</Card>
+					)}
 
-      {/* Config form */}
-      {hasFields && !source.alwaysEnabled && (
-        <>
-          {/* Required fields */}
-          {requiredFields.length > 0 && (
-            <Card className="-mx-4">
-              <CardHeader className="pb-4">
-                <CardTitle className="text-sm">Credentials</CardTitle>
-                <CardDescription>Required fields to connect this source.</CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-4">
-                {requiredFields.map(([name, field]) => (
-                  <FieldInput
-                    key={name}
-                    name={name}
-                    field={field}
-                    value={formValues[name]}
-                    onChange={(v) => handleFieldChange(name, v)}
-                    disabled={busy}
-                  />
-                ))}
-              </CardContent>
-            </Card>
-          )}
+					{/* Optional fields */}
+					{optionalFields.length > 0 && (
+						<Card className="-mx-4">
+							<CardHeader className="pb-4">
+								<CardTitle className="text-sm">Options</CardTitle>
+								<CardDescription>Optional configuration for this source.</CardDescription>
+							</CardHeader>
+							<CardContent>
+								<div className={`grid gap-4 ${optionalFields.length > 1 ? "grid-cols-2" : ""}`}>
+									{optionalFields.map(([name, field]) => (
+										<FieldInput
+											key={name}
+											name={name}
+											field={field}
+											value={formValues[name]}
+											onChange={(v) => handleFieldChange(name, v)}
+											disabled={busy}
+										/>
+									))}
+								</div>
+							</CardContent>
+						</Card>
+					)}
 
-          {/* Optional fields */}
-          {optionalFields.length > 0 && (
-            <Card className="-mx-4">
-              <CardHeader className="pb-4">
-                <CardTitle className="text-sm">Options</CardTitle>
-                <CardDescription>Optional configuration for this source.</CardDescription>
-              </CardHeader>
-              <CardContent>
-                <div className={`grid gap-4 ${optionalFields.length > 1 ? "grid-cols-2" : ""}`}>
-                  {optionalFields.map(([name, field]) => (
-                    <FieldInput
-                      key={name}
-                      name={name}
-                      field={field}
-                      value={formValues[name]}
-                      onChange={(v) => handleFieldChange(name, v)}
-                      disabled={busy}
-                    />
-                  ))}
-                </div>
-              </CardContent>
-            </Card>
-          )}
+					{/* Actions */}
+					<div className="flex items-center justify-end gap-3">
+						{serverConfig && (
+							<Button
+								onClick={() => deleteMutation.mutate()}
+								disabled={busy}
+								variant="outline"
+								className="text-destructive hover:text-destructive"
+							>
+								{deleteMutation.isPending ? (
+									<Loader2 className="size-4 animate-spin" />
+								) : (
+									<Trash2 className="size-4" />
+								)}
+								{deleteMutation.isPending ? "Deleting…" : "Delete configuration"}
+							</Button>
+						)}
+						<Button onClick={() => saveMutation.mutate()} disabled={busy}>
+							{saveMutation.isPending && <Loader2 className="size-4 animate-spin" />}
+							{saveMutation.isPending ? "Saving…" : "Save configuration"}
+						</Button>
+					</div>
+				</>
+			)}
 
-          {/* Actions */}
-          <div className="flex items-center justify-end gap-3">
-            {serverConfig && (
-              <Button
-                onClick={() => deleteMutation.mutate()}
-                disabled={busy}
-                variant="outline"
-                className="text-destructive hover:text-destructive"
-              >
-                {deleteMutation.isPending ? (
-                  <Loader2 className="size-4 animate-spin" />
-                ) : (
-                  <Trash2 className="size-4" />
-                )}
-                {deleteMutation.isPending ? "Deleting…" : "Delete configuration"}
-              </Button>
-            )}
-            <Button onClick={() => saveMutation.mutate()} disabled={busy}>
-              {saveMutation.isPending && <Loader2 className="size-4 animate-spin" />}
-              {saveMutation.isPending ? "Saving…" : "Save configuration"}
-            </Button>
-          </div>
-        </>
-      )}
+			{/* Always-on sources */}
+			{source.alwaysEnabled && source.id !== "freya.location" && (
+				<>
+					<Separator />
+					<p className="text-sm text-muted-foreground">
+						This source is always enabled and requires no configuration.
+					</p>
+				</>
+			)}
 
-      {/* Always-on sources */}
-      {source.alwaysEnabled && source.id !== "aelis.location" && (
-        <>
-          <Separator />
-          <p className="text-sm text-muted-foreground">
-            This source is always enabled and requires no configuration.
-          </p>
-        </>
-      )}
-
-      {source.id === "aelis.location" && <LocationCard />}
-    </div>
-  )
+			{source.id === "freya.location" && <LocationCard />}
+		</div>
+	)
 }
 
 function LocationCard() {
-  const [lat, setLat] = useState("")
-  const [lng, setLng] = useState("")
+	const [lat, setLat] = useState("")
+	const [lng, setLng] = useState("")
 
-  const locationMutation = useMutation({
-    mutationFn: (coords: { lat: number; lng: number }) =>
-      pushLocation({ lat: coords.lat, lng: coords.lng, accuracy: 10 }),
-    onSuccess() {
-      toast.success("Location updated")
-    },
-    onError(err) {
-      toast.error(err.message)
-    },
-  })
+	const locationMutation = useMutation({
+		mutationFn: (coords: { lat: number; lng: number }) =>
+			pushLocation({ lat: coords.lat, lng: coords.lng, accuracy: 10 }),
+		onSuccess() {
+			toast.success("Location updated")
+		},
+		onError(err) {
+			toast.error(err.message)
+		},
+	})
 
-  function handlePush() {
-    const latNum = parseFloat(lat)
-    const lngNum = parseFloat(lng)
-    if (isNaN(latNum) || isNaN(lngNum)) return
-    locationMutation.mutate({ lat: latNum, lng: lngNum })
-  }
+	function handlePush() {
+		const latNum = parseFloat(lat)
+		const lngNum = parseFloat(lng)
+		if (isNaN(latNum) || isNaN(lngNum)) return
+		locationMutation.mutate({ lat: latNum, lng: lngNum })
+	}
 
-  function handleUseDevice() {
-    navigator.geolocation.getCurrentPosition(
-      (pos) => {
-        setLat(String(pos.coords.latitude))
-        setLng(String(pos.coords.longitude))
-        locationMutation.mutate({
-          lat: pos.coords.latitude,
-          lng: pos.coords.longitude,
-        })
-      },
-      (err) => {
-        locationMutation.reset()
-        alert(`Geolocation error: ${err.message}`)
-      },
-    )
-  }
+	function handleUseDevice() {
+		navigator.geolocation.getCurrentPosition(
+			(pos) => {
+				setLat(String(pos.coords.latitude))
+				setLng(String(pos.coords.longitude))
+				locationMutation.mutate({
+					lat: pos.coords.latitude,
+					lng: pos.coords.longitude,
+				})
+			},
+			(err) => {
+				locationMutation.reset()
+				alert(`Geolocation error: ${err.message}`)
+			},
+		)
+	}
 
-  return (
-    <Card className="-mx-4">
-      <CardHeader className="pb-4">
-        <CardTitle className="text-sm">Push Location</CardTitle>
-        <CardDescription>Send a location update to the backend.</CardDescription>
-      </CardHeader>
-      <CardContent className="space-y-4">
-        <div className="grid grid-cols-2 gap-4">
-          <div className="space-y-2">
-            <Label htmlFor="loc-lat" className="text-xs font-medium">Latitude</Label>
-            <Input
-              id="loc-lat"
-              type="number"
-              step="any"
-              value={lat}
-              onChange={(e) => setLat(e.target.value)}
-              placeholder="51.5074"
-              disabled={locationMutation.isPending}
-            />
-          </div>
-          <div className="space-y-2">
-            <Label htmlFor="loc-lng" className="text-xs font-medium">Longitude</Label>
-            <Input
-              id="loc-lng"
-              type="number"
-              step="any"
-              value={lng}
-              onChange={(e) => setLng(e.target.value)}
-              placeholder="-0.1278"
-              disabled={locationMutation.isPending}
-            />
-          </div>
-        </div>
+	return (
+		<Card className="-mx-4">
+			<CardHeader className="pb-4">
+				<CardTitle className="text-sm">Push Location</CardTitle>
+				<CardDescription>Send a location update to the backend.</CardDescription>
+			</CardHeader>
+			<CardContent className="space-y-4">
+				<div className="grid grid-cols-2 gap-4">
+					<div className="space-y-2">
+						<Label htmlFor="loc-lat" className="text-xs font-medium">
+							Latitude
+						</Label>
+						<Input
+							id="loc-lat"
+							type="number"
+							step="any"
+							value={lat}
+							onChange={(e) => setLat(e.target.value)}
+							placeholder="51.5074"
+							disabled={locationMutation.isPending}
+						/>
+					</div>
+					<div className="space-y-2">
+						<Label htmlFor="loc-lng" className="text-xs font-medium">
+							Longitude
+						</Label>
+						<Input
+							id="loc-lng"
+							type="number"
+							step="any"
+							value={lng}
+							onChange={(e) => setLng(e.target.value)}
+							placeholder="-0.1278"
+							disabled={locationMutation.isPending}
+						/>
+					</div>
+				</div>
 
-        <div className="flex items-center gap-3">
-          <Button
-            size="sm"
-            variant="outline"
-            onClick={handleUseDevice}
-            disabled={locationMutation.isPending}
-          >
-            <MapPin className="size-3.5" />
-            Use device location
-          </Button>
-          <Button
-            size="sm"
-            onClick={handlePush}
-            disabled={locationMutation.isPending || !lat || !lng}
-          >
-            {locationMutation.isPending && <Loader2 className="size-3.5 animate-spin" />}
-            Push
-          </Button>
-        </div>
-      </CardContent>
-    </Card>
-  )
+				<div className="flex items-center gap-3">
+					<Button
+						size="sm"
+						variant="outline"
+						onClick={handleUseDevice}
+						disabled={locationMutation.isPending}
+					>
+						<MapPin className="size-3.5" />
+						Use device location
+					</Button>
+					<Button
+						size="sm"
+						onClick={handlePush}
+						disabled={locationMutation.isPending || !lat || !lng}
+					>
+						{locationMutation.isPending && <Loader2 className="size-3.5 animate-spin" />}
+						Push
+					</Button>
+				</div>
+			</CardContent>
+		</Card>
+	)
 }
 
 function FieldInput({
-  name,
-  field,
-  value,
-  onChange,
-  disabled,
+	name,
+	field,
+	value,
+	onChange,
+	disabled,
 }: {
-  name: string
-  field: ConfigFieldDef
-  value: unknown
-  onChange: (value: unknown) => void
-  disabled?: boolean
+	name: string
+	field: ConfigFieldDef
+	value: unknown
+	onChange: (value: unknown) => void
+	disabled?: boolean
 }) {
-  const labelContent = (
-    <div className="flex items-center gap-1.5">
-      <span>{field.label}</span>
-      {field.required && <span className="text-destructive">*</span>}
-      {field.description && (
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <Info className="size-3 text-muted-foreground cursor-help" />
-          </TooltipTrigger>
-          <TooltipContent side="top" className="max-w-xs text-xs">
-            {field.description}
-          </TooltipContent>
-        </Tooltip>
-      )}
-    </div>
-  )
+	const labelContent = (
+		<div className="flex items-center gap-1.5">
+			<span>{field.label}</span>
+			{field.required && <span className="text-destructive">*</span>}
+			{field.description && (
+				<Tooltip>
+					<TooltipTrigger asChild>
+						<Info className="size-3 text-muted-foreground cursor-help" />
+					</TooltipTrigger>
+					<TooltipContent side="top" className="max-w-xs text-xs">
+						{field.description}
+					</TooltipContent>
+				</Tooltip>
+			)}
+		</div>
+	)
 
-  if (field.type === "select" && field.options) {
-    return (
-      <div className="space-y-2">
-        <Label htmlFor={name} className="text-xs font-medium">
-          {labelContent}
-        </Label>
-        <Select value={String(value ?? "")} onValueChange={onChange} disabled={disabled}>
-          <SelectTrigger id={name}>
-            <SelectValue placeholder={`Select ${field.label.toLowerCase()}`} />
-          </SelectTrigger>
-          <SelectContent>
-            {field.options.map((opt) => (
-              <SelectItem key={opt.value} value={opt.value}>
-                {opt.label}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-      </div>
-    )
-  }
+	if (field.type === "select" && field.options) {
+		return (
+			<div className="space-y-2">
+				<Label htmlFor={name} className="text-xs font-medium">
+					{labelContent}
+				</Label>
+				<Select value={String(value ?? "")} onValueChange={onChange} disabled={disabled}>
+					<SelectTrigger id={name}>
+						<SelectValue placeholder={`Select ${field.label.toLowerCase()}`} />
+					</SelectTrigger>
+					<SelectContent>
+						{field.options.map((opt) => (
+							<SelectItem key={opt.value} value={opt.value}>
+								{opt.label}
+							</SelectItem>
+						))}
+					</SelectContent>
+				</Select>
+			</div>
+		)
+	}
 
-  if (field.type === "number") {
-    return (
-      <div className="space-y-2">
-        <Label htmlFor={name} className="text-xs font-medium">
-          {labelContent}
-        </Label>
-        <Input
-          id={name}
-          type="number"
-          value={value === undefined || value === null ? "" : String(value)}
-          onChange={(e) => {
-            const v = e.target.value
-            onChange(v === "" ? undefined : Number(v))
-          }}
-          placeholder={field.defaultValue !== undefined ? String(field.defaultValue) : undefined}
-          disabled={disabled}
-        />
-      </div>
-    )
-  }
+	if (field.type === "multiselect" && field.options) {
+		const selected = Array.isArray(value) ? (value as string[]) : []
 
-  return (
-    <div className="space-y-2">
-      <Label htmlFor={name} className="text-xs font-medium">
-        {labelContent}
-      </Label>
-      <Input
-        id={name}
-        type={field.secret ? "password" : "text"}
-        value={String(value ?? "")}
-        onChange={(e) => onChange(e.target.value)}
-        placeholder={field.defaultValue !== undefined ? String(field.defaultValue) : undefined}
-        disabled={disabled}
-      />
-    </div>
-  )
+		function toggle(optValue: string) {
+			const next = selected.includes(optValue)
+				? selected.filter((v) => v !== optValue)
+				: [...selected, optValue]
+			onChange(next)
+		}
+
+		return (
+			<div className="space-y-2">
+				<Label className="text-xs font-medium">{labelContent}</Label>
+				<div className="flex flex-wrap gap-1.5">
+					{field.options!.map((opt) => {
+						const isSelected = selected.includes(opt.value)
+						return (
+							<Badge
+								key={opt.value}
+								variant={isSelected ? "default" : "outline"}
+								className={`cursor-pointer select-none ${isSelected ? "" : "opacity-60 hover:opacity-100"}`}
+								onClick={() => !disabled && toggle(opt.value)}
+							>
+								{opt.label}
+							</Badge>
+						)
+					})}
+				</div>
+			</div>
+		)
+	}
+
+	if (field.type === "number") {
+		return (
+			<div className="space-y-2">
+				<Label htmlFor={name} className="text-xs font-medium">
+					{labelContent}
+				</Label>
+				<Input
+					id={name}
+					type="number"
+					value={value === undefined || value === null ? "" : String(value)}
+					onChange={(e) => {
+						const v = e.target.value
+						onChange(v === "" ? undefined : Number(v))
+					}}
+					placeholder={field.defaultValue !== undefined ? String(field.defaultValue) : undefined}
+					disabled={disabled}
+				/>
+			</div>
+		)
+	}
+
+	return (
+		<div className="space-y-2">
+			<Label htmlFor={name} className="text-xs font-medium">
+				{labelContent}
+			</Label>
+			<Input
+				id={name}
+				type={field.secret ? "password" : "text"}
+				value={String(value ?? "")}
+				onChange={(e) => onChange(e.target.value)}
+				placeholder={field.defaultValue !== undefined ? String(field.defaultValue) : undefined}
+				disabled={disabled}
+			/>
+		</div>
+	)
 }
 
 function buildInitialValues(
-  fields: Record<string, ConfigFieldDef>,
-  saved: Record<string, unknown> | undefined,
+	fields: Record<string, ConfigFieldDef>,
+	saved: Record<string, unknown> | undefined,
 ): Record<string, unknown> {
-  const values: Record<string, unknown> = {}
-  for (const [name, field] of Object.entries(fields)) {
-    if (saved && name in saved) {
-      values[name] = saved[name]
-    } else if (field.defaultValue !== undefined) {
-      values[name] = field.defaultValue
-    } else {
-      values[name] = field.type === "number" ? undefined : ""
-    }
-  }
-  return values
+	const values: Record<string, unknown> = {}
+	for (const [name, field] of Object.entries(fields)) {
+		if (saved && name in saved) {
+			values[name] = saved[name]
+		} else if (field.defaultValue !== undefined) {
+			values[name] = field.defaultValue
+		} else if (field.type === "multiselect") {
+			values[name] = []
+		} else {
+			values[name] = field.type === "number" ? undefined : ""
+		}
+	}
+	return values
 }

apps/admin-dashboard/src/components/theme-provider.tsx

@@ -5,226 +5,219 @@ type Theme = "dark" | "light" | "system"
 type ResolvedTheme = "dark" | "light"
 
 type ThemeProviderProps = {
-  children: React.ReactNode
-  defaultTheme?: Theme
-  storageKey?: string
-  disableTransitionOnChange?: boolean
+	children: React.ReactNode
+	defaultTheme?: Theme
+	storageKey?: string
+	disableTransitionOnChange?: boolean
 }
 
 type ThemeProviderState = {
-  theme: Theme
-  setTheme: (theme: Theme) => void
+	theme: Theme
+	setTheme: (theme: Theme) => void
 }
 
 const COLOR_SCHEME_QUERY = "(prefers-color-scheme: dark)"
 const THEME_VALUES: Theme[] = ["dark", "light", "system"]
 
-const ThemeProviderContext = React.createContext<
-  ThemeProviderState | undefined
->(undefined)
+const ThemeProviderContext = React.createContext<ThemeProviderState | undefined>(undefined)
 
 function isTheme(value: string | null): value is Theme {
-  if (value === null) {
-    return false
-  }
+	if (value === null) {
+		return false
+	}
 
-  return THEME_VALUES.includes(value as Theme)
+	return THEME_VALUES.includes(value as Theme)
 }
 
 function getSystemTheme(): ResolvedTheme {
-  if (window.matchMedia(COLOR_SCHEME_QUERY).matches) {
-    return "dark"
-  }
+	if (window.matchMedia(COLOR_SCHEME_QUERY).matches) {
+		return "dark"
+	}
 
-  return "light"
+	return "light"
 }
 
 function disableTransitionsTemporarily() {
-  const style = document.createElement("style")
-  style.appendChild(
-    document.createTextNode(
-      "*,*::before,*::after{-webkit-transition:none!important;transition:none!important}"
-    )
-  )
-  document.head.appendChild(style)
+	const style = document.createElement("style")
+	style.appendChild(
+		document.createTextNode(
+			"*,*::before,*::after{-webkit-transition:none!important;transition:none!important}",
+		),
+	)
+	document.head.appendChild(style)
 
-  return () => {
-    window.getComputedStyle(document.body)
-    requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        style.remove()
-      })
-    })
-  }
+	return () => {
+		window.getComputedStyle(document.body)
+		requestAnimationFrame(() => {
+			requestAnimationFrame(() => {
+				style.remove()
+			})
+		})
+	}
 }
 
 function isEditableTarget(target: EventTarget | null) {
-  if (!(target instanceof HTMLElement)) {
-    return false
-  }
+	if (!(target instanceof HTMLElement)) {
+		return false
+	}
 
-  if (target.isContentEditable) {
-    return true
-  }
+	if (target.isContentEditable) {
+		return true
+	}
 
-  const editableParent = target.closest(
-    "input, textarea, select, [contenteditable='true']"
-  )
-  if (editableParent) {
-    return true
-  }
+	const editableParent = target.closest("input, textarea, select, [contenteditable='true']")
+	if (editableParent) {
+		return true
+	}
 
-  return false
+	return false
 }
 
 export function ThemeProvider({
-  children,
-  defaultTheme = "system",
-  storageKey = "theme",
-  disableTransitionOnChange = true,
-  ...props
+	children,
+	defaultTheme = "system",
+	storageKey = "theme",
+	disableTransitionOnChange = true,
+	...props
 }: ThemeProviderProps) {
-  const [theme, setThemeState] = React.useState<Theme>(() => {
-    const storedTheme = localStorage.getItem(storageKey)
-    if (isTheme(storedTheme)) {
-      return storedTheme
-    }
+	const [theme, setThemeState] = React.useState<Theme>(() => {
+		const storedTheme = localStorage.getItem(storageKey)
+		if (isTheme(storedTheme)) {
+			return storedTheme
+		}
 
-    return defaultTheme
-  })
+		return defaultTheme
+	})
 
-  const setTheme = React.useCallback(
-    (nextTheme: Theme) => {
-      localStorage.setItem(storageKey, nextTheme)
-      setThemeState(nextTheme)
-    },
-    [storageKey]
-  )
+	const setTheme = React.useCallback(
+		(nextTheme: Theme) => {
+			localStorage.setItem(storageKey, nextTheme)
+			setThemeState(nextTheme)
+		},
+		[storageKey],
+	)
 
-  const applyTheme = React.useCallback(
-    (nextTheme: Theme) => {
-      const root = document.documentElement
-      const resolvedTheme =
-        nextTheme === "system" ? getSystemTheme() : nextTheme
-      const restoreTransitions = disableTransitionOnChange
-        ? disableTransitionsTemporarily()
-        : null
+	const applyTheme = React.useCallback(
+		(nextTheme: Theme) => {
+			const root = document.documentElement
+			const resolvedTheme = nextTheme === "system" ? getSystemTheme() : nextTheme
+			const restoreTransitions = disableTransitionOnChange ? disableTransitionsTemporarily() : null
 
-      root.classList.remove("light", "dark")
-      root.classList.add(resolvedTheme)
+			root.classList.remove("light", "dark")
+			root.classList.add(resolvedTheme)
 
-      if (restoreTransitions) {
-        restoreTransitions()
-      }
-    },
-    [disableTransitionOnChange]
-  )
+			if (restoreTransitions) {
+				restoreTransitions()
+			}
+		},
+		[disableTransitionOnChange],
+	)
 
-  React.useEffect(() => {
-    applyTheme(theme)
+	React.useEffect(() => {
+		applyTheme(theme)
 
-    if (theme !== "system") {
-      return undefined
-    }
+		if (theme !== "system") {
+			return undefined
+		}
 
-    const mediaQuery = window.matchMedia(COLOR_SCHEME_QUERY)
-    const handleChange = () => {
-      applyTheme("system")
-    }
+		const mediaQuery = window.matchMedia(COLOR_SCHEME_QUERY)
+		const handleChange = () => {
+			applyTheme("system")
+		}
 
-    mediaQuery.addEventListener("change", handleChange)
+		mediaQuery.addEventListener("change", handleChange)
 
-    return () => {
-      mediaQuery.removeEventListener("change", handleChange)
-    }
-  }, [theme, applyTheme])
+		return () => {
+			mediaQuery.removeEventListener("change", handleChange)
+		}
+	}, [theme, applyTheme])
 
-  React.useEffect(() => {
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.repeat) {
-        return
-      }
+	React.useEffect(() => {
+		const handleKeyDown = (event: KeyboardEvent) => {
+			if (event.repeat) {
+				return
+			}
 
-      if (event.metaKey || event.ctrlKey || event.altKey) {
-        return
-      }
+			if (event.metaKey || event.ctrlKey || event.altKey) {
+				return
+			}
 
-      if (isEditableTarget(event.target)) {
-        return
-      }
+			if (isEditableTarget(event.target)) {
+				return
+			}
 
-      if (event.key.toLowerCase() !== "d") {
-        return
-      }
+			if (event.key.toLowerCase() !== "d") {
+				return
+			}
 
-      setThemeState((currentTheme) => {
-        const nextTheme =
-          currentTheme === "dark"
-            ? "light"
-            : currentTheme === "light"
-              ? "dark"
-              : getSystemTheme() === "dark"
-                ? "light"
-                : "dark"
+			setThemeState((currentTheme) => {
+				const nextTheme =
+					currentTheme === "dark"
+						? "light"
+						: currentTheme === "light"
+							? "dark"
+							: getSystemTheme() === "dark"
+								? "light"
+								: "dark"
 
-        localStorage.setItem(storageKey, nextTheme)
-        return nextTheme
-      })
-    }
+				localStorage.setItem(storageKey, nextTheme)
+				return nextTheme
+			})
+		}
 
-    window.addEventListener("keydown", handleKeyDown)
+		window.addEventListener("keydown", handleKeyDown)
 
-    return () => {
-      window.removeEventListener("keydown", handleKeyDown)
-    }
-  }, [storageKey])
+		return () => {
+			window.removeEventListener("keydown", handleKeyDown)
+		}
+	}, [storageKey])
 
-  React.useEffect(() => {
-    const handleStorageChange = (event: StorageEvent) => {
-      if (event.storageArea !== localStorage) {
-        return
-      }
+	React.useEffect(() => {
+		const handleStorageChange = (event: StorageEvent) => {
+			if (event.storageArea !== localStorage) {
+				return
+			}
 
-      if (event.key !== storageKey) {
-        return
-      }
+			if (event.key !== storageKey) {
+				return
+			}
 
-      if (isTheme(event.newValue)) {
-        setThemeState(event.newValue)
-        return
-      }
+			if (isTheme(event.newValue)) {
+				setThemeState(event.newValue)
+				return
+			}
 
-      setThemeState(defaultTheme)
-    }
+			setThemeState(defaultTheme)
+		}
 
-    window.addEventListener("storage", handleStorageChange)
+		window.addEventListener("storage", handleStorageChange)
 
-    return () => {
-      window.removeEventListener("storage", handleStorageChange)
-    }
-  }, [defaultTheme, storageKey])
+		return () => {
+			window.removeEventListener("storage", handleStorageChange)
+		}
+	}, [defaultTheme, storageKey])
 
-  const value = React.useMemo(
-    () => ({
-      theme,
-      setTheme,
-    }),
-    [theme, setTheme]
-  )
+	const value = React.useMemo(
+		() => ({
+			theme,
+			setTheme,
+		}),
+		[theme, setTheme],
+	)
 
-  return (
-    <ThemeProviderContext.Provider {...props} value={value}>
-      {children}
-    </ThemeProviderContext.Provider>
-  )
+	return (
+		<ThemeProviderContext.Provider {...props} value={value}>
+			{children}
+		</ThemeProviderContext.Provider>
+	)
 }
 
 export const useTheme = () => {
-  const context = React.useContext(ThemeProviderContext)
+	const context = React.useContext(ThemeProviderContext)
 
-  if (context === undefined) {
-    throw new Error("useTheme must be used within a ThemeProvider")
-  }
+	if (context === undefined) {
+		throw new Error("useTheme must be used within a ThemeProvider")
+	}
 
-  return context
+	return context
 }

apps/admin-dashboard/src/components/ui/accordion.tsx

@@ -1,84 +1,84 @@
 "use client"
 
-import * as React from "react"
+import { ChevronDownIcon, ChevronUpIcon } from "lucide-react"
 import { Accordion as AccordionPrimitive } from "radix-ui"
+import * as React from "react"
 
 import { cn } from "@/lib/utils"
-import { ChevronDownIcon, ChevronUpIcon } from "lucide-react"
 
-function Accordion({
-  className,
-  ...props
-}: React.ComponentProps<typeof AccordionPrimitive.Root>) {
-  return (
-    <AccordionPrimitive.Root
-      data-slot="accordion"
-      className={cn(
-        "flex w-full flex-col overflow-hidden rounded-md border",
-        className
-      )}
-      {...props}
-    />
-  )
+function Accordion({ className, ...props }: React.ComponentProps<typeof AccordionPrimitive.Root>) {
+	return (
+		<AccordionPrimitive.Root
+			data-slot="accordion"
+			className={cn("flex w-full flex-col overflow-hidden rounded-md border", className)}
+			{...props}
+		/>
+	)
 }
 
 function AccordionItem({
-  className,
-  ...props
+	className,
+	...props
 }: React.ComponentProps<typeof AccordionPrimitive.Item>) {
-  return (
-    <AccordionPrimitive.Item
-      data-slot="accordion-item"
-      className={cn("not-last:border-b data-open:bg-muted/50", className)}
-      {...props}
-    />
-  )
+	return (
+		<AccordionPrimitive.Item
+			data-slot="accordion-item"
+			className={cn("not-last:border-b data-open:bg-muted/50", className)}
+			{...props}
+		/>
+	)
 }
 
 function AccordionTrigger({
-  className,
-  children,
-  ...props
+	className,
+	children,
+	...props
 }: React.ComponentProps<typeof AccordionPrimitive.Trigger>) {
-  return (
-    <AccordionPrimitive.Header className="flex">
-      <AccordionPrimitive.Trigger
-        data-slot="accordion-trigger"
-        className={cn(
-          "group/accordion-trigger relative flex flex-1 items-start justify-between gap-6 border border-transparent p-2 text-left text-xs/relaxed font-medium transition-all outline-none hover:underline disabled:pointer-events-none disabled:opacity-50 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 **:data-[slot=accordion-trigger-icon]:text-muted-foreground",
-          className
-        )}
-        {...props}
-      >
-        {children}
-        <ChevronDownIcon data-slot="accordion-trigger-icon" className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden" />
-        <ChevronUpIcon data-slot="accordion-trigger-icon" className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline" />
-      </AccordionPrimitive.Trigger>
-    </AccordionPrimitive.Header>
-  )
+	return (
+		<AccordionPrimitive.Header className="flex">
+			<AccordionPrimitive.Trigger
+				data-slot="accordion-trigger"
+				className={cn(
+					"group/accordion-trigger relative flex flex-1 items-start justify-between gap-6 border border-transparent p-2 text-left text-xs/relaxed font-medium transition-all outline-none hover:underline disabled:pointer-events-none disabled:opacity-50 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 **:data-[slot=accordion-trigger-icon]:text-muted-foreground",
+					className,
+				)}
+				{...props}
+			>
+				{children}
+				<ChevronDownIcon
+					data-slot="accordion-trigger-icon"
+					className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden"
+				/>
+				<ChevronUpIcon
+					data-slot="accordion-trigger-icon"
+					className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline"
+				/>
+			</AccordionPrimitive.Trigger>
+		</AccordionPrimitive.Header>
+	)
 }
 
 function AccordionContent({
-  className,
-  children,
-  ...props
+	className,
+	children,
+	...props
 }: React.ComponentProps<typeof AccordionPrimitive.Content>) {
-  return (
-    <AccordionPrimitive.Content
-      data-slot="accordion-content"
-      className="overflow-hidden px-2 text-xs/relaxed data-open:animate-accordion-down data-closed:animate-accordion-up"
-      {...props}
-    >
-      <div
-        className={cn(
-          "h-(--radix-accordion-content-height) pt-0 pb-4 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4",
-          className
-        )}
-      >
-        {children}
-      </div>
-    </AccordionPrimitive.Content>
-  )
+	return (
+		<AccordionPrimitive.Content
+			data-slot="accordion-content"
+			className="overflow-hidden px-2 text-xs/relaxed data-open:animate-accordion-down data-closed:animate-accordion-up"
+			{...props}
+		>
+			<div
+				className={cn(
+					"h-(--radix-accordion-content-height) pt-0 pb-4 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4",
+					className,
+				)}
+			>
+				{children}
+			</div>
+		</AccordionPrimitive.Content>
+	)
 }
 
 export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }

apps/admin-dashboard/src/components/ui/alert.tsx

@@ -1,76 +1,73 @@
-import * as React from "react"
 import { cva, type VariantProps } from "class-variance-authority"
+import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
 const alertVariants = cva(
-  "group/alert relative grid w-full gap-0.5 rounded-lg border px-2 py-1.5 text-left text-xs/relaxed has-data-[slot=alert-action]:relative has-data-[slot=alert-action]:pr-18 has-[>svg]:grid-cols-[auto_1fr] has-[>svg]:gap-x-1.5 *:[svg]:row-span-2 *:[svg]:translate-y-0.5 *:[svg]:text-current *:[svg:not([class*='size-'])]:size-3.5",
-  {
-    variants: {
-      variant: {
-        default: "bg-card text-card-foreground",
-        destructive:
-          "bg-card text-destructive *:data-[slot=alert-description]:text-destructive/90 *:[svg]:text-current",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-    },
-  }
+	"group/alert relative grid w-full gap-0.5 rounded-lg border px-2 py-1.5 text-left text-xs/relaxed has-data-[slot=alert-action]:relative has-data-[slot=alert-action]:pr-18 has-[>svg]:grid-cols-[auto_1fr] has-[>svg]:gap-x-1.5 *:[svg]:row-span-2 *:[svg]:translate-y-0.5 *:[svg]:text-current *:[svg:not([class*='size-'])]:size-3.5",
+	{
+		variants: {
+			variant: {
+				default: "bg-card text-card-foreground",
+				destructive:
+					"bg-card text-destructive *:data-[slot=alert-description]:text-destructive/90 *:[svg]:text-current",
+			},
+		},
+		defaultVariants: {
+			variant: "default",
+		},
+	},
 )
 
 function Alert({
-  className,
-  variant,
-  ...props
+	className,
+	variant,
+	...props
 }: React.ComponentProps<"div"> & VariantProps<typeof alertVariants>) {
-  return (
-    <div
-      data-slot="alert"
-      role="alert"
-      className={cn(alertVariants({ variant }), className)}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="alert"
+			role="alert"
+			className={cn(alertVariants({ variant }), className)}
+			{...props}
+		/>
+	)
 }
 
 function AlertTitle({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="alert-title"
-      className={cn(
-        "font-medium group-has-[>svg]/alert:col-start-2 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground",
-        className
-      )}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="alert-title"
+			className={cn(
+				"font-medium group-has-[>svg]/alert:col-start-2 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground",
+				className,
+			)}
+			{...props}
+		/>
+	)
 }
 
-function AlertDescription({
-  className,
-  ...props
-}: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="alert-description"
-      className={cn(
-        "text-xs/relaxed text-balance text-muted-foreground md:text-pretty [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4",
-        className
-      )}
-      {...props}
-    />
-  )
+function AlertDescription({ className, ...props }: React.ComponentProps<"div">) {
+	return (
+		<div
+			data-slot="alert-description"
+			className={cn(
+				"text-xs/relaxed text-balance text-muted-foreground md:text-pretty [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4",
+				className,
+			)}
+			{...props}
+		/>
+	)
 }
 
 function AlertAction({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="alert-action"
-      className={cn("absolute top-1.5 right-2", className)}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="alert-action"
+			className={cn("absolute top-1.5 right-2", className)}
+			{...props}
+		/>
+	)
 }
 
 export { Alert, AlertTitle, AlertDescription, AlertAction }

apps/admin-dashboard/src/components/ui/badge.tsx

@@ -1,49 +1,46 @@
-import * as React from "react"
 import { cva, type VariantProps } from "class-variance-authority"
 import { Slot } from "radix-ui"
+import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
 const badgeVariants = cva(
-  "group/badge inline-flex h-5 w-fit shrink-0 items-center justify-center gap-1 overflow-hidden rounded-full border border-transparent px-2 py-0.5 text-[0.625rem] font-medium whitespace-nowrap transition-all focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&>svg]:pointer-events-none [&>svg]:size-2.5!",
-  {
-    variants: {
-      variant: {
-        default: "bg-primary text-primary-foreground [a]:hover:bg-primary/80",
-        secondary:
-          "bg-secondary text-secondary-foreground [a]:hover:bg-secondary/80",
-        destructive:
-          "bg-destructive/10 text-destructive focus-visible:ring-destructive/20 dark:bg-destructive/20 dark:focus-visible:ring-destructive/40 [a]:hover:bg-destructive/20",
-        outline:
-          "border-border bg-input/20 text-foreground dark:bg-input/30 [a]:hover:bg-muted [a]:hover:text-muted-foreground",
-        ghost:
-          "hover:bg-muted hover:text-muted-foreground dark:hover:bg-muted/50",
-        link: "text-primary underline-offset-4 hover:underline",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-    },
-  }
+	"group/badge inline-flex h-5 w-fit shrink-0 items-center justify-center gap-1 overflow-hidden rounded-full border border-transparent px-2 py-0.5 text-[0.625rem] font-medium whitespace-nowrap transition-all focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&>svg]:pointer-events-none [&>svg]:size-2.5!",
+	{
+		variants: {
+			variant: {
+				default: "bg-primary text-primary-foreground [a]:hover:bg-primary/80",
+				secondary: "bg-secondary text-secondary-foreground [a]:hover:bg-secondary/80",
+				destructive:
+					"bg-destructive/10 text-destructive focus-visible:ring-destructive/20 dark:bg-destructive/20 dark:focus-visible:ring-destructive/40 [a]:hover:bg-destructive/20",
+				outline:
+					"border-border bg-input/20 text-foreground dark:bg-input/30 [a]:hover:bg-muted [a]:hover:text-muted-foreground",
+				ghost: "hover:bg-muted hover:text-muted-foreground dark:hover:bg-muted/50",
+				link: "text-primary underline-offset-4 hover:underline",
+			},
+		},
+		defaultVariants: {
+			variant: "default",
+		},
+	},
 )
 
 function Badge({
-  className,
-  variant = "default",
-  asChild = false,
-  ...props
-}: React.ComponentProps<"span"> &
-  VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
-  const Comp = asChild ? Slot.Root : "span"
+	className,
+	variant = "default",
+	asChild = false,
+	...props
+}: React.ComponentProps<"span"> & VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
+	const Comp = asChild ? Slot.Root : "span"
 
-  return (
-    <Comp
-      data-slot="badge"
-      data-variant={variant}
-      className={cn(badgeVariants({ variant }), className)}
-      {...props}
-    />
-  )
+	return (
+		<Comp
+			data-slot="badge"
+			data-variant={variant}
+			className={cn(badgeVariants({ variant }), className)}
+			{...props}
+		/>
+	)
 }
 
 export { Badge, badgeVariants }

apps/admin-dashboard/src/components/ui/button.tsx

@@ -1,65 +1,65 @@
-import * as React from "react"
 import { cva, type VariantProps } from "class-variance-authority"
 import { Slot } from "radix-ui"
+import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
 const buttonVariants = cva(
-  "group/button inline-flex shrink-0 items-center justify-center rounded-md border border-transparent bg-clip-padding text-xs/relaxed font-medium whitespace-nowrap transition-all outline-none select-none focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/30 active:translate-y-px disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-2 aria-invalid:ring-destructive/20 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-  {
-    variants: {
-      variant: {
-        default: "bg-primary text-primary-foreground hover:bg-primary/80",
-        outline:
-          "border-border hover:bg-input/50 hover:text-foreground aria-expanded:bg-muted aria-expanded:text-foreground dark:bg-input/30",
-        secondary:
-          "bg-secondary text-secondary-foreground hover:bg-secondary/80 aria-expanded:bg-secondary aria-expanded:text-secondary-foreground",
-        ghost:
-          "hover:bg-muted hover:text-foreground aria-expanded:bg-muted aria-expanded:text-foreground dark:hover:bg-muted/50",
-        destructive:
-          "bg-destructive/10 text-destructive hover:bg-destructive/20 focus-visible:border-destructive/40 focus-visible:ring-destructive/20 dark:bg-destructive/20 dark:hover:bg-destructive/30 dark:focus-visible:ring-destructive/40",
-        link: "text-primary underline-offset-4 hover:underline",
-      },
-      size: {
-        default:
-          "h-7 gap-1 px-2 text-xs/relaxed has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3.5",
-        xs: "h-5 gap-1 rounded-sm px-2 text-[0.625rem] has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-2.5",
-        sm: "h-6 gap-1 px-2 text-xs/relaxed has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3",
-        lg: "h-8 gap-1 px-2.5 text-xs/relaxed has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2 [&_svg:not([class*='size-'])]:size-4",
-        icon: "size-7 [&_svg:not([class*='size-'])]:size-3.5",
-        "icon-xs": "size-5 rounded-sm [&_svg:not([class*='size-'])]:size-2.5",
-        "icon-sm": "size-6 [&_svg:not([class*='size-'])]:size-3",
-        "icon-lg": "size-8 [&_svg:not([class*='size-'])]:size-4",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-      size: "default",
-    },
-  }
+	"group/button inline-flex shrink-0 items-center justify-center rounded-md border border-transparent bg-clip-padding text-xs/relaxed font-medium whitespace-nowrap transition-all outline-none select-none focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/30 active:translate-y-px disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-2 aria-invalid:ring-destructive/20 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+	{
+		variants: {
+			variant: {
+				default: "bg-primary text-primary-foreground hover:bg-primary/80",
+				outline:
+					"border-border hover:bg-input/50 hover:text-foreground aria-expanded:bg-muted aria-expanded:text-foreground dark:bg-input/30",
+				secondary:
+					"bg-secondary text-secondary-foreground hover:bg-secondary/80 aria-expanded:bg-secondary aria-expanded:text-secondary-foreground",
+				ghost:
+					"hover:bg-muted hover:text-foreground aria-expanded:bg-muted aria-expanded:text-foreground dark:hover:bg-muted/50",
+				destructive:
+					"bg-destructive/10 text-destructive hover:bg-destructive/20 focus-visible:border-destructive/40 focus-visible:ring-destructive/20 dark:bg-destructive/20 dark:hover:bg-destructive/30 dark:focus-visible:ring-destructive/40",
+				link: "text-primary underline-offset-4 hover:underline",
+			},
+			size: {
+				default:
+					"h-7 gap-1 px-2 text-xs/relaxed has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3.5",
+				xs: "h-5 gap-1 rounded-sm px-2 text-[0.625rem] has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-2.5",
+				sm: "h-6 gap-1 px-2 text-xs/relaxed has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3",
+				lg: "h-8 gap-1 px-2.5 text-xs/relaxed has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2 [&_svg:not([class*='size-'])]:size-4",
+				icon: "size-7 [&_svg:not([class*='size-'])]:size-3.5",
+				"icon-xs": "size-5 rounded-sm [&_svg:not([class*='size-'])]:size-2.5",
+				"icon-sm": "size-6 [&_svg:not([class*='size-'])]:size-3",
+				"icon-lg": "size-8 [&_svg:not([class*='size-'])]:size-4",
+			},
+		},
+		defaultVariants: {
+			variant: "default",
+			size: "default",
+		},
+	},
 )
 
 function Button({
-  className,
-  variant = "default",
-  size = "default",
-  asChild = false,
-  ...props
+	className,
+	variant = "default",
+	size = "default",
+	asChild = false,
+	...props
 }: React.ComponentProps<"button"> &
-  VariantProps<typeof buttonVariants> & {
-    asChild?: boolean
-  }) {
-  const Comp = asChild ? Slot.Root : "button"
+	VariantProps<typeof buttonVariants> & {
+		asChild?: boolean
+	}) {
+	const Comp = asChild ? Slot.Root : "button"
 
-  return (
-    <Comp
-      data-slot="button"
-      data-variant={variant}
-      data-size={size}
-      className={cn(buttonVariants({ variant, size, className }))}
-      {...props}
-    />
-  )
+	return (
+		<Comp
+			data-slot="button"
+			data-variant={variant}
+			data-size={size}
+			className={cn(buttonVariants({ variant, size, className }))}
+			{...props}
+		/>
+	)
 }
 
 export { Button, buttonVariants }

apps/admin-dashboard/src/components/ui/card.tsx

@@ -3,98 +3,81 @@ import * as React from "react"
 import { cn } from "@/lib/utils"
 
 function Card({
-  className,
-  size = "default",
-  ...props
+	className,
+	size = "default",
+	...props
 }: React.ComponentProps<"div"> & { size?: "default" | "sm" }) {
-  return (
-    <div
-      data-slot="card"
-      data-size={size}
-      className={cn(
-        "group/card flex flex-col gap-4 overflow-hidden rounded-lg bg-card py-4 text-xs/relaxed text-card-foreground ring-1 ring-foreground/10 has-[>img:first-child]:pt-0 data-[size=sm]:gap-3 data-[size=sm]:py-3 *:[img:first-child]:rounded-t-lg *:[img:last-child]:rounded-b-lg",
-        className
-      )}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="card"
+			data-size={size}
+			className={cn(
+				"group/card flex flex-col gap-4 overflow-hidden rounded-lg bg-card py-4 text-xs/relaxed text-card-foreground ring-1 ring-foreground/10 has-[>img:first-child]:pt-0 data-[size=sm]:gap-3 data-[size=sm]:py-3 *:[img:first-child]:rounded-t-lg *:[img:last-child]:rounded-b-lg",
+				className,
+			)}
+			{...props}
+		/>
+	)
 }
 
 function CardHeader({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="card-header"
-      className={cn(
-        "group/card-header @container/card-header grid auto-rows-min items-start gap-1 rounded-t-lg px-4 group-data-[size=sm]/card:px-3 has-data-[slot=card-action]:grid-cols-[1fr_auto] has-data-[slot=card-description]:grid-rows-[auto_auto] [.border-b]:pb-4 group-data-[size=sm]/card:[.border-b]:pb-3",
-        className
-      )}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="card-header"
+			className={cn(
+				"group/card-header @container/card-header grid auto-rows-min items-start gap-1 rounded-t-lg px-4 group-data-[size=sm]/card:px-3 has-data-[slot=card-action]:grid-cols-[1fr_auto] has-data-[slot=card-description]:grid-rows-[auto_auto] [.border-b]:pb-4 group-data-[size=sm]/card:[.border-b]:pb-3",
+				className,
+			)}
+			{...props}
+		/>
+	)
 }
 
 function CardTitle({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="card-title"
-      className={cn("text-sm font-medium", className)}
-      {...props}
-    />
-  )
+	return <div data-slot="card-title" className={cn("text-sm font-medium", className)} {...props} />
 }
 
 function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="card-description"
-      className={cn("text-xs/relaxed text-muted-foreground", className)}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="card-description"
+			className={cn("text-xs/relaxed text-muted-foreground", className)}
+			{...props}
+		/>
+	)
 }
 
 function CardAction({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="card-action"
-      className={cn(
-        "col-start-2 row-span-2 row-start-1 self-start justify-self-end",
-        className
-      )}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="card-action"
+			className={cn("col-start-2 row-span-2 row-start-1 self-start justify-self-end", className)}
+			{...props}
+		/>
+	)
 }
 
 function CardContent({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="card-content"
-      className={cn("px-4 group-data-[size=sm]/card:px-3", className)}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="card-content"
+			className={cn("px-4 group-data-[size=sm]/card:px-3", className)}
+			{...props}
+		/>
+	)
 }
 
 function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="card-footer"
-      className={cn(
-        "flex items-center rounded-b-lg px-4 group-data-[size=sm]/card:px-3 [.border-t]:pt-4 group-data-[size=sm]/card:[.border-t]:pt-3",
-        className
-      )}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="card-footer"
+			className={cn(
+				"flex items-center rounded-b-lg px-4 group-data-[size=sm]/card:px-3 [.border-t]:pt-4 group-data-[size=sm]/card:[.border-t]:pt-3",
+				className,
+			)}
+			{...props}
+		/>
+	)
 }
 
-export {
-  Card,
-  CardHeader,
-  CardFooter,
-  CardTitle,
-  CardAction,
-  CardDescription,
-  CardContent,
-}
+export { Card, CardHeader, CardFooter, CardTitle, CardAction, CardDescription, CardContent }

apps/admin-dashboard/src/components/ui/collapsible.tsx

@@ -2,32 +2,20 @@
 
 import { Collapsible as CollapsiblePrimitive } from "radix-ui"
 
-function Collapsible({
-  ...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.Root>) {
-  return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />
+function Collapsible({ ...props }: React.ComponentProps<typeof CollapsiblePrimitive.Root>) {
+	return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />
 }
 
 function CollapsibleTrigger({
-  ...props
+	...props
 }: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleTrigger>) {
-  return (
-    <CollapsiblePrimitive.CollapsibleTrigger
-      data-slot="collapsible-trigger"
-      {...props}
-    />
-  )
+	return <CollapsiblePrimitive.CollapsibleTrigger data-slot="collapsible-trigger" {...props} />
 }
 
 function CollapsibleContent({
-  ...props
+	...props
 }: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleContent>) {
-  return (
-    <CollapsiblePrimitive.CollapsibleContent
-      data-slot="collapsible-content"
-      {...props}
-    />
-  )
+	return <CollapsiblePrimitive.CollapsibleContent data-slot="collapsible-content" {...props} />
 }
 
 export { Collapsible, CollapsibleTrigger, CollapsibleContent }

apps/admin-dashboard/src/components/ui/input.tsx

@@ -3,17 +3,17 @@ import * as React from "react"
 import { cn } from "@/lib/utils"
 
 function Input({ className, type, ...props }: React.ComponentProps<"input">) {
-  return (
-    <input
-      type={type}
-      data-slot="input"
-      className={cn(
-        "h-7 w-full min-w-0 rounded-md border border-input bg-input/20 px-2 py-0.5 text-sm transition-colors outline-none file:inline-flex file:h-6 file:border-0 file:bg-transparent file:text-xs/relaxed file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/30 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-2 aria-invalid:ring-destructive/20 md:text-xs/relaxed dark:bg-input/30 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40",
-        className
-      )}
-      {...props}
-    />
-  )
+	return (
+		<input
+			type={type}
+			data-slot="input"
+			className={cn(
+				"h-7 w-full min-w-0 rounded-md border border-input bg-input/20 px-2 py-0.5 text-sm transition-colors outline-none file:inline-flex file:h-6 file:border-0 file:bg-transparent file:text-xs/relaxed file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/30 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-2 aria-invalid:ring-destructive/20 md:text-xs/relaxed dark:bg-input/30 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40",
+				className,
+			)}
+			{...props}
+		/>
+	)
 }
 
 export { Input }

apps/admin-dashboard/src/components/ui/label.tsx

@@ -1,22 +1,19 @@
-import * as React from "react"
 import { Label as LabelPrimitive } from "radix-ui"
+import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
-function Label({
-  className,
-  ...props
-}: React.ComponentProps<typeof LabelPrimitive.Root>) {
-  return (
-    <LabelPrimitive.Root
-      data-slot="label"
-      className={cn(
-        "flex items-center gap-2 text-xs/relaxed leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50",
-        className
-      )}
-      {...props}
-    />
-  )
+function Label({ className, ...props }: React.ComponentProps<typeof LabelPrimitive.Root>) {
+	return (
+		<LabelPrimitive.Root
+			data-slot="label"
+			className={cn(
+				"flex items-center gap-2 text-xs/relaxed leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50",
+				className,
+			)}
+			{...props}
+		/>
+	)
 }
 
 export { Label }

apps/admin-dashboard/src/components/ui/select.tsx

@@ -1,193 +1,183 @@
-import * as React from "react"
+import { ChevronDownIcon, CheckIcon, ChevronUpIcon } from "lucide-react"
 import { Select as SelectPrimitive } from "radix-ui"
+import * as React from "react"
 
 import { cn } from "@/lib/utils"
-import { ChevronDownIcon, CheckIcon, ChevronUpIcon } from "lucide-react"
 
-function Select({
-  ...props
-}: React.ComponentProps<typeof SelectPrimitive.Root>) {
-  return <SelectPrimitive.Root data-slot="select" {...props} />
+function Select({ ...props }: React.ComponentProps<typeof SelectPrimitive.Root>) {
+	return <SelectPrimitive.Root data-slot="select" {...props} />
 }
 
-function SelectGroup({
-  className,
-  ...props
-}: React.ComponentProps<typeof SelectPrimitive.Group>) {
-  return (
-    <SelectPrimitive.Group
-      data-slot="select-group"
-      className={cn("scroll-my-1 p-1", className)}
-      {...props}
-    />
-  )
+function SelectGroup({ className, ...props }: React.ComponentProps<typeof SelectPrimitive.Group>) {
+	return (
+		<SelectPrimitive.Group
+			data-slot="select-group"
+			className={cn("scroll-my-1 p-1", className)}
+			{...props}
+		/>
+	)
 }
 
-function SelectValue({
-  ...props
-}: React.ComponentProps<typeof SelectPrimitive.Value>) {
-  return <SelectPrimitive.Value data-slot="select-value" {...props} />
+function SelectValue({ ...props }: React.ComponentProps<typeof SelectPrimitive.Value>) {
+	return <SelectPrimitive.Value data-slot="select-value" {...props} />
 }
 
 function SelectTrigger({
-  className,
-  size = "default",
-  children,
-  ...props
+	className,
+	size = "default",
+	children,
+	...props
 }: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
-  size?: "sm" | "default"
+	size?: "sm" | "default"
 }) {
-  return (
-    <SelectPrimitive.Trigger
-      data-slot="select-trigger"
-      data-size={size}
-      className={cn(
-        "flex w-fit items-center justify-between gap-1.5 rounded-md border border-input bg-input/20 px-2 py-1.5 text-xs/relaxed whitespace-nowrap transition-colors outline-none focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/30 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-2 aria-invalid:ring-destructive/20 data-placeholder:text-muted-foreground data-[size=default]:h-7 data-[size=sm]:h-6 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-1.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
-        className
-      )}
-      {...props}
-    >
-      {children}
-      <SelectPrimitive.Icon asChild>
-        <ChevronDownIcon className="pointer-events-none size-3.5 text-muted-foreground" />
-      </SelectPrimitive.Icon>
-    </SelectPrimitive.Trigger>
-  )
+	return (
+		<SelectPrimitive.Trigger
+			data-slot="select-trigger"
+			data-size={size}
+			className={cn(
+				"flex w-fit items-center justify-between gap-1.5 rounded-md border border-input bg-input/20 px-2 py-1.5 text-xs/relaxed whitespace-nowrap transition-colors outline-none focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/30 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-2 aria-invalid:ring-destructive/20 data-placeholder:text-muted-foreground data-[size=default]:h-7 data-[size=sm]:h-6 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-1.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
+				className,
+			)}
+			{...props}
+		>
+			{children}
+			<SelectPrimitive.Icon asChild>
+				<ChevronDownIcon className="pointer-events-none size-3.5 text-muted-foreground" />
+			</SelectPrimitive.Icon>
+		</SelectPrimitive.Trigger>
+	)
 }
 
 function SelectContent({
-  className,
-  children,
-  position = "item-aligned",
-  align = "center",
-  ...props
+	className,
+	children,
+	position = "item-aligned",
+	align = "center",
+	...props
 }: React.ComponentProps<typeof SelectPrimitive.Content>) {
-  return (
-    <SelectPrimitive.Portal>
-      <SelectPrimitive.Content
-        data-slot="select-content"
-        data-align-trigger={position === "item-aligned"}
-        className={cn("relative z-50 max-h-(--radix-select-content-available-height) min-w-32 origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg bg-popover text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95", position ==="popper"&&"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1", className )}
-        position={position}
-        align={align}
-        {...props}
-      >
-        <SelectScrollUpButton />
-        <SelectPrimitive.Viewport
-          data-position={position}
-          className={cn(
-            "data-[position=popper]:h-(--radix-select-trigger-height) data-[position=popper]:w-full data-[position=popper]:min-w-(--radix-select-trigger-width)",
-            position === "popper" && ""
-          )}
-        >
-          {children}
-        </SelectPrimitive.Viewport>
-        <SelectScrollDownButton />
-      </SelectPrimitive.Content>
-    </SelectPrimitive.Portal>
-  )
+	return (
+		<SelectPrimitive.Portal>
+			<SelectPrimitive.Content
+				data-slot="select-content"
+				data-align-trigger={position === "item-aligned"}
+				className={cn(
+					"relative z-50 max-h-(--radix-select-content-available-height) min-w-32 origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg bg-popover text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
+					position === "popper" &&
+						"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+					className,
+				)}
+				position={position}
+				align={align}
+				{...props}
+			>
+				<SelectScrollUpButton />
+				<SelectPrimitive.Viewport
+					data-position={position}
+					className={cn(
+						"data-[position=popper]:h-(--radix-select-trigger-height) data-[position=popper]:w-full data-[position=popper]:min-w-(--radix-select-trigger-width)",
+						position === "popper" && "",
+					)}
+				>
+					{children}
+				</SelectPrimitive.Viewport>
+				<SelectScrollDownButton />
+			</SelectPrimitive.Content>
+		</SelectPrimitive.Portal>
+	)
 }
 
-function SelectLabel({
-  className,
-  ...props
-}: React.ComponentProps<typeof SelectPrimitive.Label>) {
-  return (
-    <SelectPrimitive.Label
-      data-slot="select-label"
-      className={cn("px-2 py-1.5 text-xs text-muted-foreground", className)}
-      {...props}
-    />
-  )
+function SelectLabel({ className, ...props }: React.ComponentProps<typeof SelectPrimitive.Label>) {
+	return (
+		<SelectPrimitive.Label
+			data-slot="select-label"
+			className={cn("px-2 py-1.5 text-xs text-muted-foreground", className)}
+			{...props}
+		/>
+	)
 }
 
 function SelectItem({
-  className,
-  children,
-  ...props
+	className,
+	children,
+	...props
 }: React.ComponentProps<typeof SelectPrimitive.Item>) {
-  return (
-    <SelectPrimitive.Item
-      data-slot="select-item"
-      className={cn(
-        "relative flex min-h-7 w-full cursor-default items-center gap-2 rounded-md px-2 py-1 text-xs/relaxed outline-hidden select-none focus:bg-accent focus:text-accent-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
-        className
-      )}
-      {...props}
-    >
-      <span className="pointer-events-none absolute right-2 flex items-center justify-center">
-        <SelectPrimitive.ItemIndicator>
-          <CheckIcon className="pointer-events-none" />
-        </SelectPrimitive.ItemIndicator>
-      </span>
-      <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
-    </SelectPrimitive.Item>
-  )
+	return (
+		<SelectPrimitive.Item
+			data-slot="select-item"
+			className={cn(
+				"relative flex min-h-7 w-full cursor-default items-center gap-2 rounded-md px-2 py-1 text-xs/relaxed outline-hidden select-none focus:bg-accent focus:text-accent-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+				className,
+			)}
+			{...props}
+		>
+			<span className="pointer-events-none absolute right-2 flex items-center justify-center">
+				<SelectPrimitive.ItemIndicator>
+					<CheckIcon className="pointer-events-none" />
+				</SelectPrimitive.ItemIndicator>
+			</span>
+			<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+		</SelectPrimitive.Item>
+	)
 }
 
 function SelectSeparator({
-  className,
-  ...props
+	className,
+	...props
 }: React.ComponentProps<typeof SelectPrimitive.Separator>) {
-  return (
-    <SelectPrimitive.Separator
-      data-slot="select-separator"
-      className={cn(
-        "pointer-events-none -mx-1 my-1 h-px bg-border/50",
-        className
-      )}
-      {...props}
-    />
-  )
+	return (
+		<SelectPrimitive.Separator
+			data-slot="select-separator"
+			className={cn("pointer-events-none -mx-1 my-1 h-px bg-border/50", className)}
+			{...props}
+		/>
+	)
 }
 
 function SelectScrollUpButton({
-  className,
-  ...props
+	className,
+	...props
 }: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {
-  return (
-    <SelectPrimitive.ScrollUpButton
-      data-slot="select-scroll-up-button"
-      className={cn(
-        "z-10 flex cursor-default items-center justify-center bg-popover py-1 [&_svg:not([class*='size-'])]:size-3.5",
-        className
-      )}
-      {...props}
-    >
-      <ChevronUpIcon
-      />
-    </SelectPrimitive.ScrollUpButton>
-  )
+	return (
+		<SelectPrimitive.ScrollUpButton
+			data-slot="select-scroll-up-button"
+			className={cn(
+				"z-10 flex cursor-default items-center justify-center bg-popover py-1 [&_svg:not([class*='size-'])]:size-3.5",
+				className,
+			)}
+			{...props}
+		>
+			<ChevronUpIcon />
+		</SelectPrimitive.ScrollUpButton>
+	)
 }
 
 function SelectScrollDownButton({
-  className,
-  ...props
+	className,
+	...props
 }: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {
-  return (
-    <SelectPrimitive.ScrollDownButton
-      data-slot="select-scroll-down-button"
-      className={cn(
-        "z-10 flex cursor-default items-center justify-center bg-popover py-1 [&_svg:not([class*='size-'])]:size-3.5",
-        className
-      )}
-      {...props}
-    >
-      <ChevronDownIcon
-      />
-    </SelectPrimitive.ScrollDownButton>
-  )
+	return (
+		<SelectPrimitive.ScrollDownButton
+			data-slot="select-scroll-down-button"
+			className={cn(
+				"z-10 flex cursor-default items-center justify-center bg-popover py-1 [&_svg:not([class*='size-'])]:size-3.5",
+				className,
+			)}
+			{...props}
+		>
+			<ChevronDownIcon />
+		</SelectPrimitive.ScrollDownButton>
+	)
 }
 
 export {
-  Select,
-  SelectContent,
-  SelectGroup,
-  SelectItem,
-  SelectLabel,
-  SelectScrollDownButton,
-  SelectScrollUpButton,
-  SelectSeparator,
-  SelectTrigger,
-  SelectValue,
+	Select,
+	SelectContent,
+	SelectGroup,
+	SelectItem,
+	SelectLabel,
+	SelectScrollDownButton,
+	SelectScrollUpButton,
+	SelectSeparator,
+	SelectTrigger,
+	SelectValue,
 }

apps/admin-dashboard/src/components/ui/separator.tsx

@@ -1,26 +1,26 @@
-import * as React from "react"
 import { Separator as SeparatorPrimitive } from "radix-ui"
+import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
 function Separator({
-  className,
-  orientation = "horizontal",
-  decorative = true,
-  ...props
+	className,
+	orientation = "horizontal",
+	decorative = true,
+	...props
 }: React.ComponentProps<typeof SeparatorPrimitive.Root>) {
-  return (
-    <SeparatorPrimitive.Root
-      data-slot="separator"
-      decorative={decorative}
-      orientation={orientation}
-      className={cn(
-        "shrink-0 bg-border data-horizontal:h-px data-horizontal:w-full data-vertical:w-px data-vertical:self-stretch",
-        className
-      )}
-      {...props}
-    />
-  )
+	return (
+		<SeparatorPrimitive.Root
+			data-slot="separator"
+			decorative={decorative}
+			orientation={orientation}
+			className={cn(
+				"shrink-0 bg-border data-horizontal:h-px data-horizontal:w-full data-vertical:w-px data-vertical:self-stretch",
+				className,
+			)}
+			{...props}
+		/>
+	)
 }
 
 export { Separator }

apps/admin-dashboard/src/components/ui/sheet.tsx

@@ -1,142 +1,128 @@
-import * as React from "react"
-import { Dialog as SheetPrimitive } from "radix-ui"
-
-import { cn } from "@/lib/utils"
-import { Button } from "@/components/ui/button"
 import { XIcon } from "lucide-react"
+import { Dialog as SheetPrimitive } from "radix-ui"
+import * as React from "react"
+
+import { Button } from "@/components/ui/button"
+import { cn } from "@/lib/utils"
 
 function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {
-  return <SheetPrimitive.Root data-slot="sheet" {...props} />
+	return <SheetPrimitive.Root data-slot="sheet" {...props} />
 }
 
-function SheetTrigger({
-  ...props
-}: React.ComponentProps<typeof SheetPrimitive.Trigger>) {
-  return <SheetPrimitive.Trigger data-slot="sheet-trigger" {...props} />
+function SheetTrigger({ ...props }: React.ComponentProps<typeof SheetPrimitive.Trigger>) {
+	return <SheetPrimitive.Trigger data-slot="sheet-trigger" {...props} />
 }
 
-function SheetClose({
-  ...props
-}: React.ComponentProps<typeof SheetPrimitive.Close>) {
-  return <SheetPrimitive.Close data-slot="sheet-close" {...props} />
+function SheetClose({ ...props }: React.ComponentProps<typeof SheetPrimitive.Close>) {
+	return <SheetPrimitive.Close data-slot="sheet-close" {...props} />
 }
 
-function SheetPortal({
-  ...props
-}: React.ComponentProps<typeof SheetPrimitive.Portal>) {
-  return <SheetPrimitive.Portal data-slot="sheet-portal" {...props} />
+function SheetPortal({ ...props }: React.ComponentProps<typeof SheetPrimitive.Portal>) {
+	return <SheetPrimitive.Portal data-slot="sheet-portal" {...props} />
 }
 
 function SheetOverlay({
-  className,
-  ...props
+	className,
+	...props
 }: React.ComponentProps<typeof SheetPrimitive.Overlay>) {
-  return (
-    <SheetPrimitive.Overlay
-      data-slot="sheet-overlay"
-      className={cn(
-        "fixed inset-0 z-50 bg-black/80 duration-100 supports-backdrop-filter:backdrop-blur-xs data-open:animate-in data-open:fade-in-0 data-closed:animate-out data-closed:fade-out-0",
-        className
-      )}
-      {...props}
-    />
-  )
+	return (
+		<SheetPrimitive.Overlay
+			data-slot="sheet-overlay"
+			className={cn(
+				"fixed inset-0 z-50 bg-black/80 duration-100 supports-backdrop-filter:backdrop-blur-xs data-open:animate-in data-open:fade-in-0 data-closed:animate-out data-closed:fade-out-0",
+				className,
+			)}
+			{...props}
+		/>
+	)
 }
 
 function SheetContent({
-  className,
-  children,
-  side = "right",
-  showCloseButton = true,
-  ...props
+	className,
+	children,
+	side = "right",
+	showCloseButton = true,
+	...props
 }: React.ComponentProps<typeof SheetPrimitive.Content> & {
-  side?: "top" | "right" | "bottom" | "left"
-  showCloseButton?: boolean
+	side?: "top" | "right" | "bottom" | "left"
+	showCloseButton?: boolean
 }) {
-  return (
-    <SheetPortal>
-      <SheetOverlay />
-      <SheetPrimitive.Content
-        data-slot="sheet-content"
-        data-side={side}
-        className={cn(
-          "fixed z-50 flex flex-col bg-background bg-clip-padding text-xs/relaxed shadow-lg transition duration-200 ease-in-out data-[side=bottom]:inset-x-0 data-[side=bottom]:bottom-0 data-[side=bottom]:h-auto data-[side=bottom]:border-t data-[side=left]:inset-y-0 data-[side=left]:left-0 data-[side=left]:h-full data-[side=left]:w-3/4 data-[side=left]:border-r data-[side=right]:inset-y-0 data-[side=right]:right-0 data-[side=right]:h-full data-[side=right]:w-3/4 data-[side=right]:border-l data-[side=top]:inset-x-0 data-[side=top]:top-0 data-[side=top]:h-auto data-[side=top]:border-b data-[side=left]:sm:max-w-sm data-[side=right]:sm:max-w-sm data-open:animate-in data-open:fade-in-0 data-[side=bottom]:data-open:slide-in-from-bottom-10 data-[side=left]:data-open:slide-in-from-left-10 data-[side=right]:data-open:slide-in-from-right-10 data-[side=top]:data-open:slide-in-from-top-10 data-closed:animate-out data-closed:fade-out-0 data-[side=bottom]:data-closed:slide-out-to-bottom-10 data-[side=left]:data-closed:slide-out-to-left-10 data-[side=right]:data-closed:slide-out-to-right-10 data-[side=top]:data-closed:slide-out-to-top-10",
-          className
-        )}
-        {...props}
-      >
-        {children}
-        {showCloseButton && (
-          <SheetPrimitive.Close data-slot="sheet-close" asChild>
-            <Button
-              variant="ghost"
-              className="absolute top-4 right-4"
-              size="icon-sm"
-            >
-              <XIcon
-              />
-              <span className="sr-only">Close</span>
-            </Button>
-          </SheetPrimitive.Close>
-        )}
-      </SheetPrimitive.Content>
-    </SheetPortal>
-  )
+	return (
+		<SheetPortal>
+			<SheetOverlay />
+			<SheetPrimitive.Content
+				data-slot="sheet-content"
+				data-side={side}
+				className={cn(
+					"fixed z-50 flex flex-col bg-background bg-clip-padding text-xs/relaxed shadow-lg transition duration-200 ease-in-out data-[side=bottom]:inset-x-0 data-[side=bottom]:bottom-0 data-[side=bottom]:h-auto data-[side=bottom]:border-t data-[side=left]:inset-y-0 data-[side=left]:left-0 data-[side=left]:h-full data-[side=left]:w-3/4 data-[side=left]:border-r data-[side=right]:inset-y-0 data-[side=right]:right-0 data-[side=right]:h-full data-[side=right]:w-3/4 data-[side=right]:border-l data-[side=top]:inset-x-0 data-[side=top]:top-0 data-[side=top]:h-auto data-[side=top]:border-b data-[side=left]:sm:max-w-sm data-[side=right]:sm:max-w-sm data-open:animate-in data-open:fade-in-0 data-[side=bottom]:data-open:slide-in-from-bottom-10 data-[side=left]:data-open:slide-in-from-left-10 data-[side=right]:data-open:slide-in-from-right-10 data-[side=top]:data-open:slide-in-from-top-10 data-closed:animate-out data-closed:fade-out-0 data-[side=bottom]:data-closed:slide-out-to-bottom-10 data-[side=left]:data-closed:slide-out-to-left-10 data-[side=right]:data-closed:slide-out-to-right-10 data-[side=top]:data-closed:slide-out-to-top-10",
+					className,
+				)}
+				{...props}
+			>
+				{children}
+				{showCloseButton && (
+					<SheetPrimitive.Close data-slot="sheet-close" asChild>
+						<Button variant="ghost" className="absolute top-4 right-4" size="icon-sm">
+							<XIcon />
+							<span className="sr-only">Close</span>
+						</Button>
+					</SheetPrimitive.Close>
+				)}
+			</SheetPrimitive.Content>
+		</SheetPortal>
+	)
 }
 
 function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="sheet-header"
-      className={cn("flex flex-col gap-1.5 p-6", className)}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="sheet-header"
+			className={cn("flex flex-col gap-1.5 p-6", className)}
+			{...props}
+		/>
+	)
 }
 
 function SheetFooter({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="sheet-footer"
-      className={cn("mt-auto flex flex-col gap-2 p-6", className)}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="sheet-footer"
+			className={cn("mt-auto flex flex-col gap-2 p-6", className)}
+			{...props}
+		/>
+	)
 }
 
-function SheetTitle({
-  className,
-  ...props
-}: React.ComponentProps<typeof SheetPrimitive.Title>) {
-  return (
-    <SheetPrimitive.Title
-      data-slot="sheet-title"
-      className={cn("text-sm font-medium text-foreground", className)}
-      {...props}
-    />
-  )
+function SheetTitle({ className, ...props }: React.ComponentProps<typeof SheetPrimitive.Title>) {
+	return (
+		<SheetPrimitive.Title
+			data-slot="sheet-title"
+			className={cn("text-sm font-medium text-foreground", className)}
+			{...props}
+		/>
+	)
 }
 
 function SheetDescription({
-  className,
-  ...props
+	className,
+	...props
 }: React.ComponentProps<typeof SheetPrimitive.Description>) {
-  return (
-    <SheetPrimitive.Description
-      data-slot="sheet-description"
-      className={cn("text-xs/relaxed text-muted-foreground", className)}
-      {...props}
-    />
-  )
+	return (
+		<SheetPrimitive.Description
+			data-slot="sheet-description"
+			className={cn("text-xs/relaxed text-muted-foreground", className)}
+			{...props}
+		/>
+	)
 }
 
 export {
-  Sheet,
-  SheetTrigger,
-  SheetClose,
-  SheetContent,
-  SheetHeader,
-  SheetFooter,
-  SheetTitle,
-  SheetDescription,
+	Sheet,
+	SheetTrigger,
+	SheetClose,
+	SheetContent,
+	SheetHeader,
+	SheetFooter,
+	SheetTitle,
+	SheetDescription,
 }

apps/admin-dashboard/src/components/ui/skeleton.tsx

@@ -1,13 +1,13 @@
 import { cn } from "@/lib/utils"
 
 function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="skeleton"
-      className={cn("animate-pulse rounded-md bg-muted", className)}
-      {...props}
-    />
-  )
+	return (
+		<div
+			data-slot="skeleton"
+			className={cn("animate-pulse rounded-md bg-muted", className)}
+			{...props}
+		/>
+	)
 }
 
 export { Skeleton }

apps/admin-dashboard/src/components/ui/sonner.tsx

@@ -1,49 +1,46 @@
 "use client"
 
-import { useTheme } from "@/components/theme-provider"
+import {
+	CircleCheckIcon,
+	InfoIcon,
+	TriangleAlertIcon,
+	OctagonXIcon,
+	Loader2Icon,
+} from "lucide-react"
 import { Toaster as Sonner, type ToasterProps } from "sonner"
-import { CircleCheckIcon, InfoIcon, TriangleAlertIcon, OctagonXIcon, Loader2Icon } from "lucide-react"
+
+import { useTheme } from "@/components/theme-provider"
 
 const Toaster = ({ ...props }: ToasterProps) => {
-  const { theme = "system" } = useTheme()
+	const { theme = "system" } = useTheme()
 
-  return (
-    <Sonner
-      theme={theme as ToasterProps["theme"]}
-      className="toaster group"
-      icons={{
-        success: (
-          <CircleCheckIcon className="size-4" />
-        ),
-        info: (
-          <InfoIcon className="size-4" />
-        ),
-        warning: (
-          <TriangleAlertIcon className="size-4" />
-        ),
-        error: (
-          <OctagonXIcon className="size-4" />
-        ),
-        loading: (
-          <Loader2Icon className="size-4 animate-spin" />
-        ),
-      }}
-      style={
-        {
-          "--normal-bg": "var(--popover)",
-          "--normal-text": "var(--popover-foreground)",
-          "--normal-border": "var(--border)",
-          "--border-radius": "var(--radius)",
-        } as React.CSSProperties
-      }
-      toastOptions={{
-        classNames: {
-          toast: "cn-toast",
-        },
-      }}
-      {...props}
-    />
-  )
+	return (
+		<Sonner
+			theme={theme as ToasterProps["theme"]}
+			className="toaster group"
+			icons={{
+				success: <CircleCheckIcon className="size-4" />,
+				info: <InfoIcon className="size-4" />,
+				warning: <TriangleAlertIcon className="size-4" />,
+				error: <OctagonXIcon className="size-4" />,
+				loading: <Loader2Icon className="size-4 animate-spin" />,
+			}}
+			style={
+				{
+					"--normal-bg": "var(--popover)",
+					"--normal-text": "var(--popover-foreground)",
+					"--normal-border": "var(--border)",
+					"--border-radius": "var(--radius)",
+				} as React.CSSProperties
+			}
+			toastOptions={{
+				classNames: {
+					toast: "cn-toast",
+				},
+			}}
+			{...props}
+		/>
+	)
 }
 
 export { Toaster }

apps/admin-dashboard/src/components/ui/switch.tsx

@@ -1,33 +1,33 @@
 "use client"
 
-import * as React from "react"
 import { Switch as SwitchPrimitive } from "radix-ui"
+import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
 function Switch({
-  className,
-  size = "default",
-  ...props
+	className,
+	size = "default",
+	...props
 }: React.ComponentProps<typeof SwitchPrimitive.Root> & {
-  size?: "sm" | "default"
+	size?: "sm" | "default"
 }) {
-  return (
-    <SwitchPrimitive.Root
-      data-slot="switch"
-      data-size={size}
-      className={cn(
-        "peer group/switch relative inline-flex shrink-0 items-center rounded-full border border-transparent transition-all outline-none after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/30 aria-invalid:border-destructive aria-invalid:ring-2 aria-invalid:ring-destructive/20 data-[size=default]:h-[16.6px] data-[size=default]:w-[28px] data-[size=sm]:h-[14px] data-[size=sm]:w-[24px] dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 data-checked:bg-primary data-unchecked:bg-input dark:data-unchecked:bg-input/80 data-disabled:cursor-not-allowed data-disabled:opacity-50",
-        className
-      )}
-      {...props}
-    >
-      <SwitchPrimitive.Thumb
-        data-slot="switch-thumb"
-        className="pointer-events-none block rounded-full bg-background ring-0 transition-transform group-data-[size=default]/switch:size-3.5 group-data-[size=sm]/switch:size-3 group-data-[size=default]/switch:data-checked:translate-x-[calc(100%-2px)] group-data-[size=sm]/switch:data-checked:translate-x-[calc(100%-2px)] dark:data-checked:bg-primary-foreground group-data-[size=default]/switch:data-unchecked:translate-x-0 group-data-[size=sm]/switch:data-unchecked:translate-x-0 dark:data-unchecked:bg-foreground"
-      />
-    </SwitchPrimitive.Root>
-  )
+	return (
+		<SwitchPrimitive.Root
+			data-slot="switch"
+			data-size={size}
+			className={cn(
+				"peer group/switch relative inline-flex shrink-0 items-center rounded-full border border-transparent transition-all outline-none after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/30 aria-invalid:border-destructive aria-invalid:ring-2 aria-invalid:ring-destructive/20 data-[size=default]:h-[16.6px] data-[size=default]:w-[28px] data-[size=sm]:h-[14px] data-[size=sm]:w-[24px] dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 data-checked:bg-primary data-unchecked:bg-input dark:data-unchecked:bg-input/80 data-disabled:cursor-not-allowed data-disabled:opacity-50",
+				className,
+			)}
+			{...props}
+		>
+			<SwitchPrimitive.Thumb
+				data-slot="switch-thumb"
+				className="pointer-events-none block rounded-full bg-background ring-0 transition-transform group-data-[size=default]/switch:size-3.5 group-data-[size=sm]/switch:size-3 group-data-[size=default]/switch:data-checked:translate-x-[calc(100%-2px)] group-data-[size=sm]/switch:data-checked:translate-x-[calc(100%-2px)] dark:data-checked:bg-primary-foreground group-data-[size=default]/switch:data-unchecked:translate-x-0 group-data-[size=sm]/switch:data-unchecked:translate-x-0 dark:data-unchecked:bg-foreground"
+			/>
+		</SwitchPrimitive.Root>
+	)
 }
 
 export { Switch }

apps/admin-dashboard/src/components/ui/tooltip.tsx

@@ -1,57 +1,53 @@
 "use client"
 
-import * as React from "react"
 import { Tooltip as TooltipPrimitive } from "radix-ui"
+import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
 function TooltipProvider({
-  delayDuration = 0,
-  ...props
+	delayDuration = 0,
+	...props
 }: React.ComponentProps<typeof TooltipPrimitive.Provider>) {
-  return (
-    <TooltipPrimitive.Provider
-      data-slot="tooltip-provider"
-      delayDuration={delayDuration}
-      {...props}
-    />
-  )
+	return (
+		<TooltipPrimitive.Provider
+			data-slot="tooltip-provider"
+			delayDuration={delayDuration}
+			{...props}
+		/>
+	)
 }
 
-function Tooltip({
-  ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Root>) {
-  return <TooltipPrimitive.Root data-slot="tooltip" {...props} />
+function Tooltip({ ...props }: React.ComponentProps<typeof TooltipPrimitive.Root>) {
+	return <TooltipPrimitive.Root data-slot="tooltip" {...props} />
 }
 
-function TooltipTrigger({
-  ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
-  return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />
+function TooltipTrigger({ ...props }: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
+	return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />
 }
 
 function TooltipContent({
-  className,
-  sideOffset = 0,
-  children,
-  ...props
+	className,
+	sideOffset = 0,
+	children,
+	...props
 }: React.ComponentProps<typeof TooltipPrimitive.Content>) {
-  return (
-    <TooltipPrimitive.Portal>
-      <TooltipPrimitive.Content
-        data-slot="tooltip-content"
-        sideOffset={sideOffset}
-        className={cn(
-          "z-50 inline-flex w-fit max-w-xs origin-(--radix-tooltip-content-transform-origin) items-center gap-1.5 rounded-md bg-foreground px-3 py-1.5 text-xs text-background has-data-[slot=kbd]:pr-1.5 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot=kbd]:relative **:data-[slot=kbd]:isolate **:data-[slot=kbd]:z-50 **:data-[slot=kbd]:rounded-sm data-[state=delayed-open]:animate-in data-[state=delayed-open]:fade-in-0 data-[state=delayed-open]:zoom-in-95 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
-          className
-        )}
-        {...props}
-      >
-        {children}
-        <TooltipPrimitive.Arrow className="z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px] bg-foreground fill-foreground" />
-      </TooltipPrimitive.Content>
-    </TooltipPrimitive.Portal>
-  )
+	return (
+		<TooltipPrimitive.Portal>
+			<TooltipPrimitive.Content
+				data-slot="tooltip-content"
+				sideOffset={sideOffset}
+				className={cn(
+					"z-50 inline-flex w-fit max-w-xs origin-(--radix-tooltip-content-transform-origin) items-center gap-1.5 rounded-md bg-foreground px-3 py-1.5 text-xs text-background has-data-[slot=kbd]:pr-1.5 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot=kbd]:relative **:data-[slot=kbd]:isolate **:data-[slot=kbd]:z-50 **:data-[slot=kbd]:rounded-sm data-[state=delayed-open]:animate-in data-[state=delayed-open]:fade-in-0 data-[state=delayed-open]:zoom-in-95 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
+					className,
+				)}
+				{...props}
+			>
+				{children}
+				<TooltipPrimitive.Arrow className="z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px] bg-foreground fill-foreground" />
+			</TooltipPrimitive.Content>
+		</TooltipPrimitive.Portal>
+	)
 }
 
 export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger }

apps/admin-dashboard/src/hooks/use-mobile.ts

@@ -3,17 +3,17 @@ import * as React from "react"
 const MOBILE_BREAKPOINT = 768
 
 export function useIsMobile() {
-  const [isMobile, setIsMobile] = React.useState<boolean | undefined>(undefined)
+	const [isMobile, setIsMobile] = React.useState<boolean | undefined>(undefined)
 
-  React.useEffect(() => {
-    const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`)
-    const onChange = () => {
-      setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
-    }
-    mql.addEventListener("change", onChange)
-    setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
-    return () => mql.removeEventListener("change", onChange)
-  }, [])
+	React.useEffect(() => {
+		const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`)
+		const onChange = () => {
+			setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
+		}
+		mql.addEventListener("change", onChange)
+		setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
+		return () => mql.removeEventListener("change", onChange)
+	}, [])
 
-  return !!isMobile
+	return !!isMobile
 }

apps/admin-dashboard/src/index.css

@@ -6,124 +6,124 @@
 @custom-variant dark (&:is(.dark *));
 
 :root {
-    --background: oklch(1 0 0);
-    --foreground: oklch(0.145 0 0);
-    --card: oklch(1 0 0);
-    --card-foreground: oklch(0.145 0 0);
-    --popover: oklch(1 0 0);
-    --popover-foreground: oklch(0.145 0 0);
-    --primary: oklch(0.511 0.096 186.391);
-    --primary-foreground: oklch(0.984 0.014 180.72);
-    --secondary: oklch(0.967 0.001 286.375);
-    --secondary-foreground: oklch(0.21 0.006 285.885);
-    --muted: oklch(0.97 0 0);
-    --muted-foreground: oklch(0.556 0 0);
-    --accent: oklch(0.97 0 0);
-    --accent-foreground: oklch(0.205 0 0);
-    --destructive: oklch(0.577 0.245 27.325);
-    --border: oklch(0.922 0 0);
-    --input: oklch(0.922 0 0);
-    --ring: oklch(0.708 0 0);
-    --chart-1: oklch(0.855 0.138 181.071);
-    --chart-2: oklch(0.704 0.14 182.503);
-    --chart-3: oklch(0.6 0.118 184.704);
-    --chart-4: oklch(0.511 0.096 186.391);
-    --chart-5: oklch(0.437 0.078 188.216);
-    --radius: 0.625rem;
-    --sidebar: oklch(0.985 0 0);
-    --sidebar-foreground: oklch(0.145 0 0);
-    --sidebar-primary: oklch(0.6 0.118 184.704);
-    --sidebar-primary-foreground: oklch(0.984 0.014 180.72);
-    --sidebar-accent: oklch(0.97 0 0);
-    --sidebar-accent-foreground: oklch(0.205 0 0);
-    --sidebar-border: oklch(0.922 0 0);
-    --sidebar-ring: oklch(0.708 0 0);
+	--background: oklch(1 0 0);
+	--foreground: oklch(0.145 0 0);
+	--card: oklch(1 0 0);
+	--card-foreground: oklch(0.145 0 0);
+	--popover: oklch(1 0 0);
+	--popover-foreground: oklch(0.145 0 0);
+	--primary: oklch(0.511 0.096 186.391);
+	--primary-foreground: oklch(0.984 0.014 180.72);
+	--secondary: oklch(0.967 0.001 286.375);
+	--secondary-foreground: oklch(0.21 0.006 285.885);
+	--muted: oklch(0.97 0 0);
+	--muted-foreground: oklch(0.556 0 0);
+	--accent: oklch(0.97 0 0);
+	--accent-foreground: oklch(0.205 0 0);
+	--destructive: oklch(0.577 0.245 27.325);
+	--border: oklch(0.922 0 0);
+	--input: oklch(0.922 0 0);
+	--ring: oklch(0.708 0 0);
+	--chart-1: oklch(0.855 0.138 181.071);
+	--chart-2: oklch(0.704 0.14 182.503);
+	--chart-3: oklch(0.6 0.118 184.704);
+	--chart-4: oklch(0.511 0.096 186.391);
+	--chart-5: oklch(0.437 0.078 188.216);
+	--radius: 0.625rem;
+	--sidebar: oklch(0.985 0 0);
+	--sidebar-foreground: oklch(0.145 0 0);
+	--sidebar-primary: oklch(0.6 0.118 184.704);
+	--sidebar-primary-foreground: oklch(0.984 0.014 180.72);
+	--sidebar-accent: oklch(0.97 0 0);
+	--sidebar-accent-foreground: oklch(0.205 0 0);
+	--sidebar-border: oklch(0.922 0 0);
+	--sidebar-ring: oklch(0.708 0 0);
 }
 
 .dark {
-    --background: oklch(0.145 0 0);
-    --foreground: oklch(0.985 0 0);
-    --card: oklch(0.205 0 0);
-    --card-foreground: oklch(0.985 0 0);
-    --popover: oklch(0.205 0 0);
-    --popover-foreground: oklch(0.985 0 0);
-    --primary: oklch(0.437 0.078 188.216);
-    --primary-foreground: oklch(0.984 0.014 180.72);
-    --secondary: oklch(0.274 0.006 286.033);
-    --secondary-foreground: oklch(0.985 0 0);
-    --muted: oklch(0.269 0 0);
-    --muted-foreground: oklch(0.708 0 0);
-    --accent: oklch(0.269 0 0);
-    --accent-foreground: oklch(0.985 0 0);
-    --destructive: oklch(0.704 0.191 22.216);
-    --border: oklch(1 0 0 / 10%);
-    --input: oklch(1 0 0 / 15%);
-    --ring: oklch(0.556 0 0);
-    --chart-1: oklch(0.855 0.138 181.071);
-    --chart-2: oklch(0.704 0.14 182.503);
-    --chart-3: oklch(0.6 0.118 184.704);
-    --chart-4: oklch(0.511 0.096 186.391);
-    --chart-5: oklch(0.437 0.078 188.216);
-    --sidebar: oklch(0.205 0 0);
-    --sidebar-foreground: oklch(0.985 0 0);
-    --sidebar-primary: oklch(0.704 0.14 182.503);
-    --sidebar-primary-foreground: oklch(0.277 0.046 192.524);
-    --sidebar-accent: oklch(0.269 0 0);
-    --sidebar-accent-foreground: oklch(0.985 0 0);
-    --sidebar-border: oklch(1 0 0 / 10%);
-    --sidebar-ring: oklch(0.556 0 0);
+	--background: oklch(0.145 0 0);
+	--foreground: oklch(0.985 0 0);
+	--card: oklch(0.205 0 0);
+	--card-foreground: oklch(0.985 0 0);
+	--popover: oklch(0.205 0 0);
+	--popover-foreground: oklch(0.985 0 0);
+	--primary: oklch(0.437 0.078 188.216);
+	--primary-foreground: oklch(0.984 0.014 180.72);
+	--secondary: oklch(0.274 0.006 286.033);
+	--secondary-foreground: oklch(0.985 0 0);
+	--muted: oklch(0.269 0 0);
+	--muted-foreground: oklch(0.708 0 0);
+	--accent: oklch(0.269 0 0);
+	--accent-foreground: oklch(0.985 0 0);
+	--destructive: oklch(0.704 0.191 22.216);
+	--border: oklch(1 0 0 / 10%);
+	--input: oklch(1 0 0 / 15%);
+	--ring: oklch(0.556 0 0);
+	--chart-1: oklch(0.855 0.138 181.071);
+	--chart-2: oklch(0.704 0.14 182.503);
+	--chart-3: oklch(0.6 0.118 184.704);
+	--chart-4: oklch(0.511 0.096 186.391);
+	--chart-5: oklch(0.437 0.078 188.216);
+	--sidebar: oklch(0.205 0 0);
+	--sidebar-foreground: oklch(0.985 0 0);
+	--sidebar-primary: oklch(0.704 0.14 182.503);
+	--sidebar-primary-foreground: oklch(0.277 0.046 192.524);
+	--sidebar-accent: oklch(0.269 0 0);
+	--sidebar-accent-foreground: oklch(0.985 0 0);
+	--sidebar-border: oklch(1 0 0 / 10%);
+	--sidebar-ring: oklch(0.556 0 0);
 }
 
 @theme inline {
-    --font-sans: 'Inter Variable', sans-serif;
-    --color-sidebar-ring: var(--sidebar-ring);
-    --color-sidebar-border: var(--sidebar-border);
-    --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
-    --color-sidebar-accent: var(--sidebar-accent);
-    --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
-    --color-sidebar-primary: var(--sidebar-primary);
-    --color-sidebar-foreground: var(--sidebar-foreground);
-    --color-sidebar: var(--sidebar);
-    --color-chart-5: var(--chart-5);
-    --color-chart-4: var(--chart-4);
-    --color-chart-3: var(--chart-3);
-    --color-chart-2: var(--chart-2);
-    --color-chart-1: var(--chart-1);
-    --color-ring: var(--ring);
-    --color-input: var(--input);
-    --color-border: var(--border);
-    --color-destructive: var(--destructive);
-    --color-accent-foreground: var(--accent-foreground);
-    --color-accent: var(--accent);
-    --color-muted-foreground: var(--muted-foreground);
-    --color-muted: var(--muted);
-    --color-secondary-foreground: var(--secondary-foreground);
-    --color-secondary: var(--secondary);
-    --color-primary-foreground: var(--primary-foreground);
-    --color-primary: var(--primary);
-    --color-popover-foreground: var(--popover-foreground);
-    --color-popover: var(--popover);
-    --color-card-foreground: var(--card-foreground);
-    --color-card: var(--card);
-    --color-foreground: var(--foreground);
-    --color-background: var(--background);
-    --radius-sm: calc(var(--radius) * 0.6);
-    --radius-md: calc(var(--radius) * 0.8);
-    --radius-lg: var(--radius);
-    --radius-xl: calc(var(--radius) * 1.4);
-    --radius-2xl: calc(var(--radius) * 1.8);
-    --radius-3xl: calc(var(--radius) * 2.2);
-    --radius-4xl: calc(var(--radius) * 2.6);
+	--font-sans: "Inter Variable", sans-serif;
+	--color-sidebar-ring: var(--sidebar-ring);
+	--color-sidebar-border: var(--sidebar-border);
+	--color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+	--color-sidebar-accent: var(--sidebar-accent);
+	--color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+	--color-sidebar-primary: var(--sidebar-primary);
+	--color-sidebar-foreground: var(--sidebar-foreground);
+	--color-sidebar: var(--sidebar);
+	--color-chart-5: var(--chart-5);
+	--color-chart-4: var(--chart-4);
+	--color-chart-3: var(--chart-3);
+	--color-chart-2: var(--chart-2);
+	--color-chart-1: var(--chart-1);
+	--color-ring: var(--ring);
+	--color-input: var(--input);
+	--color-border: var(--border);
+	--color-destructive: var(--destructive);
+	--color-accent-foreground: var(--accent-foreground);
+	--color-accent: var(--accent);
+	--color-muted-foreground: var(--muted-foreground);
+	--color-muted: var(--muted);
+	--color-secondary-foreground: var(--secondary-foreground);
+	--color-secondary: var(--secondary);
+	--color-primary-foreground: var(--primary-foreground);
+	--color-primary: var(--primary);
+	--color-popover-foreground: var(--popover-foreground);
+	--color-popover: var(--popover);
+	--color-card-foreground: var(--card-foreground);
+	--color-card: var(--card);
+	--color-foreground: var(--foreground);
+	--color-background: var(--background);
+	--radius-sm: calc(var(--radius) * 0.6);
+	--radius-md: calc(var(--radius) * 0.8);
+	--radius-lg: var(--radius);
+	--radius-xl: calc(var(--radius) * 1.4);
+	--radius-2xl: calc(var(--radius) * 1.8);
+	--radius-3xl: calc(var(--radius) * 2.2);
+	--radius-4xl: calc(var(--radius) * 2.6);
 }
 
 @layer base {
-  * {
-    @apply border-border outline-ring/50;
-    }
-  body {
-    @apply bg-background text-foreground select-none;
-    }
-  html {
-    @apply font-sans;
-    }
-}
+	* {
+		@apply border-border outline-ring/50;
+	}
+	body {
+		@apply bg-background text-foreground select-none;
+	}
+	html {
+		@apply font-sans;
+	}
+}

apps/admin-dashboard/src/lib/api.ts

@@ -1,164 +1,273 @@
 import { getServerUrl } from "./server-url"
 
 function apiBase() {
-  return `${getServerUrl()}/api/admin`
+	return `${getServerUrl()}/api/admin`
 }
 
 function serverBase() {
-  return `${getServerUrl()}/api`
+	return `${getServerUrl()}/api`
 }
 
 export interface ConfigFieldDef {
-  type: "string" | "number" | "select"
-  label: string
-  required?: boolean
-  description?: string
-  secret?: boolean
-  defaultValue?: string | number
-  options?: { label: string; value: string }[]
+	type: "string" | "number" | "select" | "multiselect"
+	label: string
+	required?: boolean
+	description?: string
+	secret?: boolean
+	defaultValue?: string | number | string[]
+	options?: { label: string; value: string }[]
 }
 
 export interface SourceDefinition {
-  id: string
-  name: string
-  description: string
-  alwaysEnabled?: boolean
-  fields: Record<string, ConfigFieldDef>
+	id: string
+	name: string
+	description: string
+	alwaysEnabled?: boolean
+	/** When true, secret fields are stored as per-user credentials via /api/sources/:id/credentials. */
+	perUserCredentials?: boolean
+	fields: Record<string, ConfigFieldDef>
 }
 
 export interface SourceConfig {
-  sourceId: string
-  enabled: boolean
-  config: Record<string, unknown>
+	sourceId: string
+	enabled: boolean
+	config: Record<string, unknown>
 }
 
 const sourceDefinitions: SourceDefinition[] = [
-  {
-    id: "aelis.location",
-    name: "Location",
-    description: "Device location provider. Always enabled as a dependency for other sources.",
-    alwaysEnabled: true,
-    fields: {},
-  },
-  {
-    id: "aelis.weather",
-    name: "WeatherKit",
-    description: "Apple WeatherKit weather data. Requires Apple Developer credentials.",
-    fields: {
-      privateKey: { type: "string", label: "Private Key", required: true, secret: true, description: "Apple WeatherKit private key (PEM format)" },
-      keyId: { type: "string", label: "Key ID", required: true, secret: true },
-      teamId: { type: "string", label: "Team ID", required: true, secret: true },
-      serviceId: { type: "string", label: "Service ID", required: true, secret: true },
-      units: { type: "select", label: "Units", options: [{ label: "Metric", value: "metric" }, { label: "Imperial", value: "imperial" }], defaultValue: "metric" },
-      hourlyLimit: { type: "number", label: "Hourly Forecast Limit", defaultValue: 12, description: "Number of hourly forecasts to include" },
-      dailyLimit: { type: "number", label: "Daily Forecast Limit", defaultValue: 7, description: "Number of daily forecasts to include" },
-    },
-  },
+	{
+		id: "freya.location",
+		name: "Location",
+		description: "Device location provider. Always enabled as a dependency for other sources.",
+		alwaysEnabled: true,
+		fields: {},
+	},
+	{
+		id: "freya.weather",
+		name: "WeatherKit",
+		description: "Apple WeatherKit weather data. Requires Apple Developer credentials.",
+		fields: {
+			privateKey: {
+				type: "string",
+				label: "Private Key",
+				required: true,
+				secret: true,
+				description: "Apple WeatherKit private key (PEM format)",
+			},
+			keyId: { type: "string", label: "Key ID", required: true, secret: true },
+			teamId: { type: "string", label: "Team ID", required: true, secret: true },
+			serviceId: { type: "string", label: "Service ID", required: true, secret: true },
+			units: {
+				type: "select",
+				label: "Units",
+				options: [
+					{ label: "Metric", value: "metric" },
+					{ label: "Imperial", value: "imperial" },
+				],
+				defaultValue: "metric",
+			},
+			hourlyLimit: {
+				type: "number",
+				label: "Hourly Forecast Limit",
+				defaultValue: 12,
+				description: "Number of hourly forecasts to include",
+			},
+			dailyLimit: {
+				type: "number",
+				label: "Daily Forecast Limit",
+				defaultValue: 7,
+				description: "Number of daily forecasts to include",
+			},
+		},
+	},
+	{
+		id: "freya.caldav",
+		name: "CalDAV",
+		description: "Calendar events from any CalDAV server (Nextcloud, Radicale, Baikal, etc.).",
+		perUserCredentials: true,
+		fields: {
+			serverUrl: {
+				type: "string",
+				label: "Server URL",
+				required: true,
+				secret: false,
+				description: "CalDAV server URL (e.g. https://nextcloud.example.com/remote.php/dav)",
+			},
+			username: {
+				type: "string",
+				label: "Username",
+				required: true,
+				secret: false,
+			},
+			password: {
+				type: "string",
+				label: "Password",
+				required: true,
+				secret: true,
+			},
+			lookAheadDays: {
+				type: "number",
+				label: "Look-ahead Days",
+				defaultValue: 0,
+				description: "Number of additional days beyond today to fetch events for",
+			},
+			timeZone: {
+				type: "string",
+				label: "Timezone",
+				description: 'IANA timezone for determining "today" (e.g. Europe/London). Defaults to UTC.',
+			},
+		},
+	},
+	{
+		id: "freya.tfl",
+		name: "TfL",
+		description: "Transport for London tube line status alerts.",
+		fields: {
+			lines: {
+				type: "multiselect",
+				label: "Lines",
+				description: "Lines to monitor. Leave empty for all lines.",
+				defaultValue: [],
+				options: [
+					{ label: "Bakerloo", value: "bakerloo" },
+					{ label: "Central", value: "central" },
+					{ label: "Circle", value: "circle" },
+					{ label: "District", value: "district" },
+					{ label: "Hammersmith & City", value: "hammersmith-city" },
+					{ label: "Jubilee", value: "jubilee" },
+					{ label: "Metropolitan", value: "metropolitan" },
+					{ label: "Northern", value: "northern" },
+					{ label: "Piccadilly", value: "piccadilly" },
+					{ label: "Victoria", value: "victoria" },
+					{ label: "Waterloo & City", value: "waterloo-city" },
+					{ label: "Lioness", value: "lioness" },
+					{ label: "Mildmay", value: "mildmay" },
+					{ label: "Windrush", value: "windrush" },
+					{ label: "Weaver", value: "weaver" },
+					{ label: "Suffragette", value: "suffragette" },
+					{ label: "Liberty", value: "liberty" },
+					{ label: "Elizabeth", value: "elizabeth" },
+				],
+			},
+		},
+	},
 ]
 
 export function fetchSources(): Promise<SourceDefinition[]> {
-  return Promise.resolve(sourceDefinitions)
+	return Promise.resolve(sourceDefinitions)
 }
 
-export async function fetchSourceConfig(
-  sourceId: string,
-): Promise<SourceConfig | null> {
-  const res = await fetch(`${serverBase()}/sources/${sourceId}`, {
-    credentials: "include",
-  })
-  if (res.status === 404) return null
-  if (!res.ok) throw new Error(`Failed to fetch source config: ${res.status}`)
-  const data = (await res.json()) as { enabled: boolean; config: Record<string, unknown> }
-  return { sourceId, enabled: data.enabled, config: data.config }
+export async function fetchSourceConfig(sourceId: string): Promise<SourceConfig | null> {
+	const res = await fetch(`${serverBase()}/sources/${sourceId}`, {
+		credentials: "include",
+	})
+	if (res.status === 404) return null
+	if (!res.ok) throw new Error(`Failed to fetch source config: ${res.status}`)
+	const data = (await res.json()) as { enabled: boolean; config: Record<string, unknown> }
+	return { sourceId, enabled: data.enabled, config: data.config }
 }
 
 export async function fetchConfigs(): Promise<SourceConfig[]> {
-  const results = await Promise.all(
-    sourceDefinitions.map((s) => fetchSourceConfig(s.id)),
-  )
-  return results.filter((c): c is SourceConfig => c !== null)
+	const results = await Promise.all(sourceDefinitions.map((s) => fetchSourceConfig(s.id)))
+	return results.filter((c): c is SourceConfig => c !== null)
 }
 
 export async function replaceSource(
-  sourceId: string,
-  body: { enabled: boolean; config: unknown },
+	sourceId: string,
+	body: { enabled: boolean; config: unknown; credentials?: Record<string, unknown> },
 ): Promise<void> {
-  const res = await fetch(`${serverBase()}/sources/${sourceId}`, {
-    method: "PUT",
-    headers: { "Content-Type": "application/json" },
-    credentials: "include",
-    body: JSON.stringify(body),
-  })
-  if (!res.ok) {
-    const data = (await res.json()) as { error?: string }
-    throw new Error(data.error ?? `Failed to replace source config: ${res.status}`)
-  }
+	const res = await fetch(`${serverBase()}/sources/${sourceId}`, {
+		method: "PUT",
+		headers: { "Content-Type": "application/json" },
+		credentials: "include",
+		body: JSON.stringify(body),
+	})
+	if (!res.ok) {
+		const data = (await res.json()) as { error?: string }
+		throw new Error(data.error ?? `Failed to replace source config: ${res.status}`)
+	}
 }
 
 export async function updateProviderConfig(
-  sourceId: string,
-  body: Record<string, unknown>,
+	sourceId: string,
+	body: Record<string, unknown>,
 ): Promise<void> {
-  const res = await fetch(`${apiBase()}/${sourceId}/config`, {
-    method: "PUT",
-    headers: { "Content-Type": "application/json" },
-    credentials: "include",
-    body: JSON.stringify(body),
-  })
-  if (!res.ok) {
-    const data = (await res.json()) as { error?: string }
-    throw new Error(data.error ?? `Failed to update provider config: ${res.status}`)
-  }
+	const res = await fetch(`${apiBase()}/${sourceId}/config`, {
+		method: "PUT",
+		headers: { "Content-Type": "application/json" },
+		credentials: "include",
+		body: JSON.stringify(body),
+	})
+	if (!res.ok) {
+		const data = (await res.json()) as { error?: string }
+		throw new Error(data.error ?? `Failed to update provider config: ${res.status}`)
+	}
+}
+
+export async function updateSourceCredentials(
+	sourceId: string,
+	credentials: Record<string, unknown>,
+): Promise<void> {
+	const res = await fetch(`${serverBase()}/sources/${sourceId}/credentials`, {
+		method: "PUT",
+		headers: { "Content-Type": "application/json" },
+		credentials: "include",
+		body: JSON.stringify(credentials),
+	})
+	if (!res.ok) {
+		const data = (await res.json()) as { error?: string }
+		throw new Error(data.error ?? `Failed to update credentials: ${res.status}`)
+	}
 }
 
 export interface LocationInput {
-  lat: number
-  lng: number
-  accuracy: number
+	lat: number
+	lng: number
+	accuracy: number
 }
 
 export async function pushLocation(location: LocationInput): Promise<void> {
-  const res = await fetch(`${serverBase()}/location`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    credentials: "include",
-    body: JSON.stringify({
-      ...location,
-      timestamp: new Date().toISOString(),
-    }),
-  })
-  if (!res.ok) {
-    const data = (await res.json()) as { error?: string }
-    throw new Error(data.error ?? `Failed to push location: ${res.status}`)
-  }
+	const res = await fetch(`${serverBase()}/location`, {
+		method: "POST",
+		headers: { "Content-Type": "application/json" },
+		credentials: "include",
+		body: JSON.stringify({
+			...location,
+			timestamp: new Date().toISOString(),
+		}),
+	})
+	if (!res.ok) {
+		const data = (await res.json()) as { error?: string }
+		throw new Error(data.error ?? `Failed to push location: ${res.status}`)
+	}
 }
 
 export interface FeedItemSlot {
-  description: string
-  content: string | null
+	description: string
+	content: string | null
 }
 
 export interface FeedItem {
-  id: string
-  sourceId: string
-  type: string
-  timestamp: string
-  data: Record<string, unknown>
-  signals?: {
-    urgency?: number
-    timeRelevance?: string
-  }
-  slots?: Record<string, FeedItemSlot>
-  ui?: unknown
+	id: string
+	sourceId: string
+	type: string
+	timestamp: string
+	data: Record<string, unknown>
+	signals?: {
+		urgency?: number
+		timeRelevance?: string
+	}
+	slots?: Record<string, FeedItemSlot>
+	ui?: unknown
 }
 
 export interface FeedResponse {
-  items: FeedItem[]
-  errors: { sourceId: string; error: string }[]
+	items: FeedItem[]
+	errors: { sourceId: string; error: string }[]
 }
 
 export async function fetchFeed(): Promise<FeedResponse> {
-  const res = await fetch(`${serverBase()}/feed`, { credentials: "include" })
-  if (!res.ok) throw new Error(`Failed to fetch feed: ${res.status}`)
-  return res.json() as Promise<FeedResponse>
+	const res = await fetch(`${serverBase()}/feed`, { credentials: "include" })
+	if (!res.ok) throw new Error(`Failed to fetch feed: ${res.status}`)
+	return res.json() as Promise<FeedResponse>
 }

apps/admin-dashboard/src/lib/auth.ts

@@ -1,47 +1,47 @@
 import { getServerUrl } from "./server-url"
 
 function authBase() {
-  return `${getServerUrl()}/api/auth`
+	return `${getServerUrl()}/api/auth`
 }
 
 export interface AuthUser {
-  id: string
-  name: string
-  email: string
-  image: string | null
+	id: string
+	name: string
+	email: string
+	image: string | null
 }
 
 export interface AuthSession {
-  user: AuthUser
-  session: { id: string; token: string }
+	user: AuthUser
+	session: { id: string; token: string }
 }
 
 export async function getSession(): Promise<AuthSession | null> {
-  const res = await fetch(`${authBase()}/get-session`, {
-    credentials: "include",
-  })
-  if (!res.ok) return null
-  const data = (await res.json()) as AuthSession | null
-  return data
+	const res = await fetch(`${authBase()}/get-session`, {
+		credentials: "include",
+	})
+	if (!res.ok) return null
+	const data = (await res.json()) as AuthSession | null
+	return data
 }
 
 export async function signIn(email: string, password: string): Promise<AuthSession> {
-  const res = await fetch(`${authBase()}/sign-in/email`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    credentials: "include",
-    body: JSON.stringify({ email, password }),
-  })
-  if (!res.ok) {
-    const data = (await res.json()) as { message?: string }
-    throw new Error(data.message ?? `Sign in failed: ${res.status}`)
-  }
-  return (await res.json()) as AuthSession
+	const res = await fetch(`${authBase()}/sign-in/email`, {
+		method: "POST",
+		headers: { "Content-Type": "application/json" },
+		credentials: "include",
+		body: JSON.stringify({ email, password }),
+	})
+	if (!res.ok) {
+		const data = (await res.json()) as { message?: string }
+		throw new Error(data.message ?? `Sign in failed: ${res.status}`)
+	}
+	return (await res.json()) as AuthSession
 }
 
 export async function signOut(): Promise<void> {
-  await fetch(`${authBase()}/sign-out`, {
-    method: "POST",
-    credentials: "include",
-  })
+	await fetch(`${authBase()}/sign-out`, {
+		method: "POST",
+		credentials: "include",
+	})
 }

apps/admin-dashboard/src/lib/server-url.ts

@@ -1,10 +1,10 @@
-const STORAGE_KEY = "aelis-server-url"
+const STORAGE_KEY = "freya-server-url"
 const DEFAULT_URL = "https://3000--019cf276-6ed6-7529-a425-210182693908.eu-runner.flex.doptig.cloud"
 
 export function getServerUrl(): string {
-  return localStorage.getItem(STORAGE_KEY) ?? DEFAULT_URL
+	return localStorage.getItem(STORAGE_KEY) ?? DEFAULT_URL
 }
 
 export function setServerUrl(url: string): void {
-  localStorage.setItem(STORAGE_KEY, url.replace(/\/+$/, ""))
+	localStorage.setItem(STORAGE_KEY, url.replace(/\/+$/, ""))
 }

apps/admin-dashboard/src/lib/utils.ts

@@ -2,5 +2,5 @@ import { clsx, type ClassValue } from "clsx"
 import { twMerge } from "tailwind-merge"
 
 export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs))
+	return twMerge(clsx(inputs))
 }

apps/admin-dashboard/src/main.tsx

@@ -3,26 +3,27 @@ import { StrictMode } from "react"
 import { createRoot } from "react-dom/client"
 
 import "./index.css"
-import App from "./App.tsx"
 import { ThemeProvider } from "@/components/theme-provider.tsx"
 import { Toaster } from "@/components/ui/sonner.tsx"
 
+import App from "./App.tsx"
+
 const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      retry: false,
-      refetchOnWindowFocus: false,
-    },
-  },
+	defaultOptions: {
+		queries: {
+			retry: false,
+			refetchOnWindowFocus: false,
+		},
+	},
 })
 
 createRoot(document.getElementById("root")!).render(
-  <StrictMode>
-    <QueryClientProvider client={queryClient}>
-      <ThemeProvider>
-        <App />
-        <Toaster />
-      </ThemeProvider>
-    </QueryClientProvider>
-  </StrictMode>
+	<StrictMode>
+		<QueryClientProvider client={queryClient}>
+			<ThemeProvider>
+				<App />
+				<Toaster />
+			</ThemeProvider>
+		</QueryClientProvider>
+	</StrictMode>,
 )

apps/admin-dashboard/src/route-tree.gen.ts

@@ -1,15 +1,11 @@
 import { Route as rootRoute } from "./routes/__root"
-import { Route as loginRoute } from "./routes/login"
 import { Route as dashboardRoute } from "./routes/_dashboard"
-import { Route as dashboardIndexRoute } from "./routes/_dashboard/index"
 import { Route as dashboardFeedRoute } from "./routes/_dashboard/feed"
+import { Route as dashboardIndexRoute } from "./routes/_dashboard/index"
 import { Route as dashboardSourceRoute } from "./routes/_dashboard/sources.$sourceId"
+import { Route as loginRoute } from "./routes/login"
 
 export const routeTree = rootRoute.addChildren([
-  loginRoute,
-  dashboardRoute.addChildren([
-    dashboardIndexRoute,
-    dashboardFeedRoute,
-    dashboardSourceRoute,
-  ]),
+	loginRoute,
+	dashboardRoute.addChildren([dashboardIndexRoute, dashboardFeedRoute, dashboardSourceRoute]),
 ])

apps/admin-dashboard/src/routes/__root.tsx

@@ -1,13 +1,15 @@
-import { createRootRouteWithContext, Outlet } from "@tanstack/react-router"
 import type { QueryClient } from "@tanstack/react-query"
+
+import { createRootRouteWithContext, Outlet } from "@tanstack/react-router"
+
 import { TooltipProvider } from "@/components/ui/tooltip"
 
 export const Route = createRootRouteWithContext<{ queryClient: QueryClient }>()({
-  component: function RootLayout() {
-    return (
-      <TooltipProvider>
-        <Outlet />
-      </TooltipProvider>
-    )
-  },
+	component: function RootLayout() {
+		return (
+			<TooltipProvider>
+				<Outlet />
+			</TooltipProvider>
+		)
+	},
 })

apps/admin-dashboard/src/routes/_dashboard.tsx

@@ -1,206 +1,219 @@
-import { createRoute, Outlet, redirect, useMatchRoute, useNavigate, Link } from "@tanstack/react-router"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
 import {
-  Calendar,
-  CalendarDays,
-  CircleDot,
-  CloudSun,
-  Loader2,
-  LogOut,
-  MapPin,
-  Rss,
-  Server,
-  TriangleAlert,
+	createRoute,
+	Outlet,
+	redirect,
+	useMatchRoute,
+	useNavigate,
+	Link,
+} from "@tanstack/react-router"
+import {
+	Calendar,
+	CalendarDays,
+	CircleDot,
+	CloudSun,
+	Loader2,
+	TrainFront,
+	LogOut,
+	MapPin,
+	Rss,
+	Server,
+	TriangleAlert,
 } from "lucide-react"
 
-import { fetchConfigs, fetchSources } from "@/lib/api"
-import { getSession, signOut } from "@/lib/auth"
-
 import { Alert, AlertDescription } from "@/components/ui/alert"
 import { Button } from "@/components/ui/button"
 import { Separator } from "@/components/ui/separator"
 import {
-  Sidebar,
-  SidebarContent,
-  SidebarGroup,
-  SidebarGroupContent,
-  SidebarGroupLabel,
-  SidebarHeader,
-  SidebarInset,
-  SidebarMenu,
-  SidebarMenuBadge,
-  SidebarMenuButton,
-  SidebarMenuItem,
-  SidebarProvider,
-  SidebarTrigger,
+	Sidebar,
+	SidebarContent,
+	SidebarGroup,
+	SidebarGroupContent,
+	SidebarGroupLabel,
+	SidebarHeader,
+	SidebarInset,
+	SidebarMenu,
+	SidebarMenuBadge,
+	SidebarMenuButton,
+	SidebarMenuItem,
+	SidebarProvider,
+	SidebarTrigger,
 } from "@/components/ui/sidebar"
+import { fetchConfigs, fetchSources } from "@/lib/api"
+import { getSession, signOut } from "@/lib/auth"
+
 import { Route as rootRoute } from "./__root"
 
 const SOURCE_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
-  "aelis.location": MapPin,
-  "aelis.weather": CloudSun,
-  "aelis.caldav": CalendarDays,
-  "aelis.google-calendar": Calendar,
+	"freya.location": MapPin,
+	"freya.weather": CloudSun,
+	"freya.caldav": CalendarDays,
+	"freya.google-calendar": Calendar,
+	"freya.tfl": TrainFront,
 }
 
 export const Route = createRoute({
-  getParentRoute: () => rootRoute,
-  id: "dashboard",
-  beforeLoad: async ({ context }) => {
-    let session: Awaited<ReturnType<typeof getSession>> | null = null
-    try {
-      session = await context.queryClient.ensureQueryData({
-        queryKey: ["session"],
-        queryFn: getSession,
-      })
-    } catch {
-      throw redirect({ to: "/login" })
-    }
-    if (!session?.user) {
-      throw redirect({ to: "/login" })
-    }
-    return { user: session.user }
-  },
-  component: DashboardLayout,
-  pendingComponent: () => (
-    <div className="flex min-h-svh items-center justify-center">
-      <Loader2 className="size-5 animate-spin text-muted-foreground" />
-    </div>
-  ),
+	getParentRoute: () => rootRoute,
+	id: "dashboard",
+	beforeLoad: async ({ context }) => {
+		let session: Awaited<ReturnType<typeof getSession>> | null = null
+		try {
+			session = await context.queryClient.ensureQueryData({
+				queryKey: ["session"],
+				queryFn: getSession,
+			})
+		} catch {
+			throw redirect({ to: "/login" })
+		}
+		if (!session?.user) {
+			throw redirect({ to: "/login" })
+		}
+		return { user: session.user }
+	},
+	component: DashboardLayout,
+	pendingComponent: () => (
+		<div className="flex min-h-svh items-center justify-center">
+			<Loader2 className="size-5 animate-spin text-muted-foreground" />
+		</div>
+	),
 })
 
 function DashboardLayout() {
-  const { user } = Route.useRouteContext()
-  const navigate = useNavigate()
-  const queryClient = useQueryClient()
-  const matchRoute = useMatchRoute()
+	const { user } = Route.useRouteContext()
+	const navigate = useNavigate()
+	const queryClient = useQueryClient()
+	const matchRoute = useMatchRoute()
 
-  const { data: sources = [] } = useQuery({
-    queryKey: ["sources"],
-    queryFn: fetchSources,
-  })
+	const { data: sources = [] } = useQuery({
+		queryKey: ["sources"],
+		queryFn: fetchSources,
+	})
 
-  const {
-    data: configs = [],
-    error: configsError,
-    refetch: refetchConfigs,
-  } = useQuery({
-    queryKey: ["configs"],
-    queryFn: fetchConfigs,
-  })
+	const {
+		data: configs = [],
+		error: configsError,
+		refetch: refetchConfigs,
+	} = useQuery({
+		queryKey: ["configs"],
+		queryFn: fetchConfigs,
+	})
 
-  const logoutMutation = useMutation({
-    mutationFn: signOut,
-    onSuccess() {
-      queryClient.setQueryData(["session"], null)
-      queryClient.clear()
-      navigate({ to: "/login" })
-    },
-  })
+	const logoutMutation = useMutation({
+		mutationFn: signOut,
+		onSuccess() {
+			queryClient.setQueryData(["session"], null)
+			queryClient.clear()
+			navigate({ to: "/login" })
+		},
+	})
 
-  const error = configsError?.message ?? null
-  const configMap = new Map(configs.map((c) => [c.sourceId, c]))
+	const error = configsError?.message ?? null
+	const configMap = new Map(configs.map((c) => [c.sourceId, c]))
 
-  return (
-    <SidebarProvider>
-      <Sidebar>
-        <SidebarHeader>
-          <div className="flex items-center justify-between px-2 py-1">
-            <div className="min-w-0">
-              <p className="truncate text-sm font-medium">{user.name}</p>
-              <p className="truncate text-xs text-muted-foreground">{user.email}</p>
-            </div>
-            <Button variant="ghost" size="icon" className="size-7 shrink-0" onClick={() => logoutMutation.mutate()}>
-              <LogOut className="size-3.5" />
-            </Button>
-          </div>
-        </SidebarHeader>
-        <SidebarContent>
-          <SidebarGroup>
-            <SidebarGroupLabel>General</SidebarGroupLabel>
-            <SidebarGroupContent>
-              <SidebarMenu>
-                <SidebarMenuItem>
-                  <SidebarMenuButton
-                    isActive={!!matchRoute({ to: "/" })}
-                    asChild
-                  >
-                    <Link to="/">
-                      <Server className="size-4" />
-                      <span>Server</span>
-                    </Link>
-                  </SidebarMenuButton>
-                </SidebarMenuItem>
-                <SidebarMenuItem>
-                  <SidebarMenuButton
-                    isActive={!!matchRoute({ to: "/feed" })}
-                    asChild
-                  >
-                    <Link to="/feed">
-                      <Rss className="size-4" />
-                      <span>Feed</span>
-                    </Link>
-                  </SidebarMenuButton>
-                </SidebarMenuItem>
-              </SidebarMenu>
-            </SidebarGroupContent>
-          </SidebarGroup>
+	return (
+		<SidebarProvider>
+			<Sidebar>
+				<SidebarHeader>
+					<div className="flex items-center justify-between px-2 py-1">
+						<div className="min-w-0">
+							<p className="truncate text-sm font-medium">{user.name}</p>
+							<p className="truncate text-xs text-muted-foreground">{user.email}</p>
+						</div>
+						<Button
+							variant="ghost"
+							size="icon"
+							className="size-7 shrink-0"
+							onClick={() => logoutMutation.mutate()}
+						>
+							<LogOut className="size-3.5" />
+						</Button>
+					</div>
+				</SidebarHeader>
+				<SidebarContent>
+					<SidebarGroup>
+						<SidebarGroupLabel>General</SidebarGroupLabel>
+						<SidebarGroupContent>
+							<SidebarMenu>
+								<SidebarMenuItem>
+									<SidebarMenuButton isActive={!!matchRoute({ to: "/" })} asChild>
+										<Link to="/">
+											<Server className="size-4" />
+											<span>Server</span>
+										</Link>
+									</SidebarMenuButton>
+								</SidebarMenuItem>
+								<SidebarMenuItem>
+									<SidebarMenuButton isActive={!!matchRoute({ to: "/feed" })} asChild>
+										<Link to="/feed">
+											<Rss className="size-4" />
+											<span>Feed</span>
+										</Link>
+									</SidebarMenuButton>
+								</SidebarMenuItem>
+							</SidebarMenu>
+						</SidebarGroupContent>
+					</SidebarGroup>
 
-          <SidebarGroup>
-            <SidebarGroupLabel>Sources</SidebarGroupLabel>
-            <SidebarGroupContent>
-              <SidebarMenu>
-                {sources.map((source) => {
-                  const Icon = SOURCE_ICONS[source.id] ?? CircleDot
-                  const cfg = configMap.get(source.id)
-                  const isEnabled = source.alwaysEnabled || cfg?.enabled
-                  return (
-                    <SidebarMenuItem key={source.id}>
-                      <SidebarMenuButton
-                        isActive={!!matchRoute({ to: "/sources/$sourceId", params: { sourceId: source.id } })}
-                        asChild
-                      >
-                        <Link to="/sources/$sourceId" params={{ sourceId: source.id }}>
-                          <Icon className="size-4" />
-                          <span>{source.name}</span>
-                        </Link>
-                      </SidebarMenuButton>
-                      {isEnabled && (
-                        <SidebarMenuBadge>
-                          <CircleDot className="size-2.5 text-primary" />
-                        </SidebarMenuBadge>
-                      )}
-                    </SidebarMenuItem>
-                  )
-                })}
-              </SidebarMenu>
-            </SidebarGroupContent>
-          </SidebarGroup>
-        </SidebarContent>
-      </Sidebar>
+					<SidebarGroup>
+						<SidebarGroupLabel>Sources</SidebarGroupLabel>
+						<SidebarGroupContent>
+							<SidebarMenu>
+								{sources.map((source) => {
+									const Icon = SOURCE_ICONS[source.id] ?? CircleDot
+									const cfg = configMap.get(source.id)
+									const isEnabled = source.alwaysEnabled || cfg?.enabled
+									return (
+										<SidebarMenuItem key={source.id}>
+											<SidebarMenuButton
+												isActive={
+													!!matchRoute({
+														to: "/sources/$sourceId",
+														params: { sourceId: source.id },
+													})
+												}
+												asChild
+											>
+												<Link to="/sources/$sourceId" params={{ sourceId: source.id }}>
+													<Icon className="size-4" />
+													<span>{source.name}</span>
+												</Link>
+											</SidebarMenuButton>
+											{isEnabled && (
+												<SidebarMenuBadge>
+													<CircleDot className="size-2.5 text-primary" />
+												</SidebarMenuBadge>
+											)}
+										</SidebarMenuItem>
+									)
+								})}
+							</SidebarMenu>
+						</SidebarGroupContent>
+					</SidebarGroup>
+				</SidebarContent>
+			</Sidebar>
 
-      <SidebarInset>
-        <header className="flex h-12 items-center gap-2 border-b px-4">
-          <SidebarTrigger className="-ml-1" />
-          <Separator orientation="vertical" className="mr-2 !h-4" />
-        </header>
+			<SidebarInset>
+				<header className="flex h-12 items-center gap-2 border-b px-4">
+					<SidebarTrigger className="-ml-1" />
+					<Separator orientation="vertical" className="mr-2 !h-4" />
+				</header>
 
-        <main className="flex-1 p-6">
-          {error && (
-            <Alert variant="destructive" className="mb-6">
-              <TriangleAlert className="size-4" />
-              <AlertDescription className="flex items-center justify-between">
-                <span>{error}</span>
-                <Button variant="ghost" size="sm" onClick={() => refetchConfigs()}>
-                  Retry
-                </Button>
-              </AlertDescription>
-            </Alert>
-          )}
+				<main className="flex-1 p-6">
+					{error && (
+						<Alert variant="destructive" className="mb-6">
+							<TriangleAlert className="size-4" />
+							<AlertDescription className="flex items-center justify-between">
+								<span>{error}</span>
+								<Button variant="ghost" size="sm" onClick={() => refetchConfigs()}>
+									Retry
+								</Button>
+							</AlertDescription>
+						</Alert>
+					)}
 
-          <Outlet />
-        </main>
-      </SidebarInset>
-    </SidebarProvider>
-  )
+					<Outlet />
+				</main>
+			</SidebarInset>
+		</SidebarProvider>
+	)
 }

apps/admin-dashboard/src/routes/_dashboard/feed.tsx

@@ -1,10 +1,11 @@
 import { createRoute } from "@tanstack/react-router"
 
 import { FeedPanel } from "@/components/feed-panel"
+
 import { Route as dashboardRoute } from "../_dashboard"
 
 export const Route = createRoute({
-  getParentRoute: () => dashboardRoute,
-  path: "/feed",
-  component: FeedPanel,
+	getParentRoute: () => dashboardRoute,
+	path: "/feed",
+	component: FeedPanel,
 })

apps/admin-dashboard/src/routes/_dashboard/index.tsx

@@ -1,10 +1,11 @@
 import { createRoute } from "@tanstack/react-router"
 
 import { GeneralSettingsPanel } from "@/components/general-settings-panel"
+
 import { Route as dashboardRoute } from "../_dashboard"
 
 export const Route = createRoute({
-  getParentRoute: () => dashboardRoute,
-  path: "/",
-  component: GeneralSettingsPanel,
+	getParentRoute: () => dashboardRoute,
+	path: "/",
+	component: GeneralSettingsPanel,
 })

apps/admin-dashboard/src/routes/_dashboard/sources.$sourceId.tsx

@@ -1,34 +1,35 @@
-import { createRoute } from "@tanstack/react-router"
 import { useQuery, useQueryClient } from "@tanstack/react-query"
+import { createRoute } from "@tanstack/react-router"
 
-import { fetchSources } from "@/lib/api"
 import { SourceConfigPanel } from "@/components/source-config-panel"
+import { fetchSources } from "@/lib/api"
+
 import { Route as dashboardRoute } from "../_dashboard"
 
 export const Route = createRoute({
-  getParentRoute: () => dashboardRoute,
-  path: "/sources/$sourceId",
-  component: SourceRoute,
+	getParentRoute: () => dashboardRoute,
+	path: "/sources/$sourceId",
+	component: SourceRoute,
 })
 
 function SourceRoute() {
-  const { sourceId } = Route.useParams()
-  const queryClient = useQueryClient()
-  const { data: sources = [] } = useQuery({
-    queryKey: ["sources"],
-    queryFn: fetchSources,
-  })
-  const source = sources.find((s) => s.id === sourceId)
+	const { sourceId } = Route.useParams()
+	const queryClient = useQueryClient()
+	const { data: sources = [] } = useQuery({
+		queryKey: ["sources"],
+		queryFn: fetchSources,
+	})
+	const source = sources.find((s) => s.id === sourceId)
 
-  if (!source) {
-    return <p className="text-sm text-muted-foreground">Source not found.</p>
-  }
+	if (!source) {
+		return <p className="text-sm text-muted-foreground">Source not found.</p>
+	}
 
-  return (
-    <SourceConfigPanel
-      key={source.id}
-      source={source}
-      onUpdate={() => queryClient.invalidateQueries({ queryKey: ["configs"] })}
-    />
-  )
+	return (
+		<SourceConfigPanel
+			key={source.id}
+			source={source}
+			onUpdate={() => queryClient.invalidateQueries({ queryKey: ["configs"] })}
+		/>
+	)
 }

apps/admin-dashboard/src/routes/login.tsx

@@ -1,22 +1,24 @@
-import { createRoute, useNavigate } from "@tanstack/react-router"
 import { useQueryClient } from "@tanstack/react-query"
+import { createRoute, useNavigate } from "@tanstack/react-router"
 
 import type { AuthSession } from "@/lib/auth"
+
 import { LoginPage } from "@/components/login-page"
+
 import { Route as rootRoute } from "./__root"
 
 export const Route = createRoute({
-  getParentRoute: () => rootRoute,
-  path: "/login",
-  component: function LoginRoute() {
-    const navigate = useNavigate()
-    const queryClient = useQueryClient()
+	getParentRoute: () => rootRoute,
+	path: "/login",
+	component: function LoginRoute() {
+		const navigate = useNavigate()
+		const queryClient = useQueryClient()
 
-    function handleLogin(session: AuthSession) {
-      queryClient.setQueryData(["session"], session)
-      navigate({ to: "/" })
-    }
+		function handleLogin(session: AuthSession) {
+			queryClient.setQueryData(["session"], session)
+			navigate({ to: "/" })
+		}
 
-    return <LoginPage onLogin={handleLogin} />
-  },
+		return <LoginPage onLogin={handleLogin} />
+	},
 })

apps/admin-dashboard/tsconfig.app.json

@@ -1,32 +1,29 @@
 {
-  "compilerOptions": {
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
-    "target": "ES2022",
-    "useDefineForClassFields": true,
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "module": "ESNext",
-    "types": ["vite/client"],
-    "skipLibCheck": true,
+	"compilerOptions": {
+		"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+		"target": "ES2022",
+		"useDefineForClassFields": true,
+		"lib": ["ES2022", "DOM"],
+		"module": "ESNext",
+		"types": ["vite/client"],
+		"skipLibCheck": true,
 
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
-    "moduleDetection": "force",
-    "noEmit": true,
-    "jsx": "react-jsx",
+		"moduleResolution": "bundler",
+		"allowImportingTsExtensions": true,
+		"verbatimModuleSyntax": true,
+		"moduleDetection": "force",
+		"noEmit": true,
+		"jsx": "react-jsx",
 
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "erasableSyntaxOnly": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUncheckedSideEffectImports": true,
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "include": ["src"]
+		"strict": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"erasableSyntaxOnly": true,
+		"noFallthroughCasesInSwitch": true,
+		"noUncheckedSideEffectImports": true,
+		"paths": {
+			"@/*": ["./src/*"]
+		}
+	},
+	"include": ["src"]
 }

apps/admin-dashboard/tsconfig.json

@@ -1,13 +1,9 @@
 {
-  "files": [],
-  "references": [
-    { "path": "./tsconfig.app.json" },
-    { "path": "./tsconfig.node.json" }
-  ],
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  }
+	"files": [],
+	"references": [{ "path": "./tsconfig.app.json" }, { "path": "./tsconfig.node.json" }],
+	"compilerOptions": {
+		"paths": {
+			"@/*": ["./src/*"]
+		}
+	}
 }

apps/admin-dashboard/tsconfig.node.json

@@ -1,26 +1,24 @@
 {
-  "compilerOptions": {
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
-    "target": "ES2023",
-    "lib": ["ES2023"],
-    "module": "ESNext",
-    "types": ["node"],
-    "skipLibCheck": true,
+	"compilerOptions": {
+		"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+		"target": "ES2023",
+		"lib": ["ES2023"],
+		"module": "ESNext",
+		"types": ["node"],
+		"skipLibCheck": true,
 
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
-    "moduleDetection": "force",
-    "noEmit": true,
+		"moduleResolution": "bundler",
+		"allowImportingTsExtensions": true,
+		"verbatimModuleSyntax": true,
+		"moduleDetection": "force",
+		"noEmit": true,
 
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "erasableSyntaxOnly": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUncheckedSideEffectImports": true
-  },
-  "include": ["vite.config.ts"]
+		"strict": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"erasableSyntaxOnly": true,
+		"noFallthroughCasesInSwitch": true,
+		"noUncheckedSideEffectImports": true
+	},
+	"include": ["vite.config.ts"]
 }

apps/admin-dashboard/vite.config.ts

@@ -1,18 +1,19 @@
-import path from "path"
 import tailwindcss from "@tailwindcss/vite"
 import react from "@vitejs/plugin-react"
+import path from "path"
 import { defineConfig } from "vite"
 
 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [react(), tailwindcss()],
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./src"),
-    },
-  },
-  server: {
-    port: 5174,
-    allowedHosts: true,
-  },
+	plugins: [react(), tailwindcss()],
+	resolve: {
+		alias: {
+			"@": path.resolve(__dirname, "./src"),
+		},
+	},
+	server: {
+		host: "0.0.0.0",
+		port: 5174,
+		allowedHosts: true,
+	},
 })

apps/aelis-backend/src/location/provider.ts

@@ -1,11 +0,0 @@
-import { LocationSource } from "@aelis/source-location"
-
-import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
-
-export class LocationSourceProvider implements FeedSourceProvider {
-	readonly sourceId = "aelis.location"
-
-	async feedSourceForUser(_userId: string, _config: unknown): Promise<LocationSource> {
-		return new LocationSource()
-	}
-}

apps/freya-backend/.env.example

@@ -5,7 +5,7 @@ DATABASE_URL=postgresql://user:password@localhost:5432/aris
 BETTER_AUTH_SECRET=
 
 # Encryption key for source credentials at rest (32 bytes, generate with: openssl rand -base64 32)
-CREDENTIALS_ENCRYPTION_KEY=
+CREDENTIAL_ENCRYPTION_KEY=
 
 # Base URL of the backend
 BETTER_AUTH_URL=http://localhost:3000

apps/freya-backend/package.json

@@ -1,10 +1,10 @@
 {
-	"name": "@aelis/backend",
+	"name": "@freya/backend",
 	"version": "0.0.0",
 	"type": "module",
 	"main": "src/server.ts",
 	"scripts": {
-		"dev": "bun run --watch src/server.ts",
+		"dev": "bun run --watch --inspect=0.0.0.0:6499 src/server.ts",
 		"start": "bun run src/server.ts",
 		"test": "bun test src/",
 		"db:generate": "bunx drizzle-kit generate",
@@ -15,12 +15,12 @@
 		"create-admin": "bun run src/scripts/create-admin.ts"
 	},
 	"dependencies": {
-		"@aelis/core": "workspace:*",
-		"@aelis/source-caldav": "workspace:*",
-		"@aelis/source-google-calendar": "workspace:*",
-		"@aelis/source-location": "workspace:*",
-		"@aelis/source-tfl": "workspace:*",
-		"@aelis/source-weatherkit": "workspace:*",
+		"@freya/core": "workspace:*",
+		"@freya/source-caldav": "workspace:*",
+		"@freya/source-google-calendar": "workspace:*",
+		"@freya/source-location": "workspace:*",
+		"@freya/source-tfl": "workspace:*",
+		"@freya/source-weatherkit": "workspace:*",
 		"@openrouter/sdk": "^0.9.11",
 		"arktype": "^2.1.29",
 		"better-auth": "^1",

apps/freya-backend/src/admin/http.test.ts

@@ -1,4 +1,4 @@
-import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
+import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
 
 import { describe, expect, mock, test } from "bun:test"
 import { Hono } from "hono"
@@ -118,9 +118,9 @@ const validWeatherConfig = {
 
 describe("PUT /api/admin/:sourceId/config", () => {
 	test("returns 404 for unknown provider", async () => {
-		const { app } = createApp([createStubProvider("aelis.location")])
+		const { app } = createApp([createStubProvider("freya.location")])
 
-		const res = await app.request("/api/admin/aelis.nonexistent/config", {
+		const res = await app.request("/api/admin/freya.nonexistent/config", {
 			method: "PUT",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify({ key: "value" }),
@@ -132,9 +132,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
 	})
 
 	test("returns 404 for provider without runtime config support", async () => {
-		const { app } = createApp([createStubProvider("aelis.location")])
+		const { app } = createApp([createStubProvider("freya.location")])
 
-		const res = await app.request("/api/admin/aelis.location/config", {
+		const res = await app.request("/api/admin/freya.location/config", {
 			method: "PUT",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify({ key: "value" }),
@@ -146,9 +146,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
 	})
 
 	test("returns 400 for invalid JSON body", async () => {
-		const { app } = createApp([createStubProvider("aelis.weather")])
+		const { app } = createApp([createStubProvider("freya.weather")])
 
-		const res = await app.request("/api/admin/aelis.weather/config", {
+		const res = await app.request("/api/admin/freya.weather/config", {
 			method: "PUT",
 			headers: { "Content-Type": "application/json" },
 			body: "not json",
@@ -160,9 +160,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
 	})
 
 	test("returns 400 when weather config fails validation", async () => {
-		const { app } = createApp([createStubProvider("aelis.weather")])
+		const { app } = createApp([createStubProvider("freya.weather")])
 
-		const res = await app.request("/api/admin/aelis.weather/config", {
+		const res = await app.request("/api/admin/freya.weather/config", {
 			method: "PUT",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify({ credentials: { privateKey: 123 } }),
@@ -174,11 +174,11 @@ describe("PUT /api/admin/:sourceId/config", () => {
 	})
 
 	test("returns 204 and applies valid weather config", async () => {
-		const { app, sessionManager } = createApp([createStubProvider("aelis.weather")])
+		const { app, sessionManager } = createApp([createStubProvider("freya.weather")])
 
-		const originalProvider = sessionManager.getProvider("aelis.weather")
+		const originalProvider = sessionManager.getProvider("freya.weather")
 
-		const res = await app.request("/api/admin/aelis.weather/config", {
+		const res = await app.request("/api/admin/freya.weather/config", {
 			method: "PUT",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify(validWeatherConfig),
@@ -187,9 +187,9 @@ describe("PUT /api/admin/:sourceId/config", () => {
 		expect(res.status).toBe(204)
 
 		// Provider was replaced with a new instance
-		const provider = sessionManager.getProvider("aelis.weather")
+		const provider = sessionManager.getProvider("freya.weather")
 		expect(provider).toBeDefined()
-		expect(provider!.sourceId).toBe("aelis.weather")
+		expect(provider!.sourceId).toBe("freya.weather")
 		expect(provider).not.toBe(originalProvider)
 	})
 })

apps/freya-backend/src/admin/http.ts

@@ -60,7 +60,7 @@ async function handleUpdateProviderConfig(c: Context<Env>) {
 	}
 
 	switch (sourceId) {
-		case "aelis.weather": {
+		case "freya.weather": {
 			const parsed = WeatherKitSourceProviderConfig(body)
 			if (parsed instanceof type.errors) {
 				return c.json({ error: parsed.summary }, 400)

apps/freya-backend/src/auth/admin-middleware.test.ts

@@ -1,5 +1,5 @@
-import { Hono } from "hono"
 import { describe, expect, test } from "bun:test"
+import { Hono } from "hono"
 
 import type { Auth } from "./index.ts"
 import type { AuthSession, AuthUser } from "./session.ts"

apps/freya-backend/src/auth/session-middleware.ts

@@ -79,7 +79,7 @@ export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddlewar
 		const user: AuthUser = {
 			id: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn",
 			name: "Dev User",
-			email: "dev@aelis.local",
+			email: "dev@freya.local",
 			emailVerified: true,
 			image: null,
 			createdAt: now,
@@ -96,7 +96,7 @@ export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddlewar
 			token: "Vb9CxNfRm2KwQs7TjPeA5dLhYg0UoZi4",
 			expiresAt,
 			ipAddress: "127.0.0.1",
-			userAgent: "aelis-dev",
+			userAgent: "freya-dev",
 			createdAt: now,
 			updatedAt: now,
 		}

apps/freya-backend/src/caldav/provider.test.ts

@@ -0,0 +1,85 @@
+import { describe, expect, test } from "bun:test"
+
+import { CalDavSourceProvider } from "./provider.ts"
+
+describe("CalDavSourceProvider", () => {
+	const provider = new CalDavSourceProvider()
+
+	test("sourceId is freya.caldav", () => {
+		expect(provider.sourceId).toBe("freya.caldav")
+	})
+
+	test("throws when credentials are null", async () => {
+		const config = { serverUrl: "https://caldav.icloud.com", username: "user@icloud.com" }
+		await expect(provider.feedSourceForUser("user-1", config, null)).rejects.toThrow(
+			"No CalDAV credentials configured",
+		)
+	})
+
+	test("throws when credentials are missing password", async () => {
+		const config = { serverUrl: "https://caldav.icloud.com", username: "user@icloud.com" }
+		await expect(provider.feedSourceForUser("user-1", config, {})).rejects.toThrow(
+			"password must be a string",
+		)
+	})
+
+	test("throws when config is missing serverUrl", async () => {
+		const credentials = { password: "app-specific-password" }
+		await expect(
+			provider.feedSourceForUser("user-1", { username: "user@icloud.com" }, credentials),
+		).rejects.toThrow("Invalid CalDAV config")
+	})
+
+	test("throws when config is missing username", async () => {
+		const credentials = { password: "app-specific-password" }
+		await expect(
+			provider.feedSourceForUser("user-1", { serverUrl: "https://caldav.icloud.com" }, credentials),
+		).rejects.toThrow("Invalid CalDAV config")
+	})
+
+	test("throws when config has extra keys", async () => {
+		const config = {
+			serverUrl: "https://caldav.icloud.com",
+			username: "user@icloud.com",
+			extra: true,
+		}
+		const credentials = { password: "app-specific-password" }
+		await expect(provider.feedSourceForUser("user-1", config, credentials)).rejects.toThrow(
+			"Invalid CalDAV config",
+		)
+	})
+
+	test("throws when credentials have extra keys", async () => {
+		const config = { serverUrl: "https://caldav.icloud.com", username: "user@icloud.com" }
+		const credentials = { password: "app-specific-password", extra: true }
+		await expect(provider.feedSourceForUser("user-1", config, credentials)).rejects.toThrow(
+			"extra must be removed",
+		)
+	})
+
+	test("returns CalDavSource with valid config and credentials", async () => {
+		const config = {
+			serverUrl: "https://caldav.icloud.com",
+			username: "user@icloud.com",
+			lookAheadDays: 3,
+			timeZone: "Europe/London",
+		}
+		const credentials = { password: "app-specific-password" }
+
+		const source = await provider.feedSourceForUser("user-1", config, credentials)
+		expect(source).toBeDefined()
+		expect(source.id).toBe("freya.caldav")
+	})
+
+	test("returns CalDavSource with minimal config", async () => {
+		const config = {
+			serverUrl: "https://caldav.icloud.com",
+			username: "user@icloud.com",
+		}
+		const credentials = { password: "app-specific-password" }
+
+		const source = await provider.feedSourceForUser("user-1", config, credentials)
+		expect(source).toBeDefined()
+		expect(source.id).toBe("freya.caldav")
+	})
+})

apps/freya-backend/src/caldav/provider.ts

@@ -0,0 +1,53 @@
+import { CalDavSource } from "@freya/source-caldav"
+import { type } from "arktype"
+
+import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
+
+import { InvalidSourceCredentialsError } from "../sources/errors.ts"
+
+const caldavConfig = type({
+	"+": "reject",
+	serverUrl: "string",
+	username: "string",
+	"lookAheadDays?": "number",
+	"timeZone?": "string",
+})
+
+const caldavCredentials = type({
+	"+": "reject",
+	password: "string",
+})
+
+export class CalDavSourceProvider implements FeedSourceProvider {
+	readonly sourceId = "freya.caldav"
+	readonly configSchema = caldavConfig
+
+	async feedSourceForUser(
+		_userId: string,
+		config: unknown,
+		credentials: unknown,
+	): Promise<CalDavSource> {
+		const parsed = caldavConfig(config)
+		if (parsed instanceof type.errors) {
+			throw new Error(`Invalid CalDAV config: ${parsed.summary}`)
+		}
+
+		if (!credentials) {
+			throw new InvalidSourceCredentialsError("freya.caldav", "No CalDAV credentials configured")
+		}
+
+		const creds = caldavCredentials(credentials)
+		if (creds instanceof type.errors) {
+			throw new InvalidSourceCredentialsError("freya.caldav", creds.summary)
+		}
+
+		return new CalDavSource({
+			serverUrl: parsed.serverUrl,
+			authMethod: "basic",
+			username: parsed.username,
+			password: creds.password,
+			lookAheadDays: parsed.lookAheadDays,
+			timeZone: parsed.timeZone,
+		})
+	}
+}

apps/freya-backend/src/db/index.ts

@@ -1,9 +1,12 @@
+import type { PgDatabase } from "drizzle-orm/pg-core"
+
 import { SQL } from "bun"
-import { drizzle, type BunSQLDatabase } from "drizzle-orm/bun-sql"
+import { drizzle, type BunSQLQueryResultHKT } from "drizzle-orm/bun-sql"
 
 import * as schema from "./schema.ts"
 
-export type Database = BunSQLDatabase<typeof schema>
+/** Covers both the top-level drizzle instance and transaction handles. */
+export type Database = PgDatabase<BunSQLQueryResultHKT, typeof schema>
 
 export interface DatabaseConnection {
 	db: Database

apps/freya-backend/src/db/schema.ts

@@ -29,7 +29,7 @@ export {
 import { user } from "./auth-schema.ts"
 
 // ---------------------------------------------------------------------------
-// AELIS — per-user source configuration
+// FREYA — per-user source configuration
 // ---------------------------------------------------------------------------
 
 const bytea = customType<{ data: Buffer }>({

apps/freya-backend/src/engine/http.test.ts

@@ -1,6 +1,6 @@
-import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
+import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
 
-import { contextKey } from "@aelis/core"
+import { contextKey } from "@freya/core"
 import { describe, expect, mock, spyOn, test } from "bun:test"
 import { Hono } from "hono"
 
@@ -244,7 +244,7 @@ describe("GET /api/feed", () => {
 })
 
 describe("GET /api/context", () => {
-	const weatherKey = contextKey("aelis.weather", "weather")
+	const weatherKey = contextKey("freya.weather", "weather")
 	const weatherData = { temperature: 20, condition: "Clear" }
 	const contextEntries: readonly ContextEntry[] = [[weatherKey, weatherData]]
 
@@ -274,7 +274,7 @@ describe("GET /api/context", () => {
 		const manager = new UserSessionManager({ db: fakeDb, providers: [] })
 		const app = buildTestApp(manager)
 
-		const res = await app.request('/api/context?key=["aelis.weather","weather"]')
+		const res = await app.request('/api/context?key=["freya.weather","weather"]')
 
 		expect(res.status).toBe(401)
 	})
@@ -332,7 +332,7 @@ describe("GET /api/context", () => {
 	test("returns 400 when match param is invalid", async () => {
 		const { app } = await buildContextApp("user-1")
 
-		const res = await app.request('/api/context?key=["aelis.weather"]&match=invalid')
+		const res = await app.request('/api/context?key=["freya.weather"]&match=invalid')
 
 		expect(res.status).toBe(400)
 		const body = (await res.json()) as { error: string }
@@ -343,7 +343,7 @@ describe("GET /api/context", () => {
 		const { app, session } = await buildContextApp("user-1")
 		await session.engine.refresh()
 
-		const res = await app.request('/api/context?key=["aelis.weather","weather"]&match=exact')
+		const res = await app.request('/api/context?key=["freya.weather","weather"]&match=exact')
 
 		expect(res.status).toBe(200)
 		const body = (await res.json()) as { match: string; value: unknown }
@@ -355,7 +355,7 @@ describe("GET /api/context", () => {
 		const { app, session } = await buildContextApp("user-1")
 		await session.engine.refresh()
 
-		const res = await app.request('/api/context?key=["aelis.weather"]&match=exact')
+		const res = await app.request('/api/context?key=["freya.weather"]&match=exact')
 
 		expect(res.status).toBe(404)
 	})
@@ -364,7 +364,7 @@ describe("GET /api/context", () => {
 		const { app, session } = await buildContextApp("user-1")
 		await session.engine.refresh()
 
-		const res = await app.request('/api/context?key=["aelis.weather"]&match=prefix')
+		const res = await app.request('/api/context?key=["freya.weather"]&match=prefix')
 
 		expect(res.status).toBe(200)
 		const body = (await res.json()) as {
@@ -373,7 +373,7 @@ describe("GET /api/context", () => {
 		}
 		expect(body.match).toBe("prefix")
 		expect(body.entries).toHaveLength(1)
-		expect(body.entries[0]!.key).toEqual(["aelis.weather", "weather"])
+		expect(body.entries[0]!.key).toEqual(["freya.weather", "weather"])
 		expect(body.entries[0]!.value).toEqual(weatherData)
 	})
 
@@ -381,7 +381,7 @@ describe("GET /api/context", () => {
 		const { app, session } = await buildContextApp("user-1")
 		await session.engine.refresh()
 
-		const res = await app.request('/api/context?key=["aelis.weather","weather"]')
+		const res = await app.request('/api/context?key=["freya.weather","weather"]')
 
 		expect(res.status).toBe(200)
 		const body = (await res.json()) as { match: string; value: unknown }
@@ -393,7 +393,7 @@ describe("GET /api/context", () => {
 		const { app, session } = await buildContextApp("user-1")
 		await session.engine.refresh()
 
-		const res = await app.request('/api/context?key=["aelis.weather"]')
+		const res = await app.request('/api/context?key=["freya.weather"]')
 
 		expect(res.status).toBe(200)
 		const body = (await res.json()) as {

apps/freya-backend/src/engine/http.ts

@@ -1,6 +1,6 @@
 import type { Context, Hono } from "hono"
 
-import { contextKey } from "@aelis/core"
+import { contextKey } from "@freya/core"
 import { createMiddleware } from "hono/factory"
 
 import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"

apps/freya-backend/src/enhancement/enhance-feed.ts

@@ -1,4 +1,4 @@
-import type { FeedItem } from "@aelis/core"
+import type { FeedItem } from "@freya/core"
 
 import type { LlmClient } from "./llm-client.ts"
 
@@ -47,5 +47,3 @@ export function createFeedEnhancer(config: FeedEnhancerConfig): FeedEnhancer {
 		return mergeEnhancement(items, result, currentTime)
 	}
 }
-
-

apps/freya-backend/src/enhancement/llm-client.ts

@@ -4,7 +4,7 @@ import type { EnhancementResult } from "./schema.ts"
 
 import { enhancementResultJsonSchema, parseEnhancementResult } from "./schema.ts"
 
-const DEFAULT_MODEL = "openai/gpt-4.1-mini"
+const DEFAULT_MODEL = "z-ai/glm-4.7-flash"
 const DEFAULT_TIMEOUT_MS = 30_000
 
 export interface LlmClientConfig {
@@ -46,7 +46,7 @@ export function createLlmClient(config: LlmClientConfig): LlmClient {
 						type: "json_schema" as const,
 						jsonSchema: {
 							name: "enhancement_result",
-							strict: true,
+							strict: false,
 							schema: enhancementResultJsonSchema,
 						},
 					},

apps/freya-backend/src/enhancement/merge.test.ts

@@ -1,4 +1,4 @@
-import type { FeedItem } from "@aelis/core"
+import type { FeedItem } from "@freya/core"
 
 import { describe, expect, test } from "bun:test"
 

apps/freya-backend/src/enhancement/merge.ts

@@ -1,8 +1,8 @@
-import type { FeedItem } from "@aelis/core"
+import type { FeedItem } from "@freya/core"
 
 import type { EnhancementResult } from "./schema.ts"
 
-const ENHANCEMENT_SOURCE_ID = "aelis.enhancement"
+const ENHANCEMENT_SOURCE_ID = "freya.enhancement"
 
 /**
  * Merges an EnhancementResult into feed items.

apps/freya-backend/src/enhancement/prompt-builder.test.ts

@@ -1,4 +1,4 @@
-import type { FeedItem } from "@aelis/core"
+import type { FeedItem } from "@freya/core"
 
 import { describe, expect, test } from "bun:test"
 

apps/freya-backend/src/enhancement/prompt-builder.ts

@@ -1,7 +1,7 @@
-import type { FeedItem } from "@aelis/core"
+import type { FeedItem } from "@freya/core"
 
-import { CalDavFeedItemType } from "@aelis/source-caldav"
-import { CalendarFeedItemType } from "@aelis/source-google-calendar"
+import { CalDavFeedItemType } from "@freya/source-caldav"
+import { CalendarFeedItemType } from "@freya/source-google-calendar"
 
 import systemPromptBase from "./prompts/system.txt"
 
@@ -36,8 +36,7 @@ export function buildPrompt(
 
 	for (const item of items) {
 		const hasUnfilledSlots =
-			item.slots &&
-			Object.values(item.slots).some((slot) => slot.content === null)
+			item.slots && Object.values(item.slots).some((slot) => slot.content === null)
 
 		if (hasUnfilledSlots) {
 			enhanceItems.push({
@@ -79,9 +78,7 @@ export function buildPrompt(
  */
 export function hasUnfilledSlots(items: FeedItem[]): boolean {
 	return items.some(
-		(item) =>
-			item.slots &&
-			Object.values(item.slots).some((slot) => slot.content === null),
+		(item) => item.slots && Object.values(item.slots).some((slot) => slot.content === null),
 	)
 }
 
@@ -129,7 +126,20 @@ function extractCalendarEntry(item: FeedItem): CalendarEntry | null {
 }
 
 const DAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"] as const
-const MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] as const
+const MONTHS = [
+	"Jan",
+	"Feb",
+	"Mar",
+	"Apr",
+	"May",
+	"Jun",
+	"Jul",
+	"Aug",
+	"Sep",
+	"Oct",
+	"Nov",
+	"Dec",
+] as const
 
 function pad2(n: number): string {
 	return n.toString().padStart(2, "0")
@@ -144,7 +154,11 @@ function formatDayShort(date: Date): string {
 }
 
 function formatDayLabel(date: Date, currentTime: Date): string {
-	const currentDay = Date.UTC(currentTime.getUTCFullYear(), currentTime.getUTCMonth(), currentTime.getUTCDate())
+	const currentDay = Date.UTC(
+		currentTime.getUTCFullYear(),
+		currentTime.getUTCMonth(),
+		currentTime.getUTCDate(),
+	)
 	const targetDay = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate())
 	const diffDays = Math.round((targetDay - currentDay) / (1000 * 60 * 60 * 24))
 

apps/freya-backend/src/enhancement/prompts/system.txt

@@ -1,4 +1,4 @@
-You are AELIS, a personal assistant. You enhance a user's feed by filling slots and optionally generating synthetic items.
+You are FREYA, a personal assistant. You enhance a user's feed by filling slots and optionally generating synthetic items.
 
 The user message is a JSON object with:
 - "items": feed items with data and named slots to fill. Each slot has a description of what to write.

apps/freya-backend/src/enhancement/schema.test.ts

@@ -135,9 +135,7 @@ describe("schema sync", () => {
 
 			// JSON Schema structure matches
 			const jsonSchema = enhancementResultJsonSchema
-			expect(Object.keys(jsonSchema.properties).sort()).toEqual(
-				Object.keys(payload).sort(),
-			)
+			expect(Object.keys(jsonSchema.properties).sort()).toEqual(Object.keys(payload).sort())
 			expect([...jsonSchema.required].sort()).toEqual(Object.keys(payload).sort())
 
 			// syntheticItems item schema has the right required fields
@@ -166,11 +164,8 @@ describe("schema sync", () => {
 		expect(parseEnhancementResult(JSON.stringify(bad))).toBeNull()
 
 		// JSON Schema only allows string or null for slot values
-		const slotValueTypes =
-			enhancementResultJsonSchema.properties.slotFills.additionalProperties
-				.additionalProperties.type
-		expect(slotValueTypes).toContain("string")
-		expect(slotValueTypes).toContain("null")
-		expect(slotValueTypes).not.toContain("number")
+		const slotValueSchema =
+			enhancementResultJsonSchema.properties.slotFills.additionalProperties.additionalProperties
+		expect(slotValueSchema.anyOf).toEqual([{ type: "string" }, { type: "null" }])
 	})
 })

apps/freya-backend/src/enhancement/schema.ts

@@ -31,7 +31,7 @@ export const enhancementResultJsonSchema = {
 			additionalProperties: {
 				type: "object",
 				additionalProperties: {
-					type: ["string", "null"],
+					anyOf: [{ type: "string" }, { type: "null" }],
 				},
 			},
 		},

apps/freya-backend/src/lib/crypto.test.ts

@@ -1,5 +1,5 @@
-import { randomBytes } from "node:crypto"
 import { describe, expect, test } from "bun:test"
+import { randomBytes } from "node:crypto"
 
 import { CredentialEncryptor } from "./crypto.ts"
 

apps/freya-backend/src/location/http.ts

@@ -57,7 +57,7 @@ async function handleUpdateLocation(c: Context<Env>) {
 		return c.json({ error: "Service unavailable" }, 503)
 	}
 
-	await session.engine.executeAction("aelis.location", "update-location", {
+	await session.engine.executeAction("freya.location", "update-location", {
 		lat: result.lat,
 		lng: result.lng,
 		accuracy: result.accuracy,

apps/freya-backend/src/location/provider.ts

@@ -0,0 +1,15 @@
+import { LocationSource } from "@freya/source-location"
+
+import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
+
+export class LocationSourceProvider implements FeedSourceProvider {
+	readonly sourceId = "freya.location"
+
+	async feedSourceForUser(
+		_userId: string,
+		_config: unknown,
+		_credentials: unknown,
+	): Promise<LocationSource> {
+		return new LocationSource()
+	}
+}

apps/freya-backend/src/server.ts

@@ -6,14 +6,17 @@ import { createRequireAdmin } from "./auth/admin-middleware.ts"
 import { registerAuthHandlers } from "./auth/http.ts"
 import { createAuth } from "./auth/index.ts"
 import { createRequireSession } from "./auth/session-middleware.ts"
+import { CalDavSourceProvider } from "./caldav/provider.ts"
 import { createDatabase } from "./db/index.ts"
 import { registerFeedHttpHandlers } from "./engine/http.ts"
 import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
 import { createLlmClient } from "./enhancement/llm-client.ts"
+import { CredentialEncryptor } from "./lib/crypto.ts"
 import { registerLocationHttpHandlers } from "./location/http.ts"
 import { LocationSourceProvider } from "./location/provider.ts"
 import { UserSessionManager } from "./session/index.ts"
 import { registerSourcesHttpHandlers } from "./sources/http.ts"
+import { TflSourceProvider } from "./tfl/provider.ts"
 import { WeatherSourceProvider } from "./weather/provider.ts"
 
 function main() {
@@ -33,9 +36,20 @@ function main() {
 		console.warn("[enhancement] OPENROUTER_API_KEY not set — feed enhancement disabled")
 	}
 
+	const credentialEncryptionKey = process.env.CREDENTIAL_ENCRYPTION_KEY
+	const credentialEncryptor = credentialEncryptionKey
+		? new CredentialEncryptor(credentialEncryptionKey)
+		: null
+	if (!credentialEncryptor) {
+		console.warn(
+			"[credentials] CREDENTIAL_ENCRYPTION_KEY not set — per-user credential storage disabled",
+		)
+	}
+
 	const sessionManager = new UserSessionManager({
 		db,
 		providers: [
+			new CalDavSourceProvider(),
 			new LocationSourceProvider(),
 			new WeatherSourceProvider({
 				credentials: {
@@ -45,8 +59,10 @@ function main() {
 					serviceId: process.env.WEATHERKIT_SERVICE_ID!,
 				},
 			}),
+			new TflSourceProvider({ apiKey: process.env.TFL_API_KEY! }),
 		],
 		feedEnhancer,
+		credentialEncryptor,
 	})
 
 	const app = new Hono()
@@ -106,5 +122,6 @@ const app = main()
 
 export default {
 	port: 3000,
+	hostname: "0.0.0.0",
 	fetch: app.fetch,
 }

apps/freya-backend/src/session/feed-source-provider.ts

@@ -1,12 +1,12 @@
-import type { FeedSource } from "@aelis/core"
+import type { FeedSource } from "@freya/core"
 import type { type } from "arktype"
 
 export type ConfigSchema = ReturnType<typeof type>
 
 export interface FeedSourceProvider {
-	/** The source ID this provider is responsible for (e.g., "aelis.location"). */
+	/** The source ID this provider is responsible for (e.g., "freya.location"). */
 	readonly sourceId: string
 	/** Arktype schema for validating user-provided config. Omit if the source has no config. */
 	readonly configSchema?: ConfigSchema
-	feedSourceForUser(userId: string, config: unknown): Promise<FeedSource>
+	feedSourceForUser(userId: string, config: unknown, credentials: unknown): Promise<FeedSource>
 }

apps/freya-backend/src/session/user-session-manager.test.ts

@@ -1,12 +1,18 @@
-import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
+import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
 
-import { LocationSource } from "@aelis/source-location"
-import { WeatherSource } from "@aelis/source-weatherkit"
+import { LocationSource } from "@freya/source-location"
+import { WeatherSource } from "@freya/source-weatherkit"
 import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test"
 
 import type { Database } from "../db/index.ts"
 import type { FeedSourceProvider } from "./feed-source-provider.ts"
 
+import { CredentialEncryptor } from "../lib/crypto.ts"
+import {
+	CredentialStorageUnavailableError,
+	InvalidSourceCredentialsError,
+} from "../sources/errors.ts"
+import { SourceNotFoundError } from "../sources/errors.ts"
 import { UserSessionManager } from "./user-session-manager.ts"
 
 /**
@@ -38,6 +44,13 @@ function getEnabledSourceIds(userId: string): string[] {
  */
 let mockFindResult: unknown | undefined
 
+/**
+ * Spy for `updateCredentials` calls. Tests can inspect calls via
+ * `mockUpdateCredentialsCalls` or override behavior.
+ */
+const mockUpdateCredentialsCalls: Array<{ sourceId: string; credentials: Buffer }> = []
+let mockUpdateCredentialsError: Error | null = null
+
 // Mock the sources module so UserSessionManager's DB query returns controlled data.
 mock.module("../sources/user-sources.ts", () => ({
 	sources: (_db: Database, userId: string) => ({
@@ -68,10 +81,39 @@ mock.module("../sources/user-sources.ts", () => ({
 				updatedAt: now,
 			}
 		},
+		async findForUpdate(sourceId: string) {
+			// Delegates to find — row locking is a no-op in tests.
+			if (mockFindResult !== undefined) return mockFindResult
+			const now = new Date()
+			return {
+				id: crypto.randomUUID(),
+				userId,
+				sourceId,
+				enabled: true,
+				config: {},
+				credentials: null,
+				createdAt: now,
+				updatedAt: now,
+			}
+		},
+		async updateConfig(_sourceId: string, _update: { enabled?: boolean; config?: unknown }) {
+			// no-op for tests
+		},
+		async upsertConfig(_sourceId: string, _data: { enabled: boolean; config: unknown }) {
+			// no-op for tests
+		},
+		async updateCredentials(sourceId: string, credentials: Buffer) {
+			if (mockUpdateCredentialsError) {
+				throw mockUpdateCredentialsError
+			}
+			mockUpdateCredentialsCalls.push({ sourceId, credentials })
+		},
 	}),
 }))
 
-const fakeDb = {} as Database
+const fakeDb = {
+	transaction: <T>(fn: (tx: unknown) => Promise<T>) => fn(fakeDb),
+} as unknown as Database
 
 function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
 	return {
@@ -93,21 +135,24 @@ function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
 
 function createStubProvider(
 	sourceId: string,
-	factory: (userId: string, config: Record<string, unknown>) => Promise<FeedSource> = async () =>
-		createStubSource(sourceId),
+	factory: (
+		userId: string,
+		config: Record<string, unknown>,
+		credentials: unknown,
+	) => Promise<FeedSource> = async () => createStubSource(sourceId),
 ): FeedSourceProvider {
 	return { sourceId, feedSourceForUser: factory }
 }
 
 const locationProvider: FeedSourceProvider = {
-	sourceId: "aelis.location",
+	sourceId: "freya.location",
 	async feedSourceForUser() {
 		return new LocationSource()
 	},
 }
 
 const weatherProvider: FeedSourceProvider = {
-	sourceId: "aelis.weather",
+	sourceId: "freya.weather",
 	async feedSourceForUser() {
 		return new WeatherSource({ client: { fetch: async () => ({}) as never } })
 	},
@@ -116,11 +161,13 @@ const weatherProvider: FeedSourceProvider = {
 beforeEach(() => {
 	enabledByUser.clear()
 	mockFindResult = undefined
+	mockUpdateCredentialsCalls.length = 0
+	mockUpdateCredentialsError = null
 })
 
 describe("UserSessionManager", () => {
 	test("getOrCreate creates session on first call", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session = await manager.getOrCreate("user-1")
@@ -130,7 +177,7 @@ describe("UserSessionManager", () => {
 	})
 
 	test("getOrCreate returns same session for same user", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session1 = await manager.getOrCreate("user-1")
@@ -140,7 +187,7 @@ describe("UserSessionManager", () => {
 	})
 
 	test("getOrCreate returns different sessions for different users", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session1 = await manager.getOrCreate("user-1")
@@ -150,20 +197,20 @@ describe("UserSessionManager", () => {
 	})
 
 	test("each user gets independent source instances", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session1 = await manager.getOrCreate("user-1")
 		const session2 = await manager.getOrCreate("user-2")
 
-		const source1 = session1.getSource<LocationSource>("aelis.location")
-		const source2 = session2.getSource<LocationSource>("aelis.location")
+		const source1 = session1.getSource<LocationSource>("freya.location")
+		const source2 = session2.getSource<LocationSource>("freya.location")
 
 		expect(source1).not.toBe(source2)
 	})
 
 	test("remove destroys session and allows re-creation", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session1 = await manager.getOrCreate("user-1")
@@ -174,14 +221,14 @@ describe("UserSessionManager", () => {
 	})
 
 	test("remove is no-op for unknown user", () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		expect(() => manager.remove("unknown")).not.toThrow()
 	})
 
 	test("registers multiple providers", async () => {
-		setEnabledSources(["aelis.location", "aelis.weather"])
+		setEnabledSources(["freya.location", "freya.weather"])
 		const manager = new UserSessionManager({
 			db: fakeDb,
 			providers: [locationProvider, weatherProvider],
@@ -189,12 +236,12 @@ describe("UserSessionManager", () => {
 
 		const session = await manager.getOrCreate("user-1")
 
-		expect(session.getSource("aelis.location")).toBeDefined()
-		expect(session.getSource("aelis.weather")).toBeDefined()
+		expect(session.getSource("freya.location")).toBeDefined()
+		expect(session.getSource("freya.weather")).toBeDefined()
 	})
 
 	test("refresh returns feed result through session", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session = await manager.getOrCreate("user-1")
@@ -207,30 +254,30 @@ describe("UserSessionManager", () => {
 	})
 
 	test("location update via executeAction works", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session = await manager.getOrCreate("user-1")
-		await session.engine.executeAction("aelis.location", "update-location", {
+		await session.engine.executeAction("freya.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,
 			timestamp: new Date(),
 		})
 
-		const source = session.getSource<LocationSource>("aelis.location")
+		const source = session.getSource<LocationSource>("freya.location")
 		expect(source?.lastLocation?.lat).toBe(51.5074)
 	})
 
 	test("subscribe receives updates after location push", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 		const callback = mock()
 
 		const session = await manager.getOrCreate("user-1")
 		session.engine.subscribe(callback)
 
-		await session.engine.executeAction("aelis.location", "update-location", {
+		await session.engine.executeAction("freya.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,
@@ -244,7 +291,7 @@ describe("UserSessionManager", () => {
 	})
 
 	test("remove stops reactive updates", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 		const callback = mock()
 
@@ -255,7 +302,7 @@ describe("UserSessionManager", () => {
 
 		// Create new session and push location — old callback should not fire
 		const session2 = await manager.getOrCreate("user-1")
-		await session2.engine.executeAction("aelis.location", "update-location", {
+		await session2.engine.executeAction("freya.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,
@@ -268,9 +315,9 @@ describe("UserSessionManager", () => {
 	})
 
 	test("creates session with successful providers when some fail", async () => {
-		setEnabledSources(["aelis.location", "aelis.failing"])
+		setEnabledSources(["freya.location", "freya.failing"])
 		const failingProvider: FeedSourceProvider = {
-			sourceId: "aelis.failing",
+			sourceId: "freya.failing",
 			async feedSourceForUser() {
 				throw new Error("provider failed")
 			},
@@ -286,25 +333,25 @@ describe("UserSessionManager", () => {
 		const session = await manager.getOrCreate("user-1")
 
 		expect(session).toBeDefined()
-		expect(session.getSource("aelis.location")).toBeDefined()
+		expect(session.getSource("freya.location")).toBeDefined()
 		expect(spy).toHaveBeenCalled()
 
 		spy.mockRestore()
 	})
 
 	test("throws AggregateError when all providers fail", async () => {
-		setEnabledSources(["aelis.fail-1", "aelis.fail-2"])
+		setEnabledSources(["freya.fail-1", "freya.fail-2"])
 		const manager = new UserSessionManager({
 			db: fakeDb,
 			providers: [
 				{
-					sourceId: "aelis.fail-1",
+					sourceId: "freya.fail-1",
 					async feedSourceForUser() {
 						throw new Error("first failed")
 					},
 				},
 				{
-					sourceId: "aelis.fail-2",
+					sourceId: "freya.fail-2",
 					async feedSourceForUser() {
 						throw new Error("second failed")
 					},
@@ -316,13 +363,13 @@ describe("UserSessionManager", () => {
 	})
 
 	test("concurrent getOrCreate for same user returns same session", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		let callCount = 0
 		const manager = new UserSessionManager({
 			db: fakeDb,
 			providers: [
 				{
-					sourceId: "aelis.location",
+					sourceId: "freya.location",
 					async feedSourceForUser() {
 						callCount++
 						await new Promise((resolve) => setTimeout(resolve, 10))
@@ -342,7 +389,7 @@ describe("UserSessionManager", () => {
 	})
 
 	test("remove during in-flight getOrCreate prevents session from being stored", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		let resolveProvider: () => void
 		const providerGate = new Promise<void>((r) => {
 			resolveProvider = r
@@ -352,7 +399,7 @@ describe("UserSessionManager", () => {
 			db: fakeDb,
 			providers: [
 				{
-					sourceId: "aelis.location",
+					sourceId: "freya.location",
 					async feedSourceForUser() {
 						await providerGate
 						return new LocationSource()
@@ -378,15 +425,15 @@ describe("UserSessionManager", () => {
 	})
 
 	test("only invokes providers for sources enabled for the user", async () => {
-		setEnabledSources(["aelis.location"])
-		const locationFactory = mock(async () => createStubSource("aelis.location"))
-		const weatherFactory = mock(async () => createStubSource("aelis.weather"))
+		setEnabledSources(["freya.location"])
+		const locationFactory = mock(async () => createStubSource("freya.location"))
+		const weatherFactory = mock(async () => createStubSource("freya.weather"))
 
 		const manager = new UserSessionManager({
 			db: fakeDb,
 			providers: [
-				{ sourceId: "aelis.location", feedSourceForUser: locationFactory },
-				{ sourceId: "aelis.weather", feedSourceForUser: weatherFactory },
+				{ sourceId: "freya.location", feedSourceForUser: locationFactory },
+				{ sourceId: "freya.weather", feedSourceForUser: weatherFactory },
 			],
 		})
 
@@ -394,43 +441,43 @@ describe("UserSessionManager", () => {
 
 		expect(locationFactory).toHaveBeenCalledTimes(1)
 		expect(weatherFactory).not.toHaveBeenCalled()
-		expect(session.getSource("aelis.location")).toBeDefined()
-		expect(session.getSource("aelis.weather")).toBeUndefined()
+		expect(session.getSource("freya.location")).toBeDefined()
+		expect(session.getSource("freya.weather")).toBeUndefined()
 	})
 
 	test("creates empty session when no sources are enabled", async () => {
 		setEnabledSources([])
-		const factory = mock(async () => createStubSource("aelis.location"))
+		const factory = mock(async () => createStubSource("freya.location"))
 
 		const manager = new UserSessionManager({
 			db: fakeDb,
-			providers: [{ sourceId: "aelis.location", feedSourceForUser: factory }],
+			providers: [{ sourceId: "freya.location", feedSourceForUser: factory }],
 		})
 
 		const session = await manager.getOrCreate("user-1")
 
 		expect(factory).not.toHaveBeenCalled()
 		expect(session).toBeDefined()
-		expect(session.getSource("aelis.location")).toBeUndefined()
+		expect(session.getSource("freya.location")).toBeUndefined()
 	})
 
 	test("per-user enabled sources are respected", async () => {
 		enabledByUser.clear()
-		setEnabledSourcesForUser("user-1", ["aelis.location"])
-		setEnabledSourcesForUser("user-2", ["aelis.weather"])
+		setEnabledSourcesForUser("user-1", ["freya.location"])
+		setEnabledSourcesForUser("user-2", ["freya.weather"])
 
 		const manager = new UserSessionManager({
 			db: fakeDb,
-			providers: [createStubProvider("aelis.location"), createStubProvider("aelis.weather")],
+			providers: [createStubProvider("freya.location"), createStubProvider("freya.weather")],
 		})
 
 		const session1 = await manager.getOrCreate("user-1")
 		const session2 = await manager.getOrCreate("user-2")
 
-		expect(session1.getSource("aelis.location")).toBeDefined()
-		expect(session1.getSource("aelis.weather")).toBeUndefined()
-		expect(session2.getSource("aelis.location")).toBeUndefined()
-		expect(session2.getSource("aelis.weather")).toBeDefined()
+		expect(session1.getSource("freya.location")).toBeDefined()
+		expect(session1.getSource("freya.weather")).toBeUndefined()
+		expect(session2.getSource("freya.location")).toBeUndefined()
+		expect(session2.getSource("freya.weather")).toBeDefined()
 	})
 })
 
@@ -478,10 +525,10 @@ describe("UserSessionManager.replaceProvider", () => {
 	})
 
 	test("throws for unknown provider sourceId", async () => {
-		setEnabledSources(["aelis.location"])
+		setEnabledSources(["freya.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
-		const unknownProvider = createStubProvider("aelis.unknown")
+		const unknownProvider = createStubProvider("freya.unknown")
 
 		await expect(manager.replaceProvider(unknownProvider)).rejects.toThrow(
 			"no existing provider with that sourceId",
@@ -681,3 +728,240 @@ describe("UserSessionManager.replaceProvider", () => {
 		expect(feedAfter.items[0]!.data.version).toBe(1)
 	})
 })
+
+const TEST_ENCRYPTION_KEY = "/bv1nbzC4ozZkT/pcv5oQfl+JAMuMZDUSVDesG2dur8="
+const testEncryptor = new CredentialEncryptor(TEST_ENCRYPTION_KEY)
+
+describe("UserSessionManager.updateSourceCredentials", () => {
+	test("encrypts and persists credentials", async () => {
+		setEnabledSources(["test"])
+		const provider = createStubProvider("test")
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [provider],
+			credentialEncryptor: testEncryptor,
+		})
+
+		await manager.updateSourceCredentials("user-1", "test", { token: "secret-123" })
+
+		expect(mockUpdateCredentialsCalls).toHaveLength(1)
+		expect(mockUpdateCredentialsCalls[0]!.sourceId).toBe("test")
+
+		// Verify the persisted buffer decrypts to the original credentials
+		const decrypted = JSON.parse(testEncryptor.decrypt(mockUpdateCredentialsCalls[0]!.credentials))
+		expect(decrypted).toEqual({ token: "secret-123" })
+	})
+
+	test("throws CredentialStorageUnavailableError when encryptor is not configured", async () => {
+		setEnabledSources(["test"])
+		const provider = createStubProvider("test")
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [provider],
+			// no credentialEncryptor
+		})
+
+		await expect(
+			manager.updateSourceCredentials("user-1", "test", { token: "x" }),
+		).rejects.toBeInstanceOf(CredentialStorageUnavailableError)
+	})
+
+	test("throws SourceNotFoundError for unknown source", async () => {
+		setEnabledSources([])
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [],
+			credentialEncryptor: testEncryptor,
+		})
+
+		await expect(
+			manager.updateSourceCredentials("user-1", "unknown", { token: "x" }),
+		).rejects.toBeInstanceOf(SourceNotFoundError)
+	})
+
+	test("propagates InvalidSourceCredentialsError from provider", async () => {
+		setEnabledSources(["test"])
+		let callCount = 0
+		const provider: FeedSourceProvider = {
+			sourceId: "test",
+			async feedSourceForUser(_userId: string, _config: unknown, _credentials: unknown) {
+				callCount++
+				// Succeed on first call (session creation), throw on refresh
+				if (callCount > 1) {
+					throw new InvalidSourceCredentialsError("test", "bad credentials")
+				}
+				return createStubSource("test")
+			},
+		}
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [provider],
+			credentialEncryptor: testEncryptor,
+		})
+
+		// Create a session first so the refresh path is exercised
+		await manager.getOrCreate("user-1")
+
+		await expect(
+			manager.updateSourceCredentials("user-1", "test", { token: "bad" }),
+		).rejects.toBeInstanceOf(InvalidSourceCredentialsError)
+
+		// Credentials should still have been persisted before the provider threw
+		expect(mockUpdateCredentialsCalls).toHaveLength(1)
+	})
+
+	test("refreshes source in active session after credential update", async () => {
+		setEnabledSources(["test"])
+		let receivedCredentials: unknown = null
+		const provider = createStubProvider("test", async (_userId, _config, credentials) => {
+			receivedCredentials = credentials
+			return createStubSource("test")
+		})
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [provider],
+			credentialEncryptor: testEncryptor,
+		})
+
+		await manager.getOrCreate("user-1")
+		await manager.updateSourceCredentials("user-1", "test", { token: "refreshed" })
+
+		expect(receivedCredentials).toEqual({ token: "refreshed" })
+	})
+
+	test("persists credentials without session refresh when no active session", async () => {
+		setEnabledSources(["test"])
+		const factory = mock(async () => createStubSource("test"))
+		const provider: FeedSourceProvider = { sourceId: "test", feedSourceForUser: factory }
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [provider],
+			credentialEncryptor: testEncryptor,
+		})
+
+		// No session created — just update credentials
+		await manager.updateSourceCredentials("user-1", "test", { token: "stored" })
+
+		expect(mockUpdateCredentialsCalls).toHaveLength(1)
+		// feedSourceForUser should not have been called (no session to refresh)
+		expect(factory).not.toHaveBeenCalled()
+	})
+})
+
+describe("UserSessionManager.saveSourceConfig", () => {
+	test("upserts config without credentials (existing behavior)", async () => {
+		setEnabledSources(["test"])
+		const factory = mock(async () => createStubSource("test"))
+		const provider: FeedSourceProvider = { sourceId: "test", feedSourceForUser: factory }
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [provider],
+			credentialEncryptor: testEncryptor,
+		})
+
+		// Create a session first so we can verify the source is refreshed
+		await manager.getOrCreate("user-1")
+
+		await manager.saveSourceConfig("user-1", "test", {
+			enabled: true,
+			config: { key: "value" },
+		})
+
+		// feedSourceForUser called once for session creation, once for upsert refresh
+		expect(factory).toHaveBeenCalledTimes(2)
+		// No credentials should have been persisted
+		expect(mockUpdateCredentialsCalls).toHaveLength(0)
+	})
+
+	test("upserts config with credentials — persists both and passes credentials to source", async () => {
+		setEnabledSources(["test"])
+		let receivedCredentials: unknown = null
+		const factory = mock(async (_userId: string, _config: unknown, creds: unknown) => {
+			receivedCredentials = creds
+			return createStubSource("test")
+		})
+		const provider: FeedSourceProvider = { sourceId: "test", feedSourceForUser: factory }
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [provider],
+			credentialEncryptor: testEncryptor,
+		})
+
+		// Create a session so the source refresh path runs
+		await manager.getOrCreate("user-1")
+
+		const creds = { username: "alice", password: "s3cret" }
+		await manager.saveSourceConfig("user-1", "test", {
+			enabled: true,
+			config: { serverUrl: "https://example.com" },
+			credentials: creds,
+		})
+
+		// Credentials were encrypted and persisted
+		expect(mockUpdateCredentialsCalls).toHaveLength(1)
+		const decrypted = JSON.parse(testEncryptor.decrypt(mockUpdateCredentialsCalls[0]!.credentials))
+		expect(decrypted).toEqual(creds)
+
+		// feedSourceForUser received the provided credentials (not null)
+		expect(receivedCredentials).toEqual(creds)
+	})
+
+	test("upserts config with credentials adds source to session when not already present", async () => {
+		// Start with no enabled sources so the session is empty
+		setEnabledSources([])
+		const factory = mock(async () => createStubSource("test"))
+		const provider: FeedSourceProvider = { sourceId: "test", feedSourceForUser: factory }
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [provider],
+			credentialEncryptor: testEncryptor,
+		})
+
+		const session = await manager.getOrCreate("user-1")
+		expect(session.hasSource("test")).toBe(false)
+
+		// Set mockFindResult to undefined so find() returns a row (simulating the row was just created by upsertConfig)
+		await manager.saveSourceConfig("user-1", "test", {
+			enabled: true,
+			config: {},
+			credentials: { token: "abc" },
+		})
+
+		// Source should now be in the session
+		expect(session.hasSource("test")).toBe(true)
+		expect(mockUpdateCredentialsCalls).toHaveLength(1)
+	})
+
+	test("throws CredentialStorageUnavailableError when credentials provided without encryptor", async () => {
+		setEnabledSources(["test"])
+		const provider = createStubProvider("test")
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [provider],
+			// No credentialEncryptor
+		})
+
+		await expect(
+			manager.saveSourceConfig("user-1", "test", {
+				enabled: true,
+				config: {},
+				credentials: { token: "abc" },
+			}),
+		).rejects.toBeInstanceOf(CredentialStorageUnavailableError)
+	})
+
+	test("throws SourceNotFoundError for unknown provider", async () => {
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [],
+			credentialEncryptor: testEncryptor,
+		})
+
+		await expect(
+			manager.saveSourceConfig("user-1", "unknown", {
+				enabled: true,
+				config: {},
+			}),
+		).rejects.toBeInstanceOf(SourceNotFoundError)
+	})
+})

apps/freya-backend/src/session/user-session-manager.ts

@@ -1,13 +1,18 @@
-import type { FeedSource } from "@aelis/core"
+import type { FeedSource } from "@freya/core"
 
 import { type } from "arktype"
 import merge from "lodash.merge"
 
 import type { Database } from "../db/index.ts"
 import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
+import type { CredentialEncryptor } from "../lib/crypto.ts"
 import type { FeedSourceProvider } from "./feed-source-provider.ts"
 
-import { InvalidSourceConfigError, SourceNotFoundError } from "../sources/errors.ts"
+import {
+	CredentialStorageUnavailableError,
+	InvalidSourceConfigError,
+	SourceNotFoundError,
+} from "../sources/errors.ts"
 import { sources } from "../sources/user-sources.ts"
 import { UserSession } from "./user-session.ts"
 
@@ -15,6 +20,7 @@ export interface UserSessionManagerConfig {
 	db: Database
 	providers: FeedSourceProvider[]
 	feedEnhancer?: FeedEnhancer | null
+	credentialEncryptor?: CredentialEncryptor | null
 }
 
 export class UserSessionManager {
@@ -23,7 +29,7 @@ export class UserSessionManager {
 	private readonly db: Database
 	private readonly providers = new Map<string, FeedSourceProvider>()
 	private readonly feedEnhancer: FeedEnhancer | null
-	private readonly db: Database
+	private readonly encryptor: CredentialEncryptor | null
 
 	constructor(config: UserSessionManagerConfig) {
 		this.db = config.db
@@ -31,7 +37,7 @@ export class UserSessionManager {
 			this.providers.set(provider.sourceId, provider)
 		}
 		this.feedEnhancer = config.feedEnhancer ?? null
-		this.db = config.db
+		this.encryptor = config.credentialEncryptor ?? null
 	}
 
 	getProvider(sourceId: string): FeedSourceProvider | undefined {
@@ -120,26 +126,29 @@ export class UserSessionManager {
 			return
 		}
 
-		// When config is provided, fetch existing to deep-merge before validating.
-		// NOTE: find + updateConfig is not atomic. A concurrent update could
-		// read stale config. Use SELECT FOR UPDATE or atomic jsonb merge if
-		// this becomes a problem.
-		let mergedConfig: Record<string, unknown> | undefined
-		if (update.config !== undefined && provider.configSchema) {
-			const existing = await sources(this.db, userId).find(sourceId)
-			const existingConfig = (existing?.config ?? {}) as Record<string, unknown>
-			mergedConfig = merge({}, existingConfig, update.config)
+		// Use a transaction with SELECT FOR UPDATE to prevent lost updates
+		// when concurrent PATCH requests merge config against the same base.
+		const { existingRow, mergedConfig } = await this.db.transaction(async (tx) => {
+			const existingRow = await sources(tx, userId).findForUpdate(sourceId)
 
-			const validated = provider.configSchema(mergedConfig)
-			if (validated instanceof type.errors) {
-				throw new InvalidSourceConfigError(sourceId, validated.summary)
+			let mergedConfig: Record<string, unknown> | undefined
+			if (update.config !== undefined && provider.configSchema) {
+				const existingConfig = (existingRow?.config ?? {}) as Record<string, unknown>
+				mergedConfig = merge({}, existingConfig, update.config)
+
+				const validated = provider.configSchema(mergedConfig)
+				if (validated instanceof type.errors) {
+					throw new InvalidSourceConfigError(sourceId, validated.summary)
+				}
 			}
-		}
 
-		// Throws SourceNotFoundError if the row doesn't exist
-		await sources(this.db, userId).updateConfig(sourceId, {
-			enabled: update.enabled,
-			config: mergedConfig,
+			// Throws SourceNotFoundError if the row doesn't exist
+			await sources(tx, userId).updateConfig(sourceId, {
+				enabled: update.enabled,
+				config: mergedConfig,
+			})
+
+			return { existingRow, mergedConfig }
 		})
 
 		// Refresh the specific source in the active session instead of
@@ -149,7 +158,10 @@ export class UserSessionManager {
 			if (update.enabled === false) {
 				session.removeSource(sourceId)
 			} else {
-				const source = await provider.feedSourceForUser(userId, mergedConfig ?? {})
+				const credentials = existingRow?.credentials
+					? this.decryptCredentials(existingRow.credentials)
+					: null
+				const source = await provider.feedSourceForUser(userId, mergedConfig ?? {}, credentials)
 				session.replaceSource(sourceId, source)
 			}
 		}
@@ -161,13 +173,18 @@ export class UserSessionManager {
 	 * inserts a new row if one doesn't exist and fully replaces config
 	 * (no merge).
 	 *
+	 * When `credentials` is provided, they are encrypted and persisted
+	 * alongside the config in the same flow, avoiding the race condition
+	 * of separate config + credential requests.
+	 *
 	 * @throws {SourceNotFoundError} if the sourceId has no registered provider
 	 * @throws {InvalidSourceConfigError} if config fails schema validation
+	 * @throws {CredentialStorageUnavailableError} if credentials are provided but no encryptor is configured
 	 */
-	async upsertSourceConfig(
+	async saveSourceConfig(
 		userId: string,
 		sourceId: string,
-		data: { enabled: boolean; config?: unknown },
+		data: { enabled: boolean; config?: unknown; credentials?: unknown },
 	): Promise<void> {
 		const provider = this.providers.get(sourceId)
 		if (!provider) {
@@ -181,10 +198,28 @@ export class UserSessionManager {
 			}
 		}
 
+		if (data.credentials !== undefined && !this.encryptor) {
+			throw new CredentialStorageUnavailableError()
+		}
+
 		const config = data.config ?? {}
-		await sources(this.db, userId).upsertConfig(sourceId, {
-			enabled: data.enabled,
-			config,
+
+		// Run the upsert + credential update atomically so a failure in
+		// either step doesn't leave the row in an inconsistent state.
+		const existingRow = await this.db.transaction(async (tx) => {
+			const existing = await sources(tx, userId).find(sourceId)
+
+			await sources(tx, userId).upsertConfig(sourceId, {
+				enabled: data.enabled,
+				config,
+			})
+
+			if (data.credentials !== undefined && this.encryptor) {
+				const encrypted = this.encryptor.encrypt(JSON.stringify(data.credentials))
+				await sources(tx, userId).updateCredentials(sourceId, encrypted)
+			}
+
+			return existing
 		})
 
 		const session = this.sessions.get(userId)
@@ -192,7 +227,14 @@ export class UserSessionManager {
 			if (!data.enabled) {
 				session.removeSource(sourceId)
 			} else {
-				const source = await provider.feedSourceForUser(userId, config)
+				// Prefer the just-provided credentials over what was in the DB.
+				let credentials: unknown = null
+				if (data.credentials !== undefined) {
+					credentials = data.credentials
+				} else if (existingRow?.credentials) {
+					credentials = this.decryptCredentials(existingRow.credentials)
+				}
+				const source = await provider.feedSourceForUser(userId, config, credentials)
 				if (session.hasSource(sourceId)) {
 					session.replaceSource(sourceId, source)
 				} else {
@@ -202,6 +244,44 @@ export class UserSessionManager {
 		}
 	}
 
+	/**
+	 * Validates, encrypts, and persists per-user credentials for a source,
+	 * then refreshes the active session.
+	 *
+	 * @throws {SourceNotFoundError} if the source row doesn't exist or has no registered provider
+	 * @throws {CredentialStorageUnavailableError} if no CredentialEncryptor is configured
+	 */
+	async updateSourceCredentials(
+		userId: string,
+		sourceId: string,
+		credentials: unknown,
+	): Promise<void> {
+		const provider = this.providers.get(sourceId)
+		if (!provider) {
+			throw new SourceNotFoundError(sourceId, userId)
+		}
+
+		if (!this.encryptor) {
+			throw new CredentialStorageUnavailableError()
+		}
+
+		const encrypted = this.encryptor.encrypt(JSON.stringify(credentials))
+		await sources(this.db, userId).updateCredentials(sourceId, encrypted)
+
+		// Refresh the source in the active session.
+		// If feedSourceForUser throws (e.g. provider rejects the credentials),
+		// the DB already has the new credentials but the session keeps the old
+		// source. The next session creation will pick up the persisted credentials.
+		const session = this.sessions.get(userId)
+		if (session && session.hasSource(sourceId)) {
+			const row = await sources(this.db, userId).find(sourceId)
+			if (row?.enabled) {
+				const source = await provider.feedSourceForUser(userId, row.config ?? {}, credentials)
+				session.replaceSource(sourceId, source)
+			}
+		}
+	}
+
 	/**
 	 * Replaces a provider and updates all active sessions.
 	 * The new provider must have the same sourceId as an existing one.
@@ -254,7 +334,12 @@ export class UserSessionManager {
 			const row = await sources(this.db, session.userId).find(provider.sourceId)
 			if (!row?.enabled) return
 
-			const newSource = await provider.feedSourceForUser(session.userId, row.config ?? {})
+			const credentials = row.credentials ? this.decryptCredentials(row.credentials) : null
+			const newSource = await provider.feedSourceForUser(
+				session.userId,
+				row.config ?? {},
+				credentials,
+			)
 			session.replaceSource(provider.sourceId, newSource)
 		} catch (err) {
 			console.error(
@@ -271,7 +356,8 @@ export class UserSessionManager {
 		for (const row of enabledRows) {
 			const provider = this.providers.get(row.sourceId)
 			if (provider) {
-				promises.push(provider.feedSourceForUser(userId, row.config ?? {}))
+				const credentials = row.credentials ? this.decryptCredentials(row.credentials) : null
+				promises.push(provider.feedSourceForUser(userId, row.config ?? {}, credentials))
 			}
 		}
 
@@ -302,4 +388,19 @@ export class UserSessionManager {
 
 		return new UserSession(userId, feedSources, this.feedEnhancer)
 	}
+
+	/**
+	 * Decrypts a credentials buffer from the DB, returning parsed JSON or null.
+	 * Returns null (with a warning) if decryption or parsing fails — e.g. due to
+	 * key rotation, data corruption, or malformed JSON.
+	 */
+	private decryptCredentials(credentials: Buffer): unknown {
+		if (!this.encryptor) return null
+		try {
+			return JSON.parse(this.encryptor.decrypt(credentials))
+		} catch (err) {
+			console.warn("[UserSessionManager] Failed to decrypt credentials:", err)
+			return null
+		}
+	}
 }

apps/freya-backend/src/session/user-session.test.ts

@@ -1,6 +1,6 @@
-import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
+import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
 
-import { LocationSource } from "@aelis/source-location"
+import { LocationSource } from "@freya/source-location"
 import { describe, expect, spyOn, test } from "bun:test"
 
 import { UserSession } from "./user-session.ts"
@@ -39,7 +39,7 @@ describe("UserSession", () => {
 		const location = new LocationSource()
 		const session = new UserSession("test-user", [location])
 
-		const result = session.getSource<LocationSource>("aelis.location")
+		const result = session.getSource<LocationSource>("freya.location")
 
 		expect(result).toBe(location)
 	})
@@ -62,7 +62,7 @@ describe("UserSession", () => {
 		const location = new LocationSource()
 		const session = new UserSession("test-user", [location])
 
-		await session.engine.executeAction("aelis.location", "update-location", {
+		await session.engine.executeAction("freya.location", "update-location", {
 			lat: 51.5,
 			lng: -0.1,
 			accuracy: 10,

apps/freya-backend/src/session/user-session.ts

@@ -1,4 +1,4 @@
-import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aelis/core"
+import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@freya/core"
 
 import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"