@flytedan/flytebot-design-system 0.71.4 → 0.71.6

package/dist/index.cjs

@@ -13611,6 +13611,7 @@ function useChatEngine(opts) {
   const listRef = React70.useRef([]);
   const queueRef = React70.useRef([]);
   const busyRef = React70.useRef(false);
+  const loadedRef = React70.useRef(false);
   const stoppedRef = React70.useRef(false);
   const abortRef = React70.useRef(null);
   const serverCount = React70.useRef(0);
@@ -13655,18 +13656,24 @@ function useChatEngine(opts) {
     const server = data && data.messages || [];
     const turn = liveTurn.current;
     const ownIds = /* @__PURE__ */ new Set();
-    let progress;
+    const ownAssistants = [];
     if (turn) {
       for (const m of server) {
         if (turn.known.has(m.id)) continue;
         ownIds.add(m.id);
-        if (m.role === "assistant") progress = m;
+        if (m.role === "assistant") ownAssistants.push(m);
       }
     }
+    const progress = ownAssistants.pop();
+    const cards = ownAssistants;
     const ids = new Set(server.map((m) => m.id));
     serverCount.current = server.length;
     serverIds.current = ids;
-    const next = [...server.filter((m) => !ownIds.has(m.id) && !retired.current.has(m.id)), ...listRef.current.filter((m) => !ids.has(m.id))];
+    const settled = server.filter((m) => !ownIds.has(m.id) && !retired.current.has(m.id));
+    const local = listRef.current.filter((m) => !ids.has(m.id));
+    const at = local.findIndex((m) => m.id === turn?.holderId);
+    const tail = at < 0 ? [...cards, ...local] : [...local.slice(0, at), ...cards, ...local.slice(at)];
+    const next = [...settled, ...tail];
     commit(turn && progress ? next.map((m) => m.id === turn.holderId ? foldProgress(m, progress) : m) : next);
   }
   function foldProgress(holder, progress) {
@@ -13700,6 +13707,7 @@ function useChatEngine(opts) {
     queueRef.current = [];
     setQueue([]);
     stoppedRef.current = false;
+    loadedRef.current = false;
     setStatus("resolving");
     setFatal(null);
     (async () => {
@@ -13720,12 +13728,14 @@ function useChatEngine(opts) {
         await loadThread(id);
         if (dead) return;
         setStatus("ready");
+        loadedRef.current = true;
         onThreadReady && onThreadReady(id);
         const stored = store.get(STORAGE_PREFIX + id);
         const last = [...visibleMessages(listRef.current)].reverse().find((m) => m.role === "assistant");
         if (stored) resumeJob(stored);
         else if (last && last.working && last.jobId) resumeJob(last.jobId, last.id);
         else if (initialMessage) send(initialMessage);
+        drain();
       } catch (err) {
         if (dead) return;
         if (!fail(err)) {
@@ -13815,6 +13825,7 @@ function useChatEngine(opts) {
       busyRef.current = false;
       setBusy(false);
       setTurnStartedAt(null);
+      drain();
     });
   }
   async function dispatchTurn(turn) {
@@ -13895,7 +13906,7 @@ function useChatEngine(opts) {
     }
   }
   async function drain() {
-    if (busyRef.current) return;
+    if (busyRef.current || !loadedRef.current) return;
     while (queueRef.current.length) {
       if (stoppedRef.current) return;
       const turn = queueRef.current[0];