@flytedan/flytebot-design-system 0.71.2 → 0.71.4

package/dist/index.cjs

@@ -13614,6 +13614,10 @@ function useChatEngine(opts) {
   const stoppedRef = React70.useRef(false);
   const abortRef = React70.useRef(null);
   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(() => {
@@ -13642,15 +13646,35 @@ function useChatEngine(opts) {
     const data = await apiAdapter.getThread(id);
     const list = [...data && data.messages || []];
     serverCount.current = list.length;
+    serverIds.current = new Set(list.map((m) => m.id));
     commit(list);
     return list;
   }, [apiAdapter]);
   async function mergeThread() {
     const data = await apiAdapter.getThread(threadRef.current);
     const server = data && data.messages || [];
+    const turn = liveTurn.current;
+    const ownIds = /* @__PURE__ */ new Set();
+    let progress;
+    if (turn) {
+      for (const m of server) {
+        if (turn.known.has(m.id)) continue;
+        ownIds.add(m.id);
+        if (m.role === "assistant") progress = m;
+      }
+    }
     const ids = new Set(server.map((m) => m.id));
     serverCount.current = server.length;
-    commit([...server, ...listRef.current.filter((m) => !ids.has(m.id))]);
+    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))];
+    commit(turn && progress ? next.map((m) => m.id === turn.holderId ? foldProgress(m, progress) : m) : next);
+  }
+  function foldProgress(holder, progress) {
+    return Object.assign({}, holder, {
+      steps: progress.steps ?? holder.steps,
+      text: progress.text || holder.text,
+      packet: progress.packet ?? holder.packet
+    });
   }
   React70.useEffect(() => {
     if (!apiAdapter) {
@@ -13805,6 +13829,7 @@ function useChatEngine(opts) {
       { id: userId, role: "user", text: turn.text || null, attachments: turn.attachments, pending: true, timestamp: (/* @__PURE__ */ new Date()).toISOString() },
       { id: holderId, role: "assistant", text: "", streaming: !!apiAdapter.streamMessage, working: !apiAdapter.streamMessage, timestamp: (/* @__PURE__ */ new Date()).toISOString() }
     );
+    liveTurn.current = { known: new Set(serverIds.current), holderId };
     const ac = typeof AbortController !== "undefined" ? new AbortController() : { abort() {
     }, signal: void 0 };
     abortRef.current = ac;
@@ -13860,6 +13885,9 @@ 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;
       setBusy(false);
@@ -13920,6 +13948,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());