@astralform/js 3.0.0 → 3.0.1

package/dist/index.d.cts

@@ -988,10 +988,11 @@ declare class ChatSession {
     switchConversation(id: string, jobId?: string, 
     /**
      * User prompt that triggered this job, if known. Emitted as a
-     * synthetic ``user_message`` ChatEvent right before the first
-     * ``message_start`` of the replay. User messages aren't persisted
-     * in ``job_events``, so without this the restored conversation
-     * would show the agent response with no visible prompt above it.
+     * synthetic ``user_message`` ChatEvent at the START of the replay —
+     * a completed job maps to exactly one user turn, so every event in it
+     * belongs beneath that prompt. User messages aren't persisted in
+     * ``job_events``, so without this the restored conversation would show
+     * the agent response with no visible prompt above it.
      */
     userMessageContent?: string): Promise<void>;
     deleteConversation(id: string): Promise<void>;
@@ -1145,8 +1146,18 @@ interface RawSseEvent {
 declare function mapSseToChat(raw: RawSseEvent): ChatEvent[];
 /**
  * Replay persisted SSE events through the provided handler, interleaving
- * user messages from session.messages at the first message_start of each
- * turn (user messages aren't persisted in job_events).
+ * user messages from session.messages at the START of each turn (user
+ * messages aren't persisted in job_events).
+ *
+ * The turn boundary is a change of ``job_id``, NOT ``message_start`` or
+ * ``message_stop``. A completed job maps to exactly one user turn — but a
+ * single job can contain several ``message_start``/``message_stop`` pairs (a
+ * tool-use loop: LLM call → tool result → LLM call again), so neither event
+ * reliably delimits turns. And within a job some events precede the first
+ * ``message_start`` (e.g. ``memory_recall``, emitted during prompt prep), so
+ * gating the user block on ``message_start`` would replay them above the
+ * user's own message. Keying off ``job_id`` injects the prompt once per job,
+ * before its first event — matching ``session.ts#switchConversation``.
  */
 declare function replayEvents(sseEvents: RawSseEvent[], userMessages: {
     role: string;

package/dist/index.d.ts

@@ -988,10 +988,11 @@ declare class ChatSession {
     switchConversation(id: string, jobId?: string, 
     /**
      * User prompt that triggered this job, if known. Emitted as a
-     * synthetic ``user_message`` ChatEvent right before the first
-     * ``message_start`` of the replay. User messages aren't persisted
-     * in ``job_events``, so without this the restored conversation
-     * would show the agent response with no visible prompt above it.
+     * synthetic ``user_message`` ChatEvent at the START of the replay —
+     * a completed job maps to exactly one user turn, so every event in it
+     * belongs beneath that prompt. User messages aren't persisted in
+     * ``job_events``, so without this the restored conversation would show
+     * the agent response with no visible prompt above it.
      */
     userMessageContent?: string): Promise<void>;
     deleteConversation(id: string): Promise<void>;
@@ -1145,8 +1146,18 @@ interface RawSseEvent {
 declare function mapSseToChat(raw: RawSseEvent): ChatEvent[];
 /**
  * Replay persisted SSE events through the provided handler, interleaving
- * user messages from session.messages at the first message_start of each
- * turn (user messages aren't persisted in job_events).
+ * user messages from session.messages at the START of each turn (user
+ * messages aren't persisted in job_events).
+ *
+ * The turn boundary is a change of ``job_id``, NOT ``message_start`` or
+ * ``message_stop``. A completed job maps to exactly one user turn — but a
+ * single job can contain several ``message_start``/``message_stop`` pairs (a
+ * tool-use loop: LLM call → tool result → LLM call again), so neither event
+ * reliably delimits turns. And within a job some events precede the first
+ * ``message_start`` (e.g. ``memory_recall``, emitted during prompt prep), so
+ * gating the user block on ``message_start`` would replay them above the
+ * user's own message. Keying off ``job_id`` injects the prompt once per job,
+ * before its first event — matching ``session.ts#switchConversation``.
  */
 declare function replayEvents(sseEvents: RawSseEvent[], userMessages: {
     role: string;

package/dist/index.js

@@ -1628,17 +1628,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(
@@ -1947,21 +1942,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);