refactor: rename arktype schemas to match types

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

.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

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
 

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
 ```
 

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")
-	})
-})

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
-}

apps/aris-backend/package.json

@@ -1,5 +1,5 @@
 {
-	"name": "@aelis/backend",
+	"name": "@aris/backend",
 	"version": "0.0.0",
 	"type": "module",
 	"main": "src/server.ts",
@@ -9,12 +9,12 @@
 		"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:*",
+		"@aris/core": "workspace:*",
+		"@aris/source-caldav": "workspace:*",
+		"@aris/source-google-calendar": "workspace:*",
+		"@aris/source-location": "workspace:*",
+		"@aris/source-tfl": "workspace:*",
+		"@aris/source-weatherkit": "workspace:*",
 		"@openrouter/sdk": "^0.9.11",
 		"arktype": "^2.1.29",
 		"better-auth": "^1",

apps/aris-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()
 	}
 }

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

@@ -1,4 +1,4 @@
-import type { FeedItem } from "@aelis/core"
+import type { FeedItem } from "@aris/core"
 
 import type { LlmClient } from "./llm-client.ts"
 

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

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

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

@@ -1,4 +1,4 @@
-import type { FeedItem } from "@aelis/core"
+import type { FeedItem } from "@aris/core"
 
 import type { EnhancementResult } from "./schema.ts"
 

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

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

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

@@ -1,7 +1,7 @@
-import type { FeedItem } from "@aelis/core"
+import type { FeedItem } from "@aris/core"
 
-import { CalDavFeedItemType } from "@aelis/source-caldav"
-import { CalendarFeedItemType } from "@aelis/source-google-calendar"
+import { CalDavFeedItemType } from "@aris/source-caldav"
+import { CalendarFeedItemType } from "@aris/source-google-calendar"
 
 import systemPromptBase from "./prompts/system.txt"
 

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

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

apps/aris-backend/src/feed/http.test.ts

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

apps/aris-backend/src/feed/http.ts

@@ -0,0 +1,45 @@
+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 = await session.feed()
+
+	return c.json({
+		items: feed.items,
+		errors: feed.errors.map((e) => ({
+			sourceId: e.sourceId,
+			error: e.error.message,
+		})),
+	})
+}

apps/aris-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,

apps/aris-backend/src/server.ts

@@ -1,11 +1,11 @@
-import { LocationSource } from "@aelis/source-location"
+import { LocationSource } from "@aris/source-location"
 import { Hono } from "hono"
 
 import { registerAuthHandlers } from "./auth/http.ts"
-import { mockAuthSessionMiddleware, requireSession } from "./auth/session-middleware.ts"
+import { 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 { registerFeedHttpHandlers } from "./feed/http.ts"
 import { registerLocationHttpHandlers } from "./location/http.ts"
 import { UserSessionManager } from "./session/index.ts"
 import { WeatherSourceProvider } from "./weather/provider.ts"
@@ -43,16 +43,10 @@ function main() {
 
 	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)
-	}
-
+	registerAuthHandlers(app)
 	registerFeedHttpHandlers(app, {
 		sessionManager,
-		authSessionMiddleware,
+		authSessionMiddleware: requireSession,
 	})
 	registerLocationHttpHandlers(app, { sessionManager })
 

apps/aris-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

apps/aris-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"
@@ -44,8 +44,8 @@ describe("UserSessionManager", () => {
 		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)
 	})
@@ -83,7 +83,7 @@ describe("UserSessionManager", () => {
 
 		const session = manager.getOrCreate("user-1")
 
-		expect(session.getSource("aelis.weather")).toBeDefined()
+		expect(session.getSource("aris.weather")).toBeDefined()
 	})
 
 	test("accepts mixed providers", () => {
@@ -94,8 +94,8 @@ describe("UserSessionManager", () => {
 
 		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 () => {
@@ -114,14 +114,14 @@ describe("UserSessionManager", () => {
 		const manager = new UserSessionManager({ providers: [() => 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)
 	})
 
@@ -132,7 +132,7 @@ describe("UserSessionManager", () => {
 		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,
@@ -156,7 +156,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,

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

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

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

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

apps/aris-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"
 

apps/aris-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"
 

apps/aris-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",

apps/aris-client/package.json

@@ -1,5 +1,5 @@
 {
-	"name": "aelis-client",
+	"name": "aris-client",
 	"version": "1.0.0",
 	"private": true,
 	"main": "expo-router/entry",