@widgetic/chat 0.1.4 → 0.1.5

package/dist/components/Chat.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { onMount, onDestroy } from 'svelte';
+  import { onMount, onDestroy, untrack } from 'svelte';
   import { chatStore, getCurrentMessages } from '../stores/chatStore.js';
   import { createChatService } from '../services/chatService.js';
   import { setLogsEnabled, chatLog, chatWarn } from '../utils/logger.js';
@@ -42,7 +42,7 @@
       conversationId: string,
       content: string,
       messageType: string,
-      attachments?: Array<{ url?: string; file_type?: string; file_name?: string | null; file_size?: number | null; display_order?: number }>,
+      attachments?: Array<{ url?: string; file?: File; file_type?: string; file_name?: string | null; file_size?: number | null; display_order?: number }>,
     ) => Promise<any>;
     onRestoreCheckpointBackend?: (conversationId: string, checkpointMessageId: string) => Promise<any>;
     onTakeScreenshot?: () => Promise<string | null>;
@@ -77,8 +77,8 @@
      * internal messages area grows/shrinks within the current chat height.
      */
     resizeExpandsContainer?: boolean;
-    /** Delta in pixels for the current drag frame (positive = grew downward). */
-    onMessagesResize?: (deltaPx: number) => void;
+    /** Delta in pixels, plus the resulting chat container height (for parent-owned resize). */
+    onMessagesResize?: (deltaPx: number, nextContainerHeightPx?: number) => void;
   }
 
   // Expose methods to parent component
@@ -110,6 +110,10 @@
     updateLatestCodegenStatusMessage: (content: string) => void;
     /** Reload messages from backend and refresh widget HEAD marker. */
     reloadConversationMessages: () => Promise<void>;
+    /** Select an existing conversation (loads its messages into the chat). */
+    selectConversation: (conversationId: string) => Promise<void>;
+    /** Replace attachments on the latest user message (CDN URLs after persist). */
+    updateLastUserMessageAttachments: (attachments: Array<{ id?: string; url: string; file_type?: string; file_name?: string | null }>) => void;
   }
 
   let { context, config = {}, class: className = '', style = '', isCompleted = false, onStatsUpdate, onChatReady, onCompletionToggle, onSendMessage, onLoadConversations, onLoadMessages, onCreateConversation, onSaveMessage, onRestoreCheckpointBackend, onTakeScreenshot, onConversationChange, onDraftChange, onRetryMessage, onUploadChatFile, showHeader = true, headerTitle = '', showDescriptionHeader = true, showLogs = true, resizeExpandsContainer = false, onMessagesResize }: Props = $props();
@@ -170,67 +174,115 @@
   /** Prefer a conversation that already has messages (avoids empty auto-created convos). */
   async function activateBestConversation(conversations: any[]): Promise<void> {
     for (const conversation of conversations) {
+      const conversationId = conversation.id || conversation.conversation_id || conversation.conversationId;
+      if (!conversationId) continue;
       const loadedMessages = onLoadMessages
-        ? await onLoadMessages(conversation.id)
-        : await chatService.getMessages(conversation.id);
+        ? await onLoadMessages(conversationId)
+        : await chatService.getMessages(conversationId);
       const messageList = loadedMessages || [];
-      chatStore.actions.setMessages(conversation.id, messageList);
+      chatStore.actions.setMessages(conversationId, messageList);
 
       if (messageList.length > 0) {
-        currentConversationId = conversation.id;
+        currentConversationId = conversationId;
         markWidgetHeadAtLatestCommit();
-        chatLog('[Chat] Restored conversation with history:', conversation.id, messageList.length, 'messages');
+        chatLog('[Chat] Restored conversation with history:', conversationId, messageList.length, 'messages');
         return;
       }
     }
 
     const fallbackConversation = conversations[0];
-    chatLog('[Chat] All conversations empty — using latest:', fallbackConversation.id);
-    currentConversationId = fallbackConversation.id;
+    const fallbackId =
+      fallbackConversation?.id ||
+      fallbackConversation?.conversation_id ||
+      fallbackConversation?.conversationId;
+    chatLog('[Chat] All conversations empty — using latest:', fallbackId);
+    currentConversationId = fallbackId || null;
+  }
+
+  let lastLoadedContextId = $state('');
+
+  async function initializeForContext(contextId: string) {
+    if (!contextId) return;
+    lastLoadedContextId = contextId;
+    chatLog('[Chat] Initializing with context:', contextId);
+    chatStore.actions.setActiveContext(contextId, true);
+
+    let loaded: any[] | null = null;
+    for (let attempt = 0; attempt < 4; attempt++) {
+      loaded = await loadConversations();
+      if (loaded !== null) break;
+      if (attempt < 3) {
+        await new Promise((resolve) => setTimeout(resolve, 400 * (attempt + 1)));
+      }
+    }
+
+    if (loaded === null) {
+      chatStore.actions.updateUI({
+        errorMessage: 'Could not load chat history.',
+      });
+      return;
+    }
+
+    if (loaded.length === 0) {
+      chatLog('[Chat] No existing conversations, creating new one');
+      await createNewConversation();
+    } else {
+      chatLog('[Chat] Selecting from', loaded.length, 'conversation(s)');
+      await activateBestConversation(loaded);
+    }
+    chatLog('[Chat] Initialized successfully');
+  }
+
+  async function retryLoadHistory() {
+    chatLog('[Chat] Retry load history for', context?.id);
+    chatStore.actions.updateUI({ errorMessage: null });
+    lastLoadedContextId = '';
+    try {
+      await initializeForContext(context.id);
+    } catch (error) {
+      console.error('[Chat] Retry load history failed:', error);
+      chatStore.actions.updateUI({
+        errorMessage: 'Could not load chat history.',
+      });
+    }
   }
 
   // Lifecycle
   onMount(async () => {
     try {
-      chatLog('[Chat] Initializing with context:', context.id);
-      
-      chatStore.actions.setActiveContext(context.id, true);
-      
-      let loaded: any[] | null = null;
-      for (let attempt = 0; attempt < 4; attempt++) {
-        loaded = await loadConversations();
-        if (loaded !== null) break;
-        if (attempt < 3) {
-          await new Promise((resolve) => setTimeout(resolve, 400 * (attempt + 1)));
-        }
-      }
-
-      if (loaded === null) {
-        chatStore.actions.updateUI({
-          errorMessage: 'Could not load chat history. Try refreshing the page.',
-        });
-        isInitialized = true;
-        return;
-      }
-      
-      if (loaded.length === 0) {
-        chatLog('[Chat] No existing conversations, creating new one');
-        await createNewConversation();
-      } else {
-        chatLog('[Chat] Selecting from', loaded.length, 'conversation(s)');
-        await activateBestConversation(loaded);
-      }
-      
+      await initializeForContext(context.id);
       isInitialized = true;
-      chatLog('[Chat] Initialized successfully');
     } catch (error) {
       console.error('[Chat] Failed to initialize:', error);
-      chatStore.actions.updateUI({ 
-        errorMessage: 'Failed to initialize chat. Please try again.' 
+      chatStore.actions.updateUI({
+        errorMessage: 'Failed to initialize chat. Please try again.',
       });
+      isInitialized = true;
     }
   });
 
+  $effect(() => {
+    const nextId = context?.id;
+    if (!isInitialized || !nextId) return;
+    if (nextId === lastLoadedContextId) return;
+    untrack(() => {
+      const prevConv = currentConversationId;
+      const prevMsgs = prevConv ? [...(getCurrentMessages(prevConv) || [])] : [];
+      const prevUserWithImage = [...prevMsgs].reverse().find(
+        (m: any) => m.messageType === 'user' && Array.isArray(m.attachments) && m.attachments.length > 0,
+      );
+      void initializeForContext(nextId).then(() => {
+        if (!prevUserWithImage?.attachments?.length) return;
+        const nextMsgs = getCurrentMessages(currentConversationId) || [];
+        const nextUser = [...nextMsgs].reverse().find((m: any) => m.messageType === 'user');
+        if (!nextUser) return;
+        if (nextUser.attachments && nextUser.attachments.length > 0) return;
+        updateLastUserMessageAttachments(prevUserWithImage.attachments);
+        chatLog('[Chat] Restored image attachments after widget id migrate:', prevUserWithImage.attachments.length);
+      });
+    });
+  });
+
   // Methods
   async function loadConversations(): Promise<any[] | null> {
     try {
@@ -335,15 +387,28 @@
       // Persist user message to backend and update local ID with DB UUID
       if (onSaveMessage) {
         try {
+          const persistAttachments = (submittedAttachments || []).map((att: any, i: number) => ({
+            url: att.uploadedUrl || userMessage.attachments?.[i]?.url,
+            file: att.file,
+            file_type: att.file?.type || userMessage.attachments?.[i]?.file_type,
+            file_name: att.file?.name || userMessage.attachments?.[i]?.file_name,
+            file_size: att.file?.size || userMessage.attachments?.[i]?.file_size,
+            display_order: i + 1,
+          })).filter((att: { url?: string; file?: File }) => !!att.url || att.file instanceof File);
           const saved = await onSaveMessage(
             currentConversationId,
             submittedContent,
             'user',
-            userMessage.attachments,
+            persistAttachments.length > 0 ? persistAttachments : userMessage.attachments,
           );
           if (saved?.id && saved.id !== userMessage.id) {
             chatStore.actions.updateMessageId(currentConversationId, userMessage.id, saved.id);
           }
+          const savedAttachments = saved?.attachments || saved?.data?.attachments;
+          if (Array.isArray(savedAttachments) && savedAttachments.length > 0) {
+            const targetId = saved?.id || userMessage.id;
+            chatStore.actions.updateMessageAttachments(currentConversationId, targetId, savedAttachments);
+          }
         } catch (err) {
           chatWarn('[Chat] Failed to persist user message:', err);
         }
@@ -352,7 +417,7 @@
       if (onSendMessage) {
         const outgoing = (submittedAttachments || []).map((att) => ({
           file: att.file,
-          url: att.uploadedUrl,
+          url: att.uploadedUrl || att.preview,
           uploadId: att.uploadId,
           fileType: att.file.type,
           fileName: att.file.name,
@@ -546,11 +611,7 @@
   }
 
   function isCdnUploadableFile(file: File): boolean {
-    return (
-      file.type.startsWith('image/') ||
-      file.type.startsWith('video/') ||
-      file.type === 'application/pdf'
-    );
+    return !!file && file.size > 0;
   }
 
   function bumpAttachmentProgress(attachmentIndex: number, percentage: number) {
@@ -566,7 +627,7 @@
     options: { source?: string } = {},
   ): Promise<void> {
     if (!onUploadChatFile || !isCdnUploadableFile(file)) {
-      if (file.type.startsWith('image/')) {
+      if (file.type.startsWith('image/') || file.type.startsWith('video/') || file.type === 'application/pdf') {
         entry.preview = URL.createObjectURL(file);
       }
       return;
@@ -580,7 +641,7 @@
       });
       entry.uploadedUrl = uploaded.url;
       entry.uploadId = uploaded.id;
-      if (file.type.startsWith('image/')) {
+      if (file.type.startsWith('image/') || file.type.startsWith('video/') || file.type === 'application/pdf') {
         entry.preview = uploaded.url;
       }
       entry.uploadProgress = 100;
@@ -590,7 +651,7 @@
       chatLog('[Chat] Attachment uploaded to CDN:', uploaded.url.slice(0, 80), 'id:', uploaded.id);
     } catch (uploadError) {
       console.error('[Chat] Upload failed, using local preview where possible:', uploadError);
-      if (file.type.startsWith('image/')) {
+      if (file.type.startsWith('image/') || file.type.startsWith('video/') || file.type === 'application/pdf') {
         entry.preview = URL.createObjectURL(file);
       }
       entry.uploadProgress = 0;
@@ -608,7 +669,7 @@
     const fileInput = document.createElement('input');
     fileInput.type = 'file';
     fileInput.multiple = true;
-    fileInput.accept = 'image/*,video/*,.pdf,.txt,.md,.mermaid';
+    fileInput.accept = '*/*';
 
     fileInput.onchange = async (event) => {
       const files = Array.from((event.target as HTMLInputElement).files || []);
@@ -812,8 +873,9 @@
 
   function getAttachmentDataUrls(): string[] {
     return localAttachments
-      .filter((att) => att.type === 'image' && (att.preview || att.file.type.startsWith('image/')))
-      .map((att) => att.preview || '');
+      .filter((att) => att.type === 'image' && (att.uploadedUrl || att.preview || att.file?.type?.startsWith('image/')))
+      .map((att) => att.uploadedUrl || att.preview || '')
+      .filter((url) => !!url);
   }
 
   function getAttachmentUploadIds(): string[] {
@@ -851,12 +913,18 @@
     return /^Updated \d+ files?/i.test(trimmed) && /\n\nCommit\s+[a-f0-9]{7,40}/i.test(trimmed);
   }
 
-  /** Widget HEAD applies only to codegen completion lines, not preview-rebuild status. */
+  /** Widget HEAD: codegen completion, saved-code summaries, or visible preview-recompiled bubbles. */
   function messageHasWidgetCommit(content?: string | null): boolean {
     const trimmed = (content || '').trim();
-    if (!trimmed || isPreviewRecompiledMessage(trimmed)) return false;
-    if (isCodegenFailureMessage(trimmed)) return false;
-    if (/^Code generation completed/i.test(trimmed) && CODEGEN_COMMIT_REGEX.test(trimmed)) return true;
+    if (!trimmed || isCodegenFailureMessage(trimmed)) return false;
+    if (isPreviewRecompiledMessage(trimmed) && CODEGEN_COMMIT_REGEX.test(trimmed)) return true;
+    if (CODEGEN_COMMIT_REGEX.test(trimmed) && (
+      /^Code generation completed/i.test(trimmed) ||
+      /^Code saved/i.test(trimmed) ||
+      isBackendCodegenSummary(trimmed)
+    )) {
+      return true;
+    }
     return isBackendCodegenSummary(trimmed);
   }
 
@@ -896,7 +964,12 @@
 
   function isCodegenFailureMessage(content?: string | null): boolean {
     const t = (content || '').trim();
-    return /^Code generation failed/i.test(t);
+    return (
+      /^Code generation failed/i.test(t) ||
+      /^⚠️/.test(t) ||
+      /Too many generation requests/i.test(t) ||
+      /temporarily unavailable/i.test(t)
+    );
   }
 
   function markWidgetHeadAtLatestCommit(preferredMessageId?: string) {
@@ -981,13 +1054,40 @@
     }
   }
 
+  function updateLastUserMessageAttachments(
+    attachments: Array<{ id?: string; url: string; file_type?: string; file_name?: string | null }>,
+  ) {
+    if (!currentConversationId || !attachments?.length) return;
+    const msgs = getCurrentMessages(currentConversationId);
+    const idx = getLastUserMessageIndex(msgs);
+    if (idx < 0) return;
+    const mapped = attachments.map((a, i) => ({
+      id: a.id || `att_${Date.now()}_${i}`,
+      url: a.url,
+      file_type: a.file_type || 'application/octet-stream',
+      file_name: a.file_name || 'attachment',
+      file_size: null,
+      display_order: i + 1,
+      created_at: new Date().toISOString(),
+    }));
+    chatStore.actions.updateMessageAttachments(currentConversationId, msgs[idx].id, mapped);
+    chatLog('[Chat] Patched last user message attachments:', mapped.length);
+  }
+
   /** Reload messages from backend and re-mark widget HEAD (picks up server-persisted summaries). */
   async function reloadConversationMessages() {
     if (!currentConversationId || !onLoadMessages) return;
     try {
+      const localMsgs = getCurrentMessages(currentConversationId);
+      const localHasHead = localMsgs.some((m) => m.isWidgetHead || messageHasWidgetCommit(m.messageContent));
       const loaded = await onLoadMessages(currentConversationId);
+      const loadedHasHead = (loaded || []).some((m) => messageHasWidgetCommit(m.messageContent));
       if (loaded?.length) {
-        chatStore.actions.setMessages(currentConversationId, loaded);
+        if (localHasHead && !loadedHasHead) {
+          chatLog('[Chat] Keep local HEAD commit message — DB reload has no commit yet');
+        } else {
+          chatStore.actions.setMessages(currentConversationId, loaded);
+        }
       }
       markWidgetHeadAtLatestCommit();
       chatLog('[Chat] Reloaded conversation messages:', loaded?.length ?? 0);
@@ -1035,6 +1135,10 @@
       markWidgetHeadAtLatestCommit,
       updateLatestCodegenStatusMessage,
       reloadConversationMessages,
+      updateLastUserMessageAttachments,
+      selectConversation: async (conversationId: string) => {
+        await loadConversation(conversationId);
+      },
     };
     onChatReady(chatMethods);
   });
@@ -1086,29 +1190,38 @@
 
   function handleMessagesResizeStart(e: PointerEvent) {
     e.preventDefault();
-    isResizingMessages = true;
+    e.stopPropagation();
     const handle = e.currentTarget as HTMLElement;
-    const messagesEl = handle.previousElementSibling as HTMLElement | null;
-    if (!messagesEl) return;
+    try {
+      handle.setPointerCapture?.(e.pointerId);
+    } catch {
+      /* pointer capture is best-effort */
+    }
+    isResizingMessages = true;
+    const messagesEl =
+      (handle.previousElementSibling as HTMLElement | null) ||
+      (chatContainer?.querySelector('.prompt-chat-messages-area') as HTMLElement | null);
     const startY = e.clientY;
-    const startHeight = messagesEl.getBoundingClientRect().height;
+    const startHeight = messagesEl?.getBoundingClientRect().height ?? MIN_MESSAGES_HEIGHT;
     let lastDy = 0;
 
     const onMove = (ev: PointerEvent) => {
       const dy = ev.clientY - startY;
       if (resizeExpandsContainer) {
-        // Report the incremental delta to the parent so it can enlarge the outer chat
-        // container. The messages area stays flex:1 within the new container height.
         const frameDelta = dy - lastDy;
         lastDy = dy;
         if (frameDelta !== 0) onMessagesResize?.(frameDelta);
       } else {
-        const next = Math.max(MIN_MESSAGES_HEIGHT, startHeight + dy);
-        messagesAreaHeight = next;
+        messagesAreaHeight = Math.max(MIN_MESSAGES_HEIGHT, startHeight + dy);
       }
     };
     const onUp = () => {
       isResizingMessages = false;
+      try {
+        handle.releasePointerCapture?.(e.pointerId);
+      } catch {
+        /* already released */
+      }
       window.removeEventListener('pointermove', onMove);
       window.removeEventListener('pointerup', onUp);
     };
@@ -1119,7 +1232,7 @@
 
 <div 
   bind:this={chatContainer}
-  class="{className ? className : 'prompt-chat-ct'} relative flex flex-col overflow-hidden bg-white border border-gray-300 rounded-medium h-full"
+  class="{className ? className : 'prompt-chat-ct'} relative flex flex-col overflow-hidden bg-white border border-gray-300 rounded-medium {resizeExpandsContainer ? 'shrink-0' : 'h-full'}"
   style={style}
 >
   {#if showHeader}
@@ -1155,7 +1268,7 @@
   <!-- Chat Interface -->
   {#if isInitialized}
     <div
-      class="prompt-chat-messages-area overflow-hidden"
+      class="prompt-chat-messages-area flex min-h-0 flex-col overflow-hidden"
       style="{messagesAreaHeight !== null
         ? `flex: 0 0 ${messagesAreaHeight}px; height: ${messagesAreaHeight}px;`
         : 'flex: 1 1 auto; min-height: 0;'}"
@@ -1197,7 +1310,7 @@
       showScreenshot={config?.features?.screenshot !== false}
       showRecord={config?.features?.screenRecording !== false}
       showUpload={config?.features?.fileUpload !== false}
-      showComplete={config?.features?.restoreCheckpoint !== false}
+      showComplete={config?.features?.markComplete === true}
       on:screenshot={handleScreenshot}
       on:recordStart={handleRecordStart}
       on:recordStop={handleRecordStop}
@@ -1238,14 +1351,25 @@
 
   <!-- Error Display -->
   {#if ui?.errorMessage}
-    <div class="error-message-ct absolute top-0 left-0 right-0 bg-red-50 border-l-4 border-red-400 p-3 flex items-center justify-between text-sm text-red-700 rounded-none z-50">
-      <span>{ui.errorMessage}</span>
-      <button 
-        class="ml-2 text-red-400 hover:text-red-600 font-semibold w-5 h-5 flex items-center justify-center"
-        onclick={() => chatStore.actions.updateUI({ errorMessage: null })}
-      >
-        ✕
-      </button>
+    <div class="error-message-ct absolute top-0 left-0 right-0 bg-red-50 border-l-4 border-red-400 p-3 flex items-center justify-between gap-2 text-sm text-red-700 rounded-none z-10">
+      <span class="error-message-text min-w-0 flex-1">{ui.errorMessage}</span>
+      <div class="error-message-actions flex items-center gap-2 shrink-0">
+        {#if ui.errorMessage.startsWith('Could not load chat history') || ui.errorMessage.startsWith('Failed to load')}
+          <button
+            type="button"
+            class="retry-load-history-btn px-2 py-1 text-xs font-semibold rounded border border-red-300 bg-white text-red-700 hover:bg-red-100"
+            onclick={() => void retryLoadHistory()}
+          >
+            Retry load history
+          </button>
+        {/if}
+        <button
+          class="ml-0 text-red-400 hover:text-red-600 font-semibold w-5 h-5 flex items-center justify-center"
+          onclick={() => chatStore.actions.updateUI({ errorMessage: null })}
+        >
+          ✕
+        </button>
+      </div>
     </div>
   {/if}
 </div>

package/dist/components/Chat.svelte.d.ts

@@ -33,6 +33,15 @@ interface ChatMethods {
     updateLatestCodegenStatusMessage: (content: string) => void;
     /** Reload messages from backend and refresh widget HEAD marker. */
     reloadConversationMessages: () => Promise<void>;
+    /** Select an existing conversation (loads its messages into the chat). */
+    selectConversation: (conversationId: string) => Promise<void>;
+    /** Replace attachments on the latest user message (CDN URLs after persist). */
+    updateLastUserMessageAttachments: (attachments: Array<{
+        id?: string;
+        url: string;
+        file_type?: string;
+        file_name?: string | null;
+    }>) => void;
 }
 interface Props {
     context: ChatContext;
@@ -60,6 +69,7 @@ interface Props {
     onCreateConversation?: (contextId: string, title: string) => Promise<any>;
     onSaveMessage?: (conversationId: string, content: string, messageType: string, attachments?: Array<{
         url?: string;
+        file?: File;
         file_type?: string;
         file_name?: string | null;
         file_size?: number | null;
@@ -104,8 +114,8 @@ interface Props {
      * internal messages area grows/shrinks within the current chat height.
      */
     resizeExpandsContainer?: boolean;
-    /** Delta in pixels for the current drag frame (positive = grew downward). */
-    onMessagesResize?: (deltaPx: number) => void;
+    /** Delta in pixels, plus the resulting chat container height (for parent-owned resize). */
+    onMessagesResize?: (deltaPx: number, nextContainerHeightPx?: number) => void;
 }
 declare const Chat: import("svelte").Component<Props, {}, "">;
 type Chat = ReturnType<typeof Chat>;

package/dist/components/ChatMessages.svelte

@@ -76,11 +76,14 @@
     return /^Updated \d+ files?/i.test(trimmed) && /\n\nCommit\s+[a-f0-9]{7,40}/i.test(trimmed);
   }
 
-  /** Codegen completion with commit — not preview-rebuild status lines. */
+  /** Codegen completion or preview-recompiled bubble that carries a commit hash. */
   function messageHasCommit(message: ChatMessage): boolean {
-    if (!message.messageContent || isPreviewRecompiledMessage(message)) return false;
+    if (!message.messageContent) return false;
     const trimmed = message.messageContent.trim();
     if (isCodegenFailure(message)) return false;
+    if (isPreviewRecompiledMessage(message) && /commit:?\s+[a-f0-9]{7,40}/i.test(trimmed)) {
+      return true;
+    }
     if (/^Code generation completed/i.test(trimmed) && /Commit:?\s+[a-f0-9]{7,40}/i.test(trimmed)) {
       return true;
     }
@@ -152,9 +155,15 @@
   }
 
   function isCodegenFailure(message: ChatMessage): boolean {
-    return message.messageType === 'assistant'
-      && !!message.messageContent
-      && /^Code generation failed/i.test(message.messageContent.trim());
+    if (message.messageType !== 'assistant' || !message.messageContent) return false;
+    const trimmed = message.messageContent.trim();
+    return (
+      /^Code generation failed/i.test(trimmed) ||
+      /^⚠️/.test(trimmed) ||
+      /Too many generation requests/i.test(trimmed) ||
+      /temporarily unavailable/i.test(trimmed) ||
+      /Generation Failed/i.test(trimmed)
+    );
   }
 
   function canRestoreToMessage(message: ChatMessage): boolean {
@@ -197,6 +206,10 @@
    *  Previously this was gated to Debug OFF (assistant reply hidden), but we want the buttons
    *  available in Debug ON too — the assistant summary and the user-side chrome coexist. */
   function showCommitMetaOnUserTurn(turn: ChatTurn): boolean {
+    const visibleHead = turn.replies.some(
+      (r) => r.isWidgetHead && shouldShowAssistantReply(r) && messageHasCommit(r),
+    );
+    if (visibleHead) return false;
     return !!getTurnCommitReply(turn);
   }
 
@@ -225,8 +238,18 @@
     chatTurns = rebalancePreviewRecompiledAcrossTurns(turns);
   });
 
-  function messageImpliesAttachedImage(content: string): boolean {
-    return /imaginea ata[sș]at[ăa]|attached (reference )?image|reference image|din imagine/i.test(content);
+  function messageImpliesAttachedFile(content: string): boolean {
+    return /imaginea ata[sș]at[ăa]|attached (reference )?(image|document|file|pdf|video)|reference image|din imagine|ata[sș]at[ăa]?\s+(document|pdf|fi[sș]ier|video)|attached document/i.test(
+      content,
+    );
+  }
+
+  function turnNeedsRetry(turn: ChatTurn): boolean {
+    if (turnHasCodegenFailure(turn)) return true;
+    const userMsg = turn.user;
+    if (!userMsg?.messageContent) return false;
+    const noAttachments = !userMsg.attachments || userMsg.attachments.length === 0;
+    return noAttachments && messageImpliesAttachedFile(userMsg.messageContent) && !getTurnCommitReply(turn);
   }
 
   let visibleMessages = $derived(
@@ -296,8 +319,23 @@
     }
   }
 
-  function handleRetryTurn(turn: ChatTurn) {
-    const retryContent = turn.user?.messageContent?.trim();
+  function getRetryPromptForTurn(turn: ChatTurn, turnIndex: number): string | null {
+    const own = turn.user?.messageContent?.trim();
+    if (own) return own;
+    for (let i = turnIndex - 1; i >= 0; i--) {
+      const previous = chatTurns[i]?.user?.messageContent?.trim();
+      if (previous) return previous;
+    }
+    return null;
+  }
+
+  function isLastCodegenFailureInTurn(turn: ChatTurn, reply: ChatMessage): boolean {
+    const failures = turn.replies.filter(isCodegenFailure);
+    return failures.length > 0 && failures[failures.length - 1]?.id === reply.id;
+  }
+
+  function handleRetryTurn(turn: ChatTurn, turnIndex: number) {
+    const retryContent = getRetryPromptForTurn(turn, turnIndex);
     if (!retryContent) return;
     chatLog('Retry requested for failed codegen turn:', retryContent.slice(0, 80));
     onRetryMessage?.(retryContent);
@@ -613,18 +651,33 @@
               <div class="message-attachments-container">
                 <AttachmentDisplay attachments={userMsg.attachments} variant="message" showPreview={true} />
               </div>
-            {:else if userMsg.messageContent && messageImpliesAttachedImage(userMsg.messageContent)}
+            {:else if userMsg.messageContent && messageImpliesAttachedFile(userMsg.messageContent)}
               <div class="wc-missing-attachment-placeholder message-attachments-container flex flex-col items-center gap-1 px-3 pb-3">
-                <div class="wc-missing-attachment-thumb flex h-20 w-28 flex-col items-center justify-center gap-1 rounded-md border border-dashed border-gray-300 bg-gray-100 text-gray-400" title="Image not available" aria-label="Missing image attachment">
+                <div class="wc-missing-attachment-thumb flex h-20 w-28 flex-col items-center justify-center gap-1 rounded-md border border-dashed border-gray-300 bg-gray-100 text-gray-400" title="Attachment not available" aria-label="Missing file attachment">
                   <svg class="h-8 w-8 shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" aria-hidden="true">
                     <rect x="3" y="5" width="18" height="14" rx="2" />
                     <path d="M4 4l16 16" stroke-linecap="round" />
                   </svg>
                 </div>
-                <p class="wc-missing-attachment-caption max-w-[12rem] text-center text-xs text-gray-500">Image not saved in chat history. Re-attach with Upload before Send.</p>
+                <p class="wc-missing-attachment-caption max-w-[12rem] text-center text-xs text-gray-500">Attachment not saved. Re-attach with Upload, then Retry.</p>
               </div>
             {/if}
           </div>
+          {#if turnNeedsRetry(turn) && !isLoading}
+            <div class="retry-codegen-row flex justify-end mt-1">
+              <button
+                class="retry-codegen-btn"
+                onclick={() => handleRetryTurn(turn, turnIndex)}
+                title="Retry this prompt (same as Retry on the error below)"
+              >
+                <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                  <path d="M21 12a9 9 0 1 1-2.64-6.36"/>
+                  <path d="M21 3v6h-6"/>
+                </svg>
+                Retry
+              </button>
+            </div>
+          {/if}
         </div>
 
         {@const commitReply = getTurnCommitReply(turn)}
@@ -709,12 +762,12 @@
             </div>
           {/if}
 
-          {#if isCodegenFailure(reply) && turn.user && !isLoading}
+          {#if isCodegenFailure(reply) && isLastCodegenFailureInTurn(turn, reply) && getRetryPromptForTurn(turn, turnIndex) && !isLoading}
             <div class="retry-codegen-row flex justify-start mt-1">
               <button
                 class="retry-codegen-btn"
-                onclick={() => handleRetryTurn(turn)}
-                title="Retry this code generation prompt"
+                onclick={() => handleRetryTurn(turn, turnIndex)}
+                title="Retry the last user prompt (same generation request)"
               >
                 <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                   <path d="M21 12a9 9 0 1 1-2.64-6.36"/>