@flamingo-stack/openframe-frontend-core 0.0.444 → 0.0.445

package/dist/{chunk-NDWIFCLS.js → chunk-3BHV2QAH.js}

@@ -27,7 +27,7 @@ import {
   useOgPlaceholderUrl,
   useOnboardingState,
   useToast
-} from "./chunk-MG4AMIFX.js";
+} from "./chunk-5NYXGWBN.js";
 import {
   AlertCircleIcon,
   AnthropicLogoGreyIcon,
@@ -249,7 +249,7 @@ import {
   acquireClient,
   releaseClient,
   startConnectionLifecycle
-} from "./chunk-PHWQLKVE.js";
+} from "./chunk-P47NN7RY.js";
 import {
   __esm
 } from "./chunk-GGWZFCYS.js";
@@ -46956,8 +46956,10 @@ function useChunkCatchup({
 }) {
   const processedSequenceKeys = useRef64(/* @__PURE__ */ new Set());
   const lastSequenceId = useRef64(null);
+  const lastSequenceIdByType = useRef64(/* @__PURE__ */ new Map());
   const fetchingInProgress = useRef64(false);
   const lastFetchParams = useRef64(null);
+  const pendingCatchupRef = useRef64(null);
   const chunkBuffer = useRef64([]);
   const bufferUntilInitialCatchupComplete = useRef64(false);
   const hasCompletedInitialCatchup = useRef64(false);
@@ -46976,8 +46978,14 @@ function useChunkCatchup({
     }
     if (chunk.sequenceId !== void 0 && chunk.sequenceId !== null) {
       const chunkType = typeof chunk.type === "string" ? chunk.type : "";
-      processedSequenceKeys.current.add(makeSeqKey(messageType, chunkType, chunk.sequenceId));
+      const key = makeSeqKey(messageType, chunkType, chunk.sequenceId);
+      if (processedSequenceKeys.current.has(key)) return true;
+      processedSequenceKeys.current.add(key);
       lastSequenceId.current = chunk.sequenceId;
+      const prevTypeSeq = lastSequenceIdByType.current.get(messageType);
+      if (prevTypeSeq === void 0 || chunk.sequenceId > prevTypeSeq) {
+        lastSequenceIdByType.current.set(messageType, chunk.sequenceId);
+      }
     }
     onChunkReceivedRef.current(chunk, messageType);
     return true;
@@ -46987,8 +46995,8 @@ function useChunkCatchup({
     const buffered = [...chunkBuffer.current];
     chunkBuffer.current = [];
     buffered.sort((a, b) => {
-      const seqA = a.chunk.sequenceId ?? 0;
-      const seqB = b.chunk.sequenceId ?? 0;
+      const seqA = a.chunk.sequenceId ?? Number.MAX_SAFE_INTEGER;
+      const seqB = b.chunk.sequenceId ?? Number.MAX_SAFE_INTEGER;
       return seqA - seqB;
     });
     buffered.forEach(({ chunk, messageType }) => {
@@ -47003,9 +47011,14 @@ function useChunkCatchup({
       return;
     }
     if (hasCompletedInitialCatchup.current) {
+      if (bufferUntilInitialCatchupComplete.current) {
+        bufferUntilInitialCatchupComplete.current = false;
+        flushBufferedRealtimeChunks();
+      }
       return;
     }
     if (fetchingInProgress.current) {
+      pendingCatchupRef.current = { dialogId: dialogId2, fromSequenceId: fromSequenceId ?? lastSequenceId.current };
       return;
     }
     if (lastFetchParams.current && lastFetchParams.current.dialogId === dialogId2 && lastFetchParams.current.fromSequenceId === fromSequenceId) {
@@ -47022,7 +47035,8 @@ function useChunkCatchup({
     try {
       const chunkPromises = chatTypes2.map(async (chatType) => {
         try {
-          const chunks = await fetchChunks2(dialogId2, chatType, fromSequenceId);
+          const typeFromSequenceId = fromSequenceId === void 0 ? void 0 : lastSequenceIdByType.current.get(getChatTypeMessageType(chatType)) ?? null;
+          const chunks = await fetchChunks2(dialogId2, chatType, typeFromSequenceId);
           const messageType = getChatTypeMessageType(chatType);
           return chunks.map((chunk) => ({ chunk, messageType }));
         } catch (error) {
@@ -47042,49 +47056,66 @@ function useChunkCatchup({
       chunkBuffer.current = [];
       const allChunks = [...allCatchupChunks, ...bufferedNatsChunks];
       allChunks.sort((a, b) => {
-        const seqA = a.chunk.sequenceId ?? 0;
-        const seqB = b.chunk.sequenceId ?? 0;
+        const seqA = a.chunk.sequenceId ?? Number.MAX_SAFE_INTEGER;
+        const seqB = b.chunk.sequenceId ?? Number.MAX_SAFE_INTEGER;
         return seqA - seqB;
       });
       const uniqueAllChunks = [];
       const seenInBatch = /* @__PURE__ */ new Set();
       for (const item of allChunks) {
-        const k = makeBatchDedupKey(item);
-        if (seenInBatch.has(k)) continue;
-        seenInBatch.add(k);
-        uniqueAllChunks.push(item);
-      }
-      let lastMessageStartSeqId = null;
-      let lastMessageEndSeqId = null;
-      for (let i = uniqueAllChunks.length - 1; i >= 0; i--) {
-        const seq = uniqueAllChunks[i].chunk.sequenceId;
-        if (uniqueAllChunks[i].chunk.type === MESSAGE_TYPE.MESSAGE_END && seq !== void 0 && seq !== null) {
-          lastMessageEndSeqId = seq;
-          break;
+        const hasSeq = item.chunk.sequenceId !== void 0 && item.chunk.sequenceId !== null;
+        if (hasSeq) {
+          const k = makeBatchDedupKey(item);
+          if (seenInBatch.has(k)) continue;
+          seenInBatch.add(k);
         }
+        uniqueAllChunks.push(item);
       }
-      for (let i = uniqueAllChunks.length - 1; i >= 0; i--) {
-        const chunk = uniqueAllChunks[i].chunk;
-        const seq = chunk.sequenceId;
-        if (chunk.type === MESSAGE_TYPE.MESSAGE_START && seq !== void 0 && seq !== null) {
-          if (lastMessageEndSeqId === null || seq > lastMessageEndSeqId) {
-            lastMessageStartSeqId = seq;
+      const hasNoSeq = (item) => item.chunk.sequenceId === void 0 || item.chunk.sequenceId === null;
+      const byType = /* @__PURE__ */ new Map();
+      for (const item of uniqueAllChunks) {
+        const list = byType.get(item.messageType);
+        if (list) list.push(item);
+        else byType.set(item.messageType, [item]);
+      }
+      const chunksToProcess = [];
+      for (const items of byType.values()) {
+        let lastMessageStartSeqId = null;
+        let lastMessageEndSeqId = null;
+        for (let i = items.length - 1; i >= 0; i--) {
+          const seq = items[i].chunk.sequenceId;
+          if (items[i].chunk.type === MESSAGE_TYPE.MESSAGE_END && seq !== void 0 && seq !== null) {
+            lastMessageEndSeqId = seq;
             break;
           }
         }
+        for (let i = items.length - 1; i >= 0; i--) {
+          const chunk = items[i].chunk;
+          const seq = chunk.sequenceId;
+          if (chunk.type === MESSAGE_TYPE.MESSAGE_START && seq !== void 0 && seq !== null) {
+            if (lastMessageEndSeqId === null || seq > lastMessageEndSeqId) {
+              lastMessageStartSeqId = seq;
+              break;
+            }
+          }
+        }
+        if (lastMessageStartSeqId !== null) {
+          chunksToProcess.push(
+            ...items.filter((item) => hasNoSeq(item) || item.chunk.sequenceId >= lastMessageStartSeqId)
+          );
+        } else if (lastMessageEndSeqId !== null) {
+          chunksToProcess.push(
+            ...items.filter((item) => hasNoSeq(item) || item.chunk.sequenceId > lastMessageEndSeqId)
+          );
+        } else {
+          chunksToProcess.push(...items);
+        }
       }
-      let chunksToProcess;
-      if (lastMessageStartSeqId !== null) {
-        chunksToProcess = uniqueAllChunks.filter(
-          (item) => item.chunk.sequenceId !== void 0 && item.chunk.sequenceId >= lastMessageStartSeqId
-        );
-      } else if (lastMessageEndSeqId !== null) {
-        chunksToProcess = uniqueAllChunks.filter(
-          (item) => item.chunk.sequenceId !== void 0 && item.chunk.sequenceId > lastMessageEndSeqId
-        );
-      } else {
-        chunksToProcess = uniqueAllChunks;
-      }
+      chunksToProcess.sort((a, b) => {
+        const seqA = a.chunk.sequenceId ?? Number.MAX_SAFE_INTEGER;
+        const seqB = b.chunk.sequenceId ?? Number.MAX_SAFE_INTEGER;
+        return seqA - seqB;
+      });
       chunksToProcess.forEach(({ chunk, messageType }) => {
         if (chunk.sequenceId !== void 0 && chunk.sequenceId !== null) {
           const chunkType = typeof chunk.type === "string" ? chunk.type : "";
@@ -47092,6 +47123,10 @@ function useChunkCatchup({
           if (processedSequenceKeys.current.has(key)) return;
           processedSequenceKeys.current.add(key);
           lastSequenceId.current = chunk.sequenceId;
+          const prevTypeSeq = lastSequenceIdByType.current.get(messageType);
+          if (prevTypeSeq === void 0 || chunk.sequenceId > prevTypeSeq) {
+            lastSequenceIdByType.current.set(messageType, chunk.sequenceId);
+          }
         }
         onChunkReceivedRef.current(chunk, messageType);
       });
@@ -47100,26 +47135,55 @@ function useChunkCatchup({
     } catch (error) {
       console.error("Error during chunk catchup:", error);
     } finally {
-      fetchingInProgress.current = false;
-      if (bufferUntilInitialCatchupComplete.current) {
-        bufferUntilInitialCatchupComplete.current = false;
-        hasCompletedInitialCatchup.current = true;
-        flushBufferedRealtimeChunks();
+      if (dialogId2 !== dialogIdRef.current) {
+        if (pendingCatchupRef.current?.dialogId === dialogId2) {
+          pendingCatchupRef.current = null;
+        }
+      } else {
+        fetchingInProgress.current = false;
+        const pending = pendingCatchupRef.current;
+        if (pending) {
+          pendingCatchupRef.current = null;
+          if (pending.dialogId === dialogId2) {
+            hasCompletedInitialCatchup.current = false;
+            lastFetchParams.current = null;
+            bufferUntilInitialCatchupComplete.current = true;
+            try {
+              await catchUpChunksRef.current?.(pending.fromSequenceId);
+            } catch (rerunError) {
+              console.error("Queued catch-up re-run failed:", rerunError);
+            }
+          } else if (bufferUntilInitialCatchupComplete.current) {
+            bufferUntilInitialCatchupComplete.current = false;
+            hasCompletedInitialCatchup.current = true;
+            flushBufferedRealtimeChunks();
+          }
+        } else if (bufferUntilInitialCatchupComplete.current) {
+          bufferUntilInitialCatchupComplete.current = false;
+          hasCompletedInitialCatchup.current = true;
+          flushBufferedRealtimeChunks();
+        }
       }
     }
   }, [flushBufferedRealtimeChunks]);
+  const catchUpChunksRef = useRef64(null);
+  catchUpChunksRef.current = catchUpChunks;
   const resetChunkTracking = useCallback46(() => {
     processedSequenceKeys.current.clear();
     lastSequenceId.current = null;
+    lastSequenceIdByType.current.clear();
     fetchingInProgress.current = false;
     lastFetchParams.current = null;
+    pendingCatchupRef.current = null;
     chunkBuffer.current = [];
     bufferUntilInitialCatchupComplete.current = false;
     hasCompletedInitialCatchup.current = false;
   }, []);
   const startInitialBuffering = useCallback46(() => {
-    chunkBuffer.current = [];
-    bufferUntilInitialCatchupComplete.current = true;
+    if (!bufferUntilInitialCatchupComplete.current) {
+      chunkBuffer.current = [];
+      bufferUntilInitialCatchupComplete.current = true;
+    }
     hasCompletedInitialCatchup.current = false;
   }, []);
   const isBufferingActive = useCallback46(() => bufferUntilInitialCatchupComplete.current, []);
@@ -47128,8 +47192,10 @@ function useChunkCatchup({
     const fromSeq = lastSequenceId.current;
     hasCompletedInitialCatchup.current = false;
     lastFetchParams.current = null;
-    bufferUntilInitialCatchupComplete.current = true;
-    chunkBuffer.current = [];
+    if (!bufferUntilInitialCatchupComplete.current) {
+      chunkBuffer.current = [];
+      bufferUntilInitialCatchupComplete.current = true;
+    }
     await catchUpChunks(fromSeq);
   }, [catchUpChunks]);
   return {
@@ -47329,6 +47395,10 @@ function useJetStreamDialogSubscription({
       }
     };
   }, [enabled, wsUrl]);
+  useEffect79(() => {
+    highestStreamSeqRef.current = null;
+    setCurrentStreamSeq(null);
+  }, [dialogId]);
   useEffect79(() => {
     if (!enabled || !dialogId || !isConnected) {
       if (subscriptionRef.current) {
@@ -47412,10 +47482,6 @@ function useJetStreamDialogSubscription({
       setIsSubscribed(false);
     };
   }, [enabled, dialogId, isConnected, streamName, topic, reconnectionCount]);
-  useEffect79(() => {
-    highestStreamSeqRef.current = null;
-    setCurrentStreamSeq(null);
-  }, [dialogId]);
   return { isConnected, isSubscribed, reconnectionCount, currentStreamSeq };
 }
 
@@ -47556,6 +47622,8 @@ function useNatsDialogSubscription({
     };
   }, [enabled, wsUrl]);
   const topicsKey = topics.join(",");
+  const topicsRef = useRef66(topics);
+  topicsRef.current = topics;
   const lastSubscribedDialogIdRef = useRef66(null);
   const isConnectedRef = useRef66(isConnected);
   useEffect80(() => {
@@ -47615,7 +47683,7 @@ function useNatsDialogSubscription({
         } catch {
         }
       };
-      topics.forEach((topic) => {
+      topicsRef.current.forEach((topic) => {
         const subscription = client.subscribeBytes(
           `chat.${dialogId}.${topic}`,
           handleMessage(topic),
@@ -47643,7 +47711,7 @@ function useNatsDialogSubscription({
       lastSubscribedDialogIdRef.current = null;
       abortControllerRef.current = null;
     };
-  }, [enabled, dialogId, topicsKey, topics]);
+  }, [enabled, dialogId, topicsKey]);
   useEffect80(() => {
     if (!enabled || !currentDialogIdRef.current || !isConnected) {
       return;
@@ -47666,7 +47734,7 @@ function useNatsDialogSubscription({
         } catch {
         }
       };
-      topics.forEach((topic) => {
+      topicsRef.current.forEach((topic) => {
         const subscription = client.subscribeBytes(
           `chat.${dialogId2}.${topic}`,
           handleMessage(topic),
@@ -47680,7 +47748,7 @@ function useNatsDialogSubscription({
     } else if (subscriptionRefs.current.size > 0) {
       setIsSubscribed(true);
     }
-  }, [isConnected, enabled, topics, topicsKey]);
+  }, [isConnected, enabled, topicsKey]);
   return { isConnected, isSubscribed, reconnectionCount };
 }
 function buildNatsWsUrl(apiBaseUrl, options) {
@@ -48041,6 +48109,10 @@ var MessageSegmentAccumulator = class {
       const hasCall = seg.data.toolCalls.some((c) => c.toolExecutionRequestId === execId);
       if (!hasCall) return seg;
       const prev = seg.data.executions?.[execId];
+      if (toolData.type === "EXECUTING_TOOL" && prev?.status === "done") {
+        matched = true;
+        return seg;
+      }
       const next = toolData.type === "EXECUTED_TOOL" ? { status: "done", result: toolData.result, success: toolData.success } : { status: "executing", result: prev?.result, success: prev?.success };
       matched = true;
       return {
@@ -48504,6 +48576,16 @@ function useRealtimeChunkProcessor(options) {
               explanation: escalatedData.explanation,
               approvalType: escalatedData.approvalType
             });
+            const emitResolved = (segments) => {
+              if (isInStreamRef.current) {
+                emitSegments(segments);
+                return;
+              }
+              const delta = segments.filter(
+                (s) => s.type === "approval_request" && s.data.requestId === requestId || s.type === "approval_batch" && s.data.approvalRequestId === requestId
+              );
+              emitSegments(delta, { append: true });
+            };
             if (escalatedData.toolCalls && escalatedData.toolCalls.length > 0) {
               if (batchApprovalsEnabled) {
                 const segments = accumulator.addApprovalBatch(
@@ -48514,7 +48596,7 @@ function useRealtimeChunkProcessor(options) {
                   void 0,
                   resolvedByName
                 );
-                emitSegments(segments);
+                emitResolved(segments);
               } else {
                 let segments = accumulator.getSegments();
                 for (const call of escalatedData.toolCalls) {
@@ -48527,7 +48609,7 @@ function useRealtimeChunkProcessor(options) {
                     status
                   );
                 }
-                emitSegments(segments);
+                emitResolved(segments);
               }
             } else {
               const segments = accumulator.addApprovalRequest(
@@ -48537,7 +48619,7 @@ function useRealtimeChunkProcessor(options) {
                 escalatedData.approvalType,
                 status
               );
-              emitSegments(segments);
+              emitResolved(segments);
             }
           } else {
             accumulator.updateApprovalStatus(requestId, status, resolvedByName);
@@ -48617,6 +48699,8 @@ function useRealtimeChunkProcessor(options) {
     hasInitializedWithData.current = false;
     sawDirectMessageRef.current = false;
     directTeardownFiredRef.current = false;
+    isInStreamRef.current = false;
+    hasEverStreamedRef.current = false;
   }, []);
   const updateApprovalStatus = useCallback47(
     (requestId, status, resolvedByName) => {
@@ -50147,7 +50231,15 @@ function processHistoricalMessages(messages, options = {}) {
     onReject,
     chatTypeFilter,
     approvalStatuses = {},
-    displayApprovalTypes
+    // An omitted option means "display every approval type" — the original
+    // history semantics. Deliberately NOT defaulted to the realtime
+    // processor's ['CLIENT']: consumers that pass a wider list to their
+    // realtime processor but omit it on the history path would silently lose
+    // pending non-CLIENT approval cards on every reload/reconnect refetch
+    // (they also ignore `escalatedApprovals`). Realtime/history parity is
+    // opt-in: pass the same explicit list to both.
+    displayApprovalTypes,
+    batchApprovalsEnabled
   } = options;
   const processedMessages = [];
   const accumulator = createMessageSegmentAccumulator({ onApprove, onReject });
@@ -50212,7 +50304,13 @@ function processHistoricalMessages(messages, options = {}) {
       }
       lastAssistantId = msg.id;
       messageDataArray.forEach((data) => {
-        processMessageData(data, accumulator, approvalStatuses, { displayApprovalTypes }, escalatedApprovals);
+        processMessageData(
+          data,
+          accumulator,
+          approvalStatuses,
+          { displayApprovalTypes, batchApprovalsEnabled },
+          escalatedApprovals
+        );
       });
       const nextMsg = messages[index + 1];
       const isLastMessage = index === messages.length - 1;
@@ -50436,7 +50534,7 @@ function extractErrorMessages(messages, options = {}) {
   return errorMessages;
 }
 function processHistoricalMessagesWithErrors(messages, options = {}) {
-  const { chatTypeFilter, assistantName = "Fae", assistantType = "fae", assistantAvatar, onApprove, onReject, approvalStatuses = {}, displayApprovalTypes } = options;
+  const { chatTypeFilter, assistantName = "Fae", assistantType = "fae", assistantAvatar, onApprove, onReject, approvalStatuses = {}, displayApprovalTypes, batchApprovalsEnabled } = options;
   const processedMessages = [];
   const accumulator = createMessageSegmentAccumulator({ onApprove, onReject });
   const escalatedApprovals = /* @__PURE__ */ new Map();
@@ -50500,7 +50598,13 @@ function processHistoricalMessagesWithErrors(messages, options = {}) {
       }
       lastAssistantId = msg.id;
       messageDataArray.forEach((data) => {
-        processMessageData(data, accumulator, approvalStatuses, { displayApprovalTypes }, escalatedApprovals);
+        processMessageData(
+          data,
+          accumulator,
+          approvalStatuses,
+          { displayApprovalTypes, batchApprovalsEnabled },
+          escalatedApprovals
+        );
       });
       const nextMsg = messages[index + 1];
       const isLastMessage = index === messages.length - 1;
@@ -50529,6 +50633,65 @@ function processHistoricalMessagesWithErrors(messages, options = {}) {
   };
 }
 
+// src/components/chat/utils/extract-incomplete-message-state.ts
+function extractIncompleteMessageState(lastMessage) {
+  if (!lastMessage || lastMessage.role !== "assistant" || typeof lastMessage.content === "string") {
+    return void 0;
+  }
+  const segments = lastMessage.content;
+  const pendingApprovals = /* @__PURE__ */ new Map();
+  const executingTools = /* @__PURE__ */ new Map();
+  let hasIncompleteState = false;
+  segments.forEach((segment) => {
+    switch (segment.type) {
+      case "tool_execution":
+        if (segment.data.type === "EXECUTING_TOOL") {
+          const toolKey = segment.data.toolExecutionRequestId || `${segment.data.integratedToolType}-${segment.data.toolFunction}`;
+          executingTools.set(toolKey, {
+            integratedToolType: segment.data.integratedToolType,
+            toolFunction: segment.data.toolFunction,
+            toolTitle: segment.data.toolTitle,
+            parameters: segment.data.parameters
+          });
+          hasIncompleteState = true;
+        }
+        break;
+      case "approval_request":
+        if (segment.status === "pending" && segment.data.requestId) {
+          pendingApprovals.set(segment.data.requestId, {
+            command: segment.data.command,
+            explanation: segment.data.explanation,
+            approvalType: segment.data.approvalType || "CLIENT"
+          });
+          hasIncompleteState = true;
+        }
+        break;
+      case "approval_batch": {
+        const allDone = !!segment.data.executions && segment.data.toolCalls.every(
+          (c) => segment.data.executions?.[c.toolExecutionRequestId]?.status === "done"
+        );
+        if (segment.status !== "rejected" && !allDone) {
+          hasIncompleteState = true;
+        }
+        break;
+      }
+      case "context_compaction":
+        if (segment.status === "started") {
+          hasIncompleteState = true;
+        }
+        break;
+    }
+  });
+  if (!hasIncompleteState) {
+    return void 0;
+  }
+  return {
+    existingSegments: segments,
+    pendingApprovals: pendingApprovals.size > 0 ? pendingApprovals : void 0,
+    executingTools: executingTools.size > 0 ? executingTools : void 0
+  };
+}
+
 // src/components/chat/hooks/use-nats-chat-adapter.ts
 function nextId(role) {
   return `${role}-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`;
@@ -50551,6 +50714,110 @@ function updateTrailingAssistant(prev, segments) {
     { ...last, segments }
   ];
 }
+var CONTENT_DEDUP_WINDOW = 4;
+var SYSTEM_DEDUP_WINDOW = 10;
+function hasRecentMessage(prev, predicate, window2) {
+  const start = Math.max(0, prev.length - window2);
+  for (let i = prev.length - 1; i >= start; i--) {
+    if (predicate(prev[i])) return true;
+  }
+  return false;
+}
+function appendToTrailingAssistant(prev, segments) {
+  if (segments.length === 0) return prev;
+  const last = prev[prev.length - 1];
+  if (!last || last.role !== "assistant") {
+    return [
+      ...prev,
+      { id: nextId("assistant"), role: "assistant", content: "", segments }
+    ];
+  }
+  const merged = [...last.segments ?? []];
+  for (const seg of segments) {
+    const tail = merged[merged.length - 1];
+    if (seg.type === "text" && tail?.type === "text") {
+      merged[merged.length - 1] = { type: "text", text: tail.text + seg.text };
+    } else if (seg.type === "thinking" && tail?.type === "thinking") {
+      merged[merged.length - 1] = { type: "thinking", text: tail.text + seg.text };
+    } else if (seg.type === "approval_batch") {
+      const idx = merged.findIndex(
+        (m) => m.type === "approval_batch" && m.data.approvalRequestId === seg.data.approvalRequestId
+      );
+      if (idx !== -1) merged[idx] = seg;
+      else merged.push(seg);
+    } else if (seg.type === "approval_request") {
+      const idx = merged.findIndex(
+        (m) => m.type === "approval_request" && m.data.requestId === seg.data.requestId && m.data.command === seg.data.command
+      );
+      if (idx !== -1) merged[idx] = seg;
+      else merged.push(seg);
+    } else {
+      merged.push(seg);
+    }
+  }
+  return [...prev.slice(0, -1), { ...last, segments: merged }];
+}
+function upsertTrailingCompaction(prev, segments) {
+  const compaction = [...segments].reverse().find((s) => s.type === "context_compaction");
+  if (!compaction) return prev;
+  const last = prev[prev.length - 1];
+  if (!last || last.role !== "assistant") {
+    return [
+      ...prev,
+      { id: nextId("assistant"), role: "assistant", content: "", segments: [compaction] }
+    ];
+  }
+  const existing = last.segments ?? [];
+  const startedIdx = existing.map((s) => s.type === "context_compaction" && s.status === "started").lastIndexOf(true);
+  const merged = startedIdx !== -1 ? existing.map((s, i) => i === startedIdx ? compaction : s) : [...existing, compaction];
+  return [...prev.slice(0, -1), { ...last, segments: merged }];
+}
+function applyToolExecutionToMessages(prev, segment) {
+  const toolData = segment.data;
+  const execId = toolData.toolExecutionRequestId;
+  for (let i = prev.length - 1; i >= 0; i--) {
+    const message2 = prev[i];
+    if (message2.role !== "assistant" || !message2.segments) continue;
+    for (let j = message2.segments.length - 1; j >= 0; j--) {
+      const seg = message2.segments[j];
+      if (execId && seg.type === "approval_batch" && seg.data.toolCalls.some((c) => c.toolExecutionRequestId === execId)) {
+        const prevExec = seg.data.executions?.[execId];
+        if (toolData.type === "EXECUTING_TOOL" && prevExec?.status === "done") {
+          return prev;
+        }
+        const nextExec = toolData.type === "EXECUTED_TOOL" ? { status: "done", result: toolData.result, success: toolData.success } : { status: "executing", result: prevExec?.result, success: prevExec?.success };
+        const nextSegments = [...message2.segments];
+        nextSegments[j] = {
+          ...seg,
+          data: { ...seg.data, executions: { ...seg.data.executions ?? {}, [execId]: nextExec } }
+        };
+        const next = [...prev];
+        next[i] = { ...message2, segments: nextSegments };
+        return next;
+      }
+      if (seg.type === "tool_execution") {
+        const matches = execId ? seg.data.toolExecutionRequestId === execId : seg.data.type === "EXECUTING_TOOL" && seg.data.integratedToolType === toolData.integratedToolType && seg.data.toolFunction === toolData.toolFunction;
+        if (!matches) continue;
+        if (toolData.type === "EXECUTING_TOOL" && seg.data.type === "EXECUTED_TOOL") {
+          return prev;
+        }
+        const nextSegments = [...message2.segments];
+        nextSegments[j] = {
+          type: "tool_execution",
+          data: {
+            ...toolData,
+            toolTitle: toolData.toolTitle ?? seg.data.toolTitle,
+            parameters: toolData.parameters || seg.data.parameters
+          }
+        };
+        const next = [...prev];
+        next[i] = { ...message2, segments: nextSegments };
+        return next;
+      }
+    }
+  }
+  return appendToTrailingAssistant(prev, [segment]);
+}
 function mapProcessedToUnified(processed) {
   const out = [];
   for (const m of processed) {
@@ -50590,6 +50857,7 @@ function useNatsChatAdapter(config, options = {}) {
     fetchChunks,
     topics,
     batchApprovalsEnabled,
+    displayApprovalTypes,
     fetchDialogs,
     fetchDialogMessages,
     createDialog: createDialogCallback,
@@ -50609,11 +50877,17 @@ function useNatsChatAdapter(config, options = {}) {
   const isManagedMode = fetchDialogs !== void 0;
   const [internalDialogId, setInternalDialogId] = useState116(null);
   const dialogId = isManagedMode ? internalDialogId : controlledDialogId !== void 0 ? controlledDialogId : null;
+  const currentDialogIdRef = useRef74(dialogId);
+  currentDialogIdRef.current = dialogId;
   const [messages, setMessages] = useState116([]);
   const [streamingPhase, setStreamingPhase] = useState116("idle");
   const streamingPhaseRef = useRef74(streamingPhase);
   streamingPhaseRef.current = streamingPhase;
-  const suppressAgentBusyRef = useRef74(false);
+  const suppressAgentBusyRef = useRef74(0);
+  const adoptTrailingAssistantRef = useRef74(false);
+  const hasConnectedOnceRef = useRef74(false);
+  const seenParticipantSeqsRef = useRef74(/* @__PURE__ */ new Set());
+  const pendingEchoTextsRef = useRef74([]);
   const [approvalStatuses, setApprovalStatuses] = useState116({});
   const [dialogs, setDialogs] = useState116([]);
   const [dialogsNextCursor, setDialogsNextCursor] = useState116(null);
@@ -50679,17 +50953,39 @@ function useNatsChatAdapter(config, options = {}) {
     return handleRejectRef.current(requestId);
   }, []);
   const callbacksRef = useRef74({
-    onSegmentsUpdate: (segments) => {
+    onSegmentsUpdate: (segments, meta) => {
+      if (meta?.append && meta.isCompacting) {
+        setMessages((prev) => upsertTrailingCompaction(prev, segments));
+        return;
+      }
+      if (meta?.append) {
+        setMessages((prev) => appendToTrailingAssistant(prev, segments));
+        return;
+      }
       setMessages((prev) => updateTrailingAssistant(prev, segments));
     },
-    onStreamStart: () => setStreamingPhase("streaming"),
+    onStreamStart: () => {
+      setStreamingPhase("streaming");
+      const adoptTail = adoptTrailingAssistantRef.current;
+      adoptTrailingAssistantRef.current = false;
+      setMessages((prev) => {
+        const last = prev[prev.length - 1];
+        if (!last || last.role !== "assistant" || adoptTail) return prev;
+        const hasContent = (last.segments?.length ?? 0) > 0 || last.content !== "";
+        if (!hasContent) return prev;
+        return [
+          ...prev,
+          { id: nextId("assistant"), role: "assistant", content: "", segments: [] }
+        ];
+      });
+    },
     onStreamEnd: () => setStreamingPhase("idle"),
     // Agent is executing (approved) commands outside an open stream — keep
     // the composer locked exactly like the in-stream phases. An open stream
     // keeps ownership: only 'idle' upgrades to 'thinking'. Suppressed during
     // initial catchup so a replayed dead tail can't lock a finished dialog.
     onAgentBusy: () => {
-      if (suppressAgentBusyRef.current) return;
+      if (suppressAgentBusyRef.current > 0) return;
       setStreamingPhase((p) => p === "idle" ? "thinking" : p);
     },
     // Terminal turn failures can arrive without a MESSAGE_END; unlock the
@@ -50704,27 +51000,171 @@ function useNatsChatAdapter(config, options = {}) {
       provider: meta.providerName || null,
       modelLabel: meta.modelDisplayName || meta.modelName || null,
       contextWindowMaxTokens: meta.contextWindow || null
-    })
+    }),
+    // Post-MESSAGE_END tool chunks (approved commands executing after the
+    // approval bubble, async batch results). Routed through the cross-message
+    // updater — the accumulator was reset at MESSAGE_END, so the old
+    // fallthrough replaced the whole trailing bubble with one tool segment.
+    onToolExecuted: (segment) => {
+      setMessages((prev) => applyToolExecutionToMessages(prev, segment));
+    },
+    // Cross-message approval status flip. Wiring this also makes the
+    // processor skip its cumulative re-emit for resolved approvals — which,
+    // post-MESSAGE_END, was an empty array that blanked the trailing bubble.
+    onApprovalResolved: (requestId, status, _approvalType, resolvedByName) => {
+      setMessages((prev) => {
+        let changed = false;
+        const next = prev.map((m) => {
+          if (m.role !== "assistant" || !m.segments) return m;
+          let msgChanged = false;
+          const segs = m.segments.map((s) => {
+            if (s.type === "approval_request" && s.data.requestId === requestId && s.status !== status) {
+              msgChanged = true;
+              return { ...s, status };
+            }
+            if (s.type === "approval_batch" && s.data.approvalRequestId === requestId) {
+              const nextResolvedBy = resolvedByName ?? s.resolvedByName;
+              if (s.status === status && nextResolvedBy === s.resolvedByName) return s;
+              msgChanged = true;
+              return { ...s, status, resolvedByName: nextResolvedBy };
+            }
+            return s;
+          });
+          if (!msgChanged) return m;
+          changed = true;
+          return { ...m, segments: segs };
+        });
+        return changed ? next : prev;
+      });
+      setApprovalStatuses(
+        (prev) => prev[requestId] === status ? prev : { ...prev, [requestId]: status }
+      );
+    },
+    // MESSAGE_REQUEST echo — a user message from THIS or another session.
+    onUserMessage: (text, meta) => {
+      if (!text) return;
+      const seq = meta?.streamSeq;
+      if (typeof seq === "number") {
+        if (seenParticipantSeqsRef.current.has(seq)) return;
+        seenParticipantSeqsRef.current.add(seq);
+      }
+      if (meta?.ownerType !== "ADMIN") {
+        const echoIdx = pendingEchoTextsRef.current.indexOf(text);
+        if (echoIdx !== -1) {
+          pendingEchoTextsRef.current.splice(echoIdx, 1);
+          return;
+        }
+      }
+      const authorType = meta?.ownerType === "ADMIN" ? "admin" : "user";
+      setMessages((prev) => {
+        if (typeof seq !== "number" && hasRecentMessage(
+          prev,
+          (m) => m.role === "user" && (m.authorType ?? "user") === authorType && m.content === text,
+          CONTENT_DEDUP_WINDOW
+        )) {
+          return prev;
+        }
+        return [
+          ...prev,
+          {
+            id: nextId("user"),
+            role: "user",
+            content: text,
+            ...meta?.displayName ? { name: meta.displayName } : {},
+            authorType,
+            ...meta?.contextItems && meta.contextItems.length > 0 ? {
+              contextItems: meta.contextItems.map((ci) => ({
+                type: ci.type,
+                id: ci.id,
+                label: ci.label ?? ci.id
+              }))
+            } : {}
+          }
+        ];
+      });
+    },
+    // Technician / admin direct message into the dialog.
+    onDirectMessage: (text, meta) => {
+      if (!text) return;
+      const seq = meta?.streamSeq;
+      if (typeof seq === "number") {
+        if (seenParticipantSeqsRef.current.has(seq)) return;
+        seenParticipantSeqsRef.current.add(seq);
+      }
+      setMessages((prev) => {
+        if (typeof seq !== "number" && hasRecentMessage(
+          prev,
+          (m) => m.role === "user" && m.authorType === "admin" && m.content === text,
+          CONTENT_DEDUP_WINDOW
+        )) {
+          return prev;
+        }
+        return [
+          ...prev,
+          {
+            id: `direct-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`,
+            role: "user",
+            content: text,
+            name: meta?.displayName ?? "Admin",
+            authorType: "admin"
+          }
+        ];
+      });
+    },
+    // System notice — rendered as a name-only row (same shape the history
+    // processor produces via `pushStandaloneMessages`).
+    onSystemMessage: (text, meta) => {
+      if (!text) return;
+      const seq = meta?.streamSeq;
+      if (typeof seq === "number") {
+        if (seenParticipantSeqsRef.current.has(seq)) return;
+        seenParticipantSeqsRef.current.add(seq);
+      }
+      setMessages((prev) => {
+        if (typeof seq !== "number" && hasRecentMessage(prev, (m) => m.authorType === "system" && m.name === text, SYSTEM_DEDUP_WINDOW)) {
+          return prev;
+        }
+        return [
+          ...prev,
+          {
+            id: `system-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`,
+            role: "user",
+            content: "",
+            name: text,
+            authorType: "system"
+          }
+        ];
+      });
+    }
   });
   const { processChunk, reset: resetAccumulator } = useRealtimeChunkProcessor({
     callbacks: {
-      onSegmentsUpdate: (segments) => callbacksRef.current.onSegmentsUpdate(segments),
+      onSegmentsUpdate: (segments, meta) => callbacksRef.current.onSegmentsUpdate(segments, meta),
       onStreamStart: () => callbacksRef.current.onStreamStart(),
       onStreamEnd: () => callbacksRef.current.onStreamEnd(),
       onAgentBusy: () => callbacksRef.current.onAgentBusy(),
       onError: () => callbacksRef.current.onError(),
       onTokenUsage: (data) => callbacksRef.current.onTokenUsage(data),
       onMetadata: (meta) => callbacksRef.current.onMetadata(meta),
+      onToolExecuted: (segment) => callbacksRef.current.onToolExecuted(segment),
+      onApprovalResolved: (requestId, status, approvalType, resolvedByName) => callbacksRef.current.onApprovalResolved(requestId, status, approvalType, resolvedByName),
+      onUserMessage: (text, meta) => callbacksRef.current.onUserMessage(text, meta),
+      onDirectMessage: (text, meta) => callbacksRef.current.onDirectMessage(text, meta),
+      onSystemMessage: (text, meta) => callbacksRef.current.onSystemMessage(text, meta),
       onApprove: accumApprove,
       onReject: accumReject
     },
-    batchApprovalsEnabled
+    batchApprovalsEnabled,
+    approvalStatuses,
+    ...displayApprovalTypes ? { displayApprovalTypes } : {}
   });
   const {
     processChunk: catchupProcessChunk,
     catchUpChunks,
     startInitialBuffering,
-    resetChunkTracking
+    resetChunkTracking,
+    resetAndCatchUp,
+    isBufferingActive
   } = useChunkCatchup({
     dialogId: active ? dialogId : null,
     onChunkReceived: (chunk) => processChunk(chunk),
@@ -50753,11 +51193,13 @@ function useNatsChatAdapter(config, options = {}) {
             onApprove: accumApprove,
             onReject: accumReject,
             approvalStatuses,
-            batchApprovalsEnabled
+            batchApprovalsEnabled,
+            ...displayApprovalTypes ? { displayApprovalTypes } : {}
           }
         );
         const unified = mapProcessedToUnified(rawProcessed);
         if (cursor === void 0) {
+          adoptTrailingAssistantRef.current = isBufferingActive() && extractIncompleteMessageState(rawProcessed[rawProcessed.length - 1]) !== void 0;
           setMessages(unified);
         } else {
           setMessages((prev) => [...unified, ...prev]);
@@ -50781,8 +51223,10 @@ function useNatsChatAdapter(config, options = {}) {
       chatTypeFilter,
       approvalStatuses,
       batchApprovalsEnabled,
+      displayApprovalTypes,
       accumApprove,
-      accumReject
+      accumReject,
+      isBufferingActive
     ]
   );
   const prevDialogIdRef = useRef74(void 0);
@@ -50791,6 +51235,9 @@ function useNatsChatAdapter(config, options = {}) {
     prevDialogIdRef.current = dialogId;
     historyLoadSeqRef.current += 1;
     resetAccumulator();
+    adoptTrailingAssistantRef.current = false;
+    seenParticipantSeqsRef.current.clear();
+    pendingEchoTextsRef.current = [];
     setMessages([]);
     setMessagesNextCursor(null);
     setDialogTokenUsage(null);
@@ -50802,13 +51249,16 @@ function useNatsChatAdapter(config, options = {}) {
   }, [active, dialogId, loadDialogHistory, resetAccumulator]);
   useEffect88(() => {
     if (!active || !dialogId) return;
-    suppressAgentBusyRef.current = true;
+    suppressAgentBusyRef.current += 1;
     resetChunkTracking();
     startInitialBuffering();
     catchUpChunks().catch((err) => {
       console.error("[useNatsChatAdapter] initial catchup failed:", err);
     }).finally(() => {
-      suppressAgentBusyRef.current = false;
+      suppressAgentBusyRef.current = Math.max(0, suppressAgentBusyRef.current - 1);
+      if (dialogId === currentDialogIdRef.current) {
+        adoptTrailingAssistantRef.current = false;
+      }
     });
   }, [active, dialogId, resetChunkTracking, startInitialBuffering, catchUpChunks]);
   useNatsDialogSubscription({
@@ -50823,6 +51273,30 @@ function useNatsChatAdapter(config, options = {}) {
     onEvent: (payload, messageType) => {
       catchupProcessChunk(payload, messageType);
       setConnectionState("connected");
+    },
+    onConnect: () => {
+      if (!hasConnectedOnceRef.current) {
+        hasConnectedOnceRef.current = true;
+        return;
+      }
+      suppressAgentBusyRef.current += 1;
+      startInitialBuffering();
+      void (async () => {
+        try {
+          if (dialogId && fetchDialogMessages) {
+            await loadDialogHistory(dialogId);
+          }
+          if (dialogId !== currentDialogIdRef.current) return;
+          await resetAndCatchUp();
+        } catch (err) {
+          console.error("[useNatsChatAdapter] reconnect catchup failed:", err);
+        } finally {
+          suppressAgentBusyRef.current = Math.max(0, suppressAgentBusyRef.current - 1);
+          if (dialogId === currentDialogIdRef.current) {
+            adoptTrailingAssistantRef.current = false;
+          }
+        }
+      })();
     }
   });
   useEffect88(() => {
@@ -50874,6 +51348,8 @@ function useNatsChatAdapter(config, options = {}) {
   const sendMessage = useCallback53(
     async (text, sendOptions) => {
       const hidden = sendOptions?.hidden ?? false;
+      pendingEchoTextsRef.current.push(text);
+      if (pendingEchoTextsRef.current.length > 5) pendingEchoTextsRef.current.shift();
       setMessages((prev) => [
         ...prev,
         {
@@ -51254,65 +51730,6 @@ function useUnifiedChat(options) {
   );
 }
 
-// src/components/chat/utils/extract-incomplete-message-state.ts
-function extractIncompleteMessageState(lastMessage) {
-  if (!lastMessage || lastMessage.role !== "assistant" || typeof lastMessage.content === "string") {
-    return void 0;
-  }
-  const segments = lastMessage.content;
-  const pendingApprovals = /* @__PURE__ */ new Map();
-  const executingTools = /* @__PURE__ */ new Map();
-  let hasIncompleteState = false;
-  segments.forEach((segment) => {
-    switch (segment.type) {
-      case "tool_execution":
-        if (segment.data.type === "EXECUTING_TOOL") {
-          const toolKey = segment.data.toolExecutionRequestId || `${segment.data.integratedToolType}-${segment.data.toolFunction}`;
-          executingTools.set(toolKey, {
-            integratedToolType: segment.data.integratedToolType,
-            toolFunction: segment.data.toolFunction,
-            toolTitle: segment.data.toolTitle,
-            parameters: segment.data.parameters
-          });
-          hasIncompleteState = true;
-        }
-        break;
-      case "approval_request":
-        if (segment.status === "pending" && segment.data.requestId) {
-          pendingApprovals.set(segment.data.requestId, {
-            command: segment.data.command,
-            explanation: segment.data.explanation,
-            approvalType: segment.data.approvalType || "CLIENT"
-          });
-          hasIncompleteState = true;
-        }
-        break;
-      case "approval_batch": {
-        const allDone = !!segment.data.executions && segment.data.toolCalls.every(
-          (c) => segment.data.executions?.[c.toolExecutionRequestId]?.status === "done"
-        );
-        if (segment.status !== "rejected" && !allDone) {
-          hasIncompleteState = true;
-        }
-        break;
-      }
-      case "context_compaction":
-        if (segment.status === "started") {
-          hasIncompleteState = true;
-        }
-        break;
-    }
-  });
-  if (!hasIncompleteState) {
-    return void 0;
-  }
-  return {
-    existingSegments: segments,
-    pendingApprovals: pendingApprovals.size > 0 ? pendingApprovals : void 0,
-    executingTools: executingTools.size > 0 ? executingTools : void 0
-  };
-}
-
 // src/components/chat/utils/history-merge.ts
 var SYNTHETIC_REALTIME_ID_PREFIXES = ["assistant-", "user-", "direct-", "system-", "error-"];
 function isSyntheticRealtimeId(id) {
@@ -53697,11 +54114,14 @@ export {
   processHistoricalMessages,
   extractErrorMessages,
   processHistoricalMessagesWithErrors,
+  extractIncompleteMessageState,
+  appendToTrailingAssistant,
+  upsertTrailingCompaction,
+  applyToolExecutionToMessages,
   mapProcessedToUnified,
   historicalToUnified,
   useNatsChatAdapter,
   useUnifiedChat,
-  extractIncompleteMessageState,
   SYNTHETIC_REALTIME_ID_PREFIXES,
   flattenMessagePagesChronological,
   maxPersistedStreamSeq,
@@ -54118,4 +54538,4 @@ export {
   LogsList,
   assets
 };
-//# sourceMappingURL=chunk-NDWIFCLS.js.map
+//# sourceMappingURL=chunk-3BHV2QAH.js.map