Update app_enhanced.py

app_enhanced.py

@@ -1,4 +1,4 @@
-import spaces  # <--- CRITICAL: MUST BE THE FIRST IMPORT
+import spaces
 import os
 import time
 import threading
@@ -28,10 +28,8 @@ def gpu_warmup():
 # ======================================================
 if os.path.exists('/data'):
     BASE_STORAGE_PATH = '/data'
-    print("✅ Using Persistent Storage at /data")
 else:
     BASE_STORAGE_PATH = '.'
-    print("⚠️ Using Ephemeral Storage")
 
 BASE_USER_DIR = os.path.join(BASE_STORAGE_PATH, "userdata")
 SAVED_COMICS_DIR = os.path.join(BASE_STORAGE_PATH, "saved_comics")
@@ -40,7 +38,7 @@ os.makedirs(BASE_USER_DIR, exist_ok=True)
 os.makedirs(SAVED_COMICS_DIR, exist_ok=True)
 
 app = Flask(__name__)
-app.config['MAX_CONTENT_LENGTH'] = 500 * 1024 * 1024  # 500MB Upload Limit
+app.config['MAX_CONTENT_LENGTH'] = 500 * 1024 * 1024
 
 def generate_save_code(length=8):
     chars = string.ascii_uppercase + string.digits
@@ -53,13 +51,20 @@ def generate_save_code(length=8):
 # 🧱 DATA CLASSES
 # ======================================================
 def bubble(dialog="", x=50, y=20, type='speech'):
+    # Determine CSS classes based on type (Logic from safwe.py)
+    classes = f"speech-bubble {type}"
+    if type == 'speech':
+        classes += " tail-bottom"
+    elif type == 'thought':
+        classes += " pos-bl"
+        
     return {
         'dialog': dialog,
         '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"
     }
@@ -73,12 +78,11 @@ class Page:
         self.bubbles = bubbles
 
 # ======================================================
-# 🧠 GPU GENERATION (16:9 Aspect Ratio Preservation)
+# 🧠 GPU GENERATION
 # ======================================================
 @spaces.GPU(duration=300)
 def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
-    print(f"🚀 Generating Comic (16:9 Aspect Ratio): {video_path}")
-    
+    print(f"🚀 Generating HD Comic: {video_path}")
     import cv2
     import srt
     import numpy as np
@@ -91,6 +95,7 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     duration = total_frames / fps
     cap.release()
 
+    # Subtitles
     user_srt = os.path.join(user_dir, 'subs.srt')
     try:
         get_real_subtitles(video_path)
@@ -106,11 +111,14 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         except: all_subs = []
 
     valid_subs = [s for s in all_subs if s.content.strip()]
-    raw_moments = [{'text': s.content, 'start': s.start.total_seconds(), 'end': s.end.total_seconds()} for s in valid_subs]
+    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:
+        raw_moments = []
 
-    if target_pages <= 0: target_pages = 1
+    # 4 Panels Per Page
     panels_per_page = 4
-    total_panels_needed = target_pages * panels_per_page
+    total_panels_needed = int(target_pages) * panels_per_page
 
     selected_moments = []
     if not raw_moments:
@@ -129,20 +137,22 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
 
     for i, moment in enumerate(selected_moments):
         mid = (moment['start'] + moment['end']) / 2
-        if mid > duration: mid = duration - 1
-        cap.set(cv2.CAP_PROP_POS_FRAMES, int(mid * fps))
+        cap.set(cv2.CAP_PROP_POS_MSEC, mid * 1000)
         ret, frame = cap.read()
         if ret:
-            # ----------------------------------------------------
-            # 🎯 EXTRACT AT 1280x720 (16:9 Aspect Ratio)
-            # This preserves full width and height.
-            # Frontend handles fitting into square panels.
-            # ----------------------------------------------------
-            frame = cv2.resize(frame, (1280, 720))
+            # 🎯 SQUARE PADDING (0% Cut)
+            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
+            # Resize to standard high res
+            square_img = cv2.resize(square_img, (1024, 1024))
             
             fname = f"frame_{count:04d}.png"
             p = os.path.join(frames_dir, fname)
-            cv2.imwrite(p, frame)
+            cv2.imwrite(p, square_img)
             
             frame_metadata[fname] = {'dialogue': moment['text'], 'time': mid}
             frame_files_ordered.append(fname)
@@ -153,26 +163,33 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         
     bubbles_list = []
     for i, f in enumerate(frame_files_ordered):
-        p = os.path.join(frames_dir, f)
         dialogue = frame_metadata.get(f, {}).get('dialogue', '')
         
+        # Determine Bubble Type
         b_type = 'speech'
-        if '(' in dialogue and ')' in dialogue: b_type = 'narration'
-        elif '!' in dialogue and dialogue.isupper(): b_type = 'reaction'
+        if '(' in dialogue: b_type = 'narration'
+        elif '!' in dialogue: b_type = 'reaction'
         elif '?' in dialogue: b_type = 'speech'
         
-        # Position bubbles centrally in panels
-        pos_idx = i % 4 # Determine which of the 4 panels this frame is for
-        if pos_idx == 0: bx, by = 150, 80  # Top-Left
-        elif pos_idx == 1: bx, by = 600, 80 # Top-Right
-        elif pos_idx == 2: bx, by = 150, 600 # Bottom-Left
-        elif pos_idx == 3: bx, by = 600, 600 # Bottom-Right
-        else: bx, by = 50, 50 # Default
-        
+        # 🎯 1 BUBBLE PER PANEL PLACEMENT (for 800x800 page)
+        # Quadrants: TL, TR, BL, BR
+        # Panel size approx 400x400
+        pos_idx = i % 4
+        if pos_idx == 0:   # TL
+            bx, by = 150, 50
+        elif pos_idx == 1: # TR
+            bx, by = 550, 50
+        elif pos_idx == 2: # BL
+            bx, by = 150, 450
+        elif pos_idx == 3: # BR
+            bx, by = 550, 450
+        else:
+            bx, by = 50, 50
+
         bubbles_list.append(bubble(dialog=dialogue, x=bx, y=by, type=b_type))
             
     pages = []
-    for i in range(target_pages):
+    for i in range(int(target_pages)):
         start_idx = i * 4
         end_idx = start_idx + 4
         p_frames = frame_files_ordered[start_idx:end_idx]
@@ -183,11 +200,13 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
              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'))
+             # Add hidden empty bubble
+             p_bubbles.append(bubble(dialog="", x=-999, y=-999, type='speech'))
 
         if p_frames:
+            # FIX: Use Page Class to avoid AttributeError
             pg_panels = [panel(image=f) for f in p_frames]
-            pages.append({'panels': pg_panels, 'bubbles': p_bubbles})
+            pages.append(Page(panels=pg_panels, bubbles=p_bubbles))
 
     result = []
     for pg in pages:
@@ -215,15 +234,48 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     cap.release()
 
     if ret:
-        frame = cv2.resize(frame, (1280, 720)) # Keep 16:9 Aspect Ratio
-        p = os.path.join(frames_dir, fname)
-        cv2.imwrite(p, frame)
+        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))
         
+        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):
+    import cv2
+    import json
+    cap = cv2.VideoCapture(video_path)
+    cap.set(cv2.CAP_PROP_POS_MSEC, float(ts) * 1000)
+    ret, frame = cap.read()
+    cap.release()
+
+    if ret:
+        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))
+        
+        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)
+            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)
+        return {"success": True, "message": f"Jumped to {ts}s"}
+    return {"success": False, "message": "Invalid timestamp"}
 
 # ======================================================
 # 💻 BACKEND CLASS
@@ -308,28 +360,31 @@ INDEX_HTML = '''
     .panel img.panning { cursor: grabbing; transition: none; }
     .panel.selected { outline: 4px solid #3498db; z-index: 5; }
 
-    /* === CLIP PATHS === */
+    /* Clip Paths */
     .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; }
     .panel:nth-child(4) { clip-path: polygon(calc(var(--b1) + var(--gap)) calc(var(--y) + var(--gap)), 100% calc(var(--y) + var(--gap)), 100% 100%, calc(var(--b2) + var(--gap)) 100%); z-index: 1; }
 
-    /* === HANDLES === */
+    /* Handles */
     .handle { position: absolute; width: 26px; height: 26px; border: 3px solid white; border-radius: 50%; transform: translate(-50%, -50%); z-index: 101; cursor: ew-resize; box-shadow: 0 2px 5px rgba(0,0,0,0.8); }
-    .handle:hover { transform: translate(-50%, -50%) scale(1.3); }
     .h-t1 { background: #3498db; left: var(--t1); top: 0%; margin-top: 15px; }
     .h-t2 { background: #3498db; left: var(--t2); top: 50%; margin-top: -15px; }
     .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 */
+    /* SPEECH BUBBLES - STYLED */
     .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; }
     
     /* SPEECH */
@@ -381,45 +436,40 @@ INDEX_HTML = '''
     button, input, select { width: 100%; margin-top: 5px; padding: 8px; border-radius: 4px; border: 1px solid #ddd; cursor: pointer; font-weight: bold; font-size: 13px; }
     .button-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 5px; }
     .color-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 5px; }
-    .action-btn { background: #4CAF50; color: white; }
-    .reset-btn { background: #e74c3c; color: white; }
+    .action-btn { background: #27ae60; color: white; }
+    .reset-btn { background: #c0392b; color: white; }
     .secondary-btn { background: #f39c12; color: white; }
-    .save-btn { background: #9b59b6; color: white; }
-    .undo-btn { background: #7f8c8d; color: white; margin-bottom: 5px; }
+    .save-btn { background: #8e44ad; color: white; }
     
-    /* MODAL */
-    .modal-overlay { position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0,0,0,0.7); display: none; justify-content: center; align-items: center; z-index: 9999; }
-    .modal-content { background: white; padding: 30px; border-radius: 12px; max-width: 400px; width: 90%; text-align: center; }
-    .modal-content .code { font-size: 32px; font-weight: bold; letter-spacing: 4px; background: #f0f0f0; padding: 15px 25px; border-radius: 8px; display: inline-block; margin: 15px 0; font-family: monospace; user-select: all; }
+    .tip { text-align:center; padding:10px; background:#e74c3c; color:white; font-weight:bold; margin-bottom:20px; border-radius:5px; }
+    .modal-overlay { position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0,0,0,0.8); display: none; justify-content: center; align-items: center; z-index: 2000; }
+    .modal-content { background: white; padding: 30px; border-radius: 12px; width: 90%; max-width: 400px; text-align: center; color: #333; }
+    .code { font-size: 24px; font-weight: bold; letter-spacing: 3px; background: #eee; padding: 10px; margin: 15px 0; display: inline-block; font-family: monospace; }
 </style>
 </head> <body> 
 
 <div id="upload-container"> 
     <div class="upload-box"> 
-        <h1>⚡ Enhanced Comic Generator</h1> 
+        <h1>⚡ Ultimate Square Comic</h1> 
         <input type="file" id="file-upload" class="file-input" onchange="document.getElementById('fn').innerText=this.files[0].name"> 
-        <label for="file-upload" class="file-label">📁 Choose Video File</label> 
-        <span id="fn" style="margin-bottom:10px; display:block; color:#666;">No file selected</span>
+        <label for="file-upload" class="file-label">📁 Choose Video</label> 
+        <span id="fn" style="margin-bottom:10px; display:block; color:#aaa;">No file selected</span>
         
         <div class="page-input-group">
-            <label>📚 Total Comic Pages:</label>
-            <input type="number" id="page-count" value="4" min="1" max="15" placeholder="e.g. 4 (Video will be divided evenly)">
-            <small style="color:#666; font-size:11px; display:block; margin-top:5px;">System calculates ~4 panels per page.</small>
+            <label>📚 Total Pages:</label>
+            <input type="number" id="page-count" value="4" min="1" max="15">
         </div>
         
-        <button class="submit-btn" onclick="upload()">🚀 Generate Comic</button>
-        <button id="restore-draft-btn" class="restore-btn" style="display:none; margin-top:15px;" onclick="restoreDraft()">📂 Restore Unsaved Draft</button>
+        <button class="submit-btn" onclick="upload()">🚀 Generate</button>
+        <button id="restore-draft-btn" class="reset-btn" style="display:none; margin-top:10px;" onclick="restoreDraft()">📂 Restore Draft</button>
         
-        <div class="load-section">
-            <h3>📥 Load Saved Comic</h3>
-            <div class="load-input-group">
-                <input type="text" id="load-code-input" placeholder="SAVE CODE" maxlength="8" style="text-transform:uppercase;">
-                <button onclick="loadSavedComic()">Load</button>
-            </div>
+        <div style="margin-top:20px; border-top:1px solid #555; padding-top:10px;">
+            <input type="text" id="load-code" placeholder="ENTER SAVE CODE" style="width:70%; display:inline-block;">
+            <button onclick="loadComic()" style="width:25%; display:inline-block; background:#9b59b6; color:white;">Load</button>
         </div>
         <div class="loading-view" id="loading-view" style="display:none; margin-top:20px;">
-            <div class="loader" style="margin:0 auto;"></div>
-            <p id="status-text" style="margin-top:10px;">Starting...</p>
+            <div class="loader"></div>
+            <p id="status-text" style="margin-top:10px;">Analyzing Video...</p>
         </div>
     </div>
 </div>
@@ -430,93 +480,76 @@ INDEX_HTML = '''
     <input type="file" id="image-uploader" style="display: none;" accept="image/*">
     
     <div class="edit-controls">
-        <h4>✏️ Interactive Editor</h4>
+        <h4>✏️ Editor</h4>
         
         <div class="control-group">
-            <button onclick="undoLastAction()" class="undo-btn">↩️ Undo</button>
+            <button onclick="undo()" style="background:#7f8c8d; color:white;">↩️ Undo</button>
             <button onclick="saveComic()" class="save-btn">💾 Save Comic</button>
         </div>
-        
+
         <div class="control-group">
             <label>💬 Bubble Styling:</label>
-            <select id="bubble-type" onchange="changeBubbleType(this.value)" disabled>
-                <option value="speech">Speech</option>
-                <option value="thought">Thought</option>
-                <option value="reaction">Reaction (Shout)</option>
-                <option value="narration">Narration (Box)</option>
+            <select id="bubble-type" onchange="updateBubbleType()">
+                <option value="speech">Speech 💬</option>
+                <option value="thought">Thought 💭</option>
+                <option value="reaction">Reaction 💥</option>
+                <option value="narration">Narration ⬜</option>
             </select>
-            <select id="font-select" onchange="changeFont(this.value)" disabled>
+            <select id="font-select" onchange="updateFont()">
                 <option value="'Comic Neue', cursive">Comic Neue</option>
                 <option value="'Bangers', cursive">Bangers</option>
-                <option value="'Gloria Hallelujah', cursive">Gloria</option>
-                <option value="'Lato', sans-serif">Lato</option>
+                <option value="'Gloria Hallelujah', cursive">Handwritten</option>
+                <option value="'Lato', sans-serif">Modern</option>
             </select>
             <div class="color-grid">
-                <div><label>Text</label><input type="color" id="bubble-text-color" value="#ffffff" disabled></div>
-                <div><label>Fill</label><input type="color" id="bubble-fill-color" value="#4ECDC4" disabled></div>
+                <input type="color" id="bub-fill" value="#ffffff" onchange="updateColors()" title="Fill">
+                <input type="color" id="bub-text" value="#000000" onchange="updateColors()" title="Text">
             </div>
             <div class="button-grid">
                 <button onclick="addBubble()" class="action-btn">Add</button>
                 <button onclick="deleteBubble()" class="reset-btn">Delete</button>
             </div>
-            
-            <div class="control-group" id="tail-controls" style="display:none;">
-                <label>📐 Tail Adjustment:</label>
-                <button onclick="rotateTail()" class="secondary-btn">🔄 Rotate Side</button>
-                <div class="slider-container">
-                    <label>Pos:</label>
-                    <input type="range" id="tail-slider" min="10" max="90" value="50" oninput="slideTail(this.value)">
-                </div>
-            </div>
+            <input type="range" min="10" max="90" value="50" oninput="slideTail(this.value)" title="Tail Pos">
         </div>
-        
+
         <div class="control-group">
-            <label>🖼️ Panel Tools:</label>
-            <button onclick="replacePanelImage()" class="action-btn">🖼️ Replace Image</button>
+            <label>🖼️ Image Control:</label>
+            <button onclick="replaceImage()" class="action-btn">Replace Image</button>
             <div class="button-grid">
-                <button onclick="adjustFrame('backward')" class="secondary-btn">⬅️ Prev</button>
-                <button onclick="adjustFrame('forward')" class="action-btn">Next ➡️</button>
-            </div>
-            <div class="timestamp-controls">
-                <input type="text" id="timestamp-input" placeholder="mm:ss or secs">
-                <button onclick="gotoTimestamp()" class="action-btn">Go</button>
+                <button onclick="adjustFrame('backward')" class="secondary-btn">⬅️ Frame</button>
+                <button onclick="adjustFrame('forward')" class="action-btn">Frame ➡️</button>
             </div>
         </div>
         
         <div class="control-group">
-            <label>🔍 Zoom & Pan:</label>
-            <div class="button-grid">
-                <button onclick="resetPanelTransform()" class="secondary-btn">Reset</button>
-                <input type="range" id="zoom-slider" min="100" max="300" value="100" step="5" disabled oninput="handleZoom(this)">
-            </div>
+            <label>🔍 Zoom (Scroll Wheel):</label>
+            <input type="range" id="zoom-slider" min="20" max="300" value="100" step="5" oninput="handleZoom(this.value)" disabled>
+            <button onclick="resetPanelTransform()" class="secondary-btn">Reset View</button>
         </div>
         
         <div class="control-group">
-            <button onclick="exportComic()" class="export-btn">📥 Export as PNG</button>
+            <button onclick="exportComic()" class="action-btn" style="background:#3498db;">📥 Export PNG</button>
             <button onclick="location.reload()" class="reset-btn" style="margin-top:10px;">🏠 Home</button>
         </div>
     </div>
 </div>
+
 <div class="modal-overlay" id="save-modal">
     <div class="modal-content">
         <h2>✅ Comic Saved!</h2>
-        <div class="code" id="modal-save-code">XXXX</div>
-        <button onclick="copyModalCode()">📋 Copy Code</button>
-        <button class="close-btn" onclick="closeModal()">Close</button>
+        <div class="code" id="modal-code">XXXX</div>
+        <button onclick="closeModal()">Close</button>
     </div>
 </div>
+
 <script>
     function genUUID(){ return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g,c=>{var r=Math.random()*16|0,v=c=='x'?r:(r&0x3|0x8);return v.toString(16);}); }
     let sid = localStorage.getItem('comic_sid') || genUUID();
     localStorage.setItem('comic_sid', sid);
-    
-    let currentSaveCode = null;
-    let isProcessing = false;
     let interval, selectedBubble = null, selectedPanel = null;
     let dragType = null, activeObj = null, dragStart = {x:0, y:0};
     let historyStack = [];
     
-    // HISTORY & UNDO
     function saveState() {
         const state = [];
         document.querySelectorAll('.comic-page').forEach(pg => {
@@ -528,9 +561,9 @@ INDEX_HTML = '''
                     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,
-                    classes: b.className, // Save the full class list
+                    colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') },
                     tailPos: b.style.getPropertyValue('--tail-pos'),
-                    colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') }
+                    classes: b.className
                 });
             });
             const panels = [];
@@ -614,6 +647,7 @@ 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, classes: b.classes, tailPos: b.tail_pos
@@ -645,6 +679,7 @@ INDEX_HTML = '''
             
             if(page.bubbles) {
                 page.bubbles.forEach((bData, bIdx) => {
+                    // Only append valid bubbles, ignore dummies
                     if(bData.text) {
                         const b = createBubbleHTML(bData); 
                         grid.appendChild(b);
@@ -667,8 +702,8 @@ INDEX_HTML = '''
         const type = data.type || 'speech';
         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;
@@ -679,9 +714,12 @@ INDEX_HTML = '''
         
         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); } }
         
-        ['nw', 'ne', 'sw', 'se'].forEach(dir => { const handle = document.createElement('div'); handle.className = `resize-handle ${dir}`; handle.onmousedown = (e) => startResize(e, dir); b.appendChild(handle); });
+        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'; 
+        resizer.onmousedown = (e) => { e.stopPropagation(); dragType='resize'; activeObj={b:b, startW:b.offsetWidth, startH:b.offsetHeight, mx:e.clientX, my:e.clientY}; };
+        b.appendChild(resizer);
         
-        b.onmousedown = (e) => { if(e.target.classList.contains('resize-handle')) return; e.stopPropagation(); selectBubble(b); dragType = 'bubble'; activeObj = b; dragStart = {x: e.clientX, y: e.clientY}; };
+        b.onmousedown = (e) => { if(e.target === resizer) return; e.stopPropagation(); selectBubble(b); dragType = 'bubble'; activeObj = b; dragStart = {x: e.clientX, y: e.clientY}; };
         b.ondblclick = (e) => { e.stopPropagation(); editBubbleText(b); };
         return b;
     }
@@ -819,7 +857,7 @@ 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, type: b.dataset.type, colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') }, tailPos: b.style.getPropertyValue('--tail-pos'), classes: b.className });
+                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, colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') }, tailPos: b.style.getPropertyValue('--tail-pos') });
             });
             const panels = [];
             grid.querySelectorAll('.panel').forEach(pan => {