fix(backend): reject unknown fields in source config

Add "+": "reject" to all arktype schemas so undeclared
keys return 400. Sources without a configSchema now
reject the config field entirely at the HTTP layer.

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 && ./scripts/setup-tailscale.sh",
+	"postStartCommand": "./scripts/setup-git.sh && ./scripts/setup-nvim.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": {

.ona/automations.yaml

@@ -17,29 +17,3 @@ services:
         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 http
-        TS_IP=$(tailscale ip -4)
-        echo ""
-        echo "------------------ Bun Debugger ------------------"
-        echo "https://debug.bun.sh/#${TS_IP}:6499"
-        echo "------------------ Bun Debugger ------------------"
-        echo ""
-        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 http
-        cd apps/admin-dashboard && bun run dev --host

apps/admin-dashboard/.gitignore

@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

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/README.md

@@ -1,21 +0,0 @@
-# React + TypeScript + Vite + shadcn/ui
-
-This is a template for a new Vite project with React, TypeScript, and shadcn/ui.
-
-## Adding components
-
-To add components to your app, run the following command:
-
-```bash
-npx shadcn@latest add button
-```
-
-This will place the ui components in the `src/components` directory.
-
-## Using components
-
-To use the components in your app, import them as follows:
-
-```tsx
-import { Button } from "@/components/ui/button"
-```

apps/admin-dashboard/components.json

@@ -1,25 +0,0 @@
-{
-  "$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 +0,0 @@
-<!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>
-</html>

apps/admin-dashboard/package.json

@@ -1,48 +0,0 @@
-{
-  "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"
-  }
-}

apps/admin-dashboard/public/vite.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

apps/admin-dashboard/src/App.tsx

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

apps/admin-dashboard/src/assets/react.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

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

@@ -1,146 +0,0 @@
-import { useQuery } from "@tanstack/react-query"
-import { useState } from "react"
-import { Loader2, RefreshCw, TriangleAlert } from "lucide-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"
-
-export function FeedPanel() {
-  const {
-    data: feed,
-    error: feedError,
-    isFetching,
-    refetch,
-  } = useQuery({
-    queryKey: ["feed"],
-    queryFn: fetchFeed,
-    enabled: false,
-  })
-
-  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>
-
-      {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 && (
-        <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)
-
-  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 +0,0 @@
-import { useQuery } from "@tanstack/react-query"
-import { CircleCheck, CircleX, Loader2 } from "lucide-react"
-
-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
-}
-
-export function GeneralSettingsPanel() {
-  const serverUrl = getServerUrl()
-
-  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
-
-  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>
-  )
-}

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

@@ -1,100 +0,0 @@
-import { useMutation } from "@tanstack/react-query"
-import { useState } from "react"
-import { Loader2, Settings2 } from "lucide-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"
-
-interface LoginPageProps {
-  onLogin: (session: AuthSession) => void
-}
-
-export function LoginPage({ onLogin }: LoginPageProps) {
-  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)
-    },
-  })
-
-  function handleSubmit(e: React.FormEvent) {
-    e.preventDefault()
-    loginMutation.mutate()
-  }
-
-  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>
-
-
-            <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,500 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
-import { useState } from "react"
-import { Info, Loader2, MapPin, Trash2 } from "lucide-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"
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
-import { Input } from "@/components/ui/input"
-import { Label } from "@/components/ui/label"
-import {
-  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"
-
-interface SourceConfigPanelProps {
-  source: SourceDefinition
-  onUpdate: () => void
-}
-
-export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps) {
-  const queryClient = useQueryClient()
-  const [dirty, setDirty] = useState<Record<string, unknown>>({})
-
-  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 }
-
-  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 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()
-  }
-
-  const saveMutation = useMutation({
-    mutationFn: async () => {
-      const promises: Promise<void>[] = [
-        replaceSource(source.id, { enabled, config: getUserConfig() }),
-      ]
-
-      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 }),
-        )
-      }
-
-      await Promise.all(promises)
-    },
-    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 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 }))
-  }
-
-  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)
-
-  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>
-            )}
-
-          </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>
-          )}
-
-          {/* 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>
-        </>
-      )}
-
-      {/* 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>
-  )
-}
-
-function LocationCard() {
-  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)
-    },
-  })
-
-  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}`)
-      },
-    )
-  }
-
-  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>
-  )
-}
-
-function FieldInput({
-  name,
-  field,
-  value,
-  onChange,
-  disabled,
-}: {
-  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>
-  )
-
-  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 === "multiselect" && field.options) {
-    const selected = Array.isArray(value) ? (value as string[]) : []
-
-    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,
-): 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 if (field.type === "multiselect") {
-      values[name] = []
-    } else {
-      values[name] = field.type === "number" ? undefined : ""
-    }
-  }
-  return values
-}

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

@@ -1,230 +0,0 @@
-/* eslint-disable react-refresh/only-export-components */
-import * as React from "react"
-
-type Theme = "dark" | "light" | "system"
-type ResolvedTheme = "dark" | "light"
-
-type ThemeProviderProps = {
-  children: React.ReactNode
-  defaultTheme?: Theme
-  storageKey?: string
-  disableTransitionOnChange?: boolean
-}
-
-type ThemeProviderState = {
-  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)
-
-function isTheme(value: string | null): value is Theme {
-  if (value === null) {
-    return false
-  }
-
-  return THEME_VALUES.includes(value as Theme)
-}
-
-function getSystemTheme(): ResolvedTheme {
-  if (window.matchMedia(COLOR_SCHEME_QUERY).matches) {
-    return "dark"
-  }
-
-  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)
-
-  return () => {
-    window.getComputedStyle(document.body)
-    requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        style.remove()
-      })
-    })
-  }
-}
-
-function isEditableTarget(target: EventTarget | null) {
-  if (!(target instanceof HTMLElement)) {
-    return false
-  }
-
-  if (target.isContentEditable) {
-    return true
-  }
-
-  const editableParent = target.closest(
-    "input, textarea, select, [contenteditable='true']"
-  )
-  if (editableParent) {
-    return true
-  }
-
-  return false
-}
-
-export function ThemeProvider({
-  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
-    }
-
-    return defaultTheme
-  })
-
-  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
-
-      root.classList.remove("light", "dark")
-      root.classList.add(resolvedTheme)
-
-      if (restoreTransitions) {
-        restoreTransitions()
-      }
-    },
-    [disableTransitionOnChange]
-  )
-
-  React.useEffect(() => {
-    applyTheme(theme)
-
-    if (theme !== "system") {
-      return undefined
-    }
-
-    const mediaQuery = window.matchMedia(COLOR_SCHEME_QUERY)
-    const handleChange = () => {
-      applyTheme("system")
-    }
-
-    mediaQuery.addEventListener("change", handleChange)
-
-    return () => {
-      mediaQuery.removeEventListener("change", handleChange)
-    }
-  }, [theme, applyTheme])
-
-  React.useEffect(() => {
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.repeat) {
-        return
-      }
-
-      if (event.metaKey || event.ctrlKey || event.altKey) {
-        return
-      }
-
-      if (isEditableTarget(event.target)) {
-        return
-      }
-
-      if (event.key.toLowerCase() !== "d") {
-        return
-      }
-
-      setThemeState((currentTheme) => {
-        const nextTheme =
-          currentTheme === "dark"
-            ? "light"
-            : currentTheme === "light"
-              ? "dark"
-              : getSystemTheme() === "dark"
-                ? "light"
-                : "dark"
-
-        localStorage.setItem(storageKey, nextTheme)
-        return nextTheme
-      })
-    }
-
-    window.addEventListener("keydown", handleKeyDown)
-
-    return () => {
-      window.removeEventListener("keydown", handleKeyDown)
-    }
-  }, [storageKey])
-
-  React.useEffect(() => {
-    const handleStorageChange = (event: StorageEvent) => {
-      if (event.storageArea !== localStorage) {
-        return
-      }
-
-      if (event.key !== storageKey) {
-        return
-      }
-
-      if (isTheme(event.newValue)) {
-        setThemeState(event.newValue)
-        return
-      }
-
-      setThemeState(defaultTheme)
-    }
-
-    window.addEventListener("storage", handleStorageChange)
-
-    return () => {
-      window.removeEventListener("storage", handleStorageChange)
-    }
-  }, [defaultTheme, storageKey])
-
-  const value = React.useMemo(
-    () => ({
-      theme,
-      setTheme,
-    }),
-    [theme, setTheme]
-  )
-
-  return (
-    <ThemeProviderContext.Provider {...props} value={value}>
-      {children}
-    </ThemeProviderContext.Provider>
-  )
-}
-
-export const useTheme = () => {
-  const context = React.useContext(ThemeProviderContext)
-
-  if (context === undefined) {
-    throw new Error("useTheme must be used within a ThemeProvider")
-  }
-
-  return context
-}

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

@@ -1,84 +0,0 @@
-"use client"
-
-import * as React from "react"
-import { Accordion as AccordionPrimitive } from "radix-ui"
-
-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 AccordionItem({
-  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}
-    />
-  )
-}
-
-function AccordionTrigger({
-  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>
-  )
-}
-
-function AccordionContent({
-  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>
-  )
-}
-
-export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }

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

@@ -1,76 +0,0 @@
-import * as React from "react"
-import { cva, type VariantProps } from "class-variance-authority"
-
-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",
-    },
-  }
-)
-
-function Alert({
-  className,
-  variant,
-  ...props
-}: React.ComponentProps<"div"> & VariantProps<typeof alertVariants>) {
-  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}
-    />
-  )
-}
-
-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}
-    />
-  )
-}
-
-export { Alert, AlertTitle, AlertDescription, AlertAction }

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

@@ -1,49 +0,0 @@
-import * as React from "react"
-import { cva, type VariantProps } from "class-variance-authority"
-import { Slot } from "radix-ui"
-
-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",
-    },
-  }
-)
-
-function Badge({
-  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}
-    />
-  )
-}
-
-export { Badge, badgeVariants }

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

@@ -1,65 +0,0 @@
-import * as React from "react"
-import { cva, type VariantProps } from "class-variance-authority"
-import { Slot } from "radix-ui"
-
-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",
-    },
-  }
-)
-
-function Button({
-  className,
-  variant = "default",
-  size = "default",
-  asChild = false,
-  ...props
-}: React.ComponentProps<"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}
-    />
-  )
-}
-
-export { Button, buttonVariants }

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

@@ -1,100 +0,0 @@
-import * as React from "react"
-
-import { cn } from "@/lib/utils"
-
-function Card({
-  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}
-    />
-  )
-}
-
-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}
-    />
-  )
-}
-
-function CardTitle({ className, ...props }: React.ComponentProps<"div">) {
-  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}
-    />
-  )
-}
-
-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}
-    />
-  )
-}
-
-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}
-    />
-  )
-}
-
-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}
-    />
-  )
-}
-
-export {
-  Card,
-  CardHeader,
-  CardFooter,
-  CardTitle,
-  CardAction,
-  CardDescription,
-  CardContent,
-}

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

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

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

@@ -1,19 +0,0 @@
-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}
-    />
-  )
-}
-
-export { Input }

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

@@ -1,22 +0,0 @@
-import * as React from "react"
-import { Label as LabelPrimitive } from "radix-ui"
-
-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}
-    />
-  )
-}
-
-export { Label }

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

@@ -1,193 +0,0 @@
-import * as React from "react"
-import { Select as SelectPrimitive } from "radix-ui"
-
-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 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 SelectTrigger({
-  className,
-  size = "default",
-  children,
-  ...props
-}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
-  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>
-  )
-}
-
-function SelectContent({
-  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>
-  )
-}
-
-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
-}: 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>
-  )
-}
-
-function SelectSeparator({
-  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}
-    />
-  )
-}
-
-function SelectScrollUpButton({
-  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>
-  )
-}
-
-function SelectScrollDownButton({
-  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>
-  )
-}
-
-export {
-  Select,
-  SelectContent,
-  SelectGroup,
-  SelectItem,
-  SelectLabel,
-  SelectScrollDownButton,
-  SelectScrollUpButton,
-  SelectSeparator,
-  SelectTrigger,
-  SelectValue,
-}

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

@@ -1,26 +0,0 @@
-import * as React from "react"
-import { Separator as SeparatorPrimitive } from "radix-ui"
-
-import { cn } from "@/lib/utils"
-
-function Separator({
-  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}
-    />
-  )
-}
-
-export { Separator }

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

@@ -1,142 +0,0 @@
-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"
-
-function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {
-  return <SheetPrimitive.Root data-slot="sheet" {...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 SheetPortal({
-  ...props
-}: React.ComponentProps<typeof SheetPrimitive.Portal>) {
-  return <SheetPrimitive.Portal data-slot="sheet-portal" {...props} />
-}
-
-function SheetOverlay({
-  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}
-    />
-  )
-}
-
-function SheetContent({
-  className,
-  children,
-  side = "right",
-  showCloseButton = true,
-  ...props
-}: React.ComponentProps<typeof SheetPrimitive.Content> & {
-  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>
-  )
-}
-
-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}
-    />
-  )
-}
-
-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}
-    />
-  )
-}
-
-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
-}: React.ComponentProps<typeof SheetPrimitive.Description>) {
-  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,
-}

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

@@ -1,708 +0,0 @@
-"use client"
-
-import * as React from "react"
-import { cva, type VariantProps } from "class-variance-authority"
-import { Slot } from "radix-ui"
-
-import { useIsMobile } from "@/hooks/use-mobile"
-import { cn } from "@/lib/utils"
-import { Button } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
-import { Separator } from "@/components/ui/separator"
-import {
-  Sheet,
-  SheetContent,
-  SheetDescription,
-  SheetHeader,
-  SheetTitle,
-} from "@/components/ui/sheet"
-import { Skeleton } from "@/components/ui/skeleton"
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from "@/components/ui/tooltip"
-import { PanelLeftIcon } from "lucide-react"
-
-const SIDEBAR_COOKIE_NAME = "sidebar_state"
-const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7
-const SIDEBAR_WIDTH = "16rem"
-const SIDEBAR_WIDTH_MOBILE = "18rem"
-const SIDEBAR_WIDTH_ICON = "3rem"
-const SIDEBAR_KEYBOARD_SHORTCUT = "b"
-
-type SidebarContextProps = {
-  state: "expanded" | "collapsed"
-  open: boolean
-  setOpen: (open: boolean) => void
-  openMobile: boolean
-  setOpenMobile: (open: boolean) => void
-  isMobile: boolean
-  toggleSidebar: () => void
-}
-
-const SidebarContext = React.createContext<SidebarContextProps | null>(null)
-
-function useSidebar() {
-  const context = React.useContext(SidebarContext)
-  if (!context) {
-    throw new Error("useSidebar must be used within a SidebarProvider.")
-  }
-
-  return context
-}
-
-function SidebarProvider({
-  defaultOpen = true,
-  open: openProp,
-  onOpenChange: setOpenProp,
-  className,
-  style,
-  children,
-  ...props
-}: React.ComponentProps<"div"> & {
-  defaultOpen?: boolean
-  open?: boolean
-  onOpenChange?: (open: boolean) => void
-}) {
-  const isMobile = useIsMobile()
-  const [openMobile, setOpenMobile] = React.useState(false)
-
-  // This is the internal state of the sidebar.
-  // We use openProp and setOpenProp for control from outside the component.
-  const [_open, _setOpen] = React.useState(defaultOpen)
-  const open = openProp ?? _open
-  const setOpen = React.useCallback(
-    (value: boolean | ((value: boolean) => boolean)) => {
-      const openState = typeof value === "function" ? value(open) : value
-      if (setOpenProp) {
-        setOpenProp(openState)
-      } else {
-        _setOpen(openState)
-      }
-
-      // This sets the cookie to keep the sidebar state.
-      document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`
-    },
-    [setOpenProp, open]
-  )
-
-  // Helper to toggle the sidebar.
-  const toggleSidebar = React.useCallback(() => {
-    return isMobile ? setOpenMobile((open) => !open) : setOpen((open) => !open)
-  }, [isMobile, setOpen, setOpenMobile])
-
-  // Adds a keyboard shortcut to toggle the sidebar.
-  React.useEffect(() => {
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (
-        event.key === SIDEBAR_KEYBOARD_SHORTCUT &&
-        (event.metaKey || event.ctrlKey)
-      ) {
-        event.preventDefault()
-        toggleSidebar()
-      }
-    }
-
-    window.addEventListener("keydown", handleKeyDown)
-    return () => window.removeEventListener("keydown", handleKeyDown)
-  }, [toggleSidebar])
-
-  // We add a state so that we can do data-state="expanded" or "collapsed".
-  // This makes it easier to style the sidebar with Tailwind classes.
-  const state = open ? "expanded" : "collapsed"
-
-  const contextValue = React.useMemo<SidebarContextProps>(
-    () => ({
-      state,
-      open,
-      setOpen,
-      isMobile,
-      openMobile,
-      setOpenMobile,
-      toggleSidebar,
-    }),
-    [state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar]
-  )
-
-  return (
-    <SidebarContext.Provider value={contextValue}>
-      <div
-        data-slot="sidebar-wrapper"
-        style={
-          {
-            "--sidebar-width": SIDEBAR_WIDTH,
-            "--sidebar-width-icon": SIDEBAR_WIDTH_ICON,
-            ...style,
-          } as React.CSSProperties
-        }
-        className={cn(
-          "group/sidebar-wrapper flex min-h-svh w-full has-data-[variant=inset]:bg-sidebar",
-          className
-        )}
-        {...props}
-      >
-        {children}
-      </div>
-    </SidebarContext.Provider>
-  )
-}
-
-function Sidebar({
-  side = "left",
-  variant = "sidebar",
-  collapsible = "offcanvas",
-  className,
-  children,
-  dir,
-  ...props
-}: React.ComponentProps<"div"> & {
-  side?: "left" | "right"
-  variant?: "sidebar" | "floating" | "inset"
-  collapsible?: "offcanvas" | "icon" | "none"
-}) {
-  const { isMobile, state, openMobile, setOpenMobile } = useSidebar()
-
-  if (collapsible === "none") {
-    return (
-      <div
-        data-slot="sidebar"
-        className={cn(
-          "flex h-full w-(--sidebar-width) flex-col bg-sidebar text-sidebar-foreground",
-          className
-        )}
-        {...props}
-      >
-        {children}
-      </div>
-    )
-  }
-
-  if (isMobile) {
-    return (
-      <Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>
-        <SheetContent
-          dir={dir}
-          data-sidebar="sidebar"
-          data-slot="sidebar"
-          data-mobile="true"
-          className="w-(--sidebar-width) bg-sidebar p-0 text-sidebar-foreground [&>button]:hidden"
-          style={
-            {
-              "--sidebar-width": SIDEBAR_WIDTH_MOBILE,
-            } as React.CSSProperties
-          }
-          side={side}
-        >
-          <SheetHeader className="sr-only">
-            <SheetTitle>Sidebar</SheetTitle>
-            <SheetDescription>Displays the mobile sidebar.</SheetDescription>
-          </SheetHeader>
-          <div className="flex h-full w-full flex-col">{children}</div>
-        </SheetContent>
-      </Sheet>
-    )
-  }
-
-  return (
-    <div
-      className="group peer hidden text-sidebar-foreground md:block"
-      data-state={state}
-      data-collapsible={state === "collapsed" ? collapsible : ""}
-      data-variant={variant}
-      data-side={side}
-      data-slot="sidebar"
-    >
-      {/* This is what handles the sidebar gap on desktop */}
-      <div
-        data-slot="sidebar-gap"
-        className={cn(
-          "relative w-(--sidebar-width) bg-transparent transition-[width] duration-200 ease-linear",
-          "group-data-[collapsible=offcanvas]:w-0",
-          "group-data-[side=right]:rotate-180",
-          variant === "floating" || variant === "inset"
-            ? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]"
-            : "group-data-[collapsible=icon]:w-(--sidebar-width-icon)"
-        )}
-      />
-      <div
-        data-slot="sidebar-container"
-        data-side={side}
-        className={cn(
-          "fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear data-[side=left]:left-0 data-[side=left]:group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)] data-[side=right]:right-0 data-[side=right]:group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)] md:flex",
-          // Adjust the padding for floating and inset variants.
-          variant === "floating" || variant === "inset"
-            ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]"
-            : "group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l",
-          className
-        )}
-        {...props}
-      >
-        <div
-          data-sidebar="sidebar"
-          data-slot="sidebar-inner"
-          className="flex size-full flex-col bg-sidebar group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:shadow-sm group-data-[variant=floating]:ring-1 group-data-[variant=floating]:ring-sidebar-border"
-        >
-          {children}
-        </div>
-      </div>
-    </div>
-  )
-}
-
-function SidebarTrigger({
-  className,
-  onClick,
-  ...props
-}: React.ComponentProps<typeof Button>) {
-  const { toggleSidebar } = useSidebar()
-
-  return (
-    <Button
-      data-sidebar="trigger"
-      data-slot="sidebar-trigger"
-      variant="ghost"
-      size="icon-sm"
-      className={cn(className)}
-      onClick={(event) => {
-        onClick?.(event)
-        toggleSidebar()
-      }}
-      {...props}
-    >
-      <PanelLeftIcon />
-      <span className="sr-only">Toggle Sidebar</span>
-    </Button>
-  )
-}
-
-function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {
-  const { toggleSidebar } = useSidebar()
-
-  return (
-    <button
-      data-sidebar="rail"
-      data-slot="sidebar-rail"
-      aria-label="Toggle Sidebar"
-      tabIndex={-1}
-      onClick={toggleSidebar}
-      title="Toggle Sidebar"
-      className={cn(
-        "absolute inset-y-0 z-20 hidden w-4 transition-all ease-linear group-data-[side=left]:-right-4 group-data-[side=right]:left-0 after:absolute after:inset-y-0 after:start-1/2 after:w-[2px] hover:after:bg-sidebar-border sm:flex ltr:-translate-x-1/2 rtl:-translate-x-1/2",
-        "in-data-[side=left]:cursor-w-resize in-data-[side=right]:cursor-e-resize",
-        "[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
-        "group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full hover:group-data-[collapsible=offcanvas]:bg-sidebar",
-        "[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",
-        "[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
-  return (
-    <main
-      data-slot="sidebar-inset"
-      className={cn(
-        "relative flex w-full flex-1 flex-col bg-background md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function SidebarInput({
-  className,
-  ...props
-}: React.ComponentProps<typeof Input>) {
-  return (
-    <Input
-      data-slot="sidebar-input"
-      data-sidebar="input"
-      className={cn(
-        "h-8 w-full border-input bg-muted/20 dark:bg-muted/30",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="sidebar-header"
-      data-sidebar="header"
-      className={cn("flex flex-col gap-2 p-2", className)}
-      {...props}
-    />
-  )
-}
-
-function SidebarFooter({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="sidebar-footer"
-      data-sidebar="footer"
-      className={cn("flex flex-col gap-2 p-2", className)}
-      {...props}
-    />
-  )
-}
-
-function SidebarSeparator({
-  className,
-  ...props
-}: React.ComponentProps<typeof Separator>) {
-  return (
-    <Separator
-      data-slot="sidebar-separator"
-      data-sidebar="separator"
-      className={cn("mx-2 w-auto bg-sidebar-border", className)}
-      {...props}
-    />
-  )
-}
-
-function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="sidebar-content"
-      data-sidebar="content"
-      className={cn(
-        "no-scrollbar flex min-h-0 flex-1 flex-col gap-0 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="sidebar-group"
-      data-sidebar="group"
-      className={cn(
-        "relative flex w-full min-w-0 flex-col px-2 py-1",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function SidebarGroupLabel({
-  className,
-  asChild = false,
-  ...props
-}: React.ComponentProps<"div"> & { asChild?: boolean }) {
-  const Comp = asChild ? Slot.Root : "div"
-
-  return (
-    <Comp
-      data-slot="sidebar-group-label"
-      data-sidebar="group-label"
-      className={cn(
-        "flex h-8 shrink-0 items-center rounded-md px-2 text-xs text-sidebar-foreground/70 ring-sidebar-ring outline-hidden transition-[margin,opacity] duration-200 ease-linear group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0 focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function SidebarGroupAction({
-  className,
-  asChild = false,
-  ...props
-}: React.ComponentProps<"button"> & { asChild?: boolean }) {
-  const Comp = asChild ? Slot.Root : "button"
-
-  return (
-    <Comp
-      data-slot="sidebar-group-action"
-      data-sidebar="group-action"
-      className={cn(
-        "absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground ring-sidebar-ring outline-hidden transition-transform group-data-[collapsible=icon]:hidden after:absolute after:-inset-2 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 md:after:hidden [&>svg]:size-4 [&>svg]:shrink-0",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function SidebarGroupContent({
-  className,
-  ...props
-}: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="sidebar-group-content"
-      data-sidebar="group-content"
-      className={cn("w-full text-xs", className)}
-      {...props}
-    />
-  )
-}
-
-function SidebarMenu({ className, ...props }: React.ComponentProps<"ul">) {
-  return (
-    <ul
-      data-slot="sidebar-menu"
-      data-sidebar="menu"
-      className={cn("flex w-full min-w-0 flex-col gap-px", className)}
-      {...props}
-    />
-  )
-}
-
-function SidebarMenuItem({ className, ...props }: React.ComponentProps<"li">) {
-  return (
-    <li
-      data-slot="sidebar-menu-item"
-      data-sidebar="menu-item"
-      className={cn("group/menu-item relative", className)}
-      {...props}
-    />
-  )
-}
-
-const sidebarMenuButtonVariants = cva(
-  "peer/menu-button group/menu-button flex w-full items-center gap-2 overflow-hidden rounded-[calc(var(--radius-sm)+2px)] p-2 text-left text-xs ring-sidebar-ring outline-hidden transition-[width,height,padding] group-has-data-[sidebar=menu-action]/menu-item:pr-8 group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-open:hover:bg-sidebar-accent data-open:hover:text-sidebar-accent-foreground data-active:bg-sidebar-accent data-active:font-medium data-active:text-sidebar-accent-foreground [&_svg]:size-4 [&_svg]:shrink-0 [&>span:last-child]:truncate",
-  {
-    variants: {
-      variant: {
-        default: "hover:bg-sidebar-accent hover:text-sidebar-accent-foreground",
-        outline:
-          "bg-background shadow-[0_0_0_1px_hsl(var(--sidebar-border))] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--sidebar-accent))]",
-      },
-      size: {
-        default: "h-8 text-xs",
-        sm: "h-7 text-xs",
-        lg: "h-12 text-xs group-data-[collapsible=icon]:p-0!",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-      size: "default",
-    },
-  }
-)
-
-function SidebarMenuButton({
-  asChild = false,
-  isActive = false,
-  variant = "default",
-  size = "default",
-  tooltip,
-  className,
-  ...props
-}: React.ComponentProps<"button"> & {
-  asChild?: boolean
-  isActive?: boolean
-  tooltip?: string | React.ComponentProps<typeof TooltipContent>
-} & VariantProps<typeof sidebarMenuButtonVariants>) {
-  const Comp = asChild ? Slot.Root : "button"
-  const { isMobile, state } = useSidebar()
-
-  const button = (
-    <Comp
-      data-slot="sidebar-menu-button"
-      data-sidebar="menu-button"
-      data-size={size}
-      data-active={isActive}
-      className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
-      {...props}
-    />
-  )
-
-  if (!tooltip) {
-    return button
-  }
-
-  if (typeof tooltip === "string") {
-    tooltip = {
-      children: tooltip,
-    }
-  }
-
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild>{button}</TooltipTrigger>
-      <TooltipContent
-        side="right"
-        align="center"
-        hidden={state !== "collapsed" || isMobile}
-        {...tooltip}
-      />
-    </Tooltip>
-  )
-}
-
-function SidebarMenuAction({
-  className,
-  asChild = false,
-  showOnHover = false,
-  ...props
-}: React.ComponentProps<"button"> & {
-  asChild?: boolean
-  showOnHover?: boolean
-}) {
-  const Comp = asChild ? Slot.Root : "button"
-
-  return (
-    <Comp
-      data-slot="sidebar-menu-action"
-      data-sidebar="menu-action"
-      className={cn(
-        "absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-[calc(var(--radius-sm)-2px)] p-0 text-sidebar-foreground ring-sidebar-ring outline-hidden transition-transform group-data-[collapsible=icon]:hidden peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[size=default]/menu-button:top-1.5 peer-data-[size=lg]/menu-button:top-2.5 peer-data-[size=sm]/menu-button:top-1 after:absolute after:-inset-2 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 md:after:hidden [&>svg]:size-4 [&>svg]:shrink-0",
-        showOnHover &&
-          "group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 peer-data-active/menu-button:text-sidebar-accent-foreground aria-expanded:opacity-100 md:opacity-0",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function SidebarMenuBadge({
-  className,
-  ...props
-}: React.ComponentProps<"div">) {
-  return (
-    <div
-      data-slot="sidebar-menu-badge"
-      data-sidebar="menu-badge"
-      className={cn(
-        "pointer-events-none absolute right-1 flex h-5 min-w-5 items-center justify-center rounded-[calc(var(--radius-sm)-2px)] px-1 text-xs font-medium text-sidebar-foreground tabular-nums select-none group-data-[collapsible=icon]:hidden peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[size=default]/menu-button:top-1.5 peer-data-[size=lg]/menu-button:top-2.5 peer-data-[size=sm]/menu-button:top-1 peer-data-active/menu-button:text-sidebar-accent-foreground",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function SidebarMenuSkeleton({
-  className,
-  showIcon = false,
-  ...props
-}: React.ComponentProps<"div"> & {
-  showIcon?: boolean
-}) {
-  // Random width between 50 to 90%.
-  const [width] = React.useState(() => {
-    return `${Math.floor(Math.random() * 40) + 50}%`
-  })
-
-  return (
-    <div
-      data-slot="sidebar-menu-skeleton"
-      data-sidebar="menu-skeleton"
-      className={cn("flex h-8 items-center gap-2 rounded-md px-2", className)}
-      {...props}
-    >
-      {showIcon && (
-        <Skeleton
-          className="size-4 rounded-md"
-          data-sidebar="menu-skeleton-icon"
-        />
-      )}
-      <Skeleton
-        className="h-4 max-w-(--skeleton-width) flex-1"
-        data-sidebar="menu-skeleton-text"
-        style={
-          {
-            "--skeleton-width": width,
-          } as React.CSSProperties
-        }
-      />
-    </div>
-  )
-}
-
-function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) {
-  return (
-    <ul
-      data-slot="sidebar-menu-sub"
-      data-sidebar="menu-sub"
-      className={cn(
-        "mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l border-sidebar-border px-2.5 py-0.5 group-data-[collapsible=icon]:hidden",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function SidebarMenuSubItem({
-  className,
-  ...props
-}: React.ComponentProps<"li">) {
-  return (
-    <li
-      data-slot="sidebar-menu-sub-item"
-      data-sidebar="menu-sub-item"
-      className={cn("group/menu-sub-item relative", className)}
-      {...props}
-    />
-  )
-}
-
-function SidebarMenuSubButton({
-  asChild = false,
-  size = "md",
-  isActive = false,
-  className,
-  ...props
-}: React.ComponentProps<"a"> & {
-  asChild?: boolean
-  size?: "sm" | "md"
-  isActive?: boolean
-}) {
-  const Comp = asChild ? Slot.Root : "a"
-
-  return (
-    <Comp
-      data-slot="sidebar-menu-sub-button"
-      data-sidebar="menu-sub-button"
-      data-size={size}
-      data-active={isActive}
-      className={cn(
-        "flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground ring-sidebar-ring outline-hidden group-data-[collapsible=icon]:hidden hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[size=md]:text-xs data-[size=sm]:text-xs data-active:bg-sidebar-accent data-active:text-sidebar-accent-foreground [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-accent-foreground",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-export {
-  Sidebar,
-  SidebarContent,
-  SidebarFooter,
-  SidebarGroup,
-  SidebarGroupAction,
-  SidebarGroupContent,
-  SidebarGroupLabel,
-  SidebarHeader,
-  SidebarInput,
-  SidebarInset,
-  SidebarMenu,
-  SidebarMenuAction,
-  SidebarMenuBadge,
-  SidebarMenuButton,
-  SidebarMenuItem,
-  SidebarMenuSkeleton,
-  SidebarMenuSub,
-  SidebarMenuSubButton,
-  SidebarMenuSubItem,
-  SidebarProvider,
-  SidebarRail,
-  SidebarSeparator,
-  SidebarTrigger,
-  useSidebar,
-}

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

@@ -1,13 +0,0 @@
-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}
-    />
-  )
-}
-
-export { Skeleton }

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

@@ -1,49 +0,0 @@
-"use client"
-
-import { useTheme } from "@/components/theme-provider"
-import { Toaster as Sonner, type ToasterProps } from "sonner"
-import { CircleCheckIcon, InfoIcon, TriangleAlertIcon, OctagonXIcon, Loader2Icon } from "lucide-react"
-
-const Toaster = ({ ...props }: ToasterProps) => {
-  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}
-    />
-  )
-}
-
-export { Toaster }

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

@@ -1,33 +0,0 @@
-"use client"
-
-import * as React from "react"
-import { Switch as SwitchPrimitive } from "radix-ui"
-
-import { cn } from "@/lib/utils"
-
-function Switch({
-  className,
-  size = "default",
-  ...props
-}: React.ComponentProps<typeof SwitchPrimitive.Root> & {
-  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>
-  )
-}
-
-export { Switch }

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

@@ -1,57 +0,0 @@
-"use client"
-
-import * as React from "react"
-import { Tooltip as TooltipPrimitive } from "radix-ui"
-
-import { cn } from "@/lib/utils"
-
-function TooltipProvider({
-  delayDuration = 0,
-  ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Provider>) {
-  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 TooltipTrigger({
-  ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
-  return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />
-}
-
-function TooltipContent({
-  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>
-  )
-}
-
-export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger }

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

@@ -1,19 +0,0 @@
-import * as React from "react"
-
-const MOBILE_BREAKPOINT = 768
-
-export function useIsMobile() {
-  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)
-  }, [])
-
-  return !!isMobile
-}

apps/admin-dashboard/src/index.css

@@ -1,129 +0,0 @@
-@import "tailwindcss";
-@import "tw-animate-css";
-@import "shadcn/tailwind.css";
-@import "@fontsource-variable/inter";
-
-@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);
-}
-
-.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);
-}
-
-@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);
-}
-
-@layer base {
-  * {
-    @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,197 +0,0 @@
-import { getServerUrl } from "./server-url"
-
-function apiBase() {
-  return `${getServerUrl()}/api/admin`
-}
-
-function serverBase() {
-  return `${getServerUrl()}/api`
-}
-
-export interface ConfigFieldDef {
-  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>
-}
-
-export interface SourceConfig {
-  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: "aelis.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)
-}
-
-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)
-}
-
-export async function replaceSource(
-  sourceId: string,
-  body: { enabled: boolean; config: 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}`)
-  }
-}
-
-export async function updateProviderConfig(
-  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}`)
-  }
-}
-
-export interface LocationInput {
-  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}`)
-  }
-}
-
-export interface FeedItemSlot {
-  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
-}
-
-export interface FeedResponse {
-  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>
-}

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

@@ -1,47 +0,0 @@
-import { getServerUrl } from "./server-url"
-
-function authBase() {
-  return `${getServerUrl()}/api/auth`
-}
-
-export interface AuthUser {
-  id: string
-  name: string
-  email: string
-  image: string | null
-}
-
-export interface AuthSession {
-  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
-}
-
-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
-}
-
-export async function signOut(): Promise<void> {
-  await fetch(`${authBase()}/sign-out`, {
-    method: "POST",
-    credentials: "include",
-  })
-}

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

@@ -1,10 +0,0 @@
-const STORAGE_KEY = "aelis-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
-}
-
-export function setServerUrl(url: string): void {
-  localStorage.setItem(STORAGE_KEY, url.replace(/\/+$/, ""))
-}

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

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

apps/admin-dashboard/src/main.tsx

@@ -1,28 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
-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"
-
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      retry: false,
-      refetchOnWindowFocus: false,
-    },
-  },
-})
-
-createRoot(document.getElementById("root")!).render(
-  <StrictMode>
-    <QueryClientProvider client={queryClient}>
-      <ThemeProvider>
-        <App />
-        <Toaster />
-      </ThemeProvider>
-    </QueryClientProvider>
-  </StrictMode>
-)

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

@@ -1,15 +0,0 @@
-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 dashboardSourceRoute } from "./routes/_dashboard/sources.$sourceId"
-
-export const routeTree = rootRoute.addChildren([
-  loginRoute,
-  dashboardRoute.addChildren([
-    dashboardIndexRoute,
-    dashboardFeedRoute,
-    dashboardSourceRoute,
-  ]),
-])

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

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

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

@@ -1,208 +0,0 @@
-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,
-  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,
-} from "@/components/ui/sidebar"
-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,
-  "aelis.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>
-  ),
-})
-
-function DashboardLayout() {
-  const { user } = Route.useRouteContext()
-  const navigate = useNavigate()
-  const queryClient = useQueryClient()
-  const matchRoute = useMatchRoute()
-
-  const { data: sources = [] } = useQuery({
-    queryKey: ["sources"],
-    queryFn: fetchSources,
-  })
-
-  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 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>
-
-          <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>
-
-        <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>
-  )
-}

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

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

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

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

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

@@ -1,34 +0,0 @@
-import { createRoute } from "@tanstack/react-router"
-import { useQuery, useQueryClient } from "@tanstack/react-query"
-
-import { fetchSources } from "@/lib/api"
-import { SourceConfigPanel } from "@/components/source-config-panel"
-import { Route as dashboardRoute } from "../_dashboard"
-
-export const Route = createRoute({
-  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)
-
-  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"] })}
-    />
-  )
-}

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

@@ -1,22 +0,0 @@
-import { createRoute, useNavigate } from "@tanstack/react-router"
-import { useQueryClient } from "@tanstack/react-query"
-
-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()
-
-    function handleLogin(session: AuthSession) {
-      queryClient.setQueryData(["session"], session)
-      navigate({ to: "/" })
-    }
-
-    return <LoginPage onLogin={handleLogin} />
-  },
-})

apps/admin-dashboard/tsconfig.app.json

@@ -1,32 +0,0 @@
-{
-  "compilerOptions": {
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
-    "target": "ES2022",
-    "useDefineForClassFields": true,
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "module": "ESNext",
-    "types": ["vite/client"],
-    "skipLibCheck": true,
-
-    /* Bundler mode */
-    "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"]
-}

apps/admin-dashboard/tsconfig.json

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

apps/admin-dashboard/tsconfig.node.json

@@ -1,26 +0,0 @@
-{
-  "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,
-
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "erasableSyntaxOnly": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUncheckedSideEffectImports": true
-  },
-  "include": ["vite.config.ts"]
-}

apps/admin-dashboard/vite.config.ts

@@ -1,18 +0,0 @@
-import path from "path"
-import tailwindcss from "@tailwindcss/vite"
-import react from "@vitejs/plugin-react"
-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,
-  },
-})

apps/aelis-backend/package.json

@@ -4,7 +4,7 @@
 	"type": "module",
 	"main": "src/server.ts",
 	"scripts": {
-		"dev": "bun run --watch --inspect=0.0.0.0:6499 src/server.ts",
+		"dev": "bun run --watch src/server.ts",
 		"start": "bun run src/server.ts",
 		"test": "bun test src/",
 		"db:generate": "bunx drizzle-kit generate",

apps/aelis-backend/src/auth/index.ts

@@ -16,9 +16,6 @@ export function createAuth(db: Database) {
 			provider: "pg",
 			schema,
 		}),
-		advanced: {
-			disableCSRFCheck: process.env.NODE_ENV !== "production",
-		},
 		emailAndPassword: {
 			enabled: true,
 		},

apps/aelis-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 = "z-ai/glm-4.7-flash"
+const DEFAULT_MODEL = "openai/gpt-4.1-mini"
 const DEFAULT_TIMEOUT_MS = 30_000
 
 export interface LlmClientConfig {
@@ -46,17 +46,15 @@ export function createLlmClient(config: LlmClientConfig): LlmClient {
 						type: "json_schema" as const,
 						jsonSchema: {
 							name: "enhancement_result",
-							strict: false,
+							strict: true,
 							schema: enhancementResultJsonSchema,
 						},
 					},
-					reasoning: { effort: "none" },
 					stream: false,
 				},
 			})
 
-			const message = response.choices?.[0]?.message
+			const content = response.choices?.[0]?.message?.content
-			const content = message?.content ?? message?.reasoning
 			if (typeof content !== "string") {
 				console.warn("[enhancement] LLM returned no content in response")
 				return null

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

@@ -166,12 +166,11 @@ describe("schema sync", () => {
 		expect(parseEnhancementResult(JSON.stringify(bad))).toBeNull()
 
 		// JSON Schema only allows string or null for slot values
-		const slotValueSchema =
+		const slotValueTypes =
 			enhancementResultJsonSchema.properties.slotFills.additionalProperties
-				.additionalProperties
+				.additionalProperties.type
-		expect(slotValueSchema.anyOf).toEqual([
+		expect(slotValueTypes).toContain("string")
-			{ type: "string" },
+		expect(slotValueTypes).toContain("null")
-			{ type: "null" },
+		expect(slotValueTypes).not.toContain("number")
-		])
 	})
 })

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

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

apps/aelis-backend/src/server.ts

@@ -1,5 +1,4 @@
 import { Hono } from "hono"
-import { cors } from "hono/cors"
 
 import { registerAdminHttpHandlers } from "./admin/http.ts"
 import { createRequireAdmin } from "./auth/admin-middleware.ts"
@@ -14,7 +13,6 @@ 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() {
@@ -46,41 +44,12 @@ function main() {
 					serviceId: process.env.WEATHERKIT_SERVICE_ID!,
 				},
 			}),
-			new TflSourceProvider({ apiKey: process.env.TFL_API_KEY! }),
 		],
 		feedEnhancer,
 	})
 
 	const app = new Hono()
 
-	const isDev = process.env.NODE_ENV !== "production"
-	const allowedOrigins = process.env.CORS_ORIGINS?.split(",").map((o) => o.trim()) ?? []
-
-	function resolveOrigin(origin: string): string | undefined {
-		if (isDev) return origin
-		return allowedOrigins.includes(origin) ? origin : undefined
-	}
-
-	app.use(
-		"/api/auth/*",
-		cors({
-			origin: resolveOrigin,
-			allowHeaders: ["Content-Type", "Authorization"],
-			allowMethods: ["POST", "GET", "OPTIONS"],
-			exposeHeaders: ["Content-Length"],
-			maxAge: 600,
-			credentials: true,
-		}),
-	)
-
-	app.use(
-		"*",
-		cors({
-			origin: resolveOrigin,
-			credentials: true,
-		}),
-	)
-
 	app.get("/health", (c) => c.json({ status: "ok" }))
 
 	const authSessionMiddleware = createRequireSession(auth)

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

@@ -38,27 +38,6 @@ export class UserSessionManager {
 		return this.providers.get(sourceId)
 	}
 
-	/**
-	 * Returns the user's config for a source, or defaults if no row exists.
-	 *
-	 * @throws {SourceNotFoundError} if the sourceId has no registered provider
-	 */
-	async fetchSourceConfig(
-		userId: string,
-		sourceId: string,
-	): Promise<{ enabled: boolean; config: unknown }> {
-		const provider = this.providers.get(sourceId)
-		if (!provider) {
-			throw new SourceNotFoundError(sourceId, userId)
-		}
-
-		const row = await sources(this.db, userId).find(sourceId)
-		return {
-			enabled: row?.enabled ?? false,
-			config: row?.config ?? {},
-		}
-	}
-
 	async getOrCreate(userId: string): Promise<UserSession> {
 		const existing = this.sessions.get(userId)
 		if (existing) return existing

apps/aelis-backend/src/sources/http.test.ts

@@ -138,10 +138,6 @@ function patch(app: Hono, sourceId: string, body: unknown) {
 	})
 }
 
-function get(app: Hono, sourceId: string) {
-	return app.request(`/api/sources/${sourceId}`, { method: "GET" })
-}
-
 function put(app: Hono, sourceId: string, body: unknown) {
 	return app.request(`/api/sources/${sourceId}`, {
 		method: "PUT",
@@ -154,72 +150,6 @@ function put(app: Hono, sourceId: string, body: unknown) {
 // Tests
 // ---------------------------------------------------------------------------
 
-describe("GET /api/sources/:sourceId", () => {
-	test("returns 401 without auth", async () => {
-		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)])
-
-		const res = await get(app, "aelis.weather")
-
-		expect(res.status).toBe(401)
-	})
-
-	test("returns 404 for unknown source", async () => {
-		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
-
-		const res = await get(app, "unknown.source")
-
-		expect(res.status).toBe(404)
-		const body = (await res.json()) as { error: string }
-		expect(body.error).toContain("not found")
-	})
-
-	test("returns enabled and config for existing source", async () => {
-		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
-			enabled: true,
-			config: { units: "metric" },
-		})
-		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
-
-		const res = await get(app, "aelis.weather")
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as { enabled: boolean; config: unknown }
-		expect(body.enabled).toBe(true)
-		expect(body.config).toEqual({ units: "metric" })
-	})
-
-	test("returns defaults when user has no row for source", async () => {
-		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
-
-		const res = await get(app, "aelis.weather")
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as { enabled: boolean; config: unknown }
-		expect(body.enabled).toBe(false)
-		expect(body.config).toEqual({})
-	})
-
-	test("returns disabled source", async () => {
-		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
-			enabled: false,
-			config: { units: "imperial" },
-		})
-		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
-
-		const res = await get(app, "aelis.weather")
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as { enabled: boolean; config: unknown }
-		expect(body.enabled).toBe(false)
-		expect(body.config).toEqual({ units: "imperial" })
-	})
-})
-
 describe("PATCH /api/sources/:sourceId", () => {
 	test("returns 401 without auth", async () => {
 		activeStore = createInMemoryStore()

apps/aelis-backend/src/sources/http.ts

@@ -45,31 +45,10 @@ export function registerSourcesHttpHandlers(
 		await next()
 	})
 
-	app.get("/api/sources/:sourceId", inject, authSessionMiddleware, handleGetSource)
 	app.patch("/api/sources/:sourceId", inject, authSessionMiddleware, handleUpdateSource)
 	app.put("/api/sources/:sourceId", inject, authSessionMiddleware, handleReplaceSource)
 }
 
-async function handleGetSource(c: Context<Env>) {
-	const sourceId = c.req.param("sourceId")
-	if (!sourceId) {
-		return c.body(null, 404)
-	}
-
-	const sessionManager = c.get("sessionManager")
-	const user = c.get("user")!
-
-	try {
-		const result = await sessionManager.fetchSourceConfig(user.id, sourceId)
-		return c.json(result)
-	} catch (err) {
-		if (err instanceof SourceNotFoundError) {
-			return c.json({ error: err.message }, 404)
-		}
-		throw err
-	}
-}
-
 async function handleUpdateSource(c: Context<Env>) {
 	const sourceId = c.req.param("sourceId")
 	if (!sourceId) {

packages/aelis-data-source-weatherkit/.env.example

@@ -0,0 +1,4 @@
+WEATHERKIT_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----"
+WEATHERKIT_KEY_ID=ABC123DEFG
+WEATHERKIT_TEAM_ID=TEAM123456
+WEATHERKIT_SERVICE_ID=com.example.weatherkit.test

packages/aelis-data-source-weatherkit/README.md

@@ -0,0 +1,58 @@
+# @aelis/data-source-weatherkit
+
+Weather data source using Apple WeatherKit REST API.
+
+## Usage
+
+```typescript
+import { WeatherKitDataSource, Units } from "@aelis/data-source-weatherkit"
+
+const dataSource = new WeatherKitDataSource({
+	credentials: {
+		privateKey: "-----BEGIN PRIVATE KEY-----\n...",
+		keyId: "ABC123",
+		teamId: "DEF456",
+		serviceId: "com.example.weatherkit",
+	},
+	hourlyLimit: 12, // optional, default: 12
+	dailyLimit: 7, // optional, default: 7
+})
+
+const items = await dataSource.query(context, {
+	units: Units.metric, // or Units.imperial
+})
+```
+
+## Feed Items
+
+The data source returns four types of feed items:
+
+| Type              | Description                |
+| ----------------- | -------------------------- |
+| `weather-current` | Current weather conditions |
+| `weather-hourly`  | Hourly forecast            |
+| `weather-daily`   | Daily forecast             |
+| `weather-alert`   | Weather alerts             |
+
+## Priority
+
+Base priorities are adjusted based on weather conditions:
+
+- Severe conditions (tornado, hurricane, blizzard, etc.): +0.3
+- Moderate conditions (thunderstorm, heavy rain, etc.): +0.15
+- Alert severity: extreme=1.0, severe=0.9, moderate=0.75, minor=0.7
+
+## Authentication
+
+WeatherKit requires Apple Developer credentials. Generate a private key in the Apple Developer portal under Certificates, Identifiers & Profiles > Keys.
+
+## Validation
+
+API responses are validated using [arktype](https://arktype.io) schemas.
+
+## Generating Test Fixtures
+
+To regenerate fixture data from the real API:
+
+1. Create a `.env` file with your credentials (see `.env.example`)
+2. Run `bun run scripts/generate-fixtures.ts`

packages/aelis-data-source-weatherkit/package.json

@@ -0,0 +1,14 @@
+{
+	"name": "@aelis/data-source-weatherkit",
+	"version": "0.0.0",
+	"type": "module",
+	"main": "src/index.ts",
+	"types": "src/index.ts",
+	"scripts": {
+		"test": "bun test ."
+	},
+	"dependencies": {
+		"@aelis/core": "workspace:*",
+		"arktype": "^2.1.0"
+	}
+}

packages/aelis-data-source-weatherkit/scripts/generate-fixtures.ts

@@ -0,0 +1,60 @@
+import { DefaultWeatherKitClient } from "../src/weatherkit"
+
+function loadEnv(): Record<string, string> {
+	const content = require("fs").readFileSync(".env", "utf-8")
+	const env: Record<string, string> = {}
+
+	for (const line of content.split("\n")) {
+		const trimmed = line.trim()
+		if (!trimmed || trimmed.startsWith("#")) continue
+
+		const eqIndex = trimmed.indexOf("=")
+		if (eqIndex === -1) continue
+
+		const key = trimmed.slice(0, eqIndex)
+		let value = trimmed.slice(eqIndex + 1)
+
+		if (value.startsWith('"') && value.endsWith('"')) {
+			value = value.slice(1, -1)
+		}
+
+		env[key] = value.replace(/\\n/g, "\n")
+	}
+
+	return env
+}
+
+const env = loadEnv()
+
+const client = new DefaultWeatherKitClient({
+	privateKey: env.WEATHERKIT_PRIVATE_KEY!,
+	keyId: env.WEATHERKIT_KEY_ID!,
+	teamId: env.WEATHERKIT_TEAM_ID!,
+	serviceId: env.WEATHERKIT_SERVICE_ID!,
+})
+
+const locations = {
+	sanFrancisco: { lat: 37.7749, lng: -122.4194 },
+}
+
+async function main() {
+	console.log("Fetching weather data for San Francisco...")
+
+	const response = await client.fetch({
+		lat: locations.sanFrancisco.lat,
+		lng: locations.sanFrancisco.lng,
+	})
+
+	const fixture = {
+		generatedAt: new Date().toISOString(),
+		location: locations.sanFrancisco,
+		response,
+	}
+
+	const output = JSON.stringify(fixture)
+	await Bun.write("fixtures/san-francisco.json", output)
+
+	console.log("Fixture written to fixtures/san-francisco.json")
+}
+
+main().catch(console.error)

packages/aelis-data-source-weatherkit/src/data-source.test.ts

@@ -0,0 +1,233 @@
+import type { ContextKey } from "@aelis/core"
+
+import { Context, contextKey } from "@aelis/core"
+import { describe, expect, test } from "bun:test"
+
+import type { WeatherKitClient, WeatherKitResponse } from "./weatherkit"
+
+import fixture from "../fixtures/san-francisco.json"
+import { WeatherKitDataSource, Units } from "./data-source"
+import { WeatherFeedItemType } from "./feed-items"
+
+const mockCredentials = {
+	privateKey: "mock",
+	keyId: "mock",
+	teamId: "mock",
+	serviceId: "mock",
+}
+
+interface LocationData {
+	lat: number
+	lng: number
+	accuracy: number
+}
+
+const LocationKey: ContextKey<LocationData> = contextKey("aelis.location", "location")
+
+const createMockClient = (response: WeatherKitResponse): WeatherKitClient => ({
+	fetch: async () => response,
+})
+
+function createMockContext(location?: { lat: number; lng: number }): Context {
+	const ctx = new Context(new Date("2026-01-17T00:00:00Z"))
+	if (location) {
+		ctx.set([[LocationKey, { ...location, accuracy: 10 }]])
+	}
+	return ctx
+}
+
+describe("WeatherKitDataSource", () => {
+	test("returns empty array when location is missing", async () => {
+		const dataSource = new WeatherKitDataSource({
+			credentials: mockCredentials,
+		})
+		const items = await dataSource.query(createMockContext())
+
+		expect(items).toEqual([])
+	})
+
+	test("type is weather-current", () => {
+		const dataSource = new WeatherKitDataSource({
+			credentials: mockCredentials,
+		})
+
+		expect(dataSource.type).toBe(WeatherFeedItemType.Current)
+	})
+
+	test("throws error if neither client nor credentials provided", () => {
+		expect(() => new WeatherKitDataSource({})).toThrow(
+			"Either client or credentials must be provided",
+		)
+	})
+})
+
+describe("WeatherKitDataSource with fixture", () => {
+	const response = fixture.response
+
+	test("parses current weather from fixture", () => {
+		const current = response.currentWeather
+
+		expect(typeof current.conditionCode).toBe("string")
+		expect(typeof current.temperature).toBe("number")
+		expect(typeof current.humidity).toBe("number")
+		expect(current.pressureTrend).toMatch(/^(rising|falling|steady)$/)
+	})
+
+	test("parses hourly forecast from fixture", () => {
+		const hours = response.forecastHourly.hours
+
+		expect(hours.length).toBeGreaterThan(0)
+
+		const firstHour = hours[0]!
+		expect(firstHour.forecastStart).toBeDefined()
+		expect(typeof firstHour.temperature).toBe("number")
+		expect(typeof firstHour.precipitationChance).toBe("number")
+	})
+
+	test("parses daily forecast from fixture", () => {
+		const days = response.forecastDaily.days
+
+		expect(days.length).toBeGreaterThan(0)
+
+		const firstDay = days[0]!
+		expect(firstDay.forecastStart).toBeDefined()
+		expect(typeof firstDay.temperatureMax).toBe("number")
+		expect(typeof firstDay.temperatureMin).toBe("number")
+		expect(firstDay.sunrise).toBeDefined()
+		expect(firstDay.sunset).toBeDefined()
+	})
+
+	test("hourly limit is respected", () => {
+		const dataSource = new WeatherKitDataSource({
+			credentials: mockCredentials,
+			hourlyLimit: 6,
+		})
+
+		expect(dataSource["hourlyLimit"]).toBe(6)
+	})
+
+	test("daily limit is respected", () => {
+		const dataSource = new WeatherKitDataSource({
+			credentials: mockCredentials,
+			dailyLimit: 3,
+		})
+
+		expect(dataSource["dailyLimit"]).toBe(3)
+	})
+
+	test("default limits are applied", () => {
+		const dataSource = new WeatherKitDataSource({
+			credentials: mockCredentials,
+		})
+
+		expect(dataSource["hourlyLimit"]).toBe(12)
+		expect(dataSource["dailyLimit"]).toBe(7)
+	})
+})
+
+describe("unit conversion", () => {
+	test("Units enum has metric and imperial", () => {
+		expect(Units.metric).toBe("metric")
+		expect(Units.imperial).toBe("imperial")
+	})
+})
+
+describe("query() with mocked client", () => {
+	const mockClient = createMockClient(fixture.response as WeatherKitResponse)
+
+	test("transforms API response into feed items", async () => {
+		const dataSource = new WeatherKitDataSource({ client: mockClient })
+		const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
+
+		const items = await dataSource.query(context)
+
+		expect(items.length).toBeGreaterThan(0)
+		expect(items.some((i) => i.type === WeatherFeedItemType.Current)).toBe(true)
+		expect(items.some((i) => i.type === WeatherFeedItemType.Hourly)).toBe(true)
+		expect(items.some((i) => i.type === WeatherFeedItemType.Daily)).toBe(true)
+	})
+
+	test("applies hourly and daily limits", async () => {
+		const dataSource = new WeatherKitDataSource({
+			client: mockClient,
+			hourlyLimit: 3,
+			dailyLimit: 2,
+		})
+		const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
+
+		const items = await dataSource.query(context)
+
+		const hourlyItems = items.filter((i) => i.type === WeatherFeedItemType.Hourly)
+		const dailyItems = items.filter((i) => i.type === WeatherFeedItemType.Daily)
+
+		expect(hourlyItems.length).toBe(3)
+		expect(dailyItems.length).toBe(2)
+	})
+
+	test("sets timestamp from context.time", async () => {
+		const dataSource = new WeatherKitDataSource({ client: mockClient })
+		const queryTime = new Date("2026-01-17T12:00:00Z")
+		const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
+		context.time = queryTime
+
+		const items = await dataSource.query(context)
+
+		for (const item of items) {
+			expect(item.timestamp).toEqual(queryTime)
+		}
+	})
+
+	test("converts temperatures to imperial", async () => {
+		const dataSource = new WeatherKitDataSource({ client: mockClient })
+		const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
+
+		const metricItems = await dataSource.query(context, {
+			units: Units.metric,
+		})
+		const imperialItems = await dataSource.query(context, {
+			units: Units.imperial,
+		})
+
+		const metricCurrent = metricItems.find((i) => i.type === WeatherFeedItemType.Current)
+		const imperialCurrent = imperialItems.find((i) => i.type === WeatherFeedItemType.Current)
+
+		expect(metricCurrent).toBeDefined()
+		expect(imperialCurrent).toBeDefined()
+
+		const metricTemp = (metricCurrent!.data as { temperature: number }).temperature
+		const imperialTemp = (imperialCurrent!.data as { temperature: number }).temperature
+
+		// Verify conversion: F = C * 9/5 + 32
+		const expectedImperial = (metricTemp * 9) / 5 + 32
+		expect(imperialTemp).toBeCloseTo(expectedImperial, 2)
+	})
+
+	test("assigns signals based on weather conditions", async () => {
+		const dataSource = new WeatherKitDataSource({ client: mockClient })
+		const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
+
+		const items = await dataSource.query(context)
+
+		for (const item of items) {
+			expect(item.signals).toBeDefined()
+			expect(item.signals!.urgency).toBeGreaterThanOrEqual(0)
+			expect(item.signals!.urgency).toBeLessThanOrEqual(1)
+			expect(item.signals!.timeRelevance).toBeDefined()
+		}
+
+		const currentItem = items.find((i) => i.type === WeatherFeedItemType.Current)
+		expect(currentItem).toBeDefined()
+		expect(currentItem!.signals!.urgency).toBeGreaterThanOrEqual(0.5)
+	})
+
+	test("generates unique IDs for each item", async () => {
+		const dataSource = new WeatherKitDataSource({ client: mockClient })
+		const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
+
+		const items = await dataSource.query(context)
+		const ids = items.map((i) => i.id)
+		const uniqueIds = new Set(ids)
+
+		expect(uniqueIds.size).toBe(ids.length)
+	})
+})

packages/aelis-data-source-weatherkit/src/data-source.ts

@@ -0,0 +1,356 @@
+import type { Context, ContextKey, DataSource, FeedItemSignals } from "@aelis/core"
+
+import { TimeRelevance, contextKey } from "@aelis/core"
+
+import {
+	WeatherFeedItemType,
+	type CurrentWeatherFeedItem,
+	type DailyWeatherFeedItem,
+	type HourlyWeatherFeedItem,
+	type WeatherAlertFeedItem,
+	type WeatherFeedItem,
+} from "./feed-items"
+import {
+	ConditionCode,
+	DefaultWeatherKitClient,
+	Severity,
+	type CurrentWeather,
+	type DailyForecast,
+	type HourlyForecast,
+	type WeatherAlert,
+	type WeatherKitClient,
+	type WeatherKitCredentials,
+} from "./weatherkit"
+
+export const Units = {
+	metric: "metric",
+	imperial: "imperial",
+} as const
+
+export type Units = (typeof Units)[keyof typeof Units]
+
+export interface WeatherKitDataSourceOptions {
+	credentials?: WeatherKitCredentials
+	client?: WeatherKitClient
+	hourlyLimit?: number
+	dailyLimit?: number
+}
+
+export interface WeatherKitQueryConfig {
+	units?: Units
+}
+
+interface LocationData {
+	lat: number
+	lng: number
+}
+
+const LocationKey: ContextKey<LocationData> = contextKey("aelis.location", "location")
+
+const SOURCE_ID = "aelis.weather"
+
+export class WeatherKitDataSource implements DataSource<WeatherFeedItem, WeatherKitQueryConfig> {
+	private readonly DEFAULT_HOURLY_LIMIT = 12
+	private readonly DEFAULT_DAILY_LIMIT = 7
+
+	readonly type = WeatherFeedItemType.Current
+	private readonly client: WeatherKitClient
+	private readonly hourlyLimit: number
+	private readonly dailyLimit: number
+
+	constructor(options: WeatherKitDataSourceOptions) {
+		if (!options.client && !options.credentials) {
+			throw new Error("Either client or credentials must be provided")
+		}
+		this.client = options.client ?? new DefaultWeatherKitClient(options.credentials!)
+		this.hourlyLimit = options.hourlyLimit ?? this.DEFAULT_HOURLY_LIMIT
+		this.dailyLimit = options.dailyLimit ?? this.DEFAULT_DAILY_LIMIT
+	}
+
+	async query(context: Context, config: WeatherKitQueryConfig = {}): Promise<WeatherFeedItem[]> {
+		const location = context.get(LocationKey)
+		if (!location) {
+			return []
+		}
+
+		const units = config.units ?? Units.metric
+		const timestamp = context.time
+
+		const response = await this.client.fetch({
+			lat: location.lat,
+			lng: location.lng,
+		})
+
+		const items: WeatherFeedItem[] = []
+
+		if (response.currentWeather) {
+			items.push(createCurrentWeatherFeedItem(response.currentWeather, timestamp, units))
+		}
+
+		if (response.forecastHourly?.hours) {
+			const hours = response.forecastHourly.hours.slice(0, this.hourlyLimit)
+			for (let i = 0; i < hours.length; i++) {
+				const hour = hours[i]
+				if (hour) {
+					items.push(createHourlyWeatherFeedItem(hour, i, timestamp, units))
+				}
+			}
+		}
+
+		if (response.forecastDaily?.days) {
+			const days = response.forecastDaily.days.slice(0, this.dailyLimit)
+			for (let i = 0; i < days.length; i++) {
+				const day = days[i]
+				if (day) {
+					items.push(createDailyWeatherFeedItem(day, i, timestamp, units))
+				}
+			}
+		}
+
+		if (response.weatherAlerts?.alerts) {
+			for (const alert of response.weatherAlerts.alerts) {
+				items.push(createWeatherAlertFeedItem(alert, timestamp))
+			}
+		}
+
+		return items
+	}
+}
+
+const BASE_URGENCY = {
+	current: 0.5,
+	hourly: 0.3,
+	daily: 0.2,
+	alert: 0.7,
+} as const
+
+const SEVERE_CONDITIONS = new Set<ConditionCode>([
+	ConditionCode.SevereThunderstorm,
+	ConditionCode.Hurricane,
+	ConditionCode.Tornado,
+	ConditionCode.TropicalStorm,
+	ConditionCode.Blizzard,
+	ConditionCode.FreezingRain,
+	ConditionCode.Hail,
+	ConditionCode.Frigid,
+	ConditionCode.Hot,
+])
+
+const MODERATE_CONDITIONS = new Set<ConditionCode>([
+	ConditionCode.Thunderstorm,
+	ConditionCode.IsolatedThunderstorms,
+	ConditionCode.ScatteredThunderstorms,
+	ConditionCode.HeavyRain,
+	ConditionCode.HeavySnow,
+	ConditionCode.FreezingDrizzle,
+	ConditionCode.BlowingSnow,
+])
+
+function adjustUrgencyForCondition(baseUrgency: number, conditionCode: ConditionCode): number {
+	if (SEVERE_CONDITIONS.has(conditionCode)) {
+		return Math.min(1, baseUrgency + 0.3)
+	}
+	if (MODERATE_CONDITIONS.has(conditionCode)) {
+		return Math.min(1, baseUrgency + 0.15)
+	}
+	return baseUrgency
+}
+
+function adjustUrgencyForAlertSeverity(severity: Severity): number {
+	switch (severity) {
+		case Severity.Extreme:
+			return 1
+		case Severity.Severe:
+			return 0.9
+		case Severity.Moderate:
+			return 0.75
+		case Severity.Minor:
+			return BASE_URGENCY.alert
+	}
+}
+
+function timeRelevanceForCondition(conditionCode: ConditionCode): TimeRelevance {
+	if (SEVERE_CONDITIONS.has(conditionCode)) {
+		return TimeRelevance.Imminent
+	}
+	if (MODERATE_CONDITIONS.has(conditionCode)) {
+		return TimeRelevance.Upcoming
+	}
+	return TimeRelevance.Ambient
+}
+
+function timeRelevanceForAlertSeverity(severity: Severity): TimeRelevance {
+	switch (severity) {
+		case Severity.Extreme:
+		case Severity.Severe:
+			return TimeRelevance.Imminent
+		case Severity.Moderate:
+			return TimeRelevance.Upcoming
+		case Severity.Minor:
+			return TimeRelevance.Ambient
+	}
+}
+
+function convertTemperature(celsius: number, units: Units): number {
+	if (units === Units.imperial) {
+		return (celsius * 9) / 5 + 32
+	}
+	return celsius
+}
+
+function convertSpeed(kmh: number, units: Units): number {
+	if (units === Units.imperial) {
+		return kmh * 0.621371
+	}
+	return kmh
+}
+
+function convertDistance(km: number, units: Units): number {
+	if (units === Units.imperial) {
+		return km * 0.621371
+	}
+	return km
+}
+
+function convertPrecipitation(mm: number, units: Units): number {
+	if (units === Units.imperial) {
+		return mm * 0.0393701
+	}
+	return mm
+}
+
+function convertPressure(mb: number, units: Units): number {
+	if (units === Units.imperial) {
+		return mb * 0.02953
+	}
+	return mb
+}
+
+function createCurrentWeatherFeedItem(
+	current: CurrentWeather,
+	timestamp: Date,
+	units: Units,
+): CurrentWeatherFeedItem {
+	const signals: FeedItemSignals = {
+		urgency: adjustUrgencyForCondition(BASE_URGENCY.current, current.conditionCode),
+		timeRelevance: timeRelevanceForCondition(current.conditionCode),
+	}
+
+	return {
+		id: `weather-current-${timestamp.getTime()}`,
+		sourceId: SOURCE_ID,
+		type: WeatherFeedItemType.Current,
+		timestamp,
+		data: {
+			conditionCode: current.conditionCode,
+			daylight: current.daylight,
+			humidity: current.humidity,
+			precipitationIntensity: convertPrecipitation(current.precipitationIntensity, units),
+			pressure: convertPressure(current.pressure, units),
+			pressureTrend: current.pressureTrend,
+			temperature: convertTemperature(current.temperature, units),
+			temperatureApparent: convertTemperature(current.temperatureApparent, units),
+			uvIndex: current.uvIndex,
+			visibility: convertDistance(current.visibility, units),
+			windDirection: current.windDirection,
+			windGust: convertSpeed(current.windGust, units),
+			windSpeed: convertSpeed(current.windSpeed, units),
+		},
+		signals,
+	}
+}
+
+function createHourlyWeatherFeedItem(
+	hourly: HourlyForecast,
+	index: number,
+	timestamp: Date,
+	units: Units,
+): HourlyWeatherFeedItem {
+	const signals: FeedItemSignals = {
+		urgency: adjustUrgencyForCondition(BASE_URGENCY.hourly, hourly.conditionCode),
+		timeRelevance: timeRelevanceForCondition(hourly.conditionCode),
+	}
+
+	return {
+		id: `weather-hourly-${timestamp.getTime()}-${index}`,
+		sourceId: SOURCE_ID,
+		type: WeatherFeedItemType.Hourly,
+		timestamp,
+		data: {
+			forecastTime: new Date(hourly.forecastStart),
+			conditionCode: hourly.conditionCode,
+			daylight: hourly.daylight,
+			humidity: hourly.humidity,
+			precipitationAmount: convertPrecipitation(hourly.precipitationAmount, units),
+			precipitationChance: hourly.precipitationChance,
+			precipitationType: hourly.precipitationType,
+			temperature: convertTemperature(hourly.temperature, units),
+			temperatureApparent: convertTemperature(hourly.temperatureApparent, units),
+			uvIndex: hourly.uvIndex,
+			windDirection: hourly.windDirection,
+			windGust: convertSpeed(hourly.windGust, units),
+			windSpeed: convertSpeed(hourly.windSpeed, units),
+		},
+		signals,
+	}
+}
+
+function createDailyWeatherFeedItem(
+	daily: DailyForecast,
+	index: number,
+	timestamp: Date,
+	units: Units,
+): DailyWeatherFeedItem {
+	const signals: FeedItemSignals = {
+		urgency: adjustUrgencyForCondition(BASE_URGENCY.daily, daily.conditionCode),
+		timeRelevance: timeRelevanceForCondition(daily.conditionCode),
+	}
+
+	return {
+		id: `weather-daily-${timestamp.getTime()}-${index}`,
+		sourceId: SOURCE_ID,
+		type: WeatherFeedItemType.Daily,
+		timestamp,
+		data: {
+			forecastDate: new Date(daily.forecastStart),
+			conditionCode: daily.conditionCode,
+			maxUvIndex: daily.maxUvIndex,
+			precipitationAmount: convertPrecipitation(daily.precipitationAmount, units),
+			precipitationChance: daily.precipitationChance,
+			precipitationType: daily.precipitationType,
+			snowfallAmount: convertPrecipitation(daily.snowfallAmount, units),
+			sunrise: new Date(daily.sunrise),
+			sunset: new Date(daily.sunset),
+			temperatureMax: convertTemperature(daily.temperatureMax, units),
+			temperatureMin: convertTemperature(daily.temperatureMin, units),
+		},
+		signals,
+	}
+}
+
+function createWeatherAlertFeedItem(alert: WeatherAlert, timestamp: Date): WeatherAlertFeedItem {
+	const signals: FeedItemSignals = {
+		urgency: adjustUrgencyForAlertSeverity(alert.severity),
+		timeRelevance: timeRelevanceForAlertSeverity(alert.severity),
+	}
+
+	return {
+		id: `weather-alert-${alert.id}`,
+		sourceId: SOURCE_ID,
+		type: WeatherFeedItemType.Alert,
+		timestamp,
+		data: {
+			alertId: alert.id,
+			areaName: alert.areaName,
+			certainty: alert.certainty,
+			description: alert.description,
+			detailsUrl: alert.detailsUrl,
+			effectiveTime: new Date(alert.effectiveTime),
+			expireTime: new Date(alert.expireTime),
+			severity: alert.severity,
+			source: alert.source,
+			urgency: alert.urgency,
+		},
+		signals,
+	}
+}

packages/aelis-data-source-weatherkit/src/feed-items.ts

@@ -0,0 +1,97 @@
+import type { FeedItem } from "@aelis/core"
+
+import type { Certainty, ConditionCode, PrecipitationType, Severity, Urgency } from "./weatherkit"
+
+export const WeatherFeedItemType = {
+	Current: "weather-current",
+	Hourly: "weather-hourly",
+	Daily: "weather-daily",
+	Alert: "weather-alert",
+} as const
+
+export type WeatherFeedItemType = (typeof WeatherFeedItemType)[keyof typeof WeatherFeedItemType]
+
+export type CurrentWeatherData = {
+	conditionCode: ConditionCode
+	daylight: boolean
+	humidity: number
+	precipitationIntensity: number
+	pressure: number
+	pressureTrend: "rising" | "falling" | "steady"
+	temperature: number
+	temperatureApparent: number
+	uvIndex: number
+	visibility: number
+	windDirection: number
+	windGust: number
+	windSpeed: number
+}
+
+export interface CurrentWeatherFeedItem extends FeedItem<
+	typeof WeatherFeedItemType.Current,
+	CurrentWeatherData
+> {}
+
+export type HourlyWeatherData = {
+	forecastTime: Date
+	conditionCode: ConditionCode
+	daylight: boolean
+	humidity: number
+	precipitationAmount: number
+	precipitationChance: number
+	precipitationType: PrecipitationType
+	temperature: number
+	temperatureApparent: number
+	uvIndex: number
+	windDirection: number
+	windGust: number
+	windSpeed: number
+}
+
+export interface HourlyWeatherFeedItem extends FeedItem<
+	typeof WeatherFeedItemType.Hourly,
+	HourlyWeatherData
+> {}
+
+export type DailyWeatherData = {
+	forecastDate: Date
+	conditionCode: ConditionCode
+	maxUvIndex: number
+	precipitationAmount: number
+	precipitationChance: number
+	precipitationType: PrecipitationType
+	snowfallAmount: number
+	sunrise: Date
+	sunset: Date
+	temperatureMax: number
+	temperatureMin: number
+}
+
+export interface DailyWeatherFeedItem extends FeedItem<
+	typeof WeatherFeedItemType.Daily,
+	DailyWeatherData
+> {}
+
+export type WeatherAlertData = {
+	alertId: string
+	areaName: string
+	certainty: Certainty
+	description: string
+	detailsUrl: string
+	effectiveTime: Date
+	expireTime: Date
+	severity: Severity
+	source: string
+	urgency: Urgency
+}
+
+export interface WeatherAlertFeedItem extends FeedItem<
+	typeof WeatherFeedItemType.Alert,
+	WeatherAlertData
+> {}
+
+export type WeatherFeedItem =
+	| CurrentWeatherFeedItem
+	| HourlyWeatherFeedItem
+	| DailyWeatherFeedItem
+	| WeatherAlertFeedItem

packages/aelis-data-source-weatherkit/src/index.ts

@@ -0,0 +1,38 @@
+export {
+	WeatherKitDataSource,
+	Units,
+	type Units as UnitsType,
+	type WeatherKitDataSourceOptions,
+	type WeatherKitQueryConfig,
+} from "./data-source"
+
+export {
+	WeatherFeedItemType,
+	type WeatherFeedItemType as WeatherFeedItemTypeType,
+	type CurrentWeatherData,
+	type CurrentWeatherFeedItem,
+	type DailyWeatherData,
+	type DailyWeatherFeedItem,
+	type HourlyWeatherData,
+	type HourlyWeatherFeedItem,
+	type WeatherAlertData,
+	type WeatherAlertFeedItem,
+	type WeatherFeedItem,
+} from "./feed-items"
+
+export {
+	Severity,
+	Urgency,
+	Certainty,
+	PrecipitationType,
+	ConditionCode,
+	DefaultWeatherKitClient,
+	type Severity as SeverityType,
+	type Urgency as UrgencyType,
+	type Certainty as CertaintyType,
+	type PrecipitationType as PrecipitationTypeType,
+	type ConditionCode as ConditionCodeType,
+	type WeatherKitCredentials,
+	type WeatherKitClient,
+	type WeatherKitQueryOptions,
+} from "./weatherkit"

packages/aelis-data-source-weatherkit/src/weatherkit.ts

@@ -0,0 +1,367 @@
+// WeatherKit REST API client and response types
+// https://developer.apple.com/documentation/weatherkitrestapi
+
+import { type } from "arktype"
+
+export interface WeatherKitCredentials {
+	privateKey: string
+	keyId: string
+	teamId: string
+	serviceId: string
+}
+
+export interface WeatherKitQueryOptions {
+	lat: number
+	lng: number
+	language?: string
+	timezone?: string
+}
+
+export interface WeatherKitClient {
+	fetch(query: WeatherKitQueryOptions): Promise<WeatherKitResponse>
+}
+
+export class DefaultWeatherKitClient implements WeatherKitClient {
+	private readonly credentials: WeatherKitCredentials
+
+	constructor(credentials: WeatherKitCredentials) {
+		this.credentials = credentials
+	}
+
+	async fetch(query: WeatherKitQueryOptions): Promise<WeatherKitResponse> {
+		const token = await generateJwt(this.credentials)
+
+		const dataSets = ["currentWeather", "forecastHourly", "forecastDaily", "weatherAlerts"].join(
+			",",
+		)
+
+		const url = new URL(
+			`${WEATHERKIT_API_BASE}/weather/${query.language ?? "en"}/${query.lat}/${query.lng}`,
+		)
+		url.searchParams.set("dataSets", dataSets)
+		if (query.timezone) {
+			url.searchParams.set("timezone", query.timezone)
+		}
+
+		const response = await fetch(url.toString(), {
+			headers: {
+				Authorization: `Bearer ${token}`,
+			},
+		})
+
+		if (!response.ok) {
+			const body = await response.text()
+			throw new Error(`WeatherKit API error: ${response.status} ${response.statusText}: ${body}`)
+		}
+
+		const json = await response.json()
+		const result = weatherKitResponseSchema(json)
+
+		if (result instanceof type.errors) {
+			throw new Error(`WeatherKit API response validation failed: ${result.summary}`)
+		}
+
+		return result
+	}
+}
+
+export const Severity = {
+	Minor: "minor",
+	Moderate: "moderate",
+	Severe: "severe",
+	Extreme: "extreme",
+} as const
+
+export type Severity = (typeof Severity)[keyof typeof Severity]
+
+export const Urgency = {
+	Immediate: "immediate",
+	Expected: "expected",
+	Future: "future",
+	Past: "past",
+	Unknown: "unknown",
+} as const
+
+export type Urgency = (typeof Urgency)[keyof typeof Urgency]
+
+export const Certainty = {
+	Observed: "observed",
+	Likely: "likely",
+	Possible: "possible",
+	Unlikely: "unlikely",
+	Unknown: "unknown",
+} as const
+
+export type Certainty = (typeof Certainty)[keyof typeof Certainty]
+
+export const PrecipitationType = {
+	Clear: "clear",
+	Precipitation: "precipitation",
+	Rain: "rain",
+	Snow: "snow",
+	Sleet: "sleet",
+	Hail: "hail",
+	Mixed: "mixed",
+} as const
+
+export type PrecipitationType = (typeof PrecipitationType)[keyof typeof PrecipitationType]
+
+export const ConditionCode = {
+	Clear: "Clear",
+	Cloudy: "Cloudy",
+	Dust: "Dust",
+	Fog: "Fog",
+	Haze: "Haze",
+	MostlyClear: "MostlyClear",
+	MostlyCloudy: "MostlyCloudy",
+	PartlyCloudy: "PartlyCloudy",
+	ScatteredThunderstorms: "ScatteredThunderstorms",
+	Smoke: "Smoke",
+	Breezy: "Breezy",
+	Windy: "Windy",
+	Drizzle: "Drizzle",
+	HeavyRain: "HeavyRain",
+	Rain: "Rain",
+	Showers: "Showers",
+	Flurries: "Flurries",
+	HeavySnow: "HeavySnow",
+	MixedRainAndSleet: "MixedRainAndSleet",
+	MixedRainAndSnow: "MixedRainAndSnow",
+	MixedRainfall: "MixedRainfall",
+	MixedSnowAndSleet: "MixedSnowAndSleet",
+	ScatteredShowers: "ScatteredShowers",
+	ScatteredSnowShowers: "ScatteredSnowShowers",
+	Sleet: "Sleet",
+	Snow: "Snow",
+	SnowShowers: "SnowShowers",
+	Blizzard: "Blizzard",
+	BlowingSnow: "BlowingSnow",
+	FreezingDrizzle: "FreezingDrizzle",
+	FreezingRain: "FreezingRain",
+	Frigid: "Frigid",
+	Hail: "Hail",
+	Hot: "Hot",
+	Hurricane: "Hurricane",
+	IsolatedThunderstorms: "IsolatedThunderstorms",
+	SevereThunderstorm: "SevereThunderstorm",
+	Thunderstorm: "Thunderstorm",
+	Tornado: "Tornado",
+	TropicalStorm: "TropicalStorm",
+} as const
+
+export type ConditionCode = (typeof ConditionCode)[keyof typeof ConditionCode]
+
+const WEATHERKIT_API_BASE = "https://weatherkit.apple.com/api/v1"
+
+const severitySchema = type.enumerated(
+	Severity.Minor,
+	Severity.Moderate,
+	Severity.Severe,
+	Severity.Extreme,
+)
+
+const urgencySchema = type.enumerated(
+	Urgency.Immediate,
+	Urgency.Expected,
+	Urgency.Future,
+	Urgency.Past,
+	Urgency.Unknown,
+)
+
+const certaintySchema = type.enumerated(
+	Certainty.Observed,
+	Certainty.Likely,
+	Certainty.Possible,
+	Certainty.Unlikely,
+	Certainty.Unknown,
+)
+
+const precipitationTypeSchema = type.enumerated(
+	PrecipitationType.Clear,
+	PrecipitationType.Precipitation,
+	PrecipitationType.Rain,
+	PrecipitationType.Snow,
+	PrecipitationType.Sleet,
+	PrecipitationType.Hail,
+	PrecipitationType.Mixed,
+)
+
+const conditionCodeSchema = type.enumerated(...Object.values(ConditionCode))
+
+const pressureTrendSchema = type.enumerated("rising", "falling", "steady")
+
+const currentWeatherSchema = type({
+	asOf: "string",
+	conditionCode: conditionCodeSchema,
+	daylight: "boolean",
+	humidity: "number",
+	precipitationIntensity: "number",
+	pressure: "number",
+	pressureTrend: pressureTrendSchema,
+	temperature: "number",
+	temperatureApparent: "number",
+	temperatureDewPoint: "number",
+	uvIndex: "number",
+	visibility: "number",
+	windDirection: "number",
+	windGust: "number",
+	windSpeed: "number",
+})
+
+export type CurrentWeather = typeof currentWeatherSchema.infer
+
+const hourlyForecastSchema = type({
+	forecastStart: "string",
+	conditionCode: conditionCodeSchema,
+	daylight: "boolean",
+	humidity: "number",
+	precipitationAmount: "number",
+	precipitationChance: "number",
+	precipitationType: precipitationTypeSchema,
+	pressure: "number",
+	snowfallIntensity: "number",
+	temperature: "number",
+	temperatureApparent: "number",
+	temperatureDewPoint: "number",
+	uvIndex: "number",
+	visibility: "number",
+	windDirection: "number",
+	windGust: "number",
+	windSpeed: "number",
+})
+
+export type HourlyForecast = typeof hourlyForecastSchema.infer
+
+const dayWeatherConditionsSchema = type({
+	conditionCode: conditionCodeSchema,
+	humidity: "number",
+	precipitationAmount: "number",
+	precipitationChance: "number",
+	precipitationType: precipitationTypeSchema,
+	snowfallAmount: "number",
+	temperatureMax: "number",
+	temperatureMin: "number",
+	windDirection: "number",
+	"windGust?": "number",
+	windSpeed: "number",
+})
+
+export type DayWeatherConditions = typeof dayWeatherConditionsSchema.infer
+
+const dailyForecastSchema = type({
+	forecastStart: "string",
+	forecastEnd: "string",
+	conditionCode: conditionCodeSchema,
+	maxUvIndex: "number",
+	moonPhase: "string",
+	"moonrise?": "string",
+	"moonset?": "string",
+	precipitationAmount: "number",
+	precipitationChance: "number",
+	precipitationType: precipitationTypeSchema,
+	snowfallAmount: "number",
+	sunrise: "string",
+	sunriseCivil: "string",
+	sunriseNautical: "string",
+	sunriseAstronomical: "string",
+	sunset: "string",
+	sunsetCivil: "string",
+	sunsetNautical: "string",
+	sunsetAstronomical: "string",
+	temperatureMax: "number",
+	temperatureMin: "number",
+	"daytimeForecast?": dayWeatherConditionsSchema,
+	"overnightForecast?": dayWeatherConditionsSchema,
+})
+
+export type DailyForecast = typeof dailyForecastSchema.infer
+
+const weatherAlertSchema = type({
+	id: "string",
+	areaId: "string",
+	areaName: "string",
+	certainty: certaintySchema,
+	countryCode: "string",
+	description: "string",
+	detailsUrl: "string",
+	effectiveTime: "string",
+	expireTime: "string",
+	issuedTime: "string",
+	responses: "string[]",
+	severity: severitySchema,
+	source: "string",
+	urgency: urgencySchema,
+})
+
+export type WeatherAlert = typeof weatherAlertSchema.infer
+
+const weatherKitResponseSchema = type({
+	"currentWeather?": currentWeatherSchema,
+	"forecastHourly?": type({
+		hours: hourlyForecastSchema.array(),
+	}),
+	"forecastDaily?": type({
+		days: dailyForecastSchema.array(),
+	}),
+	"weatherAlerts?": type({
+		alerts: weatherAlertSchema.array(),
+	}),
+})
+
+export type WeatherKitResponse = typeof weatherKitResponseSchema.infer
+
+async function generateJwt(credentials: WeatherKitCredentials): Promise<string> {
+	const header = {
+		alg: "ES256",
+		kid: credentials.keyId,
+		id: `${credentials.teamId}.${credentials.serviceId}`,
+	}
+
+	const now = Math.floor(Date.now() / 1000)
+	const payload = {
+		iss: credentials.teamId,
+		iat: now,
+		exp: now + 3600,
+		sub: credentials.serviceId,
+	}
+
+	const encoder = new TextEncoder()
+	const headerB64 = btoa(JSON.stringify(header))
+		.replace(/\+/g, "-")
+		.replace(/\//g, "_")
+		.replace(/=+$/, "")
+	const payloadB64 = btoa(JSON.stringify(payload))
+		.replace(/\+/g, "-")
+		.replace(/\//g, "_")
+		.replace(/=+$/, "")
+
+	const signingInput = `${headerB64}.${payloadB64}`
+
+	const pemContents = credentials.privateKey
+		.replace(/-----BEGIN PRIVATE KEY-----/, "")
+		.replace(/-----END PRIVATE KEY-----/, "")
+		.replace(/\s/g, "")
+
+	const binaryKey = Uint8Array.from(atob(pemContents), (c) => c.charCodeAt(0))
+
+	const cryptoKey = await crypto.subtle.importKey(
+		"pkcs8",
+		binaryKey,
+		{ name: "ECDSA", namedCurve: "P-256" },
+		false,
+		["sign"],
+	)
+
+	const signature = await crypto.subtle.sign(
+		{ name: "ECDSA", hash: "SHA-256" },
+		cryptoKey,
+		encoder.encode(signingInput),
+	)
+
+	const signatureB64 = btoa(String.fromCharCode(...new Uint8Array(signature)))
+		.replace(/\+/g, "-")
+		.replace(/\//g, "_")
+		.replace(/=+$/, "")
+
+	return `${signingInput}.${signatureB64}`
+}

packages/aelis-source-tfl/src/index.ts

@@ -10,7 +10,5 @@ export {
 	type TflAlertSeverity,
 	type TflLineStatus,
 	type TflSourceOptions,
-	type TflStatusData,
-	type TflStatusFeedItem,
 } from "./types.ts"
-export { renderTflStatus } from "./renderer.tsx"
+export { renderTflAlert } from "./renderer.tsx"

packages/aelis-source-tfl/src/renderer.test.tsx

@@ -2,140 +2,102 @@
 import { render } from "@nym.sh/jrx"
 import { describe, expect, test } from "bun:test"
 
-import type { TflAlertData, TflStatusFeedItem } from "./types.ts"
+import type { TflAlertFeedItem } from "./types.ts"
 
-import { renderTflStatus } from "./renderer.tsx"
+import { renderTflAlert } from "./renderer.tsx"
 
-function makeAlert(overrides: Partial<TflAlertData> = {}): TflAlertData {
+function makeItem(overrides: Partial<TflAlertFeedItem["data"]> = {}): TflAlertFeedItem {
 	return {
+		id: "tfl-alert-northern-minor-delays",
+		type: "tfl-alert",
+		timestamp: new Date("2026-01-15T12:00:00Z"),
+		data: {
 			line: "northern",
 			lineName: "Northern",
 			severity: "minor-delays",
 			description: "Minor delays due to signal failure",
 			closestStationDistance: null,
 			...overrides,
+		},
 	}
 }
 
-function makeItem(alerts: TflAlertData[]): TflStatusFeedItem {
+describe("renderTflAlert", () => {
-	return {
+	test("renders a FeedCard with title and description", () => {
-		id: "tfl-status",
+		const node = renderTflAlert(makeItem())
-		sourceId: "aelis.tfl",
-		type: "tfl-status",
-		timestamp: new Date("2026-01-15T12:00:00Z"),
-		data: { alerts },
-	}
-}
-
-/** Collect all SansSerifText elements from a rendered spec, filtering out Fragments. */
-function collectTextElements(spec: ReturnType<typeof render>) {
-	return Object.values(spec.elements).filter((el) => el.type === "SansSerifText")
-}
-
-describe("renderTflStatus", () => {
-	test("renders a single FeedCard", () => {
-		const node = renderTflStatus(makeItem([makeAlert()]))
 		const spec = render(node)
 
 		const root = spec.elements[spec.root]!
 		expect(root.type).toBe("FeedCard")
-	})
+		expect(root.children!.length).toBeGreaterThanOrEqual(2)
 
-	test("renders one alert with title and description", () => {
+		const title = spec.elements[root.children![0]!]!
-		const node = renderTflStatus(makeItem([makeAlert()]))
+		expect(title.type).toBe("SansSerifText")
-		const spec = render(node)
+		expect(title.props.content).toBe("Northern · Minor delays")
 
-		const texts = collectTextElements(spec)
+		const body = spec.elements[root.children![1]!]!
-		const titleText = texts.find((el) => el.props.content === "Northern · Minor delays")
+		expect(body.type).toBe("SansSerifText")
-		const bodyText = texts.find((el) => el.props.content === "Minor delays due to signal failure")
+		expect(body.props.content).toBe("Minor delays due to signal failure")
-
-		expect(titleText).toBeDefined()
-		expect(bodyText).toBeDefined()
-	})
-
-	test("renders multiple alerts stacked in one card", () => {
-		const alerts = [
-			makeAlert({ line: "northern", lineName: "Northern", severity: "minor-delays" }),
-			makeAlert({
-				line: "central",
-				lineName: "Central",
-				severity: "closure",
-				description: "Closed due to strike",
-			}),
-		]
-		const node = renderTflStatus(makeItem(alerts))
-		const spec = render(node)
-
-		const root = spec.elements[spec.root]!
-		expect(root.type).toBe("FeedCard")
-
-		const texts = collectTextElements(spec)
-		const northernTitle = texts.find((el) => el.props.content === "Northern · Minor delays")
-		const centralTitle = texts.find((el) => el.props.content === "Central · Closed")
-		const centralBody = texts.find((el) => el.props.content === "Closed due to strike")
-
-		expect(northernTitle).toBeDefined()
-		expect(centralTitle).toBeDefined()
-		expect(centralBody).toBeDefined()
 	})
 
 	test("shows nearest station distance when available", () => {
-		const node = renderTflStatus(makeItem([makeAlert({ closestStationDistance: 0.35 })]))
+		const node = renderTflAlert(makeItem({ closestStationDistance: 0.35 }))
 		const spec = render(node)
 
-		const texts = collectTextElements(spec)
+		const root = spec.elements[spec.root]!
-		const caption = texts.find((el) => el.props.content === "Nearest station: 350m away")
+		expect(root.children).toHaveLength(3)
-		expect(caption).toBeDefined()
+
+		const caption = spec.elements[root.children![2]!]!
+		expect(caption.type).toBe("SansSerifText")
+		expect(caption.props.content).toBe("Nearest station: 350m away")
 	})
 
 	test("formats distance in km when >= 1km", () => {
-		const node = renderTflStatus(makeItem([makeAlert({ closestStationDistance: 2.456 })]))
+		const node = renderTflAlert(makeItem({ closestStationDistance: 2.456 }))
 		const spec = render(node)
 
-		const texts = collectTextElements(spec)
+		const root = spec.elements[spec.root]!
-		const caption = texts.find((el) => el.props.content === "Nearest station: 2.5km away")
+		const caption = spec.elements[root.children![2]!]!
-		expect(caption).toBeDefined()
+		expect(caption.props.content).toBe("Nearest station: 2.5km away")
 	})
 
 	test("formats near-1km boundary as km not meters", () => {
-		const node = renderTflStatus(makeItem([makeAlert({ closestStationDistance: 0.9999 })]))
+		const node = renderTflAlert(makeItem({ closestStationDistance: 0.9999 }))
 		const spec = render(node)
 
-		const texts = collectTextElements(spec)
+		const root = spec.elements[spec.root]!
-		const caption = texts.find((el) => el.props.content === "Nearest station: 1.0km away")
+		const caption = spec.elements[root.children![2]!]!
-		expect(caption).toBeDefined()
+		expect(caption.props.content).toBe("Nearest station: 1.0km away")
 	})
 
 	test("omits station distance when null", () => {
-		const node = renderTflStatus(makeItem([makeAlert({ closestStationDistance: null })]))
+		const node = renderTflAlert(makeItem({ closestStationDistance: null }))
 		const spec = render(node)
 
-		const texts = collectTextElements(spec)
+		const root = spec.elements[spec.root]!
-		const distanceTexts = texts.filter((el) =>
+		// Title + body only, no caption (empty fragment doesn't produce a child)
-			(el.props.content as string).startsWith("Nearest station:"),
+		const children = root.children!.filter((key) => {
-		)
+			const el = spec.elements[key]
-		expect(distanceTexts).toHaveLength(0)
+			return el && el.type !== "Fragment"
+		})
+		expect(children).toHaveLength(2)
 	})
 
 	test("renders closure severity label", () => {
-		const node = renderTflStatus(
+		const node = renderTflAlert(makeItem({ severity: "closure", lineName: "Central" }))
-			makeItem([makeAlert({ severity: "closure", lineName: "Central" })]),
-		)
 		const spec = render(node)
 
-		const texts = collectTextElements(spec)
+		const root = spec.elements[spec.root]!
-		const title = texts.find((el) => el.props.content === "Central · Closed")
+		const title = spec.elements[root.children![0]!]!
-		expect(title).toBeDefined()
+		expect(title.props.content).toBe("Central · Closed")
 	})
 
 	test("renders major delays severity label", () => {
-		const node = renderTflStatus(
+		const node = renderTflAlert(makeItem({ severity: "major-delays", lineName: "Jubilee" }))
-			makeItem([makeAlert({ severity: "major-delays", lineName: "Jubilee" })]),
-		)
 		const spec = render(node)
 
-		const texts = collectTextElements(spec)
+		const root = spec.elements[spec.root]!
-		const title = texts.find((el) => el.props.content === "Jubilee · Major delays")
+		const title = spec.elements[root.children![0]!]!
-		expect(title).toBeDefined()
+		expect(title.props.content).toBe("Jubilee · Major delays")
 	})
 })

packages/aelis-source-tfl/src/renderer.tsx

@@ -3,7 +3,7 @@ import type { FeedItemRenderer } from "@aelis/core"
 
 import { FeedCard, SansSerifText } from "@aelis/components"
 
-import type { TflAlertData, TflStatusData } from "./types.ts"
+import type { TflAlertData } from "./types.ts"
 
 import { TflAlertSeverity } from "./types.ts"
 
@@ -21,26 +21,20 @@ function formatDistance(km: number): string {
 	return `${(meters / 1000).toFixed(1)}km away`
 }
 
-function renderAlertRow(alert: TflAlertData) {
+export const renderTflAlert: FeedItemRenderer<"tfl-alert", TflAlertData> = (item) => {
-	const severityLabel = SEVERITY_LABEL[alert.severity]
+	const { lineName, severity, description, closestStationDistance } = item.data
+	const severityLabel = SEVERITY_LABEL[severity]
 
 	return (
-		<>
+		<FeedCard>
+			<SansSerifText content={`${lineName} · ${severityLabel}`} style="text-base font-semibold" />
+			<SansSerifText content={description} style="text-sm" />
+			{closestStationDistance !== null ? (
 				<SansSerifText
-				content={`${alert.lineName} · ${severityLabel}`}
+					content={`Nearest station: ${formatDistance(closestStationDistance)}`}
-				style="text-base font-semibold"
-			/>
-			<SansSerifText content={alert.description} style="text-sm" />
-			{alert.closestStationDistance !== null ? (
-				<SansSerifText
-					content={`Nearest station: ${formatDistance(alert.closestStationDistance)}`}
 					style="text-xs text-stone-500"
 				/>
 			) : null}
-		</>
+		</FeedCard>
 	)
 }
-
-export const renderTflStatus: FeedItemRenderer<"tfl-status", TflStatusData> = (item) => {
-	return <FeedCard>{item.data.alerts.map((alert) => renderAlertRow(alert))}</FeedCard>
-}

packages/aelis-source-tfl/src/tfl-api.ts

@@ -69,7 +69,7 @@ export class TflApi {
 	}
 
 	async fetchLineStatuses(lines?: TflLineId[]): Promise<TflLineStatus[]> {
-		const lineIds = lines?.length ? lines : ALL_LINE_IDS
+		const lineIds = lines ?? ALL_LINE_IDS
 		const data = await this.fetch<unknown>(`/Line/${lineIds.join(",")}/Status`)
 
 		const parsed = lineResponseArray(data)
@@ -101,8 +101,8 @@ export class TflApi {
 			return this.stationsCache
 		}
 
-		// Fetch stations for all lines in parallel, tolerating individual failures
+		// Fetch stations for all lines in parallel
-		const results = await Promise.allSettled(
+		const responses = await Promise.all(
 			ALL_LINE_IDS.map(async (id) => {
 				const data = await this.fetch<unknown>(`/Line/${id}/StopPoints`)
 				const parsed = lineStopPointsArray(data)
@@ -116,12 +116,7 @@ export class TflApi {
 		// Merge stations, combining lines for shared stations
 		const stationMap = new Map<string, StationLocation>()
 
-		for (const result of results) {
+		for (const { lineId: currentLineId, stops } of responses) {
-			if (result.status === "rejected") {
-				continue
-			}
-
-			const { lineId: currentLineId, stops } = result.value
 			for (const stop of stops) {
 				const existing = stationMap.get(stop.naptanId)
 				if (existing) {
@@ -140,15 +135,8 @@ export class TflApi {
 			}
 		}
 
-		// Only cache if all requests succeeded — partial results shouldn't persist
+		this.stationsCache = Array.from(stationMap.values())
-		const allSucceeded = results.every((r) => r.status === "fulfilled")
+		return this.stationsCache
-		const stations = Array.from(stationMap.values())
-
-		if (allSucceeded) {
-			this.stationsCache = stations
-		}
-
-		return stations
 	}
 }
 

packages/aelis-source-tfl/src/tfl-source.test.ts

@@ -138,15 +138,13 @@ describe("TflSource", () => {
 		test("changes which lines are fetched", async () => {
 			const source = new TflSource({ client: lineFilteringApi })
 			const before = await source.fetchItems(createContext())
-			expect(before).toHaveLength(1)
+			expect(before.length).toBe(2)
-			expect(before[0]!.data.alerts).toHaveLength(2)
 
 			source.setLinesOfInterest(["northern"])
 			const after = await source.fetchItems(createContext())
 
-			expect(after).toHaveLength(1)
+			expect(after.length).toBe(1)
-			expect(after[0]!.data.alerts).toHaveLength(1)
+			expect(after[0]!.data.line).toBe("northern")
-			expect(after[0]!.data.alerts[0]!.line).toBe("northern")
 		})
 
 		test("DEFAULT_LINES_OF_INTEREST restores all lines", async () => {
@@ -155,52 +153,23 @@ describe("TflSource", () => {
 				lines: ["northern"],
 			})
 			const filtered = await source.fetchItems(createContext())
-			expect(filtered[0]!.data.alerts).toHaveLength(1)
+			expect(filtered.length).toBe(1)
 
 			source.setLinesOfInterest([...TflSource.DEFAULT_LINES_OF_INTEREST])
 			const all = await source.fetchItems(createContext())
 
-			expect(all[0]!.data.alerts).toHaveLength(2)
+			expect(all.length).toBe(2)
 		})
 	})
 
 	describe("fetchItems", () => {
-		test("returns at most one feed item", async () => {
+		test("returns feed items array", async () => {
 			const source = new TflSource({ client: api })
 			const items = await source.fetchItems(createContext())
-			expect(items).toHaveLength(1)
+			expect(Array.isArray(items)).toBe(true)
 		})
 
-		test("returns empty array when no disruptions", async () => {
+		test("feed items have correct base structure", async () => {
-			const emptyApi: ITflApi = {
-				async fetchLineStatuses(): Promise<TflLineStatus[]> {
-					return []
-				},
-				async fetchStations(): Promise<StationLocation[]> {
-					return []
-				},
-			}
-			const source = new TflSource({ client: emptyApi })
-			const items = await source.fetchItems(createContext())
-			expect(items).toHaveLength(0)
-		})
-
-		test("combined item has correct base structure", async () => {
-			const source = new TflSource({ client: api })
-			const items = await source.fetchItems(createContext())
-
-			const item = items[0]!
-			expect(item.id).toBe("tfl-status")
-			expect(item.type).toBe("tfl-status")
-			expect(item.sourceId).toBe("aelis.tfl")
-			expect(item.signals).toBeDefined()
-			expect(typeof item.signals!.urgency).toBe("number")
-			expect(item.timestamp).toBeInstanceOf(Date)
-			expect(Array.isArray(item.data.alerts)).toBe(true)
-			expect(item.data.alerts.length).toBeGreaterThan(0)
-		})
-
-		test("alerts have correct data structure", async () => {
 			const source = new TflSource({ client: api })
 			const location: Location = {
 				lat: 51.5074,
@@ -209,140 +178,72 @@ describe("TflSource", () => {
 				timestamp: new Date(),
 			}
 			const items = await source.fetchItems(createContext(location))
-			const alerts = items[0]!.data.alerts
 
-			for (const alert of alerts) {
+			for (const item of items) {
-				expect(typeof alert.line).toBe("string")
+				expect(typeof item.id).toBe("string")
-				expect(typeof alert.lineName).toBe("string")
+				expect(item.id).toMatch(/^tfl-alert-/)
-				expect(["minor-delays", "major-delays", "closure"]).toContain(alert.severity)
+				expect(item.type).toBe("tfl-alert")
-				expect(typeof alert.description).toBe("string")
+				expect(item.signals).toBeDefined()
+				expect(typeof item.signals!.urgency).toBe("number")
+				expect(item.timestamp).toBeInstanceOf(Date)
+			}
+		})
+
+		test("feed items have correct data structure", async () => {
+			const source = new TflSource({ client: api })
+			const location: Location = {
+				lat: 51.5074,
+				lng: -0.1278,
+				accuracy: 10,
+				timestamp: new Date(),
+			}
+			const items = await source.fetchItems(createContext(location))
+
+			for (const item of items) {
+				expect(typeof item.data.line).toBe("string")
+				expect(typeof item.data.lineName).toBe("string")
+				expect(["minor-delays", "major-delays", "closure"]).toContain(item.data.severity)
+				expect(typeof item.data.description).toBe("string")
 				expect(
-					alert.closestStationDistance === null || typeof alert.closestStationDistance === "number",
+					item.data.closestStationDistance === null ||
+						typeof item.data.closestStationDistance === "number",
 				).toBe(true)
 			}
 		})
 
-		test("signals use highest severity urgency", async () => {
+		test("feed item ids are unique", async () => {
-			const mixedApi: ITflApi = {
+			const source = new TflSource({ client: api })
-				async fetchLineStatuses(): Promise<TflLineStatus[]> {
-					return [
-						{
-							lineId: "northern",
-							lineName: "Northern",
-							severity: "minor-delays",
-							description: "Minor delays",
-						},
-						{
-							lineId: "central",
-							lineName: "Central",
-							severity: "closure",
-							description: "Closed",
-						},
-						{
-							lineId: "jubilee",
-							lineName: "Jubilee",
-							severity: "major-delays",
-							description: "Major delays",
-						},
-					]
-				},
-				async fetchStations(): Promise<StationLocation[]> {
-					return []
-				},
-			}
-			const source = new TflSource({ client: mixedApi })
 			const items = await source.fetchItems(createContext())
 
-			expect(items[0]!.signals!.urgency).toBe(1.0) // closure urgency
+			const ids = items.map((item) => item.id)
-			expect(items[0]!.signals!.timeRelevance).toBe("imminent") // closure time relevance
+			const uniqueIds = new Set(ids)
+			expect(uniqueIds.size).toBe(ids.length)
 		})
 
-		test("signals use single alert severity when only one disruption", async () => {
+		test("feed items are sorted by urgency descending", async () => {
-			const singleApi: ITflApi = {
+			const source = new TflSource({ client: api })
-				async fetchLineStatuses(): Promise<TflLineStatus[]> {
-					return [
-						{
-							lineId: "northern",
-							lineName: "Northern",
-							severity: "minor-delays",
-							description: "Minor delays",
-						},
-					]
-				},
-				async fetchStations(): Promise<StationLocation[]> {
-					return []
-				},
-			}
-			const source = new TflSource({ client: singleApi })
 			const items = await source.fetchItems(createContext())
 
-			expect(items[0]!.signals!.urgency).toBe(0.6) // minor-delays urgency
+			for (let i = 1; i < items.length; i++) {
-			expect(items[0]!.signals!.timeRelevance).toBe("upcoming")
+				const prev = items[i - 1]!
+				const curr = items[i]!
+				expect(prev.signals!.urgency).toBeGreaterThanOrEqual(curr.signals!.urgency!)
+			}
 		})
 
-		test("alerts sorted by closestStationDistance ascending, nulls last", async () => {
+		test("urgency values match severity levels", async () => {
-			const distanceApi: ITflApi = {
+			const source = new TflSource({ client: api })
-				async fetchLineStatuses(): Promise<TflLineStatus[]> {
+			const items = await source.fetchItems(createContext())
-					return [
-						{
-							lineId: "northern",
-							lineName: "Northern",
-							severity: "minor-delays",
-							description: "Delays",
-						},
-						{
-							lineId: "central",
-							lineName: "Central",
-							severity: "minor-delays",
-							description: "Delays",
-						},
-						{
-							lineId: "jubilee",
-							lineName: "Jubilee",
-							severity: "minor-delays",
-							description: "Delays",
-						},
-					]
-				},
-				async fetchStations(): Promise<StationLocation[]> {
-					return [
-						{ id: "s1", name: "Station A", lat: 51.51, lng: -0.13, lines: ["central"] },
-						{ id: "s2", name: "Station B", lat: 51.52, lng: -0.14, lines: ["northern"] },
-						// No stations for jubilee — its distance will be null
-					]
-				},
-			}
-			const source = new TflSource({ client: distanceApi })
-			const location: Location = {
-				lat: 51.5074,
-				lng: -0.1278,
-				accuracy: 10,
-				timestamp: new Date(),
-			}
-			const items = await source.fetchItems(createContext(location))
-			const alerts = items[0]!.data.alerts
 
-			// Alerts with distances should come before nulls
+			const severityUrgency: Record<string, number> = {
-			const withDistance = alerts.filter((a) => a.closestStationDistance !== null)
+				closure: 1.0,
-			const withoutDistance = alerts.filter((a) => a.closestStationDistance === null)
+				"major-delays": 0.8,
-
+				"minor-delays": 0.6,
-			// All distance alerts come first
-			const firstNullIndex = alerts.findIndex((a) => a.closestStationDistance === null)
-			if (firstNullIndex !== -1) {
-				for (let i = 0; i < firstNullIndex; i++) {
-					expect(alerts[i]!.closestStationDistance).not.toBeNull()
-				}
 			}
 
-			// Distance alerts are in ascending order
+			for (const item of items) {
-			for (let i = 1; i < withDistance.length; i++) {
+				expect(item.signals!.urgency).toBe(severityUrgency[item.data.severity]!)
-				expect(withDistance[i]!.closestStationDistance!).toBeGreaterThanOrEqual(
-					withDistance[i - 1]!.closestStationDistance!,
-				)
 			}
-
-			expect(withoutDistance.length).toBe(1)
-			expect(withoutDistance[0]!.line).toBe("jubilee")
 		})
 
 		test("closestStationDistance is number when location provided", async () => {
@@ -355,9 +256,9 @@ describe("TflSource", () => {
 			}
 			const items = await source.fetchItems(createContext(location))
 
-			for (const alert of items[0]!.data.alerts) {
+			for (const item of items) {
-				expect(typeof alert.closestStationDistance).toBe("number")
+				expect(typeof item.data.closestStationDistance).toBe("number")
-				expect(alert.closestStationDistance!).toBeGreaterThan(0)
+				expect(item.data.closestStationDistance!).toBeGreaterThan(0)
 			}
 		})
 
@@ -365,8 +266,8 @@ describe("TflSource", () => {
 			const source = new TflSource({ client: api })
 			const items = await source.fetchItems(createContext())
 
-			for (const alert of items[0]!.data.alerts) {
+			for (const item of items) {
-				expect(alert.closestStationDistance).toBeNull()
+				expect(item.data.closestStationDistance).toBeNull()
 			}
 		})
 	})
@@ -408,9 +309,8 @@ describe("TflSource", () => {
 			await source.executeAction("set-lines-of-interest", ["northern"])
 
 			const items = await source.fetchItems(createContext())
-			expect(items).toHaveLength(1)
+			expect(items.length).toBe(1)
-			expect(items[0]!.data.alerts).toHaveLength(1)
+			expect(items[0]!.data.line).toBe("northern")
-			expect(items[0]!.data.alerts[0]!.line).toBe("northern")
 		})
 
 		test("executeAction throws on invalid input", async () => {

packages/aelis-source-tfl/src/tfl-source.ts

@@ -8,10 +8,10 @@ import type {
 	ITflApi,
 	StationLocation,
 	TflAlertData,
+	TflAlertFeedItem,
 	TflAlertSeverity,
 	TflLineId,
 	TflSourceOptions,
-	TflStatusFeedItem,
 } from "./types.ts"
 
 import { TflApi, lineId } from "./tfl-api.ts"
@@ -51,7 +51,7 @@ const SEVERITY_TIME_RELEVANCE: Record<TflAlertSeverity, TimeRelevance> = {
  * const { items } = await engine.refresh()
  * ```
  */
-export class TflSource implements FeedSource<TflStatusFeedItem> {
+export class TflSource implements FeedSource<TflAlertFeedItem> {
 	static readonly DEFAULT_LINES_OF_INTEREST: readonly TflLineId[] = [
 		"bakerloo",
 		"central",
@@ -84,7 +84,7 @@ export class TflSource implements FeedSource<TflStatusFeedItem> {
 			throw new Error("Either client or apiKey must be provided")
 		}
 		this.client = options.client ?? new TflApi(options.apiKey!)
-		this.lines = options.lines?.length ? options.lines : [...TflSource.DEFAULT_LINES_OF_INTEREST]
+		this.lines = options.lines ?? [...TflSource.DEFAULT_LINES_OF_INTEREST]
 	}
 
 	async listActions(): Promise<Record<string, ActionDefinition>> {
@@ -123,58 +123,56 @@ export class TflSource implements FeedSource<TflStatusFeedItem> {
 		this.lines = lines
 	}
 
-	async fetchItems(context: Context): Promise<TflStatusFeedItem[]> {
+	async fetchItems(context: Context): Promise<TflAlertFeedItem[]> {
 		const [statuses, stations] = await Promise.all([
 			this.client.fetchLineStatuses(this.lines),
 			this.client.fetchStations(),
 		])
 
-		if (statuses.length === 0) {
-			return []
-		}
-
 		const location = context.get(LocationKey)
 
-		const alerts: TflAlertData[] = statuses.map((status) => ({
+		const items: TflAlertFeedItem[] = statuses.map((status) => {
+			const closestStationDistance = location
+				? findClosestStationDistance(status.lineId, stations, location.lat, location.lng)
+				: null
+
+			const data: TflAlertData = {
 				line: status.lineId,
 				lineName: status.lineName,
 				severity: status.severity,
 				description: status.description,
-			closestStationDistance: location
+				closestStationDistance,
-				? findClosestStationDistance(status.lineId, stations, location.lat, location.lng)
-				: null,
-		}))
-
-		// Sort by closest station distance ascending, nulls last
-		alerts.sort((a, b) => {
-			if (a.closestStationDistance === null && b.closestStationDistance === null) return 0
-			if (a.closestStationDistance === null) return 1
-			if (b.closestStationDistance === null) return -1
-			return a.closestStationDistance - b.closestStationDistance
-		})
-
-		// Signals from the highest-severity alert
-		const highestSeverity = alerts.reduce<TflAlertSeverity>(
-			(worst, alert) =>
-				SEVERITY_URGENCY[alert.severity] > SEVERITY_URGENCY[worst] ? alert.severity : worst,
-			alerts[0]!.severity,
-		)
-
-		const signals: FeedItemSignals = {
-			urgency: SEVERITY_URGENCY[highestSeverity],
-			timeRelevance: SEVERITY_TIME_RELEVANCE[highestSeverity],
 			}
 
-		return [
+			const signals: FeedItemSignals = {
-			{
+				urgency: SEVERITY_URGENCY[status.severity],
-				id: "tfl-status",
+				timeRelevance: SEVERITY_TIME_RELEVANCE[status.severity],
+			}
+
+			return {
+				id: `tfl-alert-${status.lineId}-${status.severity}`,
 				sourceId: this.id,
-				type: TflFeedItemType.Status,
+				type: TflFeedItemType.Alert,
 				timestamp: context.time,
-				data: { alerts },
+				data,
 				signals,
-			},
+			}
-		]
+		})
+
+		// Sort by urgency (desc), then by proximity (asc) if location available
+		items.sort((a, b) => {
+			const aUrgency = a.signals?.urgency ?? 0
+			const bUrgency = b.signals?.urgency ?? 0
+			if (bUrgency !== aUrgency) {
+				return bUrgency - aUrgency
+			}
+			if (a.data.closestStationDistance !== null && b.data.closestStationDistance !== null) {
+				return a.data.closestStationDistance - b.data.closestStationDistance
+			}
+			return 0
+		})
+
+		return items
 	}
 }
 

packages/aelis-source-tfl/src/types.ts

@@ -22,19 +22,12 @@ export interface TflAlertData extends Record<string, unknown> {
 
 export const TflFeedItemType = {
 	Alert: "tfl-alert",
-	Status: "tfl-status",
 } as const
 
 export type TflFeedItemType = (typeof TflFeedItemType)[keyof typeof TflFeedItemType]
 
 export type TflAlertFeedItem = FeedItem<typeof TflFeedItemType.Alert, TflAlertData>
 
-export interface TflStatusData extends Record<string, unknown> {
-	alerts: TflAlertData[]
-}
-
-export type TflStatusFeedItem = FeedItem<typeof TflFeedItemType.Status, TflStatusData>
-
 export interface TflSourceOptions {
 	apiKey?: string
 	client?: ITflApi

packages/aelis-source-weatherkit/src/feed-items.ts

@@ -32,7 +32,7 @@ export interface CurrentWeatherFeedItem extends FeedItem<
 	CurrentWeatherData
 > {}
 
-export type HourlyWeatherEntry = {
+export type HourlyWeatherData = {
 	forecastTime: Date
 	conditionCode: ConditionCode
 	daylight: boolean
@@ -48,16 +48,12 @@ export type HourlyWeatherEntry = {
 	windSpeed: number
 }
 
-export type HourlyWeatherData = {
-	hours: HourlyWeatherEntry[]
-}
-
 export interface HourlyWeatherFeedItem extends FeedItem<
 	typeof WeatherFeedItemType.Hourly,
 	HourlyWeatherData
 > {}
 
-export type DailyWeatherEntry = {
+export type DailyWeatherData = {
 	forecastDate: Date
 	conditionCode: ConditionCode
 	maxUvIndex: number
@@ -71,10 +67,6 @@ export type DailyWeatherEntry = {
 	temperatureMin: number
 }
 
-export type DailyWeatherData = {
-	days: DailyWeatherEntry[]
-}
-
 export interface DailyWeatherFeedItem extends FeedItem<
 	typeof WeatherFeedItemType.Daily,
 	DailyWeatherData

packages/aelis-source-weatherkit/src/index.ts

@@ -8,10 +8,8 @@ export {
 	type CurrentWeatherData,
 	type HourlyWeatherFeedItem,
 	type HourlyWeatherData,
-	type HourlyWeatherEntry,
 	type DailyWeatherFeedItem,
 	type DailyWeatherData,
-	type DailyWeatherEntry,
 	type WeatherAlertFeedItem,
 	type WeatherAlertData,
 } from "./feed-items"

packages/aelis-source-weatherkit/src/weather-source.test.ts

@@ -4,10 +4,10 @@ import { Context } from "@aelis/core"
 import { LocationKey } from "@aelis/source-location"
 import { describe, expect, test } from "bun:test"
 
-import type { WeatherKitClient, WeatherKitResponse, HourlyForecast, DailyForecast } from "./weatherkit"
+import type { WeatherKitClient, WeatherKitResponse } from "./weatherkit"
 
 import fixture from "../fixtures/san-francisco.json"
-import { WeatherFeedItemType, type DailyWeatherData, type HourlyWeatherData } from "./feed-items"
+import { WeatherFeedItemType } from "./feed-items"
 import { WeatherKey, type Weather } from "./weather-context"
 import { WeatherSource, Units } from "./weather-source"
 
@@ -131,125 +131,8 @@ describe("WeatherSource", () => {
 			const hourlyItems = items.filter((i) => i.type === WeatherFeedItemType.Hourly)
 			const dailyItems = items.filter((i) => i.type === WeatherFeedItemType.Daily)
 
-			expect(hourlyItems.length).toBe(1)
+			expect(hourlyItems.length).toBe(3)
-			expect((hourlyItems[0]!.data as HourlyWeatherData).hours.length).toBe(3)
+			expect(dailyItems.length).toBe(2)
-			expect(dailyItems.length).toBe(1)
-			expect((dailyItems[0]!.data as DailyWeatherData).days.length).toBe(2)
-		})
-
-		test("produces a single hourly item with hours array", async () => {
-			const source = new WeatherSource({ client: mockClient })
-			const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
-
-			const items = await source.fetchItems(context)
-
-			const hourlyItems = items.filter((i) => i.type === WeatherFeedItemType.Hourly)
-			expect(hourlyItems.length).toBe(1)
-
-			const hourlyData = hourlyItems[0]!.data as HourlyWeatherData
-			expect(Array.isArray(hourlyData.hours)).toBe(true)
-			expect(hourlyData.hours.length).toBeGreaterThan(0)
-			expect(hourlyData.hours.length).toBeLessThanOrEqual(12)
-		})
-
-		test("averages urgency across hours with mixed conditions", async () => {
-			const mildHour: HourlyForecast = {
-				forecastStart: "2026-01-17T01:00:00Z",
-				conditionCode: "Clear",
-				daylight: true,
-				humidity: 0.5,
-				precipitationAmount: 0,
-				precipitationChance: 0,
-				precipitationType: "clear",
-				pressure: 1013,
-				snowfallIntensity: 0,
-				temperature: 20,
-				temperatureApparent: 20,
-				temperatureDewPoint: 10,
-				uvIndex: 3,
-				visibility: 20000,
-				windDirection: 180,
-				windGust: 10,
-				windSpeed: 5,
-			}
-			const severeHour: HourlyForecast = {
-				...mildHour,
-				forecastStart: "2026-01-17T02:00:00Z",
-				conditionCode: "SevereThunderstorm",
-			}
-			const mixedResponse: WeatherKitResponse = {
-				forecastHourly: { hours: [mildHour, severeHour] },
-			}
-			const source = new WeatherSource({ client: createMockClient(mixedResponse) })
-			const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
-
-			const items = await source.fetchItems(context)
-			const hourlyItem = items.find((i) => i.type === WeatherFeedItemType.Hourly)
-
-			expect(hourlyItem).toBeDefined()
-			// Mild urgency = 0.3, severe urgency = 0.6, average = 0.45
-			expect(hourlyItem!.signals!.urgency).toBeCloseTo(0.45, 5)
-			// Worst-case: SevereThunderstorm → Imminent
-			expect(hourlyItem!.signals!.timeRelevance).toBe("imminent")
-		})
-
-		test("produces a single daily item with days array", async () => {
-			const source = new WeatherSource({ client: mockClient })
-			const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
-
-			const items = await source.fetchItems(context)
-
-			const dailyItems = items.filter((i) => i.type === WeatherFeedItemType.Daily)
-			expect(dailyItems.length).toBe(1)
-
-			const dailyData = dailyItems[0]!.data as DailyWeatherData
-			expect(Array.isArray(dailyData.days)).toBe(true)
-			expect(dailyData.days.length).toBeGreaterThan(0)
-			expect(dailyData.days.length).toBeLessThanOrEqual(7)
-		})
-
-		test("averages urgency across days with mixed conditions", async () => {
-			const mildDay: DailyForecast = {
-				forecastStart: "2026-01-17T00:00:00Z",
-				forecastEnd: "2026-01-18T00:00:00Z",
-				conditionCode: "Clear",
-				maxUvIndex: 3,
-				moonPhase: "firstQuarter",
-				precipitationAmount: 0,
-				precipitationChance: 0,
-				precipitationType: "clear",
-				snowfallAmount: 0,
-				sunrise: "2026-01-17T07:00:00Z",
-				sunriseCivil: "2026-01-17T06:30:00Z",
-				sunriseNautical: "2026-01-17T06:00:00Z",
-				sunriseAstronomical: "2026-01-17T05:30:00Z",
-				sunset: "2026-01-17T17:00:00Z",
-				sunsetCivil: "2026-01-17T17:30:00Z",
-				sunsetNautical: "2026-01-17T18:00:00Z",
-				sunsetAstronomical: "2026-01-17T18:30:00Z",
-				temperatureMax: 15,
-				temperatureMin: 5,
-			}
-			const severeDay: DailyForecast = {
-				...mildDay,
-				forecastStart: "2026-01-18T00:00:00Z",
-				forecastEnd: "2026-01-19T00:00:00Z",
-				conditionCode: "SevereThunderstorm",
-			}
-			const mixedResponse: WeatherKitResponse = {
-				forecastDaily: { days: [mildDay, severeDay] },
-			}
-			const source = new WeatherSource({ client: createMockClient(mixedResponse) })
-			const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
-
-			const items = await source.fetchItems(context)
-			const dailyItem = items.find((i) => i.type === WeatherFeedItemType.Daily)
-
-			expect(dailyItem).toBeDefined()
-			// Mild urgency = 0.2, severe urgency = 0.5, average = 0.35
-			expect(dailyItem!.signals!.urgency).toBeCloseTo(0.35, 5)
-			// Worst-case: SevereThunderstorm → Imminent
-			expect(dailyItem!.signals!.timeRelevance).toBe("imminent")
 		})
 
 		test("sets timestamp from context.time", async () => {

packages/aelis-source-weatherkit/src/weather-source.ts

@@ -3,7 +3,7 @@ import type { ActionDefinition, ContextEntry, FeedItemSignals, FeedSource } from
 import { Context, TimeRelevance, UnknownActionError } from "@aelis/core"
 import { LocationKey } from "@aelis/source-location"
 
-import { WeatherFeedItemType, type DailyWeatherEntry, type HourlyWeatherEntry, type WeatherFeedItem } from "./feed-items"
+import { WeatherFeedItemType, type WeatherFeedItem } from "./feed-items"
 import currentWeatherInsightPrompt from "./prompts/current-weather-insight.txt"
 import { WeatherKey, type Weather } from "./weather-context"
 import {
@@ -174,15 +174,21 @@ export class WeatherSource implements FeedSource<WeatherFeedItem> {
 
 		if (response.forecastHourly?.hours) {
 			const hours = response.forecastHourly.hours.slice(0, this.hourlyLimit)
-			if (hours.length > 0) {
+			for (let i = 0; i < hours.length; i++) {
-				items.push(createHourlyForecastFeedItem(hours, timestamp, this.units, this.id))
+				const hour = hours[i]
+				if (hour) {
+					items.push(createHourlyWeatherFeedItem(hour, i, timestamp, this.units, this.id))
+				}
 			}
 		}
 
 		if (response.forecastDaily?.days) {
 			const days = response.forecastDaily.days.slice(0, this.dailyLimit)
-			if (days.length > 0) {
+			for (let i = 0; i < days.length; i++) {
-				items.push(createDailyForecastFeedItem(days, timestamp, this.units, this.id))
+				const day = days[i]
+				if (day) {
+					items.push(createDailyWeatherFeedItem(day, i, timestamp, this.units, this.id))
+				}
 			}
 		}
 
@@ -317,18 +323,24 @@ function createCurrentWeatherFeedItem(
 	}
 }
 
-function createHourlyForecastFeedItem(
+function createHourlyWeatherFeedItem(
-	hourlyForecasts: HourlyForecast[],
+	hourly: HourlyForecast,
+	index: number,
 	timestamp: Date,
 	units: Units,
 	sourceId: string,
 ): WeatherFeedItem {
-	const hours: HourlyWeatherEntry[] = []
+	const signals: FeedItemSignals = {
-	let totalUrgency = 0
+		urgency: adjustUrgencyForCondition(BASE_URGENCY.hourly, hourly.conditionCode),
-	let worstTimeRelevance: TimeRelevance = TimeRelevance.Ambient
+		timeRelevance: timeRelevanceForCondition(hourly.conditionCode),
+	}
 
-	for (const hourly of hourlyForecasts) {
+	return {
-		hours.push({
+		id: `weather-hourly-${timestamp.getTime()}-${index}`,
+		sourceId,
+		type: WeatherFeedItemType.Hourly,
+		timestamp,
+		data: {
 			forecastTime: new Date(hourly.forecastStart),
 			conditionCode: hourly.conditionCode,
 			daylight: hourly.daylight,
@@ -342,43 +354,29 @@ function createHourlyForecastFeedItem(
 			windDirection: hourly.windDirection,
 			windGust: convertSpeed(hourly.windGust, units),
 			windSpeed: convertSpeed(hourly.windSpeed, units),
-		})
+		},
-		totalUrgency += adjustUrgencyForCondition(BASE_URGENCY.hourly, hourly.conditionCode)
-		const rel = timeRelevanceForCondition(hourly.conditionCode)
-		if (rel === TimeRelevance.Imminent) {
-			worstTimeRelevance = TimeRelevance.Imminent
-		} else if (rel === TimeRelevance.Upcoming && worstTimeRelevance !== TimeRelevance.Imminent) {
-			worstTimeRelevance = TimeRelevance.Upcoming
-		}
-	}
-
-	const signals: FeedItemSignals = {
-		urgency: totalUrgency / hours.length,
-		timeRelevance: worstTimeRelevance,
-	}
-
-	return {
-		id: `weather-hourly-${timestamp.getTime()}`,
-		sourceId,
-		type: WeatherFeedItemType.Hourly,
-		timestamp,
-		data: { hours },
 		signals,
 	}
 }
 
-function createDailyForecastFeedItem(
+function createDailyWeatherFeedItem(
-	dailyForecasts: DailyForecast[],
+	daily: DailyForecast,
+	index: number,
 	timestamp: Date,
 	units: Units,
 	sourceId: string,
 ): WeatherFeedItem {
-	const days: DailyWeatherEntry[] = []
+	const signals: FeedItemSignals = {
-	let totalUrgency = 0
+		urgency: adjustUrgencyForCondition(BASE_URGENCY.daily, daily.conditionCode),
-	let worstTimeRelevance: TimeRelevance = TimeRelevance.Ambient
+		timeRelevance: timeRelevanceForCondition(daily.conditionCode),
+	}
 
-	for (const daily of dailyForecasts) {
+	return {
-		days.push({
+		id: `weather-daily-${timestamp.getTime()}-${index}`,
+		sourceId,
+		type: WeatherFeedItemType.Daily,
+		timestamp,
+		data: {
 			forecastDate: new Date(daily.forecastStart),
 			conditionCode: daily.conditionCode,
 			maxUvIndex: daily.maxUvIndex,
@@ -390,27 +388,7 @@ function createDailyForecastFeedItem(
 			sunset: new Date(daily.sunset),
 			temperatureMax: convertTemperature(daily.temperatureMax, units),
 			temperatureMin: convertTemperature(daily.temperatureMin, units),
-		})
+		},
-		totalUrgency += adjustUrgencyForCondition(BASE_URGENCY.daily, daily.conditionCode)
-		const rel = timeRelevanceForCondition(daily.conditionCode)
-		if (rel === TimeRelevance.Imminent) {
-			worstTimeRelevance = TimeRelevance.Imminent
-		} else if (rel === TimeRelevance.Upcoming && worstTimeRelevance !== TimeRelevance.Imminent) {
-			worstTimeRelevance = TimeRelevance.Upcoming
-		}
-	}
-
-	const signals: FeedItemSignals = {
-		urgency: totalUrgency / days.length,
-		timeRelevance: worstTimeRelevance,
-	}
-
-	return {
-		id: `weather-daily-${timestamp.getTime()}`,
-		sourceId,
-		type: WeatherFeedItemType.Daily,
-		timestamp,
-		data: { days },
 		signals,
 	}
 }

scripts/setup-tailscale.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Tailscale setup script
-# Authenticates with Tailscale if TS_AUTH_KEY is set and Tailscale is not already logged in
-
-set -e
-
-if [ -z "$TS_AUTH_KEY" ]; then
-    echo "TS_AUTH_KEY is not set, skipping Tailscale login."
-    exit 0
-fi
-
-STATUS=$(tailscale status 2>&1 || true)
-
-if echo "$STATUS" | grep -qi "logged out\|stopped"; then
-    echo "Tailscale is not authenticated. Logging in..."
-    sudo tailscale up --accept-routes --auth-key="$TS_AUTH_KEY"
-    echo "Tailscale login complete."
-else
-    echo "Tailscale is already authenticated, skipping."
-fi