commit

Author: bufdev

internal/ibctl/ibctlconfig/ibctlconfig.go

@@ -102,7 +102,8 @@ type ExternalConfigV1 struct {
 	Cash map[string]string `yaml:"cash"`
 	// Taxes configures capital gains tax rates for portfolio value computation.
 	Taxes *ExternalTaxConfigV1 `yaml:"taxes"`
-	// Additions is the list of manually added trades from non-IBKR brokers.
+	// Additions is the list of manually added trades.
+	// Additions with an IBKR account alias merge into that account.
 	Additions []ExternalAdditionV1 `yaml:"additions"`
 	// RealtimeSymbols maps IBKR symbols to Yahoo Finance symbols for --realtime quote lookups.
 	// Only needed for international tickers where symbols differ (e.g., SHOP → SHOP.TO).
@@ -178,9 +179,11 @@ type ExternalCategorizationV1 struct {
 	Geo string `yaml:"geo"`
 }
 
-// ExternalAdditionV1 holds a manually added trade from a non-IBKR broker.
+// ExternalAdditionV1 holds a manually added trade.
+// Additions with an IBKR account alias merge into that account for FIFO lot matching.
 type ExternalAdditionV1 struct {
-	// AccountAlias is the account alias for this addition (must not match an IBKR account alias).
+	// AccountAlias is the account alias for this addition.
+	// May match an IBKR account alias to merge trades into an existing account.
 	AccountAlias string `yaml:"account_alias"`
 	// Symbol is the ticker symbol.
 	Symbol string `yaml:"symbol"`
@@ -199,6 +202,9 @@ type ExternalAdditionV1 struct {
 	LastPrice string `yaml:"last_price"`
 	// TaxExempt indicates whether this trade is in a tax-sheltered account.
 	TaxExempt bool `yaml:"tax_exempt"`
+	// UpdateCash adjusts the cash balance for this addition's currency.
+	// Buys subtract (trade_price * quantity), sells add.
+	UpdateCash bool `yaml:"update_cash"`
 }
 
 // Config is the validated runtime configuration derived from the config file.
@@ -221,7 +227,7 @@ type Config struct {
 	TaxRateSTCG float64
 	// TaxRateLTCG is the long-term capital gains tax rate (e.g., 0.28).
 	TaxRateLTCG float64
-	// Additions is the list of validated addition trades from non-IBKR brokers.
+	// Additions is the list of validated manual addition trades.
 	Additions []Addition
 	// AdditionLastPrices maps symbols to their fallback last price in micros.
 	// Used when no IBKR position exists for the symbol.
@@ -264,7 +270,7 @@ type SymbolConfig struct {
 	Geo string
 }
 
-// Addition is a validated addition trade from a non-IBKR broker.
+// Addition is a validated manual addition trade.
 type Addition struct {
 	// AccountAlias is the account alias for this addition.
 	AccountAlias string
@@ -284,6 +290,9 @@ type Addition struct {
 	LastPrice int64
 	// TaxExempt indicates whether this trade is in a tax-sheltered account.
 	TaxExempt bool
+	// UpdateCash adjusts the cash balance for this addition's currency.
+	// Buys subtract (trade_price * quantity), sells add.
+	UpdateCash bool
 }
 
 // NewConfigV1 validates an ExternalConfigV1 and returns a runtime Config.
@@ -358,11 +367,15 @@ func NewConfigV1(externalConfig ExternalConfigV1, dirPath string) (*Config, erro
 			taxPaid[strings.ToUpper(currency)] = units*1_000_000 + micros
 		}
 	}
-	// Parse and validate additions from non-IBKR brokers.
-	additions, additionLastPrices, err := parseAdditions(externalConfig.Additions, accountAliases)
+	// Parse and validate additions (manual trades that merge into the portfolio).
+	additions, additionLastPrices, additionCashAdjustments, err := parseAdditions(externalConfig.Additions)
 	if err != nil {
 		return nil, err
 	}
+	// Fold in cash adjustments from update_cash additions.
+	for currency, adjustment := range additionCashAdjustments {
+		cashAdjustments[currency] += adjustment
+	}
 	// Build realtime symbols map, defaulting to empty if not configured.
 	// Build realtime symbols map, defaulting to empty if not configured.
 	realtimeSymbols := externalConfig.RealtimeSymbols
@@ -479,33 +492,34 @@ func ValidateConfig(dirPath string) error {
 // *** PRIVATE ***
 
 // parseAdditions validates and converts external addition configs to runtime Addition structs.
-// Returns the parsed additions and a map of symbol → last price in micros.
-func parseAdditions(externalAdditions []ExternalAdditionV1, ibkrAliases map[string]string) ([]Addition, map[string]int64, error) {
+// Returns the parsed additions, a map of symbol → last price in micros, and
+// a map of currency → cash adjustment in micros from update_cash additions.
+func parseAdditions(externalAdditions []ExternalAdditionV1) ([]Addition, map[string]int64, map[string]int64, error) {
 	additions := make([]Addition, 0, len(externalAdditions))
 	additionLastPrices := make(map[string]int64)
+	// Accumulated cash adjustments from update_cash additions, keyed by currency code.
+	additionCashAdjustments := make(map[string]int64)
 	for i, ext := range externalAdditions {
 		if ext.AccountAlias == "" {
-			return nil, nil, fmt.Errorf("addition[%d]: account_alias is required", i)
-		}
-		// Addition account aliases must not match any IBKR account alias.
-		if _, ok := ibkrAliases[ext.AccountAlias]; ok {
-			return nil, nil, fmt.Errorf("addition[%d]: account_alias %q conflicts with an IBKR account alias", i, ext.AccountAlias)
+			return nil, nil, nil, fmt.Errorf("addition[%d]: account_alias is required", i)
 		}
+		// Addition account aliases may match IBKR account aliases — those trades
+		// merge naturally into the IBKR account for FIFO lot matching.
 		if ext.Symbol == "" {
-			return nil, nil, fmt.Errorf("addition[%d]: symbol is required", i)
+			return nil, nil, nil, fmt.Errorf("addition[%d]: symbol is required", i)
 		}
 		if ext.CurrencyCode == "" {
-			return nil, nil, fmt.Errorf("addition[%d]: currency_code is required", i)
+			return nil, nil, nil, fmt.Errorf("addition[%d]: currency_code is required", i)
 		}
 		// Parse trade date in YYYYMMDD format.
 		tradeDate, err := time.Parse("20060102", ext.TradeDate)
 		if err != nil {
-			return nil, nil, fmt.Errorf("addition[%d]: trade_date %q must be YYYYMMDD format: %w", i, ext.TradeDate, err)
+			return nil, nil, nil, fmt.Errorf("addition[%d]: trade_date %q must be YYYYMMDD format: %w", i, ext.TradeDate, err)
 		}
 		// Parse trade price as micros.
 		tradePriceUnits, tradePriceMicros, err := mathpb.ParseToUnitsMicros(ext.TradePrice)
 		if err != nil {
-			return nil, nil, fmt.Errorf("addition[%d]: invalid trade_price %q: %w", i, ext.TradePrice, err)
+			return nil, nil, nil, fmt.Errorf("addition[%d]: invalid trade_price %q: %w", i, ext.TradePrice, err)
 		}
 		// Parse trade side.
 		var tradeSide datav1.TradeSide
@@ -515,17 +529,17 @@ func parseAdditions(externalAdditions []ExternalAdditionV1, ibkrAliases map[stri
 		case "sell":
 			tradeSide = datav1.TradeSide_TRADE_SIDE_SELL
 		default:
-			return nil, nil, fmt.Errorf("addition[%d]: trade_side must be \"buy\" or \"sell\", got %q", i, ext.TradeSide)
+			return nil, nil, nil, fmt.Errorf("addition[%d]: trade_side must be \"buy\" or \"sell\", got %q", i, ext.TradeSide)
 		}
 		// Parse quantity as micros.
 		quantityUnits, quantityMicros, err := mathpb.ParseToUnitsMicros(ext.Quantity)
 		if err != nil {
-			return nil, nil, fmt.Errorf("addition[%d]: invalid quantity %q: %w", i, ext.Quantity, err)
+			return nil, nil, nil, fmt.Errorf("addition[%d]: invalid quantity %q: %w", i, ext.Quantity, err)
 		}
 		// Parse last price as micros.
 		lastPriceUnits, lastPriceMicros, err := mathpb.ParseToUnitsMicros(ext.LastPrice)
 		if err != nil {
-			return nil, nil, fmt.Errorf("addition[%d]: invalid last_price %q: %w", i, ext.LastPrice, err)
+			return nil, nil, nil, fmt.Errorf("addition[%d]: invalid last_price %q: %w", i, ext.LastPrice, err)
 		}
 		lastPriceTotalMicros := lastPriceUnits*1_000_000 + lastPriceMicros
 		additions = append(additions, Addition{
@@ -542,14 +556,28 @@ func parseAdditions(externalAdditions []ExternalAdditionV1, ibkrAliases map[stri
 			Quantity:   quantityUnits*1_000_000 + quantityMicros,
 			LastPrice:  lastPriceTotalMicros,
 			TaxExempt:  ext.TaxExempt,
+			UpdateCash: ext.UpdateCash,
 		})
 		// Store the last price for fallback market price lookup.
 		// Last addition for a symbol wins (allows overriding per-symbol).
 		if lastPriceTotalMicros != 0 {
 			additionLastPrices[ext.Symbol] = lastPriceTotalMicros
 		}
+		// Accumulate cash adjustment: buys subtract, sells add.
+		if ext.UpdateCash {
+			tradePriceTotalMicros := tradePriceUnits*1_000_000 + tradePriceMicros
+			quantityTotalMicros := quantityUnits*1_000_000 + quantityMicros
+			// trade_price is in micros, quantity is in micros, so multiply and divide
+			// by 1_000_000 to get cost in micros: (price * qty) / 1_000_000.
+			costMicros := tradePriceTotalMicros * quantityTotalMicros / 1_000_000
+			if tradeSide == datav1.TradeSide_TRADE_SIDE_BUY {
+				additionCashAdjustments[ext.CurrencyCode] -= costMicros
+			} else {
+				additionCashAdjustments[ext.CurrencyCode] += costMicros
+			}
+		}
 	}
-	return additions, additionLastPrices, nil
+	return additions, additionLastPrices, additionCashAdjustments, nil
 }
 
 // unmarshalYAMLStrict unmarshals the data as YAML with strict field checking.