Merge remote-tracking branch 'origin/master' into feat/caldav-slots-v2

# Conflicts:
#	packages/aelis-source-caldav/src/caldav-source.ts
#	packages/aelis-source-caldav/src/prompts/cross-source.txt
#	packages/aelis-source-caldav/src/prompts/insight.txt
#	packages/aelis-source-caldav/src/prompts/preparation.txt
#	packages/aelis-source-caldav/src/text.d.ts

.ona/automations.yaml

@@ -1,8 +1,8 @@
 services:
   expo:
     name: Expo Dev Server
-    description: Expo development server for aris-client
+    description: Expo development server for aelis-client
     triggeredBy:
       - postDevcontainerStart
     commands:
-      start: cd apps/aris-client && ./scripts/run-dev-server.sh
+      start: cd apps/aelis-client && ./scripts/run-dev-server.sh

AGENTS.md

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

README.md

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

apps/aelis-backend/package.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -45,7 +45,7 @@ async function handleUpdateLocation(c: Context<Env>) {
 	const user = c.get("user")!
 	const sessionManager = c.get("sessionManager")
 	const session = sessionManager.getOrCreate(user.id)
-	await session.engine.executeAction("aris.location", "update-location", {
+	await session.engine.executeAction("aelis.location", "update-location", {
 		lat: result.lat,
 		lng: result.lng,
 		accuracy: result.accuracy,

apps/aelis-backend/src/server.ts

@@ -1,4 +1,4 @@
-import { LocationSource } from "@aris/source-location"
+import { LocationSource } from "@aelis/source-location"
 import { Hono } from "hono"
 
 import { registerAuthHandlers } from "./auth/http.ts"

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

@@ -1,4 +1,4 @@
-import type { FeedSource } from "@aris/core"
+import type { FeedSource } from "@aelis/core"
 
 export interface FeedSourceProvider {
 	feedSourceForUser(userId: string): FeedSource

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

@@ -1,6 +1,6 @@
-import type { WeatherKitClient, WeatherKitResponse } from "@aris/source-weatherkit"
+import type { WeatherKitClient, WeatherKitResponse } from "@aelis/source-weatherkit"
 
-import { LocationSource } from "@aris/source-location"
+import { LocationSource } from "@aelis/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>("aris.location")
+		const source1 = session1.getSource<LocationSource>("aelis.location")
-		const source2 = session2.getSource<LocationSource>("aris.location")
+		const source2 = session2.getSource<LocationSource>("aelis.location")
 
 		expect(source1).not.toBe(source2)
 	})
@@ -83,7 +83,7 @@ describe("UserSessionManager", () => {
 
 		const session = manager.getOrCreate("user-1")
 
-		expect(session.getSource("aris.weather")).toBeDefined()
+		expect(session.getSource("aelis.weather")).toBeDefined()
 	})
 
 	test("accepts mixed providers", () => {
@@ -94,8 +94,8 @@ describe("UserSessionManager", () => {
 
 		const session = manager.getOrCreate("user-1")
 
-		expect(session.getSource("aris.location")).toBeDefined()
+		expect(session.getSource("aelis.location")).toBeDefined()
-		expect(session.getSource("aris.weather")).toBeDefined()
+		expect(session.getSource("aelis.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("aris.location", "update-location", {
+		await session.engine.executeAction("aelis.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,
 			timestamp: new Date(),
 		})
 
-		const source = session.getSource<LocationSource>("aris.location")
+		const source = session.getSource<LocationSource>("aelis.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("aris.location", "update-location", {
+		await session.engine.executeAction("aelis.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("aris.location", "update-location", {
+		await session2.engine.executeAction("aelis.location", "update-location", {
 			lat: 51.5074,
 			lng: -0.1278,
 			accuracy: 10,

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

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

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

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

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

@@ -1,4 +1,4 @@
-import { TflSource, type ITflApi } from "@aris/source-tfl"
+import { TflSource, type ITflApi } from "@aelis/source-tfl"
 
 import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
 

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

@@ -1,4 +1,4 @@
-import { WeatherSource, type WeatherSourceOptions } from "@aris/source-weatherkit"
+import { WeatherSource, type WeatherSourceOptions } from "@aelis/source-weatherkit"
 
 import type { FeedSourceProvider } from "../session/feed-source-provider.ts"
 

apps/aelis-client/app.json

@@ -1,11 +1,11 @@
 {
 	"expo": {
-		"name": "Aris",
+		"name": "Aelis",
-		"slug": "aris-client",
+		"slug": "aelis-client",
 		"version": "1.0.0",
 		"orientation": "portrait",
 		"icon": "./assets/images/icon.png",
-		"scheme": "aris",
+		"scheme": "aelis",
 		"userInterfaceStyle": "automatic",
 		"newArchEnabled": true,
 		"ios": {
@@ -15,7 +15,7 @@
 				},
 				"ITSAppUsesNonExemptEncryption": false
 			},
-			"bundleIdentifier": "sh.nym.aris"
+			"bundleIdentifier": "sh.nym.aelis"
 		},
 		"android": {
 			"adaptiveIcon": {
@@ -26,7 +26,7 @@
 			},
 			"edgeToEdgeEnabled": true,
 			"predictiveBackGestureEnabled": false,
-			"package": "sh.nym.aris"
+			"package": "sh.nym.aelis"
 		},
 		"web": {
 			"output": "static",

apps/aelis-client/package.json

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