feat(caldav): add slot support for feed items

Adds three LLM-fillable slots to every CalDav feed item: insight, preparation, and crossSource. Slot prompts are stored in separate .txt files under src/prompts/ with few-shot examples to steer the LLM away from restating event details. Co-authored-by: Ona <no-reply@ona.com>
fix(caldav): expand recurring events in range
2026-03-20 00:51:20 +00:00 · 2026-03-04 23:14:43 +00:00 · 2026-03-04 23:13:45 +00:00
269 changed files with 1663 additions and 6132 deletions
--- a/.ona/automations.yaml
+++ b/.ona/automations.yaml
@@ -1,8 +1,8 @@
 services:
  expo:
    name: Expo Dev Server
-    description: Expo development server for aelis-client
+    description: Expo development server for aris-client
    triggeredBy:
      - postDevcontainerStart
    commands:
-      start: cd apps/aelis-client && ./scripts/run-dev-server.sh
+      start: cd apps/aris-client && ./scripts/run-dev-server.sh
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -2,7 +2,7 @@

 ## Project

-AELIS is an AI-powered personal assistant that aggregates data from various sources into a contextual feed. Monorepo with `packages/` (shared libraries) and `apps/` (applications).
+ARIS 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

--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# aelis
+# aris

 To install dependencies:

@@ -8,14 +8,14 @@ bun install

 ## Packages

-### @aelis/source-tfl
+### @aris/source-tfl

 TfL (Transport for London) feed source for tube, overground, and Elizabeth line alerts.

 #### Testing

 ```bash
-cd packages/aelis-source-tfl
+cd packages/aris-source-tfl
 bun run test
 ```

--- a/apps/aelis-backend/src/engine/http.test.ts
+++ b/apps/aelis-backend/src/engine/http.test.ts
@@ -1,313 +0,0 @@
-import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
-
-import { contextKey } from "@aelis/core"
-import { describe, expect, test } from "bun:test"
-import { Hono } from "hono"
-
-import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
-import { UserSessionManager } from "../session/index.ts"
-import { registerFeedHttpHandlers } from "./http.ts"
-
-interface FeedResponse {
-	items: Array<{
-		id: string
-		type: string
-		priority: number
-		timestamp: string
-		data: Record<string, unknown>
-	}>
-	errors: Array<{ sourceId: string; error: string }>
-}
-
-function createStubSource(
-	id: string,
-	items: FeedItem[] = [],
-	contextEntries: readonly ContextEntry[] | null = null,
-): FeedSource {
-	return {
-		id,
-		async listActions(): Promise<Record<string, ActionDefinition>> {
-			return {}
-		},
-		async executeAction(): Promise<unknown> {
-			return undefined
-		},
-		async fetchContext(): Promise<readonly ContextEntry[] | null> {
-			return contextEntries
-		},
-		async fetchItems() {
-			return items
-		},
-	}
-}
-
-function buildTestApp(sessionManager: UserSessionManager, userId?: string) {
-	const app = new Hono()
-	registerFeedHttpHandlers(app, {
-		sessionManager,
-		authSessionMiddleware: mockAuthSessionMiddleware(userId),
-	})
-	return app
-}
-
-describe("GET /api/feed", () => {
-	test("returns 401 without auth", async () => {
-		const manager = new UserSessionManager({ providers: [] })
-		const app = buildTestApp(manager)
-
-		const res = await app.request("/api/feed")
-
-		expect(res.status).toBe(401)
-	})
-
-	test("returns cached feed when available", async () => {
-		const items: FeedItem[] = [
-			{
-				id: "item-1",
-				type: "test",
-				priority: 0.8,
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { value: 42 },
-			},
-		]
-		const manager = new UserSessionManager({
-			providers: [() => createStubSource("test", items)],
-		})
-		const app = buildTestApp(manager, "user-1")
-
-		// Prime the cache
-		const session = manager.getOrCreate("user-1")
-		await session.engine.refresh()
-		expect(session.engine.lastFeed()).not.toBeNull()
-
-		const res = await app.request("/api/feed")
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as FeedResponse
-		expect(body.items).toHaveLength(1)
-		expect(body.items[0]!.id).toBe("item-1")
-		expect(body.items[0]!.type).toBe("test")
-		expect(body.items[0]!.priority).toBe(0.8)
-		expect(body.items[0]!.timestamp).toBe("2025-01-01T00:00:00.000Z")
-		expect(body.errors).toHaveLength(0)
-	})
-
-	test("forces refresh when no cached feed", async () => {
-		const items: FeedItem[] = [
-			{
-				id: "fresh-1",
-				type: "test",
-				priority: 0.5,
-				timestamp: new Date("2025-06-01T12:00:00.000Z"),
-				data: { fresh: true },
-			},
-		]
-		const manager = new UserSessionManager({
-			providers: [() => createStubSource("test", items)],
-		})
-		const app = buildTestApp(manager, "user-1")
-
-		// No prior refresh — lastFeed() returns null, handler should call refresh()
-		const res = await app.request("/api/feed")
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as FeedResponse
-		expect(body.items).toHaveLength(1)
-		expect(body.items[0]!.id).toBe("fresh-1")
-		expect(body.items[0]!.data.fresh).toBe(true)
-		expect(body.errors).toHaveLength(0)
-	})
-
-	test("serializes source errors as message strings", async () => {
-		const failingSource: FeedSource = {
-			id: "failing",
-			async listActions() {
-				return {}
-			},
-			async executeAction() {
-				return undefined
-			},
-			async fetchContext() {
-				return null
-			},
-			async fetchItems() {
-				throw new Error("connection timeout")
-			},
-		}
-		const manager = new UserSessionManager({ providers: [() => failingSource] })
-		const app = buildTestApp(manager, "user-1")
-
-		const res = await app.request("/api/feed")
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as FeedResponse
-		expect(body.items).toHaveLength(0)
-		expect(body.errors).toHaveLength(1)
-		expect(body.errors[0]!.sourceId).toBe("failing")
-		expect(body.errors[0]!.error).toBe("connection timeout")
-	})
-})
-
-describe("GET /api/context", () => {
-	const weatherKey = contextKey("aelis.weather", "weather")
-	const weatherData = { temperature: 20, condition: "Clear" }
-	const contextEntries: readonly ContextEntry[] = [[weatherKey, weatherData]]
-
-	// The mock auth middleware always injects this hardcoded user ID
-	const mockUserId = "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn"
-
-	function buildContextApp(userId?: string) {
-		const manager = new UserSessionManager({
-			providers: [() => createStubSource("weather", [], contextEntries)],
-		})
-		const app = buildTestApp(manager, userId)
-		const session = manager.getOrCreate(mockUserId)
-		return { app, session }
-	}
-
-	test("returns 401 without auth", async () => {
-		const manager = new UserSessionManager({ providers: [] })
-		const app = buildTestApp(manager)
-
-		const res = await app.request('/api/context?key=["aelis.weather","weather"]')
-
-		expect(res.status).toBe(401)
-	})
-
-	test("returns 400 when key param is missing", async () => {
-		const { app } = buildContextApp("user-1")
-
-		const res = await app.request("/api/context")
-
-		expect(res.status).toBe(400)
-		const body = (await res.json()) as { error: string }
-		expect(body.error).toContain("key")
-	})
-
-	test("returns 400 when key is invalid JSON", async () => {
-		const { app } = buildContextApp("user-1")
-
-		const res = await app.request("/api/context?key=notjson")
-
-		expect(res.status).toBe(400)
-		const body = (await res.json()) as { error: string }
-		expect(body.error).toContain("key")
-	})
-
-	test("returns 400 when key is not an array", async () => {
-		const { app } = buildContextApp("user-1")
-
-		const res = await app.request('/api/context?key="string"')
-
-		expect(res.status).toBe(400)
-		const body = (await res.json()) as { error: string }
-		expect(body.error).toContain("key")
-	})
-
-	test("returns 400 when key contains invalid element types", async () => {
-		const { app } = buildContextApp("user-1")
-
-		const res = await app.request("/api/context?key=[true,null,[1,2]]")
-
-		expect(res.status).toBe(400)
-		const body = (await res.json()) as { error: string }
-		expect(body.error).toContain("key")
-	})
-
-	test("returns 400 when key is an empty array", async () => {
-		const { app } = buildContextApp("user-1")
-
-		const res = await app.request("/api/context?key=[]")
-
-		expect(res.status).toBe(400)
-		const body = (await res.json()) as { error: string }
-		expect(body.error).toContain("key")
-	})
-
-	test("returns 400 when match param is invalid", async () => {
-		const { app } = buildContextApp("user-1")
-
-		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 }
-		expect(body.error).toContain("match")
-	})
-
-	test("returns exact match with match=exact", async () => {
-		const { app, session } = buildContextApp("user-1")
-		await session.engine.refresh()
-
-		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 }
-		expect(body.match).toBe("exact")
-		expect(body.value).toEqual(weatherData)
-	})
-
-	test("returns 404 with match=exact when only prefix would match", async () => {
-		const { app, session } = buildContextApp("user-1")
-		await session.engine.refresh()
-
-		const res = await app.request('/api/context?key=["aelis.weather"]&match=exact')
-
-		expect(res.status).toBe(404)
-	})
-
-	test("returns prefix match with match=prefix", async () => {
-		const { app, session } = buildContextApp("user-1")
-		await session.engine.refresh()
-
-		const res = await app.request('/api/context?key=["aelis.weather"]&match=prefix')
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as {
-			match: string
-			entries: Array<{ key: unknown[]; value: unknown }>
-		}
-		expect(body.match).toBe("prefix")
-		expect(body.entries).toHaveLength(1)
-		expect(body.entries[0]!.key).toEqual(["aelis.weather", "weather"])
-		expect(body.entries[0]!.value).toEqual(weatherData)
-	})
-
-	test("default mode returns exact match when available", async () => {
-		const { app, session } = buildContextApp("user-1")
-		await session.engine.refresh()
-
-		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 }
-		expect(body.match).toBe("exact")
-		expect(body.value).toEqual(weatherData)
-	})
-
-	test("default mode falls back to prefix when no exact match", async () => {
-		const { app, session } = buildContextApp("user-1")
-		await session.engine.refresh()
-
-		const res = await app.request('/api/context?key=["aelis.weather"]')
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as {
-			match: string
-			entries: Array<{ key: unknown[]; value: unknown }>
-		}
-		expect(body.match).toBe("prefix")
-		expect(body.entries).toHaveLength(1)
-		expect(body.entries[0]!.value).toEqual(weatherData)
-	})
-
-	test("returns 404 when neither exact nor prefix matches", async () => {
-		const { app, session } = buildContextApp("user-1")
-		await session.engine.refresh()
-
-		const res = await app.request('/api/context?key=["nonexistent"]')
-
-		expect(res.status).toBe(404)
-		const body = (await res.json()) as { error: string }
-		expect(body.error).toBe("Context key not found")
-	})
-})
--- a/apps/aelis-backend/src/engine/http.ts
+++ b/apps/aelis-backend/src/engine/http.ts
@@ -1,118 +0,0 @@
-import type { Context, Hono } from "hono"
-
-import { contextKey } from "@aelis/core"
-import { createMiddleware } from "hono/factory"
-
-import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
-import type { UserSessionManager } from "../session/index.ts"
-
-type Env = {
-	Variables: {
-		sessionManager: UserSessionManager
-	}
-}
-
-interface FeedHttpHandlersDeps {
-	sessionManager: UserSessionManager
-	authSessionMiddleware: AuthSessionMiddleware
-}
-
-export function registerFeedHttpHandlers(
-	app: Hono,
-	{ sessionManager, authSessionMiddleware }: FeedHttpHandlersDeps,
-) {
-	const inject = createMiddleware<Env>(async (c, next) => {
-		c.set("sessionManager", sessionManager)
-		await next()
-	})
-
-	app.get("/api/feed", inject, authSessionMiddleware, handleGetFeed)
-	app.get("/api/context", inject, authSessionMiddleware, handleGetContext)
-}
-
-async function handleGetFeed(c: Context<Env>) {
-	const user = c.get("user")!
-	const sessionManager = c.get("sessionManager")
-	const session = sessionManager.getOrCreate(user.id)
-
-	const feed = await session.feed()
-
-	return c.json({
-		items: feed.items,
-		errors: feed.errors.map((e) => ({
-			sourceId: e.sourceId,
-			error: e.error.message,
-		})),
-	})
-}
-
-function handleGetContext(c: Context<Env>) {
-	const keyParam = c.req.query("key")
-	if (!keyParam) {
-		return c.json({ error: 'Invalid or missing "key" parameter: must be a JSON array' }, 400)
-	}
-
-	let parsed: unknown
-	try {
-		parsed = JSON.parse(keyParam)
-	} catch {
-		return c.json({ error: 'Invalid or missing "key" parameter: must be a JSON array' }, 400)
-	}
-
-	if (!Array.isArray(parsed) || parsed.length === 0 || !parsed.every(isContextKeyPart)) {
-		return c.json({ error: 'Invalid or missing "key" parameter: must be a JSON array' }, 400)
-	}
-
-	const matchParam = c.req.query("match")
-	if (matchParam !== undefined && matchParam !== "exact" && matchParam !== "prefix") {
-		return c.json({ error: 'Invalid "match" parameter: must be "exact" or "prefix"' }, 400)
-	}
-
-	const user = c.get("user")!
-	const sessionManager = c.get("sessionManager")
-	const session = sessionManager.getOrCreate(user.id)
-	const context = session.engine.currentContext()
-	const key = contextKey(...parsed)
-
-	if (matchParam === "exact") {
-		const value = context.get(key)
-		if (value === undefined) {
-			return c.json({ error: "Context key not found" }, 404)
-		}
-		return c.json({ match: "exact", value })
-	}
-
-	if (matchParam === "prefix") {
-		const entries = context.find(key)
-		if (entries.length === 0) {
-			return c.json({ error: "Context key not found" }, 404)
-		}
-		return c.json({ match: "prefix", entries })
-	}
-
-	// Default: single find() covers both exact and prefix matches
-	const entries = context.find(key)
-	if (entries.length === 0) {
-		return c.json({ error: "Context key not found" }, 404)
-	}
-
-	// If exactly one result with the same key length, treat as exact match
-	if (entries.length === 1 && entries[0]!.key.length === parsed.length) {
-		return c.json({ match: "exact", value: entries[0]!.value })
-	}
-
-	return c.json({ match: "prefix", entries })
-}
-
-/** Validates that a value is a valid ContextKeyPart (string, number, or plain object of primitives). */
-function isContextKeyPart(value: unknown): boolean {
-	if (typeof value === "string" || typeof value === "number") {
-		return true
-	}
-	if (typeof value === "object" && value !== null && !Array.isArray(value)) {
-		return Object.values(value).every(
-			(v) => typeof v === "string" || typeof v === "number" || typeof v === "boolean",
-		)
-	}
-	return false
-}
--- a/apps/aelis-backend/src/enhancement/enhance-feed.ts
+++ b/apps/aelis-backend/src/enhancement/enhance-feed.ts
@@ -1,51 +0,0 @@
-import type { FeedItem } from "@aelis/core"
-
-import type { LlmClient } from "./llm-client.ts"
-
-import { mergeEnhancement } from "./merge.ts"
-import { buildPrompt, hasUnfilledSlots } from "./prompt-builder.ts"
-
-/** Takes feed items, returns enhanced feed items. */
-export type FeedEnhancer = (items: FeedItem[]) => Promise<FeedItem[]>
-
-export interface FeedEnhancerConfig {
-	client: LlmClient
-	/** Defaults to Date.now — override for testing */
-	clock?: () => Date
-}
-
-/**
- * Creates a FeedEnhancer that uses the provided LlmClient.
- *
- * Skips the LLM call when no items have unfilled slots.
- * Returns items unchanged on LLM failure.
- */
-export function createFeedEnhancer(config: FeedEnhancerConfig): FeedEnhancer {
-	const { client } = config
-	const clock = config.clock ?? (() => new Date())
-
-	return async function enhanceFeed(items) {
-		if (!hasUnfilledSlots(items)) {
-			return items
-		}
-
-		const currentTime = clock()
-		const { systemPrompt, userMessage } = buildPrompt(items, currentTime)
-
-		let result
-		try {
-			result = await client.enhance({ systemPrompt, userMessage })
-		} catch (err) {
-			console.error("[enhancement] LLM call failed:", err)
-			result = null
-		}
-
-		if (!result) {
-			return items
-		}
-
-		return mergeEnhancement(items, result, currentTime)
-	}
-}
-
-
--- a/apps/aelis-backend/src/enhancement/llm-client.ts
+++ b/apps/aelis-backend/src/enhancement/llm-client.ts
@@ -1,71 +0,0 @@
-import { OpenRouter } from "@openrouter/sdk"
-
-import type { EnhancementResult } from "./schema.ts"
-
-import { enhancementResultJsonSchema, parseEnhancementResult } from "./schema.ts"
-
-const DEFAULT_MODEL = "openai/gpt-4.1-mini"
-const DEFAULT_TIMEOUT_MS = 30_000
-
-export interface LlmClientConfig {
-	apiKey: string
-	model?: string
-	timeoutMs?: number
-}
-
-export interface LlmClientRequest {
-	systemPrompt: string
-	userMessage: string
-}
-
-export interface LlmClient {
-	enhance(request: LlmClientRequest): Promise<EnhancementResult | null>
-}
-
-/**
- * Creates a reusable LLM client backed by OpenRouter.
- * The OpenRouter SDK instance is created once and reused across calls.
- */
-export function createLlmClient(config: LlmClientConfig): LlmClient {
-	const client = new OpenRouter({
-		apiKey: config.apiKey,
-		timeoutMs: config.timeoutMs ?? DEFAULT_TIMEOUT_MS,
-	})
-	const model = config.model ?? DEFAULT_MODEL
-
-	return {
-		async enhance(request) {
-			const response = await client.chat.send({
-				chatGenerationParams: {
-					model,
-					messages: [
-						{ role: "system" as const, content: request.systemPrompt },
-						{ role: "user" as const, content: request.userMessage },
-					],
-					responseFormat: {
-						type: "json_schema" as const,
-						jsonSchema: {
-							name: "enhancement_result",
-							strict: true,
-							schema: enhancementResultJsonSchema,
-						},
-					},
-					stream: false,
-				},
-			})
-
-			const content = response.choices?.[0]?.message?.content
-			if (typeof content !== "string") {
-				console.warn("[enhancement] LLM returned no content in response")
-				return null
-			}
-
-			const result = parseEnhancementResult(content)
-			if (!result) {
-				console.warn("[enhancement] Failed to parse LLM response:", content)
-			}
-
-			return result
-		},
-	}
-}
--- a/apps/aelis-backend/src/enhancement/merge.test.ts
+++ b/apps/aelis-backend/src/enhancement/merge.test.ts
@@ -1,150 +0,0 @@
-import type { FeedItem } from "@aelis/core"
-
-import { describe, expect, test } from "bun:test"
-
-import type { EnhancementResult } from "./schema.ts"
-
-import { mergeEnhancement } from "./merge.ts"
-
-function makeItem(overrides: Partial<FeedItem> = {}): FeedItem {
-	return {
-		id: "item-1",
-		type: "test",
-		timestamp: new Date("2025-01-01T00:00:00Z"),
-		data: { value: 42 },
-		...overrides,
-	}
-}
-
-const now = new Date("2025-06-01T12:00:00Z")
-
-describe("mergeEnhancement", () => {
-	test("fills matching slots", () => {
-		const item = makeItem({
-			slots: {
-				insight: { description: "Weather insight", content: null },
-			},
-		})
-		const result: EnhancementResult = {
-			slotFills: {
-				"item-1": { insight: "Rain after 3pm" },
-			},
-			syntheticItems: [],
-		}
-
-		const merged = mergeEnhancement([item], result, now)
-
-		expect(merged).toHaveLength(1)
-		expect(merged[0]!.slots!.insight!.content).toBe("Rain after 3pm")
-		// Description preserved
-		expect(merged[0]!.slots!.insight!.description).toBe("Weather insight")
-	})
-
-	test("does not mutate original items", () => {
-		const item = makeItem({
-			slots: {
-				insight: { description: "test", content: null },
-			},
-		})
-		const result: EnhancementResult = {
-			slotFills: { "item-1": { insight: "filled" } },
-			syntheticItems: [],
-		}
-
-		mergeEnhancement([item], result, now)
-
-		expect(item.slots!.insight!.content).toBeNull()
-	})
-
-	test("ignores fills for non-existent items", () => {
-		const item = makeItem()
-		const result: EnhancementResult = {
-			slotFills: { "non-existent": { insight: "text" } },
-			syntheticItems: [],
-		}
-
-		const merged = mergeEnhancement([item], result, now)
-
-		expect(merged).toHaveLength(1)
-		expect(merged[0]!.id).toBe("item-1")
-	})
-
-	test("ignores fills for non-existent slots", () => {
-		const item = makeItem({
-			slots: {
-				insight: { description: "test", content: null },
-			},
-		})
-		const result: EnhancementResult = {
-			slotFills: { "item-1": { "non-existent-slot": "text" } },
-			syntheticItems: [],
-		}
-
-		const merged = mergeEnhancement([item], result, now)
-
-		expect(merged[0]!.slots!.insight!.content).toBeNull()
-	})
-
-	test("skips null fills", () => {
-		const item = makeItem({
-			slots: {
-				insight: { description: "test", content: null },
-			},
-		})
-		const result: EnhancementResult = {
-			slotFills: { "item-1": { insight: null } },
-			syntheticItems: [],
-		}
-
-		const merged = mergeEnhancement([item], result, now)
-
-		expect(merged[0]!.slots!.insight!.content).toBeNull()
-	})
-
-	test("passes through items without slots unchanged", () => {
-		const item = makeItem()
-		const result: EnhancementResult = {
-			slotFills: {},
-			syntheticItems: [],
-		}
-
-		const merged = mergeEnhancement([item], result, now)
-
-		expect(merged[0]).toBe(item)
-	})
-
-	test("appends synthetic items with backfilled fields", () => {
-		const item = makeItem()
-		const result: EnhancementResult = {
-			slotFills: {},
-			syntheticItems: [
-				{
-					id: "briefing-morning",
-					type: "briefing",
-					text: "Light afternoon ahead.",
-				},
-			],
-		}
-
-		const merged = mergeEnhancement([item], result, now)
-
-		expect(merged).toHaveLength(2)
-		expect(merged[1]!.id).toBe("briefing-morning")
-		expect(merged[1]!.type).toBe("briefing")
-		expect(merged[1]!.timestamp).toEqual(now)
-		expect(merged[1]!.data).toEqual({ text: "Light afternoon ahead." })
-	})
-
-	test("handles empty enhancement result", () => {
-		const item = makeItem()
-		const result: EnhancementResult = {
-			slotFills: {},
-			syntheticItems: [],
-		}
-
-		const merged = mergeEnhancement([item], result, now)
-
-		expect(merged).toHaveLength(1)
-		expect(merged[0]).toBe(item)
-	})
-})
--- a/apps/aelis-backend/src/enhancement/merge.ts
+++ b/apps/aelis-backend/src/enhancement/merge.ts
@@ -1,41 +0,0 @@
-import type { FeedItem } from "@aelis/core"
-
-import type { EnhancementResult } from "./schema.ts"
-
-/**
- * Merges an EnhancementResult into feed items.
- *
- * - Writes slot content from slotFills into matching items
- * - Appends synthetic items to the list
- * - Returns a new array (no mutation)
- * - Ignores fills for items/slots that don't exist
- */
-export function mergeEnhancement(items: FeedItem[], result: EnhancementResult, currentTime: Date): FeedItem[] {
-	const merged = items.map((item) => {
-		const fills = result.slotFills[item.id]
-		if (!fills || !item.slots) return item
-
-		const mergedSlots = { ...item.slots }
-		let changed = false
-
-		for (const [slotName, content] of Object.entries(fills)) {
-			if (slotName in mergedSlots && content !== null) {
-				mergedSlots[slotName] = { ...mergedSlots[slotName]!, content }
-				changed = true
-			}
-		}
-
-		return changed ? { ...item, slots: mergedSlots } : item
-	})
-
-	for (const synthetic of result.syntheticItems) {
-		merged.push({
-			id: synthetic.id,
-			type: synthetic.type,
-			timestamp: currentTime,
-			data: { text: synthetic.text },
-		})
-	}
-
-	return merged
-}
--- a/apps/aelis-backend/src/enhancement/prompt-builder.test.ts
+++ b/apps/aelis-backend/src/enhancement/prompt-builder.test.ts
@@ -1,167 +0,0 @@
-import type { FeedItem } from "@aelis/core"
-
-import { describe, expect, test } from "bun:test"
-
-import { buildPrompt, hasUnfilledSlots } from "./prompt-builder.ts"
-
-function makeItem(overrides: Partial<FeedItem> = {}): FeedItem {
-	return {
-		id: "item-1",
-		type: "test",
-		timestamp: new Date("2025-01-01T00:00:00Z"),
-		data: { value: 42 },
-		...overrides,
-	}
-}
-
-function parseUserMessage(userMessage: string): Record<string, unknown> {
-	return JSON.parse(userMessage)
-}
-
-describe("hasUnfilledSlots", () => {
-	test("returns false for items without slots", () => {
-		expect(hasUnfilledSlots([makeItem()])).toBe(false)
-	})
-
-	test("returns false for items with all slots filled", () => {
-		const item = makeItem({
-			slots: {
-				insight: { description: "test", content: "filled" },
-			},
-		})
-		expect(hasUnfilledSlots([item])).toBe(false)
-	})
-
-	test("returns true when at least one slot is unfilled", () => {
-		const item = makeItem({
-			slots: {
-				insight: { description: "test", content: null },
-			},
-		})
-		expect(hasUnfilledSlots([item])).toBe(true)
-	})
-
-	test("returns false for empty array", () => {
-		expect(hasUnfilledSlots([])).toBe(false)
-	})
-})
-
-describe("buildPrompt", () => {
-	test("puts items with unfilled slots in items", () => {
-		const item = makeItem({
-			slots: {
-				insight: { description: "Weather insight", content: null },
-				filled: { description: "Already done", content: "done" },
-			},
-		})
-
-		const { userMessage } = buildPrompt([item], new Date("2025-06-01T12:00:00Z"))
-		const parsed = parseUserMessage(userMessage)
-
-		expect(parsed.items).toHaveLength(1)
-		expect((parsed.items as Array<Record<string, unknown>>)[0]!.id).toBe("item-1")
-		expect((parsed.items as Array<Record<string, unknown>>)[0]!.slots).toEqual({ insight: "Weather insight" })
-		expect((parsed.items as Array<Record<string, unknown>>)[0]!.type).toBeUndefined()
-		expect(parsed.context).toHaveLength(0)
-	})
-
-	test("puts slotless items in context", () => {
-		const withSlots = makeItem({
-			id: "with-slots",
-			slots: { insight: { description: "test", content: null } },
-		})
-		const withoutSlots = makeItem({ id: "no-slots" })
-
-		const { userMessage } = buildPrompt([withSlots, withoutSlots], new Date("2025-06-01T12:00:00Z"))
-		const parsed = parseUserMessage(userMessage)
-
-		expect(parsed.items).toHaveLength(1)
-		expect((parsed.items as Array<Record<string, unknown>>)[0]!.id).toBe("with-slots")
-		expect(parsed.context).toHaveLength(1)
-		expect((parsed.context as Array<Record<string, unknown>>)[0]!.id).toBe("no-slots")
-	})
-
-	test("includes time in ISO format", () => {
-		const { userMessage } = buildPrompt([], new Date("2025-06-01T12:00:00Z"))
-		const parsed = parseUserMessage(userMessage)
-
-		expect(parsed.time).toBe("2025-06-01T12:00:00.000Z")
-	})
-
-	test("system prompt is non-empty", () => {
-		const { systemPrompt } = buildPrompt([], new Date())
-		expect(systemPrompt.length).toBeGreaterThan(0)
-	})
-
-	test("includes schedule in system prompt", () => {
-		const calEvent = makeItem({
-			id: "cal-1",
-			type: "caldav-event",
-			data: {
-				title: "Team standup",
-				startDate: "2025-06-01T10:00:00Z",
-				endDate: "2025-06-01T10:30:00Z",
-				isAllDay: false,
-				location: null,
-			},
-			slots: {
-				insight: { description: "test", content: null },
-			},
-		})
-
-		const { systemPrompt } = buildPrompt([calEvent], new Date("2025-06-01T12:00:00Z"))
-
-		expect(systemPrompt).toContain("Schedule:\n")
-		expect(systemPrompt).toContain("Team standup")
-		expect(systemPrompt).toContain("10:00")
-	})
-
-	test("includes location in schedule", () => {
-		const calEvent = makeItem({
-			id: "cal-1",
-			type: "caldav-event",
-			data: {
-				title: "Therapy",
-				startDate: "2025-06-02T18:00:00Z",
-				endDate: "2025-06-02T19:00:00Z",
-				isAllDay: false,
-				location: "92 Tooley Street, London",
-			},
-		})
-
-		const { systemPrompt } = buildPrompt([calEvent], new Date("2025-06-01T12:00:00Z"))
-
-		expect(systemPrompt).toContain("Therapy @ 92 Tooley Street, London")
-	})
-
-	test("includes week calendar but omits schedule when no calendar items", () => {
-		const weatherItem = makeItem({
-			type: "weather-current",
-			data: { temperature: 14 },
-		})
-
-		const { systemPrompt } = buildPrompt([weatherItem], new Date("2025-06-01T12:00:00Z"))
-
-		expect(systemPrompt).toContain("Week:")
-		expect(systemPrompt).not.toContain("Schedule:")
-	})
-
-	test("user message is pure JSON", () => {
-		const calEvent = makeItem({
-			id: "cal-1",
-			type: "caldav-event",
-			data: {
-				title: "Budget Review",
-				startTime: "2025-06-01T14:00:00Z",
-				endTime: "2025-06-01T15:00:00Z",
-				isAllDay: false,
-				location: "https://meet.google.com/abc",
-			},
-		})
-
-		const { userMessage } = buildPrompt([calEvent], new Date("2025-06-01T12:00:00Z"))
-
-		expect(userMessage.startsWith("{")).toBe(true)
-		expect(() => JSON.parse(userMessage)).not.toThrow()
-	})
-})
--- a/apps/aelis-backend/src/enhancement/prompt-builder.ts
+++ b/apps/aelis-backend/src/enhancement/prompt-builder.ts
@@ -1,218 +0,0 @@
-import type { FeedItem } from "@aelis/core"
-
-import { CalDavFeedItemType } from "@aelis/source-caldav"
-import { CalendarFeedItemType } from "@aelis/source-google-calendar"
-
-import systemPromptBase from "./prompts/system.txt"
-
-const CALENDAR_ITEM_TYPES = new Set<string>([
-	CalDavFeedItemType.Event,
-	CalendarFeedItemType.Event,
-	CalendarFeedItemType.AllDay,
-])
-
-/**
- * Builds the system prompt and user message for the enhancement harness.
- *
- * Includes a pre-computed mini calendar so the LLM doesn't have to
- * parse timestamps to understand the user's schedule.
- */
-export function buildPrompt(
-	items: FeedItem[],
-	currentTime: Date,
-): { systemPrompt: string; userMessage: string } {
-	const schedule = buildSchedule(items, currentTime)
-
-	const enhanceItems: Array<{
-		id: string
-		data: Record<string, unknown>
-		slots: Record<string, string>
-	}> = []
-	const contextItems: Array<{
-		id: string
-		type: string
-		data: Record<string, unknown>
-	}> = []
-
-	for (const item of items) {
-		const hasUnfilledSlots =
-			item.slots &&
-			Object.values(item.slots).some((slot) => slot.content === null)
-
-		if (hasUnfilledSlots) {
-			enhanceItems.push({
-				id: item.id,
-				data: item.data,
-				slots: Object.fromEntries(
-					Object.entries(item.slots!)
-						.filter(([, slot]) => slot.content === null)
-						.map(([name, slot]) => [name, slot.description]),
-				),
-			})
-		} else {
-			contextItems.push({
-				id: item.id,
-				type: item.type,
-				data: item.data,
-			})
-		}
-	}
-
-	const userMessage = JSON.stringify({
-		time: currentTime.toISOString(),
-		items: enhanceItems,
-		context: contextItems,
-	})
-
-	const weekCalendar = buildWeekCalendar(currentTime)
-	let systemPrompt = systemPromptBase
-	systemPrompt += `\n\nWeek:\n${weekCalendar}`
-	if (schedule) {
-		systemPrompt += `\n\nSchedule:\n${schedule}`
-	}
-
-	return { systemPrompt, userMessage }
-}
-
-/**
- * Returns true if any item has at least one unfilled slot.
- */
-export function hasUnfilledSlots(items: FeedItem[]): boolean {
-	return items.some(
-		(item) =>
-			item.slots &&
-			Object.values(item.slots).some((slot) => slot.content === null),
-	)
-}
-
-// -- Helpers --
-
-interface CalendarEntry {
-	date: Date
-	title: string
-	location: string | null
-	isAllDay: boolean
-	startTime: Date
-	endTime: Date
-}
-
-function toValidDate(value: unknown): Date | null {
-	if (value instanceof Date) return Number.isNaN(value.getTime()) ? null : value
-	if (typeof value === "string" || typeof value === "number") {
-		const date = new Date(value)
-		return Number.isNaN(date.getTime()) ? null : date
-	}
-	return null
-}
-
-function extractCalendarEntry(item: FeedItem): CalendarEntry | null {
-	if (!CALENDAR_ITEM_TYPES.has(item.type)) return null
-
-	const d = item.data
-	const title = d.title
-	if (typeof title !== "string" || !title) return null
-
-	// CalDAV uses startDate/endDate, Google Calendar uses startTime/endTime
-	const startTime = toValidDate(d.startDate ?? d.startTime)
-	if (!startTime) return null
-
-	const endTime = toValidDate(d.endDate ?? d.endTime) ?? startTime
-
-	return {
-		date: startTime,
-		title,
-		location: typeof d.location === "string" ? d.location : null,
-		isAllDay: typeof d.isAllDay === "boolean" ? d.isAllDay : false,
-		startTime,
-		endTime,
-	}
-}
-
-const DAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"] as const
-const MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] as const
-
-function pad2(n: number): string {
-	return n.toString().padStart(2, "0")
-}
-
-function formatTime(date: Date): string {
-	return `${pad2(date.getUTCHours())}:${pad2(date.getUTCMinutes())}`
-}
-
-function formatDayShort(date: Date): string {
-	return `${DAYS[date.getUTCDay()]}, ${date.getUTCDate()} ${MONTHS[date.getUTCMonth()]}`
-}
-
-function formatDayLabel(date: Date, currentTime: Date): string {
-	const currentDay = Date.UTC(currentTime.getUTCFullYear(), currentTime.getUTCMonth(), currentTime.getUTCDate())
-	const targetDay = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate())
-	const diffDays = Math.round((targetDay - currentDay) / (1000 * 60 * 60 * 24))
-
-	const dayName = formatDayShort(date)
-
-	if (diffDays === 0) return `Today: ${dayName}`
-	if (diffDays === 1) return `Tomorrow: ${dayName}`
-	return dayName
-}
-
-/**
- * Builds a week overview mapping day names to dates,
- * so the LLM can easily match ISO timestamps to days.
- */
-function buildWeekCalendar(currentTime: Date): string {
-	const lines: string[] = []
-	for (let i = 0; i < 7; i++) {
-		const date = new Date(currentTime)
-		date.setUTCDate(date.getUTCDate() + i)
-		const label = i === 0 ? "Today" : i === 1 ? "Tomorrow" : ""
-		const dayStr = formatDayShort(date)
-		const iso = date.toISOString().slice(0, 10)
-		const prefix = label ? `${label}: ` : ""
-		lines.push(`${prefix}${dayStr} = ${iso}`)
-	}
-	return lines.join("\n")
-}
-
-/**
- * Builds a compact text calendar from all calendar-type items.
- * Groups events by day relative to currentTime.
- */
-function buildSchedule(items: FeedItem[], currentTime: Date): string {
-	const entries: CalendarEntry[] = []
-	for (const item of items) {
-		const entry = extractCalendarEntry(item)
-		if (entry) entries.push(entry)
-	}
-
-	if (entries.length === 0) return ""
-
-	entries.sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
-
-	const byDay = new Map<string, CalendarEntry[]>()
-	for (const entry of entries) {
-		const key = entry.date.toISOString().slice(0, 10)
-		const group = byDay.get(key)
-		if (group) {
-			group.push(entry)
-		} else {
-			byDay.set(key, [entry])
-		}
-	}
-
-	const lines: string[] = []
-	for (const [, dayEntries] of byDay) {
-		lines.push(formatDayLabel(dayEntries[0]!.startTime, currentTime))
-		for (const entry of dayEntries) {
-			if (entry.isAllDay) {
-				const loc = entry.location ? ` @ ${entry.location}` : ""
-				lines.push(`  all day  ${entry.title}${loc}`)
-			} else {
-				const timeRange = `${formatTime(entry.startTime)}–${formatTime(entry.endTime)}`
-				const loc = entry.location ? ` @ ${entry.location}` : ""
-				lines.push(`  ${timeRange}  ${entry.title}${loc}`)
-			}
-		}
-	}
-
-	return lines.join("\n")
-}
--- a/apps/aelis-backend/src/enhancement/prompts/system.txt
+++ b/apps/aelis-backend/src/enhancement/prompts/system.txt
@@ -1,21 +0,0 @@
-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.
- "context": other feed items (no slots) for cross-source reasoning.
- "time": current ISO timestamp.
-
-Your output has two fields:
- "slotFills": map of item ID → slot name → short text (or null if you can't fill it or cannot provide answer). Each item ID appears ONCE with ALL its slots in a single object.
- "syntheticItems": array of { id, type, text } for new items (briefings, nudges, insights). Only when genuinely useful and when not redundant.
-
-Rules:
- DO NOT USE EMDASH OR DASH OR ATTEMPT TO USE SYMBOLS TO CIRCUMVENT THIS RULE.
- One sentence per slot. Two max if absolutely necessary. Be direct.
- Say "I" not "we."
- Hedge when inferring. Don't state guesses as facts.
- Use the week and schedule below to understand when events happen. Match weather data to the correct date.
- Look for connections across items.
- Don't pad — return null for slots you can't meaningfully fill, and skip synthetic items if there's nothing useful to add.
- Never fabricate information not present in the feed. If you don't have data to support a fill, return null.
- Read each slot's description carefully — it defines when to return null.
--- a/apps/aelis-backend/src/enhancement/schema.test.ts
+++ b/apps/aelis-backend/src/enhancement/schema.test.ts
@@ -1,176 +0,0 @@
-import { describe, expect, test } from "bun:test"
-
-import {
-	emptyEnhancementResult,
-	enhancementResultJsonSchema,
-	parseEnhancementResult,
-} from "./schema.ts"
-
-describe("parseEnhancementResult", () => {
-	test("parses valid result", () => {
-		const input = JSON.stringify({
-			slotFills: {
-				"weather-1": {
-					insight: "Rain after 3pm",
-					"cross-source": null,
-				},
-			},
-			syntheticItems: [
-				{
-					id: "briefing-morning",
-					type: "briefing",
-					text: "Light afternoon ahead.",
-				},
-			],
-		})
-
-		const result = parseEnhancementResult(input)
-
-		expect(result).not.toBeNull()
-		expect(result!.slotFills["weather-1"]!.insight).toBe("Rain after 3pm")
-		expect(result!.slotFills["weather-1"]!["cross-source"]).toBeNull()
-		expect(result!.syntheticItems).toHaveLength(1)
-		expect(result!.syntheticItems[0]!.id).toBe("briefing-morning")
-		expect(result!.syntheticItems[0]!.text).toBe("Light afternoon ahead.")
-	})
-
-	test("parses empty result", () => {
-		const input = JSON.stringify({
-			slotFills: {},
-			syntheticItems: [],
-		})
-
-		const result = parseEnhancementResult(input)
-
-		expect(result).not.toBeNull()
-		expect(Object.keys(result!.slotFills)).toHaveLength(0)
-		expect(result!.syntheticItems).toHaveLength(0)
-	})
-
-	test("returns null for invalid JSON", () => {
-		expect(parseEnhancementResult("not json")).toBeNull()
-	})
-
-	test("returns null for non-object", () => {
-		expect(parseEnhancementResult('"hello"')).toBeNull()
-		expect(parseEnhancementResult("42")).toBeNull()
-		expect(parseEnhancementResult("null")).toBeNull()
-	})
-
-	test("returns null when slotFills is missing", () => {
-		const input = JSON.stringify({ syntheticItems: [] })
-		expect(parseEnhancementResult(input)).toBeNull()
-	})
-
-	test("returns null when syntheticItems is missing", () => {
-		const input = JSON.stringify({ slotFills: {} })
-		expect(parseEnhancementResult(input)).toBeNull()
-	})
-
-	test("returns null when slotFills has non-string values", () => {
-		const input = JSON.stringify({
-			slotFills: { "item-1": { slot: 42 } },
-			syntheticItems: [],
-		})
-		expect(parseEnhancementResult(input)).toBeNull()
-	})
-
-	test("returns null when syntheticItem is missing required fields", () => {
-		const input = JSON.stringify({
-			slotFills: {},
-			syntheticItems: [{ id: "x" }],
-		})
-		expect(parseEnhancementResult(input)).toBeNull()
-	})
-})
-
-describe("emptyEnhancementResult", () => {
-	test("returns empty slotFills and syntheticItems", () => {
-		const result = emptyEnhancementResult()
-		expect(result.slotFills).toEqual({})
-		expect(result.syntheticItems).toEqual([])
-	})
-})
-
-describe("schema sync", () => {
-	const referencePayloads = [
-		{
-			name: "full payload with null slot fill",
-			payload: {
-				slotFills: {
-					"weather-1": { insight: "Rain after 3pm", crossSource: null },
-					"cal-2": { summary: "Busy morning" },
-				},
-				syntheticItems: [
-					{ id: "briefing-morning", type: "briefing", text: "Light day ahead." },
-					{ id: "nudge-umbrella", type: "nudge", text: "Bring an umbrella." },
-				],
-			},
-		},
-		{
-			name: "empty collections",
-			payload: { slotFills: {}, syntheticItems: [] },
-		},
-		{
-			name: "slot fills only",
-			payload: {
-				slotFills: { "item-1": { slot: "filled" } },
-				syntheticItems: [],
-			},
-		},
-		{
-			name: "synthetic items only",
-			payload: {
-				slotFills: {},
-				syntheticItems: [{ id: "insight-1", type: "insight", text: "Something." }],
-			},
-		},
-	]
-
-	for (const { name, payload } of referencePayloads) {
-		test(`arktype and JSON Schema agree on: ${name}`, () => {
-			// arktype accepts it
-			const parsed = parseEnhancementResult(JSON.stringify(payload))
-			expect(parsed).not.toBeNull()
-
-			// JSON Schema structure matches
-			const jsonSchema = enhancementResultJsonSchema
-			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
-			const itemSchema = jsonSchema.properties.syntheticItems.items
-			expect([...itemSchema.required].sort()).toEqual(["id", "text", "type"])
-
-			// Verify each synthetic item has exactly the fields the JSON Schema expects
-			for (const item of payload.syntheticItems) {
-				expect(Object.keys(item).sort()).toEqual([...itemSchema.required].sort())
-			}
-		})
-	}
-
-	test("JSON Schema rejects what arktype rejects: missing required field", () => {
-		// Missing syntheticItems
-		expect(parseEnhancementResult(JSON.stringify({ slotFills: {} }))).toBeNull()
-
-		// JSON Schema also requires it
-		expect(enhancementResultJsonSchema.required).toContain("syntheticItems")
-	})
-
-	test("JSON Schema rejects what arktype rejects: wrong slot fill value type", () => {
-		const bad = { slotFills: { "item-1": { slot: 42 } }, syntheticItems: [] }
-
-		// arktype rejects it
-		expect(parseEnhancementResult(JSON.stringify(bad))).toBeNull()
-
-		// JSON Schema only allows string or null for slot values
-		const slotValueTypes =
-			enhancementResultJsonSchema.properties.slotFills.additionalProperties
-				.additionalProperties.type
-		expect(slotValueTypes).toContain("string")
-		expect(slotValueTypes).toContain("null")
-		expect(slotValueTypes).not.toContain("number")
-	})
-})
--- a/apps/aelis-backend/src/enhancement/schema.ts
+++ b/apps/aelis-backend/src/enhancement/schema.ts
@@ -1,89 +0,0 @@
-import { type } from "arktype"
-
-const SyntheticItem = type({
-	id: "string",
-	type: "string",
-	text: "string",
-})
-
-const EnhancementResult = type({
-	slotFills: "Record<string, Record<string, string | null>>",
-	syntheticItems: SyntheticItem.array(),
-})
-
-export type SyntheticItem = typeof SyntheticItem.infer
-export type EnhancementResult = typeof EnhancementResult.infer
-
-/**
- * JSON Schema passed to OpenRouter's structured output.
- * OpenRouter doesn't support arktype, so this is maintained separately.
- *
- * ⚠️  Must stay in sync with EnhancementResult above.
- * If you add/remove fields, update both schemas.
- */
-export const enhancementResultJsonSchema = {
-	type: "object",
-	properties: {
-		slotFills: {
-			type: "object",
-			description:
-				"Map of feed item ID to an object of slot name to filled text content. Use null for slots that cannot be meaningfully filled.",
-			additionalProperties: {
-				type: "object",
-				additionalProperties: {
-					type: ["string", "null"],
-				},
-			},
-		},
-		syntheticItems: {
-			type: "array",
-			description:
-				"New feed items to inject (briefings, nudges, cross-source insights). Keep these short and actionable.",
-			items: {
-				type: "object",
-				properties: {
-					id: {
-						type: "string",
-						description: "Unique ID, e.g. 'briefing-morning'",
-					},
-					type: {
-						type: "string",
-						description: "One of: 'briefing', 'nudge', 'insight'",
-					},
-					text: {
-						type: "string",
-						description: "Display text, 1-3 sentences",
-					},
-				},
-				required: ["id", "type", "text"],
-				additionalProperties: false,
-			},
-		},
-	},
-	required: ["slotFills", "syntheticItems"],
-	additionalProperties: false,
-} as const
-
-/**
- * Parses a JSON string into an EnhancementResult.
- * Returns null if the input is malformed.
- */
-export function parseEnhancementResult(json: string): EnhancementResult | null {
-	let parsed: unknown
-	try {
-		parsed = JSON.parse(json)
-	} catch {
-		return null
-	}
-
-	const result = EnhancementResult(parsed)
-	if (result instanceof type.errors) {
-		return null
-	}
-
-	return result
-}
-
-export function emptyEnhancementResult(): EnhancementResult {
-	return { slotFills: {}, syntheticItems: [] }
-}
--- a/apps/aelis-backend/src/server.ts
+++ b/apps/aelis-backend/src/server.ts
@@ -1,67 +0,0 @@
-import { LocationSource } from "@aelis/source-location"
-import { Hono } from "hono"
-
-import { registerAuthHandlers } from "./auth/http.ts"
-import { mockAuthSessionMiddleware, requireSession } from "./auth/session-middleware.ts"
-import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
-import { createLlmClient } from "./enhancement/llm-client.ts"
-import { registerFeedHttpHandlers } from "./engine/http.ts"
-import { registerLocationHttpHandlers } from "./location/http.ts"
-import { UserSessionManager } from "./session/index.ts"
-import { WeatherSourceProvider } from "./weather/provider.ts"
-
-function main() {
-	const openrouterApiKey = process.env.OPENROUTER_API_KEY
-	const feedEnhancer = openrouterApiKey
-		? createFeedEnhancer({
-				client: createLlmClient({
-					apiKey: openrouterApiKey,
-					model: process.env.OPENROUTER_MODEL || undefined,
-				}),
-			})
-		: null
-	if (!feedEnhancer) {
-		console.warn("[enhancement] OPENROUTER_API_KEY not set — feed enhancement disabled")
-	}
-
-	const sessionManager = new UserSessionManager({
-		providers: [
-			() => new LocationSource(),
-			new WeatherSourceProvider({
-				credentials: {
-					privateKey: process.env.WEATHERKIT_PRIVATE_KEY!,
-					keyId: process.env.WEATHERKIT_KEY_ID!,
-					teamId: process.env.WEATHERKIT_TEAM_ID!,
-					serviceId: process.env.WEATHERKIT_SERVICE_ID!,
-				},
-			}),
-		],
-		feedEnhancer,
-	})
-
-	const app = new Hono()
-
-	app.get("/health", (c) => c.json({ status: "ok" }))
-
-	const isDev = process.env.NODE_ENV !== "production"
-	const authSessionMiddleware = isDev ? mockAuthSessionMiddleware("dev-user") : requireSession
-
-	if (!isDev) {
-		registerAuthHandlers(app)
-	}
-
-	registerFeedHttpHandlers(app, {
-		sessionManager,
-		authSessionMiddleware,
-	})
-	registerLocationHttpHandlers(app, { sessionManager })
-
-	return app
-}
-
-const app = main()
-
-export default {
-	port: 3000,
-	fetch: app.fetch,
-}
--- a/apps/aelis-backend/src/session/user-session.test.ts
+++ b/apps/aelis-backend/src/session/user-session.test.ts
@@ -1,210 +0,0 @@
-import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
-
-import { LocationSource } from "@aelis/source-location"
-import { describe, expect, test } from "bun:test"
-
-import { UserSession } from "./user-session.ts"
-
-function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
-	return {
-		id,
-		async listActions(): Promise<Record<string, ActionDefinition>> {
-			return {}
-		},
-		async executeAction(): Promise<unknown> {
-			return undefined
-		},
-		async fetchContext(): Promise<readonly ContextEntry[] | null> {
-			return null
-		},
-		async fetchItems() {
-			return items
-		},
-	}
-}
-
-describe("UserSession", () => {
-	test("registers sources and starts engine", async () => {
-		const session = new UserSession([createStubSource("test-a"), createStubSource("test-b")])
-
-		const result = await session.engine.refresh()
-
-		expect(result.errors).toHaveLength(0)
-	})
-
-	test("getSource returns registered source", () => {
-		const location = new LocationSource()
-		const session = new UserSession([location])
-
-		const result = session.getSource<LocationSource>("aelis.location")
-
-		expect(result).toBe(location)
-	})
-
-	test("getSource returns undefined for unknown source", () => {
-		const session = new UserSession([createStubSource("test")])
-
-		expect(session.getSource("unknown")).toBeUndefined()
-	})
-
-	test("destroy stops engine and clears sources", () => {
-		const session = new UserSession([createStubSource("test")])
-
-		session.destroy()
-
-		expect(session.getSource("test")).toBeUndefined()
-	})
-
-	test("engine.executeAction routes to correct source", async () => {
-		const location = new LocationSource()
-		const session = new UserSession([location])
-
-		await session.engine.executeAction("aelis.location", "update-location", {
-			lat: 51.5,
-			lng: -0.1,
-			accuracy: 10,
-			timestamp: new Date(),
-		})
-
-		expect(location.lastLocation).toBeDefined()
-		expect(location.lastLocation!.lat).toBe(51.5)
-	})
-})
-
-describe("UserSession.feed", () => {
-	test("returns feed items without enhancer", async () => {
-		const items: FeedItem[] = [
-			{
-				id: "item-1",
-				type: "test",
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { value: 42 },
-			},
-		]
-		const session = new UserSession([createStubSource("test", items)])
-
-		const result = await session.feed()
-
-		expect(result.items).toHaveLength(1)
-		expect(result.items[0]!.id).toBe("item-1")
-	})
-
-	test("returns enhanced items when enhancer is provided", async () => {
-		const items: FeedItem[] = [
-			{
-				id: "item-1",
-				type: "test",
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { value: 42 },
-			},
-		]
-		const enhancer = async (feedItems: FeedItem[]) =>
-			feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
-
-		const session = new UserSession([createStubSource("test", items)], enhancer)
-
-		const result = await session.feed()
-
-		expect(result.items).toHaveLength(1)
-		expect(result.items[0]!.data.enhanced).toBe(true)
-	})
-
-	test("caches enhanced items on subsequent calls", async () => {
-		const items: FeedItem[] = [
-			{
-				id: "item-1",
-				type: "test",
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { value: 42 },
-			},
-		]
-		let enhancerCallCount = 0
-		const enhancer = async (feedItems: FeedItem[]) => {
-			enhancerCallCount++
-			return feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
-		}
-
-		const session = new UserSession([createStubSource("test", items)], enhancer)
-
-		const result1 = await session.feed()
-		expect(result1.items[0]!.data.enhanced).toBe(true)
-		expect(enhancerCallCount).toBe(1)
-
-		const result2 = await session.feed()
-		expect(result2.items[0]!.data.enhanced).toBe(true)
-		expect(enhancerCallCount).toBe(1)
-	})
-
-	test("re-enhances after engine refresh with new data", async () => {
-		let currentItems: FeedItem[] = [
-			{
-				id: "item-1",
-				type: "test",
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { version: 1 },
-			},
-		]
-		const source = createStubSource("test", currentItems)
-		// Make fetchItems dynamic so refresh returns new data
-		source.fetchItems = async () => currentItems
-
-		const enhancedVersions: number[] = []
-		const enhancer = async (feedItems: FeedItem[]) => {
-			const version = feedItems[0]!.data.version as number
-			enhancedVersions.push(version)
-			return feedItems.map((item) => ({
-				...item,
-				data: { ...item.data, enhanced: true },
-			}))
-		}
-
-		const session = new UserSession([source], enhancer)
-
-		// First feed triggers refresh + enhancement
-		const result1 = await session.feed()
-		expect(result1.items[0]!.data.version).toBe(1)
-		expect(result1.items[0]!.data.enhanced).toBe(true)
-
-		// Update source data and trigger engine refresh
-		currentItems = [
-			{
-				id: "item-1",
-				type: "test",
-				timestamp: new Date("2025-01-02T00:00:00.000Z"),
-				data: { version: 2 },
-			},
-		]
-		await session.engine.refresh()
-
-		// Wait for subscriber-triggered background enhancement
-		await new Promise((resolve) => setTimeout(resolve, 10))
-
-		// feed() should now serve re-enhanced items with version 2
-		const result2 = await session.feed()
-		expect(result2.items[0]!.data.version).toBe(2)
-		expect(result2.items[0]!.data.enhanced).toBe(true)
-		expect(enhancedVersions).toEqual([1, 2])
-	})
-
-	test("falls back to unenhanced items when enhancer throws", async () => {
-		const items: FeedItem[] = [
-			{
-				id: "item-1",
-				type: "test",
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { value: 42 },
-			},
-		]
-		const enhancer = async () => {
-			throw new Error("enhancement exploded")
-		}
-
-		const session = new UserSession([createStubSource("test", items)], enhancer)
-
-		const result = await session.feed()
-
-		expect(result.items).toHaveLength(1)
-		expect(result.items[0]!.id).toBe("item-1")
-		expect(result.items[0]!.data.value).toBe(42)
-	})
-})
--- a/apps/aelis-backend/src/session/user-session.ts
+++ b/apps/aelis-backend/src/session/user-session.ts
@@ -1,104 +0,0 @@
-import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aelis/core"
-
-import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
-
-export class UserSession {
-	readonly engine: FeedEngine
-	private sources = new Map<string, FeedSource>()
-	private readonly enhancer: FeedEnhancer | null
-	private enhancedItems: FeedItem[] | null = null
-	/** The FeedResult that enhancedItems was derived from. */
-	private enhancedSource: FeedResult | null = null
-	private enhancingPromise: Promise<void> | null = null
-	private unsubscribe: (() => void) | null = null
-
-	constructor(sources: FeedSource[], enhancer?: FeedEnhancer | null) {
-		this.engine = new FeedEngine()
-		this.enhancer = enhancer ?? null
-		for (const source of sources) {
-			this.sources.set(source.id, source)
-			this.engine.register(source)
-		}
-
-		if (this.enhancer) {
-			this.unsubscribe = this.engine.subscribe((result) => {
-				this.invalidateEnhancement()
-				this.runEnhancement(result)
-			})
-		}
-
-		this.engine.start()
-	}
-
-	/**
-	 * Returns the current feed, refreshing if the engine cache expired.
-	 * Enhancement runs eagerly on engine updates; this method awaits
-	 * any in-flight enhancement or triggers one if needed.
-	 */
-	async feed(): Promise<FeedResult> {
-		const cached = this.engine.lastFeed()
-		const result = cached ?? (await this.engine.refresh())
-
-		if (!this.enhancer) {
-			return result
-		}
-
-		// Wait for any in-flight background enhancement to finish
-		if (this.enhancingPromise) {
-			await this.enhancingPromise
-		}
-
-		// Serve cached enhancement only if it matches the current engine result
-		if (this.enhancedItems && this.enhancedSource === result) {
-			return { ...result, items: this.enhancedItems }
-		}
-
-		// Stale or missing — re-enhance
-		await this.runEnhancement(result)
-
-		if (this.enhancedItems) {
-			return { ...result, items: this.enhancedItems }
-		}
-
-		return result
-	}
-
-	getSource<T extends FeedSource>(sourceId: string): T | undefined {
-		return this.sources.get(sourceId) as T | undefined
-	}
-
-	destroy(): void {
-		this.unsubscribe?.()
-		this.unsubscribe = null
-		this.engine.stop()
-		this.sources.clear()
-		this.invalidateEnhancement()
-		this.enhancingPromise = null
-	}
-
-	private invalidateEnhancement(): void {
-		this.enhancedItems = null
-		this.enhancedSource = null
-	}
-
-	private runEnhancement(result: FeedResult): Promise<void> {
-		const promise = this.enhance(result)
-		this.enhancingPromise = promise
-		promise.finally(() => {
-			if (this.enhancingPromise === promise) {
-				this.enhancingPromise = null
-			}
-		})
-		return promise
-	}
-
-	private async enhance(result: FeedResult): Promise<void> {
-		try {
-			this.enhancedItems = await this.enhancer!(result.items)
-			this.enhancedSource = result
-		} catch (err) {
-			console.error("[enhancement] Unexpected error:", err)
-			this.invalidateEnhancement()
-		}
-	}
-}
--- a/apps/aelis-client/src/app/_layout.tsx
+++ b/apps/aelis-client/src/app/_layout.tsx
@@ -1,45 +0,0 @@
-import "react-native-reanimated"
-import { Stack } from "expo-router"
-import { StatusBar } from "expo-status-bar"
-import { useColorScheme } from "react-native"
-import tw, { useDeviceContext } from "twrnc"
-
-export default function RootLayout() {
-	useDeviceContext(tw)
-	const colorScheme = useColorScheme()
-	const headerBg = colorScheme === "dark" ? "#1c1917" : "#f5f5f4"
-	const headerTint = colorScheme === "dark" ? "#e7e5e4" : "#1c1917"
-
-	return (
-		<>
-			<Stack
-				screenOptions={{
-					headerShown: false,
-					contentStyle: { backgroundColor: headerBg },
-				}}
-			>
-				<Stack.Screen
-					name="components/index"
-					options={{
-						headerShown: true,
-						title: "Components",
-						headerStyle: { backgroundColor: headerBg },
-						headerTintColor: headerTint,
-						headerShadowVisible: false,
-					}}
-				/>
-				<Stack.Screen
-					name="components/[name]"
-					options={{
-						headerShown: true,
-						title: "",
-						headerStyle: { backgroundColor: headerBg },
-						headerTintColor: headerTint,
-						headerShadowVisible: false,
-					}}
-				/>
-			</Stack>
-			<StatusBar style="auto" />
-		</>
-	)
-}
--- a/apps/aelis-client/src/app/components/[name].tsx
+++ b/apps/aelis-client/src/app/components/[name].tsx
@@ -1,48 +0,0 @@
-import { useLocalSearchParams, useNavigation } from "expo-router"
-import { useEffect } from "react"
-import { ScrollView, View } from "react-native"
-import tw from "twrnc"
-
-import { buttonShowcase } from "@/components/ui/button.showcase"
-import { feedCardShowcase } from "@/components/ui/feed-card.showcase"
-import { monospaceTextShowcase } from "@/components/ui/monospace-text.showcase"
-import { sansSerifTextShowcase } from "@/components/ui/sans-serif-text.showcase"
-import { serifTextShowcase } from "@/components/ui/serif-text.showcase"
-import { type Showcase } from "@/components/showcase"
-import { SansSerifText } from "@/components/ui/sans-serif-text"
-
-const showcases: Record<string, Showcase> = {
-	button: buttonShowcase,
-	"feed-card": feedCardShowcase,
-	"serif-text": serifTextShowcase,
-	"sans-serif-text": sansSerifTextShowcase,
-	"monospace-text": monospaceTextShowcase,
-}
-
-export default function ComponentDetailScreen() {
-	const { name } = useLocalSearchParams<{ name: string }>()
-	const navigation = useNavigation()
-	const showcase = showcases[name]
-
-	useEffect(() => {
-		if (showcase) {
-			navigation.setOptions({ title: showcase.title })
-		}
-	}, [navigation, showcase])
-
-	if (!showcase) {
-		return (
-			<View style={tw`bg-stone-100 dark:bg-stone-900 flex-1 items-center justify-center`}>
-				<SansSerifText>Component not found</SansSerifText>
-			</View>
-		)
-	}
-
-	const ShowcaseComponent = showcase.component
-
-	return (
-		<ScrollView style={tw`bg-stone-100 dark:bg-stone-900 flex-1`} contentContainerStyle={tw`px-5 pb-10 pt-4 gap-6`}>
-			<ShowcaseComponent />
-		</ScrollView>
-	)
-}
--- a/apps/aelis-client/src/app/components/index.tsx
+++ b/apps/aelis-client/src/app/components/index.tsx
@@ -1,37 +0,0 @@
-import { Link } from "expo-router"
-import { FlatList, Pressable, View } from "react-native"
-import tw from "twrnc"
-
-import { SansSerifText } from "@/components/ui/sans-serif-text"
-
-const components = [
-	{ name: "button", label: "Button" },
-	{ name: "feed-card", label: "FeedCard" },
-	{ name: "serif-text", label: "SerifText" },
-	{ name: "sans-serif-text", label: "SansSerifText" },
-	{ name: "monospace-text", label: "MonospaceText" },
-] as const
-
-export default function ComponentsScreen() {
-	return (
-		<View style={tw`flex-1`}>
-			<View style={tw`mx-4 mt-4 rounded-xl border border-stone-200 dark:border-stone-800 overflow-hidden`}>
-				<FlatList
-					data={components}
-					keyExtractor={(item) => item.name}
-					scrollEnabled={false}
-					ItemSeparatorComponent={() => (
-						<View style={tw`border-b border-stone-200 dark:border-stone-800`} />
-					)}
-					renderItem={({ item }) => (
-						<Link href={`/components/${item.name}`} asChild>
-							<Pressable style={tw`px-4 py-3`}>
-								<SansSerifText style={tw`text-base`}>{item.label}</SansSerifText>
-							</Pressable>
-						</Link>
-					)}
-				/>
-			</View>
-		</View>
-	)
-}
--- a/apps/aelis-client/src/app/index.tsx
+++ b/apps/aelis-client/src/app/index.tsx
@@ -1,28 +0,0 @@
-import { Link } from "expo-router"
-import { Pressable } from "react-native"
-import { SafeAreaView } from "react-native-safe-area-context"
-import tw from "twrnc"
-
-import { Button } from "@/components/ui/button"
-import { FeedCard } from "@/components/ui/feed-card"
-import { MonospaceText } from "@/components/ui/monospace-text"
-import { SansSerifText } from "@/components/ui/sans-serif-text"
-import { SerifText } from "@/components/ui/serif-text"
-
-export default function HomeScreen() {
-	return (
-		<SafeAreaView style={tw`bg-stone-100 dark:bg-stone-900 flex-1 px-5 pt-6 gap-4`}>
-			<FeedCard>
-				<SerifText style={tw`text-4xl`}>Hello world asdsadsa</SerifText>
-				<SansSerifText style={tw`text-4xl font-bold`}>Hello world</SansSerifText>
-				<MonospaceText style={tw`text-4xl`}>asdjsakljdl</MonospaceText>
-				<Button style={tw`self-start`} label="Test" />
-			</FeedCard>
-			<Link href="/components" asChild>
-				<Pressable>
-					<SansSerifText style={tw`text-teal-600`}>View component library</SansSerifText>
-				</Pressable>
-			</Link>
-		</SafeAreaView>
-	)
-}
--- a/apps/aelis-client/src/components/showcase.tsx
+++ b/apps/aelis-client/src/components/showcase.tsx
@@ -1,18 +0,0 @@
-import { View } from "react-native"
-import tw from "twrnc"
-
-import { SansSerifText } from "./ui/sans-serif-text"
-
-export type Showcase = {
-	title: string
-	component: React.ComponentType
-}
-
-export function Section({ title, children }: { title: string; children: React.ReactNode }) {
-	return (
-		<View style={tw`gap-3`}>
-			<SansSerifText style={tw`text-sm text-stone-500 dark:text-stone-400`}>{title}</SansSerifText>
-			{children}
-		</View>
-	)
-}
--- a/apps/aelis-client/src/components/ui/button.showcase.tsx
+++ b/apps/aelis-client/src/components/ui/button.showcase.tsx
@@ -1,43 +0,0 @@
-import Feather from "@expo/vector-icons/Feather"
-import { View } from "react-native"
-import tw from "twrnc"
-
-import { Button } from "./button"
-import { type Showcase, Section } from "../showcase"
-
-function ButtonShowcase() {
-	return (
-		<View style={tw`gap-6`}>
-			<Section title="Default">
-				<Button style={tw`self-start`} label="Press me" />
-			</Section>
-			<Section title="Leading icon">
-				<Button
-					style={tw`self-start`}
-					label="Add item"
-					leadingIcon={<Feather name="plus" size={18} color="#e7e5e4" />}
-				/>
-			</Section>
-			<Section title="Trailing icon">
-				<Button
-					style={tw`self-start`}
-					label="Next"
-					trailingIcon={<Feather name="arrow-right" size={18} color="#e7e5e4" />}
-				/>
-			</Section>
-			<Section title="Both icons">
-				<Button
-					style={tw`self-start`}
-					label="Download"
-					leadingIcon={<Feather name="download" size={18} color="#e7e5e4" />}
-					trailingIcon={<Feather name="chevron-down" size={18} color="#e7e5e4" />}
-				/>
-			</Section>
-		</View>
-	)
-}
-
-export const buttonShowcase: Showcase = {
-	title: "Button",
-	component: ButtonShowcase,
-}
--- a/apps/aelis-client/src/components/ui/button.tsx
+++ b/apps/aelis-client/src/components/ui/button.tsx
@@ -1,30 +0,0 @@
-import { type PressableProps, Pressable, View } from "react-native"
-import tw from "twrnc"
-
-import { SansSerifText } from "./sans-serif-text"
-
-type ButtonProps = Omit<PressableProps, "children"> & {
-	label: string
-	leadingIcon?: React.ReactNode
-	trailingIcon?: React.ReactNode
-}
-
-export function Button({ style, label, leadingIcon, trailingIcon, ...props }: ButtonProps) {
-	const hasIcons = leadingIcon != null || trailingIcon != null
-
-	const textElement = <SansSerifText style={tw`text-stone-200 font-medium`}>{label}</SansSerifText>
-
-	return (
-		<Pressable style={[tw`rounded-full bg-teal-600 px-4 py-3 w-fit`, style]} {...props}>
-			{hasIcons ? (
-				<View style={tw`flex-row items-center gap-1.5`}>
-					{leadingIcon}
-					{textElement}
-					{trailingIcon}
-				</View>
-			) : (
-				textElement
-			)}
-		</Pressable>
-	)
-}
--- a/apps/aelis-client/src/components/ui/feed-card.showcase.tsx
+++ b/apps/aelis-client/src/components/ui/feed-card.showcase.tsx
@@ -1,32 +0,0 @@
-import { View } from "react-native"
-import tw from "twrnc"
-
-import { Button } from "./button"
-import { FeedCard } from "./feed-card"
-import { SansSerifText } from "./sans-serif-text"
-import { SerifText } from "./serif-text"
-import { type Showcase, Section } from "../showcase"
-
-function FeedCardShowcase() {
-	return (
-		<View style={tw`gap-6`}>
-			<Section title="Default">
-				<FeedCard style={tw`p-4`}>
-					<SansSerifText>Card content goes here</SansSerifText>
-				</FeedCard>
-			</Section>
-			<Section title="With mixed content">
-				<FeedCard style={tw`p-4 gap-2`}>
-					<SerifText style={tw`text-xl`}>Title</SerifText>
-					<SansSerifText>Body text inside a feed card.</SansSerifText>
-					<Button style={tw`self-start mt-2`} label="Action" />
-				</FeedCard>
-			</Section>
-		</View>
-	)
-}
-
-export const feedCardShowcase: Showcase = {
-	title: "FeedCard",
-	component: FeedCardShowcase,
-}
--- a/apps/aelis-client/src/components/ui/feed-card.tsx
+++ b/apps/aelis-client/src/components/ui/feed-card.tsx
@@ -1,6 +0,0 @@
-import { View, type ViewProps } from "react-native"
-import tw from "twrnc"
-
-export function FeedCard({ style, ...props }: ViewProps) {
-	return <View style={[tw`border border-stone-200 dark:border-stone-800 rounded-lg`, style]} {...props} />
-}
--- a/apps/aelis-client/src/components/ui/monospace-text.showcase.tsx
+++ b/apps/aelis-client/src/components/ui/monospace-text.showcase.tsx
@@ -1,31 +0,0 @@
-import { View } from "react-native"
-import tw from "twrnc"
-
-import { MonospaceText } from "./monospace-text"
-import { type Showcase, Section } from "../showcase"
-
-function MonospaceTextShowcase() {
-	return (
-		<View style={tw`gap-6`}>
-			<Section title="Sizes">
-				<View style={tw`gap-2`}>
-					<MonospaceText style={tw`text-sm`}>Small monospace text</MonospaceText>
-					<MonospaceText style={tw`text-base`}>Base monospace text</MonospaceText>
-					<MonospaceText style={tw`text-xl`}>Extra large monospace text</MonospaceText>
-					<MonospaceText style={tw`text-3xl`}>3XL monospace text</MonospaceText>
-				</View>
-			</Section>
-			<Section title="Code-like usage">
-				<View style={tw`bg-stone-200 dark:bg-stone-800 rounded-lg p-3`}>
-					<MonospaceText style={tw`text-sm`}>{"const x = 42;"}</MonospaceText>
-					<MonospaceText style={tw`text-sm`}>{"console.log(x);"}</MonospaceText>
-				</View>
-			</Section>
-		</View>
-	)
-}
-
-export const monospaceTextShowcase: Showcase = {
-	title: "MonospaceText",
-	component: MonospaceTextShowcase,
-}
--- a/apps/aelis-client/src/components/ui/monospace-text.tsx
+++ b/apps/aelis-client/src/components/ui/monospace-text.tsx
@@ -1,10 +0,0 @@
-import { Text, type TextProps } from "react-native"
-import tw from "twrnc"
-
-export function MonospaceText({ children, style, ...props }: TextProps) {
-	return (
-		<Text style={[tw`text-stone-800 dark:text-stone-200`, { fontFamily: "Menlo" }, style]} {...props}>
-			{children}
-		</Text>
-	)
-}
--- a/apps/aelis-client/src/components/ui/sans-serif-text.showcase.tsx
+++ b/apps/aelis-client/src/components/ui/sans-serif-text.showcase.tsx
@@ -1,34 +0,0 @@
-import { View } from "react-native"
-import tw from "twrnc"
-
-import { SansSerifText } from "./sans-serif-text"
-import { type Showcase, Section } from "../showcase"
-
-function SansSerifTextShowcase() {
-	return (
-		<View style={tw`gap-6`}>
-			<Section title="Sizes">
-				<View style={tw`gap-2`}>
-					<SansSerifText style={tw`text-sm`}>Small sans-serif text</SansSerifText>
-					<SansSerifText style={tw`text-base`}>Base sans-serif text</SansSerifText>
-					<SansSerifText style={tw`text-xl`}>Extra large sans-serif text</SansSerifText>
-					<SansSerifText style={tw`text-3xl`}>3XL sans-serif text</SansSerifText>
-				</View>
-			</Section>
-			<Section title="Weights">
-				<View style={tw`gap-2`}>
-					<SansSerifText style={tw`font-light`}>Light weight</SansSerifText>
-					<SansSerifText style={tw`font-normal`}>Normal weight</SansSerifText>
-					<SansSerifText style={tw`font-medium`}>Medium weight</SansSerifText>
-					<SansSerifText style={tw`font-semibold`}>Semibold weight</SansSerifText>
-					<SansSerifText style={tw`font-bold`}>Bold weight</SansSerifText>
-				</View>
-			</Section>
-		</View>
-	)
-}
-
-export const sansSerifTextShowcase: Showcase = {
-	title: "SansSerifText",
-	component: SansSerifTextShowcase,
-}
--- a/apps/aelis-client/src/components/ui/sans-serif-text.tsx
+++ b/apps/aelis-client/src/components/ui/sans-serif-text.tsx
@@ -1,10 +0,0 @@
-import { Text, type TextProps } from "react-native"
-import tw from "twrnc"
-
-export function SansSerifText({ children, style, ...props }: TextProps) {
-	return (
-		<Text style={[tw`text-stone-800 dark:text-stone-200`, { fontFamily: "Inter" }, style]} {...props}>
-			{children}
-		</Text>
-	)
-}
--- a/apps/aelis-client/src/components/ui/serif-text.showcase.tsx
+++ b/apps/aelis-client/src/components/ui/serif-text.showcase.tsx
@@ -1,25 +0,0 @@
-import { View } from "react-native"
-import tw from "twrnc"
-
-import { SerifText } from "./serif-text"
-import { type Showcase, Section } from "../showcase"
-
-function SerifTextShowcase() {
-	return (
-		<View style={tw`gap-6`}>
-			<Section title="Sizes">
-				<View style={tw`gap-2`}>
-					<SerifText style={tw`text-sm`}>Small serif text</SerifText>
-					<SerifText style={tw`text-base`}>Base serif text</SerifText>
-					<SerifText style={tw`text-xl`}>Extra large serif text</SerifText>
-					<SerifText style={tw`text-3xl`}>3XL serif text</SerifText>
-				</View>
-			</Section>
-		</View>
-	)
-}
-
-export const serifTextShowcase: Showcase = {
-	title: "SerifText",
-	component: SerifTextShowcase,
-}
--- a/apps/aelis-client/src/components/ui/serif-text.tsx
+++ b/apps/aelis-client/src/components/ui/serif-text.tsx
@@ -1,10 +0,0 @@
-import { Text, type TextProps } from "react-native"
-import tw from "twrnc"
-
-export function SerifText({ children, style, ...props }: TextProps) {
-	return (
-		<Text style={[tw`text-stone-800 dark:text-stone-200`, { fontFamily: "Source Serif 4" }, style]} {...props}>
-			{children}
-		</Text>
-	)
-}
--- a/apps/aelis-client/src/json-render/catalog.ts
+++ b/apps/aelis-client/src/json-render/catalog.ts
@@ -1,68 +0,0 @@
-import { defineCatalog } from "@json-render/core"
-import { schema } from "@json-render/react-native/schema"
-import { z } from "zod"
-
-export const catalog = defineCatalog(schema, {
-	components: {
-		View: {
-			props: z.object({
-				style: z.string().nullable(),
-			}),
-			slots: ["default"],
-			description:
-				"Generic layout container. The style prop accepts a twrnc class string (e.g. 'flex-row gap-2 p-4 items-center').",
-			example: { style: "flex-row gap-2 p-4" },
-		},
-		Button: {
-			props: z.object({
-				label: z.string(),
-				leadingIcon: z.string().nullable(),
-				trailingIcon: z.string().nullable(),
-			}),
-			events: ["press"],
-			slots: [],
-			description:
-				"Pressable button with a label and optional Feather icons. Icon values are Feather icon names (e.g. 'plus', 'arrow-right'). Bind on.press to trigger an action.",
-			example: { label: "Add item", leadingIcon: "plus", trailingIcon: null },
-		},
-		FeedCard: {
-			props: z.object({
-				style: z.string().nullable(),
-			}),
-			slots: ["default"],
-			description: "Bordered card container for feed content. The style prop accepts a twrnc class string.",
-			example: { style: "p-4 gap-2" },
-		},
-		SansSerifText: {
-			props: z.object({
-				text: z.string(),
-				style: z.string().nullable(),
-			}),
-			slots: [],
-			description:
-				"Sans-serif text (Inter font). The style prop accepts a twrnc class string for size, weight, color, etc.",
-			example: { text: "Hello world", style: "text-base font-medium" },
-		},
-		SerifText: {
-			props: z.object({
-				text: z.string(),
-				style: z.string().nullable(),
-			}),
-			slots: [],
-			description:
-				"Serif text (Source Serif 4 font). The style prop accepts a twrnc class string for size, color, etc.",
-			example: { text: "Heading", style: "text-xl" },
-		},
-		MonospaceText: {
-			props: z.object({
-				text: z.string(),
-				style: z.string().nullable(),
-			}),
-			slots: [],
-			description:
-				"Monospace text (Menlo font). The style prop accepts a twrnc class string for size, color, etc.",
-			example: { text: "const x = 42", style: "text-sm" },
-		},
-	},
-	actions: {},
-})
--- a/apps/aelis-client/src/json-render/index.ts
+++ b/apps/aelis-client/src/json-render/index.ts
@@ -1,2 +0,0 @@
-export { catalog } from "./catalog"
-export { registry } from "./registry"
--- a/apps/aelis-client/src/json-render/registry.tsx
+++ b/apps/aelis-client/src/json-render/registry.tsx
@@ -1,43 +0,0 @@
-import Feather from "@expo/vector-icons/Feather"
-import { defineRegistry } from "@json-render/react-native"
-import { View } from "react-native"
-import tw from "twrnc"
-
-import { Button } from "@/components/ui/button"
-import { FeedCard } from "@/components/ui/feed-card"
-import { MonospaceText } from "@/components/ui/monospace-text"
-import { SansSerifText } from "@/components/ui/sans-serif-text"
-import { SerifText } from "@/components/ui/serif-text"
-
-import { catalog } from "./catalog"
-
-function featherIcon(name: string | null | undefined) {
-	if (!name) return undefined
-	return <Feather name={name as React.ComponentProps<typeof Feather>["name"]} size={18} color="#e7e5e4" />
-}
-
-export const { registry } = defineRegistry(catalog, {
-	components: {
-		View: ({ props, children }) => <View style={props.style ? tw`${props.style}` : undefined}>{children}</View>,
-		Button: ({ props, emit }) => (
-			<Button
-				label={props.label}
-				leadingIcon={featherIcon(props.leadingIcon)}
-				trailingIcon={featherIcon(props.trailingIcon)}
-				onPress={() => emit("press")}
-			/>
-		),
-		FeedCard: ({ props, children }) => (
-			<FeedCard style={props.style ? tw`${props.style}` : undefined}>{children}</FeedCard>
-		),
-		SansSerifText: ({ props }) => (
-			<SansSerifText style={props.style ? tw`${props.style}` : undefined}>{props.text}</SansSerifText>
-		),
-		SerifText: ({ props }) => (
-			<SerifText style={props.style ? tw`${props.style}` : undefined}>{props.text}</SerifText>
-		),
-		MonospaceText: ({ props }) => (
-			<MonospaceText style={props.style ? tw`${props.style}` : undefined}>{props.text}</MonospaceText>
-		),
-	},
-})
--- a/apps/aelis-backend/.env.example
+++ b/apps/aelis-backend/.env.example
@@ -7,11 +7,6 @@ BETTER_AUTH_SECRET=
 # Base URL of the backend
 BETTER_AUTH_URL=http://localhost:3000

-# OpenRouter (LLM feed enhancement)
-OPENROUTER_API_KEY=
-# Optional: override the default model (default: openai/gpt-4.1-mini)
-# OPENROUTER_MODEL=openai/gpt-4.1-mini
-
 # Apple WeatherKit credentials
 WEATHERKIT_PRIVATE_KEY=
 WEATHERKIT_KEY_ID=
--- a/apps/aelis-backend/package.json
+++ b/apps/aelis-backend/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "@aelis/backend",
+	"name": "@aris/backend",
 	"version": "0.0.0",
 	"type": "module",
 	"main": "src/server.ts",
@@ -9,13 +9,10 @@
 		"test": "bun test src/"
 	},
 	"dependencies": {
-		"@aelis/core": "workspace:*",
-		"@aelis/source-caldav": "workspace:*",
-		"@aelis/source-google-calendar": "workspace:*",
-		"@aelis/source-location": "workspace:*",
-		"@aelis/source-tfl": "workspace:*",
-		"@aelis/source-weatherkit": "workspace:*",
-		"@openrouter/sdk": "^0.9.11",
+		"@aris/core": "workspace:*",
+		"@aris/source-location": "workspace:*",
+		"@aris/source-tfl": "workspace:*",
+		"@aris/source-weatherkit": "workspace:*",
 		"arktype": "^2.1.29",
 		"better-auth": "^1",
 		"hono": "^4",
--- a/apps/aelis-backend/src/auth/http.ts
+++ b/apps/aelis-backend/src/auth/http.ts
--- a/apps/aelis-backend/src/auth/index.ts
+++ b/apps/aelis-backend/src/auth/index.ts
--- a/apps/aelis-backend/src/auth/session-middleware.ts
+++ b/apps/aelis-backend/src/auth/session-middleware.ts
@@ -61,7 +61,7 @@ export async function getSessionFromHeaders(
 }

 /**
- * Dev/test middleware that injects a fake user and session.
+ * Test-only middleware that injects a fake user and session.
 * Pass userId to simulate an authenticated request, or omit to get 401.
 */
 export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddleware {
@@ -69,34 +69,8 @@ export function mockAuthSessionMiddleware(userId?: string): AuthSessionMiddlewar
 		if (!userId) {
 			return c.json({ error: "Unauthorized" }, 401)
 		}
-
-		const now = new Date()
-		const expiresAt = new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000)
-
-		const user: AuthUser = {
-			id: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn",
-			name: "Dev User",
-			email: "dev@aelis.local",
-			emailVerified: true,
-			image: null,
-			createdAt: now,
-			updatedAt: now,
-		}
-
-		const session: AuthSession = {
-			id: "Wt3FvBpXaQrMhD8sKjE6LcYn0gUz5iRo",
-			userId: "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn",
-			token: "Vb9CxNfRm2KwQs7TjPeA5dLhYg0UoZi4",
-			expiresAt,
-			ipAddress: "127.0.0.1",
-			userAgent: "aelis-dev",
-			createdAt: now,
-			updatedAt: now,
-		}
-
-		c.set("user", user)
-		c.set("session", session)
-
+		c.set("user", { id: userId } as AuthUser)
+		c.set("session", { id: "mock-session" } as AuthSession)
 		await next()
 	}
 }
--- a/apps/aelis-backend/src/auth/session.ts
+++ b/apps/aelis-backend/src/auth/session.ts
--- a/apps/aelis-backend/src/db.ts
+++ b/apps/aelis-backend/src/db.ts
--- a/apps/aris-backend/src/feed/http.test.ts
+++ b/apps/aris-backend/src/feed/http.test.ts
@@ -0,0 +1,140 @@
+import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aris/core"
+
+import { describe, expect, test } from "bun:test"
+import { Hono } from "hono"
+
+import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
+import { UserSessionManager } from "../session/index.ts"
+import { registerFeedHttpHandlers } from "./http.ts"
+
+interface FeedResponse {
+	items: Array<{
+		id: string
+		type: string
+		priority: number
+		timestamp: string
+		data: Record<string, unknown>
+	}>
+	errors: Array<{ sourceId: string; error: string }>
+}
+
+function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
+	return {
+		id,
+		async listActions(): Promise<Record<string, ActionDefinition>> {
+			return {}
+		},
+		async executeAction(): Promise<unknown> {
+			return undefined
+		},
+		async fetchContext(): Promise<readonly ContextEntry[] | null> {
+			return null
+		},
+		async fetchItems() {
+			return items
+		},
+	}
+}
+
+function buildTestApp(sessionManager: UserSessionManager, userId?: string) {
+	const app = new Hono()
+	registerFeedHttpHandlers(app, {
+		sessionManager,
+		authSessionMiddleware: mockAuthSessionMiddleware(userId),
+	})
+	return app
+}
+
+describe("GET /api/feed", () => {
+	test("returns 401 without auth", async () => {
+		const manager = new UserSessionManager([])
+		const app = buildTestApp(manager)
+
+		const res = await app.request("/api/feed")
+
+		expect(res.status).toBe(401)
+	})
+
+	test("returns cached feed when available", async () => {
+		const items: FeedItem[] = [
+			{
+				id: "item-1",
+				type: "test",
+				priority: 0.8,
+				timestamp: new Date("2025-01-01T00:00:00.000Z"),
+				data: { value: 42 },
+			},
+		]
+		const manager = new UserSessionManager([() => createStubSource("test", items)])
+		const app = buildTestApp(manager, "user-1")
+
+		// Prime the cache
+		const session = manager.getOrCreate("user-1")
+		await session.engine.refresh()
+		expect(session.engine.lastFeed()).not.toBeNull()
+
+		const res = await app.request("/api/feed")
+
+		expect(res.status).toBe(200)
+		const body = (await res.json()) as FeedResponse
+		expect(body.items).toHaveLength(1)
+		expect(body.items[0]!.id).toBe("item-1")
+		expect(body.items[0]!.type).toBe("test")
+		expect(body.items[0]!.priority).toBe(0.8)
+		expect(body.items[0]!.timestamp).toBe("2025-01-01T00:00:00.000Z")
+		expect(body.errors).toHaveLength(0)
+	})
+
+	test("forces refresh when no cached feed", async () => {
+		const items: FeedItem[] = [
+			{
+				id: "fresh-1",
+				type: "test",
+				priority: 0.5,
+				timestamp: new Date("2025-06-01T12:00:00.000Z"),
+				data: { fresh: true },
+			},
+		]
+		const manager = new UserSessionManager([() => createStubSource("test", items)])
+		const app = buildTestApp(manager, "user-1")
+
+		// No prior refresh — lastFeed() returns null, handler should call refresh()
+		const res = await app.request("/api/feed")
+
+		expect(res.status).toBe(200)
+		const body = (await res.json()) as FeedResponse
+		expect(body.items).toHaveLength(1)
+		expect(body.items[0]!.id).toBe("fresh-1")
+		expect(body.items[0]!.data.fresh).toBe(true)
+		expect(body.errors).toHaveLength(0)
+	})
+
+	test("serializes source errors as message strings", async () => {
+		const failingSource: FeedSource = {
+			id: "failing",
+			async listActions() {
+				return {}
+			},
+			async executeAction() {
+				return undefined
+			},
+			async fetchContext() {
+				return null
+			},
+			async fetchItems() {
+				throw new Error("connection timeout")
+			},
+		}
+		const manager = new UserSessionManager([() => failingSource])
+		const app = buildTestApp(manager, "user-1")
+
+		const res = await app.request("/api/feed")
+
+		expect(res.status).toBe(200)
+		const body = (await res.json()) as FeedResponse
+		expect(body.items).toHaveLength(0)
+		expect(body.errors).toHaveLength(1)
+		expect(body.errors[0]!.sourceId).toBe("failing")
+		expect(body.errors[0]!.error).toBe("connection timeout")
+	})
+})
--- a/apps/aris-backend/src/feed/http.ts
+++ b/apps/aris-backend/src/feed/http.ts
@@ -0,0 +1,41 @@
+import type { Context, Hono } from "hono"
+
+import { createMiddleware } from "hono/factory"
+
+import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
+import type { UserSessionManager } from "../session/index.ts"
+
+type Env = { Variables: { sessionManager: UserSessionManager } }
+
+interface FeedHttpHandlersDeps {
+	sessionManager: UserSessionManager
+	authSessionMiddleware: AuthSessionMiddleware
+}
+
+export function registerFeedHttpHandlers(
+	app: Hono,
+	{ sessionManager, authSessionMiddleware }: FeedHttpHandlersDeps,
+) {
+	const inject = createMiddleware<Env>(async (c, next) => {
+		c.set("sessionManager", sessionManager)
+		await next()
+	})
+
+	app.get("/api/feed", inject, authSessionMiddleware, handleGetFeed)
+}
+
+async function handleGetFeed(c: Context<Env>) {
+	const user = c.get("user")!
+	const sessionManager = c.get("sessionManager")
+	const session = sessionManager.getOrCreate(user.id)
+
+	const feed = session.engine.lastFeed() ?? (await session.engine.refresh())
+
+	return c.json({
+		items: feed.items,
+		errors: feed.errors.map((e) => ({
+			sourceId: e.sourceId,
+			error: e.error.message,
+		})),
+	})
+}
--- a/apps/aelis-backend/src/lib/error.ts
+++ b/apps/aelis-backend/src/lib/error.ts
--- a/apps/aelis-backend/src/location/http.ts
+++ b/apps/aelis-backend/src/location/http.ts
@@ -45,7 +45,7 @@ async function handleUpdateLocation(c: Context<Env>) {
 	const user = c.get("user")!
 	const sessionManager = c.get("sessionManager")
 	const session = sessionManager.getOrCreate(user.id)
-	await session.engine.executeAction("aelis.location", "update-location", {
+	await session.engine.executeAction("aris.location", "update-location", {
 		lat: result.lat,
 		lng: result.lng,
 		accuracy: result.accuracy,
--- a/apps/aris-backend/src/server.ts
+++ b/apps/aris-backend/src/server.ts
@@ -0,0 +1,40 @@
+import { LocationSource } from "@aris/source-location"
+import { Hono } from "hono"
+
+import { registerAuthHandlers } from "./auth/http.ts"
+import { requireSession } from "./auth/session-middleware.ts"
+import { registerFeedHttpHandlers } from "./feed/http.ts"
+import { registerLocationHttpHandlers } from "./location/http.ts"
+import { UserSessionManager } from "./session/index.ts"
+import { WeatherSourceProvider } from "./weather/provider.ts"
+
+function main() {
+	const sessionManager = new UserSessionManager([
+		() => new LocationSource(),
+		new WeatherSourceProvider({
+			credentials: {
+				privateKey: process.env.WEATHERKIT_PRIVATE_KEY!,
+				keyId: process.env.WEATHERKIT_KEY_ID!,
+				teamId: process.env.WEATHERKIT_TEAM_ID!,
+				serviceId: process.env.WEATHERKIT_SERVICE_ID!,
+			},
+		}),
+	])
+
+	const app = new Hono()
+
+	app.get("/health", (c) => c.json({ status: "ok" }))
+
+	registerAuthHandlers(app)
+	registerFeedHttpHandlers(app, { sessionManager, authSessionMiddleware: requireSession })
+	registerLocationHttpHandlers(app, { sessionManager })
+
+	return app
+}
+
+const app = main()
+
+export default {
+	port: 3000,
+	fetch: app.fetch,
+}
--- a/apps/aelis-backend/src/session/feed-source-provider.ts
+++ b/apps/aelis-backend/src/session/feed-source-provider.ts
@@ -1,4 +1,4 @@
-import type { FeedSource } from "@aelis/core"
+import type { FeedSource } from "@aris/core"

 export interface FeedSourceProvider {
 	feedSourceForUser(userId: string): FeedSource
--- a/apps/aelis-backend/src/session/index.ts
+++ b/apps/aelis-backend/src/session/index.ts
--- a/apps/aelis-backend/src/session/user-session-manager.test.ts
+++ b/apps/aelis-backend/src/session/user-session-manager.test.ts
@@ -1,6 +1,6 @@
-import type { WeatherKitClient, WeatherKitResponse } from "@aelis/source-weatherkit"
+import type { WeatherKitClient, WeatherKitResponse } from "@aris/source-weatherkit"

-import { LocationSource } from "@aelis/source-location"
+import { LocationSource } from "@aris/source-location"
 import { describe, expect, mock, test } from "bun:test"

 import { WeatherSourceProvider } from "../weather/provider.ts"
@@ -12,7 +12,7 @@ const mockWeatherClient: WeatherKitClient = {

 describe("UserSessionManager", () => {
 	test("getOrCreate creates session on first call", () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])

 		const session = manager.getOrCreate("user-1")

@@ -21,7 +21,7 @@ describe("UserSessionManager", () => {
 	})

 	test("getOrCreate returns same session for same user", () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])

 		const session1 = manager.getOrCreate("user-1")
 		const session2 = manager.getOrCreate("user-1")
@@ -30,7 +30,7 @@ describe("UserSessionManager", () => {
 	})

 	test("getOrCreate returns different sessions for different users", () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])

 		const session1 = manager.getOrCreate("user-1")
 		const session2 = manager.getOrCreate("user-2")
@@ -39,19 +39,19 @@ describe("UserSessionManager", () => {
 	})

 	test("each user gets independent source instances", () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])

 		const session1 = manager.getOrCreate("user-1")
 		const session2 = manager.getOrCreate("user-2")

-		const source1 = session1.getSource<LocationSource>("aelis.location")
-		const source2 = session2.getSource<LocationSource>("aelis.location")
+		const source1 = session1.getSource<LocationSource>("aris.location")
+		const source2 = session2.getSource<LocationSource>("aris.location")

 		expect(source1).not.toBe(source2)
 	})

 	test("remove destroys session and allows re-creation", () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])

 		const session1 = manager.getOrCreate("user-1")
 		manager.remove("user-1")
@@ -61,13 +61,13 @@ describe("UserSessionManager", () => {
 	})

 	test("remove is no-op for unknown user", () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])

 		expect(() => manager.remove("unknown")).not.toThrow()
 	})

 	test("accepts function providers", async () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])

 		const session = manager.getOrCreate("user-1")
 		const result = await session.engine.refresh()
@@ -77,29 +77,25 @@ describe("UserSessionManager", () => {

 	test("accepts object providers", () => {
 		const provider = new WeatherSourceProvider({ client: mockWeatherClient })
-		const manager = new UserSessionManager({
-			providers: [() => new LocationSource(), provider],
-		})
+		const manager = new UserSessionManager([() => new LocationSource(), provider])

 		const session = manager.getOrCreate("user-1")

-		expect(session.getSource("aelis.weather")).toBeDefined()
+		expect(session.getSource("aris.weather")).toBeDefined()
 	})

 	test("accepts mixed providers", () => {
 		const provider = new WeatherSourceProvider({ client: mockWeatherClient })
-		const manager = new UserSessionManager({
-			providers: [() => new LocationSource(), provider],
-		})
+		const manager = new UserSessionManager([() => new LocationSource(), provider])

 		const session = manager.getOrCreate("user-1")

-		expect(session.getSource("aelis.location")).toBeDefined()
-		expect(session.getSource("aelis.weather")).toBeDefined()
+		expect(session.getSource("aris.location")).toBeDefined()
+		expect(session.getSource("aris.weather")).toBeDefined()
 	})

 	test("refresh returns feed result through session", async () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])

 		const session = manager.getOrCreate("user-1")
 		const result = await session.engine.refresh()
@@ -111,28 +107,28 @@ describe("UserSessionManager", () => {
 	})

 	test("location update via executeAction works", async () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])

 		const session = manager.getOrCreate("user-1")
-		await session.engine.executeAction("aelis.location", "update-location", {
+		await session.engine.executeAction("aris.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,
 			timestamp: new Date(),
 		})

-		const source = session.getSource<LocationSource>("aelis.location")
+		const source = session.getSource<LocationSource>("aris.location")
 		expect(source?.lastLocation?.lat).toBe(51.5074)
 	})

 	test("subscribe receives updates after location push", async () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])
 		const callback = mock()

 		const session = manager.getOrCreate("user-1")
 		session.engine.subscribe(callback)

-		await session.engine.executeAction("aelis.location", "update-location", {
+		await session.engine.executeAction("aris.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,
@@ -146,7 +142,7 @@ describe("UserSessionManager", () => {
 	})

 	test("remove stops reactive updates", async () => {
-		const manager = new UserSessionManager({ providers: [() => new LocationSource()] })
+		const manager = new UserSessionManager([() => new LocationSource()])
 		const callback = mock()

 		const session = manager.getOrCreate("user-1")
@@ -156,7 +152,7 @@ describe("UserSessionManager", () => {

 		// Create new session and push location — old callback should not fire
 		const session2 = manager.getOrCreate("user-1")
-		await session2.engine.executeAction("aelis.location", "update-location", {
+		await session2.engine.executeAction("aris.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,
--- a/apps/aelis-backend/src/session/user-session-manager.ts
+++ b/apps/aelis-backend/src/session/user-session-manager.ts
@@ -1,21 +1,13 @@
-import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
 import type { FeedSourceProviderInput } from "./feed-source-provider.ts"

 import { UserSession } from "./user-session.ts"

-export interface UserSessionManagerConfig {
-	providers: FeedSourceProviderInput[]
-	feedEnhancer?: FeedEnhancer | null
-}
-
 export class UserSessionManager {
 	private sessions = new Map<string, UserSession>()
 	private readonly providers: FeedSourceProviderInput[]
-	private readonly feedEnhancer: FeedEnhancer | null

-	constructor(config: UserSessionManagerConfig) {
-		this.providers = config.providers
-		this.feedEnhancer = config.feedEnhancer ?? null
+	constructor(providers: FeedSourceProviderInput[]) {
+		this.providers = providers
 	}

 	getOrCreate(userId: string): UserSession {
@@ -24,7 +16,7 @@ export class UserSessionManager {
 			const sources = this.providers.map((p) =>
 				typeof p === "function" ? p(userId) : p.feedSourceForUser(userId),
 			)
-			session = new UserSession(sources, this.feedEnhancer)
+			session = new UserSession(sources)
 			this.sessions.set(userId, session)
 		}
 		return session
--- a/apps/aris-backend/src/session/user-session.test.ts
+++ b/apps/aris-backend/src/session/user-session.test.ts
@@ -0,0 +1,72 @@
+import type { ActionDefinition, ContextEntry, FeedSource } from "@aris/core"
+
+import { LocationSource } from "@aris/source-location"
+import { describe, expect, test } from "bun:test"
+
+import { UserSession } from "./user-session.ts"
+
+function createStubSource(id: string): FeedSource {
+	return {
+		id,
+		async listActions(): Promise<Record<string, ActionDefinition>> {
+			return {}
+		},
+		async executeAction(): Promise<unknown> {
+			return undefined
+		},
+		async fetchContext(): Promise<readonly ContextEntry[] | null> {
+			return null
+		},
+		async fetchItems() {
+			return []
+		},
+	}
+}
+
+describe("UserSession", () => {
+	test("registers sources and starts engine", async () => {
+		const session = new UserSession([createStubSource("test-a"), createStubSource("test-b")])
+
+		const result = await session.engine.refresh()
+
+		expect(result.errors).toHaveLength(0)
+	})
+
+	test("getSource returns registered source", () => {
+		const location = new LocationSource()
+		const session = new UserSession([location])
+
+		const result = session.getSource<LocationSource>("aris.location")
+
+		expect(result).toBe(location)
+	})
+
+	test("getSource returns undefined for unknown source", () => {
+		const session = new UserSession([createStubSource("test")])
+
+		expect(session.getSource("unknown")).toBeUndefined()
+	})
+
+	test("destroy stops engine and clears sources", () => {
+		const session = new UserSession([createStubSource("test")])
+
+		session.destroy()
+
+		expect(session.getSource("test")).toBeUndefined()
+	})
+
+	test("engine.executeAction routes to correct source", async () => {
+		const location = new LocationSource()
+		const session = new UserSession([location])
+
+		await session.engine.executeAction("aris.location", "update-location", {
+			lat: 51.5,
+			lng: -0.1,
+			accuracy: 10,
+			timestamp: new Date(),
+		})
+
+		expect(location.lastLocation).toBeDefined()
+		expect(location.lastLocation!.lat).toBe(51.5)
+	})
+})
--- a/apps/aris-backend/src/session/user-session.ts
+++ b/apps/aris-backend/src/session/user-session.ts
@@ -0,0 +1,24 @@
+import { FeedEngine, type FeedSource } from "@aris/core"
+
+export class UserSession {
+	readonly engine: FeedEngine
+	private sources = new Map<string, FeedSource>()
+
+	constructor(sources: FeedSource[]) {
+		this.engine = new FeedEngine()
+		for (const source of sources) {
+			this.sources.set(source.id, source)
+			this.engine.register(source)
+		}
+		this.engine.start()
+	}
+
+	getSource<T extends FeedSource>(sourceId: string): T | undefined {
+		return this.sources.get(sourceId) as T | undefined
+	}
+
+	destroy(): void {
+		this.engine.stop()
+		this.sources.clear()
+	}
+}
--- a/apps/aelis-backend/src/tfl/provider.ts
+++ b/apps/aelis-backend/src/tfl/provider.ts
@@ -1,4 +1,4 @@
-import { TflSource, type ITflApi } from "@aelis/source-tfl"
+import { TflSource, type ITflApi } from "@aris/source-tfl"

 import type { FeedSourceProvider } from "../session/feed-source-provider.ts"

--- a/apps/aelis-backend/src/weather/provider.ts
+++ b/apps/aelis-backend/src/weather/provider.ts
@@ -1,4 +1,4 @@
-import { WeatherSource, type WeatherSourceOptions } from "@aelis/source-weatherkit"
+import { WeatherSource, type WeatherSourceOptions } from "@aris/source-weatherkit"

 import type { FeedSourceProvider } from "../session/feed-source-provider.ts"

--- a/apps/aelis-backend/tsconfig.json
+++ b/apps/aelis-backend/tsconfig.json
--- a/apps/aelis-client/.gitignore
+++ b/apps/aelis-client/.gitignore
--- a/apps/aelis-client/.vscode/extensions.json
+++ b/apps/aelis-client/.vscode/extensions.json
--- a/apps/aelis-client/.vscode/settings.json
+++ b/apps/aelis-client/.vscode/settings.json
--- a/apps/aelis-client/README.md
+++ b/apps/aelis-client/README.md
--- a/apps/aelis-client/app.json
+++ b/apps/aelis-client/app.json
@@ -1,11 +1,11 @@
 {
 	"expo": {
-		"name": "Aelis",
-		"slug": "aelis-client",
+		"name": "Aris",
+		"slug": "aris-client",
 		"version": "1.0.0",
 		"orientation": "portrait",
 		"icon": "./assets/images/icon.png",
-		"scheme": "aelis",
+		"scheme": "aris",
 		"userInterfaceStyle": "automatic",
 		"newArchEnabled": true,
 		"ios": {
@@ -15,7 +15,7 @@
 				},
 				"ITSAppUsesNonExemptEncryption": false
 			},
-			"bundleIdentifier": "sh.nym.aelis"
+			"bundleIdentifier": "sh.nym.aris"
 		},
 		"android": {
 			"adaptiveIcon": {
@@ -26,7 +26,7 @@
 			},
 			"edgeToEdgeEnabled": true,
 			"predictiveBackGestureEnabled": false,
-			"package": "sh.nym.aelis"
+			"package": "sh.nym.aris"
 		},
 		"web": {
 			"output": "static",
--- a/apps/aelis-client/assets/fonts/Inter_100Thin.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_100Thin.ttf
--- a/apps/aelis-client/assets/fonts/Inter_100Thin_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_100Thin_Italic.ttf
--- a/apps/aelis-client/assets/fonts/Inter_200ExtraLight.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_200ExtraLight.ttf
--- a/apps/aelis-client/assets/fonts/Inter_200ExtraLight_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_200ExtraLight_Italic.ttf
--- a/apps/aelis-client/assets/fonts/Inter_300Light.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_300Light.ttf
--- a/apps/aelis-client/assets/fonts/Inter_300Light_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_300Light_Italic.ttf
--- a/apps/aelis-client/assets/fonts/Inter_400Regular.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_400Regular.ttf
--- a/apps/aelis-client/assets/fonts/Inter_400Regular_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_400Regular_Italic.ttf
--- a/apps/aelis-client/assets/fonts/Inter_500Medium.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_500Medium.ttf
--- a/apps/aelis-client/assets/fonts/Inter_500Medium_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_500Medium_Italic.ttf
--- a/apps/aelis-client/assets/fonts/Inter_600SemiBold.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_600SemiBold.ttf
--- a/apps/aelis-client/assets/fonts/Inter_600SemiBold_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_600SemiBold_Italic.ttf
--- a/apps/aelis-client/assets/fonts/Inter_700Bold.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_700Bold.ttf
--- a/apps/aelis-client/assets/fonts/Inter_700Bold_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_700Bold_Italic.ttf
--- a/apps/aelis-client/assets/fonts/Inter_800ExtraBold.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_800ExtraBold.ttf
--- a/apps/aelis-client/assets/fonts/Inter_800ExtraBold_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_800ExtraBold_Italic.ttf
--- a/apps/aelis-client/assets/fonts/Inter_900Black.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_900Black.ttf
--- a/apps/aelis-client/assets/fonts/Inter_900Black_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/Inter_900Black_Italic.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_200ExtraLight.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_200ExtraLight.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_300Light.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_300Light.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_300Light_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_300Light_Italic.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_400Regular.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_400Regular.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_400Regular_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_400Regular_Italic.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_500Medium.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_500Medium.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_500Medium_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_500Medium_Italic.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_600SemiBold.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_600SemiBold.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_600SemiBold_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_600SemiBold_Italic.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_700Bold.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_700Bold.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_700Bold_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_700Bold_Italic.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_800ExtraBold.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_800ExtraBold.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_900Black.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_900Black.ttf
--- a/apps/aelis-client/assets/fonts/SourceSerif4_900Black_Italic.ttf
+++ b/apps/aelis-client/assets/fonts/SourceSerif4_900Black_Italic.ttf
--- a/apps/aelis-client/assets/images/android-icon-background.png
+++ b/apps/aelis-client/assets/images/android-icon-background.png
--- a/apps/aelis-client/assets/images/android-icon-foreground.png
+++ b/apps/aelis-client/assets/images/android-icon-foreground.png
--- a/apps/aelis-client/assets/images/android-icon-monochrome.png
+++ b/apps/aelis-client/assets/images/android-icon-monochrome.png
--- a/apps/aelis-client/assets/images/favicon.png
+++ b/apps/aelis-client/assets/images/favicon.png
--- a/apps/aelis-client/assets/images/icon.png
+++ b/apps/aelis-client/assets/images/icon.png
--- a/Show More
+++ b/Show More