fix: add source to session on cred update

When updateSourceCredentials was called for a source not yet in the
active session (e.g. because credentials were missing at config time),
the source was never instantiated despite being enabled in the DB.

Now, if the source row is enabled but absent from the session, the
source is added instead of skipped.

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

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

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

.ona/automations.yaml

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

.oxfmtrc.json

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

AGENTS.md

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

README.md

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

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

@@ -71,7 +71,7 @@ export function LoginPage({ onLogin }: LoginPageProps) {
 								type="email"
 								value={email}
 								onChange={(e) => setEmail(e.target.value)}
-								placeholder="admin@freya.local"
+								placeholder="admin@aelis.local"
 								required
 							/>
 						</div>

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

@@ -20,7 +20,13 @@ import {
 import { Separator } from "@/components/ui/separator"
 import { Switch } from "@/components/ui/switch"
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"
-import { fetchSourceConfig, pushLocation, replaceSource, updateProviderConfig } from "@/lib/api"
+import {
+	fetchSourceConfig,
+	pushLocation,
+	replaceSource,
+	updateProviderConfig,
+	updateSourceCredentials,
+} from "@/lib/api"
 
 interface SourceConfigPanelProps {
 	source: SourceDefinition
@@ -74,24 +80,23 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
 
 	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) {
+				if (source.perUserCredentials) {
+					promises.push(updateSourceCredentials(source.id, credentialFields))
+				} else {
+					promises.push(updateProviderConfig(source.id, { credentials: credentialFields }))
+				}
+			}
 
-			const body: Parameters<typeof replaceSource>[1] = {
+			await Promise.all(promises)
-				enabled,
-				config: getUserConfig(),
-			}
-			if (hasCredentials && source.perUserCredentials) {
-				body.credentials = credentialFields
-			}
-			await replaceSource(source.id, body)
-
-			// For non-per-user credentials (provider-level), still use the admin endpoint.
-			if (hasCredentials && !source.perUserCredentials) {
-				await updateProviderConfig(source.id, { credentials: credentialFields })
-			}
 		},
 		onSuccess() {
 			setDirty({})
@@ -247,7 +252,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
 			)}
 
 			{/* Always-on sources */}
-			{source.alwaysEnabled && source.id !== "freya.location" && (
+			{source.alwaysEnabled && source.id !== "aelis.location" && (
 				<>
 					<Separator />
 					<p className="text-sm text-muted-foreground">
@@ -256,7 +261,7 @@ export function SourceConfigPanel({ source, onUpdate }: SourceConfigPanelProps)
 				</>
 			)}
 
-			{source.id === "freya.location" && <LocationCard />}
+			{source.id === "aelis.location" && <LocationCard />}
 		</div>
 	)
 }

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

@@ -36,14 +36,14 @@ export interface SourceConfig {
 
 const sourceDefinitions: SourceDefinition[] = [
 	{
-		id: "freya.location",
+		id: "aelis.location",
 		name: "Location",
 		description: "Device location provider. Always enabled as a dependency for other sources.",
 		alwaysEnabled: true,
 		fields: {},
 	},
 	{
-		id: "freya.weather",
+		id: "aelis.weather",
 		name: "WeatherKit",
 		description: "Apple WeatherKit weather data. Requires Apple Developer credentials.",
 		fields: {
@@ -81,7 +81,7 @@ const sourceDefinitions: SourceDefinition[] = [
 		},
 	},
 	{
-		id: "freya.caldav",
+		id: "aelis.caldav",
 		name: "CalDAV",
 		description: "Calendar events from any CalDAV server (Nextcloud, Radicale, Baikal, etc.).",
 		perUserCredentials: true,
@@ -114,12 +114,12 @@ const sourceDefinitions: SourceDefinition[] = [
 			timeZone: {
 				type: "string",
 				label: "Timezone",
-				description: 'IANA timezone for determining "today" (e.g. Europe/London). Defaults to UTC.',
+				description: "IANA timezone for determining \"today\" (e.g. Europe/London). Defaults to UTC.",
 			},
 		},
 	},
 	{
-		id: "freya.tfl",
+		id: "aelis.tfl",
 		name: "TfL",
 		description: "Transport for London tube line status alerts.",
 		fields: {
@@ -174,7 +174,7 @@ export async function fetchConfigs(): Promise<SourceConfig[]> {
 
 export async function replaceSource(
 	sourceId: string,
-	body: { enabled: boolean; config: unknown; credentials?: Record<string, unknown> },
+	body: { enabled: boolean; config: unknown },
 ): Promise<void> {
 	const res = await fetch(`${serverBase()}/sources/${sourceId}`, {
 		method: "PUT",

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

@@ -1,4 +1,4 @@
-const STORAGE_KEY = "freya-server-url"
+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 {

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

@@ -45,11 +45,11 @@ import { getSession, signOut } from "@/lib/auth"
 import { Route as rootRoute } from "./__root"
 
 const SOURCE_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
-	"freya.location": MapPin,
+	"aelis.location": MapPin,
-	"freya.weather": CloudSun,
+	"aelis.weather": CloudSun,
-	"freya.caldav": CalendarDays,
+	"aelis.caldav": CalendarDays,
-	"freya.google-calendar": Calendar,
+	"aelis.google-calendar": Calendar,
-	"freya.tfl": TrainFront,
+	"aelis.tfl": TrainFront,
 }
 
 export const Route = createRoute({

apps/admin-dashboard/vite.config.ts

@@ -12,7 +12,6 @@ export default defineConfig({
 		},
 	},
 	server: {
-		host: "0.0.0.0",
 		port: 5174,
 		allowedHosts: true,
 	},

apps/aelis-backend/package.json

@@ -1,5 +1,5 @@
 {
-	"name": "@freya/backend",
+	"name": "@aelis/backend",
 	"version": "0.0.0",
 	"type": "module",
 	"main": "src/server.ts",
@@ -15,12 +15,12 @@
 		"create-admin": "bun run src/scripts/create-admin.ts"
 	},
 	"dependencies": {
-		"@freya/core": "workspace:*",
+		"@aelis/core": "workspace:*",
-		"@freya/source-caldav": "workspace:*",
+		"@aelis/source-caldav": "workspace:*",
-		"@freya/source-google-calendar": "workspace:*",
+		"@aelis/source-google-calendar": "workspace:*",
-		"@freya/source-location": "workspace:*",
+		"@aelis/source-location": "workspace:*",
-		"@freya/source-tfl": "workspace:*",
+		"@aelis/source-tfl": "workspace:*",
-		"@freya/source-weatherkit": "workspace:*",
+		"@aelis/source-weatherkit": "workspace:*",
 		"@openrouter/sdk": "^0.9.11",
 		"arktype": "^2.1.29",
 		"better-auth": "^1",

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

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

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

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

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

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

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

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

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

@@ -5,8 +5,8 @@ import { CalDavSourceProvider } from "./provider.ts"
 describe("CalDavSourceProvider", () => {
 	const provider = new CalDavSourceProvider()
 
-	test("sourceId is freya.caldav", () => {
+	test("sourceId is aelis.caldav", () => {
-		expect(provider.sourceId).toBe("freya.caldav")
+		expect(provider.sourceId).toBe("aelis.caldav")
 	})
 
 	test("throws when credentials are null", async () => {
@@ -68,7 +68,7 @@ describe("CalDavSourceProvider", () => {
 
 		const source = await provider.feedSourceForUser("user-1", config, credentials)
 		expect(source).toBeDefined()
-		expect(source.id).toBe("freya.caldav")
+		expect(source.id).toBe("aelis.caldav")
 	})
 
 	test("returns CalDavSource with minimal config", async () => {
@@ -80,6 +80,6 @@ describe("CalDavSourceProvider", () => {
 
 		const source = await provider.feedSourceForUser("user-1", config, credentials)
 		expect(source).toBeDefined()
-		expect(source.id).toBe("freya.caldav")
+		expect(source.id).toBe("aelis.caldav")
 	})
 })

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

@@ -1,4 +1,4 @@
-import { CalDavSource } from "@freya/source-caldav"
+import { CalDavSource } from "@aelis/source-caldav"
 import { type } from "arktype"
 
 import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
@@ -19,7 +19,7 @@ const caldavCredentials = type({
 })
 
 export class CalDavSourceProvider implements FeedSourceProvider {
-	readonly sourceId = "freya.caldav"
+	readonly sourceId = "aelis.caldav"
 	readonly configSchema = caldavConfig
 
 	async feedSourceForUser(
@@ -33,12 +33,12 @@ export class CalDavSourceProvider implements FeedSourceProvider {
 		}
 
 		if (!credentials) {
-			throw new InvalidSourceCredentialsError("freya.caldav", "No CalDAV credentials configured")
+			throw new InvalidSourceCredentialsError("aelis.caldav", "No CalDAV credentials configured")
 		}
 
 		const creds = caldavCredentials(credentials)
 		if (creds instanceof type.errors) {
-			throw new InvalidSourceCredentialsError("freya.caldav", creds.summary)
+			throw new InvalidSourceCredentialsError("aelis.caldav", creds.summary)
 		}
 
 		return new CalDavSource({

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
-import { LocationSource } from "@freya/source-location"
+import { LocationSource } from "@aelis/source-location"
 
 import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
 
 export class LocationSourceProvider implements FeedSourceProvider {
-	readonly sourceId = "freya.location"
+	readonly sourceId = "aelis.location"
 
 	async feedSourceForUser(
 		_userId: string,

apps/aelis-backend/src/server.ts

@@ -122,6 +122,5 @@ const app = main()
 
 export default {
 	port: 3000,
-	hostname: "0.0.0.0",
 	fetch: app.fetch,
 }

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

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

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

@@ -1,7 +1,7 @@
-import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
+import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
 
-import { LocationSource } from "@freya/source-location"
+import { LocationSource } from "@aelis/source-location"
-import { WeatherSource } from "@freya/source-weatherkit"
+import { WeatherSource } from "@aelis/source-weatherkit"
 import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test"
 
 import type { Database } from "../db/index.ts"
@@ -81,27 +81,6 @@ mock.module("../sources/user-sources.ts", () => ({
 				updatedAt: now,
 			}
 		},
-		async findForUpdate(sourceId: string) {
-			// Delegates to find — row locking is a no-op in tests.
-			if (mockFindResult !== undefined) return mockFindResult
-			const now = new Date()
-			return {
-				id: crypto.randomUUID(),
-				userId,
-				sourceId,
-				enabled: true,
-				config: {},
-				credentials: null,
-				createdAt: now,
-				updatedAt: now,
-			}
-		},
-		async updateConfig(_sourceId: string, _update: { enabled?: boolean; config?: unknown }) {
-			// no-op for tests
-		},
-		async upsertConfig(_sourceId: string, _data: { enabled: boolean; config: unknown }) {
-			// no-op for tests
-		},
 		async updateCredentials(sourceId: string, credentials: Buffer) {
 			if (mockUpdateCredentialsError) {
 				throw mockUpdateCredentialsError
@@ -111,9 +90,7 @@ mock.module("../sources/user-sources.ts", () => ({
 	}),
 }))
 
-const fakeDb = {
+const fakeDb = {} as Database
-	transaction: <T>(fn: (tx: unknown) => Promise<T>) => fn(fakeDb),
-} as unknown as Database
 
 function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
 	return {
@@ -145,14 +122,14 @@ function createStubProvider(
 }
 
 const locationProvider: FeedSourceProvider = {
-	sourceId: "freya.location",
+	sourceId: "aelis.location",
 	async feedSourceForUser() {
 		return new LocationSource()
 	},
 }
 
 const weatherProvider: FeedSourceProvider = {
-	sourceId: "freya.weather",
+	sourceId: "aelis.weather",
 	async feedSourceForUser() {
 		return new WeatherSource({ client: { fetch: async () => ({}) as never } })
 	},
@@ -167,7 +144,7 @@ beforeEach(() => {
 
 describe("UserSessionManager", () => {
 	test("getOrCreate creates session on first call", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session = await manager.getOrCreate("user-1")
@@ -177,7 +154,7 @@ describe("UserSessionManager", () => {
 	})
 
 	test("getOrCreate returns same session for same user", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session1 = await manager.getOrCreate("user-1")
@@ -187,7 +164,7 @@ describe("UserSessionManager", () => {
 	})
 
 	test("getOrCreate returns different sessions for different users", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session1 = await manager.getOrCreate("user-1")
@@ -197,20 +174,20 @@ describe("UserSessionManager", () => {
 	})
 
 	test("each user gets independent source instances", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session1 = await manager.getOrCreate("user-1")
 		const session2 = await manager.getOrCreate("user-2")
 
-		const source1 = session1.getSource<LocationSource>("freya.location")
+		const source1 = session1.getSource<LocationSource>("aelis.location")
-		const source2 = session2.getSource<LocationSource>("freya.location")
+		const source2 = session2.getSource<LocationSource>("aelis.location")
 
 		expect(source1).not.toBe(source2)
 	})
 
 	test("remove destroys session and allows re-creation", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session1 = await manager.getOrCreate("user-1")
@@ -221,14 +198,14 @@ describe("UserSessionManager", () => {
 	})
 
 	test("remove is no-op for unknown user", () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		expect(() => manager.remove("unknown")).not.toThrow()
 	})
 
 	test("registers multiple providers", async () => {
-		setEnabledSources(["freya.location", "freya.weather"])
+		setEnabledSources(["aelis.location", "aelis.weather"])
 		const manager = new UserSessionManager({
 			db: fakeDb,
 			providers: [locationProvider, weatherProvider],
@@ -236,12 +213,12 @@ describe("UserSessionManager", () => {
 
 		const session = await manager.getOrCreate("user-1")
 
-		expect(session.getSource("freya.location")).toBeDefined()
+		expect(session.getSource("aelis.location")).toBeDefined()
-		expect(session.getSource("freya.weather")).toBeDefined()
+		expect(session.getSource("aelis.weather")).toBeDefined()
 	})
 
 	test("refresh returns feed result through session", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session = await manager.getOrCreate("user-1")
@@ -254,30 +231,30 @@ describe("UserSessionManager", () => {
 	})
 
 	test("location update via executeAction works", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
 		const session = await manager.getOrCreate("user-1")
-		await session.engine.executeAction("freya.location", "update-location", {
+		await session.engine.executeAction("aelis.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,
 			timestamp: new Date(),
 		})
 
-		const source = session.getSource<LocationSource>("freya.location")
+		const source = session.getSource<LocationSource>("aelis.location")
 		expect(source?.lastLocation?.lat).toBe(51.5074)
 	})
 
 	test("subscribe receives updates after location push", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 		const callback = mock()
 
 		const session = await manager.getOrCreate("user-1")
 		session.engine.subscribe(callback)
 
-		await session.engine.executeAction("freya.location", "update-location", {
+		await session.engine.executeAction("aelis.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,
@@ -291,7 +268,7 @@ describe("UserSessionManager", () => {
 	})
 
 	test("remove stops reactive updates", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 		const callback = mock()
 
@@ -302,7 +279,7 @@ describe("UserSessionManager", () => {
 
 		// Create new session and push location — old callback should not fire
 		const session2 = await manager.getOrCreate("user-1")
-		await session2.engine.executeAction("freya.location", "update-location", {
+		await session2.engine.executeAction("aelis.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,
@@ -315,9 +292,9 @@ describe("UserSessionManager", () => {
 	})
 
 	test("creates session with successful providers when some fail", async () => {
-		setEnabledSources(["freya.location", "freya.failing"])
+		setEnabledSources(["aelis.location", "aelis.failing"])
 		const failingProvider: FeedSourceProvider = {
-			sourceId: "freya.failing",
+			sourceId: "aelis.failing",
 			async feedSourceForUser() {
 				throw new Error("provider failed")
 			},
@@ -333,25 +310,25 @@ describe("UserSessionManager", () => {
 		const session = await manager.getOrCreate("user-1")
 
 		expect(session).toBeDefined()
-		expect(session.getSource("freya.location")).toBeDefined()
+		expect(session.getSource("aelis.location")).toBeDefined()
 		expect(spy).toHaveBeenCalled()
 
 		spy.mockRestore()
 	})
 
 	test("throws AggregateError when all providers fail", async () => {
-		setEnabledSources(["freya.fail-1", "freya.fail-2"])
+		setEnabledSources(["aelis.fail-1", "aelis.fail-2"])
 		const manager = new UserSessionManager({
 			db: fakeDb,
 			providers: [
 				{
-					sourceId: "freya.fail-1",
+					sourceId: "aelis.fail-1",
 					async feedSourceForUser() {
 						throw new Error("first failed")
 					},
 				},
 				{
-					sourceId: "freya.fail-2",
+					sourceId: "aelis.fail-2",
 					async feedSourceForUser() {
 						throw new Error("second failed")
 					},
@@ -363,13 +340,13 @@ describe("UserSessionManager", () => {
 	})
 
 	test("concurrent getOrCreate for same user returns same session", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		let callCount = 0
 		const manager = new UserSessionManager({
 			db: fakeDb,
 			providers: [
 				{
-					sourceId: "freya.location",
+					sourceId: "aelis.location",
 					async feedSourceForUser() {
 						callCount++
 						await new Promise((resolve) => setTimeout(resolve, 10))
@@ -389,7 +366,7 @@ describe("UserSessionManager", () => {
 	})
 
 	test("remove during in-flight getOrCreate prevents session from being stored", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		let resolveProvider: () => void
 		const providerGate = new Promise<void>((r) => {
 			resolveProvider = r
@@ -399,7 +376,7 @@ describe("UserSessionManager", () => {
 			db: fakeDb,
 			providers: [
 				{
-					sourceId: "freya.location",
+					sourceId: "aelis.location",
 					async feedSourceForUser() {
 						await providerGate
 						return new LocationSource()
@@ -425,15 +402,15 @@ describe("UserSessionManager", () => {
 	})
 
 	test("only invokes providers for sources enabled for the user", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
-		const locationFactory = mock(async () => createStubSource("freya.location"))
+		const locationFactory = mock(async () => createStubSource("aelis.location"))
-		const weatherFactory = mock(async () => createStubSource("freya.weather"))
+		const weatherFactory = mock(async () => createStubSource("aelis.weather"))
 
 		const manager = new UserSessionManager({
 			db: fakeDb,
 			providers: [
-				{ sourceId: "freya.location", feedSourceForUser: locationFactory },
+				{ sourceId: "aelis.location", feedSourceForUser: locationFactory },
-				{ sourceId: "freya.weather", feedSourceForUser: weatherFactory },
+				{ sourceId: "aelis.weather", feedSourceForUser: weatherFactory },
 			],
 		})
 
@@ -441,43 +418,43 @@ describe("UserSessionManager", () => {
 
 		expect(locationFactory).toHaveBeenCalledTimes(1)
 		expect(weatherFactory).not.toHaveBeenCalled()
-		expect(session.getSource("freya.location")).toBeDefined()
+		expect(session.getSource("aelis.location")).toBeDefined()
-		expect(session.getSource("freya.weather")).toBeUndefined()
+		expect(session.getSource("aelis.weather")).toBeUndefined()
 	})
 
 	test("creates empty session when no sources are enabled", async () => {
 		setEnabledSources([])
-		const factory = mock(async () => createStubSource("freya.location"))
+		const factory = mock(async () => createStubSource("aelis.location"))
 
 		const manager = new UserSessionManager({
 			db: fakeDb,
-			providers: [{ sourceId: "freya.location", feedSourceForUser: factory }],
+			providers: [{ sourceId: "aelis.location", feedSourceForUser: factory }],
 		})
 
 		const session = await manager.getOrCreate("user-1")
 
 		expect(factory).not.toHaveBeenCalled()
 		expect(session).toBeDefined()
-		expect(session.getSource("freya.location")).toBeUndefined()
+		expect(session.getSource("aelis.location")).toBeUndefined()
 	})
 
 	test("per-user enabled sources are respected", async () => {
 		enabledByUser.clear()
-		setEnabledSourcesForUser("user-1", ["freya.location"])
+		setEnabledSourcesForUser("user-1", ["aelis.location"])
-		setEnabledSourcesForUser("user-2", ["freya.weather"])
+		setEnabledSourcesForUser("user-2", ["aelis.weather"])
 
 		const manager = new UserSessionManager({
 			db: fakeDb,
-			providers: [createStubProvider("freya.location"), createStubProvider("freya.weather")],
+			providers: [createStubProvider("aelis.location"), createStubProvider("aelis.weather")],
 		})
 
 		const session1 = await manager.getOrCreate("user-1")
 		const session2 = await manager.getOrCreate("user-2")
 
-		expect(session1.getSource("freya.location")).toBeDefined()
+		expect(session1.getSource("aelis.location")).toBeDefined()
-		expect(session1.getSource("freya.weather")).toBeUndefined()
+		expect(session1.getSource("aelis.weather")).toBeUndefined()
-		expect(session2.getSource("freya.location")).toBeUndefined()
+		expect(session2.getSource("aelis.location")).toBeUndefined()
-		expect(session2.getSource("freya.weather")).toBeDefined()
+		expect(session2.getSource("aelis.weather")).toBeDefined()
 	})
 })
 
@@ -525,10 +502,10 @@ describe("UserSessionManager.replaceProvider", () => {
 	})
 
 	test("throws for unknown provider sourceId", async () => {
-		setEnabledSources(["freya.location"])
+		setEnabledSources(["aelis.location"])
 		const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
 
-		const unknownProvider = createStubProvider("freya.unknown")
+		const unknownProvider = createStubProvider("aelis.unknown")
 
 		await expect(manager.replaceProvider(unknownProvider)).rejects.toThrow(
 			"no existing provider with that sourceId",
@@ -829,6 +806,31 @@ describe("UserSessionManager.updateSourceCredentials", () => {
 		expect(receivedCredentials).toEqual({ token: "refreshed" })
 	})
 
+	test("adds source to session when source is enabled but not yet in session", async () => {
+		// Simulate a source that was never added to the session (e.g. credentials
+		// were missing at config time), but is enabled in the DB.
+		setEnabledSources([]) // no sources during session creation
+		const factory = mock(async () => createStubSource("test"))
+		const provider: FeedSourceProvider = { sourceId: "test", feedSourceForUser: factory }
+		const manager = new UserSessionManager({
+			db: fakeDb,
+			providers: [provider],
+			credentialEncryptor: testEncryptor,
+		})
+
+		const session = await manager.getOrCreate("user-1")
+		// Source is NOT in the session
+		expect(session.hasSource("test")).toBe(false)
+
+		// mockFindResult returns an enabled row by default, so the source
+		// row exists and is enabled in the DB.
+		await manager.updateSourceCredentials("user-1", "test", { token: "new-token" })
+
+		// Source should now be added to the session
+		expect(session.hasSource("test")).toBe(true)
+		expect(factory).toHaveBeenCalledTimes(1)
+	})
+
 	test("persists credentials without session refresh when no active session", async () => {
 		setEnabledSources(["test"])
 		const factory = mock(async () => createStubSource("test"))
@@ -847,121 +849,3 @@ describe("UserSessionManager.updateSourceCredentials", () => {
 		expect(factory).not.toHaveBeenCalled()
 	})
 })
-
-describe("UserSessionManager.saveSourceConfig", () => {
-	test("upserts config without credentials (existing behavior)", async () => {
-		setEnabledSources(["test"])
-		const factory = mock(async () => createStubSource("test"))
-		const provider: FeedSourceProvider = { sourceId: "test", feedSourceForUser: factory }
-		const manager = new UserSessionManager({
-			db: fakeDb,
-			providers: [provider],
-			credentialEncryptor: testEncryptor,
-		})
-
-		// Create a session first so we can verify the source is refreshed
-		await manager.getOrCreate("user-1")
-
-		await manager.saveSourceConfig("user-1", "test", {
-			enabled: true,
-			config: { key: "value" },
-		})
-
-		// feedSourceForUser called once for session creation, once for upsert refresh
-		expect(factory).toHaveBeenCalledTimes(2)
-		// No credentials should have been persisted
-		expect(mockUpdateCredentialsCalls).toHaveLength(0)
-	})
-
-	test("upserts config with credentials — persists both and passes credentials to source", async () => {
-		setEnabledSources(["test"])
-		let receivedCredentials: unknown = null
-		const factory = mock(async (_userId: string, _config: unknown, creds: unknown) => {
-			receivedCredentials = creds
-			return createStubSource("test")
-		})
-		const provider: FeedSourceProvider = { sourceId: "test", feedSourceForUser: factory }
-		const manager = new UserSessionManager({
-			db: fakeDb,
-			providers: [provider],
-			credentialEncryptor: testEncryptor,
-		})
-
-		// Create a session so the source refresh path runs
-		await manager.getOrCreate("user-1")
-
-		const creds = { username: "alice", password: "s3cret" }
-		await manager.saveSourceConfig("user-1", "test", {
-			enabled: true,
-			config: { serverUrl: "https://example.com" },
-			credentials: creds,
-		})
-
-		// Credentials were encrypted and persisted
-		expect(mockUpdateCredentialsCalls).toHaveLength(1)
-		const decrypted = JSON.parse(testEncryptor.decrypt(mockUpdateCredentialsCalls[0]!.credentials))
-		expect(decrypted).toEqual(creds)
-
-		// feedSourceForUser received the provided credentials (not null)
-		expect(receivedCredentials).toEqual(creds)
-	})
-
-	test("upserts config with credentials adds source to session when not already present", async () => {
-		// Start with no enabled sources so the session is empty
-		setEnabledSources([])
-		const factory = mock(async () => createStubSource("test"))
-		const provider: FeedSourceProvider = { sourceId: "test", feedSourceForUser: factory }
-		const manager = new UserSessionManager({
-			db: fakeDb,
-			providers: [provider],
-			credentialEncryptor: testEncryptor,
-		})
-
-		const session = await manager.getOrCreate("user-1")
-		expect(session.hasSource("test")).toBe(false)
-
-		// Set mockFindResult to undefined so find() returns a row (simulating the row was just created by upsertConfig)
-		await manager.saveSourceConfig("user-1", "test", {
-			enabled: true,
-			config: {},
-			credentials: { token: "abc" },
-		})
-
-		// Source should now be in the session
-		expect(session.hasSource("test")).toBe(true)
-		expect(mockUpdateCredentialsCalls).toHaveLength(1)
-	})
-
-	test("throws CredentialStorageUnavailableError when credentials provided without encryptor", async () => {
-		setEnabledSources(["test"])
-		const provider = createStubProvider("test")
-		const manager = new UserSessionManager({
-			db: fakeDb,
-			providers: [provider],
-			// No credentialEncryptor
-		})
-
-		await expect(
-			manager.saveSourceConfig("user-1", "test", {
-				enabled: true,
-				config: {},
-				credentials: { token: "abc" },
-			}),
-		).rejects.toBeInstanceOf(CredentialStorageUnavailableError)
-	})
-
-	test("throws SourceNotFoundError for unknown provider", async () => {
-		const manager = new UserSessionManager({
-			db: fakeDb,
-			providers: [],
-			credentialEncryptor: testEncryptor,
-		})
-
-		await expect(
-			manager.saveSourceConfig("user-1", "unknown", {
-				enabled: true,
-				config: {},
-			}),
-		).rejects.toBeInstanceOf(SourceNotFoundError)
-	})
-})

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

@@ -1,4 +1,4 @@
-import type { FeedSource } from "@freya/core"
+import type { FeedSource } from "@aelis/core"
 
 import { type } from "arktype"
 import merge from "lodash.merge"
@@ -126,29 +126,27 @@ export class UserSessionManager {
 			return
 		}
 
-		// Use a transaction with SELECT FOR UPDATE to prevent lost updates
+		// Fetch the existing row for config merging and credential access.
-		// when concurrent PATCH requests merge config against the same base.
+		// NOTE: find + updateConfig is not atomic. A concurrent update could
-		const { existingRow, mergedConfig } = await this.db.transaction(async (tx) => {
+		// read stale config. Use SELECT FOR UPDATE or atomic jsonb merge if
-			const existingRow = await sources(tx, userId).findForUpdate(sourceId)
+		// this becomes a problem.
+		const existingRow = await sources(this.db, userId).find(sourceId)
 
-			let mergedConfig: Record<string, unknown> | undefined
+		let mergedConfig: Record<string, unknown> | undefined
-			if (update.config !== undefined && provider.configSchema) {
+		if (update.config !== undefined && provider.configSchema) {
-				const existingConfig = (existingRow?.config ?? {}) as Record<string, unknown>
+			const existingConfig = (existingRow?.config ?? {}) as Record<string, unknown>
-				mergedConfig = merge({}, existingConfig, update.config)
+			mergedConfig = merge({}, existingConfig, update.config)
 
-				const validated = provider.configSchema(mergedConfig)
+			const validated = provider.configSchema(mergedConfig)
-				if (validated instanceof type.errors) {
+			if (validated instanceof type.errors) {
-					throw new InvalidSourceConfigError(sourceId, validated.summary)
+				throw new InvalidSourceConfigError(sourceId, validated.summary)
-				}
 			}
+		}
 
-			// Throws SourceNotFoundError if the row doesn't exist
+		// Throws SourceNotFoundError if the row doesn't exist
-			await sources(tx, userId).updateConfig(sourceId, {
+		await sources(this.db, userId).updateConfig(sourceId, {
-				enabled: update.enabled,
+			enabled: update.enabled,
-				config: mergedConfig,
+			config: mergedConfig,
-			})
-
-			return { existingRow, mergedConfig }
 		})
 
 		// Refresh the specific source in the active session instead of
@@ -173,18 +171,13 @@ export class UserSessionManager {
 	 * inserts a new row if one doesn't exist and fully replaces config
 	 * (no merge).
 	 *
-	 * When `credentials` is provided, they are encrypted and persisted
-	 * alongside the config in the same flow, avoiding the race condition
-	 * of separate config + credential requests.
-	 *
 	 * @throws {SourceNotFoundError} if the sourceId has no registered provider
 	 * @throws {InvalidSourceConfigError} if config fails schema validation
-	 * @throws {CredentialStorageUnavailableError} if credentials are provided but no encryptor is configured
 	 */
-	async saveSourceConfig(
+	async upsertSourceConfig(
 		userId: string,
 		sourceId: string,
-		data: { enabled: boolean; config?: unknown; credentials?: unknown },
+		data: { enabled: boolean; config?: unknown },
 	): Promise<void> {
 		const provider = this.providers.get(sourceId)
 		if (!provider) {
@@ -198,28 +191,15 @@ export class UserSessionManager {
 			}
 		}
 
-		if (data.credentials !== undefined && !this.encryptor) {
-			throw new CredentialStorageUnavailableError()
-		}
-
 		const config = data.config ?? {}
 
-		// Run the upsert + credential update atomically so a failure in
+		// Fetch existing row before upsert to capture credentials for session refresh.
-		// either step doesn't leave the row in an inconsistent state.
+		// For new rows this will be undefined — credentials will be null.
-		const existingRow = await this.db.transaction(async (tx) => {
+		const existingRow = await sources(this.db, userId).find(sourceId)
-			const existing = await sources(tx, userId).find(sourceId)
 
-			await sources(tx, userId).upsertConfig(sourceId, {
+		await sources(this.db, userId).upsertConfig(sourceId, {
-				enabled: data.enabled,
+			enabled: data.enabled,
-				config,
+			config,
-			})
-
-			if (data.credentials !== undefined && this.encryptor) {
-				const encrypted = this.encryptor.encrypt(JSON.stringify(data.credentials))
-				await sources(tx, userId).updateCredentials(sourceId, encrypted)
-			}
-
-			return existing
 		})
 
 		const session = this.sessions.get(userId)
@@ -227,13 +207,9 @@ export class UserSessionManager {
 			if (!data.enabled) {
 				session.removeSource(sourceId)
 			} else {
-				// Prefer the just-provided credentials over what was in the DB.
+				const credentials = existingRow?.credentials
-				let credentials: unknown = null
+					? this.decryptCredentials(existingRow.credentials)
-				if (data.credentials !== undefined) {
+					: null
-					credentials = data.credentials
-				} else if (existingRow?.credentials) {
-					credentials = this.decryptCredentials(existingRow.credentials)
-				}
 				const source = await provider.feedSourceForUser(userId, config, credentials)
 				if (session.hasSource(sourceId)) {
 					session.replaceSource(sourceId, source)
@@ -273,11 +249,15 @@ export class UserSessionManager {
 		// the DB already has the new credentials but the session keeps the old
 		// source. The next session creation will pick up the persisted credentials.
 		const session = this.sessions.get(userId)
-		if (session && session.hasSource(sourceId)) {
+		if (session) {
 			const row = await sources(this.db, userId).find(sourceId)
 			if (row?.enabled) {
 				const source = await provider.feedSourceForUser(userId, row.config ?? {}, credentials)
-				session.replaceSource(sourceId, source)
+				if (session.hasSource(sourceId)) {
+					session.replaceSource(sourceId, source)
+				} else {
+					session.addSource(source)
+				}
 			}
 		}
 	}

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

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

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

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

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

@@ -1,4 +1,4 @@
-import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
+import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
 
 import { describe, expect, mock, spyOn, test } from "bun:test"
 import { Hono } from "hono"
@@ -80,9 +80,6 @@ function createInMemoryStore() {
 				async find(sourceId: string) {
 					return rows.get(key(userId, sourceId))
 				},
-				async findForUpdate(sourceId: string) {
-					return rows.get(key(userId, sourceId))
-				},
 				async updateConfig(sourceId: string, update: { enabled?: boolean; config?: unknown }) {
 					const existing = rows.get(key(userId, sourceId))
 					if (!existing) {
@@ -128,9 +125,7 @@ mock.module("../sources/user-sources.ts", () => ({
 	},
 }))
 
-const fakeDb = {
+const fakeDb = {} as Database
-	transaction: <T>(fn: (tx: unknown) => Promise<T>) => fn(fakeDb),
-} as unknown as Database
 
 function createApp(providers: FeedSourceProvider[], userId?: string) {
 	const sessionManager = new UserSessionManager({ providers, db: fakeDb })
@@ -193,16 +188,16 @@ function put(app: Hono, sourceId: string, body: unknown) {
 describe("GET /api/sources/:sourceId", () => {
 	test("returns 401 without auth", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)])
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)])
 
-		const res = await get(app, "freya.weather")
+		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("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
 		const res = await get(app, "unknown.source")
 
@@ -213,13 +208,13 @@ describe("GET /api/sources/:sourceId", () => {
 
 	test("returns enabled and config for existing source", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather", {
+		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
 			enabled: true,
 			config: { units: "metric" },
 		})
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await get(app, "freya.weather")
+		const res = await get(app, "aelis.weather")
 
 		expect(res.status).toBe(200)
 		const body = (await res.json()) as { enabled: boolean; config: unknown }
@@ -229,9 +224,9 @@ describe("GET /api/sources/:sourceId", () => {
 
 	test("returns defaults when user has no row for source", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await get(app, "freya.weather")
+		const res = await get(app, "aelis.weather")
 
 		expect(res.status).toBe(200)
 		const body = (await res.json()) as { enabled: boolean; config: unknown }
@@ -241,13 +236,13 @@ describe("GET /api/sources/:sourceId", () => {
 
 	test("returns disabled source", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather", {
+		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
 			enabled: false,
 			config: { units: "imperial" },
 		})
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await get(app, "freya.weather")
+		const res = await get(app, "aelis.weather")
 
 		expect(res.status).toBe(200)
 		const body = (await res.json()) as { enabled: boolean; config: unknown }
@@ -259,16 +254,16 @@ describe("GET /api/sources/:sourceId", () => {
 describe("PATCH /api/sources/:sourceId", () => {
 	test("returns 401 without auth", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)])
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)])
 
-		const res = await patch(app, "freya.weather", { enabled: true })
+		const res = await patch(app, "aelis.weather", { enabled: true })
 
 		expect(res.status).toBe(401)
 	})
 
 	test("returns 404 for unknown source", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
 		const res = await patch(app, "unknown.source", { enabled: true })
 
@@ -279,9 +274,9 @@ describe("PATCH /api/sources/:sourceId", () => {
 
 	test("returns 404 when user has no existing row for source", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.weather", { enabled: true })
+		const res = await patch(app, "aelis.weather", { enabled: true })
 
 		expect(res.status).toBe(404)
 		const body = (await res.json()) as { error: string }
@@ -290,29 +285,29 @@ describe("PATCH /api/sources/:sourceId", () => {
 
 	test("returns 204 when body is empty object (no-op) on existing source", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather")
+		activeStore.seed(MOCK_USER_ID, "aelis.weather")
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.weather", {})
+		const res = await patch(app, "aelis.weather", {})
 
 		expect(res.status).toBe(204)
 	})
 
 	test("returns 404 when body is empty object on nonexistent user source", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.weather", {})
+		const res = await patch(app, "aelis.weather", {})
 
 		expect(res.status).toBe(404)
 	})
 
 	test("returns 400 for invalid JSON body", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather")
+		activeStore.seed(MOCK_USER_ID, "aelis.weather")
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await app.request("/api/sources/freya.weather", {
+		const res = await app.request("/api/sources/aelis.weather", {
 			method: "PATCH",
 			headers: { "Content-Type": "application/json" },
 			body: "not json",
@@ -325,10 +320,10 @@ describe("PATCH /api/sources/:sourceId", () => {
 
 	test("returns 400 when request body contains unknown fields", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather")
+		activeStore.seed(MOCK_USER_ID, "aelis.weather")
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.weather", {
+		const res = await patch(app, "aelis.weather", {
 			enabled: true,
 			unknownField: "hello",
 		})
@@ -338,10 +333,10 @@ describe("PATCH /api/sources/:sourceId", () => {
 
 	test("returns 400 when weather config contains unknown fields", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather")
+		activeStore.seed(MOCK_USER_ID, "aelis.weather")
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.weather", {
+		const res = await patch(app, "aelis.weather", {
 			config: { units: "metric", unknownField: "hello" },
 		})
 
@@ -350,10 +345,10 @@ describe("PATCH /api/sources/:sourceId", () => {
 
 	test("returns 400 when weather config fails validation", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather")
+		activeStore.seed(MOCK_USER_ID, "aelis.weather")
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.weather", {
+		const res = await patch(app, "aelis.weather", {
 			config: { units: "invalid" },
 		})
 
@@ -362,65 +357,65 @@ describe("PATCH /api/sources/:sourceId", () => {
 
 	test("returns 204 and updates enabled", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather", {
+		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
 			enabled: true,
 			config: { units: "metric" },
 		})
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.weather", { enabled: false })
+		const res = await patch(app, "aelis.weather", { enabled: false })
 
 		expect(res.status).toBe(204)
-		const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
+		const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
 		expect(row!.enabled).toBe(false)
 		expect(row!.config).toEqual({ units: "metric" })
 	})
 
 	test("returns 204 and updates config", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather", {
+		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
 			config: { units: "metric" },
 		})
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.weather", {
+		const res = await patch(app, "aelis.weather", {
 			config: { units: "imperial" },
 		})
 
 		expect(res.status).toBe(204)
-		const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
+		const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
 		expect(row!.config).toEqual({ units: "imperial" })
 	})
 
 	test("preserves config when only updating enabled", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.tfl", {
+		activeStore.seed(MOCK_USER_ID, "aelis.tfl", {
 			enabled: true,
 			config: { lines: ["bakerloo"] },
 		})
-		const { app } = createApp([createStubProvider("freya.tfl", tflConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.tfl", tflConfig)], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.tfl", { enabled: false })
+		const res = await patch(app, "aelis.tfl", { enabled: false })
 
 		expect(res.status).toBe(204)
-		const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.tfl`)
+		const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.tfl`)
 		expect(row!.enabled).toBe(false)
 		expect(row!.config).toEqual({ lines: ["bakerloo"] })
 	})
 
 	test("deep-merges config on update", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather", {
+		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
 			config: { units: "metric", hourlyLimit: 12 },
 		})
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.weather", {
+		const res = await patch(app, "aelis.weather", {
 			config: { dailyLimit: 5 },
 		})
 
 		expect(res.status).toBe(204)
-		const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
+		const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
 		expect(row!.config).toEqual({
 			units: "metric",
 			hourlyLimit: 12,
@@ -430,18 +425,18 @@ describe("PATCH /api/sources/:sourceId", () => {
 
 	test("refreshes source in active session after config update", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather", {
+		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
 			config: { units: "metric" },
 		})
 		const { app, sessionManager } = createApp(
-			[createStubProvider("freya.weather", weatherConfig)],
+			[createStubProvider("aelis.weather", weatherConfig)],
 			MOCK_USER_ID,
 		)
 
 		const session = await sessionManager.getOrCreate(MOCK_USER_ID)
 		const replaceSpy = spyOn(session, "replaceSource")
 
-		const res = await patch(app, "freya.weather", {
+		const res = await patch(app, "aelis.weather", {
 			config: { units: "imperial" },
 		})
 
@@ -452,31 +447,31 @@ describe("PATCH /api/sources/:sourceId", () => {
 
 	test("removes source from session when disabled", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather", {
+		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
 			enabled: true,
 			config: { units: "metric" },
 		})
 		const { app, sessionManager } = createApp(
-			[createStubProvider("freya.weather", weatherConfig)],
+			[createStubProvider("aelis.weather", weatherConfig)],
 			MOCK_USER_ID,
 		)
 
 		const session = await sessionManager.getOrCreate(MOCK_USER_ID)
 		const removeSpy = spyOn(session, "removeSource")
 
-		const res = await patch(app, "freya.weather", { enabled: false })
+		const res = await patch(app, "aelis.weather", { enabled: false })
 
 		expect(res.status).toBe(204)
-		expect(removeSpy).toHaveBeenCalledWith("freya.weather")
+		expect(removeSpy).toHaveBeenCalledWith("aelis.weather")
 		removeSpy.mockRestore()
 	})
 
 	test("returns 400 when config is provided for source without schema", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.location")
+		activeStore.seed(MOCK_USER_ID, "aelis.location")
-		const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.location", {
+		const res = await patch(app, "aelis.location", {
 			config: { something: "value" },
 		})
 
@@ -485,10 +480,10 @@ describe("PATCH /api/sources/:sourceId", () => {
 
 	test("returns 400 when empty config is provided for source without schema", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.location")
+		activeStore.seed(MOCK_USER_ID, "aelis.location")
-		const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.location", {
+		const res = await patch(app, "aelis.location", {
 			config: {},
 		})
 
@@ -497,13 +492,13 @@ describe("PATCH /api/sources/:sourceId", () => {
 
 	test("updates enabled on location source", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.location", { enabled: true })
+		activeStore.seed(MOCK_USER_ID, "aelis.location", { enabled: true })
-		const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
 
-		const res = await patch(app, "freya.location", { enabled: false })
+		const res = await patch(app, "aelis.location", { enabled: false })
 
 		expect(res.status).toBe(204)
-		const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.location`)
+		const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.location`)
 		expect(row!.enabled).toBe(false)
 	})
 })
@@ -515,16 +510,16 @@ describe("PATCH /api/sources/:sourceId", () => {
 describe("PUT /api/sources/:sourceId", () => {
 	test("returns 401 without auth", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)])
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)])
 
-		const res = await put(app, "freya.weather", { enabled: true, config: {} })
+		const res = await put(app, "aelis.weather", { enabled: true, config: {} })
 
 		expect(res.status).toBe(401)
 	})
 
 	test("returns 404 for unknown source", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
 		const res = await put(app, "unknown.source", { enabled: true, config: {} })
 
@@ -535,9 +530,9 @@ describe("PUT /api/sources/:sourceId", () => {
 
 	test("returns 400 for invalid JSON", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await app.request("/api/sources/freya.weather", {
+		const res = await app.request("/api/sources/aelis.weather", {
 			method: "PUT",
 			headers: { "Content-Type": "application/json" },
 			body: "not json",
@@ -550,27 +545,27 @@ describe("PUT /api/sources/:sourceId", () => {
 
 	test("returns 400 when enabled is missing", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await put(app, "freya.weather", { config: {} })
+		const res = await put(app, "aelis.weather", { config: {} })
 
 		expect(res.status).toBe(400)
 	})
 
 	test("returns 400 when config is missing", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await put(app, "freya.weather", { enabled: true })
+		const res = await put(app, "aelis.weather", { enabled: true })
 
 		expect(res.status).toBe(400)
 	})
 
 	test("returns 400 when request body contains unknown fields", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await put(app, "freya.weather", {
+		const res = await put(app, "aelis.weather", {
 			enabled: true,
 			config: { units: "metric" },
 			unknownField: "hello",
@@ -581,9 +576,9 @@ describe("PUT /api/sources/:sourceId", () => {
 
 	test("returns 400 when weather config contains unknown fields", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await put(app, "freya.weather", {
+		const res = await put(app, "aelis.weather", {
 			enabled: true,
 			config: { units: "metric", unknownField: "hello" },
 		})
@@ -593,9 +588,9 @@ describe("PUT /api/sources/:sourceId", () => {
 
 	test("returns 400 when config fails schema validation", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await put(app, "freya.weather", {
+		const res = await put(app, "aelis.weather", {
 			enabled: true,
 			config: { units: "invalid" },
 		})
@@ -605,15 +600,15 @@ describe("PUT /api/sources/:sourceId", () => {
 
 	test("returns 204 and inserts when row does not exist", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await put(app, "freya.weather", {
+		const res = await put(app, "aelis.weather", {
 			enabled: true,
 			config: { units: "metric" },
 		})
 
 		expect(res.status).toBe(204)
-		const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
+		const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
 		expect(row).toBeDefined()
 		expect(row!.enabled).toBe(true)
 		expect(row!.config).toEqual({ units: "metric" })
@@ -621,19 +616,19 @@ describe("PUT /api/sources/:sourceId", () => {
 
 	test("returns 204 and fully replaces existing row", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather", {
+		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
 			enabled: true,
 			config: { units: "metric", hourlyLimit: 12 },
 		})
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.weather", weatherConfig)], MOCK_USER_ID)
 
-		const res = await put(app, "freya.weather", {
+		const res = await put(app, "aelis.weather", {
 			enabled: false,
 			config: { units: "imperial" },
 		})
 
 		expect(res.status).toBe(204)
-		const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
+		const row = activeStore.rows.get(`${MOCK_USER_ID}:aelis.weather`)
 		expect(row!.enabled).toBe(false)
 		// hourlyLimit should be gone — full replace, not merge
 		expect(row!.config).toEqual({ units: "imperial" })
@@ -641,18 +636,18 @@ describe("PUT /api/sources/:sourceId", () => {
 
 	test("refreshes source in active session after upsert", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather", {
+		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
 			config: { units: "metric" },
 		})
 		const { app, sessionManager } = createApp(
-			[createStubProvider("freya.weather", weatherConfig)],
+			[createStubProvider("aelis.weather", weatherConfig)],
 			MOCK_USER_ID,
 		)
 
 		const session = await sessionManager.getOrCreate(MOCK_USER_ID)
 		const replaceSpy = spyOn(session, "replaceSource")
 
-		const res = await put(app, "freya.weather", {
+		const res = await put(app, "aelis.weather", {
 			enabled: true,
 			config: { units: "imperial" },
 		})
@@ -664,56 +659,56 @@ describe("PUT /api/sources/:sourceId", () => {
 
 	test("removes source from session when disabled via upsert", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.weather", {
+		activeStore.seed(MOCK_USER_ID, "aelis.weather", {
 			enabled: true,
 			config: { units: "metric" },
 		})
 		const { app, sessionManager } = createApp(
-			[createStubProvider("freya.weather", weatherConfig)],
+			[createStubProvider("aelis.weather", weatherConfig)],
 			MOCK_USER_ID,
 		)
 
 		const session = await sessionManager.getOrCreate(MOCK_USER_ID)
 		const removeSpy = spyOn(session, "removeSource")
 
-		const res = await put(app, "freya.weather", {
+		const res = await put(app, "aelis.weather", {
 			enabled: false,
 			config: { units: "metric" },
 		})
 
 		expect(res.status).toBe(204)
-		expect(removeSpy).toHaveBeenCalledWith("freya.weather")
+		expect(removeSpy).toHaveBeenCalledWith("aelis.weather")
 		removeSpy.mockRestore()
 	})
 
 	test("adds source to active session when inserting a new source", async () => {
 		activeStore = createInMemoryStore()
 		// Seed a different source so the session can be created
-		activeStore.seed(MOCK_USER_ID, "freya.location", { enabled: true })
+		activeStore.seed(MOCK_USER_ID, "aelis.location", { enabled: true })
 		const { app, sessionManager } = createApp(
-			[createStubProvider("freya.location"), createStubProvider("freya.weather", weatherConfig)],
+			[createStubProvider("aelis.location"), createStubProvider("aelis.weather", weatherConfig)],
 			MOCK_USER_ID,
 		)
 
-		// Create session — only has freya.location
+		// Create session — only has aelis.location
 		const session = await sessionManager.getOrCreate(MOCK_USER_ID)
-		expect(session.hasSource("freya.weather")).toBe(false)
+		expect(session.hasSource("aelis.weather")).toBe(false)
 
 		// PUT a new source that didn't exist before
-		const res = await put(app, "freya.weather", {
+		const res = await put(app, "aelis.weather", {
 			enabled: true,
 			config: { units: "metric" },
 		})
 
 		expect(res.status).toBe(204)
-		expect(session.hasSource("freya.weather")).toBe(true)
+		expect(session.hasSource("aelis.weather")).toBe(true)
 	})
 
 	test("returns 400 when config is provided for source without schema", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
 
-		const res = await put(app, "freya.location", {
+		const res = await put(app, "aelis.location", {
 			enabled: true,
 			config: { something: "value" },
 		})
@@ -723,9 +718,9 @@ describe("PUT /api/sources/:sourceId", () => {
 
 	test("returns 400 when empty config is provided for source without schema", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
 
-		const res = await put(app, "freya.location", {
+		const res = await put(app, "aelis.location", {
 			enabled: true,
 			config: {},
 		})
@@ -735,65 +730,29 @@ describe("PUT /api/sources/:sourceId", () => {
 
 	test("returns 204 without config field for source without schema", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
 
-		const res = await put(app, "freya.location", {
+		const res = await put(app, "aelis.location", {
 			enabled: true,
 		})
 
 		expect(res.status).toBe(204)
 	})
-
-	test("returns 204 when credentials are included alongside config", async () => {
-		activeStore = createInMemoryStore()
-		const { app } = createAppWithEncryptor(
-			[createStubProvider("freya.weather", weatherConfig)],
-			MOCK_USER_ID,
-		)
-
-		const res = await put(app, "freya.weather", {
-			enabled: true,
-			config: { units: "metric" },
-			credentials: { apiKey: "secret123" },
-		})
-
-		expect(res.status).toBe(204)
-		const row = activeStore.rows.get(`${MOCK_USER_ID}:freya.weather`)
-		expect(row).toBeDefined()
-		expect(row!.enabled).toBe(true)
-		expect(row!.config).toEqual({ units: "metric" })
-	})
-
-	test("returns 503 when credentials are provided but no encryptor is configured", async () => {
-		activeStore = createInMemoryStore()
-		// createApp does NOT configure an encryptor
-		const { app } = createApp([createStubProvider("freya.weather", weatherConfig)], MOCK_USER_ID)
-
-		const res = await put(app, "freya.weather", {
-			enabled: true,
-			config: { units: "metric" },
-			credentials: { apiKey: "secret123" },
-		})
-
-		expect(res.status).toBe(503)
-		const body = (await res.json()) as { error: string }
-		expect(body.error).toContain("not configured")
-	})
 })
 
 describe("PUT /api/sources/:sourceId/credentials", () => {
 	test("returns 401 without auth", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createAppWithEncryptor([createStubProvider("freya.location")])
+		const { app } = createAppWithEncryptor([createStubProvider("aelis.location")])
 
-		const res = await putCredentials(app, "freya.location", { token: "x" })
+		const res = await putCredentials(app, "aelis.location", { token: "x" })
 
 		expect(res.status).toBe(401)
 	})
 
 	test("returns 404 for unknown source", async () => {
 		activeStore = createInMemoryStore()
-		const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID)
+		const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID)
 
 		const res = await putCredentials(app, "unknown.source", { token: "x" })
 
@@ -802,10 +761,10 @@ describe("PUT /api/sources/:sourceId/credentials", () => {
 
 	test("returns 400 for invalid JSON", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.location")
+		activeStore.seed(MOCK_USER_ID, "aelis.location")
-		const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID)
+		const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID)
 
-		const res = await app.request("/api/sources/freya.location/credentials", {
+		const res = await app.request("/api/sources/aelis.location/credentials", {
 			method: "PUT",
 			headers: { "Content-Type": "application/json" },
 			body: "not-json",
@@ -818,10 +777,10 @@ describe("PUT /api/sources/:sourceId/credentials", () => {
 
 	test("returns 204 and persists credentials", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.location")
+		activeStore.seed(MOCK_USER_ID, "aelis.location")
-		const { app } = createAppWithEncryptor([createStubProvider("freya.location")], MOCK_USER_ID)
+		const { app } = createAppWithEncryptor([createStubProvider("aelis.location")], MOCK_USER_ID)
 
-		const res = await putCredentials(app, "freya.location", { token: "secret" })
+		const res = await putCredentials(app, "aelis.location", { token: "secret" })
 
 		expect(res.status).toBe(204)
 	})
@@ -853,10 +812,10 @@ describe("PUT /api/sources/:sourceId/credentials", () => {
 
 	test("returns 503 when credential encryption is not configured", async () => {
 		activeStore = createInMemoryStore()
-		activeStore.seed(MOCK_USER_ID, "freya.location")
+		activeStore.seed(MOCK_USER_ID, "aelis.location")
-		const { app } = createApp([createStubProvider("freya.location")], MOCK_USER_ID)
+		const { app } = createApp([createStubProvider("aelis.location")], MOCK_USER_ID)
 
-		const res = await putCredentials(app, "freya.location", { token: "x" })
+		const res = await putCredentials(app, "aelis.location", { token: "x" })
 
 		expect(res.status).toBe(503)
 		const body = (await res.json()) as { error: string }

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

@@ -34,13 +34,11 @@ const ReplaceSourceConfigRequestBody = type({
 	"+": "reject",
 	enabled: "boolean",
 	config: "unknown",
-	"credentials?": "unknown",
 })
 
 const ReplaceSourceConfigNoConfigRequestBody = type({
 	"+": "reject",
 	enabled: "boolean",
-	"credentials?": "unknown",
 })
 
 export function registerSourcesHttpHandlers(
@@ -163,15 +161,14 @@ async function handleReplaceSource(c: Context<Env>) {
 		return c.json({ error: parsed.summary }, 400)
 	}
 
-	const { enabled, credentials } = parsed
+	const { enabled } = parsed
 	const config = "config" in parsed ? parsed.config : undefined
 	const user = c.get("user")!
 
 	try {
-		await sessionManager.saveSourceConfig(user.id, sourceId, {
+		await sessionManager.upsertSourceConfig(user.id, sourceId, {
 			enabled,
 			config,
-			credentials,
 		})
 	} catch (err) {
 		if (err instanceof SourceNotFoundError) {
@@ -180,9 +177,6 @@ async function handleReplaceSource(c: Context<Env>) {
 		if (err instanceof InvalidSourceConfigError) {
 			return c.json({ error: err.message }, 400)
 		}
-		if (err instanceof CredentialStorageUnavailableError) {
-			return c.json({ error: err.message }, 503)
-		}
 		throw err
 	}
 

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

@@ -26,18 +26,6 @@ export function sources(db: Database, userId: string) {
 			return rows[0]
 		},
 
-		/** Like find(), but acquires a row lock to prevent concurrent modifications. Must be called inside a transaction. */
-		async findForUpdate(sourceId: string) {
-			const rows = await db
-				.select()
-				.from(userSources)
-				.where(and(eq(userSources.userId, userId), eq(userSources.sourceId, sourceId)))
-				.limit(1)
-				.for("update")
-
-			return rows[0]
-		},
-
 		/** Enables a source for the user. Throws if the source row doesn't exist. */
 		async enableSource(sourceId: string) {
 			const rows = await db

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

@@ -1,4 +1,4 @@
-import { TflSource, type ITflApi, type TflLineId } from "@freya/source-tfl"
+import { TflSource, type ITflApi, type TflLineId } from "@aelis/source-tfl"
 import { type } from "arktype"
 
 import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
@@ -13,7 +13,7 @@ export const tflConfig = type({
 })
 
 export class TflSourceProvider implements FeedSourceProvider {
-	readonly sourceId = "freya.tfl"
+	readonly sourceId = "aelis.tfl"
 	readonly configSchema = tflConfig
 	private readonly apiKey: string | undefined
 	private readonly client: ITflApi | undefined

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

@@ -1,4 +1,4 @@
-import { WeatherSource, type WeatherSourceOptions } from "@freya/source-weatherkit"
+import { WeatherSource, type WeatherSourceOptions } from "@aelis/source-weatherkit"
 import { type } from "arktype"
 
 import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
@@ -16,7 +16,7 @@ export const weatherConfig = type({
 })
 
 export class WeatherSourceProvider implements FeedSourceProvider {
-	readonly sourceId = "freya.weather"
+	readonly sourceId = "aelis.weather"
 	readonly configSchema = weatherConfig
 	private readonly credentials: WeatherSourceOptions["credentials"]
 	private readonly client: WeatherSourceOptions["client"]

apps/aelis-client/app.json

@@ -1,11 +1,11 @@
 {
 	"expo": {
-		"name": "Freya",
+		"name": "Aelis",
-		"slug": "freya-client",
+		"slug": "aelis-client",
 		"version": "1.0.0",
 		"orientation": "portrait",
 		"icon": "./assets/images/icon.png",
-		"scheme": "freya",
+		"scheme": "aelis",
 		"userInterfaceStyle": "automatic",
 		"newArchEnabled": true,
 		"ios": {
@@ -15,7 +15,7 @@
 				},
 				"ITSAppUsesNonExemptEncryption": false
 			},
-			"bundleIdentifier": "sh.nym.freya"
+			"bundleIdentifier": "sh.nym.aelis"
 		},
 		"android": {
 			"adaptiveIcon": {
@@ -26,7 +26,7 @@
 			},
 			"edgeToEdgeEnabled": true,
 			"predictiveBackGestureEnabled": false,
-			"package": "sh.nym.freya"
+			"package": "sh.nym.aelis"
 		},
 		"web": {
 			"output": "static",
@@ -55,112 +55,44 @@
 								"fontFamily": "Inter",
 								"fontDefinitions": [
 									{ "path": "./assets/fonts/Inter_100Thin.ttf", "weight": 100 },
-									{
+									{ "path": "./assets/fonts/Inter_100Thin_Italic.ttf", "weight": 100, "style": "italic" },
-										"path": "./assets/fonts/Inter_100Thin_Italic.ttf",
-										"weight": 100,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/Inter_200ExtraLight.ttf", "weight": 200 },
-									{
+									{ "path": "./assets/fonts/Inter_200ExtraLight_Italic.ttf", "weight": 200, "style": "italic" },
-										"path": "./assets/fonts/Inter_200ExtraLight_Italic.ttf",
-										"weight": 200,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/Inter_300Light.ttf", "weight": 300 },
-									{
+									{ "path": "./assets/fonts/Inter_300Light_Italic.ttf", "weight": 300, "style": "italic" },
-										"path": "./assets/fonts/Inter_300Light_Italic.ttf",
-										"weight": 300,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/Inter_400Regular.ttf", "weight": 400 },
-									{
+									{ "path": "./assets/fonts/Inter_400Regular_Italic.ttf", "weight": 400, "style": "italic" },
-										"path": "./assets/fonts/Inter_400Regular_Italic.ttf",
-										"weight": 400,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/Inter_500Medium.ttf", "weight": 500 },
-									{
+									{ "path": "./assets/fonts/Inter_500Medium_Italic.ttf", "weight": 500, "style": "italic" },
-										"path": "./assets/fonts/Inter_500Medium_Italic.ttf",
-										"weight": 500,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/Inter_600SemiBold.ttf", "weight": 600 },
-									{
+									{ "path": "./assets/fonts/Inter_600SemiBold_Italic.ttf", "weight": 600, "style": "italic" },
-										"path": "./assets/fonts/Inter_600SemiBold_Italic.ttf",
-										"weight": 600,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/Inter_700Bold.ttf", "weight": 700 },
-									{
+									{ "path": "./assets/fonts/Inter_700Bold_Italic.ttf", "weight": 700, "style": "italic" },
-										"path": "./assets/fonts/Inter_700Bold_Italic.ttf",
-										"weight": 700,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/Inter_800ExtraBold.ttf", "weight": 800 },
-									{
+									{ "path": "./assets/fonts/Inter_800ExtraBold_Italic.ttf", "weight": 800, "style": "italic" },
-										"path": "./assets/fonts/Inter_800ExtraBold_Italic.ttf",
-										"weight": 800,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/Inter_900Black.ttf", "weight": 900 },
-									{
+									{ "path": "./assets/fonts/Inter_900Black_Italic.ttf", "weight": 900, "style": "italic" }
-										"path": "./assets/fonts/Inter_900Black_Italic.ttf",
-										"weight": 900,
-										"style": "italic"
-									}
 								]
 							},
 							{
 								"fontFamily": "Source Serif 4",
 								"fontDefinitions": [
 									{ "path": "./assets/fonts/SourceSerif4_200ExtraLight.ttf", "weight": 200 },
-									{
+									{ "path": "./assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf", "weight": 200, "style": "italic" },
-										"path": "./assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf",
-										"weight": 200,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/SourceSerif4_300Light.ttf", "weight": 300 },
-									{
+									{ "path": "./assets/fonts/SourceSerif4_300Light_Italic.ttf", "weight": 300, "style": "italic" },
-										"path": "./assets/fonts/SourceSerif4_300Light_Italic.ttf",
-										"weight": 300,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/SourceSerif4_400Regular.ttf", "weight": 400 },
-									{
+									{ "path": "./assets/fonts/SourceSerif4_400Regular_Italic.ttf", "weight": 400, "style": "italic" },
-										"path": "./assets/fonts/SourceSerif4_400Regular_Italic.ttf",
-										"weight": 400,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/SourceSerif4_500Medium.ttf", "weight": 500 },
-									{
+									{ "path": "./assets/fonts/SourceSerif4_500Medium_Italic.ttf", "weight": 500, "style": "italic" },
-										"path": "./assets/fonts/SourceSerif4_500Medium_Italic.ttf",
-										"weight": 500,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/SourceSerif4_600SemiBold.ttf", "weight": 600 },
-									{
+									{ "path": "./assets/fonts/SourceSerif4_600SemiBold_Italic.ttf", "weight": 600, "style": "italic" },
-										"path": "./assets/fonts/SourceSerif4_600SemiBold_Italic.ttf",
-										"weight": 600,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/SourceSerif4_700Bold.ttf", "weight": 700 },
-									{
+									{ "path": "./assets/fonts/SourceSerif4_700Bold_Italic.ttf", "weight": 700, "style": "italic" },
-										"path": "./assets/fonts/SourceSerif4_700Bold_Italic.ttf",
-										"weight": 700,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/SourceSerif4_800ExtraBold.ttf", "weight": 800 },
-									{
+									{ "path": "./assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf", "weight": 800, "style": "italic" },
-										"path": "./assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf",
-										"weight": 800,
-										"style": "italic"
-									},
 									{ "path": "./assets/fonts/SourceSerif4_900Black.ttf", "weight": 900 },
-									{
+									{ "path": "./assets/fonts/SourceSerif4_900Black_Italic.ttf", "weight": 900, "style": "italic" }
-										"path": "./assets/fonts/SourceSerif4_900Black_Italic.ttf",
-										"weight": 900,
-										"style": "italic"
-									}
 								]
 							}
 						]