commit

Author: bufdev

cmd/ibctl/internal/command/holding/safesell/safeselllist/safeselllist.go

@@ -37,6 +37,8 @@ const (
 	realtimeFlagName = "realtime"
 	// separateAccountsFlagName is the flag name for per-account FIFO (CRA-style).
 	separateAccountsFlagName = "separate-accounts"
+	// excludedFlagName is the flag name for showing only config-excluded positions.
+	excludedFlagName = "excluded"
 )
 
 // NewCommand returns a new safe-sell list command.
@@ -73,10 +75,15 @@ ACCOUNT column is shown in this mode.
 EXCLUSIONS
 
 Symbols and asset types listed under safe_sell.exclude in ibctl.yaml are
-always omitted. Use safe_sell.exclude.symbols for specific tickers (e.g.,
-VTI, VXUS) and safe_sell.exclude.types for entire asset types (e.g., BOND,
-HOUSE). Types are matched against the type field from the categorization
-config.
+omitted by default. Use safe_sell.exclude.symbols for specific tickers
+(e.g., VTI, VXUS) and safe_sell.exclude.types for entire asset types
+(e.g., BOND, HOUSE). Types are matched against the type field from the
+categorization config.
+
+Use --excluded to invert the filter and show only the excluded positions.
+The same FIFO analysis is run on them so you can see what you would be
+selling if they were not excluded. The results of safe-sell, safe-sell
+--excluded, and unsafe-sell together cover the full holding list.
 
 STCG THRESHOLD
 
@@ -130,6 +137,8 @@ type flags struct {
 	Realtime bool
 	// SeparateAccounts applies FIFO independently per account (CRA-style).
 	SeparateAccounts bool
+	// Excluded shows only positions excluded by config instead of the safe-sell candidates.
+	Excluded bool
 }
 
 func newFlags() *flags {
@@ -143,6 +152,7 @@ func (f *flags) Bind(flagSet *pflag.FlagSet) {
 	flagSet.StringVar(&f.BaseCurrency, baseCurrencyFlagName, "USD", "Base currency for value conversion (e.g., USD, CAD)")
 	flagSet.BoolVar(&f.Realtime, realtimeFlagName, false, "Fetch real-time quotes and FX rates from Yahoo Finance")
 	flagSet.BoolVar(&f.SeparateAccounts, separateAccountsFlagName, false, "Apply FIFO independently per account (CRA-style)")
+	flagSet.BoolVar(&f.Excluded, excludedFlagName, false, "Show only positions excluded by config (inverse of default output)")
 }
 
 func run(ctx context.Context, container appext.Container, flags *flags) error {
@@ -204,6 +214,7 @@ func run(ctx context.Context, container appext.Container, flags *flags) error {
 		fxStore,
 		baseCurrency,
 		flags.SeparateAccounts,
+		flags.Excluded,
 	)
 	if err != nil {
 		return err

cmd/ibctl/internal/ibctlcmd/holdingsdata.go

@@ -281,10 +281,12 @@ func ComputeYTDTaxSummary(
 	todayStr := now.Format("2006-01-02")
 	var taxPaidMicros int64
 	for currency, amountMicros := range config.TaxPaid {
+		// Return an error if FX conversion fails — tax remaining would be wrong if we silently skipped.
 		convertedMicros, ok := fxStore.ConvertOnDate(amountMicros, currency, baseCurrency, todayStr)
-		if ok {
-			taxPaidMicros += convertedMicros
+		if !ok {
+			return nil, fmt.Errorf("FX conversion failed for tax paid amount: %s to %s on %s", currency, baseCurrency, todayStr)
 		}
+		taxPaidMicros += convertedMicros
 	}
 	return &YTDTaxSummary{
 		DividendMicros:     totals.DividendBaseMicros,

internal/ibctl/ibctlfxrates/ibctlfxrates.go

@@ -130,13 +130,25 @@ func (s *Store) ConvertOnDate(valueMicros int64, baseCurrency string, quoteCurre
 // Each key in pairRatesMicros is a pair key (e.g., "USD.CAD") and the value
 // is the rate in micros. This is used by --realtime to apply fresh rates
 // for the current command run without persisting to disk.
-func (s *Store) OverrideLatestRates(todayDate string, pairRatesMicros map[string]int64) {
+func (s *Store) OverrideLatestRates(todayDate string, pairRatesMicros map[string]int64) error {
+	// Pre-load any pairs from disk before overriding, so that historical rates
+	// are available alongside the real-time rate. Without this, a pair created
+	// here with only today's rate would shadow the on-disk historical data,
+	// causing ConvertOnDate lookups for past dates (e.g., lot open dates) to fail.
+	for pairKey := range pairRatesMicros {
+		base, quote, err := splitPairKey(pairKey)
+		if err != nil {
+			return err
+		}
+		// loadPair handles its own locking and is a no-op if already loaded.
+		s.loadPair(base, quote)
+	}
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	for pairKey, rateMicros := range pairRatesMicros {
-		pair, found := s.pairs[pairKey]
-		if !found || pair == nil {
-			// Create a new pair entry for a pair not yet loaded from disk.
+		pair := s.pairs[pairKey]
+		if pair == nil {
+			// No historical data on disk for this pair — create a new entry.
 			pair = &pairData{
 				rates: make(map[string]int64),
 			}
@@ -149,6 +161,23 @@ func (s *Store) OverrideLatestRates(todayDate string, pairRatesMicros map[string
 		pair.latestDate = todayDate
 		pair.rates[todayDate] = rateMicros
 	}
+	return nil
+}
+
+// splitPairKey splits a pair key like "JPY.USD" into base and quote currency codes.
+// Returns an error if the key does not contain exactly one dot separator.
+func splitPairKey(pairKey string) (string, string, error) {
+	for i, c := range pairKey {
+		if c == '.' {
+			base := pairKey[:i]
+			quote := pairKey[i+1:]
+			if base == "" || quote == "" {
+				return "", "", fmt.Errorf("malformed FX pair key %q: base and quote must be non-empty", pairKey)
+			}
+			return base, quote, nil
+		}
+	}
+	return "", "", fmt.Errorf("malformed FX pair key %q: expected format BASE.QUOTE", pairKey)
 }
 
 // *** PRIVATE ***