opencami 1.9.0 → 1.9.1

package/dist/server/assets/{_sessionKey-Bhksr7VP.js → _sessionKey-D8TGrDRM.js}

@@ -19,7 +19,7 @@ import { u as useChatSettings$1 } from "./index-B_F4DTUu.js";
 import { createPortal } from "react-dom";
 import { create } from "zustand";
 import { persist } from "zustand/middleware";
-import { a as Route } from "./router-C9JRmWMm.js";
+import { a as Route } from "./router-DaKDqc9w.js";
 function deriveFriendlyIdFromKey(key) {
   if (!key) return "main";
   const trimmed = key.trim();
@@ -1686,7 +1686,7 @@ function areSidebarSessionsEqual(prev, next) {
   return true;
 }
 const SettingsDialog = lazy(
-  () => import("./settings-dialog-B5yR2pBy.js").then((m) => ({ default: m.SettingsDialog }))
+  () => import("./settings-dialog-DyWNblva.js").then((m) => ({ default: m.SettingsDialog }))
 );
 const SessionExportDialog = lazy(
   () => import("./session-export-dialog-CgtlOnwf.js").then((m) => ({
@@ -2833,7 +2833,7 @@ function Tool({ toolPart, defaultOpen = false }) {
   ] }) });
 }
 const Thinking = lazy(
-  () => import("./thinking-CHx4Oouj.js").then((m) => ({
+  () => import("./thinking-CU0FRlzT.js").then((m) => ({
     default: m.Thinking
   }))
 );
@@ -3015,7 +3015,9 @@ function MessageItemComponent({
   wrapperClassName,
   wrapperScrollMarginTop,
   messageDomId,
-  highlighted = false
+  highlighted = false,
+  onRetry,
+  onDismiss
 }) {
   const { settings } = useChatSettings$1();
   const role = message.role || "assistant";
@@ -3023,6 +3025,7 @@ function MessageItemComponent({
   const thinking = thinkingFromMessage(message);
   const images = imagesFromMessage(message);
   const isUser = role === "user";
+  const isFailed = isUser && message.status === "error";
   const imageDataUris = useMemo(
     () => images.map(
       (img) => `data:${img.source.media_type};base64,${img.source.data}`
@@ -3165,13 +3168,35 @@ function MessageItemComponent({
                 className: cn(
                   "text-primary-900 opencami-text-size min-w-0 max-w-full",
                   isUser ? "opencami-message-user bg-primary-100 px-4 py-[var(--opencami-user-bubble-py)] max-w-[85%]" : "opencami-message-assistant bg-transparent w-full",
-                  !isUser && isStreaming && "stream-fade-in"
+                  !isUser && isStreaming && "stream-fade-in",
+                  isFailed && "opacity-60"
                 ),
                 children: displayText
               }
             )
           }
         ),
+        isFailed && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 text-xs text-red-500 dark:text-red-400", children: [
+          /* @__PURE__ */ jsx("span", { children: "Failed to send" }),
+          onRetry && /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              className: "underline hover:text-red-700 dark:hover:text-red-300",
+              onClick: () => onRetry(message),
+              children: "Retry"
+            }
+          ),
+          onDismiss && /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              className: "underline hover:text-red-700 dark:hover:text-red-300",
+              onClick: () => onDismiss(message),
+              children: "Dismiss"
+            }
+          )
+        ] }),
         hasToolCalls && settings.showToolMessages && /* @__PURE__ */ jsx("div", { className: "mt-2 flex w-full min-w-0 max-w-[var(--opencami-chat-width)] flex-col gap-3 overflow-x-hidden", children: toolCalls.map((toolCall) => {
           const resultMessage = toolCall.id ? toolResultsByCallId?.get(toolCall.id) : void 0;
           const toolPart = mapToolCallToToolPart(toolCall, resultMessage);
@@ -3213,6 +3238,9 @@ function areMessagesEqual(prevProps, nextProps) {
   }
   if (prevProps.messageDomId !== nextProps.messageDomId) return false;
   if (prevProps.highlighted !== nextProps.highlighted) return false;
+  if (prevProps.onRetry !== nextProps.onRetry) return false;
+  if (prevProps.onDismiss !== nextProps.onDismiss) return false;
+  if (prevProps.message.status !== nextProps.message.status) return false;
   if ((prevProps.message.role || "assistant") !== (nextProps.message.role || "assistant")) {
     return false;
   }
@@ -3474,7 +3502,7 @@ function TypingIndicator({ className }) {
   ] });
 }
 const FollowUpSuggestions = lazy(
-  () => import("./follow-up-suggestions-B3hol2KT.js").then((m) => ({
+  () => import("./follow-up-suggestions-C65ptDij.js").then((m) => ({
     default: m.FollowUpSuggestions
   }))
 );
@@ -3493,7 +3521,9 @@ function ChatMessageListComponent({
   headerHeight,
   contentStyle,
   onFollowUpClick,
-  jumpToMessageId
+  jumpToMessageId,
+  onRetryMessage,
+  onDismissMessage
 }) {
   const anchorRef = useRef(null);
   const lastUserRef = useRef(null);
@@ -3689,7 +3719,9 @@ function ChatMessageListComponent({
               isLastAssistant,
               aggregatedSearchSources: isLastAssistant ? aggregatedSearchSources : void 0,
               messageDomId: messageId ? `message-${messageId}` : void 0,
-              highlighted: highlightedMessageId === messageId
+              highlighted: highlightedMessageId === messageId,
+              onRetry: onRetryMessage,
+              onDismiss: onDismissMessage
             },
             messageKey
           );
@@ -3723,7 +3755,9 @@ function ChatMessageListComponent({
                     wrapperClassName,
                     wrapperScrollMarginTop,
                     messageDomId: messageId ? `message-${messageId}` : void 0,
-                    highlighted: highlightedMessageId === messageId
+                    highlighted: highlightedMessageId === messageId,
+                    onRetry: onRetryMessage,
+                    onDismiss: onDismissMessage
                   },
                   messageKey
                 );
@@ -3757,7 +3791,9 @@ function ChatMessageListComponent({
               isLastAssistant,
               aggregatedSearchSources: isLastAssistant ? aggregatedSearchSources : void 0,
               messageDomId: messageId ? `message-${messageId}` : void 0,
-              highlighted: highlightedMessageId === messageId
+              highlighted: highlightedMessageId === messageId,
+              onRetry: onRetryMessage,
+              onDismiss: onDismissMessage
             },
             messageKey
           );
@@ -3782,7 +3818,7 @@ function ChatMessageListComponent({
   );
 }
 function areChatMessageListEqual(prev, next) {
-  return prev.messages === next.messages && prev.loading === next.loading && prev.empty === next.empty && prev.emptyState === next.emptyState && prev.notice === next.notice && prev.noticePosition === next.noticePosition && prev.waitingForResponse === next.waitingForResponse && prev.isStreaming === next.isStreaming && prev.sessionKey === next.sessionKey && prev.pinToTop === next.pinToTop && prev.pinGroupMinHeight === next.pinGroupMinHeight && prev.headerHeight === next.headerHeight && prev.contentStyle === next.contentStyle && prev.onFollowUpClick === next.onFollowUpClick && prev.jumpToMessageId === next.jumpToMessageId;
+  return prev.messages === next.messages && prev.loading === next.loading && prev.empty === next.empty && prev.emptyState === next.emptyState && prev.notice === next.notice && prev.noticePosition === next.noticePosition && prev.waitingForResponse === next.waitingForResponse && prev.isStreaming === next.isStreaming && prev.sessionKey === next.sessionKey && prev.pinToTop === next.pinToTop && prev.pinGroupMinHeight === next.pinGroupMinHeight && prev.headerHeight === next.headerHeight && prev.contentStyle === next.contentStyle && prev.onFollowUpClick === next.onFollowUpClick && prev.jumpToMessageId === next.jumpToMessageId && prev.onRetryMessage === next.onRetryMessage && prev.onDismissMessage === next.onDismissMessage;
 }
 const MemoizedChatMessageList = memo(
   ChatMessageListComponent,
@@ -5450,13 +5486,20 @@ function useChatHistory({
         if (message.__optimisticId) return true;
         return Boolean(message.clientId);
       }) : [];
+      const cachedMessages = Array.isArray(cached?.messages) ? cached.messages : [];
       const serverData = await fetchHistory({
         sessionKey: sessionKeyForHistory,
         friendlyId: activeFriendlyId
       });
-      if (!optimisticMessages.length) return serverData;
-      const merged = mergeOptimisticHistoryMessages(
+      const serverMessages = restoreCachedImageParts(
         serverData.messages,
+        cachedMessages
+      );
+      if (!optimisticMessages.length) {
+        return { ...serverData, messages: serverMessages };
+      }
+      const merged = mergeOptimisticHistoryMessages(
+        serverMessages,
         optimisticMessages
       );
       return {
@@ -5502,30 +5545,101 @@ function useChatHistory({
     sessionKeyForHistory
   };
 }
-function mergeOptimisticHistoryMessages(serverMessages, optimisticMessages) {
-  if (!optimisticMessages.length) return serverMessages;
-  const merged = [...serverMessages];
-  for (const optimisticMessage of optimisticMessages) {
-    const hasMatch = serverMessages.some((serverMessage) => {
-      if (optimisticMessage.clientId && serverMessage.clientId && optimisticMessage.clientId === serverMessage.clientId) {
+function findMatchIndex(serverMessages, optimisticMessage) {
+  return serverMessages.findIndex((serverMessage) => {
+    if (optimisticMessage.clientId && serverMessage.clientId && optimisticMessage.clientId === serverMessage.clientId) {
+      return true;
+    }
+    if (optimisticMessage.__optimisticId && serverMessage.__optimisticId && optimisticMessage.__optimisticId === serverMessage.__optimisticId) {
+      return true;
+    }
+    if (optimisticMessage.role && serverMessage.role) {
+      if (optimisticMessage.role !== serverMessage.role) return false;
+    }
+    const optimisticText = textFromMessage(optimisticMessage);
+    if (!optimisticText) return false;
+    if (optimisticText !== textFromMessage(serverMessage)) return false;
+    const optimisticTime = getMessageTimestamp(optimisticMessage);
+    const serverTime = getMessageTimestamp(serverMessage);
+    return Math.abs(optimisticTime - serverTime) <= 1e4;
+  });
+}
+function getImageParts(message) {
+  if (!Array.isArray(message.content)) return [];
+  return message.content.filter((part) => {
+    if (typeof part !== "object" || part === null) return false;
+    const p = part;
+    if (p.type !== "image") return false;
+    const source = p.source;
+    return typeof source?.data === "string" && source.data.length > 0;
+  });
+}
+function restoreCachedImageParts(serverMessages, cachedMessages) {
+  const cachedMessagesWithImages = cachedMessages.filter(
+    (message) => getImageParts(message).length > 0
+  );
+  if (!cachedMessagesWithImages.length) return serverMessages;
+  return serverMessages.map((serverMessage) => {
+    if (getImageParts(serverMessage).length > 0) return serverMessage;
+    const cachedMatch = cachedMessagesWithImages.find((cachedMessage) => {
+      if (serverMessage.role !== cachedMessage.role) return false;
+      if (serverMessage.id && cachedMessage.id && serverMessage.id === cachedMessage.id) {
         return true;
       }
-      if (optimisticMessage.__optimisticId && serverMessage.__optimisticId && optimisticMessage.__optimisticId === serverMessage.__optimisticId) {
+      if (serverMessage.clientId && cachedMessage.clientId && serverMessage.clientId === cachedMessage.clientId) {
         return true;
       }
-      if (optimisticMessage.role && serverMessage.role) {
-        if (optimisticMessage.role !== serverMessage.role) return false;
-      }
-      const optimisticText = textFromMessage(optimisticMessage);
-      if (!optimisticText) return false;
-      if (optimisticText !== textFromMessage(serverMessage)) return false;
-      const optimisticTime = getMessageTimestamp(optimisticMessage);
-      const serverTime = getMessageTimestamp(serverMessage);
-      return Math.abs(optimisticTime - serverTime) <= 1e4;
+      const serverText = textFromMessage(serverMessage);
+      const cachedText = textFromMessage(cachedMessage);
+      if (!serverText || serverText !== cachedText) return false;
+      const timeDiff = Math.abs(
+        getMessageTimestamp(serverMessage) - getMessageTimestamp(cachedMessage)
+      );
+      return timeDiff <= 3e4;
     });
-    if (!hasMatch) {
+    if (!cachedMatch) return serverMessage;
+    const imageParts = getImageParts(cachedMatch);
+    if (!imageParts.length) return serverMessage;
+    return {
+      ...serverMessage,
+      content: [
+        ...imageParts,
+        ...Array.isArray(serverMessage.content) ? serverMessage.content : []
+      ]
+    };
+  });
+}
+function mergeOptimisticHistoryMessages(serverMessages, optimisticMessages) {
+  if (!optimisticMessages.length) return serverMessages;
+  const merged = [...serverMessages];
+  for (const optimisticMessage of optimisticMessages) {
+    const matchIndex = findMatchIndex(merged, optimisticMessage);
+    if (matchIndex === -1) {
       merged.push(optimisticMessage);
+      continue;
     }
+    const imageParts = getImageParts(optimisticMessage);
+    const serverMessage = merged[matchIndex];
+    const serverImageParts = getImageParts(serverMessage);
+    const needsImages = imageParts.length > 0 && serverImageParts.length === 0;
+    const needsOptimisticId = Boolean(
+      optimisticMessage.__optimisticId && !serverMessage.__optimisticId
+    );
+    const needsClientId = Boolean(
+      optimisticMessage.clientId && !serverMessage.clientId
+    );
+    if (!needsImages && !needsOptimisticId && !needsClientId) continue;
+    merged[matchIndex] = {
+      ...serverMessage,
+      ...needsOptimisticId ? { __optimisticId: optimisticMessage.__optimisticId } : {},
+      ...needsClientId ? { clientId: optimisticMessage.clientId } : {},
+      ...needsImages ? {
+        content: [
+          ...imageParts,
+          ...Array.isArray(serverMessage.content) ? serverMessage.content : []
+        ]
+      } : {}
+    };
   }
   return merged;
 }
@@ -5902,6 +6016,101 @@ function generateHeuristicTitle(message) {
 function useLlmTitlesEnabled() {
   return useLlmSettingsStore((state) => state.settings.useLlmTitles);
 }
+function handleAgentEvent(payload, fallbackSessionKey, options) {
+  const agentPayload = asRecord(payload);
+  const stream = normalizeString(agentPayload?.stream);
+  const runId = normalizeString(agentPayload?.runId);
+  const sessionKey = normalizeString(agentPayload?.sessionKey) || fallbackSessionKey;
+  const streamData = asRecord(agentPayload?.data);
+  if (runId) {
+    options.anyRunSeen.current = true;
+    if (stream === "lifecycle") {
+      const phase = normalizeString(streamData?.phase);
+      if (phase === "end" || phase === "error" || phase === "abort") {
+        options.activeRuns.delete(runId);
+      } else if (phase) {
+        options.activeRuns.add(runId);
+      }
+    } else {
+      options.activeRuns.add(runId);
+    }
+  }
+  if (stream === "assistant") {
+    const text = normalizeString(streamData?.delta) || normalizeString(streamData?.text);
+    if (!text) return;
+    options.setState((prev) => {
+      const blocks = [...prev.contentBlocks];
+      const lastBlock = blocks[blocks.length - 1];
+      if (lastBlock?.kind === "text") {
+        blocks[blocks.length - 1] = { ...lastBlock, text: lastBlock.text + text };
+      } else {
+        blocks.push({ kind: "text", text });
+      }
+      return {
+        ...prev,
+        sessionKey,
+        text: prev.text + text,
+        contentBlocks: blocks
+      };
+    });
+    options.onAssistantDelta?.({ text, sessionKey });
+    return;
+  }
+  if (!stream.includes("tool")) return;
+  const toolId = normalizeString(streamData?.toolCallId) || normalizeString(streamData?.id) || normalizeString(streamData?.callId) || `${runId || "tool"}:${normalizeString(streamData?.toolName) || normalizeString(streamData?.name) || "unknown"}`;
+  const toolName = normalizeString(streamData?.toolName) || normalizeString(streamData?.name) || "Tool";
+  const toolStatus = deriveToolStatus(stream, streamData);
+  const toolArgs = asRecord(streamData?.arguments) || asRecord(streamData?.input) || asRecord(streamData?.params) || null;
+  const toolOutput = normalizeString(streamData?.result) || normalizeString(streamData?.output) || (stream.includes("result") ? normalizeString(streamData?.text) : "");
+  options.setState((prev) => {
+    const tools = [...prev.tools];
+    const toolIndex = tools.findIndex((tool) => tool.id === toolId);
+    const nextTool = { id: toolId, name: toolName, status: toolStatus };
+    if (toolIndex >= 0) {
+      tools[toolIndex] = nextTool;
+    } else {
+      tools.push(nextTool);
+    }
+    const blocks = [...prev.contentBlocks];
+    const blockIndex = blocks.findIndex(
+      (b) => b.kind === "tool" && b.id === toolId
+    );
+    const existingBlock = blockIndex >= 0 ? blocks[blockIndex] : null;
+    const nextBlock = {
+      kind: "tool",
+      name: toolName,
+      id: toolId,
+      status: toolStatus,
+      // Merge: keep existing arguments/output if new event doesn't carry them
+      arguments: toolArgs ?? existingBlock?.arguments,
+      output: toolOutput || existingBlock?.output || void 0
+    };
+    if (blockIndex >= 0) {
+      blocks[blockIndex] = nextBlock;
+    } else {
+      blocks.push(nextBlock);
+    }
+    return {
+      ...prev,
+      sessionKey,
+      tools,
+      contentBlocks: blocks
+    };
+  });
+}
+function deriveToolStatus(stream, data) {
+  const explicitStatus = normalizeString(data?.phase) || normalizeString(data?.status) || normalizeString(data?.state);
+  if (explicitStatus) return explicitStatus;
+  if (stream.includes("result") || stream.includes("output")) return "done";
+  if (stream.includes("call")) return "running";
+  return "running";
+}
+function asRecord(value) {
+  return value && typeof value === "object" ? value : null;
+}
+function normalizeString(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
 const INITIAL_STATE = {
   active: false,
   text: "",
@@ -6018,101 +6227,6 @@ function useStreaming(options) {
   }, []);
   return { streaming: state, startStream: start, stopStream: stop };
 }
-function handleAgentEvent(payload, fallbackSessionKey, options) {
-  const agentPayload = asRecord(payload);
-  const stream = normalizeString(agentPayload?.stream);
-  const runId = normalizeString(agentPayload?.runId);
-  const sessionKey = normalizeString(agentPayload?.sessionKey) || fallbackSessionKey;
-  const streamData = asRecord(agentPayload?.data);
-  if (runId) {
-    options.anyRunSeen.current = true;
-    if (stream === "lifecycle") {
-      const phase = normalizeString(streamData?.phase);
-      if (phase === "end" || phase === "error" || phase === "abort") {
-        options.activeRuns.delete(runId);
-      } else if (phase) {
-        options.activeRuns.add(runId);
-      }
-    } else {
-      options.activeRuns.add(runId);
-    }
-  }
-  if (stream === "assistant") {
-    const text = normalizeString(streamData?.delta) || normalizeString(streamData?.text);
-    if (!text) return;
-    options.setState((prev) => {
-      const blocks = [...prev.contentBlocks];
-      const lastBlock = blocks[blocks.length - 1];
-      if (lastBlock?.kind === "text") {
-        blocks[blocks.length - 1] = { ...lastBlock, text: lastBlock.text + text };
-      } else {
-        blocks.push({ kind: "text", text });
-      }
-      return {
-        ...prev,
-        sessionKey,
-        text: prev.text + text,
-        contentBlocks: blocks
-      };
-    });
-    options.onAssistantDelta?.({ text, sessionKey });
-    return;
-  }
-  if (!stream.includes("tool")) return;
-  const toolId = normalizeString(streamData?.toolCallId) || normalizeString(streamData?.id) || normalizeString(streamData?.callId) || `${runId || "tool"}:${normalizeString(streamData?.toolName) || normalizeString(streamData?.name) || "unknown"}`;
-  const toolName = normalizeString(streamData?.toolName) || normalizeString(streamData?.name) || "Tool";
-  const toolStatus = deriveToolStatus(stream, streamData);
-  const toolArgs = asRecord(streamData?.arguments) || asRecord(streamData?.input) || asRecord(streamData?.params) || null;
-  const toolOutput = normalizeString(streamData?.result) || normalizeString(streamData?.output) || (stream.includes("result") ? normalizeString(streamData?.text) : "");
-  options.setState((prev) => {
-    const tools = [...prev.tools];
-    const toolIndex = tools.findIndex((tool) => tool.id === toolId);
-    const nextTool = { id: toolId, name: toolName, status: toolStatus };
-    if (toolIndex >= 0) {
-      tools[toolIndex] = nextTool;
-    } else {
-      tools.push(nextTool);
-    }
-    const blocks = [...prev.contentBlocks];
-    const blockIndex = blocks.findIndex(
-      (b) => b.kind === "tool" && b.id === toolId
-    );
-    const existingBlock = blockIndex >= 0 ? blocks[blockIndex] : null;
-    const nextBlock = {
-      kind: "tool",
-      name: toolName,
-      id: toolId,
-      status: toolStatus,
-      // Merge: keep existing arguments/output if new event doesn't carry them
-      arguments: toolArgs ?? existingBlock?.arguments,
-      output: toolOutput || existingBlock?.output || void 0
-    };
-    if (blockIndex >= 0) {
-      blocks[blockIndex] = nextBlock;
-    } else {
-      blocks.push(nextBlock);
-    }
-    return {
-      ...prev,
-      sessionKey,
-      tools,
-      contentBlocks: blocks
-    };
-  });
-}
-function deriveToolStatus(stream, data) {
-  const explicitStatus = normalizeString(data?.phase) || normalizeString(data?.status) || normalizeString(data?.state);
-  if (explicitStatus) return explicitStatus;
-  if (stream.includes("result") || stream.includes("output")) return "done";
-  if (stream.includes("call")) return "running";
-  return "running";
-}
-function asRecord(value) {
-  return value && typeof value === "object" ? value : null;
-}
-function normalizeString(value) {
-  return typeof value === "string" ? value.trim() : "";
-}
 function useKeyboardShortcuts(handlers) {
   const handleKeyDown = useCallback(
     (event) => {
@@ -6324,11 +6438,32 @@ const KeyboardShortcutsDialog = lazy(
   }))
 );
 const SearchDialog = lazy(
-  () => import("./search-dialog-CTJULPB8.js").then((m) => ({
+  () => import("./search-dialog-DSSK93kq.js").then((m) => ({
     default: m.SearchDialog
   }))
 );
 const SEARCH_JUMP_TARGET_KEY = "opencami-search-jump-target";
+function extractRetryImageAttachments(message) {
+  const parts = Array.isArray(message.content) ? message.content : [];
+  const attachments = [];
+  const payload = [];
+  for (const [index, part] of parts.entries()) {
+    if (part.type !== "image" || !("source" in part) || typeof part.source?.data !== "string" || part.source.data.length === 0) {
+      continue;
+    }
+    const mimeType = typeof part.source?.media_type === "string" && part.source.media_type.length > 0 ? part.source.media_type : "image/jpeg";
+    const content = part.source.data;
+    attachments.push({
+      id: crypto.randomUUID(),
+      file: new File([], `retry-attachment-${index + 1}`, { type: mimeType }),
+      preview: null,
+      type: "image",
+      base64: content
+    });
+    payload.push({ mimeType, content });
+  }
+  return { attachments, payload };
+}
 function ChatScreen({
   activeFriendlyId,
   isNewChat = false,
@@ -6808,7 +6943,7 @@ function ChatScreen({
     queryClient,
     resolvedSessionKey
   ]);
-  function sendMessage(sessionKey, friendlyId, body, skipOptimistic = false, attachments, model) {
+  function sendMessage(sessionKey, friendlyId, body, skipOptimistic = false, attachments, model, retryAttachmentsPayload) {
     let optimisticClientId = "";
     if (!skipOptimistic) {
       const { clientId, optimisticMessage } = createOptimisticMessage(
@@ -6834,10 +6969,14 @@ function ChatScreen({
     setError(null);
     setWaitingForResponse(true);
     setPinToTop(true);
-    const attachmentsPayload = attachments?.map((a) => ({
-      mimeType: a.file.type,
-      content: a.base64
-    }));
+    const attachmentsPayload = retryAttachmentsPayload ?? attachments?.flatMap(
+      (a) => a.base64 ? [
+        {
+          mimeType: a.file.type,
+          content: a.base64
+        }
+      ] : []
+    );
     streamingNotificationTextRef.current = "";
     streamStart();
     const preStreamKey = sessionKey || friendlyId;
@@ -7006,6 +7145,70 @@ function ChatScreen({
       return { ...state, isSidebarCollapsed: false };
     });
   }, [queryClient]);
+  const handleRetryMessage = useCallback(
+    (message) => {
+      const messageText = textFromMessage(message);
+      const {
+        attachments: retryAttachments,
+        payload: retryAttachmentsPayload
+      } = extractRetryImageAttachments(message);
+      if (!messageText && retryAttachments.length === 0) return;
+      const sessionKeyForSend = forcedSessionKey || resolvedSessionKey || activeSessionKey;
+      if (!sessionKeyForSend) return;
+      const clientId = message.clientId;
+      const optimisticId = message.__optimisticId;
+      if (clientId) {
+        removeHistoryMessageByClientId(
+          queryClient,
+          activeFriendlyId,
+          sessionKeyForSend,
+          clientId,
+          optimisticId
+        );
+      }
+      sendMessage(
+        sessionKeyForSend,
+        activeFriendlyId,
+        messageText,
+        false,
+        retryAttachments,
+        void 0,
+        retryAttachmentsPayload
+      );
+    },
+    [
+      activeFriendlyId,
+      activeSessionKey,
+      forcedSessionKey,
+      queryClient,
+      resolvedSessionKey
+    ]
+  );
+  const handleDismissMessage = useCallback(
+    (message) => {
+      const sessionKeyForSend = forcedSessionKey || resolvedSessionKey || activeSessionKey;
+      if (!sessionKeyForSend) return;
+      const clientId = message.clientId;
+      const optimisticId = message.__optimisticId;
+      if (clientId) {
+        removeHistoryMessageByClientId(
+          queryClient,
+          activeFriendlyId,
+          sessionKeyForSend,
+          clientId,
+          optimisticId
+        );
+      }
+      setError(null);
+    },
+    [
+      activeFriendlyId,
+      activeSessionKey,
+      forcedSessionKey,
+      queryClient,
+      resolvedSessionKey
+    ]
+  );
   const handleFollowUpClick = useCallback(
     (suggestion) => {
       if (isNewChat || !suggestion.trim()) return;
@@ -7164,7 +7367,9 @@ function ChatScreen({
                       headerHeight,
                       contentStyle: stableContentStyle,
                       onFollowUpClick: handleFollowUpClick,
-                      jumpToMessageId: searchJumpMessageId
+                      jumpToMessageId: searchJumpMessageId,
+                      onRetryMessage: handleRetryMessage,
+                      onDismissMessage: handleDismissMessage
                     }
                   ),
                   /* @__PURE__ */ jsx(