@firstlovecenter/ai-chat 0.9.2 → 0.9.3

package/dist/ui/index.js

@@ -699,6 +699,11 @@ function AiChat({
       cancelled = true;
     };
   }, []);
+  useEffect(() => {
+    if (initialSessionId != null && activeSessionId !== initialSessionId) {
+      setActiveSessionId(initialSessionId);
+    }
+  }, [initialSessionId]);
   useEffect(() => {
     if (initialSessionId == null) {
       setAnswers([]);
@@ -711,13 +716,18 @@ function AiChat({
         const res = await fetch(`/api/chat/sessions/${id}`, { cache: "no-store" });
         if (cancelled) return;
         if (!res.ok) {
+          console.warn(
+            "[AiChat] hydration: GET /api/chat/sessions failed",
+            { id, status: res.status }
+          );
           setAnswers([]);
           return;
         }
         const data = await res.json();
         if (cancelled) return;
         setAnswers(messagesToAnswers(data.messages ?? []));
-      } catch {
+      } catch (err) {
+        console.error("[AiChat] hydration threw \u2014 setting empty answers", err);
         if (!cancelled) setAnswers([]);
       } finally {
         if (!cancelled) setLoadingSession(false);
@@ -1459,6 +1469,15 @@ function updateLast(prev, updater) {
   next[next.length - 1] = updater(next[next.length - 1]);
   return next;
 }
+function coerceJsonField(v) {
+  if (v == null) return null;
+  if (typeof v !== "string") return v;
+  try {
+    return JSON.parse(v);
+  } catch {
+    return null;
+  }
+}
 function messagesToAnswers(messages) {
   const out = [];
   let pendingUser = null;
@@ -1469,19 +1488,24 @@ function messagesToAnswers(messages) {
       const question = pendingUser ?? "";
       pendingUser = null;
       const blocks = [];
-      const stored = m.blocks ?? [];
-      stored.forEach((b, i) => {
-        const sanitised = sanitiseBlock({ ...b});
-        if (sanitised.kind === "paragraph_brief") {
-          sanitised.prose = m.prose?.[String(i)] ?? "";
-        }
-        blocks[i] = sanitised;
-      });
+      const storedBlocks = coerceJsonField(m.blocks) ?? [];
+      const storedProse = coerceJsonField(m.prose) ?? {};
+      const storedError = coerceJsonField(m.errorJson);
+      if (Array.isArray(storedBlocks)) {
+        storedBlocks.forEach((b, i) => {
+          const sanitised = sanitiseBlock({
+            ...b});
+          if (sanitised.kind === "paragraph_brief") {
+            sanitised.prose = storedProse[String(i)] ?? "";
+          }
+          blocks[i] = sanitised;
+        });
+      }
       out.push({
         question,
         blocks,
         done: true,
-        error: m.errorJson ?? void 0
+        error: storedError ?? void 0
       });
     }
   }
@@ -2377,6 +2401,15 @@ function UserChip2({ text }) {
     )
   ] });
 }
+function coerceJsonField2(v) {
+  if (v == null) return null;
+  if (typeof v !== "string") return v;
+  try {
+    return JSON.parse(v);
+  } catch {
+    return null;
+  }
+}
 function storedToUseChat(stored) {
   const uiMessages = [];
   const blocksMap = {};
@@ -2392,15 +2425,20 @@ function storedToUseChat(stored) {
     if (m.role === "assistant") {
       const id = `assistant-${m.id}`;
       const blocks = [];
-      const stored2 = m.blocks ?? [];
-      stored2.forEach((b, i) => {
-        const sanitised = sanitiseBlock({ ...b});
-        if (sanitised.kind === "paragraph_brief") {
-          sanitised.prose = m.prose?.[String(i)] ?? "";
-        }
-        blocks[i] = sanitised;
-      });
-      const joinedProse = Object.values(m.prose ?? {}).filter(Boolean).join("\n\n");
+      const storedBlocks = coerceJsonField2(m.blocks) ?? [];
+      const storedProse = coerceJsonField2(m.prose) ?? {};
+      const storedError = coerceJsonField2(m.errorJson);
+      if (Array.isArray(storedBlocks)) {
+        storedBlocks.forEach((b, i) => {
+          const sanitised = sanitiseBlock({
+            ...b});
+          if (sanitised.kind === "paragraph_brief") {
+            sanitised.prose = storedProse[String(i)] ?? "";
+          }
+          blocks[i] = sanitised;
+        });
+      }
+      const joinedProse = Object.values(storedProse).filter(Boolean).join("\n\n");
       uiMessages.push({
         id,
         role: "assistant",
@@ -2408,7 +2446,7 @@ function storedToUseChat(stored) {
       });
       blocksMap[id] = blocks;
       if (joinedProse) proseMap[id] = joinedProse;
-      if (m.errorJson) errorsMap[id] = m.errorJson;
+      if (storedError) errorsMap[id] = storedError;
     }
   }
   return { uiMessages, blocksMap, proseMap, errorsMap };