Fix hub options float summary blank when bid book is invalid.

Stop treating total_received=0 as a real bid recycle, fall back to exchange upl for display totals, and keep row/summary aligned.

Co-authored-by: Cursor <cursoragent@cursor.com>

lib/common/static/options_panel.js

@@ -753,15 +753,27 @@
 
   function netPnlFromPos(p) {
     const preview = (p && p.close_preview) || {};
+    if (preview.bid_invalid) {
+      const upl = p && p.upl != null ? Number(p.upl) : NaN;
+      return Number.isFinite(upl) ? upl : null;
+    }
     if (preview.estimated_pnl != null && !Number.isNaN(Number(preview.estimated_pnl))) {
       return Number(preview.estimated_pnl);
     }
+    const covered = Number(preview.covered_sheets);
     const recv = Number(preview.total_received);
     const prem = Number(p && p.premium_paid);
-    if (preview.total_received != null && !Number.isNaN(recv) && !Number.isNaN(prem)) {
+    if (
+      preview.total_received != null &&
+      Number.isFinite(covered) &&
+      covered > 0 &&
+      !Number.isNaN(recv) &&
+      !Number.isNaN(prem)
+    ) {
       return recv - prem;
     }
-    return null;
+    const upl = p && p.upl != null ? Number(p.upl) : NaN;
+    return Number.isFinite(upl) ? upl : null;
   }
 
   function netRoiFromPos(p, net) {

lib/common/static/options_position_cards.js

@@ -103,15 +103,27 @@
 
   function netPnlFromPos(p) {
     const preview = (p && p.close_preview) || {};
+    if (preview.bid_invalid) {
+      const upl = p && p.upl != null ? Number(p.upl) : NaN;
+      return Number.isFinite(upl) ? upl : null;
+    }
     if (preview.estimated_pnl != null && !Number.isNaN(Number(preview.estimated_pnl))) {
       return Number(preview.estimated_pnl);
     }
+    const covered = Number(preview.covered_sheets);
     const recv = Number(preview.total_received);
     const prem = Number(p && p.premium_paid);
-    if (preview.total_received != null && !Number.isNaN(recv) && !Number.isNaN(prem)) {
+    if (
+      preview.total_received != null &&
+      Number.isFinite(covered) &&
+      covered > 0 &&
+      !Number.isNaN(recv) &&
+      !Number.isNaN(prem)
+    ) {
       return recv - prem;
     }
-    return null;
+    const upl = p && p.upl != null ? Number(p.upl) : NaN;
+    return Number.isFinite(upl) ? upl : null;
   }
 
   function netRoiFromPos(p, net) {
@@ -170,9 +182,9 @@
     const pnlCells = hidePnl
       ? ""
       : '<div class="pos-cell"><span class="pos-label">净盈亏</span><span class="pos-value ' + uplCls + '">' +
-        (closePreview.bid_invalid || net == null ? "—" : fmt(net, 2)) + "</span></div>" +
+        (net == null ? "—" : fmt(net, 2)) + "</span></div>" +
         '<div class="pos-cell"><span class="pos-label">收益率</span><span class="pos-value ' + uplCls + '">' +
-        (closePreview.bid_invalid || roi == null ? "—" : fmt(roi, 2) + "%") + "</span></div>";
+        (roi == null ? "—" : fmt(roi, 2) + "%") + "</span></div>";
     return (
       '<div class="pos-card-head">' +
       '<div class="pos-card-symbol"><strong>' + (p.inst_id || "") + "</strong>" +

lib/hub/hub_options_funds_lib.py

@@ -54,11 +54,27 @@ def options_float_pnl_usdt(options_snap: dict[str, Any] | None) -> Optional[floa
     if snap.get("enabled") is False or snap.get("ok") is False:
         return None
     upl = snap.get("upl_total_usdc")
-    if upl is None:
-        return None
+    if upl is not None:
+        try:
+            return round(float(upl), 4)
+        except (TypeError, ValueError):
+            pass
+    # 快照偶发缺合计时,按持仓行回退汇总(与卡片展示一致)
     try:
-        return round(float(upl), 4)
-    except (TypeError, ValueError):
+        from lib.options.options_positions_lib import display_pnl_from_option_row
+
+        total = 0.0
+        found = False
+        for p in snap.get("positions") or []:
+            if not isinstance(p, dict):
+                continue
+            pnl = display_pnl_from_option_row(p)
+            if pnl is None:
+                continue
+            found = True
+            total += float(pnl)
+        return round(total, 4) if found else None
+    except Exception:
         return None
 
 

lib/instance/instance_dashboard_lib.py

@@ -142,12 +142,12 @@ def _format_options_item(p: dict[str, Any], *, conn=None) -> dict[str, Any]:
     inst = str(p.get("inst_id") or p.get("instId") or "-").strip() or "-"
     opt_type = str(p.get("opt_type") or p.get("optType") or "").upper()
     label = "Call" if opt_type == "C" else "Put" if opt_type == "P" else (opt_type or "OPT")
-    # 看板期权列固定用净盈亏(买一回收−权利金);残档买一则空.
+    # 看板期权列:优先买一净盈亏,残档回退交易所 upl
     pnl = None
     try:
-        from lib.options.options_positions_lib import net_pnl_from_display_row
+        from lib.options.options_positions_lib import display_pnl_from_option_row
 
-        pnl = net_pnl_from_display_row(p)
+        pnl = display_pnl_from_option_row(p)
     except Exception:
         pnl = None
     pos = _safe_float(p.get("pos"))

lib/options/options_hub_lib.py

@@ -66,17 +66,17 @@ def build_options_hub_snapshot(cfg: dict[str, Any]) -> dict[str, Any]:
                 conn.close()
         except Exception:
             target_monitors = []
-        from lib.options.options_positions_lib import net_pnl_from_display_row
+        from lib.options.options_positions_lib import display_pnl_from_option_row
 
         upl_total = 0.0
         has_upl = False
         for p in positions:
-            # 与持仓卡「净盈亏」一致(买一回收−权利金);不用交易所标记价 upl
-            net = net_pnl_from_display_row(p)
-            if net is None:
+            # 与持仓卡展示一致:优先买一净盈亏,残档回退交易所 upl
+            pnl = display_pnl_from_option_row(p)
+            if pnl is None:
                 continue
             has_upl = True
-            upl_total += float(net)
+            upl_total += float(pnl)
         bal = cfg["fetch_options_balances"](ex)
         return {
             "ok": True,

lib/options/options_positions_lib.py

@@ -92,13 +92,26 @@ def net_pnl_from_display_row(row: dict[str, Any]) -> float | None:
             return float(net)
         except (TypeError, ValueError):
             pass
+    # 仅当实际吃到买盘张数时,才用 total_received − 权利金(避免 bid 无效时 total_received=0 算出 −权利金假亏)
+    try:
+        covered = float(preview.get("covered_sheets") or 0)
+    except (TypeError, ValueError):
+        covered = 0.0
     recv = _safe_float(preview.get("total_received"))
     paid = _safe_float(row.get("premium_paid"))
-    if recv is not None and paid is not None:
+    if covered > 0 and recv is not None and paid is not None:
         return round(recv - paid, 4)
     return None
 
 
+def display_pnl_from_option_row(row: dict[str, Any]) -> float | None:
+    """展示用盈亏:优先买一净盈亏;残档/无买一时回退交易所标记浮盈 upl."""
+    net = net_pnl_from_display_row(row)
+    if net is not None:
+        return net
+    return _safe_float(row.get("upl"))
+
+
 def sum_options_net_pnl_usdc(
     cfg: dict[str, Any],
     ex: Any,
@@ -106,7 +119,8 @@ def sum_options_net_pnl_usdc(
 ) -> float | None:
     """
     期权浮盈合计(USDC),与顶栏实时盈亏/中控口径对齐为「净盈亏」:
-    各仓买一可回收 − 权利金之和.获取失败返回 None;无持仓返回 0.
+    各仓买一可回收 − 权利金之和;残档则回退该仓交易所 upl.
+    获取失败返回 None;无持仓返回 0.
     """
     raw = raw_positions
     if raw is None:
@@ -119,11 +133,11 @@ def sum_options_net_pnl_usdc(
     total = 0.0
     found = False
     for p in positions:
-        net = net_pnl_from_display_row(p)
-        if net is None:
+        pnl = display_pnl_from_option_row(p)
+        if pnl is None:
             continue
         found = True
-        total += float(net)
+        total += float(pnl)
     return round(total, 4) if found else (0.0 if not positions else None)
 
 

lib/options/templates/options_panel.html

@@ -324,4 +324,4 @@
     </div>
 </div>
 <script src="/static/options_expiry_countdown.js?v=1"></script>
-<script src="/static/options_panel.js?v=52"></script>
+<script src="/static/options_panel.js?v=53"></script>