P0-R5-R2 no historical completed UI

.gitattributes

@@ -33,3 +33,4 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
+static/payment_wechat_qr.png filter=lfs diff=lfs merge=lfs -text

app.py

@@ -821,11 +821,9 @@ def _process_pending_launch(lang_code: str) -> None:
         if "product_entitlement_required" in raw:
             st.session_state["sp_payment_required"] = True
             st.error(tr(lang_code, "product_entitlement_required"))
-            render_payment_purchase(lang_code)
         elif "payment_required" in raw:
             st.session_state["sp_payment_required"] = True
             st.error(tr(lang_code, "quota_exhausted"))
-            render_payment_purchase(lang_code)
         elif "a5_product_task_path_not_active" in raw or "a5_product_task_path_not_authorized" in raw:
             st.error(tr(lang_code, "product_generation_not_active"))
         else:
@@ -1289,10 +1287,6 @@ def _render_task_status_once(lang_code: str) -> None:
         return
     status = str(task.get("status") or "")
 
-    # First-paint invariant: render useful, localized progress and manuscript
-    # placeholders before any browser bridge call that may yield once via
-    # st.stop(). The browser watcher mutates these stable DOM targets in place
-    # after the bridge handshake, so no duplicate monitor/preview is needed.
     st.session_state["sp_last_ui_task_status"] = status
     _render_monitor_box(task, lang_code)
     _render_checkpoint_preview(task, lang_code)
@@ -1590,7 +1584,9 @@ def render_workspace_controls(user):
             st.markdown(tr(lang_code, "template_help_undetermined"))
 
     product_ui = get_product_ui_projection()
-    if product_ui.get("mode") == "a5_product":
+    product_ui_ready = product_ui.get("mode") == "a5_product"
+    selected_remaining: int | None = None
+    if product_ui_ready:
         products = product_ui.get("products") or {}
         tier_options = [tier for tier in ("STANDARD", "FLAGSHIP") if tier in products]
         if len(tier_options) != 2:
@@ -1610,6 +1606,10 @@ def render_workspace_controls(user):
             key="sp_product_tier",
         )
         selected_product = products[selected_tier]
+        entitlement = product_ui.get("entitlement") or {}
+        selected_remaining = int(
+            entitlement.get("standard_remaining" if selected_tier == "STANDARD" else "flagship_remaining") or 0
+        )
         word_min = int(selected_product["min_body_words"])
         word_max = int(selected_product["max_body_words"])
         word_label = tr(
@@ -1628,6 +1628,7 @@ def render_workspace_controls(user):
             min_words=word_min,
             max_words=word_max,
         )
+        st.info(tr(lang_code, "product_data_loading"))
 
     current_words = int(st.session_state.get("sp_words") or APP_CONFIG["target_words_default"])
     bounded_words = min(word_max, max(word_min, current_words))
@@ -1649,7 +1650,17 @@ def render_workspace_controls(user):
             st.session_state["sp_pending_cancel_task_id"] = str(task.get("task_id") or "")
             st.rerun()
     else:
-        can_start = bool(preflight.get("can_start_generation"))
+        entitlement_exhausted = bool(product_ui_ready and selected_remaining is not None and selected_remaining <= 0)
+        if entitlement_exhausted:
+            st.warning(tr(lang_code, "product_entitlement_required"))
+            if st.button(tr(lang_code, "payment_open"), key="btn_open_payment_for_selected_tier"):
+                render_payment_purchase(lang_code)
+        can_start = bool(
+            preflight.get("can_start_generation")
+            and product_ui_ready
+            and selected_remaining is not None
+            and selected_remaining > 0
+        )
         if st.button(
             tr(lang_code, "start_generation_unified"),
             disabled=not can_start,
@@ -1696,13 +1707,16 @@ _process_pending_resume()
 _process_pending_launch(lang_code)
 
 if st.session_state.get("sp_payment_required"):
-    render_payment_purchase(lang_code)
+    st.warning(tr(lang_code, "product_entitlement_required"))
+    if st.button(tr(lang_code, "payment_open"), key="btn_open_payment_after_rejection"):
+        render_payment_purchase(lang_code)
 
 # R3.2.4 keeps the approved task-monitor location. Active progress is updated
 # inside the browser by read-only edge polling; Streamlit reruns only on a
 # user action or a terminal/resumable boundary, so there is no periodic flicker.
 _task_for_monitor = st.session_state.get("sp_generation_task") or {}
-if str(_task_for_monitor.get("task_id") or "").strip():
+_task_for_monitor_id = str(_task_for_monitor.get("task_id") or "").strip()
+if _task_for_monitor_id:
     st.markdown("<div id='sp-task-monitor-anchor'></div>", unsafe_allow_html=True)
     # Install the one-time navigation script before task-status bridge calls.
     # If the first bridge handshake yields via st.stop(), the browser still

i18n.py

@@ -411,30 +411,36 @@ TEXTS: dict[str, dict[str, str]] = {
         "login_pending": "支付宝授权尚未完成，请扫码并确认授权。",
         "account_title": "用户账户",
         "account_id": "用户编号：**{value}**",
-        "daily_free": "每日免费：**{value}篇**",
-        "bonus_papers": "长期有效额度：**{value}篇**",
+        "daily_free": "标准版：**{value}篇**",
+        "bonus_papers": "旗舰版：**{value}篇**",
         "account_chip_user": "用户 {value}",
-        "account_chip_free": "免费 {value}篇",
-        "account_chip_bonus": "长期 {value}篇",
+        "account_chip_free": "标准版 {value}篇",
+        "account_chip_bonus": "旗舰版 {value}篇",
         "account_chip_standard": "标准版 {value}篇",
         "account_chip_flagship": "旗舰版 {value}篇",
         "logout_short": "退出",
-        "payment_dialog_title": "支付宝付款",
-        "payment_notice": "今日免费额度和长期额度均已用完。支付9.9元可增加3篇长期有效额度。",
-        "product_entitlement_required": "当前所选版本额度不足，请使用支付宝购买对应版本额度。",
-        "payment_notice_product": "购买{tier}：支付 {amount} {currency} 可增加{credits}篇长期有效额度。",
-        "payment_paid_product": "支付成功，已增加{credits}篇{tier}长期有效额度。请重新点击生成论文。",
-        "quota_exhausted": "今日免费额度和长期额度均已用完。请使用支付宝购买长期额度。",
-        "payment_create": "生成支付宝付款二维码",
-        "payment_creating": "正在创建支付宝订单……",
+        "payment_dialog_title": "购买论文额度",
+        "payment_notice": "当前版本额度不足，请购买相应版本的论文额度。",
+        "product_entitlement_required": "当前所选版本额度为0，暂时不能生成论文。购买并到账后即可继续生成该版本论文。",
+        "product_data_loading": "正在加载标准版 / 旗舰版额度与产品策略，请稍候。加载完成前暂不能生成论文。",
+        "payment_open": "购买额度",
+        "payment_channel_label": "本次付款方式",
+        "payment_channel_alipay": "Alipay",
+        "payment_channel_wechat": "WeChat",
+        "payment_scan_dual": "请使用与本次付款方式一致的二维码（当前选择：{channel}）。付款后将订单号发送给管理员，核实到账后会增加对应版本额度。",
+        "payment_notice_product": "购买{tier}：支付 {amount} {currency} 可增加{credits}篇该版本论文额度。",
+        "payment_paid_product": "付款已确认，已增加{credits}篇{tier}论文额度。现在可以继续生成论文。",
+        "quota_exhausted": "当前所选版本额度不足，请购买相应版本额度。",
+        "payment_create": "创建付款订单",
+        "payment_creating": "正在创建付款订单……",
         "payment_scan": "请使用支付宝 App 扫码支付。支付成功后点击“查询支付结果”。",
-        "payment_scan_manual": "请使用支付宝 App 扫码支付。支付后请将订单号发送给管理员，管理员核实实际到账后会自动增加额度。随后可点击“查询支付结果”。",
+        "payment_scan_manual": "请使用所选付款方式扫码。付款后请将订单号发送给管理员，管理员核实实际到账后会增加对应版本额度。",
         "payment_order_no": "订单号：{order_no}",
         "payment_support_prompt": "支付遇到问题或者提升论文质量？请联系管理员",
         "payment_support_wechat": "微信：{value}",
         "payment_support_whatsapp": "WhatsApp：{value}",
         "payment_check": "查询支付结果",
-        "payment_paid": "支付成功，已增加3篇长期有效额度。请重新点击生成论文。",
+        "payment_paid": "付款已确认，额度已更新。现在可以继续生成论文。",
         "payment_expired": "付款二维码已过期，请重新生成。",
         "browse_files": "选择文件",
         "drop_docs": "将文件拖放到此处",
@@ -652,30 +658,36 @@ TEXTS: dict[str, dict[str, str]] = {
         "login_pending": "Alipay authorization is still pending. Scan the code and confirm authorization.",
         "account_title": "User Account",
         "account_id": "User ID: **{value}**",
-        "daily_free": "Daily free allowance: **{value} papers**",
-        "bonus_papers": "Long-term allowance: **{value} papers**",
+        "daily_free": "Standard: **{value} papers**",
+        "bonus_papers": "Flagship: **{value} papers**",
         "account_chip_user": "User {value}",
-        "account_chip_free": "Free {value}",
-        "account_chip_bonus": "Bonus {value}",
+        "account_chip_free": "Standard {value}",
+        "account_chip_bonus": "Flagship {value}",
         "account_chip_standard": "Standard {value}",
         "account_chip_flagship": "Flagship {value}",
         "logout_short": "Sign out",
-        "payment_dialog_title": "Alipay Payment",
-        "payment_notice": "Your daily free quota and long-term quota are exhausted. Pay CNY 9.9 to add three long-term papers.",
-        "product_entitlement_required": "The selected plan has no remaining credits. Purchase credits for this plan with Alipay.",
-        "payment_notice_product": "Purchase {tier}: pay {currency} {amount} to add {credits} long-term paper credits.",
-        "payment_paid_product": "Payment succeeded. {credits} long-term {tier} paper credits were added. Start the paper again.",
-        "quota_exhausted": "Your daily free quota and long-term quota are exhausted. Purchase long-term quota with Alipay.",
-        "payment_create": "Create Alipay QR code",
-        "payment_creating": "Creating the Alipay order…",
+        "payment_dialog_title": "Purchase Paper Credits",
+        "payment_notice": "The selected plan has no remaining credits. Purchase credits for that plan to continue.",
+        "product_entitlement_required": "The selected plan has 0 remaining credits, so generation is disabled. Purchase credits for this plan and wait for confirmation before generating again.",
+        "product_data_loading": "Loading Standard / Flagship credits and product policy. Generation stays disabled until authoritative data is ready.",
+        "payment_open": "Purchase credits",
+        "payment_channel_label": "Payment method for this order",
+        "payment_channel_alipay": "Alipay",
+        "payment_channel_wechat": "WeChat",
+        "payment_scan_dual": "Use the QR code that matches the selected payment method (current: {channel}). After payment, send the order number to the administrator; the matching plan credits will be added after receipt is verified.",
+        "payment_notice_product": "Purchase {tier}: pay {currency} {amount} to add {credits} paper credits for this plan.",
+        "payment_paid_product": "Payment was confirmed. {credits} {tier} paper credits were added. You can generate again now.",
+        "quota_exhausted": "The selected plan has no remaining credits. Purchase credits for that plan to continue.",
+        "payment_create": "Create payment order",
+        "payment_creating": "Creating the payment order…",
         "payment_scan": "Scan the code with the Alipay app. After payment, select “Check payment result.”",
-        "payment_scan_manual": "Scan with the Alipay app. After payment, send the order number to the administrator. Credits will be added automatically after the administrator verifies the actual receipt. You can then select “Check payment result.”",
+        "payment_scan_manual": "Scan with the selected payment method. After payment, send the order number to the administrator. Credits will be added after the administrator verifies the actual receipt.",
         "payment_order_no": "Order number: {order_no}",
         "payment_support_prompt": "Need help with payment or improving your paper's quality? Contact the administrator.",
         "payment_support_wechat": "WeChat: {value}",
         "payment_support_whatsapp": "WhatsApp: {value}",
         "payment_check": "Check payment result",
-        "payment_paid": "Payment succeeded. Three long-term papers were added. Start the paper again.",
+        "payment_paid": "Payment was confirmed and your credits were updated. You can generate again now.",
         "payment_expired": "The payment QR code has expired. Create a new one.",
         "browse_files": "Choose files",
         "drop_docs": "Drag and drop files here",
@@ -893,30 +905,36 @@ TEXTS: dict[str, dict[str, str]] = {
         "login_pending": "Авторизация Alipay ещё не завершена. Отсканируйте код и подтвердите доступ.",
         "account_title": "Учётная запись",
         "account_id": "Идентификатор пользователя: **{value}**",
-        "daily_free": "Ежедневно бесплатно: **{value} статьи**",
-        "bonus_papers": "Долгосрочный остаток: **{value} статьи**",
+        "daily_free": "Стандарт: **{value} статьи**",
+        "bonus_papers": "Флагман: **{value} статьи**",
         "account_chip_user": "Пользователь {value}",
-        "account_chip_free": "Бесплатно {value}",
-        "account_chip_bonus": "Запас {value}",
+        "account_chip_free": "Стандарт {value}",
+        "account_chip_bonus": "Флагман {value}",
         "account_chip_standard": "Стандарт {value}",
         "account_chip_flagship": "Флагман {value}",
         "logout_short": "Выйти",
-        "payment_dialog_title": "Оплата через Alipay",
-        "payment_notice": "Ежедневная бесплатная и долгосрочная квоты исчерпаны. Оплата 9,9 юаня добавляет квоту на три статьи без срока действия.",
-        "product_entitlement_required": "Квота выбранного тарифа исчерпана. Приобретите квот�� этого тарифа через Alipay.",
-        "payment_notice_product": "Покупка тарифа {tier}: оплата {amount} {currency} добавит {credits} долгосрочных квот на статьи.",
-        "payment_paid_product": "Оплата прошла успешно. Добавлено {credits} долгосрочных квот тарифа {tier}. Запустите создание статьи повторно.",
-        "quota_exhausted": "Ежедневная бесплатная и долгосрочная квоты исчерпаны. Приобретите долгосрочную квоту через Alipay.",
+        "payment_dialog_title": "Покупка лимита статей",
+        "payment_notice": "Лимит выбранной версии исчерпан. Приобретите лимит для этой версии, чтобы продолжить.",
+        "product_entitlement_required": "Остаток выбранной версии равен 0, поэтому создание статьи отключено. После покупки и подтверждения лимита можно продолжить.",
+        "product_data_loading": "Загружаются лимиты Standard / Flagship и политика продукта. До получения подтверждённых данных создание статьи отключено.",
+        "payment_open": "Купить лимит",
+        "payment_channel_label": "Способ оплаты для этого заказа",
+        "payment_channel_alipay": "Alipay",
+        "payment_channel_wechat": "WeChat",
+        "payment_scan_dual": "Используйте QR-код, соответствующий выбранному способу оплаты (сейчас: {channel}). После оплаты отправьте номер заказа администратору; лимит нужной версии будет добавлен после проверки поступления средств.",
+        "payment_notice_product": "Покупка {tier}: оплата {amount} {currency} добавит {credits} квоты на статьи этой версии.",
+        "payment_paid_product": "Платёж подтверждён. Добавлено {credits} квоты {tier}. Теперь можно продолжить создание статьи.",
+        "quota_exhausted": "Лимит выбранной версии исчерпан. Приобретите лимит для этой версии, чтобы продолжить.",
         "payment_create": "Создать QR-код для оплаты",
-        "payment_creating": "Создаётся заказ Alipay…",
+        "payment_creating": "Создаётся платёжный заказ…",
         "payment_scan": "Отсканируйте QR-код в приложении Alipay. После оплаты нажмите «Проверить результат оплаты».",
-        "payment_scan_manual": "Отсканируйте QR-код в приложении Alipay. После оплаты отправьте номер заказа администратору. После проверки фактического поступления средств квота будет добавлена автоматически. Затем нажмите «Проверить результат оплаты».",
+        "payment_scan_manual": "Используйте выбранный способ оплаты. После оплаты отправьте номер заказа администратору; лимит будет добавлен после проверки фактического поступления средств.",
         "payment_order_no": "Номер заказа: {order_no}",
         "payment_support_prompt": "Возникли вопросы с оплатой или хотите повысить качество научной статьи? Свяжитесь с администратором.",
         "payment_support_wechat": "WeChat: {value}",
         "payment_support_whatsapp": "WhatsApp: {value}",
         "payment_check": "Проверить результат оплаты",
-        "payment_paid": "Оплата прошла успешно. Добавлена долгосрочная квота на три статьи. Запустите создание статьи повторно.",
+        "payment_paid": "Платёж подтверждён, лимит обновлён. Теперь можно продолжить создание статьи.",
         "payment_expired": "Срок действия QR-кода истёк. Создайте новый код.",
         "browse_files": "Выбрать файлы",
         "drop_docs": "Перетащите файлы сюда",
@@ -1134,30 +1152,36 @@ TEXTS: dict[str, dict[str, str]] = {
         "login_pending": "Alipay рұқсаты әлі аяқталған жоқ. QR-кодты сканерлеп, рұқсатты растаңыз.",
         "account_title": "Пайдаланушы есептік жазбасы",
         "account_id": "Пайдаланушы нөмірі: **{value}**",
-        "daily_free": "Күнделікті тегін: **{value} мақала**",
-        "bonus_papers": "Ұзақ мерзімді қалдық: **{value} мақала**",
+        "daily_free": "Стандарт: **{value} мақала**",
+        "bonus_papers": "Флагман: **{value} мақала**",
         "account_chip_user": "Пайдаланушы {value}",
-        "account_chip_free": "Тегін {value}",
-        "account_chip_bonus": "Қор {value}",
+        "account_chip_free": "Стандарт {value}",
+        "account_chip_bonus": "Флагман {value}",
         "account_chip_standard": "Стандарт {value}",
         "account_chip_flagship": "Флагман {value}",
         "logout_short": "Шығу",
-        "payment_dialog_title": "Alipay арқылы төлеу",
-        "payment_notice": "Күнделікті тегін және ұзақ мерзімді квота таусылды. 9,9 юань төлегенде мерзімі шектелмеген үш мақала квотасы қосылады.",
-        "product_entitlement_required": "Таңдалған нұсқаның квотасы таусылды. Осы нұсқаға арналған квотаны Alipay арқылы сатып алыңыз.",
-        "payment_notice_product": "{tier} нұсқасын сатып алу: {amount} {currency} төлемі {credits} ұзақ мерзімді мақала квотасын қосады.",
-        "payment_paid_product": "Төлем сәтті өтті. {tier} нұсқасына {credits} ұзақ мерзімді мақала квотасы қосылды. Мақала жасауды қайта бастаңыз.",
-        "quota_exhausted": "Күнделікті тегін және ұзақ мерзімді квота таусылды. Alipay арқылы ұзақ мерзімді квота сатып алыңыз.",
+        "payment_dialog_title": "Мақала лимитін сатып алу",
+        "payment_notice": "Таңдалған нұсқаның лимиті таусылды. Жалғастыру үшін осы нұсқаға лимит сатып алыңыз.",
+        "product_entitlement_required": "Таңдалған нұсқаның қалдығы 0, сондықтан мақала жасау өшірілді. Сатып алу расталғаннан кейін жалғастыруға болады.",
+        "product_data_loading": "Standard / Flagship лимиттері мен өнім саясаты жүктелуде. Расталған деректер дайын болғанша мақала жасау өшіріледі.",
+        "payment_open": "Лимит сатып алу",
+        "payment_channel_label": "Осы тапсырыстың төлем тәсілі",
+        "payment_channel_alipay": "Alipay",
+        "payment_channel_wechat": "WeChat",
+        "payment_scan_dual": "Таңдалған төлем тәсіліне сәйкес QR-кодты пайдаланыңыз (қазір: {channel}). Төлемнен кейін тапсырыс нөмірін әкімшіге жіберіңіз; түсім расталғаннан кейін тиісті нұсқа лимиті қосылады.",
+        "payment_notice_product": "{tier} нұсқасын сатып алу: {amount} {currency} төлемі осы нұсқаға {credits} мақала лимитін қосады.",
+        "payment_paid_product": "Төлем расталды. {tier} нұсқасына {credits} мақала лимиті қосылды. Енді мақала жасауды жалғастыруға болады.",
+        "quota_exhausted": "Таңдалған нұсқаның лимиті таусылды. Жалғастыру үшін осы нұсқаға лимит сатып алыңыз.",
         "payment_create": "Төлемге арналған QR-код жасау",
-        "payment_creating": "Alipay тапсырысы жасалуда…",
+        "payment_creating": "Төлем тапсырысы жасалуда…",
         "payment_scan": "QR-кодты Alipay қолданбасымен сканерлеңіз. Төлемнен кейін «Төлем нәтижесін тексеру» түймесін басыңыз.",
-        "payment_scan_manual": "QR-кодты Alipay қолданбасымен сканерлеңіз. Төлемнен кейін тапсырыс нөмірін әкімшіге жіберіңіз. Әкімші төлемнің нақты түскенін тексерген соң квота автоматты түрде қосылады. Содан кейін «Төлем нәтижесін тексеру» түймесін басыңыз.",
+        "payment_scan_manual": "Таңдалған төлем тәсілін пайдаланыңыз. Төлемнен кейін тапсырыс нөм��рін әкімшіге жіберіңіз; нақты түсім тексерілгеннен кейін лимит қосылады.",
         "payment_order_no": "Тапсырыс нөмірі: {order_no}",
         "payment_support_prompt": "Төлем бойынша мәселе туындады ма немесе ғылыми мақаланың сапасын жақсартқыңыз келе ме? Әкімшіге хабарласыңыз.",
         "payment_support_wechat": "WeChat: {value}",
         "payment_support_whatsapp": "WhatsApp: {value}",
         "payment_check": "Төлем нәтижесін тексеру",
-        "payment_paid": "Төлем сәтті өтті. Мерзімі шектелмеген үш мақала квотасы қосылды. Мақала жасауды қайта бастаңыз.",
+        "payment_paid": "Төлем расталды, лимит жаңартылды. Енді мақала жасауды жалғастыруға болады.",
         "payment_expired": "QR-кодтың қолданылу мерзімі аяқталды. Жаңа код жасаңыз.",
         "browse_files": "Файлдарды таңдау",
         "drop_docs": "Файлдарды осы жерге сүйреп әкеліңіз",

managed_auth.py

@@ -140,6 +140,7 @@ def _clear_generation_session_state() -> None:
         "rag_engine", "up_amj_ref", "up_amj_data", "up_asq_ref",
         "up_asq_data", "sp_payment_required", "sp_payment_order",
         "sp_payment_request_id", "sp_payment_package_sku",
+        "sp_payment_channel", "sp_payment_order_channel",
     ):
         st.session_state.pop(key, None)
 
@@ -389,6 +390,8 @@ def start_generation_task(
     started_task = result.get("task")
     if isinstance(started_task, dict) and started_task.get("task_id"):
         st.session_state["sp_tracked_task_id"] = str(started_task["task_id"])
+        # A user-started task must never inherit the prior-login completed-task UI mode.
+        st.session_state["sp_recovered_completed_task_id"] = ""
     return dict(result)
 
 
@@ -450,10 +453,23 @@ def recover_generation_task() -> dict[str, Any]:
     _merge_quota_into_session(result)
     task = result.get("task")
     if isinstance(task, dict) and task.get("task_id"):
-        _restore_completed_artifact_if_needed(task)
-        st.session_state["sp_generation_task"] = dict(task)
-        st.session_state["sp_tracked_task_id"] = str(task["task_id"])
-        st.session_state["sp_last_ui_task_status"] = str(task.get("status") or "")
+        recovered_status = str(task.get("status") or "").strip().lower()
+        if recovered_status == "completed":
+            # Historical completed tasks remain authoritative in D1/Bucket, but a
+            # fresh login must open a clean workspace. Do not restore the artifact,
+            # attach the completed task to Streamlit session state, or render any
+            # historical generation/download UI.
+            st.session_state["sp_generation_task"] = None
+            st.session_state["sp_last_ui_task_status"] = ""
+            st.session_state.pop("sp_tracked_task_id", None)
+            logging.info(
+                "[SP_AUTH] completed_task_hidden_on_fresh_login task_id=%s",
+                str(task.get("task_id") or ""),
+            )
+        else:
+            st.session_state["sp_generation_task"] = dict(task)
+            st.session_state["sp_tracked_task_id"] = str(task["task_id"])
+            st.session_state["sp_last_ui_task_status"] = recovered_status
     else:
         st.session_state["sp_generation_task"] = None
         st.session_state["sp_last_ui_task_status"] = ""
@@ -517,12 +533,18 @@ def logout_alipay_session(on_logout: Callable[[str, str], None] | None = None) -
 def create_payment_order(
     idempotency_key: str,
     package_sku: str | None = None,
+    payment_channel: str | None = None,
 ) -> dict[str, Any]:
     normalized = str(idempotency_key or "").strip()
     payload: dict[str, Any] = {"idempotency_key": normalized}
     normalized_sku = str(package_sku or "").strip()
     if normalized_sku:
         payload["package_sku"] = normalized_sku
+    normalized_channel = str(payment_channel or "").strip().upper()
+    if normalized_channel:
+        if normalized_channel not in {"ALIPAY", "WECHAT"}:
+            raise RuntimeError("payment_channel_invalid")
+        payload["payment_channel"] = normalized_channel
     result = _edge_call(
         "pay_create",
         normalized,
@@ -564,6 +586,7 @@ def _render_payment_purchase_body(language: str) -> None:
     product_mode = projection.get("mode") == "a5_product"
     selected_product: dict[str, Any] | None = None
     package_sku = ""
+    existing_order = st.session_state.get("sp_payment_order")
     if product_mode:
         selected_tier = str(st.session_state.get("sp_product_tier") or "STANDARD").strip().upper()
         raw_product = (projection.get("products") or {}).get(selected_tier)
@@ -590,7 +613,6 @@ def _render_payment_purchase_body(language: str) -> None:
                 credits=credits,
             )
         )
-        existing_order = st.session_state.get("sp_payment_order")
         existing_sku = str(st.session_state.get("sp_payment_package_sku") or "").strip()
         order_sku = str((existing_order or {}).get("package_sku") or "").strip() if isinstance(existing_order, dict) else ""
         if (existing_sku and existing_sku != package_sku) or (existing_order and order_sku != package_sku):
@@ -599,17 +621,39 @@ def _render_payment_purchase_body(language: str) -> None:
     else:
         st.warning(tr(language, "payment_notice"))
 
+    frozen_order_channel = (
+        str((existing_order or {}).get("payment_channel") or "").strip().upper()
+        if isinstance(existing_order, dict)
+        else ""
+    )
+    if frozen_order_channel in {"ALIPAY", "WECHAT"}:
+        st.session_state["sp_payment_channel"] = frozen_order_channel
+    payment_channel = st.radio(
+        tr(language, "payment_channel_label"),
+        ("ALIPAY", "WECHAT"),
+        index=0 if str(st.session_state.get("sp_payment_channel") or "ALIPAY").upper() != "WECHAT" else 1,
+        format_func=lambda value: tr(language, f"payment_channel_{value.lower()}"),
+        horizontal=True,
+        disabled=bool(existing_order),
+        key="sp_payment_channel",
+    )
+
     if st.button(tr(language, "payment_create"), key="sp_create_payment_order"):
         st.session_state["sp_payment_request_id"] = (
             f"pay_{int(time.time() * 1000)}_{secrets.token_urlsafe(12)}"
         )
         st.session_state["sp_payment_package_sku"] = package_sku
+        st.session_state["sp_payment_order_channel"] = str(payment_channel).upper()
 
     request_id = str(st.session_state.get("sp_payment_request_id") or "").strip()
     order = st.session_state.get("sp_payment_order")
     if request_id and not order:
         st.info(tr(language, "payment_creating"))
-        order_result = create_payment_order(request_id, package_sku or None)
+        order_result = create_payment_order(
+            request_id,
+            package_sku or None,
+            str(st.session_state.get("sp_payment_order_channel") or payment_channel),
+        )
         order = dict(order_result.get("order") or {})
         if not order.get("merchant_order_no") or not order.get("qr_code"):
             raise RuntimeError("payment_order_missing_qr_code")
@@ -623,15 +667,69 @@ def _render_payment_purchase_body(language: str) -> None:
     order = st.session_state.get("sp_payment_order") or {}
     qr_code = str(order.get("qr_code") or "").strip()
     if qr_code:
-        st.image(_qr_png_bytes(qr_code), width=280)
+        payment_provider = str(order.get("payment_provider") or "").strip().upper()
+        payment_channel = str(order.get("payment_channel") or st.session_state.get("sp_payment_order_channel") or "ALIPAY").strip().upper()
+        if payment_provider == "MANUAL_ALIPAY":
+            alipay_bytes = _qr_png_bytes(qr_code)
+            wechat_path = Path(__file__).resolve().parent / "static" / "payment_wechat_qr.png"
+            if not wechat_path.is_file():
+                raise RuntimeError("payment_wechat_qr_missing")
+            wechat_bytes = wechat_path.read_bytes()
+            alipay_uri = "data:image/png;base64," + base64.b64encode(alipay_bytes).decode("ascii")
+            wechat_uri = "data:image/png;base64," + base64.b64encode(wechat_bytes).decode("ascii")
+            st.markdown(
+                f"""
+                <style media="all">
+                .sp-payment-grid {{
+                    display:grid;
+                    grid-template-columns:repeat(2,minmax(0,1fr));
+                    gap:1rem;
+                    align-items:start;
+                    margin:.35rem 0 .6rem;
+                }}
+                .sp-payment-card {{text-align:center; min-width:0;}}
+                .sp-payment-card strong {{display:block; margin-bottom:.4rem;}}
+                .sp-payment-qr-frame {{
+                    width:min(100%,300px);
+                    aspect-ratio:1/1;
+                    margin:0 auto;
+                    display:flex;
+                    align-items:center;
+                    justify-content:center;
+                    overflow:hidden;
+                }}
+                .sp-payment-qr-frame img {{
+                    width:100%;
+                    height:100%;
+                    object-fit:contain;
+                    display:block;
+                }}
+                @media (max-width:640px) {{
+                    .sp-payment-grid {{grid-template-columns:1fr;}}
+                    .sp-payment-qr-frame {{width:min(86vw,300px);}}
+                }}
+                </style>
+                <div class="sp-payment-grid">
+                  <div class="sp-payment-card">
+                    <strong>{html.escape(tr(language, 'payment_channel_alipay'))}</strong>
+                    <div class="sp-payment-qr-frame"><img src="{alipay_uri}" alt="Alipay QR"></div>
+                  </div>
+                  <div class="sp-payment-card">
+                    <strong>{html.escape(tr(language, 'payment_channel_wechat'))}</strong>
+                    <div class="sp-payment-qr-frame"><img src="{wechat_uri}" alt="WeChat QR"></div>
+                  </div>
+                </div>
+                """,
+                unsafe_allow_html=True,
+            )
+            st.caption(tr(language, "payment_scan_dual", channel=tr(language, f"payment_channel_{payment_channel.lower()}")))
+        else:
+            st.image(_qr_png_bytes(qr_code), width=280)
         order_no = str(order.get("merchant_order_no") or "").strip()
         if order_no:
             st.caption(tr(language, "payment_order_no", order_no=order_no))
             st.code(order_no)
-        payment_provider = str(order.get("payment_provider") or "").strip().upper()
-        if payment_provider == "MANUAL_ALIPAY":
-            st.caption(tr(language, "payment_scan_manual"))
-        else:
+        if payment_provider != "MANUAL_ALIPAY":
             st.caption(tr(language, "payment_scan"))
         support = order.get("payment_support") if isinstance(order.get("payment_support"), dict) else {}
         support_wechat = str((support or {}).get("wechat") or "").strip()
@@ -660,6 +758,7 @@ def _render_payment_purchase_body(language: str) -> None:
                 st.session_state["sp_payment_order"] = None
                 st.session_state["sp_payment_request_id"] = ""
                 st.session_state["sp_payment_package_sku"] = ""
+                st.session_state["sp_payment_order_channel"] = ""
                 if product_mode and selected_product is not None:
                     tier_name = tr(language, f"product_tier_{str(selected_product.get('product_tier') or '').lower()}")
                     st.success(
@@ -676,6 +775,7 @@ def _render_payment_purchase_body(language: str) -> None:
                 st.session_state["sp_payment_order"] = None
                 st.session_state["sp_payment_request_id"] = ""
                 st.session_state["sp_payment_package_sku"] = ""
+                st.session_state["sp_payment_order_channel"] = ""
                 st.warning(tr(language, "payment_expired"))
 
 
@@ -711,8 +811,8 @@ def render_logged_in_account(
         standard_remaining = entitlement["standard_remaining"]
         flagship_remaining = entitlement["flagship_remaining"]
     else:
-        free_remaining = user.get("daily_free_remaining", user.get("daily_free_limit", 3))
-        bonus_papers = user.get("bonus_papers", 0)
+        standard_remaining = "—"
+        flagship_remaining = "—"
 
     st.markdown(
         """
@@ -834,18 +934,11 @@ def render_logged_in_account(
 
     info_col, logout_col = st.columns([5.9, 1.65])
     with info_col:
-        if product_mode:
-            balance_markup = (
-                f"<span>{html.escape(tr(language, 'account_chip_standard', value=standard_remaining))}</span>"
-                f'<span class="sp-account-separator">•</span>'
-                f"<span>{html.escape(tr(language, 'account_chip_flagship', value=flagship_remaining))}</span>"
-            )
-        else:
-            balance_markup = (
-                f"<span>{html.escape(tr(language, 'account_chip_free', value=free_remaining))}</span>"
-                f'<span class="sp-account-separator">•</span>'
-                f"<span>{html.escape(tr(language, 'account_chip_bonus', value=bonus_papers))}</span>"
-            )
+        balance_markup = (
+            f"<span>{html.escape(tr(language, 'account_chip_standard', value=standard_remaining))}</span>"
+            f'<span class="sp-account-separator">•</span>'
+            f"<span>{html.escape(tr(language, 'account_chip_flagship', value=flagship_remaining))}</span>"
+        )
         st.markdown(
             f"""
             <div class="sp-account-card">