Fix: scrape URLs on rewrite, in-app links, natural AI, persistent check"

ai_runtime_patch_fast.py

@@ -1,207 +1,196 @@
-"""Patch: persistent data, single ask AI box, working rewrite, Qwen AI answers."""
+"""Patch: scrape source URLs on rewrite, in-app article links, natural AI chat, persistent data."""
 import re, threading, time, json, os, asyncio
 import ai_runtime_final6 as f6
 from ai_runtime_final6 import app, rt, f5, HTMLResponse, JSONResponse, Request, Query
 import html as html_lib
+from urllib.parse import urlparse
 
 def clean(s):return re.sub(r"\s+"," ",html_lib.unescape(str(s or ""))).strip()
+def _domain(u):
+    try:return urlparse(u or '').netloc.replace('www.','')
+    except:return ''
 
-# === PERSISTENT STORAGE ===
-# HF Spaces with persistent storage mount /data. Without it, use /app/data (lost on rebuild).
-# To survive rebuild: Space Settings → enable Persistent Storage.
 DATA_DIR="/data" if os.path.isdir('/data') else "/app/data"
 os.makedirs(DATA_DIR,exist_ok=True)
 SHORT_COMMENTS_FILE=os.path.join(DATA_DIR,'short_comments.json')
-# AI wall file is managed by f5.base (ai_ext.py) which uses /data/ai_wall_posts.json if /data exists.
-# We just need to ensure the directory exists.
 TTL_24H=86400
+HAS_PERSISTENT=os.path.isdir('/data')
 
 def _load_json(path,default):
     try:
         if os.path.exists(path):
             with open(path,'r',encoding='utf-8') as f:return json.load(f)
-    except Exception:pass
+    except:pass
     return default
 def _save_json(path,data):
     try:
         os.makedirs(os.path.dirname(path),exist_ok=True);tmp=path+'.tmp'
         with open(tmp,'w',encoding='utf-8') as f:json.dump(data,f,ensure_ascii=False)
         os.replace(tmp,path)
-    except Exception:pass
+    except:pass
 
 def _cleanup_old_posts():
     now=int(time.time());posts=f5.base._load_ai_wall()
     fresh=[p for p in posts if now-int(p.get('ts') or 0)<TTL_24H]
     if len(fresh)<len(posts):f5.base._save_ai_wall(fresh)
 
-# ===== BACKGROUND PREFETCH =====
-_bg_home_cache={"t":0,"d":[]};_bg_shorts_cache={"t":0,"d":[]};_bg_loading=False
+def _scrape_url_text(url,max_chars=8000):
+    """Scrape full article text from a URL."""
+    try:
+        data=f5.base.scrape_any_url(url)
+        return (data.get('title',''),((data.get('summary','')+'\n'+data.get('text','')).strip())[:max_chars],data.get('image') or data.get('og_image') or '')
+    except:return ('','','')
+
+# ===== BACKGROUND =====
+_bg_home={"t":0,"d":[]};_bg_shorts={"t":0,"d":[]};_bg_lock=False
 def _bg_refresh():
-    global _bg_loading
-    if _bg_loading:return
-    _bg_loading=True
+    global _bg_lock
+    if _bg_lock:return
+    _bg_lock=True
     try:
         if hasattr(f6,'_fast_homepage'):
-            data=f6._fast_homepage()
-            if data:_bg_home_cache.update({"t":time.time(),"d":data})
+            d=f6._fast_homepage()
+            if d:_bg_home.update({"t":time.time(),"d":d})
         raw=[]
         for h in f6.YOUTUBE_HANDLES:raw.extend(f6._yt_ytdlp(h,20) or f6._yt_html(h,20))
         raw.extend(f6._fallback_shorts());seen=set();out=[]
         for v in raw:
             vid=v.get('id') or ''
             if vid and vid not in seen:seen.add(vid);out.append(v)
-        if out:_bg_shorts_cache.update({"t":time.time(),"d":out[:40]})
+        if out:_bg_shorts.update({"t":time.time(),"d":out[:40]})
         _cleanup_old_posts()
-    except Exception:pass
-    finally:_bg_loading=False
-
+    except:pass
+    finally:_bg_lock=False
 @app.on_event("startup")
-async def startup_prefetch():threading.Thread(target=_bg_refresh,daemon=True).start()
-def _periodic():
+async def _startup():threading.Thread(target=_bg_refresh,daemon=True).start()
+def _loop():
     while True:time.sleep(600);_bg_refresh()
-threading.Thread(target=_periodic,daemon=True).start()
+threading.Thread(target=_loop,daemon=True).start()
 
-# ===== OVERRIDE ENDPOINTS =====
+# ===== ENDPOINTS =====
 app.router.routes=[r for r in app.router.routes if not (
-    (getattr(r,'path',None)=='/api/homepage' and 'GET' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/api/shorts' and 'GET' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/api/topic_post' and 'POST' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/api/short/comments' and 'GET' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/api/short/comment' and 'POST' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/api/article/ask' and 'POST' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/api/topic/rewrite' and 'POST' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/api/rewrite_share' and 'POST' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/api/url_wall' and 'POST' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/api/ai_wall' and 'GET' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/' and 'GET' in getattr(r,'methods',set()))
+    (getattr(r,'path',None) in ('/api/homepage','/api/shorts','/api/ai_wall','/api/topic_post','/api/article/ask','/api/topic/rewrite','/api/rewrite_share','/api/url_wall','/api/short/comments','/api/short/comment','/api/storage_status','/') and any(m in getattr(r,'methods',set()) for m in ('GET','POST')))
 )]
 
 @app.get('/api/homepage')
-def api_homepage_instant():
+def _homepage():
     now=time.time()
-    if _bg_home_cache['d']:
-        if now-_bg_home_cache['t']>300:threading.Thread(target=_bg_refresh,daemon=True).start()
-        return JSONResponse(_bg_home_cache['d'])
+    if _bg_home['d']:
+        if now-_bg_home['t']>300:threading.Thread(target=_bg_refresh,daemon=True).start()
+        return JSONResponse(_bg_home['d'])
     if hasattr(f6,'_fast_homepage'):
-        data=f6._fast_homepage()
-        if data:_bg_home_cache.update({"t":now,"d":data});return JSONResponse(data)
+        d=f6._fast_homepage()
+        if d:_bg_home.update({"t":now,"d":d});return JSONResponse(d)
     return JSONResponse([])
 
 @app.get('/api/shorts')
-def api_shorts_instant(refresh:int=Query(default=0)):
+def _shorts(refresh:int=Query(default=0)):
     now=time.time()
-    if _bg_shorts_cache['d'] and (not refresh or now-_bg_shorts_cache['t']<120):
-        if now-_bg_shorts_cache['t']>600:threading.Thread(target=_bg_refresh,daemon=True).start()
-        return JSONResponse(_bg_shorts_cache['d'])
+    if _bg_shorts['d'] and (not refresh or now-_bg_shorts['t']<120):
+        if now-_bg_shorts['t']>600:threading.Thread(target=_bg_refresh,daemon=True).start()
+        return JSONResponse(_bg_shorts['d'])
     if hasattr(f6,'api_shorts_final6'):return f6.api_shorts_final6(refresh=refresh)
     return JSONResponse([])
 
 @app.get('/api/ai_wall')
-def api_ai_wall_with_ttl():
+def _ai_wall():
     now=int(time.time());posts=f5.base._load_ai_wall()
     fresh=[p for p in posts if now-int(p.get('ts') or 0)<TTL_24H]
-    return JSONResponse({'posts':fresh})
+    return JSONResponse({'posts':fresh,'persistent':HAS_PERSISTENT})
+
+@app.get('/api/storage_status')
+def _storage():return JSONResponse({'persistent':HAS_PERSISTENT,'data_dir':DATA_DIR})
 
-# ===== SHORT COMMENTS =====
 @app.get('/api/short/comments')
-def get_short_comments(id:str=Query(...)):
-    db=_load_json(SHORT_COMMENTS_FILE,{});return JSONResponse({'comments':db.get(id,[])})
+def _get_cmts(id:str=Query(...)):return JSONResponse({'comments':_load_json(SHORT_COMMENTS_FILE,{}).get(id,[])})
 
 @app.post('/api/short/comment')
-async def post_short_comment(request:Request):
+async def _post_cmt(request:Request):
     body=await request.json();vid=str(body.get('id','')).strip();text=clean(body.get('text',''))
-    if not vid or not text:return JSONResponse({'error':'missing id or text'},status_code=400)
-    db=_load_json(SHORT_COMMENTS_FILE,{});comments=db.get(vid,[]);comments.insert(0,{'text':text[:300],'ts':int(time.time())})
-    db[vid]=comments[:100];_save_json(SHORT_COMMENTS_FILE,db);return JSONResponse({'comments':db[vid]})
+    if not vid or not text:return JSONResponse({'error':'missing'},status_code=400)
+    db=_load_json(SHORT_COMMENTS_FILE,{});c=db.get(vid,[]);c.insert(0,{'text':text[:300],'ts':int(time.time())})
+    db[vid]=c[:100];_save_json(SHORT_COMMENTS_FILE,db);return JSONResponse({'comments':db[vid]})
 
-# ===== ASK AI — uses Qwen model =====
+# ===== ASK AI — truly conversational =====
 @app.post('/api/article/ask')
-async def article_ask(request:Request):
-    body=await request.json();url=clean(body.get('url',''));question=clean(body.get('question',''));context=clean(body.get('context',''))
-    if not question:return JSONResponse({'error':'missing question'},status_code=400)
+async def _ask(request:Request):
+    body=await request.json();url=clean(body.get('url',''));q=clean(body.get('question',''));ctx=clean(body.get('context',''))
+    if not q:return JSONResponse({'error':'missing question'},status_code=400)
     title='';raw=''
     if url:
-        try:
-            data=f5.base.scrape_any_url(url) if hasattr(f5.base,'scrape_any_url') else None
-            if data:title=data.get('title','');raw=(data.get('summary','')+'\n'+data.get('text','')).strip()
-        except Exception:pass
-    if not raw and context:raw=context[:12000]
-    if not raw:raw=question
-    prompt=f"""Bạn là trợ lý thông minh VNEWS. Người dùng đang đọc bài viết/xem video và hỏi bạn.
-
-Nội dung bài:
----
-Tiêu đề: {title}
-{raw[:10000]}
----
+        title,raw,_=_scrape_url_text(url,10000)
+    if not raw and ctx:raw=ctx[:12000]
+    prompt=f"""Bạn tên là VNEWS AI, một người bạn thông minh và am hiểu. Người dùng đang đọc bài viết/xem video và hỏi bạn một câu.
+
+Đây là nội dung họ đang xem:
+"{title}"
+{raw[:9000]}
 
-Câu hỏi: {question}
+Họ hỏi: "{q}"
 
-Trả lời tự nhiên, thân thiện bằng tiếng Việt:
-- Dựa vào nội dung bài làm cơ sở chính
-- Giải thích dễ hiểu như đang trò chuyện
-- Nếu câu hỏi mở rộng hơn bài → bổ sung kiến thức chung, nói rõ "theo hiểu biết chung..."
+Hãy trả lời như một người bạn đang giải thích cho người khác nghe — tự nhiên, dễ hiểu, có chiều sâu. Đừng nói kiểu robot hay liệt kê khô khan. Nếu bài không nói đến phần họ hỏi, bạn vẫn có thể chia sẻ kiến thức của mình nhưng nói rõ "theo mình biết thêm thì..." Trả lời bằng tiếng Việt.
 """
     ans=await f5.base.qwen_generate(prompt,max_tokens=1200)
-    if not ans:ans='AI chưa trả lời được. Kiểm tra HF_TOKEN trong Space Settings → Secrets.'
+    if not ans:ans='Mình chưa trả lời được lúc này. Bạn thử hỏi lại nhé!'
     return JSONResponse({'answer':ans,'title':title})
 
-# ===== REWRITE — works for both regular articles and topic posts =====
+# ===== REWRITE — scrape source URLs for full content =====
 @app.post('/api/rewrite_share')
 @app.post('/api/url_wall')
-async def rewrite_url(request:Request):
+async def _rewrite_url(request:Request):
     body=await request.json();url=clean(body.get('url',''))
     if not url.startswith('http'):return JSONResponse({'error':'URL không hợp lệ'},status_code=400)
-    title='';raw=''
-    try:
-        data=f5.base.scrape_any_url(url) if hasattr(f5.base,'scrape_any_url') else None
-        if data:title=data.get('title','');raw=(data.get('summary','')+'\n'+data.get('text','')).strip()
-    except Exception as e:
-        return JSONResponse({'error':'Không đọc được URL: '+str(e)[:150]},status_code=422)
-    if len(raw)<100:return JSONResponse({'error':'URL không có đủ nội dung'},status_code=422)
-    img=(data.get('image') or data.get('og_image') or '') if data else ''
-    prompt=f"""Tóm tắt bài viết sau đăng lên Tường AI VNEWS.
+    title,raw,img=_scrape_url_text(url,14000)
+    if len(raw)<100:return JSONResponse({'error':'Không đọc được bài viết từ URL này'},status_code=422)
+    prompt=f"""Tóm tắt bài viết sau để đăng Tường AI:
 
 Tiêu đề: {title}
 Nội dung:
 {raw[:14000]}
 
-Yêu cầu:
-- Tóm tắt ngắn gọn, cụ thể, 4-6 ý chính.
-- Không lặp ý, không bịa.
-- Cuối bài ghi nguồn.
+Yêu cầu: tóm tắt 4-6 ý chính, tự nhiên, không bịa. Cuối ghi nguồn.
 """
     text=None
     try:text=await asyncio.wait_for(f5.base.qwen_generate(prompt,image_url=img or None,max_tokens=1000),timeout=30)
-    except Exception:text=None
-    if not text or len(text)<100:
-        text=f"Tóm tắt: {title}\n\n{raw[:1200]}\n\nNguồn: {url}"
-    from urllib.parse import urlparse
-    via=urlparse(url).netloc.replace('www.','')
-    post=f5.base.make_post(title or 'Bài viết',text,img,url,'rewrite',sources=[{'title':title,'url':url,'via':via}])
+    except:pass
+    if not text or len(text)<100:text=f"Tóm tắt: {title}\n\n{raw[:1200]}\n\nNguồn: {_domain(url)}"
+    post=f5.base.make_post(title or 'Bài viết',text,img,url,'rewrite',sources=[{'title':title,'url':url,'via':_domain(url)}])
     posts=f5.base._load_ai_wall();posts.insert(0,post);f5.base._save_ai_wall(posts)
     return JSONResponse({'post':post})
 
 @app.post('/api/topic/rewrite')
-async def topic_rewrite(request:Request):
+async def _topic_rewrite(request:Request):
+    """Rewrite topic post by RE-SCRAPING all source URLs for fresh full content."""
     body=await request.json();post_id=str(body.get('post_id','')).strip()
     if not post_id:return JSONResponse({'error':'missing post_id'},status_code=400)
     posts=f5.base._load_ai_wall();p=next((x for x in posts if str(x.get('id'))==post_id),None)
     if not p:return JSONResponse({'error':'Không tìm thấy bài.'},status_code=404)
-    all_content=(p.get('text') or '')
-    for s in (p.get('source_details') or []):all_content+='\n\n'+s.get('content','')
+    # Collect URLs from source_details and sources
+    urls=[]
+    for s in (p.get('source_details') or []):
+        if s.get('url'):urls.append(s['url'])
+    for s in (p.get('sources') or []):
+        if s.get('url') and s['url'] not in urls:urls.append(s['url'])
+    # Scrape all source URLs for FULL content
+    scraped_parts=[]
+    for u in urls[:5]:
+        t,raw,_=_scrape_url_text(u,6000)
+        if raw and len(raw)>200:
+            scraped_parts.append(f"NGUỒN: {_domain(u)}\nTIÊU ĐỀ: {t}\n{raw}")
+    all_content='\n\n---\n\n'.join(scraped_parts) if scraped_parts else (p.get('text') or '')
     title=p.get('title') or 'Bài viết'
-    prompt=f"""Viết lại nội dung sau thành bản tóm tắt mới, hấp dẫn, đăng Tường AI.
+    prompt=f"""Viết lại thành bản tóm tắt mới hấp dẫn từ các nguồn sau:
 
-Tiêu đề gốc: {title}
-Nội dung:
+Chủ đề gốc: {title}
+
+Nội dung các nguồn đã scrape:
 {all_content[:16000]}
 
-Yêu cầu: tiêu đề mới + 3-5 ý chính + nguồn tham khảo.
+Yêu cầu: tiêu đề mới hấp dẫn + 4-6 ý chính tổng hợp + nguồn tham khảo cuối bài.
 """
     text=None
-    try:text=await asyncio.wait_for(f5.base.qwen_generate(prompt,image_url=p.get('img'),max_tokens=1200),timeout=30)
-    except Exception:text=None
+    try:text=await asyncio.wait_for(f5.base.qwen_generate(prompt,image_url=p.get('img'),max_tokens=1200),timeout=35)
+    except:pass
     if not text or len(text)<150:text=f"Tóm tắt: {title}\n\n{all_content[:1500]}\n\nNguồn: VNEWS AI"
     new_post=f5.base.make_post('Rewrite: '+title,text,p.get('img',''),'','rewrite_topic',sources=p.get('sources',[]))
     new_post['images']=p.get('images',[])
@@ -210,7 +199,7 @@ Yêu cầu: tiêu đề mới + 3-5 ý chính + nguồn tham khảo.
 
 # ===== TOPIC POST =====
 @app.post('/api/topic_post')
-async def topic_post_focused(request:Request):
+async def _topic(request:Request):
     body=await request.json();topic=clean(body.get('topic',''))
     if not topic:return JSONResponse({'error':'missing topic'},status_code=400)
     img=f6._topic_image(topic)
@@ -219,16 +208,16 @@ async def topic_post_focused(request:Request):
     details=f6._extract_source_details_from_context(context,sources) if hasattr(f6,'_extract_source_details_from_context') else []
     if not context or not sources:return JSONResponse({'error':'Không tìm được nội dung. Thử chủ đề cụ thể hơn.'},status_code=422)
     source_brief='\n\n'.join([f"[{i+1}] {d.get('title','')} ({d.get('via','')})\n{d.get('content','')[:1400]}" for i,d in enumerate(details)]) if details else context[:18000]
-    prompt=f"""Viết MỘT BÀI VIẾT tiếng Việt VỀ ĐÚNG CHỦ ĐỀ: "{topic}"
+    prompt=f"""Viết bài tiếng Việt VỀ ĐÚNG CHỦ ĐỀ: "{topic}"
 
 NGUỒN:
 {source_brief[:18000]}
 
-QUY TẮC: CHỈ viết về "{topic}". Tiêu đề chứa "{topic}". 5-8 đoạn. Cuối bài có nguồn.
+CHỈ viết về "{topic}". Tiêu đề chứa "{topic}". 5-8 đoạn. Cuối có nguồn.
 """
     text=None
     try:text=await asyncio.wait_for(f5.base.qwen_generate(prompt,image_url=img,max_tokens=1700),timeout=35)
-    except Exception:text=None
+    except:pass
     if not text or len(text)<300:
         bullets='\n'.join([f"• {d['title']}: {d.get('content','')[:300]}" for d in (details or [])[:6]])
         vias=', '.join(sorted({d.get('via','') for d in (details or []) if d.get('via')}))
@@ -238,18 +227,21 @@ QUY TẮC: CHỈ viết về "{topic}". Tiêu đề chứa "{topic}". 5-8 đoạ
     posts=f5.base._load_ai_wall();posts.insert(0,post);f5.base._save_ai_wall(posts)
     return JSONResponse({'post':post})
 
-# ===== FRONTEND — single ask box, working rewrite =====
+# ===== FRONTEND =====
 PATCH_INJECT=r'''
-<style>.short-cmt-panel{position:fixed;bottom:0;left:0;right:0;max-height:55vh;background:#181818;border-radius:16px 16px 0 0;z-index:99999;padding:14px;display:none;overflow-y:auto}.short-cmt-panel.active{display:block}.short-cmt-panel textarea{width:100%;background:#222;border:1px solid #444;color:#eee;border-radius:10px;padding:9px;margin:6px 0;min-height:60px}.short-cmt-panel button{background:#2d8659;border:0;color:#fff;border-radius:10px;padding:8px 12px;margin:4px}.cmt-item{background:#222;border-radius:8px;padding:7px;margin:5px 0;color:#ccc;font-size:12px}.source-detail-box{margin-top:14px;background:#151515;border:1px solid #2b2b2b;border-radius:10px;padding:10px}.source-detail-item{background:#202020;border-radius:8px;padding:9px;margin:7px 0}.source-detail-title{font-size:12px;font-weight:700;color:#eee}.source-detail-content{font-size:12px;color:#bbb;line-height:1.5;white-space:pre-wrap;max-height:160px;overflow:auto}.source-detail-item a{color:#5cb87a;font-size:11px;cursor:pointer}.source-detail-item img{width:100%;aspect-ratio:16/9;object-fit:cover;border-radius:6px;margin-bottom:6px;background:#222}.article-ai-ask{margin-top:12px;background:#141414;border:1px solid #2a2a2a;border-radius:10px;padding:10px}.article-ai-ask textarea{width:100%;min-height:60px;background:#222;border:1px solid #444;color:#eee;border-radius:10px;padding:9px}.article-ai-ask button{background:#2d8659;border:0;color:#fff;border-radius:10px;padding:8px 12px;margin-top:6px}.article-ai-answer{white-space:pre-wrap;color:#ccc;font-size:13px;line-height:1.55;margin-top:8px}</style>
+<style>.short-cmt-panel{position:fixed;bottom:0;left:0;right:0;max-height:55vh;background:#181818;border-radius:16px 16px 0 0;z-index:99999;padding:14px;display:none;overflow-y:auto}.short-cmt-panel.active{display:block}.short-cmt-panel textarea{width:100%;background:#222;border:1px solid #444;color:#eee;border-radius:10px;padding:9px;margin:6px 0;min-height:60px}.short-cmt-panel button{background:#2d8659;border:0;color:#fff;border-radius:10px;padding:8px 12px;margin:4px}.cmt-item{background:#222;border-radius:8px;padding:7px;margin:5px 0;color:#ccc;font-size:12px}.source-detail-box{margin-top:14px;background:#151515;border:1px solid #2b2b2b;border-radius:10px;padding:10px}.source-detail-item{background:#202020;border-radius:8px;padding:9px;margin:7px 0;cursor:pointer}.source-detail-title{font-size:12px;font-weight:700;color:#eee}.source-detail-content{font-size:12px;color:#bbb;line-height:1.5;white-space:pre-wrap;max-height:140px;overflow:auto}.source-detail-item img{width:100%;aspect-ratio:16/9;object-fit:cover;border-radius:6px;margin-bottom:6px;background:#222}.source-read-btn{color:#5cb87a;font-size:11px;margin-top:4px;display:inline-block}.article-ai-ask{margin-top:12px;background:#141414;border:1px solid #2a2a2a;border-radius:10px;padding:10px}.article-ai-ask textarea{width:100%;min-height:60px;background:#222;border:1px solid #444;color:#eee;border-radius:10px;padding:9px}.article-ai-ask button{background:#2d8659;border:0;color:#fff;border-radius:10px;padding:8px 12px;margin-top:6px}.article-ai-answer{white-space:pre-wrap;color:#ccc;font-size:13px;line-height:1.55;margin-top:8px}.storage-warn{background:#332200;border:1px solid #664400;color:#ffcc00;padding:8px 12px;border-radius:8px;font-size:11px;margin:6px 4px}</style>
 <div id="short-cmt-panel" class="short-cmt-panel"></div>
 <script>
 (function(){
 function esc(s){return String(s||'').replace(/[&<>"']/g,m=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[m]));}
 
+// Check persistent storage and warn
+fetch('/api/storage_status').then(r=>r.json()).then(j=>{if(!j.persistent){let home=document.getElementById('view-home');if(home){let w=document.createElement('div');w.className='storage-warn';w.textContent='⚠️ Persistent Storage chưa bật. Bài tường AI và bình luận sẽ mất khi rebuild. Bật trong Space Settings.';home.prepend(w);}}});
+
 function renderSourceDetails(post,container){
 let details=post.source_details||[];if(!details.length)return;
 let box=document.createElement('div');box.className='source-detail-box';
-box.innerHTML='<h3 style="font-size:14px;color:#5cb87a;margin-bottom:8px">📚 Bài viết nguồn</h3>'+details.map((s,i)=>`<div class="source-detail-item"><div class="source-detail-title">${i+1}. ${esc(s.title)}</div><div class="source-detail-content">${esc((s.content||'').slice(0,500))}</div>${s.url?`<a onclick="event.preventDefault();if(typeof readArticle==='function')readArticle('${esc(s.url)}')">📖 Đọc trên VNEWS</a>`:''}</div>`).join('');
+box.innerHTML='<h3 style="font-size:14px;color:#5cb87a;margin-bottom:8px">📚 Bài viết nguồn (nhấn để đọc trên VNEWS)</h3>'+details.map((s,i)=>`<div class="source-detail-item" onclick="if(typeof readArticle==='function'&&'${esc(s.url||'')}')readArticle('${esc(s.url||'')}')"><div class="source-detail-title">${i+1}. ${esc(s.title)}</div><div class="source-detail-content">${esc((s.content||'').slice(0,400))}</div><span class="source-read-btn">📖 Đọc trên VNEWS</span></div>`).join('');
 container.appendChild(box);
 details.forEach((s,i)=>{if(!s.url)return;fetch('/api/article?url='+encodeURIComponent(s.url)).then(r=>r.json()).then(d=>{if(d&&(d.og_image||d.img)){let items=box.querySelectorAll('.source-detail-item');if(items[i]){let img=document.createElement('img');img.src=d.og_image||d.img;img.loading='lazy';img.onerror=function(){this.style.display='none'};items[i].prepend(img);}}}).catch(()=>{});});}
 
@@ -258,55 +250,47 @@ let wall=(await fetch('/api/ai_wall').then(r=>r.json()).catch(()=>({posts:[]})))
 let p=wall[i];if(!p)return;showView('view-article');
 let h=`<button class="back-btn" onclick="switchCat('home')">← Quay lại</button><div class="article-view"><span class="badge badge-ai">AI</span><h1 class="article-title">${esc(p.title)}</h1>${p.img?`<img class="article-img" src="${p.img}">`:''}`;
 h+=`<p class="article-p" style="white-space:pre-wrap">${esc(p.text)}</p>`;
-h+=`<div class="article-actions"><button class="primary" onclick="rewriteTopicPost('${esc(p.id)}')">🤖 Tóm tắt AI đăng tường</button><button onclick="doShare('${esc(p.title)}','${location.origin}','${esc(p.img||'')}')">📤 Chia sẻ</button></div>`;
-h+=`<div class="article-ai-ask"><h3 style="font-size:14px;color:#5cb87a">🤖 Hỏi AI</h3><textarea id="article-ai-q" placeholder="Hỏi về nội dung này..."></textarea><button onclick="askAIWall(${i})">Hỏi</button><div id="article-ai-ans" class="article-ai-answer"></div></div></div>`;
+h+=`<div class="article-actions"><button class="primary" onclick="rewriteTopicPost('${esc(p.id)}')">🤖 Rewrite AI đăng tường</button><button onclick="doShare('${esc(p.title)}','${location.origin}','${esc(p.img||'')}')">📤 Chia sẻ</button></div>`;
+h+=`<div class="article-ai-ask"><h3 style="font-size:14px;color:#5cb87a">🤖 Hỏi AI</h3><textarea id="article-ai-q" placeholder="Hỏi bất cứ gì về nội dung này..."></textarea><button onclick="askAIWall(${i})">Hỏi</button><div id="article-ai-ans" class="article-ai-answer"></div></div></div>`;
 document.getElementById('view-article').innerHTML=h;
 let art=document.querySelector('.article-view');if(art&&p.source_details)renderSourceDetails(p,art);
 window.scrollTo(0,0);}
 window.readAIWallPost=readAIWallPost;window.aiReadWallPatched=window.aiReadWall=window.readWallPost=function(i){readAIWallPost(i)};
 
 window.rewriteTopicPost=async function(postId){
-let btn=event?.target;if(btn){btn.disabled=true;btn.textContent='Đang tóm tắt...';}
-try{let r=await fetch('/api/topic/rewrite',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({post_id:postId})});let j=await r.json();if(!r.ok||j.error)throw new Error(j.error||'Lỗi');alert('Đã tóm tắt và đăng lên Tường AI!');}catch(e){alert('Lỗi: '+e.message)}finally{if(btn){btn.disabled=false;btn.textContent='🤖 Tóm tắt AI đăng tường';}}};
+let btn=event?.target;if(btn){btn.disabled=true;btn.textContent='Đang scrape nguồn & rewrite...';}
+try{let r=await fetch('/api/topic/rewrite',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({post_id:postId})});let j=await r.json();if(!r.ok||j.error)throw new Error(j.error||'Lỗi');alert('Đã scrape lại các nguồn, rewrite và đăng bản mới!');}catch(e){alert('Lỗi: '+e.message)}finally{if(btn){btn.disabled=false;btn.textContent='🤖 Rewrite AI đăng tường';}}};
 
 window.askAIWall=async function(i){
 let q=document.getElementById('article-ai-q')?.value.trim();if(!q)return alert('Nhập câu hỏi');
-document.getElementById('article-ai-ans').textContent='Đang hỏi AI...';
+document.getElementById('article-ai-ans').textContent='Đang hỏi...';
 let wall=(await fetch('/api/ai_wall').then(r=>r.json()).catch(()=>({posts:[]}))).posts||[];
-let p=wall[i]||{};let context=(p.text||'');for(let s of (p.source_details||[]))context+='\n'+s.content;
+let p=wall[i]||{};let context=(p.text||'');for(let s of (p.source_details||[]))context+='\n'+(s.content||'');
 try{let r=await fetch('/api/article/ask',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({question:q,context:context.slice(0,12000)})});let j=await r.json();document.getElementById('article-ai-ans').textContent=j.answer||'Không trả lời được';}catch(e){document.getElementById('article-ai-ans').textContent='Lỗi: '+e.message}};
 
-// Short comments
-window.openShortComments=async function(id){let panel=document.getElementById('short-cmt-panel');let j=await fetch('/api/short/comments?id='+encodeURIComponent(id)).then(r=>r.json()).catch(()=>({comments:[]}));let cmts=j.comments||[];panel.innerHTML=`<h3 style="color:#5cb87a">💬 Bình luận</h3><div id="cmt-list">${cmts.map(c=>`<div class="cmt-item">${esc(c.text)}</div>`).join('')||'<div class="cmt-item" style="color:#777">Chưa có</div>'}</div><textarea id="cmt-text" placeholder="Bình luận..."></textarea><button onclick="submitShortCmt('${esc(id)}')">Gửi</button><button onclick="document.getElementById('short-cmt-panel').classList.remove('active')">Đóng</button>`;panel.classList.add('active');}
-window.submitShortCmt=async function(id){let text=document.getElementById('cmt-text')?.value.trim();if(!text)return;let j=await fetch('/api/short/comment',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({id,text})}).then(r=>r.json()).catch(()=>({comments:[]}));document.getElementById('cmt-list').innerHTML=(j.comments||[]).map(c=>`<div class="cmt-item">${esc(c.text)}</div>`).join('');document.getElementById('cmt-text').value='';}
+window.openShortComments=async function(id){let panel=document.getElementById('short-cmt-panel');let j=await fetch('/api/short/comments?id='+encodeURIComponent(id)).then(r=>r.json()).catch(()=>({comments:[]}));panel.innerHTML=`<h3 style="color:#5cb87a">💬 Bình luận</h3><div id="cmt-list">${(j.comments||[]).map(c=>`<div class="cmt-item">${esc(c.text)}</div>`).join('')||'<div class="cmt-item" style="color:#777">Chưa có</div>'}</div><textarea id="cmt-text" placeholder="Bình luận..."></textarea><button onclick="submitShortCmt('${esc(id)}')">Gửi</button><button onclick="document.getElementById('short-cmt-panel').classList.remove('active')">Đóng</button>`;panel.classList.add('active');}
+window.submitShortCmt=async function(id){let t=document.getElementById('cmt-text')?.value.trim();if(!t)return;let j=await fetch('/api/short/comment',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({id,text:t})}).then(r=>r.json()).catch(()=>({comments:[]}));document.getElementById('cmt-list').innerHTML=(j.comments||[]).map(c=>`<div class="cmt-item">${esc(c.text)}</div>`).join('');document.getElementById('cmt-text').value='';}
+function patchShortBtns(){document.querySelectorAll('.tiktok-slide').forEach(sl=>{if(sl.dataset.cmtDone)return;sl.dataset.cmtDone='1';let id=sl.dataset.id||'';if(!id)return;let r=sl.querySelector('.tiktok-right,.short-action-panel');if(!r||r.querySelector('[data-cmt]'))return;let b=document.createElement('button');b.className='short-action-btn';b.setAttribute('data-cmt','1');b.innerHTML='<div class="ico" style="width:42px;height:42px;border-radius:50%;background:rgba(0,0,0,.45);display:flex;align-items:center;justify-content:center;font-size:20px">💬</div>';b.onclick=function(e){e.stopPropagation();openShortComments(id);};r.appendChild(b);});}
 
-function patchShortButtons(){document.querySelectorAll('.tiktok-slide').forEach(sl=>{if(sl.dataset.cmtDone)return;sl.dataset.cmtDone='1';let id=sl.dataset.id||'';if(!id)return;let right=sl.querySelector('.tiktok-right,.short-action-panel');if(!right)return;if(right.querySelector('[data-cmt]'))return;let btn=document.createElement('button');btn.className='short-action-btn';btn.setAttribute('data-cmt','1');btn.innerHTML='<div class="ico" style="width:42px;height:42px;border-radius:50%;background:rgba(0,0,0,.45);display:flex;align-items:center;justify-content:center;font-size:20px">💬</div>';btn.onclick=function(e){e.stopPropagation();openShortComments(id);};right.appendChild(btn);});}
-
-// Single rewrite + ask for regular articles (only ONE of each)
-function patchArticleView(){let art=document.querySelector('#view-article .article-view');if(!art)return;
-// Remove ALL duplicate ask boxes and rewrite buttons injected by old layers
-let asks=art.querySelectorAll('.article-ai-ask');if(asks.length>1)for(let i=1;i<asks.length;i++)asks[i].remove();
-let rws=art.querySelectorAll('[data-rewrite]');if(rws.length>1)for(let i=1;i<rws.length;i++)rws[i].remove();
-// Add rewrite if missing
-if(!art.querySelector('[data-rewrite]')){let actions=art.querySelector('.article-actions');if(actions){let btn=document.createElement('button');btn.className='primary';btn.setAttribute('data-rewrite','1');btn.textContent='🤖 Tóm tắt AI đăng tường';btn.onclick=function(){let url=(window._currentArticle&&window._currentArticle.url)||'';if(!url){alert('Không có URL bài viết');return;}fetch('/api/rewrite_share',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({url})}).then(r=>r.json()).then(j=>{if(j.post)alert('Đã tóm tắt và đăng lên Tường AI!');else alert(j.error||'Lỗi')}).catch(e=>alert(e.message))};actions.insertBefore(btn,actions.firstChild);}}
-// Add ask if missing
+// Regular articles: single rewrite + ask
+function patchArticle(){let art=document.querySelector('#view-article .article-view');if(!art)return;
+art.querySelectorAll('.article-ai-ask').forEach((e,i)=>{if(i>0)e.remove();});
+art.querySelectorAll('[data-rewrite]').forEach((e,i)=>{if(i>0)e.remove();});
+if(!art.querySelector('[data-rewrite]')){let a=art.querySelector('.article-actions');if(a){let b=document.createElement('button');b.className='primary';b.setAttribute('data-rewrite','1');b.textContent='🤖 Rewrite AI đăng tường';b.onclick=function(){let url=(window._currentArticle&&window._currentArticle.url)||'';if(!url){alert('Không có URL');return;}b.disabled=true;b.textContent='Đang rewrite...';fetch('/api/rewrite_share',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({url})}).then(r=>r.json()).then(j=>{if(j.post)alert('Đã rewrite và đăng tường!');else alert(j.error||'Lỗi')}).catch(e=>alert(e.message)).finally(()=>{b.disabled=false;b.textContent='🤖 Rewrite AI đăng tường'})};a.insertBefore(b,a.firstChild);}}
 if(!art.querySelector('.article-ai-ask')){let box=document.createElement('div');box.className='article-ai-ask';box.innerHTML='<h3 style="font-size:14px;color:#5cb87a">🤖 Hỏi AI</h3><textarea id="article-ai-question" placeholder="Hỏi về bài viết..."></textarea><button onclick="askArticleAI()">Hỏi</button><div id="article-ai-answer" class="article-ai-answer"></div>';art.appendChild(box);}}
-window.askArticleAI=async function(){let q=document.getElementById('article-ai-question')?.value.trim();if(!q)return alert('Nhập câu hỏi');let ans=document.getElementById('article-ai-answer');ans.textContent='Đang hỏi...';let url=(window._currentArticle&&window._currentArticle.url)||'';let ctx=document.querySelector('.article-view')?.innerText?.slice(0,12000)||'';try{let r=await fetch('/api/article/ask',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({url,question:q,context:ctx})});let j=await r.json();ans.textContent=j.answer||'Không trả lời được';}catch(e){ans.textContent='Lỗi: '+e.message}}
-
-// Override rewriteCurrentArticle used by old layers
-window.rewriteCurrentArticle=function(){let url=(window._currentArticle&&window._currentArticle.url)||'';if(!url){alert('Không có URL bài viết để rewrite');return;}fetch('/api/rewrite_share',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({url})}).then(r=>r.json()).then(j=>{if(j.post)alert('Đã tóm tắt và đăng lên Tường AI!');else alert(j.error||'Lỗi')}).catch(e=>alert(e.message))};
-
-let oldRA=window.readArticle;if(oldRA){window.readArticle=async function(){let ret=await oldRA.apply(this,arguments);setTimeout(patchArticleView,600);return ret;}}
+window.askArticleAI=async function(){let q=document.getElementById('article-ai-question')?.value.trim();if(!q)return alert('Nhập câu hỏi');let a=document.getElementById('article-ai-answer');a.textContent='Đang hỏi...';let url=(window._currentArticle&&window._currentArticle.url)||'';let ctx=document.querySelector('.article-view')?.innerText?.slice(0,12000)||'';try{let r=await fetch('/api/article/ask',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({url,question:q,context:ctx})});let j=await r.json();a.textContent=j.answer||'Không trả lời được';}catch(e){a.textContent='Lỗi: '+e.message}}
+window.rewriteCurrentArticle=function(){let url=(window._currentArticle&&window._currentArticle.url)||'';if(!url)return alert('Không có URL');fetch('/api/rewrite_share',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({url})}).then(r=>r.json()).then(j=>{if(j.post)alert('Đã rewrite và đăng tường!');else alert(j.error||'Lỗi')}).catch(e=>alert(e.message))};
 
-let _hotLoaded=false;function deferHot(){if(_hotLoaded)return;_hotLoaded=true;setTimeout(()=>{if(typeof ensureHotTopics==='function')ensureHotTopics();if(typeof ensureNewsShortsHome==='function')ensureNewsShortsHome();},4000);}
-if(document.readyState==='complete')deferHot();else window.addEventListener('load',deferHot);
-setInterval(()=>{patchArticleView();patchShortButtons();},1500);
+let oldRA=window.readArticle;if(oldRA){window.readArticle=async function(){let ret=await oldRA.apply(this,arguments);setTimeout(patchArticle,600);return ret;}}
+let _h=false;function dH(){if(_h)return;_h=true;setTimeout(()=>{if(typeof ensureHotTopics==='function')ensureHotTopics();if(typeof ensureNewsShortsHome==='function')ensureNewsShortsHome();},4000);}
+if(document.readyState==='complete')dH();else window.addEventListener('load',dH);
+setInterval(()=>{patchArticle();patchShortBtns();},1500);
 })();
 </script>
 '''
 
 @app.get('/')
-async def index_patched():
+async def _index():
     html=f5.f4.f3.f2.f1._load_index_html()
     body=getattr(rt.old,'PATCH_INJECT','')+f5.f4.f3.f2.f1.FINAL_INJECT+f5.f4.f3.FINAL3_INJECT+f5.f4.FINAL4_INJECT+f5.FINAL5_INJECT
     body+=getattr(f6,'FINAL6_INJECT','')