fix(execution): bridge cash-only sell-funded buys

application/execution_service.py

@@ -1225,6 +1225,76 @@ def _should_bootstrap_whole_share_buy(symbol, *, target_value, limit_price) -> b
     return max(0.0, float(target_value or 0.0)) >= effective_limit_price * float(min_target_share_ratio)
 
 
+def _should_top_up_existing_whole_share_buy(symbol, *, target_gap_value, limit_price, quantity=0.0) -> bool:
+    normalized_symbol = str(symbol or "").strip().upper()
+    if normalized_symbol not in SMALL_ACCOUNT_WHOLE_SHARE_BOOTSTRAP_MIN_TARGET_SHARE_RATIO_BY_SYMBOL:
+        return False
+    if max(0.0, float(quantity or 0.0)) <= 0.0:
+        return False
+    effective_limit_price = max(0.0, float(limit_price or 0.0))
+    if effective_limit_price <= 0.0:
+        return False
+    return max(0.0, float(target_gap_value or 0.0)) >= (
+        effective_limit_price * float(_SMALL_ACCOUNT_RETENTION_MIN_TARGET_SHARE_RATIO_DEFAULT)
+    )
+
+
+def _planned_buy_order_quantity(
+    symbol,
+    *,
+    buy_value,
+    limit_price,
+    quantity_step,
+    investable_buying_power,
+    held_quantity=0.0,
+) -> tuple[float, bool]:
+    effective_limit_price = max(0.0, float(limit_price or 0.0))
+    qty = (
+        _floor_order_quantity(float(buy_value or 0.0) / effective_limit_price, quantity_step=quantity_step)
+        if effective_limit_price > 0.0
+        else 0.0
+    )
+    forced_whole_share = False
+    if (
+        qty <= 0
+        and effective_limit_price > 0.0
+        and float(investable_buying_power or 0.0) >= effective_limit_price
+        and (
+            _should_top_up_existing_whole_share_buy(
+                symbol,
+                target_gap_value=buy_value,
+                limit_price=effective_limit_price,
+                quantity=held_quantity,
+            )
+            or _should_bootstrap_whole_share_buy(
+                symbol,
+                target_value=buy_value,
+                limit_price=effective_limit_price,
+            )
+        )
+    ):
+        qty = _floor_order_quantity(1.0, quantity_step=quantity_step)
+        forced_whole_share = qty > 0
+    return qty, forced_whole_share
+
+
+def _projected_sell_release_value_for_report(report, *, fallback_price=0.0, fallback_quantity=0.0) -> float:
+    status = str(getattr(report, "status", "") or "")
+    if status not in {"Filled", "PartiallyFilled", "Partial"}:
+        return 0.0
+    filled_quantity = float(getattr(report, "filled_quantity", 0.0) or 0.0)
+    if status == "Filled" and filled_quantity <= 0.0:
+        filled_quantity = float(getattr(report, "quantity", 0.0) or fallback_quantity or 0.0)
+    if filled_quantity <= 0.0:
+        return 0.0
+    fill_price = float(getattr(report, "average_fill_price", 0.0) or 0.0)
+    if fill_price <= 0.0:
+        fill_price = max(0.0, float(fallback_price or 0.0))
+    if fill_price <= 0.0:
+        return 0.0
+    return filled_quantity * fill_price
+
+
 def _format_symbol_with_suffix(symbol, *, suffix=".US") -> str:
     normalized = str(symbol or "").strip().upper()
     if not normalized:
@@ -1370,6 +1440,7 @@ def record_quote_snapshot(symbol, snapshot) -> None:
         "small_account_whole_share_cash_notes": [],
         "small_account_allocation_drift_notes": [],
         "residual_cash_estimate": float(account_values.get("buying_power", 0.0) or 0.0),
+        "projected_sell_release_value": 0.0,
         "current_stock_weight": 0.0,
         "current_safe_haven_weight": 0.0,
         "price_source_mode": "market_quote",
@@ -1778,10 +1849,13 @@ def cash_sweep_sale_quantity_to_fund_buy(max_quantity: int, candidate_symbols: t
             min_notional_symbols.append(symbol)
             continue
         limit_price = _limit_buy_price(symbol, price, limit_buy_premium, limit_buy_premium_by_symbol)
-        qty = (
-            _floor_order_quantity(buy_value / limit_price, quantity_step=order_quantity_step)
-            if limit_price > 0
-            else 0
+        qty, _forced_whole_share = _planned_buy_order_quantity(
+            symbol,
+            buy_value=buy_value,
+            limit_price=limit_price,
+            quantity_step=order_quantity_step,
+            investable_buying_power=investable_anticipated_buying_power,
+            held_quantity=max(0.0, float(positions.get(symbol, {}).get("quantity", 0.0) or 0.0)),
         )
         if qty > 0:
             has_buy_plan = True
@@ -1900,6 +1974,7 @@ def cash_sweep_sale_quantity_to_fund_buy(max_quantity: int, candidate_symbols: t
     execution_summary["execution_status"] = "executing"
 
     sell_executed = False
+    projected_sell_release_value = 0.0
     pending_sell_release_symbols: list[str] = []
     for symbol in all_symbols:
         current = current_mv.get(symbol, 0)
@@ -1979,6 +2054,11 @@ def cash_sweep_sale_quantity_to_fund_buy(max_quantity: int, candidate_symbols: t
         trade_logs.append(translator("market_sell", symbol=symbol, qty=format_quantity(qty)) + f" {status_msg}")
         if ok:
             sell_executed = True
+            projected_sell_release_value += _projected_sell_release_value_for_report(
+                report,
+                fallback_price=price,
+                fallback_quantity=qty,
+            )
 
     if dry_run_only:
         buying_power = max(0.0, anticipated_buying_power + dry_run_sale_proceeds)
@@ -1992,9 +2072,15 @@ def cash_sweep_sale_quantity_to_fund_buy(max_quantity: int, candidate_symbols: t
                 currency=market_currency,
                 cash_only_execution=cash_only_execution,
             )
+            if cash_only_execution and projected_sell_release_value > 0.0:
+                buying_power = max(
+                    float(buying_power or 0.0),
+                    float(anticipated_buying_power or 0.0) + float(projected_sell_release_value),
+                )
         else:
             buying_power = anticipated_buying_power
     investable_buying_power = _investable_buying_power(buying_power, reserved)
+    execution_summary["projected_sell_release_value"] = float(projected_sell_release_value)
     pending_sell_release_symbols = list(dict.fromkeys(pending_sell_release_symbols))
     buy_needed_symbols = [
         symbol
@@ -2064,10 +2150,26 @@ def cash_sweep_sale_quantity_to_fund_buy(max_quantity: int, candidate_symbols: t
                 continue
 
             limit_price = _limit_buy_price(symbol, price, limit_buy_premium, limit_buy_premium_by_symbol)
-            qty = _floor_order_quantity(
-                buy_value / limit_price,
+            held_quantity = max(0.0, float(positions.get(symbol, {}).get("quantity", 0.0) or 0.0))
+            qty, forced_whole_share = _planned_buy_order_quantity(
+                symbol,
+                buy_value=buy_value,
+                limit_price=limit_price,
                 quantity_step=order_quantity_step,
+                investable_buying_power=investable_buying_power,
+                held_quantity=held_quantity,
             )
+            if (
+                forced_whole_share
+                and symbol not in execution_summary["small_account_whole_share_bootstrap_symbols"]
+            ):
+                execution_summary["small_account_whole_share_bootstrap_symbols"].append(symbol)
+                trade_logs.extend(
+                    _format_small_account_whole_share_bootstrap_notes(
+                        (symbol,),
+                        translator=translator,
+                    )
+                )
             if qty <= 0:
                 execution_summary["orders_skipped"].append({"symbol": symbol, "side": "buy", "reason": "quantity_zero"})
                 continue