修复回报上下文与盘前意图并在提交前采用最新完整目标

crates/fidc-core/src/strategy.rs

@@ -990,6 +990,15 @@ pub struct StrategyDecision {
 }
 
 impl StrategyDecision {
+    pub(crate) fn is_portfolio_target_only(&self) -> bool {
+        (self.rebalance && self.order_intents.is_empty())
+            || (self.order_intents.len() == 1
+                && matches!(
+                    self.order_intents[0].unwrapped(),
+                    OrderIntent::StockPool { .. } | OrderIntent::TargetPortfolioSmart { .. }
+                ))
+    }
+
     pub fn potential_buy_symbols(&self, open_orders: &[OpenOrderView]) -> BTreeSet<String> {
         let mut symbols = BTreeSet::new();
         if self.rebalance {
@@ -1003,9 +1012,24 @@ impl StrategyDecision {
     }
 
     pub fn merge_from(&mut self, mut other: StrategyDecision) {
+        if self.is_portfolio_target_only() && other.is_portfolio_target_only() {
+            let mut previous = std::mem::replace(self, other);
+            previous
+                .diagnostics
+                .push("unsubmitted_portfolio_target_superseded".into());
+            self.notes.splice(0..0, previous.notes);
+            self.diagnostics.splice(0..0, previous.diagnostics);
+            return;
+        }
         self.buy_denials.append(&mut other.buy_denials);
-        self.rebalance |= other.rebalance;
-        self.target_weights.append(&mut other.target_weights);
+        if other.rebalance {
+            // Rebalance targets are a complete portfolio, not an additive
+            // list. A newer unsent target replaces the earlier allocation.
+            self.rebalance = true;
+            self.target_weights = std::mem::take(&mut other.target_weights);
+        } else {
+            self.target_weights.append(&mut other.target_weights);
+        }
         self.exit_symbols.append(&mut other.exit_symbols);
         self.order_intents.append(&mut other.order_intents);
         self.notes.append(&mut other.notes);
@@ -1025,6 +1049,52 @@ impl StrategyDecision {
     }
 }
 
+#[cfg(test)]
+mod decision_merge_tests {
+    use super::*;
+
+    #[test]
+    fn newer_complete_target_replaces_old_symbols_without_discarding_explicit_actions() {
+        let mut earlier = StrategyDecision {
+            rebalance: true,
+            target_weights: BTreeMap::from([("A".into(), 0.5), ("B".into(), 0.5)]),
+            exit_symbols: BTreeSet::from(["risk_exit".into()]),
+            order_intents: vec![OrderIntent::Shares {
+                symbol: "explicit".into(),
+                quantity: 100,
+                reason: "explicit action".into(),
+            }],
+            ..Default::default()
+        };
+        earlier.merge_from(StrategyDecision {
+            rebalance: true,
+            target_weights: BTreeMap::from([("C".into(), 1.)]),
+            ..Default::default()
+        });
+        assert_eq!(earlier.target_weights, BTreeMap::from([("C".into(), 1.)]));
+        assert!(earlier.rebalance);
+        assert!(earlier.exit_symbols.contains("risk_exit"));
+        assert_eq!(earlier.order_intents.len(), 1);
+    }
+
+    #[test]
+    fn explicit_empty_complete_target_replaces_old_allocation_but_empty_callback_does_not() {
+        let mut decision = StrategyDecision {
+            rebalance: true,
+            target_weights: BTreeMap::from([("A".into(), 1.)]),
+            ..Default::default()
+        };
+        decision.merge_from(StrategyDecision::default());
+        assert_eq!(decision.target_weights.len(), 1);
+        decision.merge_from(StrategyDecision {
+            rebalance: true,
+            ..Default::default()
+        });
+        assert!(decision.target_weights.is_empty());
+        assert!(decision.rebalance);
+    }
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum AlgoOrderStyle {
     Vwap,