feat(client): add Button.Icon subcomponent

Introduce Button.Icon to enforce consistent icon styling
(size, theme-aware color) instead of hardcoding Feather
props at each call site. Update showcase and json-render
registry to use it.

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

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

@@ -1,42 +0,0 @@
-name: Build waitlist website
-
-on:
-  push:
-    branches: [master]
-    paths:
-      - apps/waitlist-website/**
-      - .github/workflows/build-waitlist-website.yml
-
-  workflow_dispatch:
-
-env:
-  REGISTRY: cr.nym.sh
-  IMAGE_NAME: aelis-waitlist-website
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Log in to container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: apps/waitlist-website
-          push: true
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.github/workflows/test.yml

@@ -21,4 +21,4 @@ jobs:
         run: bun install --frozen-lockfile
 
       - name: Run tests
-        run: bun run test
+        run: bun test

apps/aelis-backend/package.json

@@ -15,7 +15,6 @@
 		"@aelis/source-location": "workspace:*",
 		"@aelis/source-tfl": "workspace:*",
 		"@aelis/source-weatherkit": "workspace:*",
-		"@nym.sh/jrx": "^0.2.0",
 		"@openrouter/sdk": "^0.9.11",
 		"arktype": "^2.1.29",
 		"better-auth": "^1",

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

@@ -1,7 +0,0 @@
-import type { FeedItemRenderer } from "@aelis/core"
-
-import { renderCalDavFeedItem } from "@aelis/source-caldav"
-
-export const CALDAV_SOURCE_ID = "aelis.caldav"
-
-export const calDavRenderer: FeedItemRenderer = renderCalDavFeedItem as FeedItemRenderer

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

@@ -1,19 +1,10 @@
-import type {
+import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
-	ActionDefinition,
-	ContextEntry,
-	FeedItem,
-	FeedItemRenderer,
-	FeedSource,
-} from "@aelis/core"
-import type { Spec } from "@json-render/core"
 
 import { contextKey } from "@aelis/core"
-import { JRX_NODE } from "@nym.sh/jrx"
 import { describe, expect, test } from "bun:test"
 import { Hono } from "hono"
 
 import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
-import { FeedRenderer } from "../session/feed-renderer.ts"
 import { UserSessionManager } from "../session/index.ts"
 import { registerFeedHttpHandlers } from "./http.ts"
 
@@ -28,17 +19,6 @@ interface FeedResponse {
 	errors: Array<{ sourceId: string; error: string }>
 }
 
-interface RenderedFeedResponse {
-	items: Array<{
-		id: string
-		type: string
-		timestamp: string
-		data: Record<string, unknown>
-		ui: Spec
-	}>
-	errors: Array<{ sourceId: string; error: string }>
-}
-
 function createStubSource(
 	id: string,
 	items: FeedItem[] = [],
@@ -84,7 +64,6 @@ describe("GET /api/feed", () => {
 		const items: FeedItem[] = [
 			{
 				id: "item-1",
-				sourceId: "test",
 				type: "test",
 				priority: 0.8,
 				timestamp: new Date("2025-01-01T00:00:00.000Z"),
@@ -117,7 +96,6 @@ describe("GET /api/feed", () => {
 		const items: FeedItem[] = [
 			{
 				id: "fresh-1",
-				sourceId: "test",
 				type: "test",
 				priority: 0.5,
 				timestamp: new Date("2025-06-01T12:00:00.000Z"),
@@ -170,168 +148,6 @@ describe("GET /api/feed", () => {
 	})
 })
 
-describe("GET /api/feed?render=json-render", () => {
-	const stubRenderer: FeedItemRenderer = (item) => ({
-		$$typeof: JRX_NODE,
-		type: "FeedCard",
-		props: {},
-		children: [
-			{
-				$$typeof: JRX_NODE,
-				type: "SansSerifText",
-				props: { content: `Rendered: ${item.data.value}` },
-				children: [],
-				key: undefined,
-				visible: undefined,
-				on: undefined,
-				repeat: undefined,
-				watch: undefined,
-			},
-		],
-		key: undefined,
-		visible: undefined,
-		on: undefined,
-		repeat: undefined,
-		watch: undefined,
-	})
-
-	const rendererProvider = {
-		feedRendererForUser: () => new FeedRenderer({ "test-source": stubRenderer }),
-	}
-
-	test("returns rendered items with ui field as Spec", async () => {
-		const items: FeedItem[] = [
-			{
-				id: "item-1",
-				sourceId: "test-source",
-				type: "renderable",
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { value: "hello" },
-			},
-		]
-		const manager = new UserSessionManager({
-			providers: [() => createStubSource("test", items)],
-			rendererProvider,
-		})
-		const app = buildTestApp(manager, "user-1")
-
-		const res = await app.request("/api/feed?render=json-render")
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as RenderedFeedResponse
-		expect(body.items).toHaveLength(1)
-		expect(body.items[0]!.id).toBe("item-1")
-		expect(body.items[0]!.ui).toBeDefined()
-		expect(body.items[0]!.ui.root).toBeDefined()
-		expect(body.items[0]!.ui.elements).toBeDefined()
-	})
-
-	test("drops items without a renderer", async () => {
-		const items: FeedItem[] = [
-			{
-				id: "renderable-1",
-				sourceId: "test-source",
-				type: "renderable",
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { value: "yes" },
-			},
-			{
-				id: "unrenderable-1",
-				sourceId: "other-source",
-				type: "no-renderer",
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { value: "no" },
-			},
-		]
-		const manager = new UserSessionManager({
-			providers: [() => createStubSource("test", items)],
-			rendererProvider,
-		})
-		const app = buildTestApp(manager, "user-1")
-
-		const res = await app.request("/api/feed?render=json-render")
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as RenderedFeedResponse
-		expect(body.items).toHaveLength(1)
-		expect(body.items[0]!.id).toBe("renderable-1")
-	})
-
-	test("returns empty items when no renderers match", async () => {
-		const items: FeedItem[] = [
-			{
-				id: "item-1",
-				sourceId: "other-source",
-				type: "no-renderer",
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { value: 42 },
-			},
-		]
-		const manager = new UserSessionManager({
-			providers: [() => createStubSource("test", items)],
-			rendererProvider,
-		})
-		const app = buildTestApp(manager, "user-1")
-
-		const res = await app.request("/api/feed?render=json-render")
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as RenderedFeedResponse
-		expect(body.items).toHaveLength(0)
-	})
-
-	test("returns 400 for unknown render format", async () => {
-		const manager = new UserSessionManager({
-			providers: [() => createStubSource("test")],
-			rendererProvider,
-		})
-		const app = buildTestApp(manager, "user-1")
-
-		const res = await app.request("/api/feed?render=unknown")
-
-		expect(res.status).toBe(400)
-		const body = (await res.json()) as { error: string }
-		expect(body.error).toContain("unknown")
-	})
-
-	test("returns 500 when renderer is not available", async () => {
-		const manager = new UserSessionManager({
-			providers: [() => createStubSource("test")],
-		})
-		const app = buildTestApp(manager, "user-1")
-
-		const res = await app.request("/api/feed?render=json-render")
-
-		expect(res.status).toBe(500)
-		const body = (await res.json()) as { error: string }
-		expect(body.error).toContain("not available")
-	})
-
-	test("without render param returns raw items (no ui field)", async () => {
-		const items: FeedItem[] = [
-			{
-				id: "item-1",
-				sourceId: "test-source",
-				type: "renderable",
-				timestamp: new Date("2025-01-01T00:00:00.000Z"),
-				data: { value: 42 },
-			},
-		]
-		const manager = new UserSessionManager({
-			providers: [() => createStubSource("test", items)],
-			rendererProvider,
-		})
-		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(1)
-		expect(body.items[0]!).not.toHaveProperty("ui")
-	})
-})
-
 describe("GET /api/context", () => {
 	const weatherKey = contextKey("aelis.weather", "weather")
 	const weatherData = { temperature: 20, condition: "Clear" }

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

@@ -1,7 +1,6 @@
 import type { Context, Hono } from "hono"
 
 import { contextKey } from "@aelis/core"
-import { render } from "@nym.sh/jrx"
 import { createMiddleware } from "hono/factory"
 
 import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
@@ -38,31 +37,6 @@ async function handleGetFeed(c: Context<Env>) {
 
 	const feed = await session.feed()
 
-	const renderParam = c.req.query("render")
-
-	if (renderParam !== undefined) {
-		if (renderParam !== "json-render") {
-			return c.json({ error: `Unknown render format: "${renderParam}"` }, 400)
-		}
-
-		if (!session.renderer) {
-			return c.json({ error: "Rendering is not available" }, 500)
-		}
-
-		const renderedItems = session.renderer.render(feed.items).map((item) => ({
-			...item,
-			ui: render(item.ui),
-		}))
-
-		return c.json({
-			items: renderedItems,
-			errors: feed.errors.map((e) => ({
-				sourceId: e.sourceId,
-				error: e.error.message,
-			})),
-		})
-	}
-
 	return c.json({
 		items: feed.items,
 		errors: feed.errors.map((e) => ({

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

@@ -9,7 +9,6 @@ import { mergeEnhancement } from "./merge.ts"
 function makeItem(overrides: Partial<FeedItem> = {}): FeedItem {
 	return {
 		id: "item-1",
-		sourceId: "test",
 		type: "test",
 		timestamp: new Date("2025-01-01T00:00:00Z"),
 		data: { value: 42 },

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

@@ -2,8 +2,6 @@ import type { FeedItem } from "@aelis/core"
 
 import type { EnhancementResult } from "./schema.ts"
 
-const ENHANCEMENT_SOURCE_ID = "aelis.enhancement"
-
 /**
  * Merges an EnhancementResult into feed items.
  *
@@ -12,11 +10,7 @@ const ENHANCEMENT_SOURCE_ID = "aelis.enhancement"
  * - Returns a new array (no mutation)
  * - Ignores fills for items/slots that don't exist
  */
-export function mergeEnhancement(
+export function mergeEnhancement(items: FeedItem[], result: EnhancementResult, currentTime: Date): FeedItem[] {
-	items: FeedItem[],
-	result: EnhancementResult,
-	currentTime: Date,
-): FeedItem[] {
 	const merged = items.map((item) => {
 		const fills = result.slotFills[item.id]
 		if (!fills || !item.slots) return item
@@ -37,7 +31,6 @@ export function mergeEnhancement(
 	for (const synthetic of result.syntheticItems) {
 		merged.push({
 			id: synthetic.id,
-			sourceId: ENHANCEMENT_SOURCE_ID,
 			type: synthetic.type,
 			timestamp: currentTime,
 			data: { text: synthetic.text },

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

@@ -7,7 +7,6 @@ import { buildPrompt, hasUnfilledSlots } from "./prompt-builder.ts"
 function makeItem(overrides: Partial<FeedItem> = {}): FeedItem {
 	return {
 		id: "item-1",
-		sourceId: "test",
 		type: "test",
 		timestamp: new Date("2025-01-01T00:00:00Z"),
 		data: { value: 42 },
@@ -61,9 +60,7 @@ describe("buildPrompt", () => {
 
 		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({
+		expect((parsed.items as Array<Record<string, unknown>>)[0]!.slots).toEqual({ insight: "Weather insight" })
-			insight: "Weather insight",
-		})
 		expect((parsed.items as Array<Record<string, unknown>>)[0]!.type).toBeUndefined()
 		expect(parsed.context).toHaveLength(0)
 	})

apps/aelis-backend/src/server.ts

@@ -3,13 +3,11 @@ import { Hono } from "hono"
 
 import { registerAuthHandlers } from "./auth/http.ts"
 import { mockAuthSessionMiddleware, requireSession } from "./auth/session-middleware.ts"
-import { CALDAV_SOURCE_ID, calDavRenderer } from "./caldav/renderer-provider.ts"
-import { registerFeedHttpHandlers } from "./engine/http.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 { FeedRenderer, UserSessionManager } from "./session/index.ts"
+import { UserSessionManager } from "./session/index.ts"
-import { TFL_SOURCE_ID, tflRenderer } from "./tfl/renderer-provider.ts"
 import { WeatherSourceProvider } from "./weather/provider.ts"
 
 function main() {
@@ -26,11 +24,6 @@ function main() {
 		console.warn("[enhancement] OPENROUTER_API_KEY not set — feed enhancement disabled")
 	}
 
-	const allRenderers = {
-		[TFL_SOURCE_ID]: tflRenderer,
-		[CALDAV_SOURCE_ID]: calDavRenderer,
-	}
-
 	const sessionManager = new UserSessionManager({
 		providers: [
 			() => new LocationSource(),
@@ -43,9 +36,6 @@ function main() {
 				},
 			}),
 		],
-		rendererProvider: {
-			feedRendererForUser: (_userId) => new FeedRenderer(allRenderers),
-		},
 		feedEnhancer,
 	})
 

apps/aelis-backend/src/session/feed-renderer.ts

@@ -1,30 +0,0 @@
-import type { FeedItem, FeedItemRenderer, RenderedFeedItem } from "@aelis/core"
-
-/**
- * Renders feed items using registered renderers.
- *
- * Constructed with a map of source ID to renderer function.
- * Items whose source has no renderer are silently dropped.
- */
-export class FeedRenderer {
-	private readonly renderers: Map<string, FeedItemRenderer>
-
-	constructor(renderers: Record<string, FeedItemRenderer>) {
-		this.renderers = new Map(Object.entries(renderers))
-	}
-
-	/**
-	 * Renders an array of feed items. Items whose sourceId has no
-	 * registered renderer are silently dropped from the result.
-	 */
-	render(items: FeedItem[]): RenderedFeedItem[] {
-		const result: RenderedFeedItem[] = []
-		for (const item of items) {
-			const renderer = this.renderers.get(item.sourceId)
-			if (renderer) {
-				result.push({ ...item, ui: renderer(item) })
-			}
-		}
-		return result
-	}
-}

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

@@ -3,7 +3,5 @@ export type {
 	FeedSourceProviderFn,
 	FeedSourceProviderInput,
 } from "./feed-source-provider.ts"
-export { FeedRenderer } from "./feed-renderer.ts"
-export type { FeedRendererProvider } from "./renderer-provider.ts"
 export { UserSession } from "./user-session.ts"
 export { UserSessionManager } from "./user-session-manager.ts"

apps/aelis-backend/src/session/renderer-provider.ts

@@ -1,5 +0,0 @@
-import type { FeedRenderer } from "./feed-renderer.ts"
-
-export interface FeedRendererProvider {
-	feedRendererForUser(userId: string): FeedRenderer
-}

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

@@ -1,24 +1,20 @@
 import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
 import type { FeedSourceProviderInput } from "./feed-source-provider.ts"
-import type { FeedRendererProvider } from "./renderer-provider.ts"
 
 import { UserSession } from "./user-session.ts"
 
 export interface UserSessionManagerConfig {
 	providers: FeedSourceProviderInput[]
-	rendererProvider?: FeedRendererProvider | null
 	feedEnhancer?: FeedEnhancer | null
 }
 
 export class UserSessionManager {
 	private sessions = new Map<string, UserSession>()
 	private readonly providers: FeedSourceProviderInput[]
-	private readonly rendererProvider: FeedRendererProvider | null
 	private readonly feedEnhancer: FeedEnhancer | null
 
 	constructor(config: UserSessionManagerConfig) {
 		this.providers = config.providers
-		this.rendererProvider = config.rendererProvider ?? null
 		this.feedEnhancer = config.feedEnhancer ?? null
 	}
 
@@ -28,11 +24,7 @@ export class UserSessionManager {
 			const sources = this.providers.map((p) =>
 				typeof p === "function" ? p(userId) : p.feedSourceForUser(userId),
 			)
-			session = new UserSession({
+			session = new UserSession(sources, this.feedEnhancer)
-				sources,
-				enhancer: this.feedEnhancer,
-				renderer: this.rendererProvider?.feedRendererForUser(userId) ?? null,
-			})
 			this.sessions.set(userId, session)
 		}
 		return session

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

@@ -1,16 +1,8 @@
-import type {
+import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@aelis/core"
-	ActionDefinition,
-	ContextEntry,
-	FeedItem,
-	FeedItemRenderer,
-	FeedSource,
-} from "@aelis/core"
 
 import { LocationSource } from "@aelis/source-location"
-import { JRX_NODE } from "@nym.sh/jrx"
 import { describe, expect, test } from "bun:test"
 
-import { FeedRenderer } from "./feed-renderer.ts"
 import { UserSession } from "./user-session.ts"
 
 function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
@@ -33,9 +25,7 @@ function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
 
 describe("UserSession", () => {
 	test("registers sources and starts engine", async () => {
-		const session = new UserSession({
+		const session = new UserSession([createStubSource("test-a"), createStubSource("test-b")])
-			sources: [createStubSource("test-a"), createStubSource("test-b")],
-		})
 
 		const result = await session.engine.refresh()
 
@@ -44,7 +34,7 @@ describe("UserSession", () => {
 
 	test("getSource returns registered source", () => {
 		const location = new LocationSource()
-		const session = new UserSession({ sources: [location] })
+		const session = new UserSession([location])
 
 		const result = session.getSource<LocationSource>("aelis.location")
 
@@ -52,13 +42,13 @@ describe("UserSession", () => {
 	})
 
 	test("getSource returns undefined for unknown source", () => {
-		const session = new UserSession({ sources: [createStubSource("test")] })
+		const session = new UserSession([createStubSource("test")])
 
 		expect(session.getSource("unknown")).toBeUndefined()
 	})
 
 	test("destroy stops engine and clears sources", () => {
-		const session = new UserSession({ sources: [createStubSource("test")] })
+		const session = new UserSession([createStubSource("test")])
 
 		session.destroy()
 
@@ -67,7 +57,7 @@ describe("UserSession", () => {
 
 	test("engine.executeAction routes to correct source", async () => {
 		const location = new LocationSource()
-		const session = new UserSession({ sources: [location] })
+		const session = new UserSession([location])
 
 		await session.engine.executeAction("aelis.location", "update-location", {
 			lat: 51.5,
@@ -86,13 +76,12 @@ describe("UserSession.feed", () => {
 		const items: FeedItem[] = [
 			{
 				id: "item-1",
-				sourceId: "test",
 				type: "test",
 				timestamp: new Date("2025-01-01T00:00:00.000Z"),
 				data: { value: 42 },
 			},
 		]
-		const session = new UserSession({ sources: [createStubSource("test", items)] })
+		const session = new UserSession([createStubSource("test", items)])
 
 		const result = await session.feed()
 
@@ -104,7 +93,6 @@ describe("UserSession.feed", () => {
 		const items: FeedItem[] = [
 			{
 				id: "item-1",
-				sourceId: "test",
 				type: "test",
 				timestamp: new Date("2025-01-01T00:00:00.000Z"),
 				data: { value: 42 },
@@ -113,7 +101,7 @@ describe("UserSession.feed", () => {
 		const enhancer = async (feedItems: FeedItem[]) =>
 			feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
 
-		const session = new UserSession({ sources: [createStubSource("test", items)], enhancer })
+		const session = new UserSession([createStubSource("test", items)], enhancer)
 
 		const result = await session.feed()
 
@@ -125,7 +113,6 @@ describe("UserSession.feed", () => {
 		const items: FeedItem[] = [
 			{
 				id: "item-1",
-				sourceId: "test",
 				type: "test",
 				timestamp: new Date("2025-01-01T00:00:00.000Z"),
 				data: { value: 42 },
@@ -137,7 +124,7 @@ describe("UserSession.feed", () => {
 			return feedItems.map((item) => ({ ...item, data: { ...item.data, enhanced: true } }))
 		}
 
-		const session = new UserSession({ sources: [createStubSource("test", items)], enhancer })
+		const session = new UserSession([createStubSource("test", items)], enhancer)
 
 		const result1 = await session.feed()
 		expect(result1.items[0]!.data.enhanced).toBe(true)
@@ -152,7 +139,6 @@ describe("UserSession.feed", () => {
 		let currentItems: FeedItem[] = [
 			{
 				id: "item-1",
-				sourceId: "test",
 				type: "test",
 				timestamp: new Date("2025-01-01T00:00:00.000Z"),
 				data: { version: 1 },
@@ -172,7 +158,7 @@ describe("UserSession.feed", () => {
 			}))
 		}
 
-		const session = new UserSession({ sources: [source], enhancer })
+		const session = new UserSession([source], enhancer)
 
 		// First feed triggers refresh + enhancement
 		const result1 = await session.feed()
@@ -183,7 +169,6 @@ describe("UserSession.feed", () => {
 		currentItems = [
 			{
 				id: "item-1",
-				sourceId: "test",
 				type: "test",
 				timestamp: new Date("2025-01-02T00:00:00.000Z"),
 				data: { version: 2 },
@@ -205,7 +190,6 @@ describe("UserSession.feed", () => {
 		const items: FeedItem[] = [
 			{
 				id: "item-1",
-				sourceId: "test",
 				type: "test",
 				timestamp: new Date("2025-01-01T00:00:00.000Z"),
 				data: { value: 42 },
@@ -215,7 +199,7 @@ describe("UserSession.feed", () => {
 			throw new Error("enhancement exploded")
 		}
 
-		const session = new UserSession({ sources: [createStubSource("test", items)], enhancer })
+		const session = new UserSession([createStubSource("test", items)], enhancer)
 
 		const result = await session.feed()
 
@@ -224,81 +208,3 @@ describe("UserSession.feed", () => {
 		expect(result.items[0]!.data.value).toBe(42)
 	})
 })
-
-describe("FeedRenderer", () => {
-	const stubRenderer: FeedItemRenderer = (item) => ({
-		$$typeof: JRX_NODE,
-		type: "FeedCard",
-		props: { content: item.data.value },
-		children: [],
-		key: undefined,
-		visible: undefined,
-		on: undefined,
-		repeat: undefined,
-		watch: undefined,
-	})
-
-	function makeItem(sourceId: string): FeedItem {
-		return {
-			id: `item-${sourceId}`,
-			sourceId,
-			type: "some-type",
-			timestamp: new Date("2025-01-01T00:00:00.000Z"),
-			data: { value: 42 },
-		}
-	}
-
-	test("renders items with matching sourceId", () => {
-		const renderer = new FeedRenderer({ "test-source": stubRenderer })
-
-		const result = renderer.render([makeItem("test-source")])
-
-		expect(result).toHaveLength(1)
-		expect(result[0]!.ui).toBeDefined()
-		expect(result[0]!.id).toBe("item-test-source")
-	})
-
-	test("drops items without a matching renderer", () => {
-		const renderer = new FeedRenderer({ "test-source": stubRenderer })
-
-		const result = renderer.render([makeItem("unknown-source")])
-
-		expect(result).toHaveLength(0)
-	})
-
-	test("filters mixed items", () => {
-		const renderer = new FeedRenderer({ "test-source": stubRenderer })
-
-		const result = renderer.render([makeItem("test-source"), makeItem("unknown-source")])
-
-		expect(result).toHaveLength(1)
-		expect(result[0]!.id).toBe("item-test-source")
-	})
-
-	test("renders empty array for empty input", () => {
-		const renderer = new FeedRenderer({ "test-source": stubRenderer })
-
-		expect(renderer.render([])).toHaveLength(0)
-	})
-
-	test("renders with no renderers registered", () => {
-		const renderer = new FeedRenderer({})
-
-		expect(renderer.render([makeItem("test-source")])).toHaveLength(0)
-	})
-})
-
-describe("UserSession.renderer", () => {
-	test("exposes renderer when provided", () => {
-		const renderer = new FeedRenderer({})
-		const session = new UserSession({ sources: [createStubSource("test")], renderer })
-
-		expect(session.renderer).toBe(renderer)
-	})
-
-	test("renderer is null when not provided", () => {
-		const session = new UserSession({ sources: [createStubSource("test")] })
-
-		expect(session.renderer).toBeNull()
-	})
-})

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

@@ -1,17 +1,9 @@
 import { FeedEngine, type FeedItem, type FeedResult, type FeedSource } from "@aelis/core"
 
 import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
-import type { FeedRenderer } from "./feed-renderer.ts"
-
-export interface UserSessionOptions {
-	sources: FeedSource[]
-	enhancer?: FeedEnhancer | null
-	renderer?: FeedRenderer | null
-}
 
 export class UserSession {
 	readonly engine: FeedEngine
-	readonly renderer: FeedRenderer | null
 	private sources = new Map<string, FeedSource>()
 	private readonly enhancer: FeedEnhancer | null
 	private enhancedItems: FeedItem[] | null = null
@@ -20,11 +12,10 @@ export class UserSession {
 	private enhancingPromise: Promise<void> | null = null
 	private unsubscribe: (() => void) | null = null
 
-	constructor(options: UserSessionOptions) {
+	constructor(sources: FeedSource[], enhancer?: FeedEnhancer | null) {
 		this.engine = new FeedEngine()
-		this.enhancer = options.enhancer ?? null
+		this.enhancer = enhancer ?? null
-		this.renderer = options.renderer ?? null
+		for (const source of sources) {
-		for (const source of options.sources) {
 			this.sources.set(source.id, source)
 			this.engine.register(source)
 		}

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

@@ -1,7 +0,0 @@
-import type { FeedItemRenderer } from "@aelis/core"
-
-import { renderTflAlert } from "@aelis/source-tfl"
-
-export const TFL_SOURCE_ID = "aelis.tfl"
-
-export const tflRenderer: FeedItemRenderer = renderTflAlert as FeedItemRenderer

bun.lock

@@ -6,7 +6,7 @@
       "name": "aelis",
       "devDependencies": {
         "@json-render/core": "^0.12.1",
-        "@nym.sh/jrx": "^0.2.0",
+        "@nym.sh/jrx": "^0.1.0",
         "@types/bun": "latest",
         "oxfmt": "^0.24.0",
         "oxlint": "^1.39.0",
@@ -25,7 +25,6 @@
         "@aelis/source-location": "workspace:*",
         "@aelis/source-tfl": "workspace:*",
         "@aelis/source-weatherkit": "workspace:*",
-        "@nym.sh/jrx": "^0.2.0",
         "@openrouter/sdk": "^0.9.11",
         "arktype": "^2.1.29",
         "better-auth": "^1",
@@ -111,14 +110,6 @@
         "vite-tsconfig-paths": "^5.1.4",
       },
     },
-    "packages/aelis-components": {
-      "name": "@aelis/components",
-      "version": "0.0.0",
-      "peerDependencies": {
-        "@json-render/core": "*",
-        "@nym.sh/jrx": "*",
-      },
-    },
     "packages/aelis-core": {
       "name": "@aelis/core",
       "version": "0.0.0",
@@ -153,7 +144,6 @@
       "name": "@aelis/source-caldav",
       "version": "0.0.0",
       "dependencies": {
-        "@aelis/components": "workspace:*",
         "@aelis/core": "workspace:*",
         "ical.js": "^2.1.0",
         "tsdav": "^2.1.7",
@@ -179,15 +169,10 @@
       "name": "@aelis/source-tfl",
       "version": "0.0.0",
       "dependencies": {
-        "@aelis/components": "workspace:*",
         "@aelis/core": "workspace:*",
         "@aelis/source-location": "workspace:*",
         "arktype": "^2.1.0",
       },
-      "peerDependencies": {
-        "@json-render/core": "*",
-        "@nym.sh/jrx": "*",
-      },
     },
     "packages/aelis-source-weatherkit": {
       "name": "@aelis/source-weatherkit",
@@ -204,8 +189,6 @@
 
     "@aelis/backend": ["@aelis/backend@workspace:apps/aelis-backend"],
 
-    "@aelis/components": ["@aelis/components@workspace:packages/aelis-components"],
-
     "@aelis/core": ["@aelis/core@workspace:packages/aelis-core"],
 
     "@aelis/data-source-weatherkit": ["@aelis/data-source-weatherkit@workspace:packages/aelis-data-source-weatherkit"],
@@ -698,7 +681,7 @@
 
     "@nolyfill/is-core-module": ["@nolyfill/is-core-module@1.0.39", "", {}, "sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA=="],
 
-    "@nym.sh/jrx": ["@nym.sh/jrx@0.2.0", "", { "peerDependencies": { "@json-render/core": ">=0.10.0" } }, "sha512-jd7Z1Q6T21366MtSUnwCFiu6Yl1AdNc9s5m6HxeUg265P+0enZCiyyxOuHsFwvpUcSEs/2DVBsqfMptdca44lA=="],
+    "@nym.sh/jrx": ["@nym.sh/jrx@0.1.0", "", { "peerDependencies": { "@json-render/core": ">=0.10.0" } }, "sha512-mu6fkAP/TI9FuP8A4WMCrcucpUtWF5xBTcETnrjOtvEED9i+7sQKuoOyhJeF6QaSuUkAA/8t3Xx3kYUjcAPFbw=="],
 
     "@oclif/core": ["@oclif/core@4.8.4", "", { "dependencies": { "ansi-escapes": "^4.3.2", "ansis": "^3.17.0", "clean-stack": "^3.0.1", "cli-spinners": "^2.9.2", "debug": "^4.4.3", "ejs": "^3.1.10", "get-package-type": "^0.1.0", "indent-string": "^4.0.0", "is-wsl": "^2.2.0", "lilconfig": "^3.1.3", "minimatch": "^10.2.4", "semver": "^7.7.3", "string-width": "^4.2.3", "supports-color": "^8", "tinyglobby": "^0.2.14", "widest-line": "^3.1.0", "wordwrap": "^1.0.0", "wrap-ansi": "^7.0.0" } }, "sha512-UTAqwXJJyRvLBvosL+1uPZYSpr8lEHgUb/EVGbPXo5WZqUIBHfJ0sR2bkBEsrj00/ar4IegKxx4YK0wn2c8SQg=="],
 

package.json

@@ -15,7 +15,7 @@
 	},
 	"devDependencies": {
 		"@json-render/core": "^0.12.1",
-		"@nym.sh/jrx": "^0.2.0",
+		"@nym.sh/jrx": "^0.1.0",
 		"@types/bun": "latest",
 		"oxfmt": "^0.24.0",
 		"oxlint": "^1.39.0"

packages/aelis-components/package.json

@@ -1,14 +0,0 @@
-{
-	"name": "@aelis/components",
-	"version": "0.0.0",
-	"type": "module",
-	"main": "src/index.ts",
-	"types": "src/index.ts",
-	"scripts": {
-		"test": "bun test ./src"
-	},
-	"peerDependencies": {
-		"@json-render/core": "*",
-		"@nym.sh/jrx": "*"
-	}
-}

packages/aelis-components/src/button.ts

@@ -1,15 +0,0 @@
-import type { JrxNode } from "@nym.sh/jrx"
-
-import { jsx } from "@nym.sh/jrx/jsx-runtime"
-
-export type ButtonProps = {
-	label: string
-	leadingIcon?: string
-	trailingIcon?: string
-	style?: string
-	children?: JrxNode | JrxNode[]
-}
-
-export function Button(props: ButtonProps): JrxNode {
-	return jsx("Button", props)
-}

packages/aelis-components/src/components.test.tsx

@@ -1,155 +0,0 @@
-/** @jsxImportSource @nym.sh/jrx */
-
-import { render } from "@nym.sh/jrx"
-import { describe, expect, test } from "bun:test"
-
-import { Button } from "./button.ts"
-import { FeedCard } from "./feed-card.ts"
-import { MonospaceText } from "./monospace-text.ts"
-import { SansSerifText } from "./sans-serif-text.ts"
-import { SerifText } from "./serif-text.ts"
-
-describe("Button", () => {
-	test("renders with label", () => {
-		const spec = render(<Button label="Press me" />)
-
-		expect(spec.root).toStartWith("button-")
-		const root = spec.elements[spec.root]!
-		expect(root.type).toBe("Button")
-		expect(root.props).toEqual({ label: "Press me" })
-	})
-
-	test("renders with icon props", () => {
-		const spec = render(<Button label="Add" leadingIcon="plus" trailingIcon="arrow-right" />)
-
-		const root = spec.elements[spec.root]!
-		expect(root.type).toBe("Button")
-		expect(root.props).toEqual({
-			label: "Add",
-			leadingIcon: "plus",
-			trailingIcon: "arrow-right",
-		})
-	})
-
-	test("passes style as string prop", () => {
-		const spec = render(<Button label="Go" style="px-4 py-2" />)
-
-		const root = spec.elements[spec.root]!
-		expect(root.props.style).toBe("px-4 py-2")
-	})
-})
-
-describe("FeedCard", () => {
-	test("renders as container", () => {
-		const spec = render(<FeedCard />)
-
-		expect(spec.root).toStartWith("feedcard-")
-		const root = spec.elements[spec.root]!
-		expect(root.type).toBe("FeedCard")
-	})
-
-	test("renders with a single child", () => {
-		const spec = render(
-			<FeedCard>
-				<SansSerifText content="Only child" />
-			</FeedCard>,
-		)
-
-		const root = spec.elements[spec.root]!
-		expect(root.children).toHaveLength(1)
-		const child = spec.elements[root.children![0]!]!
-		expect(child.type).toBe("SansSerifText")
-		expect(child.props).toEqual({ content: "Only child" })
-	})
-
-	test("passes style as string prop", () => {
-		const spec = render(<FeedCard style="p-4 border rounded-lg" />)
-
-		const root = spec.elements[spec.root]!
-		expect(root.props.style).toBe("p-4 border rounded-lg")
-	})
-})
-
-describe("SansSerifText", () => {
-	test("renders with content prop", () => {
-		const spec = render(<SansSerifText content="Hello" />)
-
-		expect(spec.root).toStartWith("sansseriftext-")
-		const root = spec.elements[spec.root]!
-		expect(root.type).toBe("SansSerifText")
-		expect(root.props).toEqual({ content: "Hello" })
-	})
-
-	test("passes style as string prop", () => {
-		const spec = render(<SansSerifText content="Hello" style="text-sm text-stone-500" />)
-
-		const root = spec.elements[spec.root]!
-		expect(root.props.style).toBe("text-sm text-stone-500")
-	})
-})
-
-describe("SerifText", () => {
-	test("renders with content prop", () => {
-		const spec = render(<SerifText content="Title" />)
-
-		expect(spec.root).toStartWith("seriftext-")
-		const root = spec.elements[spec.root]!
-		expect(root.type).toBe("SerifText")
-		expect(root.props).toEqual({ content: "Title" })
-	})
-
-	test("passes style as string prop", () => {
-		const spec = render(<SerifText content="Title" style="text-xl" />)
-
-		const root = spec.elements[spec.root]!
-		expect(root.props.style).toBe("text-xl")
-	})
-})
-
-describe("MonospaceText", () => {
-	test("renders with content prop", () => {
-		const spec = render(<MonospaceText content="code()" />)
-
-		expect(spec.root).toStartWith("monospacetext-")
-		const root = spec.elements[spec.root]!
-		expect(root.type).toBe("MonospaceText")
-		expect(root.props).toEqual({ content: "code()" })
-	})
-
-	test("passes style as string prop", () => {
-		const spec = render(<MonospaceText content="code()" style="text-xs" />)
-
-		const root = spec.elements[spec.root]!
-		expect(root.props.style).toBe("text-xs")
-	})
-})
-
-describe("composite", () => {
-	test("FeedCard with nested children", () => {
-		const spec = render(
-			<FeedCard>
-				<SerifText content="Weather" />
-				<SansSerifText content="Sunny, 22C" />
-				<Button label="Details" />
-			</FeedCard>,
-		)
-
-		const root = spec.elements[spec.root]!
-		expect(root.type).toBe("FeedCard")
-		expect(root.children).toHaveLength(3)
-
-		const childKeys = root.children!
-		const child0 = spec.elements[childKeys[0]!]!
-		const child1 = spec.elements[childKeys[1]!]!
-		const child2 = spec.elements[childKeys[2]!]!
-
-		expect(child0.type).toBe("SerifText")
-		expect(child0.props).toEqual({ content: "Weather" })
-
-		expect(child1.type).toBe("SansSerifText")
-		expect(child1.props).toEqual({ content: "Sunny, 22C" })
-
-		expect(child2.type).toBe("Button")
-		expect(child2.props).toEqual({ label: "Details" })
-	})
-})

packages/aelis-components/src/feed-card.ts

@@ -1,12 +0,0 @@
-import type { JrxNode } from "@nym.sh/jrx"
-
-import { jsx } from "@nym.sh/jrx/jsx-runtime"
-
-export type FeedCardProps = {
-	style?: string
-	children?: JrxNode | JrxNode[]
-}
-
-export function FeedCard(props: FeedCardProps): JrxNode {
-	return jsx("FeedCard", props)
-}

packages/aelis-components/src/index.ts

@@ -1,14 +0,0 @@
-export type { ButtonProps } from "./button.ts"
-export { Button } from "./button.ts"
-
-export type { FeedCardProps } from "./feed-card.ts"
-export { FeedCard } from "./feed-card.ts"
-
-export type { SansSerifTextProps } from "./sans-serif-text.ts"
-export { SansSerifText } from "./sans-serif-text.ts"
-
-export type { SerifTextProps } from "./serif-text.ts"
-export { SerifText } from "./serif-text.ts"
-
-export type { MonospaceTextProps } from "./monospace-text.ts"
-export { MonospaceText } from "./monospace-text.ts"

packages/aelis-components/src/monospace-text.ts

@@ -1,13 +0,0 @@
-import type { JrxNode } from "@nym.sh/jrx"
-
-import { jsx } from "@nym.sh/jrx/jsx-runtime"
-
-export type MonospaceTextProps = {
-	content?: string
-	style?: string
-	children?: JrxNode | JrxNode[]
-}
-
-export function MonospaceText(props: MonospaceTextProps): JrxNode {
-	return jsx("MonospaceText", props)
-}

packages/aelis-components/src/sans-serif-text.ts

@@ -1,13 +0,0 @@
-import type { JrxNode } from "@nym.sh/jrx"
-
-import { jsx } from "@nym.sh/jrx/jsx-runtime"
-
-export type SansSerifTextProps = {
-	content?: string
-	style?: string
-	children?: JrxNode | JrxNode[]
-}
-
-export function SansSerifText(props: SansSerifTextProps): JrxNode {
-	return jsx("SansSerifText", props)
-}

packages/aelis-components/src/serif-text.ts

@@ -1,13 +0,0 @@
-import type { JrxNode } from "@nym.sh/jrx"
-
-import { jsx } from "@nym.sh/jrx/jsx-runtime"
-
-export type SerifTextProps = {
-	content?: string
-	style?: string
-	children?: JrxNode | JrxNode[]
-}
-
-export function SerifText(props: SerifTextProps): JrxNode {
-	return jsx("SerifText", props)
-}

packages/aelis-components/tsconfig.json

@@ -1,7 +0,0 @@
-{
-	"extends": "../../tsconfig.json",
-	"compilerOptions": {
-		"jsxImportSource": "@nym.sh/jrx"
-	},
-	"include": ["src"]
-}

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

@@ -17,7 +17,6 @@ import type { FeedItem } from "./feed"
  *     const data = await fetchWeather(location)
  *     return [{
  *       id: `weather-${Date.now()}`,
- *       sourceId: "aelis.weather",
  *       type: this.type,
  *       timestamp: context.time,
  *       data: { temp: data.temperature },

packages/aelis-core/src/feed-engine.test.ts

@@ -99,7 +99,6 @@ function createWeatherSource(
 			return [
 				{
 					id: `weather-${Date.now()}`,
-					sourceId: "weather",
 					type: "weather",
 					timestamp: new Date(),
 					data: {
@@ -131,7 +130,6 @@ function createAlertSource(): FeedSource<AlertFeedItem> {
 				return [
 					{
 						id: "alert-storm",
-						sourceId: "alert",
 						type: "alert",
 						timestamp: new Date(),
 						data: { message: "Storm warning!" },
@@ -425,7 +423,6 @@ describe("FeedEngine", () => {
 					return [
 						{
 							id: "item-1",
-							sourceId: "working",
 							type: "test",
 							priority: 0.5,
 							timestamp: new Date(),
@@ -749,7 +746,6 @@ describe("FeedEngine", () => {
 					return [
 						{
 							id: "item-1",
-							sourceId: "reactive-items",
 							type: "test",
 							priority: 0.5,
 							timestamp: new Date(),
@@ -834,7 +830,6 @@ describe("FeedEngine", () => {
 					return [
 						{
 							id: `item-${fetchCount}`,
-							sourceId: "counter",
 							type: "test",
 							priority: 0.5,
 							timestamp: new Date(),
@@ -900,7 +895,6 @@ describe("FeedEngine", () => {
 					return [
 						{
 							id: `weather-${Date.now()}`,
-							sourceId: "weather",
 							type: "weather",
 							priority: 0.5,
 							timestamp: new Date(),

packages/aelis-core/src/feed-post-processor.test.ts

@@ -29,17 +29,11 @@ type WeatherItem = FeedItem<"weather", { temp: number }>
 type CalendarItem = FeedItem<"calendar", { title: string }>
 
 function weatherItem(id: string, temp: number): WeatherItem {
-	return { id, sourceId: "aelis.weather", type: "weather", timestamp: new Date(), data: { temp } }
+	return { id, type: "weather", timestamp: new Date(), data: { temp } }
 }
 
 function calendarItem(id: string, title: string): CalendarItem {
-	return {
+	return { id, type: "calendar", timestamp: new Date(), data: { title } }
-		id,
-		sourceId: "aelis.calendar",
-		type: "calendar",
-		timestamp: new Date(),
-		data: { title },
-	}
 }
 
 // =============================================================================

packages/aelis-core/src/feed-source.test.ts

@@ -98,7 +98,6 @@ function createWeatherSource(
 			return [
 				{
 					id: `weather-${Date.now()}`,
-					sourceId: "weather",
 					type: "weather",
 					timestamp: new Date(),
 					data: {
@@ -130,7 +129,6 @@ function createAlertSource(): FeedSource<AlertFeedItem> {
 				return [
 					{
 						id: "alert-storm",
-						sourceId: "alert",
 						type: "alert",
 						timestamp: new Date(),
 						data: { message: "Storm warning!" },

packages/aelis-core/src/feed.test.ts

@@ -6,7 +6,6 @@ describe("FeedItem slots", () => {
 	test("FeedItem without slots is valid", () => {
 		const item: FeedItem<"test", { value: number }> = {
 			id: "test-1",
-			sourceId: "test-source",
 			type: "test",
 			timestamp: new Date(),
 			data: { value: 42 },
@@ -18,7 +17,6 @@ describe("FeedItem slots", () => {
 	test("FeedItem with unfilled slots", () => {
 		const item: FeedItem<"weather", { temp: number }> = {
 			id: "weather-1",
-			sourceId: "aelis.weather",
 			type: "weather",
 			timestamp: new Date(),
 			data: { temp: 18 },
@@ -43,7 +41,6 @@ describe("FeedItem slots", () => {
 	test("FeedItem with filled slots", () => {
 		const item: FeedItem<"weather", { temp: number }> = {
 			id: "weather-1",
-			sourceId: "aelis.weather",
 			type: "weather",
 			timestamp: new Date(),
 			data: { temp: 18 },
@@ -78,7 +75,6 @@ describe("FeedItem slots", () => {
 	test("FeedItem with empty slots record", () => {
 		const item: FeedItem<"test", { value: number }> = {
 			id: "test-1",
-			sourceId: "test-source",
 			type: "test",
 			timestamp: new Date(),
 			data: { value: 1 },

packages/aelis-core/src/feed.ts

@@ -48,7 +48,6 @@ export interface Slot {
  *
  * const item: WeatherItem = {
  *   id: "weather-123",
- *   sourceId: "aelis.weatherkit",
  *   type: "weather",
  *   timestamp: new Date(),
  *   data: { temp: 18, condition: "cloudy" },
@@ -68,8 +67,6 @@ export interface FeedItem<
 > {
 	/** Unique identifier */
 	id: string
-	/** ID of the FeedSource that produced this item */
-	sourceId: string
 	/** Item type, matches the data source type */
 	type: TType
 	/** When this item was generated */
@@ -82,12 +79,6 @@ export interface FeedItem<
 	slots?: Record<string, Slot>
 }
 
-/** Takes a FeedItem and returns a JRX node tree for rendering. */
-export type FeedItemRenderer<
-	TType extends string = string,
-	TData extends Record<string, unknown> = Record<string, unknown>,
-> = (item: FeedItem<TType, TData>) => JrxNode
-
 /** A FeedItem with a JRX UI tree attached for client-side rendering. */
 export interface RenderedFeedItem<
 	TType extends string = string,

packages/aelis-core/src/index.ts

@@ -7,7 +7,7 @@ export type { ActionDefinition } from "./action"
 export { UnknownActionError } from "./action"
 
 // Feed
-export type { FeedItem, FeedItemRenderer, FeedItemSignals, RenderedFeedItem, Slot } from "./feed"
+export type { FeedItem, FeedItemSignals, RenderedFeedItem, Slot } from "./feed"
 export { TimeRelevance } from "./feed"
 
 // Feed Source

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

@@ -47,8 +47,6 @@ interface LocationData {
 
 const LocationKey: ContextKey<LocationData> = contextKey("aelis.location", "location")
 
-const SOURCE_ID = "aelis.weather"
-
 export class WeatherKitDataSource implements DataSource<WeatherFeedItem, WeatherKitQueryConfig> {
 	private readonly DEFAULT_HOURLY_LIMIT = 12
 	private readonly DEFAULT_DAILY_LIMIT = 7
@@ -238,7 +236,6 @@ function createCurrentWeatherFeedItem(
 
 	return {
 		id: `weather-current-${timestamp.getTime()}`,
-		sourceId: SOURCE_ID,
 		type: WeatherFeedItemType.Current,
 		timestamp,
 		data: {
@@ -273,7 +270,6 @@ function createHourlyWeatherFeedItem(
 
 	return {
 		id: `weather-hourly-${timestamp.getTime()}-${index}`,
-		sourceId: SOURCE_ID,
 		type: WeatherFeedItemType.Hourly,
 		timestamp,
 		data: {
@@ -308,7 +304,6 @@ function createDailyWeatherFeedItem(
 
 	return {
 		id: `weather-daily-${timestamp.getTime()}-${index}`,
-		sourceId: SOURCE_ID,
 		type: WeatherFeedItemType.Daily,
 		timestamp,
 		data: {
@@ -336,7 +331,6 @@ function createWeatherAlertFeedItem(alert: WeatherAlert, timestamp: Date): Weath
 
 	return {
 		id: `weather-alert-${alert.id}`,
-		sourceId: SOURCE_ID,
 		type: WeatherFeedItemType.Alert,
 		timestamp,
 		data: {

packages/aelis-feed-enhancers/src/time-of-day-enhancer.test.ts

@@ -40,7 +40,6 @@ function saturday(hour: number, minute = 0): Date {
 function weatherCurrent(id = "w-current"): FeedItem {
 	return {
 		id,
-		sourceId: "aelis.weather",
 		type: WeatherFeedItemType.Current,
 		timestamp: new Date(),
 		data: { temperature: 18, precipitationIntensity: 0 },
@@ -50,7 +49,6 @@ function weatherCurrent(id = "w-current"): FeedItem {
 function weatherCurrentRainy(id = "w-current-rain"): FeedItem {
 	return {
 		id,
-		sourceId: "aelis.weather",
 		type: WeatherFeedItemType.Current,
 		timestamp: new Date(),
 		data: { temperature: 12, precipitationIntensity: 2.5 },
@@ -60,7 +58,6 @@ function weatherCurrentRainy(id = "w-current-rain"): FeedItem {
 function weatherCurrentExtreme(id = "w-current-extreme"): FeedItem {
 	return {
 		id,
-		sourceId: "aelis.weather",
 		type: WeatherFeedItemType.Current,
 		timestamp: new Date(),
 		data: { temperature: -5, precipitationIntensity: 0 },
@@ -70,7 +67,6 @@ function weatherCurrentExtreme(id = "w-current-extreme"): FeedItem {
 function weatherHourly(id = "w-hourly"): FeedItem {
 	return {
 		id,
-		sourceId: "aelis.weather",
 		type: WeatherFeedItemType.Hourly,
 		timestamp: new Date(),
 		data: { forecastTime: new Date(), temperature: 20 },
@@ -80,7 +76,6 @@ function weatherHourly(id = "w-hourly"): FeedItem {
 function weatherDaily(id = "w-daily"): FeedItem {
 	return {
 		id,
-		sourceId: "aelis.weather",
 		type: WeatherFeedItemType.Daily,
 		timestamp: new Date(),
 		data: { forecastDate: new Date() },
@@ -90,7 +85,6 @@ function weatherDaily(id = "w-daily"): FeedItem {
 function weatherAlert(id = "w-alert", urgency = 0.9): FeedItem {
 	return {
 		id,
-		sourceId: "aelis.weather",
 		type: WeatherFeedItemType.Alert,
 		timestamp: new Date(),
 		data: { severity: "extreme" },
@@ -105,7 +99,6 @@ function calendarEvent(
 ): FeedItem {
 	return {
 		id,
-		sourceId: "aelis.google-calendar",
 		type: CalendarFeedItemType.Event,
 		timestamp: new Date(),
 		data: {
@@ -127,7 +120,6 @@ function calendarEvent(
 function calendarAllDay(id: string): FeedItem {
 	return {
 		id,
-		sourceId: "aelis.google-calendar",
 		type: CalendarFeedItemType.AllDay,
 		timestamp: new Date(),
 		data: {
@@ -153,7 +145,6 @@ function caldavEvent(
 ): FeedItem {
 	return {
 		id,
-		sourceId: "aelis.caldav",
 		type: CalDavFeedItemType.Event,
 		timestamp: new Date(),
 		data: {
@@ -179,7 +170,6 @@ function caldavEvent(
 function tflAlert(id = "tfl-1", urgency = 0.8): FeedItem {
 	return {
 		id,
-		sourceId: "aelis.tfl",
 		type: TflFeedItemType.Alert,
 		timestamp: new Date(),
 		data: {
@@ -195,7 +185,6 @@ function tflAlert(id = "tfl-1", urgency = 0.8): FeedItem {
 function unknownItem(id = "unknown-1"): FeedItem {
 	return {
 		id,
-		sourceId: "unknown",
 		type: "some-future-type",
 		timestamp: new Date(),
 		data: { foo: "bar" },

packages/aelis-source-caldav/package.json

@@ -9,7 +9,6 @@
 		"test:live": "bun run scripts/test-live.ts"
 	},
 	"dependencies": {
-		"@aelis/components": "workspace:*",
 		"@aelis/core": "workspace:*",
 		"ical.js": "^2.1.0",
 		"tsdav": "^2.1.7"

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

@@ -133,7 +133,7 @@ export class CalDavSource implements FeedSource<CalDavFeedItem> {
 	async fetchItems(context: Context): Promise<CalDavFeedItem[]> {
 		const now = context.time
 		const events = await this.fetchEvents(context)
-		return events.map((event) => createFeedItem(event, now, this.id, this.timeZone))
+		return events.map((event) => createFeedItem(event, now, this.timeZone))
 	}
 
 	private fetchEvents(context: Context): Promise<CalDavEventData[]> {
@@ -351,15 +351,9 @@ function createEventSlots(): Record<string, Slot> {
 	}
 }
 
-function createFeedItem(
+function createFeedItem(event: CalDavEventData, now: Date, timeZone?: string): CalDavFeedItem {
-	event: CalDavEventData,
-	now: Date,
-	sourceId: string,
-	timeZone?: string,
-): CalDavFeedItem {
 	return {
 		id: `caldav-event-${event.uid}${event.recurrenceId ? `-${event.recurrenceId}` : ""}`,
-		sourceId,
 		type: CalDavFeedItemType.Event,
 		timestamp: now,
 		data: event,

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

@@ -1,7 +1,6 @@
 export { CalDavCalendarKey, type CalendarContext } from "./calendar-context.ts"
 export { CalDavSource, type CalDavSourceOptions } from "./caldav-source.ts"
 export { parseICalEvents, type ICalTimeRange } from "./ical-parser.ts"
-export { renderCalDavFeedItem } from "./renderer.tsx"
 export {
 	AttendeeRole,
 	AttendeeStatus,

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

@@ -1,74 +0,0 @@
-/** @jsxImportSource @nym.sh/jrx */
-
-import type { FeedItemRenderer } from "@aelis/core"
-
-import { FeedCard, SansSerifText, SerifText } from "@aelis/components"
-
-import type { CalDavEventData } from "./types.ts"
-
-import { CalDavEventStatus } from "./types.ts"
-
-function formatTime(date: Date): string {
-	const hours = date.getHours()
-	const minutes = date.getMinutes()
-	const period = hours >= 12 ? "PM" : "AM"
-	const h = hours % 12 || 12
-	const m = minutes.toString().padStart(2, "0")
-	return `${h}:${m} ${period}`
-}
-
-function formatTimeRange(data: CalDavEventData): string {
-	if (data.isAllDay) {
-		return "All day"
-	}
-	return `${formatTime(data.startDate)} – ${formatTime(data.endDate)}`
-}
-
-function formatStatus(status: CalDavEventData["status"]): string | null {
-	if (status === CalDavEventStatus.Cancelled) return "Cancelled"
-	if (status === CalDavEventStatus.Tentative) return "Tentative"
-	return null
-}
-
-export const renderCalDavFeedItem: FeedItemRenderer<"caldav-event", CalDavEventData> = (item) => {
-	const { data, slots } = item
-	const statusLabel = formatStatus(data.status)
-	const attendeeCount = data.attendees.length
-
-	return (
-		<FeedCard>
-			{statusLabel ? <SansSerifText content={statusLabel} style="text-xs uppercase" /> : null}
-
-			<SerifText content={data.title} style="text-lg" />
-
-			<SansSerifText content={formatTimeRange(data)} style="text-sm" />
-
-			{data.calendarName ? (
-				<SansSerifText content={data.calendarName} style="text-sm text-secondary" />
-			) : null}
-
-			{data.location ? (
-				<SansSerifText content={data.location} style="text-sm text-secondary" />
-			) : null}
-
-			{attendeeCount > 0 ? (
-				<SansSerifText
-					content={`${attendeeCount} attendee${attendeeCount === 1 ? "" : "s"}`}
-					style="text-sm text-secondary"
-				/>
-			) : null}
-
-			{slots?.insight?.content ? (
-				<SansSerifText content={slots.insight.content} style="text-sm" />
-			) : null}
-
-			{slots?.preparation?.content ? (
-				<SansSerifText content={slots.preparation.content} style="text-sm" />
-			) : null}
-
-			{slots?.crossSource?.content ? (
-				<SansSerifText content={slots.crossSource.content} style="text-sm" />
-			) : null}
-		</FeedCard>
-	)
-}

packages/aelis-source-caldav/tsconfig.json

@@ -1,7 +0,0 @@
-{
-	"extends": "../../tsconfig.json",
-	"compilerOptions": {
-		"jsxImportSource": "@nym.sh/jrx"
-	},
-	"include": ["src"]
-}

packages/aelis-source-google-calendar/src/google-calendar-source.ts

@@ -113,7 +113,7 @@ export class GoogleCalendarSource implements FeedSource<CalendarFeedItem> {
 		const now = context.time.getTime()
 		const lookaheadMs = this.lookaheadHours * 60 * 60 * 1000
 
-		return events.map((event) => createFeedItem(event, now, lookaheadMs, this.id))
+		return events.map((event) => createFeedItem(event, now, lookaheadMs))
 	}
 
 	private async resolveCalendarIds(): Promise<string[]> {
@@ -208,13 +208,11 @@ function createFeedItem(
 	event: CalendarEventData,
 	nowMs: number,
 	lookaheadMs: number,
-	sourceId: string,
 ): CalendarFeedItem {
 	const itemType = event.isAllDay ? CalendarFeedItemType.AllDay : CalendarFeedItemType.Event
 
 	return {
 		id: `calendar-${event.calendarId}-${event.eventId}`,
-		sourceId,
 		type: itemType,
 		timestamp: new Date(nowMs),
 		data: event,

packages/aelis-source-tfl/package.json

@@ -10,12 +10,7 @@
 	},
 	"dependencies": {
 		"@aelis/core": "workspace:*",
-		"@aelis/components": "workspace:*",
 		"@aelis/source-location": "workspace:*",
 		"arktype": "^2.1.0"
-	},
-	"peerDependencies": {
-		"@json-render/core": "*",
-		"@nym.sh/jrx": "*"
 	}
 }

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

@@ -11,4 +11,3 @@ export {
 	type TflLineStatus,
 	type TflSourceOptions,
 } from "./types.ts"
-export { renderTflAlert } from "./renderer.tsx"

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

@@ -1,103 +0,0 @@
-/** @jsxImportSource @nym.sh/jrx */
-import { render } from "@nym.sh/jrx"
-import { describe, expect, test } from "bun:test"
-
-import type { TflAlertFeedItem } from "./types.ts"
-
-import { renderTflAlert } from "./renderer.tsx"
-
-function makeItem(overrides: Partial<TflAlertFeedItem["data"]> = {}): TflAlertFeedItem {
-	return {
-		id: "tfl-alert-northern-minor-delays",
-		type: "tfl-alert",
-		timestamp: new Date("2026-01-15T12:00:00Z"),
-		data: {
-			line: "northern",
-			lineName: "Northern",
-			severity: "minor-delays",
-			description: "Minor delays due to signal failure",
-			closestStationDistance: null,
-			...overrides,
-		},
-	}
-}
-
-describe("renderTflAlert", () => {
-	test("renders a FeedCard with title and description", () => {
-		const node = renderTflAlert(makeItem())
-		const spec = render(node)
-
-		const root = spec.elements[spec.root]!
-		expect(root.type).toBe("FeedCard")
-		expect(root.children!.length).toBeGreaterThanOrEqual(2)
-
-		const title = spec.elements[root.children![0]!]!
-		expect(title.type).toBe("SansSerifText")
-		expect(title.props.content).toBe("Northern · Minor delays")
-
-		const body = spec.elements[root.children![1]!]!
-		expect(body.type).toBe("SansSerifText")
-		expect(body.props.content).toBe("Minor delays due to signal failure")
-	})
-
-	test("shows nearest station distance when available", () => {
-		const node = renderTflAlert(makeItem({ closestStationDistance: 0.35 }))
-		const spec = render(node)
-
-		const root = spec.elements[spec.root]!
-		expect(root.children).toHaveLength(3)
-
-		const caption = spec.elements[root.children![2]!]!
-		expect(caption.type).toBe("SansSerifText")
-		expect(caption.props.content).toBe("Nearest station: 350m away")
-	})
-
-	test("formats distance in km when >= 1km", () => {
-		const node = renderTflAlert(makeItem({ closestStationDistance: 2.456 }))
-		const spec = render(node)
-
-		const root = spec.elements[spec.root]!
-		const caption = spec.elements[root.children![2]!]!
-		expect(caption.props.content).toBe("Nearest station: 2.5km away")
-	})
-
-	test("formats near-1km boundary as km not meters", () => {
-		const node = renderTflAlert(makeItem({ closestStationDistance: 0.9999 }))
-		const spec = render(node)
-
-		const root = spec.elements[spec.root]!
-		const caption = spec.elements[root.children![2]!]!
-		expect(caption.props.content).toBe("Nearest station: 1.0km away")
-	})
-
-	test("omits station distance when null", () => {
-		const node = renderTflAlert(makeItem({ closestStationDistance: null }))
-		const spec = render(node)
-
-		const root = spec.elements[spec.root]!
-		// Title + body only, no caption (empty fragment doesn't produce a child)
-		const children = root.children!.filter((key) => {
-			const el = spec.elements[key]
-			return el && el.type !== "Fragment"
-		})
-		expect(children).toHaveLength(2)
-	})
-
-	test("renders closure severity label", () => {
-		const node = renderTflAlert(makeItem({ severity: "closure", lineName: "Central" }))
-		const spec = render(node)
-
-		const root = spec.elements[spec.root]!
-		const title = spec.elements[root.children![0]!]!
-		expect(title.props.content).toBe("Central · Closed")
-	})
-
-	test("renders major delays severity label", () => {
-		const node = renderTflAlert(makeItem({ severity: "major-delays", lineName: "Jubilee" }))
-		const spec = render(node)
-
-		const root = spec.elements[spec.root]!
-		const title = spec.elements[root.children![0]!]!
-		expect(title.props.content).toBe("Jubilee · Major delays")
-	})
-})

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

@@ -1,40 +0,0 @@
-/** @jsxImportSource @nym.sh/jrx */
-import type { FeedItemRenderer } from "@aelis/core"
-
-import { FeedCard, SansSerifText } from "@aelis/components"
-
-import type { TflAlertData } from "./types.ts"
-
-import { TflAlertSeverity } from "./types.ts"
-
-const SEVERITY_LABEL: Record<TflAlertSeverity, string> = {
-	[TflAlertSeverity.Closure]: "Closed",
-	[TflAlertSeverity.MajorDelays]: "Major delays",
-	[TflAlertSeverity.MinorDelays]: "Minor delays",
-}
-
-function formatDistance(km: number): string {
-	const meters = Math.round(km * 1000)
-	if (meters < 1000) {
-		return `${meters}m away`
-	}
-	return `${(meters / 1000).toFixed(1)}km away`
-}
-
-export const renderTflAlert: FeedItemRenderer<"tfl-alert", TflAlertData> = (item) => {
-	const { lineName, severity, description, closestStationDistance } = item.data
-	const severityLabel = SEVERITY_LABEL[severity]
-
-	return (
-		<FeedCard>
-			<SansSerifText content={`${lineName} · ${severityLabel}`} style="text-base font-semibold" />
-			<SansSerifText content={description} style="text-sm" />
-			{closestStationDistance !== null ? (
-				<SansSerifText
-					content={`Nearest station: ${formatDistance(closestStationDistance)}`}
-					style="text-xs text-stone-500"
-				/>
-			) : null}
-		</FeedCard>
-	)
-}

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

@@ -151,7 +151,6 @@ export class TflSource implements FeedSource<TflAlertFeedItem> {
 
 			return {
 				id: `tfl-alert-${status.lineId}-${status.severity}`,
-				sourceId: this.id,
 				type: TflFeedItemType.Alert,
 				timestamp: context.time,
 				data,

packages/aelis-source-tfl/tsconfig.json

@@ -1,7 +0,0 @@
-{
-	"extends": "../../tsconfig.json",
-	"compilerOptions": {
-		"jsxImportSource": "@nym.sh/jrx"
-	},
-	"include": ["src"]
-}

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

@@ -167,9 +167,7 @@ export class WeatherSource implements FeedSource<WeatherFeedItem> {
 		const items: WeatherFeedItem[] = []
 
 		if (response.currentWeather) {
-			items.push(
+			items.push(createCurrentWeatherFeedItem(response.currentWeather, timestamp, this.units))
-				createCurrentWeatherFeedItem(response.currentWeather, timestamp, this.units, this.id),
-			)
 		}
 
 		if (response.forecastHourly?.hours) {
@@ -177,7 +175,7 @@ export class WeatherSource implements FeedSource<WeatherFeedItem> {
 			for (let i = 0; i < hours.length; i++) {
 				const hour = hours[i]
 				if (hour) {
-					items.push(createHourlyWeatherFeedItem(hour, i, timestamp, this.units, this.id))
+					items.push(createHourlyWeatherFeedItem(hour, i, timestamp, this.units))
 				}
 			}
 		}
@@ -187,14 +185,14 @@ export class WeatherSource implements FeedSource<WeatherFeedItem> {
 			for (let i = 0; i < days.length; i++) {
 				const day = days[i]
 				if (day) {
-					items.push(createDailyWeatherFeedItem(day, i, timestamp, this.units, this.id))
+					items.push(createDailyWeatherFeedItem(day, i, timestamp, this.units))
 				}
 			}
 		}
 
 		if (response.weatherAlerts?.alerts) {
 			for (const alert of response.weatherAlerts.alerts) {
-				items.push(createWeatherAlertFeedItem(alert, timestamp, this.id))
+				items.push(createWeatherAlertFeedItem(alert, timestamp))
 			}
 		}
 
@@ -286,7 +284,6 @@ function createCurrentWeatherFeedItem(
 	current: CurrentWeather,
 	timestamp: Date,
 	units: Units,
-	sourceId: string,
 ): WeatherFeedItem {
 	const signals: FeedItemSignals = {
 		urgency: adjustUrgencyForCondition(BASE_URGENCY.current, current.conditionCode),
@@ -295,7 +292,6 @@ function createCurrentWeatherFeedItem(
 
 	return {
 		id: `weather-current-${timestamp.getTime()}`,
-		sourceId,
 		type: WeatherFeedItemType.Current,
 		timestamp,
 		data: {
@@ -328,7 +324,6 @@ function createHourlyWeatherFeedItem(
 	index: number,
 	timestamp: Date,
 	units: Units,
-	sourceId: string,
 ): WeatherFeedItem {
 	const signals: FeedItemSignals = {
 		urgency: adjustUrgencyForCondition(BASE_URGENCY.hourly, hourly.conditionCode),
@@ -337,7 +332,6 @@ function createHourlyWeatherFeedItem(
 
 	return {
 		id: `weather-hourly-${timestamp.getTime()}-${index}`,
-		sourceId,
 		type: WeatherFeedItemType.Hourly,
 		timestamp,
 		data: {
@@ -364,7 +358,6 @@ function createDailyWeatherFeedItem(
 	index: number,
 	timestamp: Date,
 	units: Units,
-	sourceId: string,
 ): WeatherFeedItem {
 	const signals: FeedItemSignals = {
 		urgency: adjustUrgencyForCondition(BASE_URGENCY.daily, daily.conditionCode),
@@ -373,7 +366,6 @@ function createDailyWeatherFeedItem(
 
 	return {
 		id: `weather-daily-${timestamp.getTime()}-${index}`,
-		sourceId,
 		type: WeatherFeedItemType.Daily,
 		timestamp,
 		data: {
@@ -393,11 +385,7 @@ function createDailyWeatherFeedItem(
 	}
 }
 
-function createWeatherAlertFeedItem(
+function createWeatherAlertFeedItem(alert: WeatherAlert, timestamp: Date): WeatherFeedItem {
-	alert: WeatherAlert,
-	timestamp: Date,
-	sourceId: string,
-): WeatherFeedItem {
 	const signals: FeedItemSignals = {
 		urgency: adjustUrgencyForAlertSeverity(alert.severity),
 		timeRelevance: timeRelevanceForAlertSeverity(alert.severity),
@@ -405,7 +393,6 @@ function createWeatherAlertFeedItem(
 
 	return {
 		id: `weather-alert-${alert.id}`,
-		sourceId,
 		type: WeatherFeedItemType.Alert,
 		timestamp,
 		data: {