Add end-plan action; never show unfilled option legs as open.

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

lib/hedge_plan/hedge_plan_register.py

@@ -588,6 +588,24 @@ def register_hedge_plan_routes(app: Flask, cfg: dict[str, Any]) -> None:
         out["gates"] = gates
         return jsonify(out), (200 if out.get("ok") else 400)
 
+    @app.route("/api/hedge-plan/<int:plan_id>/end", methods=["POST"])
+    @lr
+    def api_hedge_end_plan(plan_id: int):
+        """人工结束进行中计划:不自动平仓;未成交腿改为 cancelled."""
+        from lib.hedge_plan.hedge_plan_db import init_hedge_plan_tables
+        from lib.hedge_plan.hedge_plan_orders_lib import execute_manual_end_plan
+
+        conn = cfg["get_db"]()
+        try:
+            init_hedge_plan_tables(conn)
+            out = execute_manual_end_plan(cfg, conn, plan_id)
+            if not out.get("ok"):
+                return jsonify(out), 400
+            conn.commit()
+        finally:
+            conn.close()
+        return jsonify(out)
+
     @app.route("/api/hedge-plan/<int:plan_id>/complete-leg", methods=["POST"])
     @lr
     def api_hedge_complete_leg(plan_id: int):
@@ -742,6 +760,7 @@ def register_hedge_plan_routes(app: Flask, cfg: dict[str, Any]) -> None:
             init_hedge_plan_tables,
             list_plans,
         )
+        from lib.hedge_plan.hedge_plan_orders_lib import reconcile_unfilled_option_legs
 
         conn = cfg["get_db"]()
         try:
@@ -750,6 +769,16 @@ def register_hedge_plan_routes(app: Flask, cfg: dict[str, Any]) -> None:
             for status in ("opening", "active", "partial"):
                 rows.extend(list_plans(conn, status=status, limit=80))
             rows.sort(key=lambda row: int(row.get("id") or 0), reverse=True)
+            for row in rows:
+                try:
+                    reconcile_unfilled_option_legs(cfg, conn, int(row["id"]))
+                except Exception:
+                    pass
+            # 校正后可能 status 变化,重新拉一遍
+            rows = []
+            for status in ("opening", "active", "partial"):
+                rows.extend(list_plans(conn, status=status, limit=80))
+            rows.sort(key=lambda row: int(row.get("id") or 0), reverse=True)
             plans = attach_legs_to_plans(conn, rows)
             conn.commit()
         finally:
@@ -779,6 +808,7 @@ def register_hedge_plan_routes(app: Flask, cfg: dict[str, Any]) -> None:
             init_hedge_plan_tables,
             legs_contract_summary,
         )
+        from lib.hedge_plan.hedge_plan_orders_lib import reconcile_unfilled_option_legs
 
         conn = cfg["get_db"]()
         try:
@@ -786,6 +816,10 @@ def register_hedge_plan_routes(app: Flask, cfg: dict[str, Any]) -> None:
             plan = get_plan(conn, plan_id)
             if not plan:
                 return jsonify({"ok": False, "msg": "计划不存在"}), 404
+            # 打开细节时校正:无成交却标 open → cancelled
+            if str(plan.get("status") or "") in ("opening", "active", "partial"):
+                reconcile_unfilled_option_legs(cfg, conn, plan_id)
+                plan = get_plan(conn, plan_id) or plan
             legs = get_plan_legs(conn, plan_id)
             conn.commit()
         finally: