Fix: single rewrite button, guaranteed rewrite success, short button after rewrite"

ai_runtime_patch_fast.py

@@ -1,4 +1,4 @@
-"""Patch: scrape source URLs on rewrite, in-app article links, natural AI chat, persistent data."""
+"""Patch: single rewrite, guaranteed success, short button after rewrite."""
 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
@@ -13,8 +13,7 @@ def _domain(u):
 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')
-TTL_24H=86400
-HAS_PERSISTENT=os.path.isdir('/data')
+TTL_24H=86400;HAS_PERSISTENT=os.path.isdir('/data')
 
 def _load_json(path,default):
     try:
@@ -28,20 +27,16 @@ def _save_json(path,data):
         with open(tmp,'w',encoding='utf-8') as f:json.dump(data,f,ensure_ascii=False)
         os.replace(tmp,path)
     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)
-
 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_lock
@@ -67,7 +62,6 @@ def _loop():
     while True:time.sleep(600);_bg_refresh()
 threading.Thread(target=_loop,daemon=True).start()
 
-# ===== ENDPOINTS =====
 app.router.routes=[r for r in app.router.routes if not (
     (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')))
 )]
@@ -78,11 +72,8 @@ def _homepage():
     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'):
-        d=f6._fast_homepage()
-        if d:_bg_home.update({"t":now,"d":d});return JSONResponse(d)
+    if hasattr(f6,'_fast_homepage'):d=f6._fast_homepage();_bg_home.update({"t":now,"d":d or []});return JSONResponse(d or [])
     return JSONResponse([])
-
 @app.get('/api/shorts')
 def _shorts(refresh:int=Query(default=0)):
     now=time.time()
@@ -91,19 +82,14 @@ def _shorts(refresh:int=Query(default=0)):
         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 _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,'persistent':HAS_PERSISTENT})
-
+    return JSONResponse({'posts':[p for p in posts if now-int(p.get('ts') or 0)<TTL_24H],'persistent':HAS_PERSISTENT})
 @app.get('/api/storage_status')
-def _storage():return JSONResponse({'persistent':HAS_PERSISTENT,'data_dir':DATA_DIR})
-
+def _storage():return JSONResponse({'persistent':HAS_PERSISTENT})
 @app.get('/api/short/comments')
 def _get_cmts(id:str=Query(...)):return JSONResponse({'comments':_load_json(SHORT_COMMENTS_FILE,{}).get(id,[])})
-
 @app.post('/api/short/comment')
 async def _post_cmt(request:Request):
     body=await request.json();vid=str(body.get('id','')).strip();text=clean(body.get('text',''))
@@ -111,93 +97,83 @@ async def _post_cmt(request:Request):
     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 — truly conversational =====
 @app.post('/api/article/ask')
 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:
-        title,raw,_=_scrape_url_text(url,10000)
+    if url: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.
+    prompt=f"""Bạn tên VNEWS AI. Người dùng đang đọc bài/xem video và hỏi bạn.
 
-Đây là nội dung họ đang xem:
-"{title}"
+Nội dung: "{title}"
 {raw[:9000]}
 
-Họ hỏi: "{q}"
+Câu hỏi: "{q}"
 
-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.
+Trả lời tự nhiên, thân thiện, dễ hiểu bằng tiếng Việt. Dựa vào nội dung bài. Nếu mở rộng thì nói "theo mình biết thêm..."
 """
     ans=await f5.base.qwen_generate(prompt,max_tokens=1200)
-    if not ans:ans='Mình chưa trả lời được lúc này. Bạn thử hỏi lại nhé!'
+    if not ans:ans='Mình chưa trả lời được. Bạn thử lại nhé!'
     return JSONResponse({'answer':ans,'title':title})
 
-# ===== REWRITE — scrape source URLs for full content =====
 @app.post('/api/rewrite_share')
 @app.post('/api/url_wall')
 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,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:
+    if len(raw)<50:
+        # Fallback: use context from request body if scrape fails
+        raw=clean(body.get('context',''))[:14000]
+        if not raw:return JSONResponse({'error':'Không đọc được URL'},status_code=422)
+    prompt=f"""Tóm tắt bài viết đăng Tường AI:
 
 Tiêu đề: {title}
 Nội dung:
 {raw[:14000]}
 
-Yêu cầu: tóm tắt 4-6 ý chính, tự nhiên, không bịa. Cuối ghi nguồn.
+Tóm tắt 4-6 ý chính, tự nhiên. 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:pass
-    if not text or len(text)<100:text=f"Tóm tắt: {title}\n\n{raw[:1200]}\n\nNguồn: {_domain(url)}"
+    if not text or len(text)<80: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):
-    """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)
-    # 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=[]
+    if not p:return JSONResponse({'error':'Bài không tồn tại.'},status_code=404)
+    urls=[s['url'] for s in (p.get('source_details') or []) if s.get('url')]
+    urls+=[s['url'] for s in (p.get('sources') or []) if s.get('url') and s['url'] not in urls]
+    scraped=[]
     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 '')
+        if raw and len(raw)>150:scraped.append(f"[{_domain(u)}] {t}\n{raw}")
+    all_content='\n\n---\n\n'.join(scraped) if scraped else (p.get('text') or '')
     title=p.get('title') or 'Bài viết'
-    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:
-
-Chủ đề gốc: {title}
+    prompt=f"""Viết lại thành bản tóm tắt mới từ nguồn:
 
-Nội dung các nguồn đã scrape:
+Chủ đề: {title}
+Nguồn:
 {all_content[:16000]}
 
-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.
+Tiêu đề mới + 4-6 ý chính + nguồn 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=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"
+    if not text or len(text)<100: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',[])
     all_posts=f5.base._load_ai_wall();all_posts.insert(0,new_post);f5.base._save_ai_wall(all_posts)
     return JSONResponse({'post':new_post})
 
-# ===== TOPIC POST =====
 @app.post('/api/topic_post')
 async def _topic(request:Request):
     body=await request.json();topic=clean(body.get('topic',''))
@@ -206,82 +182,67 @@ async def _topic(request:Request):
     research=f6._fast_context(topic) if hasattr(f6,'_fast_context') else f6._web_research_context(topic)
     context=research.get('context','');sources=research.get('sources',[])
     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)
+    if not context or not sources:return JSONResponse({'error':'Không tìm được nội dung.'},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 bài tiếng Việt VỀ ĐÚNG CHỦ ĐỀ: "{topic}"
-
-NGUỒN:
-{source_brief[:18000]}
-
-CHỈ viết về "{topic}". Tiêu đề chứa "{topic}". 5-8 đoạn. Cuối có nguồn.
-"""
+    prompt=f"""Viết bài tiếng Việt VỀ CHỦ ĐỀ: "{topic}"\nNGUỒN:\n{source_brief[:18000]}\nCHỈ viết về "{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: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')}))
-        text=f"{topic}: tổng hợp\n\n{bullets}\n\nNguồn: {vias}"
+        text=f"{topic}: tổng hợp\n\n{bullets}\n\nNguồn: "+', '.join(sorted({d.get('via','') for d in (details or []) if d.get('via')}))
     post=f5.base.make_post(topic,text,img,'','topic_focused',sources=[s for s in sources if s.get('url')])
     post['images']=[img];post['source_details']=details
     posts=f5.base._load_ai_wall();posts.insert(0,post);f5.base._save_ai_wall(posts)
     return JSONResponse({'post':post})
 
-# ===== 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;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>
+<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}.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}/* HIDE all old rewrite buttons from previous layers */button[onclick*="rewriteCurrentArticle"]{display:none!important}</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]));}
+fetch('/api/storage_status').then(r=>r.json()).then(j=>{if(!j.persistent){let h=document.getElementById('view-home');if(h){let w=document.createElement('div');w.className='storage-warn';w.textContent='⚠️ Persistent Storage chưa bật. Bài AI sẽ mất khi rebuild. Bật trong Space Settings.';h.prepend(w);}}});
 
-// 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 (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(()=>{});});}
+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 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></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(()=>{});});}
 
-async function readAIWallPost(i){
-let wall=(await fetch('/api/ai_wall').then(r=>r.json()).catch(()=>({posts:[]}))).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)}')">🤖 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);}
+async function readAIWallPost(i){let wall=(await fetch('/api/ai_wall').then(r=>r.json()).catch(()=>({posts:[]}))).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" data-rw-topic="${esc(p.id)}" onclick="doRewriteTopic(this,'${esc(p.id)}')">🤖 Rewrite AI đăng tường</button>${p.video?`<button onclick="window.open('${p.video}','_blank')">🎬 Xem Short</button>`:''}<button onclick="doShare('${esc(p.title)}','${location.origin}','${esc(p.img||'')}')">📤</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>`;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 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';}}};
+// Unified rewrite for topic posts
+window.doRewriteTopic=async function(btn,postId){btn.disabled=true;btn.textContent='Đang scrape & 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');let post=j.post;alert('Đã rewrite thành công!');showRewriteResult(post);}catch(e){alert('Lỗi: '+e.message)}finally{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...';
-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||'');
-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}};
+// Unified rewrite for regular articles
+window.doRewriteArticle=async function(btn){let url=(window._currentArticle&&window._currentArticle.url)||'';if(!url){let link=document.querySelector('#view-article a[href*="://"]');if(link)url=link.href;}if(!url){alert('Không tìm được URL bài viết');return;}let ctx=document.querySelector('.article-view')?.innerText?.slice(0,14000)||'';btn.disabled=true;btn.textContent='Đang rewrite...';try{let r=await fetch('/api/rewrite_share',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({url,context:ctx})});let j=await r.json();if(!r.ok||j.error)throw new Error(j.error||'Lỗi');alert('Đã rewrite thành công!');showRewriteResult(j.post);}catch(e){alert('Lỗi: '+e.message)}finally{btn.disabled=false;btn.textContent='🤖 Rewrite AI đăng tường';}};
+
+// Show rewrite result with Short button
+function showRewriteResult(post){if(!post)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">Rewrite</span><h1 class="article-title">${esc(post.title)}</h1>${post.img?`<img class="article-img" src="${post.img}">`:''}`;h+=`<p class="article-p" style="white-space:pre-wrap">${esc(post.text)}</p>`;h+=`<div class="article-actions"><button class="primary" onclick="makeShortFromPost('${esc(post.id)}',this)">🎬 Tạo Short AI</button><button onclick="doShare('${esc(post.title)}','${location.origin}','${esc(post.img||'')}')">📤 Chia sẻ</button></div></div>`;document.getElementById('view-article').innerHTML=h;window.scrollTo(0,0);}
+
+// Make short from any wall post
+window.makeShortFromPost=async function(postId,btn){if(btn){btn.disabled=true;btn.textContent='Đang tạo short...';}try{let r=await fetch('/api/ai/short/'+postId,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({voice:'nu',emotion:'neutral',speed:1.2})});let j=await r.json();if(!r.ok||j.error)throw new Error(j.error||'Lỗi');alert('Đã tạo Short AI!');}catch(e){alert('Lỗi tạo short: '+e.message)}finally{if(btn){btn.disabled=false;btn.textContent='🎬 Tạo Short AI';}}};
+
+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...';let wall=(await fetch('/api/ai_wall').then(r=>r.json()).catch(()=>({posts:[]}))).posts||[];let p=wall[i]||{};let ctx=(p.text||'');for(let s of (p.source_details||[]))ctx+='\n'+(s.content||'');try{let r=await fetch('/api/article/ask',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({question:q,context:ctx.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}};
 
 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);});}
 
-// Regular articles: single rewrite + ask
+// Patch regular articles: ONLY ONE rewrite button + ask box
 function patchArticle(){let art=document.querySelector('#view-article .article-view');if(!art)return;
+// Remove ALL old rewrite buttons from any layer
+art.querySelectorAll('button[onclick*="rewriteCurrentArticle"],button[data-rewrite],.rewrite-injected').forEach(e=>e.remove());
+// Remove duplicate ask boxes
 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);}}
+// Add our single rewrite if not already there
+if(!art.querySelector('[data-rw-article]')){let a=art.querySelector('.article-actions');if(a){let b=document.createElement('button');b.className='primary';b.setAttribute('data-rw-article','1');b.textContent='🤖 Rewrite AI đăng tường';b.onclick=function(){doRewriteArticle(b)};a.insertBefore(b,a.firstChild);}}
+// Add ask if missing
 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 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 oldRA=window.readArticle;if(oldRA){window.readArticle=async function(){let ret=await oldRA.apply(this,arguments);setTimeout(patchArticle,600);return ret;}}
+// Kill old rewriteCurrentArticle from injected layers
+window.rewriteCurrentArticle=function(){let btn=document.querySelector('[data-rw-article]');if(btn)doRewriteArticle(btn);};
+
+let oldRA=window.readArticle;if(oldRA){window.readArticle=async function(){let ret=await oldRA.apply(this,arguments);setTimeout(patchArticle,500);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);