);
+
+ init = createInit(() => {
+ const query = useCachedQuery(api.user_enabled_models.get_enabled, {
+ user_id: session.current?.user.id ?? '',
+ });
+ watch(
+ () => $state.snapshot(query.data),
+ (data) => {
+ if (data) this.enabled = data;
+ }
+ );
+ });
+
+ from(provider: Provider) {
+ return page.data.models[provider].map((m: { id: string }) => {
+ return {
+ ...m,
+ enabled: this.enabled[getModelKey({ provider, model_id: m.id })] !== undefined,
+ };
+ }) as Array;
+ }
+}
+
+export const models = new Models();
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
new file mode 100644
index 0000000..5daa98d
--- /dev/null
+++ b/src/lib/state/settings.svelte.ts
@@ -0,0 +1,5 @@
+import { createPersistedObj } from '$lib/spells/persisted-obj.svelte';
+
+export const settings = createPersistedObj('settings', {
+ modelId: undefined as string | undefined,
+});
diff --git a/src/lib/utils/array.ts b/src/lib/utils/array.ts
index 9608d3f..ace8626 100644
--- a/src/lib/utils/array.ts
+++ b/src/lib/utils/array.ts
@@ -71,7 +71,7 @@ export function toMap(
const map: Record = {};
for (let i = 0; i < arr.length; i++) {
- const [key, value] = fn(arr[i], i);
+ const [key, value] = fn(arr[i]!, i);
map[key] = value;
}
diff --git a/src/lib/utils/is.ts b/src/lib/utils/is.ts
new file mode 100644
index 0000000..408b9e6
--- /dev/null
+++ b/src/lib/utils/is.ts
@@ -0,0 +1,3 @@
+export function isString(value: unknown): value is string {
+ return typeof value === 'string';
+}
diff --git a/src/lib/utils/object.ts b/src/lib/utils/object.ts
index 2bdce8b..12c8749 100644
--- a/src/lib/utils/object.ts
+++ b/src/lib/utils/object.ts
@@ -3,6 +3,11 @@ export function keys(obj: T): Array {
return Object.keys(obj) as Array;
}
+// typed object.entries
+export function entries(obj: T): Array<[keyof T, T[keyof T]]> {
+ return Object.entries(obj) as Array<[keyof T, T[keyof T]]>;
+}
+
export function omit(obj: T, keys: K[]): Omit {
return Object.fromEntries(
Object.entries(obj).filter(([key]) => !keys.includes(key as K))
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index d736029..f81ab66 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -1,10 +1,15 @@
+import { getOpenRouterModels, type OpenRouterModel } from '$lib/backend/models/open-router';
+import { Provider } from '$lib/types';
import type { LayoutServerLoad } from './$types';
export const load: LayoutServerLoad = async ({ locals }) => {
- const session = await locals.auth();
+ const [session, openRouterModels] = await Promise.all([locals.auth(), getOpenRouterModels()]);
return {
session,
+ models: {
+ [Provider.OpenRouter]: openRouterModels.unwrapOr([] as OpenRouterModel[]),
+ },
};
};
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 77bf533..d78b20e 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -3,10 +3,12 @@
import '../app.css';
import { ModeWatcher } from 'mode-watcher';
import { PUBLIC_CONVEX_URL } from '$env/static/public';
+ import { models } from '$lib/state/models.svelte';
let { children } = $props();
setupConvex(PUBLIC_CONVEX_URL);
+ models.init();
diff --git a/src/routes/account/+layout.svelte b/src/routes/account/+layout.svelte
index 4f1b70d..f48efe4 100644
--- a/src/routes/account/+layout.svelte
+++ b/src/routes/account/+layout.svelte
@@ -55,7 +55,7 @@
{data.session.user.name
.split(' ')
- .map((i) => i[0].toUpperCase())
+ .map((i) => i[0]?.toUpperCase())
.join('')}
{/snippet}
diff --git a/src/routes/account/api-keys/provider-card.svelte b/src/routes/account/api-keys/provider-card.svelte
index 0d32781..d2396c8 100644
--- a/src/routes/account/api-keys/provider-card.svelte
+++ b/src/routes/account/api-keys/provider-card.svelte
@@ -21,8 +21,8 @@
const id = $props.id();
const keyQuery = useCachedQuery(api.user_keys.get, {
- user_id: session.current?.user.id ?? '',
provider,
+ session_token: session.current?.session.token ?? '',
});
const client = useConvexClient();
@@ -44,6 +44,7 @@
provider,
user_id: session.current?.user.id ?? '',
key: `${key}`,
+ session_token: session.current?.session.token,
}),
(e) => e
);
diff --git a/src/routes/account/models/+page.server.ts b/src/routes/account/models/+page.server.ts
deleted file mode 100644
index e16dd1a..0000000
--- a/src/routes/account/models/+page.server.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { getOpenRouterModels, type OpenRouterModel } from '$lib/backend/models/open-router';
-
-export async function load() {
- return {
- openRouterModels: (await getOpenRouterModels()).unwrapOr([] as OpenRouterModel[]),
- };
-}
diff --git a/src/routes/account/models/+page.svelte b/src/routes/account/models/+page.svelte
index 0526eed..f0c2c6b 100644
--- a/src/routes/account/models/+page.svelte
+++ b/src/routes/account/models/+page.svelte
@@ -1,15 +1,7 @@
@@ -22,8 +14,7 @@
- {#each data.openRouterModels as model (model.id)}
- {@const enabled = enabledModels.data?.[`${Provider.OpenRouter}:${model.id}`] !== undefined}
-
+ {#each models.from(Provider.OpenRouter) as model (model.id)}
+
{/each}
diff --git a/src/routes/account/models/model-card.svelte b/src/routes/account/models/model-card.svelte
index b88232b..dc2ddf6 100644
--- a/src/routes/account/models/model-card.svelte
+++ b/src/routes/account/models/model-card.svelte
@@ -38,6 +38,7 @@
async function toggleEnabled(v: boolean) {
enabled = v; // Optimistic!
+ console.log('hi');
if (!session.current?.user.id) return;
const res = await ResultAsync.fromPromise(
@@ -46,6 +47,7 @@
user_id: session.current.user.id,
model_id: model.id,
enabled: v,
+ session_token: session.current?.session.token,
}),
(e) => e
);
diff --git a/src/routes/api/generate-message/+server.ts b/src/routes/api/generate-message/+server.ts
new file mode 100644
index 0000000..36f32a0
--- /dev/null
+++ b/src/routes/api/generate-message/+server.ts
@@ -0,0 +1,280 @@
+import { PUBLIC_CONVEX_URL } from '$env/static/public';
+import { api } from '$lib/backend/convex/_generated/api';
+import type { Id } from '$lib/backend/convex/_generated/dataModel';
+import type { SessionObj } from '$lib/backend/convex/betterAuth';
+import { Provider } from '$lib/types';
+import { error, json, type RequestHandler } from '@sveltejs/kit';
+import { ConvexHttpClient } from 'convex/browser';
+import { ResultAsync } from 'neverthrow';
+import OpenAI from 'openai';
+
+import { z } from 'zod/v4';
+
+// Set to true to enable debug logging
+const ENABLE_LOGGING = true;
+
+const reqBodySchema = z.object({
+ message: z.string(),
+ model_id: z.string(),
+
+ session_token: z.string(),
+ conversation_id: z.string().optional(),
+});
+
+export type GenerateMessageRequestBody = z.infer;
+
+export type GenerateMessageResponse = {
+ ok: true;
+ conversation_id: string;
+};
+
+function response(res: GenerateMessageResponse) {
+ return json(res);
+}
+
+function log(message: string, startTime: number): void {
+ if (!ENABLE_LOGGING) return;
+ const elapsed = Date.now() - startTime;
+ console.log(`[GenerateMessage] ${message} (${elapsed}ms)`);
+}
+
+const client = new ConvexHttpClient(PUBLIC_CONVEX_URL);
+
+async function generateAIResponse(
+ conversationId: string,
+ session: SessionObj,
+ modelId: string,
+ startTime: number
+) {
+ log('Starting AI response generation in background', startTime);
+
+ const modelResult = await ResultAsync.fromPromise(
+ client.query(api.user_enabled_models.get, {
+ provider: Provider.OpenRouter,
+ model_id: modelId,
+ user_id: session.userId,
+ }),
+ (e) => `Failed to get model: ${e}`
+ );
+
+ if (modelResult.isErr()) {
+ log(`Background model query failed: ${modelResult.error}`, startTime);
+ return;
+ }
+
+ const model = modelResult.value;
+ if (!model) {
+ log('Background: Model not found or not enabled', startTime);
+ return;
+ }
+
+ log('Background: Model found and enabled', startTime);
+
+ const messagesQuery = await ResultAsync.fromPromise(
+ client.query(api.messages.getAllFromConversation, {
+ conversation_id: conversationId as Id<'conversations'>,
+ session_token: session.token,
+ }),
+ (e) => `Failed to get messages: ${e}`
+ );
+
+ if (messagesQuery.isErr()) {
+ log(`Background messages query failed: ${messagesQuery.error}`, startTime);
+ return;
+ }
+
+ const messages = messagesQuery.value;
+ log(`Background: Retrieved ${messages.length} messages from conversation`, startTime);
+
+ const keyResult = await ResultAsync.fromPromise(
+ client.query(api.user_keys.get, {
+ provider: Provider.OpenRouter,
+ session_token: session.token,
+ }),
+ (e) => `Failed to get API key: ${e}`
+ );
+
+ if (keyResult.isErr()) {
+ log(`Background API key query failed: ${keyResult.error}`, startTime);
+ return;
+ }
+
+ const key = keyResult.value;
+ if (!key) {
+ log('Background: No API key found', startTime);
+ return;
+ }
+
+ log('Background: API key retrieved successfully', startTime);
+
+ const openai = new OpenAI({
+ baseURL: 'https://openrouter.ai/api/v1',
+ apiKey: key,
+ });
+
+ const streamResult = await ResultAsync.fromPromise(
+ openai.chat.completions.create({
+ model: model.model_id,
+ messages: messages.map((m) => ({ role: m.role, content: m.content })),
+ max_tokens: 1000,
+ temperature: 0.7,
+ stream: true,
+ }),
+ (e) => `OpenAI API call failed: ${e}`
+ );
+
+ if (streamResult.isErr()) {
+ log(`Background OpenAI stream creation failed: ${streamResult.error}`, startTime);
+ return;
+ }
+
+ const stream = streamResult.value;
+ log('Background: OpenAI stream created successfully', startTime);
+
+ // Create assistant message
+ const messageCreationResult = await ResultAsync.fromPromise(
+ client.mutation(api.messages.create, {
+ conversation_id: conversationId,
+ content: '',
+ role: 'assistant',
+ session_token: session.token,
+ }),
+ (e) => `Failed to create assistant message: ${e}`
+ );
+
+ if (messageCreationResult.isErr()) {
+ log(`Background assistant message creation failed: ${messageCreationResult.error}`, startTime);
+ return;
+ }
+
+ const mid = messageCreationResult.value;
+ log('Background: Assistant message created', startTime);
+
+ let content = '';
+ let chunkCount = 0;
+
+ try {
+ for await (const chunk of stream) {
+ chunkCount++;
+ content += chunk.choices[0]?.delta?.content || '';
+ if (!content) continue;
+
+ const updateResult = await ResultAsync.fromPromise(
+ client.mutation(api.messages.updateContent, {
+ message_id: mid,
+ content,
+ session_token: session.token,
+ }),
+ (e) => `Failed to update message content: ${e}`
+ );
+
+ if (updateResult.isErr()) {
+ log(
+ `Background message update failed on chunk ${chunkCount}: ${updateResult.error}`,
+ startTime
+ );
+ }
+ }
+
+ log(
+ `Background stream processing completed. Processed ${chunkCount} chunks, final content length: ${content.length}`,
+ startTime
+ );
+ } catch (error) {
+ log(`Background stream processing error: ${error}`, startTime);
+ }
+}
+
+export const POST: RequestHandler = async ({ request }) => {
+ const startTime = Date.now();
+ log('Starting message generation request', startTime);
+
+ const bodyResult = await ResultAsync.fromPromise(
+ request.json(),
+ () => 'Failed to parse request body'
+ );
+
+ if (bodyResult.isErr()) {
+ log(`Request body parsing failed: ${bodyResult.error}`, startTime);
+ return error(400, 'Failed to parse request body');
+ }
+
+ log('Request body parsed successfully', startTime);
+
+ const parsed = reqBodySchema.safeParse(bodyResult.value);
+ if (!parsed.success) {
+ log(`Schema validation failed: ${parsed.error}`, startTime);
+ return error(400, parsed.error);
+ }
+ const args = parsed.data;
+
+ log('Schema validation passed', startTime);
+
+ const sessionResult = await ResultAsync.fromPromise(
+ client.query(api.betterAuth.publicGetSession, {
+ session_token: args.session_token,
+ }),
+ (e) => `Failed to get session: ${e}`
+ );
+
+ if (sessionResult.isErr()) {
+ log(`Session query failed: ${sessionResult.error}`, startTime);
+ return error(401, 'Failed to authenticate');
+ }
+
+ const session = sessionResult.value;
+ if (!session) {
+ log('No session found - unauthorized', startTime);
+ return error(401, 'Unauthorized');
+ }
+
+ log('Session authenticated successfully', startTime);
+
+ let conversationId = args.conversation_id;
+ if (!conversationId) {
+ const conversationResult = await ResultAsync.fromPromise(
+ client.mutation(api.conversations.create, {
+ session_token: args.session_token,
+ }),
+ (e) => `Failed to create conversation: ${e}`
+ );
+
+ if (conversationResult.isErr()) {
+ log(`Conversation creation failed: ${conversationResult.error}`, startTime);
+ return error(500, 'Failed to create conversation');
+ }
+
+ conversationId = conversationResult.value;
+ log('New conversation created', startTime);
+ } else {
+ log('Using existing conversation', startTime);
+ }
+
+ if (args.message) {
+ const userMessageResult = await ResultAsync.fromPromise(
+ client.mutation(api.messages.create, {
+ conversation_id: conversationId as Id<'conversations'>,
+ content: args.message,
+ session_token: args.session_token,
+ model_id: args.model_id,
+ role: 'user',
+ }),
+ (e) => `Failed to create user message: ${e}`
+ );
+
+ if (userMessageResult.isErr()) {
+ log(`User message creation failed: ${userMessageResult.error}`, startTime);
+ return error(500, 'Failed to create user message');
+ }
+
+ log('User message created', startTime);
+ }
+
+ // Start AI response generation in background - don't await
+ generateAIResponse(conversationId, session, args.model_id, startTime).catch((error) => {
+ log(`Background AI response generation error: ${error}`, startTime);
+ });
+
+ log('Response sent, AI generation started in background', startTime);
+ return response({ ok: true, conversation_id: conversationId });
+};
diff --git a/src/routes/api/generate-message/call.ts b/src/routes/api/generate-message/call.ts
new file mode 100644
index 0000000..ae28391
--- /dev/null
+++ b/src/routes/api/generate-message/call.ts
@@ -0,0 +1,17 @@
+import { ResultAsync } from 'neverthrow';
+import type { GenerateMessageRequestBody, GenerateMessageResponse } from './+server';
+
+export async function callGenerateMessage(args: GenerateMessageRequestBody) {
+ const res = ResultAsync.fromPromise(
+ fetch('/api/generate-message', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(args),
+ }),
+ (e) => e
+ ).map((r) => r.json() as Promise);
+
+ return res;
+}
diff --git a/src/routes/chat/+layout.svelte b/src/routes/chat/+layout.svelte
index 01cc921..02aa4d9 100644
--- a/src/routes/chat/+layout.svelte
+++ b/src/routes/chat/+layout.svelte
@@ -1,12 +1,50 @@
@@ -16,22 +54,26 @@
- Thom Chat
+ Thom.chat
-
-
+
{#if data.session !== null}