P0-R6-E1-R4-1D-C

app.py

@@ -815,6 +815,13 @@ def _process_pending_cancel() -> None:
     st.rerun()
 
 
+def _process_pending_payment_dialog(lang_code: str) -> None:
+    """Reopen purchase dialog until the initial browser bridge creates its trusted order."""
+    if not bool(st.session_state.get("sp_payment_dialog_pending")):
+        return
+    render_payment_purchase(lang_code)
+
+
 def _process_pending_resume() -> None:
     task_id = str(st.session_state.get("sp_pending_resume_task_id") or "").strip()
     if not task_id:
@@ -1728,8 +1735,9 @@ def render_workspace_controls(user):
         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)
+            if st.button(f"💳 {tr(lang_code, 'payment_open')}", key="btn_open_payment_for_selected_tier"):
+                st.session_state["sp_payment_dialog_pending"] = True
+                st.rerun()
         can_start = bool(
             preflight.get("can_start_generation")
             and product_ui_ready
@@ -1792,11 +1800,13 @@ if isinstance(_notice, dict) and _notice.get("message"):
 _process_pending_cancel()
 _process_pending_resume()
 _process_pending_launch(lang_code)
+_process_pending_payment_dialog(lang_code)
 
 if st.session_state.get("sp_payment_required"):
     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)
+    if st.button(f"💳 {tr(lang_code, 'payment_open')}", key="btn_open_payment_after_rejection"):
+        st.session_state["sp_payment_dialog_pending"] = True
+        st.rerun()
 
 # 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

managed_auth.py

@@ -141,6 +141,7 @@ def _clear_generation_session_state() -> None:
         "up_asq_data", "sp_payment_required", "sp_payment_order",
         "sp_payment_request_id", "sp_payment_package_sku",
         "sp_payment_channel", "sp_payment_order_channel",
+        "sp_payment_dialog_pending",
     ):
         st.session_state.pop(key, None)
 
@@ -150,6 +151,7 @@ def _clear_session() -> None:
         "sp_session_expires_at", "sp_user",
         "sp_last_verified_at", "sp_edge_assertion", "sp_auth_api_origin",
         "sp_product_ui_projection", "sp_product_tier",
+        "sp_account_pending_command_id",
     ):
         st.session_state.pop(key, None)
 
@@ -322,14 +324,22 @@ def get_product_ui_projection() -> dict[str, Any]:
 
 
 def get_account_snapshot(*, block: bool = False) -> dict[str, Any] | None:
-    bucket = int(time.time() // 30)
+    # External entitlement mutations (administrator adjustment/payment credit/
+    # another device) cannot increment this browser's local revision. Keep one
+    # command id stable only for the browser-bridge handshake, then retire it
+    # after a completed response so the next Streamlit rerun performs a fresh
+    # Worker/D1 account read instead of reusing a time-bucketed cached result.
     revision = int(st.session_state.get("sp_account_revision") or 0)
-    command_id = f"account:{revision}:{bucket}"
+    command_id = str(st.session_state.get("sp_account_pending_command_id") or "").strip()
+    if not command_id:
+        command_id = f"account:{revision}:{secrets.token_urlsafe(10)}"
+        st.session_state["sp_account_pending_command_id"] = command_id
     result = _edge_call("account", command_id, {}, key_prefix="sp_account")
     if result is None:
         if block:
             st.stop()
         return None
+    st.session_state.pop("sp_account_pending_command_id", None)
     if not result.get("ok"):
         if block:
             _raise_edge_error(result, "account_query_failed")
@@ -651,6 +661,12 @@ def _render_payment_purchase_body(language: str) -> None:
             st.session_state["sp_product_ui_projection"] = _normalize_product_ui_projection(projected)
 
     order = st.session_state.get("sp_payment_order") or {}
+    if str(order.get("merchant_order_no") or "").strip():
+        # The app-level pending flag exists only to survive the initial
+        # browser-bridge handshake. Once the trusted order exists, clear it
+        # inside the dialog fragment so manually closing the dialog does not
+        # cause an unrelated later rerun to reopen it.
+        st.session_state["sp_payment_dialog_pending"] = False
     qr_code = str(order.get("qr_code") or "").strip()
     if qr_code:
         payment_provider = str(order.get("payment_provider") or "").strip().upper()
@@ -827,8 +843,8 @@ def render_logged_in_account(
             padding: 0.48rem clamp(0.55rem, 0.85vw, 0.9rem);
             border: 1px solid rgba(148, 163, 184, 0.30);
             border-radius: 13px;
-            background: rgba(30, 41, 59, 0.58);
-            color: var(--text-color, #f3f4f6);
+            background: #1e293b;
+            color: #f8fafc;
             font-size: clamp(0.76rem, 0.84vw, 0.92rem);
             font-weight: 500;
             line-height: 1.25;
@@ -866,8 +882,8 @@ def render_logged_in_account(
             padding: 0.45rem 0.72rem;
             border: 1px solid rgba(148, 163, 184, 0.30);
             border-radius: 0.5rem;
-            background: transparent;
-            color: var(--text-color, #f3f4f6) !important;
+            background: #1e293b;
+            color: #f8fafc !important;
             text-decoration: none !important;
             white-space: nowrap !important;
             overflow-wrap: normal !important;
@@ -882,8 +898,8 @@ def render_logged_in_account(
 
         .sp-logout-link:hover {
             border-color: rgba(255, 75, 75, 0.78);
-            background: rgba(255, 255, 255, 0.035);
-            color: var(--text-color, #f3f4f6) !important;
+            background: #334155;
+            color: #f8fafc !important;
         }
 
         .sp-logout-link:focus-visible {