@astralform/js 7.5.0 → 7.5.1

package/dist/index.cjs

@@ -2938,23 +2938,41 @@ var StreamManager = class {
     }
   }
   // ── Internal: restore ─────────────────────────────────────────
+  /**
+   * A conversation's turns, oldest first.
+   *
+   * Its own method so ``restore`` can put the request on the wire beside the
+   * probe and the message list while ``replayHistory``, which consumes it,
+   * keeps owning the shape it reads.
+   */
+  jobList(conversationId) {
+    return this.session.client.get(
+      `/v1/conversations/${encodeURIComponent(conversationId)}/jobs`
+    );
+  }
   async restore(conversationId, gen) {
     const superseded = () => gen !== this.generation;
     if (superseded()) return;
     const turn = this.turnCounter;
     const announcedRestoring = !this.session.isStreaming;
     if (announcedRestoring) this.setState("restoring");
-    let activeJobId = null;
-    try {
-      const res = await this.session.client.getActiveJob(conversationId);
-      activeJobId = res.jobId;
-    } catch {
-    }
     if (superseded()) return;
-    await this.session.loadConversation(conversationId);
+    const probeRequest = this.session.client.getActiveJob(conversationId).catch(() => null);
+    const loadRequest = this.session.loadConversation(conversationId);
+    const jobsRequest = announcedRestoring ? this.jobList(conversationId) : null;
+    void jobsRequest?.catch(() => {
+    });
+    const [probe] = await Promise.all([probeRequest, loadRequest]);
+    const activeJobId = probe?.jobId ?? null;
     if (superseded()) return;
     if (announcedRestoring && this.viewTakenOverByLiveTurn()) return;
-    if (announcedRestoring && !await this.replayHistory(conversationId, gen, activeJobId, turn))
+    if (jobsRequest && !await this.replayHistory(
+      conversationId,
+      gen,
+      activeJobId,
+      turn,
+      jobsRequest
+    ))
       return;
     if (activeJobId) {
       this.setState("streaming");
@@ -3012,11 +3030,17 @@ var StreamManager = class {
    * that started it, which is emitted as a bubble with no events — the whole
    * reason a conversation reopened mid-turn now shows the message that started
    * that turn.
+   *
+   * ``jobsRequest`` is the job list already IN FLIGHT — issued by ``restore``
+   * alongside the probe and the message list rather than fetched here, so the
+   * three round trips overlap. It is awaited inside the try below, which is
+   * what keeps a failed job list non-blocking exactly as it was when the fetch
+   * lived here.
    */
-  async replayHistory(conversationId, gen, activeJobId, turn) {
+  async replayHistory(conversationId, gen, activeJobId, turn, jobsRequest) {
     const stopReplay = () => gen !== this.generation || this.viewTakenOverByLiveTurn() || this.turnStarted(turn);
     try {
-      const jobs = await this.session.client.get(`/v1/conversations/${encodeURIComponent(conversationId)}/jobs`);
+      const jobs = await jobsRequest;
       if (stopReplay()) return false;
       const replayableJobs = jobs.filter(
         (j) => j.job_id !== activeJobId