Update app_enhanced.py

app_enhanced.py

@@ -52,16 +52,16 @@ def generate_save_code(length=8):
 # ======================================================
 # 🧱 DATA CLASSES
 # ======================================================
-def bubble(dialog="...", x=50, y=50, type='speech'):
-    # Default styling
+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"
+        classes += " tail-bottom" # Default tail position
     elif type == 'thought':
         classes += " pos-bl"
         
     return {
-        'dialog': dialog if dialog.strip() else "...", # Ensure text is never empty
+        'dialog': dialog,
         'bubble_offset_x': int(x),
         'bubble_offset_y': int(y),
         'type': type,
@@ -71,6 +71,14 @@ def bubble(dialog="...", x=50, y=50, type='speech'):
         'font': "'Comic Neue', cursive"
     }
 
+def panel(image=""):
+    return {'image': image}
+
+class Page:
+    def __init__(self, panels, bubbles):
+        self.panels = panels
+        self.bubbles = bubbles
+
 # ======================================================
 # 🧠 GPU GENERATION
 # ======================================================
@@ -96,29 +104,27 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         if os.path.exists('test1.srt'):
             shutil.move('test1.srt', user_srt)
         elif not os.path.exists(user_srt):
-            with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\nText\n")
+            with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
     except:
-        with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\nText\n")
+        with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
             
     with open(user_srt, 'r', encoding='utf-8') as f:
         try: all_subs = list(srt.parse(f.read()))
         except: all_subs = []
 
-    valid_subs = [s for s in all_subs if s.content and s.content.strip()]
+    valid_subs = [s for s in all_subs if s.content.strip()]
     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 = []
 
-    # 4 Panels Per Page
     panels_per_page = 4
     total_panels_needed = int(target_pages) * panels_per_page
 
     selected_moments = []
     if not raw_moments:
-        # Create timestamps if no text
         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:
@@ -135,23 +141,20 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         cap.set(cv2.CAP_PROP_POS_MSEC, mid * 1000)
         ret, frame = cap.read()
         if ret:
-            # 🎯 SQUARE PADDING (0% Cut, Matches Template)
+            # 🎯 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
-            # Standardize size
             square_img = cv2.resize(square_img, (1024, 1024))
             
             fname = f"frame_{count:04d}.png"
             p = os.path.join(frames_dir, fname)
             cv2.imwrite(p, square_img)
             
-            # Ensure text exists
-            txt = moment['text'] if moment['text'].strip() else "..."
-            frame_metadata[fname] = {'dialogue': txt, 'time': mid}
+            frame_metadata[fname] = {'dialogue': moment['text'], 'time': mid}
             frame_files_ordered.append(fname)
             count += 1
     cap.release()
@@ -160,25 +163,21 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         
     bubbles_list = []
     for i, f in enumerate(frame_files_ordered):
-        dialogue = frame_metadata.get(f, {}).get('dialogue', '...')
+        dialogue = frame_metadata.get(f, {}).get('dialogue', '')
         
-        # Determine Bubble Type
         b_type = 'speech'
-        if '(' in dialogue: 
-            b_type = 'narration'
-        elif '!' in dialogue and len(dialogue) < 15: # Reaction only if short
-            b_type = 'reaction'
-        else:
-            b_type = 'speech'
+        if '(' in dialogue: b_type = 'narration'
+        elif '!' in dialogue: b_type = 'reaction'
+        elif '?' in dialogue: b_type = 'speech'
         
-        # Smart Positioning (Center of quadrants)
+        # 1 Bubble Per Panel Placement
         pos_idx = i % 4
-        if pos_idx == 0: bx, by = 150, 80
-        elif pos_idx == 1: bx, by = 600, 80
-        elif pos_idx == 2: bx, by = 150, 600
-        elif pos_idx == 3: bx, by = 600, 600
+        if pos_idx == 0: bx, by = 150, 50
+        elif pos_idx == 1: bx, by = 550, 50
+        elif pos_idx == 2: bx, by = 150, 450
+        elif pos_idx == 3: bx, by = 550, 450
         else: bx, by = 50, 50
-
+            
         bubbles_list.append(bubble(dialog=dialogue, x=bx, y=by, type=b_type))
             
     pages = []
@@ -196,10 +195,16 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
              p_bubbles.append(bubble(dialog="", x=-999, y=-999, type='speech'))
 
         if p_frames:
-            pg_panels = [{'image': f} for f in p_frames]
-            pages.append({'panels': pg_panels, 'bubbles': p_bubbles})
-
-    return pages
+            pg_panels = [panel(image=f) for f in p_frames]
+            pages.append(Page(panels=pg_panels, bubbles=p_bubbles))
+
+    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
 
 @spaces.GPU
 def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
@@ -262,9 +267,6 @@ def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, ts):
         return {"success": True, "message": f"Jumped to {ts}s"}
     return {"success": False, "message": "Invalid timestamp"}
 
-# ======================================================
-# 💻 BACKEND CLASS
-# ======================================================
 class EnhancedComicGenerator:
     def __init__(self, sid):
         self.sid = sid
@@ -302,91 +304,40 @@ class EnhancedComicGenerator:
 # ======================================================
 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&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; }
-    
     #editor-container { display: none; padding: 20px; width: 100%; box-sizing: border-box; padding-bottom: 150px; }
     
-    h1 { color: #fff; margin-bottom: 20px; }
-    .file-input { display: none; }
-    .file-label { display: block; padding: 15px; background: #e67e22; color: white; border-radius: 8px; cursor: pointer; font-weight: bold; margin-bottom: 10px; transition:0.2s; }
-    .file-label:hover { background: #d35400; }
-    
-    .page-input-group { margin: 20px 0; text-align: left; }
-    .page-input-group label { font-weight: bold; font-size: 14px; display: block; margin-bottom: 5px; color: #ccc; }
-    .page-input-group input { width: 100%; padding: 12px; border: 2px solid #555; background: #2c3e50; color: white; border-radius: 8px; font-size: 16px; box-sizing: border-box; }
-    
-    .submit-btn { width: 100%; padding: 15px; background: #2980b9; color: white; border: none; border-radius: 8px; font-size: 18px; font-weight: bold; cursor: pointer; }
-    .loader { width: 100px; height: 10px; background: #e67e22; margin: 20px auto; animation: load 1s infinite alternate; }
-    @keyframes load { from { width: 20px; } to { width: 100px; } }
-    
-    /* === SQUARE COMIC LAYOUT (800x800) === */
-    .comic-wrapper { max-width: 1000px; margin: 0 auto; display: flex; flex-direction: column; align-items: center; gap: 40px; }
-    .page-wrapper { display: flex; flex-direction: column; align-items: center; }
-    .page-title { text-align: center; color: #eee; margin-bottom: 10px; font-size: 20px; font-weight: bold; }
-    
-    .comic-page { 
-        width: 800px; 
-        height: 800px; 
-        background: white; 
-        box-shadow: 0 5px 30px rgba(0,0,0,0.6); 
-        position: relative; overflow: hidden; 
-        border: 6px solid #000; 
-    }
-    
-    .comic-grid {
-        width: 100%; height: 100%; position: relative; background: #000;
-        --y: 50%; --t1: 100%; --t2: 100%; --b1: 100%; --b2: 100%; --gap: 3px; 
-    }
-
+    .comic-page { width: 800px; height: 800px; background: white; box-shadow: 0 5px 30px rgba(0,0,0,0.6); position: relative; overflow: hidden; border: 6px solid #000; }
+    .comic-grid { width: 100%; height: 100%; position: relative; background: #000; --y: 50%; --t1: 100%; --t2: 100%; --b1: 100%; --b2: 100%; --gap: 3px; }
     .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; 
-        transform-origin: center; 
-        transition: transform 0.05s ease-out; 
-        display: block; 
-    }
+    .panel img { width: 100%; height: 100%; object-fit: cover; transform-origin: center; transition: transform 0.05s ease-out; display: block; }
     .panel img.panning { cursor: grabbing; transition: none; }
     .panel.selected { outline: 4px solid #3498db; z-index: 5; }
 
-    /* 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 */
     .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; }
+    .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 */
+    /* === ADVANCED BUBBLE CSS (WITH ROTATION) === */
     .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; 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;
-    }
+    .bubble-text { padding: 0.8em; 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 */
+    /* Speech Bubble + Rotation Classes */
     .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;
+        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 {
@@ -395,29 +346,27 @@ INDEX_HTML = '''
         -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%);
     }
+    /* Tail Orientations */
     .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.speech.tail-top { border-radius: min(var(--r), calc(var(--p) - (1 - var(--t)) * var(--b) / 2)) min(var(--r), calc(100% - var(--p) - (1 - var(--t)) * var(--b) / 2)) var(--r) var(--r) / var(--r); }
+    .speech-bubble.speech.tail-top:before { bottom: 100%; left: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); transform: scaleY(-1); }
+    
+    .speech-bubble.speech.tail-left { border-radius: var(--r); }
+    .speech-bubble.speech.tail-left:before { right: 100%; top: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); transform: rotate(90deg); transform-origin: top right; }
+    
+    .speech-bubble.speech.tail-right { border-radius: var(--r); }
+    .speech-bubble.speech.tail-right:before { left: 100%; top: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); transform: rotate(-90deg); transform-origin: top left; }
+
+    /* Thought & Others */
     .speech-bubble.thought { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 2px dashed #555; border-radius: 50%; }
     .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; }
+    .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%); 
-    }
-    
-    /* 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;
-    }
+    .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%); 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; }
@@ -448,15 +397,9 @@ INDEX_HTML = '''
         <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</label> 
         <span id="fn" style="margin-bottom:10px; display:block; color:#aaa;">No file selected</span>
-        
-        <div class="page-input-group">
-            <label>📚 Total Pages:</label>
-            <input type="number" id="page-count" value="4" min="1" max="15">
-        </div>
-        
+        <div class="page-input-group"> <label>📚 Total Pages:</label> <input type="number" id="page-count" value="4" min="1" max="15"> </div>
         <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 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>
@@ -472,59 +415,23 @@ INDEX_HTML = '''
     <div class="tip">👉 Drag Right-Side Dots to reveal 4 panels! | 📜 Scroll to Zoom/Pan</div>
     <div class="comic-wrapper" id="comic-container"></div>
     <input type="file" id="image-uploader" style="display: none;" accept="image/*">
-    
     <div class="edit-controls">
         <h4>✏️ Editor</h4>
-        
-        <div class="control-group">
-            <button onclick="undo()" style="background:#7f8c8d; color:white;">↩️ Undo</button>
-            <button onclick="saveComic()" class="save-btn">💾 Save Comic</button>
-        </div>
-
+        <div class="control-group"> <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="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="updateFont()">
-                <option value="'Comic Neue', cursive">Comic Neue</option>
-                <option value="'Bangers', cursive">Bangers</option>
-                <option value="'Gloria Hallelujah', cursive">Handwritten</option>
-                <option value="'Lato', sans-serif">Modern</option>
-            </select>
-            <div class="color-grid">
-                <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>
-            <input type="range" min="10" max="90" value="50" oninput="slideTail(this.value)" title="Tail Pos">
-        </div>
-
-        <div class="control-group">
-            <label>🖼️ Image Control:</label>
-            <button onclick="replaceImage()" class="action-btn">Replace Image</button>
-            <div class="button-grid">
-                <button onclick="adjustFrame('backward')" class="secondary-btn">⬅️ Frame</button>
-                <button onclick="adjustFrame('forward')" class="action-btn">Frame ➡️</button>
+            <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="updateFont()"> <option value="'Comic Neue', cursive">Comic Neue</option> <option value="'Bangers', cursive">Bangers</option> <option value="'Gloria Hallelujah', cursive">Handwritten</option> <option value="'Lato', sans-serif">Modern</option> </select>
+            <div class="color-grid"> <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 id="tail-controls">
+                <button onclick="rotateTail()" class="secondary-btn" style="margin-top:5px;">🔄 Rotate Tail Side</button>
+                <input type="range" min="10" max="90" value="50" oninput="slideTail(this.value)" title="Tail Pos">
             </div>
         </div>
-        
-        <div class="control-group">
-            <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="action-btn" style="background:#3498db;">📥 Export PNG</button>
-            <button onclick="location.reload()" class="reset-btn" style="margin-top:10px;">🏠 Home</button>
-        </div>
+        <div class="control-group"> <label>🖼️ Image Control:</label> <button onclick="replaceImage()" class="action-btn">Replace Image</button> <div class="button-grid"> <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 (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="action-btn" style="background:#3498db;">📥 Export PNG</button> <button onclick="location.reload()" class="reset-btn" style="margin-top:10px;">🏠 Home</button> </div>
     </div>
 </div>
 
@@ -551,14 +458,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, 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
-                });
+                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 => {
@@ -574,24 +474,14 @@ INDEX_HTML = '''
         localStorage.setItem('comic_draft_'+sid, JSON.stringify(state));
     }
     
-    function undo() {
-        if(historyStack.length > 1) {
-            historyStack.pop(); 
-            const prev = JSON.parse(historyStack[historyStack.length-1]);
-            restoreFromState(prev);
-        }
-    }
-    
+    function undo() { if(historyStack.length > 1) { historyStack.pop(); const prev = JSON.parse(historyStack[historyStack.length-1]); restoreFromState(prev); } }
     function restoreFromState(stateData) {
         if(!stateData) return;
         const pages = document.querySelectorAll('.comic-page');
         stateData.forEach((pgData, i) => {
             if(i >= pages.length) return;
             const grid = pages[i].querySelector('.comic-grid');
-            if(pgData.layout) {
-                grid.style.setProperty('--t1', pgData.layout.t1); grid.style.setProperty('--t2', pgData.layout.t2);
-                grid.style.setProperty('--b1', pgData.layout.b1); grid.style.setProperty('--b2', pgData.layout.b2);
-            }
+            if(pgData.layout) { grid.style.setProperty('--t1', pgData.layout.t1); grid.style.setProperty('--t2', pgData.layout.t2); grid.style.setProperty('--b1', pgData.layout.b1); grid.style.setProperty('--b2', pgData.layout.b2); }
             grid.querySelectorAll('.speech-bubble').forEach(b=>b.remove());
             pgData.bubbles.forEach(bData => { const b = createBubbleHTML(bData); grid.appendChild(b); });
             const panels = grid.querySelectorAll('.panel');
@@ -607,14 +497,7 @@ INDEX_HTML = '''
     }
     
     if(localStorage.getItem('comic_draft_'+sid)) document.getElementById('restore-draft-btn').style.display='inline-block';
-    function restoreDraft() {
-        document.getElementById('upload-container').style.display='none';
-        document.getElementById('editor-container').style.display='block';
-        loadNewComic().then(() => {
-            setTimeout(() => restoreFromState(JSON.parse(localStorage.getItem('comic_draft_'+sid))), 500);
-        });
-    }
-
+    function restoreDraft() { document.getElementById('upload-container').style.display='none'; document.getElementById('editor-container').style.display='block'; loadNewComic().then(() => { setTimeout(() => restoreFromState(JSON.parse(localStorage.getItem('comic_draft_'+sid))), 500); }); }
     async function upload() {
         const f = document.getElementById('file-upload').files[0];
         const pCount = document.getElementById('page-count').value;
@@ -627,7 +510,6 @@ INDEX_HTML = '''
         if(r.ok) interval = setInterval(checkStatus, 1500); 
         else { const d = await r.json(); alert("Upload failed: " + d.message); location.reload(); }
     }
-    
     async function checkStatus() {
         try {
             const r = await fetch(`/status?sid=${sid}`); const d = await r.json();
@@ -635,22 +517,15 @@ INDEX_HTML = '''
             if(d.progress >= 100) { clearInterval(interval); document.getElementById('upload-container').style.display='none'; document.getElementById('editor-container').style.display='block'; loadNewComic(); }
         } catch(e) {}
     }
-    
     async function loadNewComic() {
         const r = await fetch(`/output/pages.json?sid=${sid}`);
         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
-            }))
+            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 }))
         }));
-        renderFromState(cleanData);
-        saveState();
+        renderFromState(cleanData); saveState();
     }
-
     function renderFromState(pagesData) {
         const con = document.getElementById('comic-container'); con.innerHTML = '';
         pagesData.forEach((page, pageIdx) => {
@@ -658,7 +533,6 @@ INDEX_HTML = '''
             pageWrapper.innerHTML = `<h2 class="page-title">Page ${pageIdx + 1}</h2>`;
             const div = document.createElement('div'); div.className = 'comic-page';
             const grid = document.createElement('div'); grid.className = 'comic-grid';
-            
             page.panels.forEach((pan, idx) => {
                 const pDiv = document.createElement('div'); pDiv.className = 'panel';
                 const img = document.createElement('img');
@@ -668,36 +542,18 @@ INDEX_HTML = '''
                 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'));
-            
-            if(page.bubbles) {
-                page.bubbles.forEach((bData, bIdx) => {
-                    // Only append valid bubbles, ignore dummies
-                    if(bData.text) {
-                        const b = createBubbleHTML(bData); 
-                        grid.appendChild(b);
-                    }
-                });
-            }
-            
+            if(page.bubbles) { page.bubbles.forEach((bData, bIdx) => { if(bData.text) { const b = createBubbleHTML(bData); grid.appendChild(b); } }); }
             div.appendChild(grid); pageWrapper.appendChild(div); con.appendChild(pageWrapper);
         });
     }
-    
-    function createHandle(cls, grid, varName) {
-        let h = document.createElement('div'); h.className = `handle ${cls}`;
-        h.onmousedown = (e) => { e.stopPropagation(); dragType = 'handle'; activeObj = { grid: grid, var: varName }; };
-        return h;
-    }
-    
+    function createHandle(cls, grid, varName) { let h = document.createElement('div'); h.className = `handle ${cls}`; h.onmousedown = (e) => { e.stopPropagation(); dragType = 'handle'; activeObj = { grid: grid, var: varName }; }; return h; }
     function createBubbleHTML(data) {
         const b = document.createElement('div');
         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;
@@ -705,43 +561,22 @@ 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') { 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'; 
         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);
-        
-        // 🎯 DRAG FIX: Stop propagation to prevent selecting panel behind it
-        b.onmousedown = (e) => { 
-            if(e.target === resizer) return; 
-            e.stopPropagation(); 
-            e.preventDefault(); // Stop text selection
-            selectBubble(b); 
-            dragType = 'bubble'; 
-            activeObj = b; 
-            
-            // Calculate offset so we drag from clicked point, not top-left jump
-            dragStart = {
-                x: e.clientX - b.getBoundingClientRect().left,
-                y: e.clientY - b.getBoundingClientRect().top
-            };
-        };
+        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;
     }
-    
     function editBubbleText(bubble) {
         const textSpan = bubble.querySelector('.bubble-text'); 
         const newText = prompt("Edit Text:", textSpan.textContent);
         if(newText !== null) { textSpan.textContent = newText; saveState(); }
     }
-    
-    // --- GLOBAL MOUSE EVENTS ---
     document.addEventListener('mousemove', (e) => {
         if(!dragType) return;
-        
         if(dragType === 'handle') {
             const rect = activeObj.grid.getBoundingClientRect();
             let x = (e.clientX - rect.left) / rect.width * 100;
@@ -753,41 +588,20 @@ INDEX_HTML = '''
             img.dataset.translateY = parseFloat(img.dataset.translateY) + dy;
             updateImageTransform(img); dragStart = {x: e.clientX, y: e.clientY};
         } else if(dragType === 'bubble') {
-            // Correct parent-relative positioning
-            const parentRect = activeObj.parentElement.getBoundingClientRect();
-            let newX = e.clientX - parentRect.left - dragStart.x;
-            let newY = e.clientY - parentRect.top - dragStart.y;
-            
-            activeObj.style.left = newX + 'px';
-            activeObj.style.top = newY + 'px';
+            const rect = activeObj.parentElement.getBoundingClientRect();
+            activeObj.style.left = (e.clientX - rect.left - (activeObj.offsetWidth/2)) + 'px';
+            activeObj.style.top = (e.clientY - rect.top - (activeObj.offsetHeight/2)) + 'px';
         } else if(dragType === 'resize') {
             const dx = e.clientX - activeObj.mx; const dy = e.clientY - activeObj.my;
             activeObj.b.style.width = (activeObj.startW + dx) + 'px';
             activeObj.b.style.height = (activeObj.startH + dy) + 'px';
         }
     });
-    
-    document.addEventListener('mouseup', () => { 
-        if(activeObj && activeObj.classList) activeObj.classList.remove('panning');
-        if(dragType) saveState();
-        dragType = null; activeObj = null; 
-    });
-    
-    function selectBubble(el) { 
-        if(selectedBubble) selectedBubble.classList.remove('selected'); 
-        selectedBubble = el; el.classList.add('selected'); 
-        document.getElementById('bubble-type').value = el.dataset.type;
-        document.getElementById('font-select').value = el.style.fontFamily || "'Comic Neue', cursive";
-    }
-    function selectPanel(el) { 
-        if(selectedPanel) selectedPanel.classList.remove('selected'); 
-        selectedPanel = el; el.classList.add('selected');
-        document.getElementById('zoom-slider').disabled = false;
-        document.getElementById('zoom-slider').value = el.querySelector('img').dataset.zoom;
-    }
+    document.addEventListener('mouseup', () => { if(activeObj && activeObj.classList) activeObj.classList.remove('panning'); if(dragType) saveState(); dragType = null; activeObj = null; });
+    function selectBubble(el) { if(selectedBubble) selectedBubble.classList.remove('selected'); selectedBubble = el; el.classList.add('selected'); document.getElementById('bubble-type').value = el.dataset.type; document.getElementById('font-select').value = el.style.fontFamily || "'Comic Neue', cursive"; }
+    function selectPanel(el) { if(selectedPanel) selectedPanel.classList.remove('selected'); selectedPanel = el; el.classList.add('selected'); document.getElementById('zoom-slider').disabled = false; document.getElementById('zoom-slider').value = el.querySelector('img').dataset.zoom; }
     function addBubble() { const grid = document.querySelector('.comic-grid'); if(grid) { const b = createBubbleHTML({ text: "Text", left: "50%", top: "50%" }); grid.appendChild(b); selectBubble(b); saveState(); } }
     function deleteBubble() { if(selectedBubble) { selectedBubble.remove(); selectedBubble=null; saveState(); } }
-    
     function updateBubbleType() {
         if(!selectedBubble) return;
         const type = document.getElementById('bubble-type').value;
@@ -798,23 +612,38 @@ INDEX_HTML = '''
             type: type, font: oldB.style.fontFamily,
             colors: { fill: oldB.style.getPropertyValue('--bubble-fill'), text: oldB.style.getPropertyValue('--bubble-text') },
             tailPos: oldB.style.getPropertyValue('--tail-pos'),
-            classes: oldB.className // Pass existing classes
+            classes: oldB.className 
         };
         const newB = createBubbleHTML(data);
         oldB.parentElement.replaceChild(newB, oldB);
         selectBubble(newB); saveState();
     }
+    function updateColors() { if(!selectedBubble) return; selectedBubble.style.setProperty('--bubble-fill', document.getElementById('bub-fill').value); selectedBubble.style.setProperty('--bubble-text', document.getElementById('bub-text').value); saveState(); }
+    function updateFont() { if(selectedBubble) { selectedBubble.style.fontFamily = document.getElementById('font-select').value; saveState(); } }
+    function slideTail(val) { if(selectedBubble) { selectedBubble.style.setProperty('--tail-pos', val+'%'); saveState(); } }
     
-    function updateColors() {
+    // 🎯 NEW ROTATE TAIL FUNCTION
+    function rotateTail() {
         if(!selectedBubble) return;
-        selectedBubble.style.setProperty('--bubble-fill', document.getElementById('bub-fill').value);
-        selectedBubble.style.setProperty('--bubble-text', document.getElementById('bub-text').value);
+        const type = selectedBubble.dataset.type;
+        
+        if(type === 'speech') {
+            const positions = ['tail-bottom', 'tail-right', 'tail-top', 'tail-left'];
+            // Find current class match
+            let current = positions.find(pos => selectedBubble.classList.contains(pos)) || 'tail-bottom';
+            selectedBubble.classList.remove(current);
+            // Cycle
+            let nextIndex = (positions.indexOf(current) + 1) % 4;
+            selectedBubble.classList.add(positions[nextIndex]);
+        } 
+        else if (type === 'thought') {
+            // Logic for thought bubble (flipping dots) if needed, or simple rotation
+            // For now, let's allow thought bubbles to use the same tail classes if CSS supports it, 
+            // or just flip positions.
+        }
         saveState();
     }
-    
-    function updateFont() { if(selectedBubble) { selectedBubble.style.fontFamily = document.getElementById('font-select').value; saveState(); } }
-    function slideTail(val) { if(selectedBubble) { selectedBubble.style.setProperty('--tail-pos', val+'%'); saveState(); } }
-    
+
     function handleZoom(val) { if(selectedPanel) { const img = selectedPanel.querySelector('img'); img.dataset.zoom = val; updateImageTransform(img); saveState(); } }
     function updateImageTransform(img) { const z = (img.dataset.zoom||100)/100, x = img.dataset.translateX||0, y = img.dataset.translateY||0; img.style.transform = `translateX(${x}px) translateY(${y}px) scale(${z})`; }
     function resetPanelTransform() { if(selectedPanel) { const img = selectedPanel.querySelector('img'); img.dataset.zoom=100; img.dataset.translateX=0; img.dataset.translateY=0; updateImageTransform(img); document.getElementById('zoom-slider').value=100; saveState(); } }
@@ -841,6 +670,18 @@ 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');
@@ -871,7 +712,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, 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, 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 => {
@@ -897,8 +738,7 @@ def upload():
     if not sid: return jsonify({'success': False, 'message': 'Missing session ID'}), 400
     
     file = request.files.get('file')
-    if not file or file.filename == '':
-         return jsonify({'success': False, 'message': 'No file uploaded'}), 400
+    if not file or file.filename == '': return jsonify({'success': False, 'message': 'No file uploaded'}), 400
     
     target_pages = request.form.get('target_pages', 4)
     gen = EnhancedComicGenerator(sid)
@@ -933,6 +773,23 @@ def regen():
     gen = EnhancedComicGenerator(sid)
     return jsonify(regen_frame_gpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], d['direction']))
 
+@app.route('/goto_timestamp', methods=['POST'])
+def go_time():
+    sid = request.args.get('sid')
+    d = request.get_json()
+    gen = EnhancedComicGenerator(sid)
+    return jsonify(get_frame_at_ts_gpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], float(d['timestamp'])))
+
+@app.route('/replace_panel', methods=['POST'])
+def rep_panel():
+    sid = request.args.get('sid')
+    f = request.files['image']
+    frames_dir = os.path.join(BASE_USER_DIR, sid, 'frames')
+    os.makedirs(frames_dir, exist_ok=True)
+    fname = f"replaced_{int(time.time() * 1000)}.png"
+    f.save(os.path.join(frames_dir, fname))
+    return jsonify({'success': True, 'new_filename': fname})
+
 @app.route('/save_comic', methods=['POST'])
 def save_comic():
     sid = request.args.get('sid')
@@ -941,49 +798,31 @@ def save_comic():
         save_code = generate_save_code()
         save_dir = os.path.join(SAVED_COMICS_DIR, save_code)
         os.makedirs(save_dir, exist_ok=True)
-        
         user_frames_dir = os.path.join(BASE_USER_DIR, sid, 'frames')
         saved_frames_dir = os.path.join(save_dir, 'frames')
-        
         if os.path.exists(user_frames_dir):
             if os.path.exists(saved_frames_dir): shutil.rmtree(saved_frames_dir)
             shutil.copytree(user_frames_dir, saved_frames_dir)
-        
-        save_data = {
-            'code': save_code,
-            'originalSid': sid,
-            'pages': data.get('pages', []),
-            'savedAt': data.get('savedAt', time.strftime('%Y-%m-%d %H:%M:%S'))
-        }
-        with open(os.path.join(save_dir, 'comic_state.json'), 'w') as f: json.dump(save_data, f, indent=2)
+        with open(os.path.join(save_dir, 'comic_state.json'), 'w') as f:
+            json.dump({'originalSid': sid, 'pages': data['pages'], 'savedAt': time.time()}, f)
         return jsonify({'success': True, 'code': save_code})
-    except Exception as e:
-        traceback.print_exc()
-        return jsonify({'success': False, 'message': str(e)})
+    except Exception as e: return jsonify({'success': False, 'message': str(e)})
 
 @app.route('/load_comic/<code>')
 def load_comic(code):
     code = code.upper()
     save_dir = os.path.join(SAVED_COMICS_DIR, code)
-    state_file = os.path.join(save_dir, 'comic_state.json')
-    
-    if not os.path.exists(state_file): return jsonify({'success': False, 'message': 'Code not found'})
-    
+    if not os.path.exists(save_dir): return jsonify({'success': False, 'message': 'Code not found'})
     try:
-        with open(state_file, 'r') as f: save_data = json.load(f)
-        original_sid = save_data.get('originalSid')
-        saved_frames_dir = os.path.join(save_dir, 'frames')
-        if original_sid and os.path.exists(saved_frames_dir):
-            user_frames_dir = os.path.join(BASE_USER_DIR, original_sid, 'frames')
-            os.makedirs(user_frames_dir, exist_ok=True)
-            for fname in os.listdir(saved_frames_dir):
-                src = os.path.join(saved_frames_dir, fname)
-                dst = os.path.join(user_frames_dir, fname)
-                if not os.path.exists(dst): shutil.copy2(src, dst)
-        return jsonify({ 'success': True, 'pages': save_data.get('pages', []), 'originalSid': original_sid, 'savedAt': save_data.get('savedAt') })
-    except Exception as e:
-        traceback.print_exc()
-        return jsonify({'success': False, 'message': str(e)})
+        with open(os.path.join(save_dir, 'comic_state.json'), 'r') as f: data = json.load(f)
+        orig_sid = data['originalSid']
+        saved_frames = os.path.join(save_dir, 'frames')
+        user_frames = os.path.join(BASE_USER_DIR, orig_sid, 'frames')
+        os.makedirs(user_frames, exist_ok=True)
+        for fn in os.listdir(saved_frames):
+            shutil.copy2(os.path.join(saved_frames, fn), os.path.join(user_frames, fn))
+        return jsonify({'success': True, 'originalSid': orig_sid, 'pages': data['pages']})
+    except Exception as e: return jsonify({'success': False, 'message': str(e)})
 
 if __name__ == '__main__':
     try: gpu_warmup()