bloby-bot 0.46.2 → 0.46.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bloby-bot",
-  "version": "0.46.2",
+  "version": "0.46.3",
   "releaseNotes": [
     "1. # voice note (PTT bubble)",
     "2. # audio file + caption",

package/supervisor/chat/src/hooks/useBlobyChat.ts

@@ -81,14 +81,14 @@ export function useBlobyChat(ws: WsClient | null, triggerReload?: number, enable
     };
   }, []);
 
-  // Load current conversation from DB (last 20 messages)
+  // Load current conversation from DB (last 200 messages — pagination kicks in beyond that)
   const loadFromDb = useCallback(async () => {
     try {
       const ctx = await authFetch('/api/context/current').then((r) => r.json());
       if (!ctx.conversationId) return;
       setConversationId(ctx.conversationId);
 
-      const limit = 20;
+      const limit = 200;
       const res = await authFetch(`/api/conversations/${ctx.conversationId}/messages?limit=${limit}`);
       if (!res.ok) return;
       const data = await res.json();
@@ -100,14 +100,14 @@ export function useBlobyChat(ws: WsClient | null, triggerReload?: number, enable
     } catch { /* worker not ready yet */ }
   }, [parseMessage]);
 
-  // Load older messages (cursor-based pagination)
+  // Load older messages (cursor-based pagination — cursor is the rowid-equivalent on the server)
   const loadOlder = useCallback(async () => {
     if (loadingOlder.current || !conversationIdRef.current) return;
     loadingOlder.current = true;
     try {
       const oldestId = messages[0]?.id;
       if (!oldestId) return;
-      const limit = 20;
+      const limit = 100;
       const res = await authFetch(`/api/conversations/${conversationIdRef.current}/messages?before=${oldestId}&limit=${limit}`);
       if (!res.ok) return;
       const data = await res.json();

package/supervisor/index.ts

@@ -1327,7 +1327,11 @@ ${!connected ? `<script>
         const data = msg.data || {};
         const content = data.content;
         if (!content) return;
-        if (data.conversationId) convId = data.conversationId;
+        // Note: we intentionally ignore data.conversationId from the client.
+        // The server is the authority on which DB conversation this WS belongs to —
+        // honoring a client-supplied id let stale browser state drive messages into
+        // an orphan conv whose row had been deleted, causing FK failures on every
+        // INSERT. Server resolution below (clientConvs → context.current → create).
 
         // Re-read config on each message so post-onboard changes are picked up
         const freshConfig = loadConfig();
@@ -1396,6 +1400,10 @@ ${!connected ? `<script>
               });
             } catch (err: any) {
               log.warn(`[bloby] DB persist error: ${err.message}`);
+              // Surface to all clients so they can flag the missing user bubble
+              // instead of pretending it's saved. addMessage() in worker/db.ts is
+              // self-healing for orphan convIds, so this should now be rare.
+              broadcastBloby('chat:persist-error', { conversationId: convId, role: 'user', error: err.message });
             }
 
             // Fetch agent/user names and recent messages in parallel
@@ -1438,7 +1446,7 @@ ${!connected ? `<script>
               // the self-chat mirror (the user's own number).
               const waState = channelManager.createWaStreamState();
 
-              await startConversation(convId, freshConfig.ai.model, (type, eventData) => {
+              await startConversation(convId, freshConfig.ai.model, async (type, eventData) => {
                 // Track stream buffer for reconnecting clients
                 if (type === 'bot:typing') {
                   currentStreamConvId = convId;
@@ -1493,19 +1501,23 @@ ${!connected ? `<script>
                   return;
                 }
 
-                // Save assistant response to DB
+                // Save assistant response to DB BEFORE broadcasting so a refresh
+                // immediately after the bubble appears can't race the INSERT and lose
+                // the message. addMessage() in worker/db.ts is self-healing —
+                // it INSERT OR IGNOREs the parent conversation row first, so even an
+                // orphan convId persists cleanly.
                 if (type === 'bot:response') {
                   currentStreamBuffer = '';
-
-                  (async () => {
-                    try {
-                      await workerApi(`/api/conversations/${convId}/messages`, 'POST', {
-                        role: 'assistant', content: eventData.content, meta: { model: freshConfig.ai.model },
-                      });
-                    } catch (err: any) {
-                      log.warn(`[bloby] DB persist bot response error: ${err.message}`);
-                    }
-                  })();
+                  try {
+                    await workerApi(`/api/conversations/${convId}/messages`, 'POST', {
+                      role: 'assistant', content: eventData.content, meta: { model: freshConfig.ai.model },
+                    });
+                  } catch (err: any) {
+                    log.warn(`[bloby] DB persist bot response error: ${err.message}`);
+                    // Tell clients the bubble they're about to see is not durable —
+                    // they can flag/retry rather than silently losing it on refresh.
+                    broadcastBloby('chat:persist-error', { conversationId: convId, role: 'assistant', error: err.message });
+                  }
                 }
 
                 // Stream all events to every connected client

package/worker/db.ts

@@ -93,10 +93,18 @@ export function deleteConversation(id: string) {
 
 // Messages
 export function addMessage(convId: string, role: string, content: string, meta?: { tokens_in?: number; tokens_out?: number; model?: string; audio_data?: string; attachments?: string }) {
-  const msg = db.prepare('INSERT INTO messages (conversation_id, role, content, tokens_in, tokens_out, model, audio_data, attachments) VALUES (?, ?, ?, ?, ?, ?, ?, ?) RETURNING *')
-    .get(convId, role, content, meta?.tokens_in ?? null, meta?.tokens_out ?? null, meta?.model ?? null, meta?.audio_data ?? null, meta?.attachments ?? null);
-  db.prepare('UPDATE conversations SET updated_at = CURRENT_TIMESTAMP WHERE id = ?').run(convId);
-  return msg as any;
+  // Self-heal: if the conversation row is missing (orphan live convId, harness session
+  // drift, deleted parent, etc.), create it so the FK constraint never fires.
+  // Use the first user message as title; assistant-first stays NULL (filled by UI).
+  const tx = db.transaction(() => {
+    db.prepare('INSERT OR IGNORE INTO conversations (id, title, model) VALUES (?, ?, ?)')
+      .run(convId, role === 'user' ? content.slice(0, 80) : null, meta?.model ?? null);
+    const msg = db.prepare('INSERT INTO messages (conversation_id, role, content, tokens_in, tokens_out, model, audio_data, attachments) VALUES (?, ?, ?, ?, ?, ?, ?, ?) RETURNING *')
+      .get(convId, role, content, meta?.tokens_in ?? null, meta?.tokens_out ?? null, meta?.model ?? null, meta?.audio_data ?? null, meta?.attachments ?? null);
+    db.prepare('UPDATE conversations SET updated_at = CURRENT_TIMESTAMP WHERE id = ?').run(convId);
+    return msg;
+  });
+  return tx() as any;
 }
 export function getMessages(convId: string) {
   return db.prepare('SELECT * FROM messages WHERE conversation_id = ? ORDER BY created_at ASC').all(convId);
@@ -177,22 +185,29 @@ export function deleteAllTrustedDevices() {
   db.prepare('DELETE FROM trusted_devices').run();
 }
 
-// Recent messages (for context injection)
+// Recent messages (for context injection).
+// Order by rowid (monotonic insertion order) — created_at has 1-second resolution
+// so rapid-fire messages can collide. rowid never does.
+// rowid is a hidden column, so `SELECT *` omits it — we must alias it explicitly
+// in the inner query for the outer ORDER BY to reach it.
 export function getRecentMessages(convId: string, limit = 20) {
   return db.prepare(`
     SELECT * FROM (
-      SELECT * FROM messages WHERE conversation_id = ? ORDER BY created_at DESC LIMIT ?
-    ) sub ORDER BY created_at ASC
+      SELECT messages.*, messages.rowid AS _rid FROM messages
+      WHERE conversation_id = ? ORDER BY messages.rowid DESC LIMIT ?
+    ) sub ORDER BY _rid ASC
   `).all(convId, limit);
 }
 
-// Cursor-based pagination: messages before a given ID
+// Cursor-based pagination: messages before a given message id.
+// Use rowid for comparison — message.id is random hex so `id < ?` is meaningless.
 export function getMessagesBefore(convId: string, beforeId: string, limit = 20) {
   return db.prepare(`
     SELECT * FROM (
-      SELECT * FROM messages
-      WHERE conversation_id = ? AND id < ?
-      ORDER BY id DESC LIMIT ?
-    ) sub ORDER BY id ASC
+      SELECT messages.*, messages.rowid AS _rid FROM messages
+      WHERE conversation_id = ?
+        AND messages.rowid < (SELECT rowid FROM messages WHERE id = ?)
+      ORDER BY messages.rowid DESC LIMIT ?
+    ) sub ORDER BY _rid ASC
   `).all(convId, beforeId, limit);
 }

package/worker/index.ts

@@ -133,12 +133,12 @@ app.post('/api/conversations/:id/messages', (req, res) => {
 });
 app.get('/api/conversations/:id/messages/recent', (req, res) => {
   const limit = parseInt(req.query.limit as string) || 20;
-  const msgs = getRecentMessages(req.params.id, Math.min(limit, 100));
+  const msgs = getRecentMessages(req.params.id, Math.min(limit, 1000));
   res.json(msgs);
 });
 app.get('/api/conversations/:id/messages', (req, res) => {
   const before = req.query.before as string;
-  const limit = Math.min(parseInt(req.query.limit as string) || 20, 100);
+  const limit = Math.min(parseInt(req.query.limit as string) || 20, 1000);
   if (before) {
     res.json(getMessagesBefore(req.params.id, before, limit));
   } else {