@astralform/js 4.3.0 → 4.4.0

package/dist/index.cjs

@@ -1820,11 +1820,16 @@ var ChatSession = class {
    * ``message_start`` in the stream (e.g. ``memory_recall`` from prompt prep),
    * so leading with the prompt keeps the turn in order.
    */
-  replayTurn(id, events, userMessageContent) {
+  replayTurn(id, events, userMessageContent, userMessageId, isSteer = false) {
     this.conversationId = id;
     this.resetStreamingState();
     if (userMessageContent) {
-      this.emit({ type: "user_message", content: userMessageContent });
+      this.emit({
+        type: "user_message",
+        content: userMessageContent,
+        ...userMessageId ? { id: userMessageId } : {},
+        ...isSteer ? { steer: true } : {}
+      });
     }
     for (const ev of events) {
       const type = ev.data.type || ev.event;
@@ -1937,6 +1942,64 @@ var ChatSession = class {
   }
 };
 
+// src/restore-plan.ts
+function planRestore(args) {
+  const { completedJobs, userMessages } = args;
+  const byId = /* @__PURE__ */ new Map();
+  userMessages.forEach((m, i) => {
+    if (m.id) byId.set(m.id, i);
+  });
+  const linkOf = (j) => j.message_id ? byId.get(j.message_id) : void 0;
+  const positional = (jobs, msgs) => jobs.map((job, i) => ({
+    kind: "turn",
+    jobId: job.job_id,
+    content: msgs[i]?.content,
+    messageId: msgs[i]?.id
+  }));
+  const firstLinked = completedJobs.findIndex((j) => linkOf(j) !== void 0);
+  if (firstLinked === -1) {
+    return positional(completedJobs, userMessages);
+  }
+  const cutover = linkOf(completedJobs[firstLinked]);
+  const steps = positional(
+    completedJobs.slice(0, firstLinked),
+    userMessages.slice(0, cutover)
+  );
+  let cursor = cutover;
+  const isSteer = (m) => !!m?.id && !completedJobs.some((j) => j.message_id === m.id);
+  const drainTo = (stopAt) => {
+    while (cursor < stopAt) {
+      const m = userMessages[cursor++];
+      if (isSteer(m)) {
+        steps.push({ kind: "steer", content: m.content, messageId: m.id });
+      }
+    }
+    cursor = stopAt + 1;
+  };
+  for (const job of completedJobs.slice(firstLinked)) {
+    const at = linkOf(job);
+    if (at !== void 0) {
+      drainTo(at);
+      const prompt = userMessages[at];
+      steps.push({
+        kind: "turn",
+        jobId: job.job_id,
+        content: prompt.content,
+        messageId: prompt.id
+      });
+      continue;
+    }
+    steps.push({ kind: "turn", jobId: job.job_id });
+  }
+  for (let i = cursor; i < userMessages.length; i++) {
+    const m = userMessages[i];
+    if (isSteer(m)) {
+      steps.push({ kind: "steer", content: m.content, messageId: m.id });
+    }
+  }
+  return steps;
+}
+
 // src/types.ts
 var ChatEventType = {
   // Connection lifecycle (SDK-local, not wire)
@@ -2205,16 +2268,40 @@ var StreamManager = class {
         const userMessages = this.session.messages.filter(
           (m) => m.role === "user"
         );
+        const plan = planRestore({
+          completedJobs: completedJobs.map((j) => ({
+            job_id: j.job_id,
+            message_id: j.message_id
+          })),
+          userMessages: userMessages.map((m) => ({
+            id: m.id,
+            content: m.content
+          }))
+        });
         const eventLists = await Promise.all(
           completedJobs.map(
             (job) => this.session.client.getConversationEvents(conversationId, job.job_id).catch(() => [])
           )
         );
-        for (let i = 0; i < completedJobs.length; i++) {
+        const eventsByJobId = new Map(
+          completedJobs.map((job, i) => [job.job_id, eventLists[i] ?? []])
+        );
+        for (const step of plan) {
+          if (step.kind === "steer") {
+            this.session.replayTurn(
+              conversationId,
+              [],
+              step.content,
+              step.messageId,
+              true
+            );
+            continue;
+          }
           this.session.replayTurn(
             conversationId,
-            eventLists[i] ?? [],
-            userMessages[i]?.content
+            eventsByJobId.get(step.jobId) ?? [],
+            step.content,
+            step.messageId
           );
         }
         if (completedJobs.length > 0) {