@firstlovecenter/ai-chat 0.9.1 → 0.9.3

package/dist/ui/index.cjs

@@ -723,6 +723,11 @@ function AiChat({
       cancelled = true;
     };
   }, []);
+  React.useEffect(() => {
+    if (initialSessionId != null && activeSessionId !== initialSessionId) {
+      setActiveSessionId(initialSessionId);
+    }
+  }, [initialSessionId]);
   React.useEffect(() => {
     if (initialSessionId == null) {
       setAnswers([]);
@@ -735,13 +740,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);
@@ -874,7 +884,9 @@ function AiChat({
             const data = await create.json();
             sessionId = data.session.id;
             setActiveSessionId(sessionId);
-            syncUrl(sessionId);
+            if (typeof window !== "undefined") {
+              window.history.replaceState(null, "", `${basePath}/${sessionId}`);
+            }
             setSessions((prev) => [
               { id: data.session.id, title: data.session.title, updatedAt: null },
               ...prev
@@ -936,6 +948,17 @@ function AiChat({
           const events = buffer.split("\n\n");
           buffer = events.pop() ?? "";
           for (const raw of events) {
+            const meta = parseMetaChatSessionId(raw);
+            if (meta != null) {
+              setActiveSessionId((prev) => prev ?? meta);
+              if (typeof window !== "undefined" && !window.location.pathname.endsWith(`/${meta}`)) {
+                window.history.replaceState(
+                  null,
+                  "",
+                  `${basePath}/${meta}`
+                );
+              }
+            }
             handleEvent(raw, setAnswers);
           }
         }
@@ -1394,6 +1417,22 @@ function UserChip({ text }) {
     )
   ] });
 }
+function parseMetaChatSessionId(raw) {
+  const lines = raw.split("\n");
+  let event = "";
+  let dataStr = "";
+  for (const line of lines) {
+    if (line.startsWith("event: ")) event = line.slice(7).trim();
+    else if (line.startsWith("data: ")) dataStr += line.slice(6);
+  }
+  if (event !== "meta") return null;
+  try {
+    const parsed = JSON.parse(dataStr || "{}");
+    return typeof parsed.chatSessionId === "string" && parsed.chatSessionId.length > 0 ? parsed.chatSessionId : null;
+  } catch {
+    return null;
+  }
+}
 function handleEvent(raw, setAnswers) {
   const lines = raw.split("\n");
   let event = "";
@@ -1454,6 +1493,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;
@@ -1464,19 +1512,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
       });
     }
   }
@@ -1646,6 +1699,20 @@ function VercelChat({
       cancelled = true;
     };
   }, [initialSessionId, setMessages]);
+  React.useEffect(() => {
+    if (!Array.isArray(data)) return;
+    for (const raw of data) {
+      const part = asDataPart(raw);
+      if (!part || part.type !== "meta") continue;
+      const id = part.value.chatSessionId;
+      if (!id) continue;
+      setActiveSessionId((prev) => prev ?? id);
+      if (typeof window !== "undefined" && !window.location.pathname.endsWith(`/${id}`)) {
+        window.history.replaceState(null, "", `${basePath}/${id}`);
+      }
+      break;
+    }
+  }, [data, basePath]);
   const answers = React.useMemo(() => {
     const liveBlocks = [];
     const liveErrors = [];
@@ -1868,7 +1935,13 @@ function VercelChat({
             const json = await create.json();
             activeSessionIdRef.current = json.session.id;
             setActiveSessionId(json.session.id);
-            syncUrl(json.session.id);
+            if (typeof window !== "undefined") {
+              window.history.replaceState(
+                null,
+                "",
+                `${basePath}/${json.session.id}`
+              );
+            }
             setSessions((prev) => [
               { id: json.session.id, title: json.session.title, updatedAt: null },
               ...prev
@@ -2352,6 +2425,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 = {};
@@ -2367,15 +2449,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",
@@ -2383,7 +2470,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 };