@astralform/js 3.0.0 → 3.0.1

package/dist/index.cjs

@@ -1674,17 +1674,12 @@ var ChatSession = class {
     ]);
     this.messages = messagesResult.status === "fulfilled" ? messagesResult.value : [];
     if (eventsResult.status === "fulfilled") {
-      let userMessageEmitted = !userMessageContent;
+      if (userMessageContent) {
+        this.emit({ type: "user_message", content: userMessageContent });
+      }
       for (const ev of eventsResult.value) {
         const type = ev.data.type || ev.event;
         if (!type || type === "done") continue;
-        if (!userMessageEmitted && type === "message_start") {
-          this.emit({
-            type: "user_message",
-            content: userMessageContent
-          });
-          userMessageEmitted = true;
-        }
         const wire = { ...ev.data, type };
         try {
           await this.dispatchWireEvent(
@@ -1993,21 +1988,21 @@ function mapSseToChat(raw) {
 function replayEvents(sseEvents, userMessages, handleEvent, addBlock) {
   const userMsgs = userMessages.filter((m) => m.role === "user");
   let userIdx = 0;
-  let expectingUserMessage = true;
+  let currentJobId = null;
   for (const raw of sseEvents) {
     const type = raw.data.type || raw.event;
-    if (type === "message_stop") {
-      expectingUserMessage = true;
-    }
-    if (type === "message_start" && expectingUserMessage && userIdx < userMsgs.length) {
-      const userMsg = userMsgs[userIdx];
-      addBlock({
-        type: "user",
-        id: `replay_user_${userIdx}`,
-        content: userMsg.content
-      });
-      userIdx++;
-      expectingUserMessage = false;
+    if (!type || type === "done") continue;
+    const jobId = raw.data.job_id ?? null;
+    if (jobId !== null && jobId !== currentJobId) {
+      currentJobId = jobId;
+      if (userIdx < userMsgs.length) {
+        addBlock({
+          type: "user",
+          id: `replay_user_${userIdx}`,
+          content: userMsgs[userIdx].content
+        });
+        userIdx++;
+      }
     }
     for (const ce of mapSseToChat(raw)) {
       handleEvent(ce);