@astralform/js 9.5.0 → 9.7.0

package/dist/index.cjs

@@ -2825,6 +2825,48 @@ var ChatSession = class {
     if (!fresh.length) return;
     this.setMessages([...fresh, ...this.messages]);
   }
+  /**
+   * Re-fetch the NEWEST page of the conversation list and merge it in.
+   *
+   * The list the sidebar renders is seeded once at `connect()` and then only
+   * changed by this client's own actions (create, delete, rename) — so a row's
+   * `activeJobId` is as fresh as that seed, and a job started in ANOTHER tab or
+   * on another device never appears, while one that ended elsewhere stays lit
+   * forever. A caller that refreshes on a trigger (the tab becoming visible, or
+   * a bounded interval while any job is live) keeps the rows honest without a
+   * socket per conversation.
+   *
+   * Merge rules, and why each is what it is:
+   *
+   *  - the server's ORDER wins for the rows it returns: an updated conversation
+   *    moves to its new place, which is the whole point of the call;
+   *  - rows paged in EARLIER (`loadMoreConversations`) are kept — this reads page
+   *    1 only, and dropping the tail would make a refresh silently truncate a
+   *    list the reader has already scrolled;
+   *  - a row the caller MINTED locally and the server does not know yet is kept
+   *    too (it has no server row to be refreshed by);
+   *  - `conversationsGeneration` is bumped, for the same reason `connect()`
+   *    bumps it: a page request already in flight was cut against the old head
+   *    and its offset no longer means what it did.
+   */
+  async refreshConversations() {
+    const page = await this.client.getConversations(CONVERSATION_PAGE_SIZE, 0);
+    const pageIds = new Set(page.map((c) => c.id));
+    const known = new Set(this.conversations.map((c) => c.id));
+    this.conversationsGeneration++;
+    this.conversations = [
+      ...page,
+      // Everything the page did not mention: older pages, and rows that exist
+      // only on this client (a minted conversation the server has not been told
+      // about yet).
+      ...this.conversations.filter((c) => !pageIds.has(c.id))
+    ];
+    for (const c of page) {
+      this.serverConversationIds.add(c.id);
+      known.delete(c.id);
+    }
+    return page;
+  }
   async loadMoreConversations() {
     if (this.isLoadingConversations || !this.hasMoreConversations) return [];
     this.isLoadingConversations = true;
@@ -3420,6 +3462,7 @@ var StreamManager = class _StreamManager {
     const haveByJobId = new Map(
       (have ?? []).map((h) => [h.jobId, h.lastSeq])
     );
+    const heldFromMarks = (have ?? []).map((h) => h.messageId).filter((id) => typeof id === "string" && id.length > 0);
     const superseded = () => gen !== this.generation;
     if (superseded()) return;
     const turn = this.turnCounter;
@@ -3447,7 +3490,8 @@ var StreamManager = class _StreamManager {
       activeJobId,
       turn,
       jobsRequest,
-      haveByJobId
+      haveByJobId,
+      heldFromMarks
     ))
       return;
     if (activeJobId) {
@@ -3644,7 +3688,7 @@ var StreamManager = class _StreamManager {
       session.isLoadingEarlierTurns = false;
     }
   }
-  async replayHistory(conversationId, gen, activeJobId, turn, jobsRequest, haveByJobId) {
+  async replayHistory(conversationId, gen, activeJobId, turn, jobsRequest, haveByJobId, heldFromMarks) {
     const stopReplay = () => gen !== this.generation || this.viewTakenOverByLiveTurn() || this.turnStarted(turn);
     let complete = false;
     try {
@@ -3691,7 +3735,10 @@ var StreamManager = class _StreamManager {
         // primary cache scenario, a SETTLED conversation whose turns are all
         // held — and the empty-walk rescue would otherwise re-emit every one of
         // them as a steer bubble.
-        heldMessageIds: jobs.filter((j) => haveByJobId.has(j.job_id)).map((j) => j.message_id),
+        heldMessageIds: [
+          ...jobs.filter((j) => haveByJobId.has(j.job_id)).map((j) => j.message_id),
+          ...heldFromMarks
+        ],
         userMessages: userMessages.map((m) => ({
           id: m.id,
           content: m.content
@@ -3725,8 +3772,11 @@ var StreamManager = class _StreamManager {
           step.messageId
         );
       }
-      this.session.hasMoreTurns = page.hasMore;
-      this.session.oldestTurnCursor = page.nextBefore;
+      const drewNothing = plan.length === 0;
+      const holdsTurns = haveByJobId.size > 0;
+      const noDrawableTurns = drewNothing && holdsTurns;
+      this.session.hasMoreTurns = noDrawableTurns ? false : page.hasMore;
+      this.session.oldestTurnCursor = noDrawableTurns ? null : page.nextBefore;
       this.oldestDrawnMessageId = plan[0]?.messageId ?? null;
       complete = true;
       if (stopReplay()) return false;