@flytedan/flytebot-design-system 0.71.3 → 0.71.5

package/dist/index.js

@@ -12439,6 +12439,8 @@ function useChatEngine(opts) {
   const serverCount = React70.useRef(0);
   const serverIds = React70.useRef(/* @__PURE__ */ new Set());
   const liveTurn = React70.useRef(null);
+  const lastTurnOwn = React70.useRef(/* @__PURE__ */ new Set());
+  const retired = React70.useRef(/* @__PURE__ */ new Set());
   const threadRef = React70.useRef(null);
   const mounted = React70.useRef(true);
   React70.useEffect(() => {
@@ -12476,18 +12478,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)), ...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) {
@@ -12706,6 +12714,8 @@ function useChatEngine(opts) {
         commit(listRef.current.filter((m) => m.id !== holderId));
       }
     } finally {
+      const known = liveTurn.current.known;
+      lastTurnOwn.current = new Set([...serverIds.current].filter((id2) => !known.has(id2)));
       liveTurn.current = null;
       abortRef.current = null;
       busyRef.current = false;
@@ -12767,6 +12777,7 @@ function useChatEngine(opts) {
     const turn = list[at];
     commit(list.slice(0, at));
     serverCount.current = Math.max(0, serverCount.current - 1);
+    lastTurnOwn.current.forEach((id) => retired.current.add(id));
     stoppedRef.current = false;
     queueRef.current = [{ id: uid("q"), text: turn.text || "", attachments: turn.attachments }].concat(queueRef.current);
     setQueue(queueRef.current.slice());