feat: add agent websocket endpoint

2026-06-18 23:51:17 +01:00 · 2026-06-17 23:13:02 +01:00
35 changed files with 1824 additions and 1703 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -39,13 +39,4 @@ Use Bun exclusively. Do not use npm or yarn.

 - Branch: `feat/<task>`, `fix/<task>`, `ci/<task>`, etc.
 - Commits: conventional commit format, title <= 50 chars
-
-## Nix
-
-Use the Nix dev shell for project commands by default.
-
- Run repo tooling through `nix develop -c`, e.g. `nix develop -c bun test`.
- Use Bun exclusively inside the Nix shell.
- Do not use host `bun`, `node`, `tsc`, or package binaries for project tasks unless explicitly checking host behavior.
- Simple inspection commands like `rg`, `sed`, `ls`, and `git status` may run outside Nix.
- While `flake.nix` is untracked, use `nix develop path:. -c <command>`.
+- Signing: If `GPG_PRIVATE_KEY_PASSPHRASE` env var is available, use it to sign commits with `git commit -S`
--- a/apps/admin-dashboard/package.json
+++ b/apps/admin-dashboard/package.json
@@ -21,8 +21,8 @@
 		"lucide-react": "^0.577.0",
 		"next-themes": "^0.4.6",
 		"radix-ui": "^1.4.3",
-		"react": "19.2.3",
-		"react-dom": "19.2.3",
+		"react": "^19.2.0",
+		"react-dom": "^19.2.0",
 		"shadcn": "^4.0.8",
 		"sonner": "^2.0.7",
 		"tailwind-merge": "^3.5.0",
--- a/apps/agent-test-cli/package.json
+++ b/apps/agent-test-cli/package.json
@@ -7,9 +7,5 @@
 		"format": "oxfmt --write .",
 		"start": "bun run src/agent-test-cli.ts",
 		"typecheck": "bun tsc --noEmit"
-	},
-	"dependencies": {
-		"@freya/agent-protocol": "workspace:*",
-		"@nym.sh/jrpc": "^0.1.0"
 	}
 }
--- a/apps/agent-test-cli/src/agent-test-cli.ts
+++ b/apps/agent-test-cli/src/agent-test-cli.ts
@@ -1,13 +1,3 @@
-import type {
-	AgentClientApi,
-	AgentEvent,
-	AgentServerApi,
-	SendMessageResult,
-} from "@freya/agent-protocol"
-import type { JrpcChannel, JrpcMessage, JsonRpcMessage } from "@nym.sh/jrpc"
-
-import { JsonRpcClient, JsonRpcServer } from "@nym.sh/jrpc"
-
 type JsonObject = Record<string, unknown>

 interface AuthUser {
@@ -25,6 +15,10 @@ interface AuthSession {
 	}
 }

+interface QueryResponse {
+	message: string
+}
+
 interface QueryToolDefinition {
 	name: string
 	label: string
@@ -66,219 +60,6 @@ class CookieJar {
 	}
 }

-class AgentWebSocketSession implements AgentClientApi {
-	private readonly channel: WebSocketJrpcChannel
-	private readonly client: JsonRpcClient<AgentServerApi>
-	private readonly server: JsonRpcServer<AgentClientApi>
-	private conversationId: string | undefined
-	private responseHadText = false
-
-	private constructor(channel: WebSocketJrpcChannel) {
-		this.channel = channel
-		this.client = new JsonRpcClient<AgentServerApi>(channel)
-		this.server = new JsonRpcServer<AgentClientApi>(
-			{
-				notify: this.notify.bind(this),
-			},
-			channel,
-		)
-	}
-
-	static async connect(backendUrl: string, cookies: CookieJar): Promise<AgentWebSocketSession> {
-		const channel = new WebSocketJrpcChannel(agentWebSocketUrl(backendUrl), cookies.header())
-		const session = new AgentWebSocketSession(channel)
-
-		try {
-			await channel.waitUntilOpen()
-			void session.server.start().catch((err: unknown) => {
-				if (!channel.isClosed()) {
-					console.error(`\nWebSocket JSON-RPC failed: ${formatError(err)}\n`)
-				}
-			})
-			await session.client.call("ping")
-		} catch (err) {
-			channel.close()
-			throw err
-		}
-
-		return session
-	}
-
-	async ask(message: string): Promise<void> {
-		this.responseHadText = false
-
-		const result = await this.sendMessage(message)
-		if (result.conversationId) {
-			this.conversationId = result.conversationId
-		}
-
-		if (!this.responseHadText) {
-			console.log(`\nagent> ${result.message || "(no message)"}`)
-		}
-		console.log("")
-	}
-
-	notify(event: AgentEvent): void {
-		switch (event.type) {
-			case "conversation_started":
-				this.conversationId = event.conversationId
-				break
-			case "message_created":
-				this.printMessage(event.text)
-				break
-			case "tool_started":
-				console.log(`\ntool> ${event.toolName} started`)
-				break
-			case "tool_finished":
-				console.log(`tool> ${event.toolName} ${event.ok ? "finished" : "failed"}`)
-				break
-			case "message_finished":
-				break
-			case "message_failed":
-				console.log(`\nagent! ${event.error}`)
-				break
-		}
-	}
-
-	describeConversation(): string {
-		return this.conversationId ? `Conversation: ${this.conversationId}` : "No conversation yet."
-	}
-
-	close(): void {
-		this.channel.close()
-	}
-
-	private async sendMessage(message: string): Promise<SendMessageResult> {
-		return this.client.call("sendMessage", message)
-	}
-
-	private printMessage(text: string): void {
-		if (text === "") return
-
-		console.log(`\nagent> ${text}`)
-		this.responseHadText = true
-	}
-}
-
-class WebSocketJrpcChannel implements JrpcChannel {
-	private readonly ws: WebSocket
-	private readonly opened: Promise<void>
-	private closed = false
-	private openedOnce = false
-	private queue: JrpcMessage[] = []
-	private waiters: Array<(result: IteratorResult<JrpcMessage, void>) => void> = []
-
-	constructor(url: string, cookieHeader?: string) {
-		this.ws = new WebSocket(url, createWebSocketOptions(cookieHeader))
-		this.opened = new Promise((resolve, reject) => {
-			this.ws.onopen = () => {
-				this.openedOnce = true
-				resolve()
-			}
-			this.ws.onerror = () => {
-				if (!this.openedOnce) {
-					reject(new Error(`Could not connect to ${url}`))
-				}
-			}
-			this.ws.onclose = (event) => {
-				if (!this.openedOnce) {
-					reject(new Error(formatWebSocketClose(url, event)))
-				}
-				this.close()
-			}
-		})
-		this.ws.onmessage = (event) => {
-			this.receive(event.data)
-		}
-	}
-
-	waitUntilOpen(): Promise<void> {
-		return this.opened
-	}
-
-	isClosed(): boolean {
-		return this.closed
-	}
-
-	async send(msg: JsonRpcMessage): Promise<void> {
-		await this.opened
-		if (this.closed || this.ws.readyState !== WebSocket.OPEN) {
-			throw new Error("JSON-RPC WebSocket channel is closed")
-		}
-
-		this.ws.send(JSON.stringify(msg))
-	}
-
-	async next(): Promise<IteratorResult<JrpcMessage, void>> {
-		const msg = this.queue.shift()
-		if (msg) {
-			return { done: false, value: msg }
-		}
-
-		if (this.closed) {
-			return { done: true, value: undefined }
-		}
-
-		return new Promise((resolve) => {
-			this.waiters.push(resolve)
-		})
-	}
-
-	async return(): Promise<IteratorResult<JrpcMessage, void>> {
-		this.close()
-		return { done: true, value: undefined }
-	}
-
-	async throw(error?: unknown): Promise<IteratorResult<JrpcMessage, void>> {
-		this.close()
-		throw error
-	}
-
-	async [Symbol.asyncDispose](): Promise<void> {
-		await this.return()
-	}
-
-	close(): void {
-		if (this.closed) return
-
-		this.closed = true
-		for (const resolve of this.waiters.splice(0)) {
-			resolve({ done: true, value: undefined })
-		}
-
-		if (this.ws.readyState === WebSocket.CONNECTING || this.ws.readyState === WebSocket.OPEN) {
-			this.ws.close()
-		}
-	}
-
-	[Symbol.asyncIterator](): AsyncGenerator<JrpcMessage, void, unknown> {
-		return this
-	}
-
-	private receive(message: unknown): void {
-		const parsed = parseJrpcMessage(message)
-		if (!parsed) {
-			this.ws.close(1003, "Invalid JSON-RPC message")
-			this.close()
-			return
-		}
-
-		this.push(parsed)
-	}
-
-	private push(msg: JrpcMessage): void {
-		if (this.closed) return
-
-		const resolve = this.waiters.shift()
-		if (resolve) {
-			resolve({ done: false, value: msg })
-			return
-		}
-
-		this.queue.push(msg)
-	}
-}
-
 async function main(): Promise<void> {
 	if (wantsHelp()) {
 		printUsage()
@@ -330,72 +111,73 @@ async function runChatLoop(
 	cookies: CookieJar,
 	session: AuthSession,
 ): Promise<void> {
-	const agent = await AgentWebSocketSession.connect(backendUrl, cookies)
-	console.log("Connected to /api/agent/ws")
 	printHelp()

-	try {
-		for (;;) {
-			const input = askOptional("you> ")?.trim()
-			if (!input) continue
+	for (;;) {
+		const input = askOptional("you> ")?.trim()
+		if (!input) continue

-			if (input === "/quit" || input === "/exit") {
-				console.log("Bye.")
-				return
-			}
-
-			if (input === "/help") {
-				printHelp()
-				continue
-			}
-
-			if (input === "/session") {
-				console.log(`${session.user.name || session.user.email} (${session.user.id})`)
-				continue
-			}
-
-			if (input === "/conversation") {
-				console.log(agent.describeConversation())
-				continue
-			}
-
-			if (input === "/tools") {
-				await runCliCommand(() => listQueryTools(backendUrl, cookies))
-				continue
-			}
-
-			if (input.startsWith("/tool ")) {
-				await runCliCommand(() =>
-					executeQueryTool(backendUrl, cookies, input.slice("/tool ".length)),
-				)
-				continue
-			}
-
-			if (input.startsWith("/actions ")) {
-				await runCliCommand(() =>
-					listSourceActions(backendUrl, cookies, input.slice("/actions ".length)),
-				)
-				continue
-			}
-
-			if (input.startsWith("/action ")) {
-				await runCliCommand(() =>
-					executeSourceAction(backendUrl, cookies, input.slice("/action ".length)),
-				)
-				continue
-			}
-
-			try {
-				await agent.ask(input)
-			} catch (err) {
-				console.error(`\n${formatError(err)}\n`)
-			}
+		if (input === "/quit" || input === "/exit") {
+			console.log("Bye.")
+			return
+		}
+
+		if (input === "/help") {
+			printHelp()
+			continue
+		}
+
+		if (input === "/session") {
+			console.log(`${session.user.name || session.user.email} (${session.user.id})`)
+			continue
+		}
+
+		if (input === "/tools") {
+			await runCliCommand(() => listQueryTools(backendUrl, cookies))
+			continue
+		}
+
+		if (input.startsWith("/tool ")) {
+			await runCliCommand(() => executeQueryTool(backendUrl, cookies, input.slice("/tool ".length)))
+			continue
+		}
+
+		if (input.startsWith("/actions ")) {
+			await runCliCommand(() =>
+				listSourceActions(backendUrl, cookies, input.slice("/actions ".length)),
+			)
+			continue
+		}
+
+		if (input.startsWith("/action ")) {
+			await runCliCommand(() =>
+				executeSourceAction(backendUrl, cookies, input.slice("/action ".length)),
+			)
+			continue
+		}
+
+		try {
+			await askAgent(backendUrl, cookies, input)
+		} catch (err) {
+			console.error(`\n${formatError(err)}\n`)
 		}
-	} finally {
-		agent.close()
 	}
 }

+async function askAgent(backendUrl: string, cookies: CookieJar, message: string): Promise<void> {
+	const data = await requestJson(backendUrl, cookies, "/api/agent", {
+		method: "POST",
+		body: { message },
+	})
+
+	if (!isQueryResponse(data)) {
+		throw new Error("Query returned an unexpected response shape")
+	}
+
+	console.log(`\nagent> ${data.message || "(no message)"}`)
+	console.log("")
+}
+
 async function runCliCommand(command: () => Promise<void>): Promise<void> {
 	try {
 		await command()
@@ -545,7 +327,7 @@ async function requestJson(

 function printIntro(): void {
 	console.log("FREYA agent test CLI")
-	console.log("Connect to a backend, sign in, then send test messages to /api/agent/ws.\n")
+	console.log("Connect to a backend, sign in, then send test messages to /api/agent.\n")
 }

 function printUsage(): void {
@@ -566,7 +348,6 @@ function printHelp(): void {
 	console.log("  /tool        Execute an agent debug tool with JSON params")
 	console.log("  /actions     List source actions: /actions <source-id>")
 	console.log("  /action      Execute source action: /action <source-id> <action-id> <json-params>")
-	console.log("  /conversation  Show the current websocket conversation")
 	console.log("  /session     Show the signed-in user")
 	console.log("  /help        Show commands")
 	console.log("  /quit        Exit\n")
@@ -636,33 +417,6 @@ function normalizeBackendUrl(value: string): string {
 	}
 }

-function agentWebSocketUrl(backendUrl: string): string {
-	const url = new URL(backendUrl)
-	url.protocol = url.protocol === "https:" ? "wss:" : "ws:"
-	url.pathname = "/api/agent/ws"
-	url.search = ""
-	url.hash = ""
-	return url.toString()
-}
-
-function createWebSocketOptions(cookieHeader?: string): Bun.WebSocketOptions | undefined {
-	if (!cookieHeader) return undefined
-
-	return {
-		headers: {
-			Cookie: cookieHeader,
-		},
-	}
-}
-
-function formatWebSocketClose(
-	url: string,
-	event: { code: number; reason: string; wasClean: boolean },
-): string {
-	const reason = event.reason ? `: ${event.reason}` : ""
-	return `Could not connect to ${url} (${event.code}${reason})`
-}
-
 function formatPromptLabel(label: string, defaultValue?: string): string {
 	return defaultValue ? `${label} (${defaultValue}): ` : `${label}: `
 }
@@ -757,25 +511,6 @@ function splitSetCookieHeader(header: string): string[] {
 	return parts.filter(Boolean)
 }

-function parseJrpcMessage(message: unknown): JrpcMessage | null {
-	const text = webSocketMessageText(message)
-	if (!text) return null
-
-	try {
-		const value: unknown = JSON.parse(text)
-		return isJrpcMessage(value) ? value : null
-	} catch {
-		return null
-	}
-}
-
-function webSocketMessageText(message: unknown): string | null {
-	if (typeof message === "string") return message
-	if (message instanceof Uint8Array) return Buffer.from(message).toString("utf8")
-	if (message instanceof ArrayBuffer) return Buffer.from(message).toString("utf8")
-	return null
-}
-
 async function readResponseError(response: Response, path: string): Promise<string> {
 	const text = await response.text()
 	if (response.status === 404 && path === "/api/agent") {
@@ -813,6 +548,11 @@ function isAuthSession(value: unknown): value is AuthSession {
 	)
 }

+function isQueryResponse(value: unknown): value is QueryResponse {
+	if (!isJsonObject(value)) return false
+	return typeof value.message === "string"
+}
+
 function isQueryToolsResponse(value: unknown): value is QueryToolsResponse {
 	if (!isJsonObject(value) || !Array.isArray(value.tools)) return false
 	return value.tools.every(isQueryToolDefinition)
@@ -845,33 +585,6 @@ function isSourceActionDefinition(value: unknown): value is { id: string; descri
 	)
 }

-function isJrpcMessage(value: unknown): value is JrpcMessage {
-	if (!isJsonObject(value) || value.jsonrpc !== "2.0" || typeof value.id !== "number") {
-		return false
-	}
-
-	if ("method" in value) {
-		return (
-			typeof value.method === "string" &&
-			(value.params === undefined || Array.isArray(value.params))
-		)
-	}
-
-	if ("result" in value) {
-		return true
-	}
-
-	if ("error" in value) {
-		return isJsonRpcErrorObject(value.error)
-	}
-
-	return false
-}
-
-function isJsonRpcErrorObject(value: unknown): boolean {
-	return isJsonObject(value) && typeof value.code === "number" && typeof value.message === "string"
-}
-
 function isJsonObject(value: unknown): value is JsonObject {
 	return typeof value === "object" && value !== null && !Array.isArray(value)
 }
--- a/apps/freya-backend/src/agent/conversation-recording-query-agent.test.ts
+++ b/apps/freya-backend/src/agent/conversation-recording-query-agent.test.ts
@@ -1,4 +1,3 @@
-import { ConversationEntryKind } from "@freya/core"
 import { describe, expect, test } from "bun:test"

 import type { AppendConversationEntryInput } from "../conversations/storage.ts"
@@ -7,6 +6,7 @@ import type {
 	ConversationStorageEntry,
 } from "./conversation-recording-query-agent.ts"

+import { ConversationEntryKind } from "../conversations/types.ts"
 import { ConversationRecordingQueryAgent } from "./conversation-recording-query-agent.ts"
 import {
 	createQueryAgentEventListeners,
--- a/apps/freya-backend/src/agent/conversation-recording-query-agent.ts
+++ b/apps/freya-backend/src/agent/conversation-recording-query-agent.ts
@@ -1,13 +1,12 @@
-import type { ConversationEntryMetadata } from "@freya/core"
-
-import { ConversationEntryKind } from "@freya/core"
 import { randomUUID } from "node:crypto"

 import type {
 	AppendConversationEntryInput,
 	ConversationEntryRow,
 } from "../conversations/storage.ts"
+import type { ConversationEntryMetadata } from "../conversations/types.ts"

+import { ConversationEntryKind } from "../conversations/types.ts"
 import {
 	createQueryAgentEventListeners,
 	QueryAgentEvent,
@@ -20,7 +19,6 @@ import {
 	type QueryAgentStreamEvent,
 } from "./query-agent.ts"

-/** Storage operations used to persist and replay query-agent conversation entries. */
 export interface ConversationStorage {
 	getOrCreateConversation(): Promise<{ id: string }>
 	appendEntry(
@@ -30,13 +28,11 @@ export interface ConversationStorage {
 	listEntries(conversationId: string): Promise<ConversationStorageEntry[]>
 }

-/** Minimal persisted entry shape needed by recording and replay agents. */
 export type ConversationStorageEntry = Pick<
 	ConversationEntryRow,
 	"id" | "sequence" | "kind" | "payload" | "metadata" | "createdAt"
 >

-/** Configuration for wrapping a QueryAgent with conversation recording. */
 export interface ConversationRecordingQueryAgentConfig {
 	agent: QueryAgent
 	storage: ConversationStorage
--- a/apps/freya-backend/src/agent/pi-query-agent.test.ts
+++ b/apps/freya-backend/src/agent/pi-query-agent.test.ts
@@ -1,9 +1,9 @@
-import { ConversationEntryKind } from "@freya/core"
 import { beforeEach, describe, expect, mock, test } from "bun:test"

 import type { QueryAgentToolbox } from "./query-agent-toolbox.ts"
 import type { QueryAgentStreamEvent } from "./query-agent.ts"

+import { ConversationEntryKind } from "../conversations/types.ts"
 import { QueryAgentEvent } from "./query-agent.ts"

 interface FakePiSession {
--- a/apps/freya-backend/src/agent/pi-query-agent.ts
+++ b/apps/freya-backend/src/agent/pi-query-agent.ts
@@ -33,25 +33,13 @@ import {
 import { createSessionManager } from "./session-manager.ts"
 import { createFreyaAgentTools, FREYA_AGENT_TOOL_NAMES } from "./tools.ts"

-/** Active Pi SDK session instance returned by createAgentSession. */
 type PiSession = Awaited<ReturnType<typeof createAgentSession>>["session"]
-
-/** Pi event emitted when a message finishes. */
 type PiMessageEndEvent = Extract<AgentSessionEvent, { type: "message_end" }>
-
-/** Message payload carried by Pi's message-end event. */
 type PiAgentMessage = PiMessageEndEvent["message"]
-
-/** Pi event emitted when an agent run finishes. */
 type PiAgentEndEvent = Extract<AgentSessionEvent, { type: "agent_end" }>
-
-/** Session manager created for Pi conversation replay. */
 type PiSessionManager = ReturnType<typeof createSessionManager>
-
-/** Message shape accepted by the replay session manager. */
 type PiSessionMessage = Parameters<PiSessionManager["appendMessage"]>[0]

-/** Configuration for the Pi-backed query agent. */
 export interface PiQueryAgentConfig {
 	toolbox: QueryAgentToolbox
 	apiKey?: string
--- a/apps/freya-backend/src/agent/session-manager.test.ts
+++ b/apps/freya-backend/src/agent/session-manager.test.ts
@@ -1,8 +1,8 @@
-import { ConversationEntryKind } from "@freya/core"
 import { describe, expect, test } from "bun:test"

 import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"

+import { ConversationEntryKind } from "../conversations/types.ts"
 import { createSessionManager } from "./session-manager.ts"

 describe("createSessionManager", () => {
--- a/apps/freya-backend/src/agent/session-manager.ts
+++ b/apps/freya-backend/src/agent/session-manager.ts
@@ -1,21 +1,18 @@
 import { SessionManager } from "@earendil-works/pi-coding-agent"
+import { tmpdir } from "node:os"
+
+import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"
+
 import {
 	AssistantMessagePayload,
 	ContextSummaryPayload,
 	ConversationEntryKind,
 	UserMessagePayload,
-} from "@freya/core"
-import { tmpdir } from "node:os"
+} from "../conversations/types.ts"

-import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"
-
-/** Message shape accepted by Pi's SessionManager.appendMessage API. */
 type PiMessage = Parameters<SessionManager["appendMessage"]>[0]
-
-/** Assistant message variant required when replaying stored assistant entries. */
 type PiAssistantMessage = Extract<PiMessage, { role: "assistant" }>

-/** Inputs required to rebuild a Pi session manager from stored conversation entries. */
 export interface CreateSessionManagerInput {
 	cwd?: string
 	entries: ConversationStorageEntry[]
--- a/apps/freya-backend/src/conversations/errors.ts
+++ b/apps/freya-backend/src/conversations/errors.ts
@@ -1,11 +0,0 @@
-export class ConversationNotFoundError extends Error {
-	readonly conversationId: string
-	readonly userId: string
-
-	constructor(conversationId: string, userId: string) {
-		super(`Conversation "${conversationId}" not found for user "${userId}"`)
-		this.name = "ConversationNotFoundError"
-		this.conversationId = conversationId
-		this.userId = userId
-	}
-}
--- a/apps/freya-backend/src/conversations/http.test.ts
+++ b/apps/freya-backend/src/conversations/http.test.ts
@@ -1,55 +1,21 @@
-import { ConversationEntryKind, ConversationEntryVisibility } from "@freya/core"
 import { beforeEach, describe, expect, mock, test } from "bun:test"
 import { Hono } from "hono"

 import type { Database } from "../db/index.ts"
-import type {
-	ConversationEntryRow,
-	ConversationRow,
-	ListConversationEntriesParams,
-} from "./storage.ts"
+import type { ConversationRow } from "./storage.ts"

 import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
-import { ConversationNotFoundError } from "./errors.ts"
 import { registerConversationsHttpHandlers } from "./http.ts"

 const MockUserId = "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn"
-const ConversationId = "11111111-1111-4111-8111-111111111111"
-const MissingConversationId = "22222222-2222-4222-8222-222222222222"

 const conversationRowsByUser = new Map<string, ConversationRow[]>()
-const conversationEntryRowsByUserAndConversation = new Map<string, ConversationEntryRow[]>()
-const listEntriesCalls: Array<{
-	userId: string
-	conversationId: string
-	params: ListConversationEntriesParams
-}> = []

 mock.module("./storage.ts", () => ({
 	conversations: (_db: Database, userId: string) => ({
 		async listConversations(): Promise<ConversationRow[]> {
 			return conversationRowsByUser.get(userId) ?? []
 		},
-
-		async listEntries(
-			conversationId: string,
-			params: ListConversationEntriesParams = {},
-		): Promise<ConversationEntryRow[]> {
-			listEntriesCalls.push({ userId, conversationId, params })
-
-			const rows = conversationEntryRowsByUserAndConversation.get(
-				conversationEntriesKey(userId, conversationId),
-			)
-			if (!rows) {
-				throw new ConversationNotFoundError(conversationId, userId)
-			}
-
-			if (params.visibility) {
-				return rows.filter((row) => row.visibility === params.visibility)
-			}
-
-			return rows
-		},
 	}),
 }))

@@ -78,39 +44,9 @@ function createConversationRow(
 	}
 }

-function createConversationEntryRow(
-	id: string,
-	conversationId: string,
-	sequence: number,
-	kind: ConversationEntryRow["kind"],
-	visibility: ConversationEntryRow["visibility"],
-	payload: ConversationEntryRow["payload"],
-	createdAt: string,
-	metadata: ConversationEntryRow["metadata"] = {},
-	fileId: string | null = null,
-): ConversationEntryRow {
-	return {
-		id,
-		conversationId,
-		sequence,
-		kind,
-		visibility,
-		fileId,
-		payload,
-		metadata,
-		createdAt: new Date(createdAt),
-	}
-}
-
-function conversationEntriesKey(userId: string, conversationId: string): string {
-	return `${userId}:${conversationId}`
-}
-
 describe("GET /api/conversations", () => {
 	beforeEach(() => {
 		conversationRowsByUser.clear()
-		conversationEntryRowsByUserAndConversation.clear()
-		listEntriesCalls.length = 0
 	})

 	test("returns 401 without auth", async () => {
@@ -172,162 +108,3 @@ describe("GET /api/conversations", () => {
 		})
 	})
 })
-
-describe("GET /api/conversations/:id/entries", () => {
-	beforeEach(() => {
-		conversationRowsByUser.clear()
-		conversationEntryRowsByUserAndConversation.clear()
-		listEntriesCalls.length = 0
-	})
-
-	test("returns 401 without auth", async () => {
-		const app = buildTestApp()
-
-		const res = await app.request("/api/conversations/conversation-1/entries")
-
-		expect(res.status).toBe(401)
-	})
-
-	test("returns user-visible entries for the authenticated user", async () => {
-		conversationEntryRowsByUserAndConversation.set(
-			conversationEntriesKey(MockUserId, ConversationId),
-			[
-				createConversationEntryRow(
-					"entry-user",
-					ConversationId,
-					1,
-					ConversationEntryKind.UserMessage,
-					ConversationEntryVisibility.UserVisible,
-					{
-						role: "user",
-						parts: [{ type: "text", text: "What is on today?" }],
-					},
-					"2026-06-17T09:30:00.000Z",
-				),
-				createConversationEntryRow(
-					"entry-tool",
-					ConversationId,
-					2,
-					ConversationEntryKind.ToolCall,
-					ConversationEntryVisibility.Internal,
-					{
-						toolName: "freya_list_context",
-						input: {},
-					},
-					"2026-06-17T09:30:01.000Z",
-				),
-				createConversationEntryRow(
-					"entry-assistant",
-					ConversationId,
-					3,
-					ConversationEntryKind.AssistantMessage,
-					ConversationEntryVisibility.UserVisible,
-					{
-						role: "assistant",
-						parts: [{ type: "text", text: "You have two calendar events." }],
-					},
-					"2026-06-17T09:30:02.000Z",
-					{ runId: "run-1" },
-				),
-			],
-		)
-		const app = buildTestApp("user-1")
-
-		const res = await app.request(`/api/conversations/${ConversationId}/entries`)
-
-		expect(res.status).toBe(200)
-		expect(listEntriesCalls).toEqual([
-			{
-				userId: MockUserId,
-				conversationId: ConversationId,
-				params: { visibility: ConversationEntryVisibility.UserVisible },
-			},
-		])
-
-		const body = (await res.json()) as { entries: unknown[] }
-		expect(body).toEqual({
-			entries: [
-				{
-					id: "entry-user",
-					conversationId: ConversationId,
-					sequence: 1,
-					kind: ConversationEntryKind.UserMessage,
-					visibility: ConversationEntryVisibility.UserVisible,
-					fileId: null,
-					payload: {
-						role: "user",
-						parts: [{ type: "text", text: "What is on today?" }],
-					},
-					metadata: {},
-					createdAt: "2026-06-17T09:30:00.000Z",
-				},
-				{
-					id: "entry-assistant",
-					conversationId: ConversationId,
-					sequence: 3,
-					kind: ConversationEntryKind.AssistantMessage,
-					visibility: ConversationEntryVisibility.UserVisible,
-					fileId: null,
-					payload: {
-						role: "assistant",
-						parts: [{ type: "text", text: "You have two calendar events." }],
-					},
-					metadata: { runId: "run-1" },
-					createdAt: "2026-06-17T09:30:02.000Z",
-				},
-			],
-		})
-	})
-
-	test("returns an empty list when the conversation has no user-visible entries", async () => {
-		conversationEntryRowsByUserAndConversation.set(
-			conversationEntriesKey(MockUserId, ConversationId),
-			[
-				createConversationEntryRow(
-					"entry-tool",
-					ConversationId,
-					1,
-					ConversationEntryKind.ToolResult,
-					ConversationEntryVisibility.Internal,
-					{ toolCallId: "call-1", output: { ok: true } },
-					"2026-06-17T09:30:00.000Z",
-				),
-			],
-		)
-		const app = buildTestApp("user-1")
-
-		const res = await app.request(`/api/conversations/${ConversationId}/entries`)
-
-		expect(res.status).toBe(200)
-		const body = (await res.json()) as { entries: unknown[] }
-		expect(body).toEqual({ entries: [] })
-	})
-
-	test("returns 404 for malformed conversation ids without querying storage", async () => {
-		const app = buildTestApp("user-1")
-
-		const res = await app.request("/api/conversations/missing-conversation/entries")
-
-		expect(res.status).toBe(404)
-		expect(listEntriesCalls).toEqual([])
-		const body = (await res.json()) as { error: string }
-		expect(body).toEqual({ error: "Conversation not found" })
-	})
-
-	test("returns 404 when the conversation does not exist for the user", async () => {
-		const app = buildTestApp("user-1")
-
-		const res = await app.request(`/api/conversations/${MissingConversationId}/entries`)
-
-		expect(res.status).toBe(404)
-		expect(listEntriesCalls).toEqual([
-			{
-				userId: MockUserId,
-				conversationId: MissingConversationId,
-				params: { visibility: ConversationEntryVisibility.UserVisible },
-			},
-		])
-		const body = (await res.json()) as { error: string }
-		expect(body).toEqual({ error: "Conversation not found" })
-	})
-})
--- a/apps/freya-backend/src/conversations/http.ts
+++ b/apps/freya-backend/src/conversations/http.ts
@@ -1,38 +1,23 @@
 import type { Context, Hono } from "hono"

-import { ConversationEntryVisibility } from "@freya/core"
-import { type } from "arktype"
 import { createMiddleware } from "hono/factory"

 import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
 import type { Database } from "../db/index.ts"
-import type { ConversationRow } from "./storage.ts"

-import { ConversationNotFoundError } from "./errors.ts"
 import { conversations } from "./storage.ts"

-/** Hono environment populated by the conversations route middleware. */
 type Env = {
 	Variables: {
 		db: Database
 	}
 }

-/** Serialized conversation summary returned by the list endpoint. */
-interface ConversationSummaryResponse {
-	id: string
-	createdAt: string
-	updatedAt: string
-}
-
-/** Dependencies required to register conversation HTTP handlers. */
 interface ConversationsHttpHandlersDeps {
 	db: Database
 	authSessionMiddleware: AuthSessionMiddleware
 }

-const ConversationIdParam = type("string.uuid")
-
 export function registerConversationsHttpHandlers(
 	app: Hono,
 	{ db, authSessionMiddleware }: ConversationsHttpHandlersDeps,
@@ -43,7 +28,6 @@ export function registerConversationsHttpHandlers(
 	})

 	app.get("/api/conversations", inject, authSessionMiddleware, handleListConversations)
-	app.get("/api/conversations/:id/entries", inject, authSessionMiddleware, handleListEntries)
 }

 async function handleListConversations(c: Context<Env>) {
@@ -51,54 +35,10 @@ async function handleListConversations(c: Context<Env>) {
 	const db = c.get("db")

 	return c.json({
-		conversations: (await conversations(db, user.id).listConversations()).map(
-			serializeConversation,
-		),
+		conversations: (await conversations(db, user.id).listConversations()).map((row) => ({
+			id: row.id,
+			createdAt: row.createdAt.toISOString(),
+			updatedAt: row.updatedAt.toISOString(),
+		})),
 	})
 }
-
-async function handleListEntries(c: Context<Env>) {
-	const user = c.get("user")!
-	const db = c.get("db")
-	const conversationId = c.req.param("id")
-	if (!conversationId) {
-		return c.json({ error: "Conversation not found" }, 404)
-	}
-	const parsedConversationId = ConversationIdParam(conversationId)
-	if (parsedConversationId instanceof type.errors) {
-		return c.json({ error: "Conversation not found" }, 404)
-	}
-
-	try {
-		const entries = await conversations(db, user.id).listEntries(parsedConversationId, {
-			visibility: ConversationEntryVisibility.UserVisible,
-		})
-
-		return c.json({
-			entries: entries.map((row) => ({
-				id: row.id,
-				conversationId: row.conversationId,
-				sequence: row.sequence,
-				kind: row.kind,
-				visibility: row.visibility,
-				fileId: row.fileId,
-				payload: row.payload,
-				metadata: row.metadata,
-				createdAt: row.createdAt.toISOString(),
-			})),
-		})
-	} catch (err) {
-		if (err instanceof ConversationNotFoundError) {
-			return c.json({ error: "Conversation not found" }, 404)
-		}
-		throw err
-	}
-}
-
-function serializeConversation(row: ConversationRow): ConversationSummaryResponse {
-	return {
-		id: row.id,
-		createdAt: row.createdAt.toISOString(),
-		updatedAt: row.updatedAt.toISOString(),
-	}
-}
--- a/apps/freya-backend/src/conversations/storage.ts
+++ b/apps/freya-backend/src/conversations/storage.ts
@@ -1,18 +1,17 @@
-import {
-	AssistantMessagePayload,
-	AttachmentPayload,
-	ConversationEntryKind,
-	ConversationEntryVisibility,
-	ContextSummaryPayload,
-	ConversationEntryMetadata,
-	GenericObjectPayload,
-	UserMessagePayload,
-	type ConversationEntryPayload,
-} from "@freya/core"
-import { type } from "arktype"
 import { and, asc, desc, eq } from "drizzle-orm"

 import type { Database } from "../db/index.ts"
+import type {
+	AssistantMessagePayload,
+	AttachmentPayload,
+	ContextSummaryPayload,
+	ConversationEntryKind as ConversationEntryKindType,
+	ConversationEntryMetadata,
+	ConversationEntryPayload,
+	ConversationEntryVisibility as ConversationEntryVisibilityType,
+	GenericObjectPayload,
+	UserMessagePayload,
+} from "./types.ts"

 import {
 	conversationEntries,
@@ -20,21 +19,23 @@ import {
 	files,
 	user,
 } from "../db/schema.ts"
-import { ConversationNotFoundError } from "./errors.ts"
+import {
+	ConversationEntryMetadata as ConversationEntryMetadataSchema,
+	AssistantMessagePayload as AssistantMessagePayloadSchema,
+	AttachmentPayload as AttachmentPayloadSchema,
+	ConversationEntryKind,
+	ConversationEntryKindInput,
+	ConversationEntryVisibility,
+	ConversationEntryVisibilityInput,
+	ContextSummaryPayload as ContextSummaryPayloadSchema,
+	GenericObjectPayload as GenericObjectPayloadSchema,
+	UserMessagePayload as UserMessagePayloadSchema,
+} from "./types.ts"

-const conversationEntryKind = type.enumerated(...Object.values(ConversationEntryKind))
-const conversationEntryVisibility = type.enumerated(...Object.values(ConversationEntryVisibility))
-
-/** Database row shape for a conversation owned by a user. */
 export type ConversationRow = typeof conversationsTable.$inferSelect
-
-/** Database row shape for an entry in a conversation timeline. */
 export type ConversationEntryRow = typeof conversationEntries.$inferSelect
-
-/** Database row shape for an uploaded file referenced by conversations. */
 export type FileRow = typeof files.$inferSelect

-/** Input required to create a stored file record. */
 export interface CreateFileInput {
 	storageKey: string
 	originalName?: string
@@ -43,27 +44,23 @@ export interface CreateFileInput {
 	metadata?: Record<string, unknown>
 }

-/** Input for creating a file and appending its attachment entry together. */
 export interface AppendAttachmentEntryInput {
 	file: CreateFileInput
 	payload: AttachmentPayload
-	visibility?: ConversationEntryVisibility
+	visibility?: ConversationEntryVisibilityType
 	metadata?: ConversationEntryMetadata
 }

-/** Result returned after a file-backed attachment entry is appended. */
 export interface AppendAttachmentEntryResult {
 	file: FileRow
 	entry: ConversationEntryRow
 }

-/** Common fields accepted when appending any conversation entry. */
 interface AppendConversationEntryBase {
-	visibility?: ConversationEntryVisibility
+	visibility?: ConversationEntryVisibilityType
 	metadata?: ConversationEntryMetadata
 }

-/** Discriminated input for appending any supported entry kind to a conversation. */
 export type AppendConversationEntryInput =
 	| (AppendConversationEntryBase & {
 			kind: typeof ConversationEntryKind.UserMessage
@@ -94,13 +91,12 @@ export type AppendConversationEntryInput =
 			fileId?: never
 	  })

-/** Filters accepted when listing conversation entries. */
 export interface ListConversationEntriesParams {
-	visibility?: ConversationEntryVisibility
+	visibility?: ConversationEntryVisibilityType
 }

 export function conversations(db: Database, userId: string) {
-	const storage = {
+	return {
 		async createConversation(): Promise<ConversationRow> {
 			return insertConversation(db, userId)
 		},
@@ -113,18 +109,6 @@ export function conversations(db: Database, userId: string) {
 				.orderBy(desc(conversationsTable.updatedAt), desc(conversationsTable.createdAt))
 		},

-		async getConversation(conversationId: string): Promise<ConversationRow | null> {
-			const rows = await db
-				.select()
-				.from(conversationsTable)
-				.where(
-					and(eq(conversationsTable.id, conversationId), eq(conversationsTable.userId, userId)),
-				)
-				.limit(1)
-
-			return rows[0] ?? null
-		},
-
 		async getOrCreateConversation(): Promise<ConversationRow> {
 			return db.transaction(async (tx) => {
 				await requireUserForUpdate(tx, userId)
@@ -143,12 +127,12 @@ export function conversations(db: Database, userId: string) {
 			conversationId: string,
 			input: AppendConversationEntryInput,
 		): Promise<ConversationEntryRow> {
-			const kind = conversationEntryKind.assert(input.kind)
-			const visibility = conversationEntryVisibility.assert(
+			const kind = ConversationEntryKindInput.assert(input.kind)
+			const visibility = ConversationEntryVisibilityInput.assert(
 				input.visibility ?? defaultVisibilityForKind(kind),
 			)
 			const payload = payloadForKind(kind, input.payload)
-			const metadata = ConversationEntryMetadata.assert(input.metadata ?? {})
+			const metadata = ConversationEntryMetadataSchema.assert(input.metadata ?? {})
 			let fileId: string | null = null

 			if (input.kind === ConversationEntryKind.Attachment) {
@@ -157,9 +141,7 @@ export function conversations(db: Database, userId: string) {
 			}

 			const rows = await db.transaction(async (tx) => {
-				if (!(await findConversationForUpdate(tx, userId, conversationId))) {
-					throw new ConversationNotFoundError(conversationId, userId)
-				}
+				await requireConversationForUpdate(tx, userId, conversationId)
 				const sequence = await nextSequence(tx, conversationId)

 				const rows = await tx
@@ -186,16 +168,14 @@ export function conversations(db: Database, userId: string) {
 			conversationId: string,
 			input: AppendAttachmentEntryInput,
 		): Promise<AppendAttachmentEntryResult> {
-			const payload = AttachmentPayload.assert(input.payload)
-			const visibility = conversationEntryVisibility.assert(
+			const payload = AttachmentPayloadSchema.assert(input.payload)
+			const visibility = ConversationEntryVisibilityInput.assert(
 				input.visibility ?? defaultVisibilityForKind(ConversationEntryKind.Attachment),
 			)
-			const metadata = ConversationEntryMetadata.assert(input.metadata ?? {})
+			const metadata = ConversationEntryMetadataSchema.assert(input.metadata ?? {})

 			return db.transaction(async (tx) => {
-				if (!(await findConversationForUpdate(tx, userId, conversationId))) {
-					throw new ConversationNotFoundError(conversationId, userId)
-				}
+				await requireConversationForUpdate(tx, userId, conversationId)

 				const file = await insertFile(tx, userId, input.file)
 				const sequence = await nextSequence(tx, conversationId)
@@ -224,9 +204,7 @@ export function conversations(db: Database, userId: string) {
 			conversationId: string,
 			params: ListConversationEntriesParams = {},
 		): Promise<ConversationEntryRow[]> {
-			if (!(await storage.getConversation(conversationId))) {
-				throw new ConversationNotFoundError(conversationId, userId)
-			}
+			await requireConversation(db, userId, conversationId)

 			if (params.visibility) {
 				return db
@@ -248,27 +226,25 @@ export function conversations(db: Database, userId: string) {
 				.orderBy(asc(conversationEntries.sequence))
 		},
 	}
-
-	return storage
 }

 function payloadForKind(
-	kind: ConversationEntryKind,
+	kind: ConversationEntryKindType,
 	payload: AppendConversationEntryInput["payload"],
 ): ConversationEntryPayload {
 	switch (kind) {
 		case ConversationEntryKind.UserMessage:
-			return UserMessagePayload.assert(payload)
+			return UserMessagePayloadSchema.assert(payload)
 		case ConversationEntryKind.AssistantMessage:
-			return AssistantMessagePayload.assert(payload)
+			return AssistantMessagePayloadSchema.assert(payload)
 		case ConversationEntryKind.Attachment:
-			return AttachmentPayload.assert(payload)
+			return AttachmentPayloadSchema.assert(payload)
 		case ConversationEntryKind.ContextSummary:
-			return ContextSummaryPayload.assert(payload)
+			return ContextSummaryPayloadSchema.assert(payload)
 		case ConversationEntryKind.ToolCall:
 		case ConversationEntryKind.ToolResult:
 		case ConversationEntryKind.SystemNote:
-			return GenericObjectPayload.assert(payload)
+			return GenericObjectPayloadSchema.assert(payload)
 	}
 }

@@ -283,11 +259,25 @@ async function requireUserForUpdate(db: Database, userId: string): Promise<void>
 	requireRow(rows, `User not found: ${userId}`)
 }

-async function findConversationForUpdate(
+async function requireConversation(
 	db: Database,
 	userId: string,
 	conversationId: string,
-): Promise<ConversationRow | null> {
+): Promise<ConversationRow> {
+	const rows = await db
+		.select()
+		.from(conversationsTable)
+		.where(and(eq(conversationsTable.id, conversationId), eq(conversationsTable.userId, userId)))
+		.limit(1)
+
+	return requireRow(rows, `Conversation not found: ${conversationId}`)
+}
+
+async function requireConversationForUpdate(
+	db: Database,
+	userId: string,
+	conversationId: string,
+): Promise<ConversationRow> {
 	const rows = await db
 		.select()
 		.from(conversationsTable)
@@ -295,7 +285,7 @@ async function findConversationForUpdate(
 		.limit(1)
 		.for("update")

-	return rows[0] ?? null
+	return requireRow(rows, `Conversation not found: ${conversationId}`)
 }

 async function latestConversation(db: Database, userId: string): Promise<ConversationRow | null> {
@@ -374,7 +364,9 @@ function requireRow<T>(rows: T[], message = "Expected database row"): T {
 	return row
 }

-function defaultVisibilityForKind(kind: ConversationEntryKind): ConversationEntryVisibility {
+function defaultVisibilityForKind(
+	kind: ConversationEntryKindType,
+): ConversationEntryVisibilityType {
 	switch (kind) {
 		case ConversationEntryKind.UserMessage:
 		case ConversationEntryKind.AssistantMessage:
--- a/apps/freya-backend/src/conversations/types.test.ts
+++ b/apps/freya-backend/src/conversations/types.test.ts
@@ -7,7 +7,7 @@ import {
 	ConversationEntryMetadata,
 	GenericObjectPayload,
 	UserMessagePayload,
-} from "./conversation"
+} from "./types.ts"

 describe("conversation entry schemas", () => {
 	test("parses valid user message payloads", () => {
--- a/apps/freya-backend/src/conversations/types.ts
+++ b/apps/freya-backend/src/conversations/types.ts
@@ -1,6 +1,5 @@
 import { type } from "arktype"

-/** Entry kinds supported by the persisted conversation timeline. */
 export const ConversationEntryKind = {
 	UserMessage: "user_message",
 	AssistantMessage: "assistant_message",
@@ -11,21 +10,17 @@ export const ConversationEntryKind = {
 	SystemNote: "system_note",
 } as const

-/** Discriminator for the payload shape and handling of a conversation entry. */
 export type ConversationEntryKind =
 	(typeof ConversationEntryKind)[keyof typeof ConversationEntryKind]

-/** Visibility scopes supported by stored conversation entries. */
 export const ConversationEntryVisibility = {
 	UserVisible: "user_visible",
 	Internal: "internal",
 } as const

-/** Indicates whether a conversation entry should be exposed to the user. */
 export type ConversationEntryVisibility =
 	(typeof ConversationEntryVisibility)[keyof typeof ConversationEntryVisibility]

-/** Attachment media categories accepted by conversation entries. */
 export const AttachmentType = {
 	Image: "image",
 	Audio: "audio",
@@ -34,64 +29,57 @@ export const AttachmentType = {
 	Other: "other",
 } as const

-/** File or media category associated with an attachment payload. */
 export type AttachmentType = (typeof AttachmentType)[keyof typeof AttachmentType]

-/** Plain text content part for a message. */
-export const TextMessagePart = type({
+export const ConversationEntryKindInput = type.enumerated(...Object.values(ConversationEntryKind))
+export const ConversationEntryVisibilityInput = type.enumerated(
+	...Object.values(ConversationEntryVisibility),
+)
+export const AttachmentTypeInput = type.enumerated(...Object.values(AttachmentType))
+
+const TextMessagePart = type({
 	"+": "reject",
 	type: "'text'",
 	text: "string",
 })

-/** Structured JSON content part for a message. */
-export const JsonMessagePart = type({
+const JsonMessagePart = type({
 	"+": "reject",
 	type: "'json'",
 	value: "unknown",
 })

-/** Content part variants supported by user and assistant messages. */
 export const MessagePart = type.or(TextMessagePart, JsonMessagePart)
-
-/** A structured content part inside a user or assistant message payload. */
 export type MessagePart = typeof MessagePart.infer

-/** User-authored message entry payload. */
 export const UserMessagePayload = type({
 	"+": "reject",
 	role: "'user'",
 	parts: MessagePart.array().atLeastLength(1),
 })

-/** Payload stored for a conversation entry containing a user message. */
 export type UserMessagePayload = typeof UserMessagePayload.infer

-/** Assistant-authored message entry payload. */
 export const AssistantMessagePayload = type({
 	"+": "reject",
 	role: "'assistant'",
 	parts: MessagePart.array().atLeastLength(1),
 })

-/** Payload stored for a conversation entry containing an assistant message. */
 export type AssistantMessagePayload = typeof AssistantMessagePayload.infer

-/** Attachment entry payload. */
 export const AttachmentPayload = type({
 	"+": "reject",
 	role: type.enumerated("user", "assistant"),
 	name: "string",
 	mimeType: "string",
-	attachmentType: type.enumerated(...Object.values(AttachmentType)),
+	attachmentType: AttachmentTypeInput,
 	"caption?": "string",
 })

-/** Payload stored for a conversation entry that references an uploaded file. */
 export type AttachmentPayload = typeof AttachmentPayload.infer

-/** Durable facts extracted from compacted conversation history. */
-export const ContextSummary = type({
+const ContextSummary = type({
 	"+": "reject",
 	"userIntent?": "string",
 	durableFacts: type.string.array(),
@@ -101,10 +89,6 @@ export const ContextSummary = type({
 	importantDetails: type.string.array(),
 })

-/** Durable facts and follow-ups retained from compacted conversation history. */
-export type ContextSummary = typeof ContextSummary.infer
-
-/** Context-summary conversation entry payload. */
 export const ContextSummaryPayload = type({
 	"+": "reject",
 	covers: type({
@@ -117,10 +101,8 @@ export const ContextSummaryPayload = type({
 	"sourceEntryIds?": type.string.array(),
 })

-/** Payload describing a compaction summary and the sequence range it covers. */
 export type ContextSummaryPayload = typeof ContextSummaryPayload.infer

-/** Model invocation metadata recorded on generated entries. */
 export const ModelRunMetadata = type({
 	"+": "reject",
 	route: "string",
@@ -134,25 +116,18 @@ export const ModelRunMetadata = type({
 	"providerRequestId?": "string",
 })

-/** Metadata describing the model run that produced a conversation entry. */
 export type ModelRunMetadata = typeof ModelRunMetadata.infer

-/** Arbitrary metadata stored alongside conversation entries. */
 export const ConversationEntryMetadata = type({
 	"modelRun?": ModelRunMetadata,
 	"[string]": "unknown",
 })

-/** Metadata bag attached to a conversation entry. */
 export type ConversationEntryMetadata = typeof ConversationEntryMetadata.infer

-/** Generic object payload used by operational entries. */
 export const GenericObjectPayload = type("Record<string, unknown>")
-
-/** Fallback payload shape for tool calls, tool results, and system notes. */
 export type GenericObjectPayload = typeof GenericObjectPayload.infer

-/** Union of payload shapes that can be stored on a conversation entry. */
 export type ConversationEntryPayload =
 	| UserMessagePayload
 	| AssistantMessagePayload
--- a/apps/freya-backend/src/db/schema.ts
+++ b/apps/freya-backend/src/db/schema.ts
@@ -1,10 +1,3 @@
-import {
-	ConversationEntryVisibility,
-	type ConversationEntryKind,
-	type ConversationEntryMetadata,
-	type ConversationEntryPayload,
-	type ConversationEntryVisibility as ConversationEntryVisibilityType,
-} from "@freya/core"
 import { sql } from "drizzle-orm"
 import {
 	boolean,
@@ -20,6 +13,14 @@ import {
 	uuid,
 } from "drizzle-orm/pg-core"

+import {
+	ConversationEntryVisibility,
+	type ConversationEntryKind,
+	type ConversationEntryMetadata,
+	type ConversationEntryPayload,
+	type ConversationEntryVisibility as ConversationEntryVisibilityType,
+} from "../conversations/types.ts"
+
 // ---------------------------------------------------------------------------
 // Better Auth core tables
 // Re-exported from CLI-generated schema.
--- a/apps/freya-backend/src/server.ts
+++ b/apps/freya-backend/src/server.ts
@@ -11,7 +11,6 @@ import { registerAuthHandlers } from "./auth/http.ts"
 import { createAuth } from "./auth/index.ts"
 import { createRequireSession } from "./auth/session-middleware.ts"
 import { CalDavSourceProvider } from "./caldav/provider.ts"
-import { registerConversationsHttpHandlers } from "./conversations/http.ts"
 import { createDatabase } from "./db/index.ts"
 import { registerFeedHttpHandlers } from "./engine/http.ts"
 import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
@@ -130,7 +129,6 @@ function main() {
 		sessionManager,
 		authSessionMiddleware,
 	})
-	registerConversationsHttpHandlers(app, { db, authSessionMiddleware })
 	if (isDebugMode) {
 		registerDebugAgentHttpHandlers(app, {
 			authSessionMiddleware,
--- a/apps/freya-backend/src/session/user-session-manager.test.ts
+++ b/apps/freya-backend/src/session/user-session-manager.test.ts
@@ -1,6 +1,5 @@
 import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"

-import { ConversationEntryKind } from "@freya/core"
 import { LocationSource } from "@freya/source-location"
 import { WeatherSource } from "@freya/source-weatherkit"
 import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test"
@@ -10,6 +9,7 @@ import type { AppendConversationEntryInput } from "../conversations/storage.ts"
 import type { Database } from "../db/index.ts"
 import type { FeedSourceProvider } from "./feed-source-provider.ts"

+import { ConversationEntryKind } from "../conversations/types.ts"
 import { CredentialEncryptor } from "../lib/crypto.ts"
 import {
 	CredentialStorageUnavailableError,
--- a/apps/freya-backend/src/session/user-session.test.ts
+++ b/apps/freya-backend/src/session/user-session.test.ts
@@ -1,6 +1,5 @@
 import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"

-import { ConversationEntryKind } from "@freya/core"
 import { LocationSource } from "@freya/source-location"
 import { describe, expect, spyOn, test } from "bun:test"

@@ -10,6 +9,7 @@ import type {
 } from "../agent/conversation-recording-query-agent.ts"
 import type { AppendConversationEntryInput } from "../conversations/storage.ts"

+import { ConversationEntryKind } from "../conversations/types.ts"
 import { UserSession } from "./user-session.ts"

 function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
--- a/apps/freya-client/app.json
+++ b/apps/freya-client/app.json
@@ -1,12 +1,13 @@
 {
 	"expo": {
 		"name": "Freya",
-		"slug": "freya",
+		"slug": "freya-client",
 		"version": "1.0.0",
 		"orientation": "portrait",
 		"icon": "./assets/images/icon.png",
 		"scheme": "freya",
 		"userInterfaceStyle": "automatic",
+		"newArchEnabled": true,
 		"ios": {
 			"infoPlist": {
 				"NSAppTransportSecurity": {
@@ -23,6 +24,7 @@
 				"backgroundImage": "./assets/images/android-icon-background.png",
 				"monochromeImage": "./assets/images/android-icon-monochrome.png"
 			},
+			"edgeToEdgeEnabled": true,
 			"predictiveBackGestureEnabled": false,
 			"package": "sh.nym.freya"
 		},
@@ -52,82 +54,55 @@
 							{
 								"fontFamily": "Inter",
 								"fontDefinitions": [
-									{
-										"path": "./assets/fonts/Inter_100Thin.ttf",
-										"weight": 100
-									},
+									{ "path": "./assets/fonts/Inter_100Thin.ttf", "weight": 100 },
 									{
 										"path": "./assets/fonts/Inter_100Thin_Italic.ttf",
 										"weight": 100,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/Inter_200ExtraLight.ttf",
-										"weight": 200
-									},
+									{ "path": "./assets/fonts/Inter_200ExtraLight.ttf", "weight": 200 },
 									{
 										"path": "./assets/fonts/Inter_200ExtraLight_Italic.ttf",
 										"weight": 200,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/Inter_300Light.ttf",
-										"weight": 300
-									},
+									{ "path": "./assets/fonts/Inter_300Light.ttf", "weight": 300 },
 									{
 										"path": "./assets/fonts/Inter_300Light_Italic.ttf",
 										"weight": 300,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/Inter_400Regular.ttf",
-										"weight": 400
-									},
+									{ "path": "./assets/fonts/Inter_400Regular.ttf", "weight": 400 },
 									{
 										"path": "./assets/fonts/Inter_400Regular_Italic.ttf",
 										"weight": 400,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/Inter_500Medium.ttf",
-										"weight": 500
-									},
+									{ "path": "./assets/fonts/Inter_500Medium.ttf", "weight": 500 },
 									{
 										"path": "./assets/fonts/Inter_500Medium_Italic.ttf",
 										"weight": 500,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/Inter_600SemiBold.ttf",
-										"weight": 600
-									},
+									{ "path": "./assets/fonts/Inter_600SemiBold.ttf", "weight": 600 },
 									{
 										"path": "./assets/fonts/Inter_600SemiBold_Italic.ttf",
 										"weight": 600,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/Inter_700Bold.ttf",
-										"weight": 700
-									},
+									{ "path": "./assets/fonts/Inter_700Bold.ttf", "weight": 700 },
 									{
 										"path": "./assets/fonts/Inter_700Bold_Italic.ttf",
 										"weight": 700,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/Inter_800ExtraBold.ttf",
-										"weight": 800
-									},
+									{ "path": "./assets/fonts/Inter_800ExtraBold.ttf", "weight": 800 },
 									{
 										"path": "./assets/fonts/Inter_800ExtraBold_Italic.ttf",
 										"weight": 800,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/Inter_900Black.ttf",
-										"weight": 900
-									},
+									{ "path": "./assets/fonts/Inter_900Black.ttf", "weight": 900 },
 									{
 										"path": "./assets/fonts/Inter_900Black_Italic.ttf",
 										"weight": 900,
@@ -138,73 +113,49 @@
 							{
 								"fontFamily": "Source Serif 4",
 								"fontDefinitions": [
-									{
-										"path": "./assets/fonts/SourceSerif4_200ExtraLight.ttf",
-										"weight": 200
-									},
+									{ "path": "./assets/fonts/SourceSerif4_200ExtraLight.ttf", "weight": 200 },
 									{
 										"path": "./assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf",
 										"weight": 200,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/SourceSerif4_300Light.ttf",
-										"weight": 300
-									},
+									{ "path": "./assets/fonts/SourceSerif4_300Light.ttf", "weight": 300 },
 									{
 										"path": "./assets/fonts/SourceSerif4_300Light_Italic.ttf",
 										"weight": 300,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/SourceSerif4_400Regular.ttf",
-										"weight": 400
-									},
+									{ "path": "./assets/fonts/SourceSerif4_400Regular.ttf", "weight": 400 },
 									{
 										"path": "./assets/fonts/SourceSerif4_400Regular_Italic.ttf",
 										"weight": 400,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/SourceSerif4_500Medium.ttf",
-										"weight": 500
-									},
+									{ "path": "./assets/fonts/SourceSerif4_500Medium.ttf", "weight": 500 },
 									{
 										"path": "./assets/fonts/SourceSerif4_500Medium_Italic.ttf",
 										"weight": 500,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/SourceSerif4_600SemiBold.ttf",
-										"weight": 600
-									},
+									{ "path": "./assets/fonts/SourceSerif4_600SemiBold.ttf", "weight": 600 },
 									{
 										"path": "./assets/fonts/SourceSerif4_600SemiBold_Italic.ttf",
 										"weight": 600,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/SourceSerif4_700Bold.ttf",
-										"weight": 700
-									},
+									{ "path": "./assets/fonts/SourceSerif4_700Bold.ttf", "weight": 700 },
 									{
 										"path": "./assets/fonts/SourceSerif4_700Bold_Italic.ttf",
 										"weight": 700,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/SourceSerif4_800ExtraBold.ttf",
-										"weight": 800
-									},
+									{ "path": "./assets/fonts/SourceSerif4_800ExtraBold.ttf", "weight": 800 },
 									{
 										"path": "./assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf",
 										"weight": 800,
 										"style": "italic"
 									},
-									{
-										"path": "./assets/fonts/SourceSerif4_900Black.ttf",
-										"weight": 900
-									},
+									{ "path": "./assets/fonts/SourceSerif4_900Black.ttf", "weight": 900 },
 									{
 										"path": "./assets/fonts/SourceSerif4_900Black_Italic.ttf",
 										"weight": 900,
@@ -253,9 +204,7 @@
 						]
 					}
 				}
-			],
-			"expo-web-browser",
-			"expo-image"
+			]
 		],
 		"experiments": {
 			"typedRoutes": true,
@@ -264,7 +213,7 @@
 		"extra": {
 			"router": {},
 			"eas": {
-				"projectId": "c54ea4e5-27da-4066-b081-db8005ecf70a"
+				"projectId": "61092d23-36aa-418e-929d-ea40dc912e8f"
 			}
 		}
 	}
--- a/apps/freya-client/package.json
+++ b/apps/freya-client/package.json
@@ -10,8 +10,8 @@
 		"ios": "expo start --ios",
 		"web": "expo start --web",
 		"lint": "expo lint",
-		"build:ios": "bunx eas-cli build --profile development --platform ios --non-interactive",
-		"build:ios-simulator": "bunx eas-cli build --profile development-simulator --platform ios --non-interactive",
+		"build:ios": "eas build --profile development --platform ios --non-interactive",
+		"build:ios-simulator": "eas build --profile development-simulator --platform ios --non-interactive",
 		"debugger": "bun run scripts/open-debugger.ts"
 	},
 	"dependencies": {
@@ -19,38 +19,42 @@
 		"@expo-google-fonts/source-serif-4": "^0.4.1",
 		"@expo/vector-icons": "^15.0.3",
 		"@json-render/react-native": "^0.13.0",
+		"@react-navigation/bottom-tabs": "^7.4.0",
+		"@react-navigation/elements": "^2.6.3",
+		"@react-navigation/native": "^7.1.8",
 		"@tanstack/react-query": "^5.90.21",
-		"expo": "^56.0.0",
-		"expo-constants": "~56.0.18",
-		"expo-dev-client": "~56.0.20",
-		"expo-font": "~56.0.7",
-		"expo-haptics": "~56.0.3",
-		"expo-image": "~56.0.11",
-		"expo-linking": "~56.0.14",
-		"expo-location": "~56.0.18",
-		"expo-router": "~56.2.11",
-		"expo-splash-screen": "~56.0.10",
-		"expo-status-bar": "~56.0.4",
-		"expo-symbols": "~56.0.6",
-		"expo-system-ui": "~56.0.5",
-		"expo-web-browser": "~56.0.5",
-		"react": "19.2.3",
-		"react-dom": "19.2.3",
-		"react-native": "0.85.3",
-		"react-native-gesture-handler": "~2.31.1",
-		"react-native-reanimated": "4.3.1",
-		"react-native-safe-area-context": "~5.7.0",
-		"react-native-screens": "4.25.2",
-		"react-native-svg": "15.15.4",
+		"expo": "~54.0.33",
+		"expo-constants": "~18.0.13",
+		"expo-dev-client": "~6.0.20",
+		"expo-font": "~14.0.11",
+		"expo-haptics": "~15.0.8",
+		"expo-image": "~3.0.11",
+		"expo-linking": "~8.0.11",
+		"expo-location": "~19.0.8",
+		"expo-router": "~6.0.23",
+		"expo-splash-screen": "~31.0.13",
+		"expo-status-bar": "~3.0.9",
+		"expo-symbols": "~1.0.8",
+		"expo-system-ui": "~6.0.9",
+		"expo-web-browser": "~15.0.10",
+		"react": "19.1.0",
+		"react-dom": "19.1.0",
+		"react-native": "0.81.5",
+		"react-native-gesture-handler": "~2.28.0",
+		"react-native-reanimated": "~4.1.1",
+		"react-native-safe-area-context": "~5.6.0",
+		"react-native-screens": "~4.16.0",
+		"react-native-svg": "15.12.1",
 		"react-native-web": "~0.21.0",
-		"react-native-worklets": "0.8.3",
+		"react-native-worklets": "0.5.1",
 		"twrnc": "^4.16.0",
 		"zod": "^4.3.6"
 	},
 	"devDependencies": {
-		"@types/react": "~19.2.10",
+		"@types/react": "~19.1.0",
+		"eas-cli": "^18.0.1",
 		"eslint": "^9.25.0",
-		"eslint-config-expo": "~56.0.4",
-		"typescript": "~6.0.3"
+		"eslint-config-expo": "~10.0.0",
+		"typescript": "^6"
 	}
 }
--- a/apps/freya-client/scripts/dev-proxy.ts
+++ b/apps/freya-client/scripts/dev-proxy.ts
@@ -8,16 +8,14 @@ import type { ServerWebSocket } from "bun"

 const PROXY_PORT = parseInt(process.env.PROXY_PORT || "8080", 10)
 const PROXY_HOST = process.env.PROXY_HOST || "0.0.0.0"
-const METRO_HOST = process.env.METRO_HOST || "localhost"
 const METRO_PORT = parseInt(process.env.METRO_PORT || "8081", 10)
-const METRO_BASE = `http://${METRO_HOST}:${METRO_PORT}`
-const METRO_WS_BASE = `ws://${METRO_HOST}:${METRO_PORT}`
+const METRO_BASE = `http://127.0.0.1:${METRO_PORT}`

 function forwardHeaders(headers: Headers): Headers {
 	const result = new Headers(headers)
 	result.delete("origin")
 	result.delete("referer")
-	result.set("host", `${METRO_HOST}:${METRO_PORT}`)
+	result.set("host", `127.0.0.1:${METRO_PORT}`)
 	return result
 }

@@ -42,7 +40,7 @@ Bun.serve<WsData>({

 		// WebSocket upgrade — bridge to Metro's ws endpoint
 		if (req.headers.get("upgrade")?.toLowerCase() === "websocket") {
-			const wsUrl = `${METRO_WS_BASE}${url.pathname}${url.search}`
+			const wsUrl = `ws://127.0.0.1:${METRO_PORT}${url.pathname}${url.search}`
 			const upstream = new WebSocket(wsUrl)

 			// Wait for upstream to connect before upgrading the client
@@ -67,12 +65,12 @@ Bun.serve<WsData>({
 		// HTTP proxy
 		const upstream = `${METRO_BASE}${url.pathname}${url.search}`
 		const body = req.body ? await req.arrayBuffer() : undefined
-		const res = await fetchUpstream(upstream, req.method, forwardHeaders(req.headers), body)
-		if (res == null) {
-			return new Response(`Metro is not reachable on ${METRO_HOST}. Restart the Expo dev server.`, {
-				status: 502,
-			})
-		}
+		const res = await fetch(upstream, {
+			method: req.method,
+			headers: forwardHeaders(req.headers),
+			body,
+			redirect: "manual",
+		})

 		return new Response(res.body, {
 			status: res.status,
@@ -123,7 +121,9 @@ async function printDebuggerUrl() {
 	const target = targets.find((t) => t.reactNative?.capabilities?.prefersFuseboxFrontend)
 	if (!target) return

-	const wsPath = getProxyWebSocketPath(target.webSocketDebuggerUrl)
+	const wsPath = target.webSocketDebuggerUrl
+		.replace(/^ws:\/\//, "")
+		.replace(`127.0.0.1:${METRO_PORT}`, `${tsIp}:${PROXY_PORT}`)

 	console.log(
 		`\n  React Native DevTools:\n  ${base}/debugger-frontend/rn_fusebox.html?ws=${encodeURIComponent(wsPath)}&sources.hide_add_folder=true&unstable_enableNetworkPanel=true\n`,
@@ -131,28 +131,9 @@ async function printDebuggerUrl() {
 }

 console.log(
-	`[proxy] listening on ${PROXY_HOST}:${PROXY_PORT}, forwarding to ${METRO_HOST}:${METRO_PORT}`,
+	`[proxy] listening on ${PROXY_HOST}:${PROXY_PORT}, forwarding to 127.0.0.1:${METRO_PORT}`,
 )

-async function fetchUpstream(
-	upstream: string,
-	method: string,
-	headers: Headers,
-	body: ArrayBuffer | undefined,
-) {
-	try {
-		return await fetch(upstream, {
-			method,
-			headers,
-			body,
-			redirect: "manual",
-		})
-	} catch {
-		console.error(`[proxy] ${method} ${upstream} failed; Metro is not reachable`)
-		return null
-	}
-}
-
 function isDebugTarget(value: unknown): value is DebugTarget {
 	if (!isRecord(value) || typeof value.webSocketDebuggerUrl !== "string") return false

@@ -168,11 +149,6 @@ function isDebugTarget(value: unknown): value is DebugTarget {
 	return prefersFuseboxFrontend === undefined || typeof prefersFuseboxFrontend === "boolean"
 }

-function getProxyWebSocketPath(webSocketDebuggerUrl: string) {
-	const url = new URL(webSocketDebuggerUrl)
-	return `${tsIp}:${PROXY_PORT}${url.pathname}${url.search}`
-}
-
 function isRecord(value: unknown): value is Record<string, unknown> {
 	return typeof value === "object" && value !== null
 }
--- a/apps/freya-client/scripts/open-debugger.ts
+++ b/apps/freya-client/scripts/open-debugger.ts
@@ -4,6 +4,7 @@
 import { $ } from "bun"

 const PROXY_PORT = process.env.PROXY_PORT || "8080"
+const METRO_PORT = process.env.METRO_PORT || "8081"
 const tsIp = (await $`tailscale ip -4`.text()).trim()
 const base = `http://${tsIp}:${PROXY_PORT}`

@@ -36,7 +37,9 @@ if (!target) {
 	process.exit(1)
 }

-const wsUrl = getProxyWebSocketPath(target.webSocketDebuggerUrl)
+const wsUrl = target.webSocketDebuggerUrl
+	.replace(/^ws:\/\//, "")
+	.replace(`127.0.0.1:${METRO_PORT}`, `${tsIp}:${PROXY_PORT}`)

 const url = `${base}/debugger-frontend/rn_fusebox.html?ws=${encodeURIComponent(wsUrl)}&sources.hide_add_folder=true&unstable_enableNetworkPanel=true`

@@ -68,11 +71,6 @@ function isDebugTarget(value: unknown): value is DebugTarget {
 	return prefersFuseboxFrontend === undefined || typeof prefersFuseboxFrontend === "boolean"
 }

-function getProxyWebSocketPath(webSocketDebuggerUrl: string) {
-	const url = new URL(webSocketDebuggerUrl)
-	return `${tsIp}:${PROXY_PORT}${url.pathname}${url.search}`
-}
-
 function isRecord(value: unknown): value is Record<string, unknown> {
 	return typeof value === "object" && value !== null
 }
--- a/apps/freya-client/scripts/run-dev-server.sh
+++ b/apps/freya-client/scripts/run-dev-server.sh
@@ -1,47 +1,14 @@
 #!/usr/bin/env bash
 set -euo pipefail

-PROXY_PORT=${PROXY_PORT:-8080}
-METRO_HOST=${METRO_HOST:-localhost}
-METRO_PORT=${METRO_PORT:-8081}
+PROXY_PORT=8080
+METRO_PORT=8081
 TS_IP=$(tailscale ip -4)

-port_is_open() {
-	(: >"/dev/tcp/$1/$2") >/dev/null 2>&1
-}
-
-ensure_port_available() {
-	local port=$1
-	local name=$2
-
-	if port_is_open localhost "$port"; then
-		echo "$name port $port is already in use." >&2
-		echo "Stop the existing process or set ${name}_PORT to another value." >&2
-		exit 1
-	fi
-}
-
-wait_for_metro() {
-	for _ in {1..120}; do
-		if port_is_open "$METRO_HOST" "$METRO_PORT"; then
-			return 0
-		fi
-		sleep 0.5
-	done
-
-	echo "Metro did not start on ${METRO_HOST}:${METRO_PORT}." >&2
-	return 1
-}
-
-ensure_port_available "$PROXY_PORT" PROXY
-ensure_port_available "$METRO_PORT" METRO
-
-# Start the proxy only after Metro is listening. Otherwise an iOS client can hit
-# the proxy during Expo startup and get a misleading upstream connection error.
-(
-	wait_for_metro
-	exec env PROXY_PORT=$PROXY_PORT METRO_HOST=$METRO_HOST METRO_PORT=$METRO_PORT bun run scripts/dev-proxy.ts
-) &
+# Start a reverse proxy so Metro sees all requests as loopback.
+# This makes debugger endpoints (/debugger-frontend, /json, /open-debugger)
+# accessible through the Tailscale IP.
+PROXY_PORT=$PROXY_PORT METRO_PORT=$METRO_PORT bun run scripts/dev-proxy.ts &
 PROXY_PID=$!
 trap "kill $PROXY_PID 2>/dev/null" EXIT

--- a/apps/freya-client/src/components/ui/button.tsx
+++ b/apps/freya-client/src/components/ui/button.tsx
@@ -1,5 +1,5 @@
 import Feather from "@expo/vector-icons/Feather"
-import { type PressableProps, Pressable, type StyleProp, View, type ViewStyle } from "react-native"
+import { type PressableProps, Pressable, View } from "react-native"
 import tw from "twrnc"

 import { SansSerifText } from "./sans-serif-text"
@@ -14,10 +14,9 @@ function ButtonIcon({ name }: ButtonIconProps) {
 	return <Feather name={name} size={18} color={tw.color("text-stone-100 dark:text-stone-200")} />
 }

-type ButtonProps = Omit<PressableProps, "children" | "style"> & {
+type ButtonProps = Omit<PressableProps, "children"> & {
 	label: string
 	leadingIcon?: React.ReactNode
-	style?: StyleProp<ViewStyle>
 	trailingIcon?: React.ReactNode
 }

--- a/apps/waitlist-website/package.json
+++ b/apps/waitlist-website/package.json
@@ -16,9 +16,9 @@
 		"lottie-react": "^2.4.1",
 		"lucide-react": "^0.577.0",
 		"motion": "^12.35.0",
-		"react": "19.2.3",
+		"react": "^19.2.4",
 		"react-aria-components": "^1.16.0",
-		"react-dom": "19.2.3",
+		"react-dom": "^19.2.4",
 		"react-router": "7.12.0",
 		"resend": "^6.9.3",
 		"streamdown": "^2.4.0"
--- a/bun.lock
+++ b/bun.lock
--- a/bunfig.toml
+++ b/bunfig.toml
@@ -1,2 +0,0 @@
-[install]
-linker = "hoisted"
--- a/flake.lock
+++ b/flake.lock
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1781577229,
-        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/flake.nix
+++ b/flake.nix
@@ -1,282 +0,0 @@
-{
-  description = "FREYA development shell";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  };
-
-  outputs =
-    { nixpkgs, ... }:
-    let
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
-
-      lib = nixpkgs.lib;
-      forEachSystem = lib.genAttrs systems;
-      pkgsFor = forEachSystem (system: import nixpkgs { inherit system; });
-
-      # App outputs are for long-running local tools and dev servers.
-      appScripts = {
-        expo = "expo";
-        drizzle-studio = "drizzle-studio";
-        freya-backend = "freya-backend";
-        admin-dashboard = "admin-dashboard";
-        agent-test-cli = "agent-test-cli";
-      };
-
-      # Check outputs are the CI-like validation commands run by `nix flake check`.
-      checkCommands = {
-        format-check = "bun run format:check";
-        lint = "bun run lint";
-        test = "bun run test";
-      };
-
-      # Dev-shell conveniences mirror the common app/check commands.
-      shellScripts = appScripts // {
-        freya-test = "test";
-        lint = "lint";
-        format-check = "format:check";
-      };
-
-      # node_modules is content-addressed. If bun.lock or package manifests
-      # change, Nix will report the new hash to put here.
-      nodeModulesHashes = {
-        x86_64-linux = "sha256-8uhlaQAFfCgGdUlrz8sqhtIkC/WfdasbTCi3p/NkU/w=";
-      };
-      checkSystems = lib.attrNames nodeModulesHashes;
-
-      # Dependency derivations only need the lockfile and workspace manifests,
-      # so source-only edits do not force Bun to reinstall.
-      dependencySource = lib.fileset.toSource {
-        root = ./.;
-        fileset = lib.fileset.fileFilter (
-          file: file.name == "bun.lock" || file.name == "package.json" || file.name == "bunfig.toml"
-        ) ./.;
-      };
-
-      # Checks run against a clean source tree, even when using `path:.`.
-      # Without this filter, local node_modules can sneak into the Nix sandbox.
-      projectSource = builtins.path {
-        name = "freya-source";
-        path = ./.;
-        filter =
-          path: type:
-          let
-            name = builtins.baseNameOf path;
-          in
-          !(type == "directory" && (name == ".git" || name == "node_modules")) && name != "result";
-      };
-
-      mkBunScriptCommands =
-        pkgs: scripts:
-        let
-          mkBunScript =
-            name: script:
-            pkgs.writeShellApplication {
-              inherit name;
-              runtimeInputs = with pkgs; [
-                bun
-                git
-              ];
-              text = ''
-                repo_root="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
-                cd "$repo_root"
-                exec bun run ${lib.escapeShellArg script} "$@"
-              '';
-            };
-        in
-        lib.mapAttrs mkBunScript scripts;
-      mkBunApps =
-        commands:
-        lib.mapAttrs (name: command: {
-          type = "app";
-          program = "${command}/bin/${name}";
-        }) commands;
-      mkBunNodeModules =
-        system: pkgs:
-        pkgs.stdenvNoCC.mkDerivation {
-          pname = "freya-node-modules";
-          version = "1";
-          __structuredAttrs = true;
-
-          src = dependencySource;
-          nativeBuildInputs = with pkgs; [
-            bun
-            cacert
-            nodejs
-          ];
-
-          SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-          GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-
-          outputHashAlgo = "sha256";
-          outputHashMode = "recursive";
-          outputHash = nodeModulesHashes.${system};
-
-          # `patchShebangs` embeds Nix store interpreters in package bins. The
-          # check derivations also depend on bun/node, so this dependency blob
-          # can safely drop those references after its hash is verified.
-          unsafeDiscardReferences.out = true;
-
-          dontConfigure = true;
-          # Workspace package links are completed inside each check's source tree,
-          # so they are intentionally dangling in this dependency-only output.
-          dontFixup = true;
-
-          buildPhase = ''
-            runHook preBuild
-
-            export HOME="$TMPDIR/home"
-            mkdir -p "$HOME"
-
-            # Keep the real workspace manifest for `--frozen-lockfile`, but
-            # filter out frontend workspaces that do not participate in checks.
-            # `--force` matters in the Nix sandbox: without it, Bun can accept
-            # manifest-only cached packages and leave tool binaries missing.
-            bun install \
-              --force \
-              --frozen-lockfile \
-              --ignore-scripts \
-              --backend copyfile \
-              --filter freya \
-              --filter '@freya/*' \
-              --filter '@freya/backend' \
-              --no-progress
-
-            patchShebangs node_modules
-
-            runHook postBuild
-          '';
-
-          installPhase = ''
-            runHook preInstall
-
-            mkdir -p "$out"
-
-            # Keep the root install in the store; checks symlink this directly.
-            cp -a node_modules "$out/node_modules"
-
-            # Bun also creates per-workspace node_modules directories. These are
-            # mostly relative symlinks, so checks copy the symlink entries into
-            # their writable source tree instead of symlinking the directory.
-            find apps packages -mindepth 2 -maxdepth 2 -type d -name node_modules -print |
-              while IFS= read -r node_modules_dir; do
-                mkdir -p "$out/$(dirname "$node_modules_dir")"
-                cp -a "$node_modules_dir" "$out/$node_modules_dir"
-              done
-
-            runHook postInstall
-          '';
-        };
-      mkBunCheck =
-        pkgs: nodeModules: name: command:
-        pkgs.stdenvNoCC.mkDerivation {
-          pname = "freya-${name}";
-          version = "1";
-
-          src = projectSource;
-          nativeBuildInputs = with pkgs; [
-            bun
-            nodejs
-          ];
-
-          dontConfigure = true;
-
-          buildPhase = ''
-            runHook preBuild
-
-            export HOME="$TMPDIR/home"
-            mkdir -p "$HOME"
-
-            # Root dependencies are read-only and shared across checks.
-            ln -s "${nodeModules}/node_modules" node_modules
-
-            # Workspace node_modules contain relative symlinks back to packages/
-            # and apps/, so copy just those symlink entries into this source tree.
-            for node_modules_dir in "${nodeModules}"/apps/*/node_modules "${nodeModules}"/packages/*/node_modules; do
-              if [ -d "$node_modules_dir" ]; then
-                relative_path="''${node_modules_dir#"${nodeModules}/"}"
-                mkdir -p "$relative_path"
-                cp -a "$node_modules_dir/." "$relative_path/"
-              fi
-            done
-
-            ${command}
-
-            runHook postBuild
-          '';
-
-          installPhase = ''
-            runHook preInstall
-
-            mkdir -p "$out"
-            touch "$out/${name}"
-
-            runHook postInstall
-          '';
-        };
-    in
-    {
-      apps = forEachSystem (
-        system:
-        let
-          pkgs = pkgsFor.${system};
-        in
-        mkBunApps (mkBunScriptCommands pkgs appScripts)
-      );
-
-      checks = lib.genAttrs checkSystems (
-        system:
-        let
-          pkgs = pkgsFor.${system};
-          nodeModules = mkBunNodeModules system pkgs;
-        in
-        lib.mapAttrs (mkBunCheck pkgs nodeModules) checkCommands
-      );
-
-      devShells = forEachSystem (
-        system:
-        let
-          pkgs = pkgsFor.${system};
-          bunScriptCommands = lib.attrValues (mkBunScriptCommands pkgs shellScripts);
-          commonPackages = with pkgs; [
-            bun
-            eas-cli
-            git
-            gh
-            gnumake
-            nixfmt
-            nodejs
-            openssl
-            pkg-config
-            postgresql
-            python3
-            watchman
-          ];
-          linuxPackages = with pkgs; [
-            gcc
-            inotify-tools
-            tailscale
-          ];
-        in
-        {
-          default = pkgs.mkShell {
-            packages =
-              commonPackages ++ bunScriptCommands ++ pkgs.lib.optionals pkgs.stdenv.isLinux linuxPackages;
-
-            SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-
-            shellHook = ''
-              export PATH="$PWD/node_modules/.bin:$PATH"
-            '';
-          };
-        }
-      );
-
-      formatter = forEachSystem (system: pkgsFor.${system}.nixfmt);
-    };
-}
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
 		"expo": "cd apps/freya-client && bun run start",
 		"drizzle-studio": "TS_IP=$(tailscale ip -4); echo \"Drizzle Studio: https://local.drizzle.studio/?host=${TS_IP}&port=4983\"; cd apps/freya-backend && bunx drizzle-kit studio --host 0.0.0.0 --port 4983",
 		"freya-backend": "TS_IP=$(tailscale ip -4); echo \"Freya Backend: http://${TS_IP}:3000\"; echo \"\"; echo \"------------------ Bun Debugger ------------------\"; echo \"https://debug.bun.sh/#${TS_IP}:6499\"; echo \"------------------ Bun Debugger ------------------\"; echo \"\"; cd apps/freya-backend && bun run dev",
-		"client": "bun run --elide-lines=0 --filter freya-client start",
 		"admin-dashboard": "TS_IP=$(tailscale ip -4); echo \"Admin Dashboard: http://${TS_IP}:5174\"; cd apps/admin-dashboard && bun run dev --host 0.0.0.0",
 		"agent-test-cli": "cd apps/agent-test-cli && bun run start",
 		"test": "bun run --filter '*' test",
--- a/packages/freya-core/package.json
+++ b/packages/freya-core/package.json
@@ -8,8 +8,7 @@
 		"test": "bun test ."
 	},
 	"dependencies": {
-		"@standard-schema/spec": "^1.1.0",
-		"arktype": "^2.1.29"
+		"@standard-schema/spec": "^1.1.0"
 	},
 	"peerDependencies": {
 		"@json-render/core": "*",
--- a/packages/freya-core/src/feed-engine.test.ts
+++ b/packages/freya-core/src/feed-engine.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, spyOn, test } from "bun:test"
+import { describe, expect, test } from "bun:test"

 import type { ActionDefinition, ContextEntry, ContextKey, FeedItem, FeedSource } from "./index"

@@ -145,16 +145,6 @@ function createAlertSource(): FeedSource<AlertFeedItem> {
 	}
 }

-async function waitForCondition(predicate: () => boolean, timeoutMs = 2_000): Promise<void> {
-	const deadline = Date.now() + timeoutMs
-	while (!predicate()) {
-		if (Date.now() > deadline) {
-			throw new Error("Timed out waiting for condition")
-		}
-		await new Promise((resolve) => setTimeout(resolve, 10))
-	}
-}
-
 // =============================================================================
 // TESTS
 // =============================================================================
@@ -817,35 +807,28 @@ describe("FeedEngine", () => {
 		})

 		test("TTL resets after reactive update", async () => {
-			let now = 1_000
-			const nowSpy = spyOn(Date, "now").mockImplementation(() => now)
 			const location = createLocationSource()
 			const weather = createWeatherSource()

 			const engine = new FeedEngine({ cacheTtlMs: 100 }).register(location).register(weather)

-			try {
-				engine.start()
+			engine.start()

-				// Initial reactive update
-				location.simulateUpdate({ lat: 51.5, lng: -0.1 })
-				await new Promise((resolve) => setTimeout(resolve, 50))
+			// Initial reactive update
+			location.simulateUpdate({ lat: 51.5, lng: -0.1 })
+			await new Promise((resolve) => setTimeout(resolve, 50))

-				expect(engine.lastFeed()).not.toBeNull()
+			expect(engine.lastFeed()).not.toBeNull()

-				// Move past the original TTL, then trigger another update to reset it.
-				now += 120
-				location.simulateUpdate({ lat: 52.0, lng: -0.2 })
-				await new Promise((resolve) => setTimeout(resolve, 50))
+			// Wait 70ms (total 120ms from first update, past original TTL)
+			// but trigger another update at 50ms to reset TTL
+			location.simulateUpdate({ lat: 52.0, lng: -0.2 })
+			await new Promise((resolve) => setTimeout(resolve, 50))

-				// Should still be cached because TTL was reset by second update.
-				expect(engine.lastFeed()).not.toBeNull()
+			// Should still be cached because TTL was reset by second update
+			expect(engine.lastFeed()).not.toBeNull()

-				engine.stop()
-			} finally {
-				engine.stop()
-				nowSpy.mockRestore()
-			}
+			engine.stop()
 		})

 		test("cacheTtlMs is configurable", async () => {
@@ -886,21 +869,17 @@ describe("FeedEngine", () => {
 				},
 			}

-			const engine = new FeedEngine({ cacheTtlMs: 20 }).register(source)
-			await engine.refresh()
+			const engine = new FeedEngine({ cacheTtlMs: 50 }).register(source)
+			engine.start()

-			expect(fetchCount).toBe(1)
+			// Wait for two TTL intervals to elapse
+			await new Promise((resolve) => setTimeout(resolve, 120))

-			try {
-				engine.start()
+			// Should have auto-refreshed at least twice
+			expect(fetchCount).toBeGreaterThanOrEqual(2)
+			expect(engine.lastFeed()).not.toBeNull()

-				await waitForCondition(() => fetchCount >= 2)
-
-				expect(fetchCount).toBeGreaterThanOrEqual(2)
-				expect(engine.lastFeed()).not.toBeNull()
-			} finally {
-				engine.stop()
-			}
+			engine.stop()
 		})

 		test("stop cancels periodic refresh", async () => {
@@ -956,25 +935,28 @@ describe("FeedEngine", () => {
 				},
 			}

-			const engine = new FeedEngine({ cacheTtlMs: 10_000 })
+			const engine = new FeedEngine({ cacheTtlMs: 100 })
 				.register(location)
 				.register(countingWeather)
-			const clearTimeoutSpy = spyOn(globalThis, "clearTimeout")

-			try {
-				engine.start()
+			engine.start()

-				const countBeforeUpdate = fetchCount
-				location.simulateUpdate({ lat: 51.5, lng: -0.1 })
-				await waitForCondition(() => fetchCount > countBeforeUpdate && engine.lastFeed() !== null)
+			// At 40ms, push a reactive update — this resets the timer
+			await new Promise((resolve) => setTimeout(resolve, 40))
+			const countBeforeUpdate = fetchCount
+			location.simulateUpdate({ lat: 51.5, lng: -0.1 })
+			await new Promise((resolve) => setTimeout(resolve, 20))

-				// Reactive updates refresh the cache and reset the pending periodic timer.
-				expect(fetchCount).toBeGreaterThan(countBeforeUpdate)
-				expect(clearTimeoutSpy).toHaveBeenCalled()
-			} finally {
-				engine.stop()
-				clearTimeoutSpy.mockRestore()
-			}
+			// Reactive update triggered a fetch
+			expect(fetchCount).toBeGreaterThan(countBeforeUpdate)
+			const countAfterUpdate = fetchCount
+
+			// At 100ms from start (60ms after reactive update), the original
+			// timer would have fired, but it was reset. No extra fetch yet.
+			await new Promise((resolve) => setTimeout(resolve, 40))
+			expect(fetchCount).toBe(countAfterUpdate)
+
+			engine.stop()
 		})
 	})

--- a/packages/freya-core/src/index.ts
+++ b/packages/freya-core/src/index.ts
@@ -6,25 +6,6 @@ export { Context, contextKey, serializeKey } from "./context"
 export type { ActionDefinition } from "./action"
 export { UnknownActionError } from "./action"

-// Conversation
-export type { ConversationEntryPayload } from "./conversation"
-export {
-	AssistantMessagePayload,
-	AttachmentPayload,
-	AttachmentType,
-	ContextSummary,
-	ContextSummaryPayload,
-	ConversationEntryKind,
-	ConversationEntryMetadata,
-	ConversationEntryVisibility,
-	GenericObjectPayload,
-	JsonMessagePart,
-	MessagePart,
-	ModelRunMetadata,
-	TextMessagePart,
-	UserMessagePayload,
-} from "./conversation"
-
 // Feed
 export type { FeedItem, FeedItemRenderer, FeedItemSignals, RenderedFeedItem, Slot } from "./feed"
 export { TimeRelevance } from "./feed"