Update app_enhanced.py

app_enhanced.py

@@ -39,11 +39,8 @@ SAVED_COMICS_DIR = os.path.join(BASE_STORAGE_PATH, "saved_comics")
 os.makedirs(BASE_USER_DIR, exist_ok=True)
 os.makedirs(SAVED_COMICS_DIR, exist_ok=True)
 
-# ======================================================
-# 🔧 APP CONFIG
-# ======================================================
 app = Flask(__name__)
-app.config['MAX_CONTENT_LENGTH'] = 500 * 1024 * 1024  # 500MB Limit
+app.config['MAX_CONTENT_LENGTH'] = 500 * 1024 * 1024
 
 def generate_save_code(length=8):
     chars = string.ascii_uppercase + string.digits
@@ -53,19 +50,23 @@ def generate_save_code(length=8):
             return code
 
 # ======================================================
-# 🧱 DATA CLASSES (Restored from safwe.py)
+# 🧱 DATA CLASSES
 # ======================================================
-def bubble(dialog="", bubble_offset_x=50, bubble_offset_y=20, lip_x=-1, lip_y=-1, emotion='normal', type='speech'):
+def bubble(dialog="", x=50, y=20, type='speech'):
+    # Determine CSS classes based on type
+    classes = f"speech-bubble {type}"
+    if type == 'speech':
+        classes += " tail-bottom"
+    elif type == 'thought':
+        classes += " pos-bl" # Bottom-left tail default for thought
+        
     return {
         'dialog': dialog,
-        'bubble_offset_x': int(bubble_offset_x),
-        'bubble_offset_y': int(bubble_offset_y),
-        'lip_x': int(lip_x),
-        'lip_y': int(lip_y),
-        'emotion': emotion,
+        'bubble_offset_x': int(x),
+        'bubble_offset_y': int(y),
         'type': type,
         'tail_pos': '50%',
-        'classes': f'speech-bubble {type} tail-bottom',
+        'classes': classes,
         'colors': {'fill': '#ffffff', 'text': '#000000'},
         'font': "'Comic Neue', cursive"
     }
@@ -79,18 +80,16 @@ class Page:
         self.bubbles = bubbles
 
 # ======================================================
-# 🧠 GPU GENERATION (SQUARE PADDING LOGIC)
+# 🧠 GPU GENERATION (SQUARE + TEXT + 1 BUBBLE/PANEL)
 # ======================================================
 @spaces.GPU(duration=300)
 def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
-    print(f"🚀 Generating Square Comic: {video_path}")
-    
+    print(f"🚀 Generating HD Comic: {video_path}")
     import cv2
     import srt
     import numpy as np
     from backend.subtitles.subs_real import get_real_subtitles
     
-    # 1. Video Setup
     cap = cv2.VideoCapture(video_path)
     if not cap.isOpened(): raise Exception("Cannot open video")
     fps = cap.get(cv2.CAP_PROP_FPS) or 25
@@ -98,7 +97,7 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     duration = total_frames / fps
     cap.release()
 
-    # 2. SUBTITLES
+    # Subtitles
     user_srt = os.path.join(user_dir, 'subs.srt')
     try:
         get_real_subtitles(video_path)
@@ -121,27 +120,22 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     if valid_subs:
         raw_moments = [{'text': s.content.strip(), 'start': s.start.total_seconds(), 'end': s.end.total_seconds()} for s in valid_subs]
     else:
-        # Fallback moments if no speech
         raw_moments = []
 
-    # 3. Frame Selection (4 per page)
+    # 4 Panels Per Page
     panels_per_page = 4
     total_panels_needed = int(target_pages) * panels_per_page
 
     selected_moments = []
     if not raw_moments:
-        # Generate time-based moments
         times = np.linspace(1, max(1, duration-1), total_panels_needed)
-        for t in times:
-            selected_moments.append({'text': '', 'start': t, 'end': t+1})
+        for t in times: selected_moments.append({'text': '', 'start': t, 'end': t+1})
     elif len(raw_moments) <= total_panels_needed:
         selected_moments = raw_moments
     else:
-        # Subsample moments
         indices = np.linspace(0, len(raw_moments) - 1, total_panels_needed, dtype=int)
         selected_moments = [raw_moments[i] for i in indices]
         
-    # 4. Extract & PAD TO SQUARE
     frame_metadata = {}
     cap = cv2.VideoCapture(video_path)
     count = 0
@@ -151,25 +145,17 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         mid = (moment['start'] + moment['end']) / 2
         cap.set(cv2.CAP_PROP_POS_MSEC, mid * 1000)
         ret, frame = cap.read()
-        
         if ret:
-            # ----------------------------------------------------
-            # 🎯 SQUARE PADDING LOGIC (0% Cut)
-            # ----------------------------------------------------
+            # 🎯 SQUARE PADDING (0% Cut)
             h, w = frame.shape[:2]
             sq_dim = max(h, w)
-            
-            # Create black square canvas
             square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
-            
-            # Calculate centering offsets
             x_off = (sq_dim - w) // 2
             y_off = (sq_dim - h) // 2
-            
-            # Paste original frame in center
             square_img[y_off:y_off+h, x_off:x_off+w] = frame
+            # Resize to standard high res
+            square_img = cv2.resize(square_img, (1024, 1024))
             
-            # Save
             fname = f"frame_{count:04d}.png"
             p = os.path.join(frames_dir, fname)
             cv2.imwrite(p, square_img)
@@ -177,23 +163,23 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
             frame_metadata[fname] = {'dialogue': moment['text'], 'time': mid}
             frame_files_ordered.append(fname)
             count += 1
-            
     cap.release()
-    with open(metadata_path, 'w') as f:
-        json.dump(frame_metadata, f, indent=2)
+    
+    with open(metadata_path, 'w') as f: json.dump(frame_metadata, f, indent=2)
         
-    # 5. Bubbles
     bubbles_list = []
     for f in frame_files_ordered:
         dialogue = frame_metadata.get(f, {}).get('dialogue', '')
+        
+        # Determine Bubble Type
         b_type = 'speech'
         if '(' in dialogue: b_type = 'narration'
-        elif '!' in dialogue: b_type = 'reaction'
+        elif '!' in dialogue and dialogue.isupper(): b_type = 'reaction'
+        elif '?' in dialogue: b_type = 'speech'
         
-        # Use full bubble function structure
-        bubbles_list.append(bubble(dialog=dialogue, bubble_offset_x=50, bubble_offset_y=20, type=b_type))
+        # 1 Bubble Per Panel logic handled by 1:1 list mapping
+        bubbles_list.append(bubble(dialog=dialogue, x=50, y=20, type=b_type))
             
-    # 6. Pages
     pages = []
     for i in range(int(target_pages)):
         start_idx = i * 4
@@ -203,33 +189,23 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         
         while len(p_frames) < 4:
              fname = f"empty_{i}_{len(p_frames)}.png"
-             img = np.zeros((800, 800, 3), dtype=np.uint8)
-             img[:] = (30,30,30)
+             img = np.zeros((1024, 1024, 3), dtype=np.uint8); img[:] = (30,30,30)
              cv2.imwrite(os.path.join(frames_dir, fname), img)
              p_frames.append(fname)
              p_bubbles.append(bubble(dialog="", type='speech'))
 
         if p_frames:
-            pg_panels = [panel(image=f) for f in p_frames]
-            pages.append(Page(panels=pg_panels, bubbles=p_bubbles))
-
-    # 7. Convert to Dict
-    result = []
-    for pg in pages:
-        p_data = [p if isinstance(p, dict) else p.__dict__ for p in pg.panels]
-        b_data = [b if isinstance(b, dict) else b.__dict__ for b in pg.bubbles]
-        result.append({'panels': p_data, 'bubbles': b_data})
-        
-    return result
+            pg_panels = [{'image': f} for f in p_frames]
+            pages.append({'panels': pg_panels, 'bubbles': p_bubbles})
+
+    return pages
 
 @spaces.GPU
 def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     import cv2
     import json
-    if not os.path.exists(metadata_path):
-        return {"success": False, "message": "No metadata"}
-    with open(metadata_path, 'r') as f:
-        meta = json.load(f)
+    if not os.path.exists(metadata_path): return {"success": False, "message": "No metadata"}
+    with open(metadata_path, 'r') as f: meta = json.load(f)
     
     t = meta[fname]['time'] if isinstance(meta[fname], dict) else meta[fname]
     cap = cv2.VideoCapture(video_path)
@@ -242,25 +218,20 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     cap.release()
 
     if ret:
-        # Re-apply Square Padding
         h, w = frame.shape[:2]
         sq_dim = max(h, w)
         square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
         x_off = (sq_dim - w) // 2
         y_off = (sq_dim - h) // 2
         square_img[y_off:y_off+h, x_off:x_off+w] = frame
+        square_img = cv2.resize(square_img, (1024, 1024))
         
-        p = os.path.join(frames_dir, fname)
-        cv2.imwrite(p, square_img)
-        
-        if isinstance(meta[fname], dict):
-            meta[fname]['time'] = new_t
-        else:
-            meta[fname] = new_t
-        with open(metadata_path, 'w') as f:
-            json.dump(meta, f, indent=2)
+        cv2.imwrite(os.path.join(frames_dir, fname), square_img)
+        if isinstance(meta[fname], dict): meta[fname]['time'] = new_t
+        else: meta[fname] = new_t
+        with open(metadata_path, 'w') as f: json.dump(meta, f, indent=2)
         return {"success": True, "message": f"Time: {new_t:.2f}s"}
-    return {"success": False, "message": "End of video"}
+    return {"success": False}
 
 @spaces.GPU
 def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, ts):
@@ -278,19 +249,15 @@ def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, ts):
         x_off = (sq_dim - w) // 2
         y_off = (sq_dim - h) // 2
         square_img[y_off:y_off+h, x_off:x_off+w] = frame
+        square_img = cv2.resize(square_img, (1024, 1024))
         
-        p = os.path.join(frames_dir, fname)
-        cv2.imwrite(p, square_img)
+        cv2.imwrite(os.path.join(frames_dir, fname), square_img)
         if os.path.exists(metadata_path):
-            with open(metadata_path, 'r') as f:
-                meta = json.load(f)
+            with open(metadata_path, 'r') as f: meta = json.load(f)
             if fname in meta:
-                if isinstance(meta[fname], dict):
-                    meta[fname]['time'] = float(ts)
-                else:
-                    meta[fname] = float(ts)
-                with open(metadata_path, 'w') as f:
-                    json.dump(meta, f, indent=2)
+                if isinstance(meta[fname], dict): meta[fname]['time'] = float(ts)
+                else: meta[fname] = float(ts)
+                with open(metadata_path, 'w') as f: json.dump(meta, f, indent=2)
         return {"success": True, "message": f"Jumped to {ts}s"}
     return {"success": False, "message": "Invalid timestamp"}
 
@@ -309,10 +276,8 @@ class EnhancedComicGenerator:
         self.metadata_path = os.path.join(self.frames_dir, 'frame_metadata.json')
 
     def cleanup(self):
-        if os.path.exists(self.frames_dir):
-            shutil.rmtree(self.frames_dir)
-        if os.path.exists(self.output_dir):
-            shutil.rmtree(self.output_dir)
+        if os.path.exists(self.frames_dir): shutil.rmtree(self.frames_dir)
+        if os.path.exists(self.output_dir): shutil.rmtree(self.output_dir)
         os.makedirs(self.frames_dir, exist_ok=True)
         os.makedirs(self.output_dir, exist_ok=True)
 
@@ -332,10 +297,10 @@ class EnhancedComicGenerator:
             json.dump({'message': msg, 'progress': prog}, f)
 
 # ======================================================
-# 🌐 ROUTES & FRONTEND
+# 🌐 FRONTEND
 # ======================================================
 INDEX_HTML = '''
-<!DOCTYPE html><html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Square HD Comic</title> <script src="https://cdnjs.cloudflare.com/ajax/libs/html-to-image/1.11.11/html-to-image.min.js"></script> <link href="https://fonts.googleapis.com/css2?family=Bangers&family=Comic+Neue:wght@700&display=swap" rel="stylesheet"> <style> * { box-sizing: border-box; } body { background-color: #2c3e50; font-family: 'Comic Neue', sans-serif; color: #eee; margin: 0; min-height: 100vh; }
+<!DOCTYPE html><html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Square HD Comic</title> <script src="https://cdnjs.cloudflare.com/ajax/libs/html-to-image/1.11.11/html-to-image.min.js"></script> <link href="https://fonts.googleapis.com/css2?family=Bangers&family=Comic+Neue:wght@700&family=Gloria+Hallelujah&family=Lato&display=swap" rel="stylesheet"> <style> * { box-sizing: border-box; } body { background-color: #2c3e50; font-family: 'Lato', sans-serif; color: #eee; margin: 0; min-height: 100vh; }
     
     #upload-container { display: flex; flex-direction:column; justify-content: center; align-items: center; min-height: 100vh; width: 100%; padding: 20px; }
     .upload-box { max-width: 500px; width: 100%; padding: 40px; background: #34495e; border-radius: 12px; box-shadow: 0 10px 30px rgba(0,0,0,0.5); text-align: center; }
@@ -369,14 +334,14 @@ INDEX_HTML = '''
         border: 6px solid #000; 
     }
     
+    /* === GRID CSS === */
     .comic-grid {
         width: 100%; height: 100%; position: relative; background: #000;
         --y: 50%; --t1: 100%; --t2: 100%; --b1: 100%; --b2: 100%; --gap: 3px; 
     }
 
+    /* Panel and Image */
     .panel { position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden; background: #1a1a1a; cursor: grab; }
-    
-    /* IMAGE: Cover ensures it fills. Zoom allows control. */
     .panel img { 
         width: 100%; height: 100%; 
         object-fit: cover; 
@@ -387,7 +352,7 @@ INDEX_HTML = '''
     .panel img.panning { cursor: grabbing; transition: none; }
     .panel.selected { outline: 4px solid #3498db; z-index: 5; }
 
-    /* Clip Paths */
+    /* Clip Paths (4 Panels) */
     .panel:nth-child(1) { clip-path: polygon(0 0, calc(var(--t1) - var(--gap)) 0, calc(var(--t2) - var(--gap)) calc(var(--y) - var(--gap)), 0 calc(var(--y) - var(--gap))); z-index: 1; }
     .panel:nth-child(2) { clip-path: polygon(calc(var(--t1) + var(--gap)) 0, 100% 0, 100% calc(var(--y) - var(--gap)), calc(var(--t2) + var(--gap)) calc(var(--y) - var(--gap))); z-index: 1; }
     .panel:nth-child(3) { clip-path: polygon(0 calc(var(--y) + var(--gap)), calc(var(--b1) - var(--gap)) calc(var(--y) + var(--gap)), calc(var(--b2) - var(--gap)) 100%, 0 100%); z-index: 1; }
@@ -401,26 +366,57 @@ INDEX_HTML = '''
     .h-b1 { background: #2ecc71; left: var(--b1); top: 50%; margin-top: 15px; }
     .h-b2 { background: #2ecc71; left: var(--b2); top: 100%; margin-top: -15px; }
     
-    /* SPEECH BUBBLES */
+    /* --- ADVANCED SPEECH BUBBLES (FROM SAFWE.PY) --- */
     .speech-bubble { 
         position: absolute; display: flex; justify-content: center; align-items: center; 
         min-width: 60px; min-height: 40px; box-sizing: border-box; 
         z-index: 10; cursor: move; font-weight: bold; text-align: center; 
         overflow: visible; line-height: 1.2; --tail-pos: 50%;
     }
-    .bubble-text { padding: 0.8em; width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; overflow: hidden; white-space: pre-wrap; pointer-events: none; border-radius: inherit; }
+    .bubble-text { 
+        padding: 0.8em; word-wrap: break-word; white-space: pre-wrap; 
+        width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; 
+        border-radius: inherit; pointer-events: none;
+    }
     .speech-bubble.selected { outline: 2px dashed #4CAF50; z-index: 100; }
     
-    /* Bubble Styles */
-    .speech-bubble.speech { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 3px solid #000; border-radius: 50%; }
-    .speech-bubble.speech::after { content: ''; position: absolute; bottom: -12px; left: var(--tail-pos); border: 12px solid transparent; border-top-color: #000; border-bottom: 0; margin-left: -12px; }
+    /* SPEECH */
+    .speech-bubble.speech {
+        --b: 3em; --h: 1.8em; --t: 0.6; --p: var(--tail-pos, 50%); --r: 1.2em;
+        background: var(--bubble-fill, #fff);
+        color: var(--bubble-text, #000);
+        padding: 0;
+        border-radius: var(--r) var(--r) min(var(--r), calc(100% - var(--p) - (1 - var(--t)) * var(--b) / 2)) min(var(--r), calc(var(--p) - (1 - var(--t)) * var(--b) / 2)) / var(--r);
+    }
+    .speech-bubble.speech:before {
+        content: ""; position: absolute; width: var(--b); height: var(--h);
+        background: inherit; border-bottom-left-radius: 100%; pointer-events: none; z-index: 1;
+        -webkit-mask: radial-gradient(calc(var(--t)*100%) 105% at 100% 0,#0000 99%,#000 101%);
+        mask: radial-gradient(calc(var(--t)*100%) 105% at 100% 0,#0000 99%,#000 101%);
+    }
+    .speech-bubble.speech.tail-bottom:before { top: 100%; left: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); }
     
+    /* THOUGHT */
     .speech-bubble.thought { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 2px dashed #555; border-radius: 50%; }
-    .speech-bubble.thought .dots { position: absolute; bottom:-20px; left:20px; width:15px; height:15px; background:#fff; border:2px solid #555; border-radius:50%; }
-    
-    .speech-bubble.reaction { background: #ff0; border: 3px solid red; color: red; font-family: 'Bangers'; text-transform: uppercase; clip-path: polygon(0% 25%, 17% 21%, 17% 0%, 31% 16%, 50% 4%, 69% 16%, 83% 0%, 83% 21%, 100% 25%, 85% 45%, 95% 62%, 82% 79%, 100% 97%, 79% 89%, 60% 98%, 46% 82%, 27% 95%, 15% 78%, 5% 62%, 15% 45%); }
+    .speech-bubble.thought::before { display:none; }
+    .thought-dot { position: absolute; background-color: var(--bubble-fill, #fff); border: 2px solid #555; border-radius: 50%; z-index: -1; }
+    .thought-dot-1 { width: 15px; height: 15px; bottom:-15px; left:20px; }
+    .thought-dot-2 { width: 10px; height: 10px; bottom:-25px; left:10px; }
+    .speech-bubble.thought.pos-bl .thought-dot-1 { left: 20px; bottom: -20px; }
+    
+    /* REACTION */
+    .speech-bubble.reaction { 
+        background: #FFD700; border: 3px solid #E53935; color: #D32F2F; 
+        font-family: 'Bangers'; text-transform: uppercase; 
+        clip-path: polygon(0% 25%, 17% 21%, 17% 0%, 31% 16%, 50% 4%, 69% 16%, 83% 0%, 83% 21%, 100% 25%, 85% 45%, 95% 62%, 82% 79%, 100% 97%, 79% 89%, 60% 98%, 46% 82%, 27% 95%, 15% 78%, 5% 62%, 15% 45%); 
+    }
     
-    .speech-bubble.narration { background: #eee; border: 2px solid #000; color: #000; border-radius: 0; font-family: 'Lato'; bottom: 10px; left: 50%; transform: translateX(-50%); }
+    /* NARRATION */
+    .speech-bubble.narration { 
+        background: #eee; border: 2px solid #000; color: #000; 
+        border-radius: 0; font-family: 'Lato'; 
+        bottom: 10px; left: 50%; transform: translateX(-50%); width: 80% !important; height: auto !important;
+    }
     
     .resize-handle { position: absolute; bottom:-5px; right:-5px; width:15px; height:15px; background:#3498db; border:1px solid white; cursor:se-resize; display:none; }
     .speech-bubble.selected .resize-handle { display:block; }
@@ -559,7 +555,9 @@ INDEX_HTML = '''
                     left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height,
                     type: b.dataset.type, font: b.style.fontFamily,
                     colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') },
-                    tailPos: b.style.getPropertyValue('--tail-pos')
+                    tailPos: b.style.getPropertyValue('--tail-pos'),
+                    // Save specific class lists
+                    classes: b.className
                 });
             });
             const panels = [];
@@ -643,9 +641,10 @@ INDEX_HTML = '''
         const data = await r.json();
         const cleanData = data.map(p => ({
             panels: p.panels.map(pan => ({ src: `/frames/${pan.image}?sid=${sid}` })),
+            // Map backend bubbles to strict list structure to avoid grouping
             bubbles: p.bubbles.map(b => ({
                 text: b.dialog, left: (b.bubble_offset_x||50)+'px', top: (b.bubble_offset_y||20)+'px', type: b.type,
-                colors: b.colors, font: b.font
+                colors: b.colors, font: b.font, classes: b.classes, tailPos: b.tail_pos
             }))
         }));
         renderFromState(cleanData);
@@ -660,30 +659,32 @@ INDEX_HTML = '''
             const div = document.createElement('div'); div.className = 'comic-page';
             const grid = document.createElement('div'); grid.className = 'comic-grid';
             
-            page.panels.forEach(pan => {
+            page.panels.forEach((pan, idx) => {
                 const pDiv = document.createElement('div'); pDiv.className = 'panel';
                 const img = document.createElement('img');
                 img.src = pan.src.includes('?') ? pan.src : pan.src + `?sid=${sid}`;
                 img.dataset.zoom = 100; img.dataset.translateX = 0; img.dataset.translateY = 0;
                 img.onmousedown = (e) => { e.preventDefault(); e.stopPropagation(); selectPanel(pDiv); dragType = 'pan'; activeObj = img; dragStart = {x:e.clientX, y:e.clientY}; img.classList.add('panning'); };
-                
-                // 🚀 ZOOM: Allows zooming out to 20% to fit 16:9 images in squares
-                img.onwheel = (e) => { 
-                    e.preventDefault(); 
-                    let zoom = parseFloat(img.dataset.zoom); 
-                    zoom += e.deltaY * -0.1; 
-                    zoom = Math.min(Math.max(20, zoom), 300); 
-                    img.dataset.zoom = zoom; 
-                    updateImageTransform(img); 
-                    if(selectedPanel === pDiv) document.getElementById('zoom-slider').value = zoom; 
-                    saveState(); 
-                };
-                
+                img.onwheel = (e) => { e.preventDefault(); let zoom = parseFloat(img.dataset.zoom); zoom += e.deltaY * -0.1; zoom = Math.min(Math.max(20, zoom), 300); img.dataset.zoom = zoom; updateImageTransform(img); if(selectedPanel === pDiv) document.getElementById('zoom-slider').value = zoom; saveState(); };
                 pDiv.appendChild(img); grid.appendChild(pDiv);
             });
             
             grid.append(createHandle('h-t1', grid, 't1'), createHandle('h-t2', grid, 't2'), createHandle('h-b1', grid, 'b1'), createHandle('h-b2', grid, 'b2'));
-            (page.bubbles || []).forEach(bData => { grid.appendChild(createBubbleHTML(bData)); });
+            
+            // 🎯 CRITICAL: PAIR 1 BUBBLE TO 1 PANEL IF AVAILABLE
+            // Instead of just looping all bubbles, we map them by index to keep 1:1 if possible
+            if(page.bubbles) {
+                page.bubbles.forEach((bData, bIdx) => {
+                    // We simply append them to the grid. The backend ensures the list length matches panels roughly.
+                    // To enforce strict placement visually, we rely on the backend setting varied coordinates.
+                    // But here we just append to Grid so they float over panels.
+                    if(bData.text) {
+                        const b = createBubbleHTML(bData); 
+                        grid.appendChild(b);
+                    }
+                });
+            }
+            
             div.appendChild(grid); pageWrapper.appendChild(div); con.appendChild(pageWrapper);
         });
     }
@@ -697,7 +698,12 @@ INDEX_HTML = '''
     function createBubbleHTML(data) {
         const b = document.createElement('div');
         const type = data.type || 'speech';
-        b.className = `speech-bubble ${type}`;
+        
+        // Use existing classes or generate defaults
+        let className = data.classes || `speech-bubble ${type} tail-bottom`;
+        if (type === 'thought' && !className.includes('pos-')) className += ' pos-bl';
+        b.className = className;
+        
         b.dataset.type = type;
         b.style.left = data.left; b.style.top = data.top;
         if(data.width) b.style.width = data.width;
@@ -705,7 +711,8 @@ INDEX_HTML = '''
         if(data.font) b.style.fontFamily = data.font;
         if(data.colors) { b.style.setProperty('--bubble-fill', data.colors.fill); b.style.setProperty('--bubble-text', data.colors.text); }
         if(data.tailPos) b.style.setProperty('--tail-pos', data.tailPos);
-        if(type === 'thought') { const dots=document.createElement('div'); dots.className='dots'; b.appendChild(dots); }
+        
+        if(type === 'thought') { for(let i=1; i<=2; i++){ const d = document.createElement('div'); d.className = `thought-dot thought-dot-${i}`; b.appendChild(d); } }
         
         const textSpan = document.createElement('span'); textSpan.className = 'bubble-text'; textSpan.textContent = data.text || 'Text'; b.appendChild(textSpan);
         const resizer = document.createElement('div'); resizer.className = 'resize-handle'; 
@@ -723,7 +730,6 @@ INDEX_HTML = '''
         if(newText !== null) { textSpan.textContent = newText; saveState(); }
     }
     
-    // --- GLOBAL MOUSE EVENTS ---
     document.addEventListener('mousemove', (e) => {
         if(!dragType) return;
         if(dragType === 'handle') {
@@ -753,7 +759,6 @@ INDEX_HTML = '''
         dragType = null; activeObj = null; 
     });
     
-    // --- UI ACTIONS ---
     function selectBubble(el) { 
         if(selectedBubble) selectedBubble.classList.remove('selected'); 
         selectedBubble = el; el.classList.add('selected'); 
@@ -821,18 +826,6 @@ INDEX_HTML = '''
         if(d.success) img.src = `/frames/${fname}?sid=${sid}&t=${Date.now()}`;
         img.style.opacity='1'; saveState();
     }
-    async function gotoTimestamp() {
-        if(!selectedPanel) return alert("Select a panel");
-        let v = document.getElementById('timestamp-input').value.trim();
-        if(!v) return;
-        if(v.includes(':')) { let p = v.split(':'); v = parseInt(p[0]) * 60 + parseFloat(p[1]); } else { v = parseFloat(v); }
-        const img = selectedPanel.querySelector('img'); let fname = img.src.split('/').pop().split('?')[0]; 
-        img.style.opacity = '0.5';
-        const r = await fetch(`/goto_timestamp?sid=${sid}`, { method:'POST', headers:{'Content-Type':'application/json'}, body:JSON.stringify({filename:fname, timestamp:v}) });
-        const d = await r.json();
-        if(d.success) img.src = `/frames/${fname}?sid=${sid}&t=${Date.now()}`;
-        img.style.opacity='1'; saveState();
-    }
     
     async function exportComic() {
         const pgs = document.querySelectorAll('.comic-page');
@@ -863,7 +856,14 @@ INDEX_HTML = '''
             const layout = { t1: grid.style.getPropertyValue('--t1')||'100%', t2: grid.style.getPropertyValue('--t2')||'100%', b1: grid.style.getPropertyValue('--b1')||'100%', b2: grid.style.getPropertyValue('--b2')||'100%' };
             const bubbles = [];
             grid.querySelectorAll('.speech-bubble').forEach(b => {
-                bubbles.push({ text: b.querySelector('.bubble-text').textContent, left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height, colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') } });
+                bubbles.push({
+                    text: b.querySelector('.bubble-text').textContent,
+                    left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height,
+                    type: b.dataset.type, font: b.style.fontFamily,
+                    colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') },
+                    tailPos: b.style.getPropertyValue('--tail-pos'),
+                    classes: b.className
+                });
             });
             const panels = [];
             grid.querySelectorAll('.panel').forEach(pan => {