commit

Author: bufdev

cmd/ibctl/internal/command/holdings/holdingsoverview/holdingsoverview.go

@@ -114,18 +114,17 @@ func run(ctx context.Context, container appext.Container, flags *flags) error {
 	switch format {
 	case cliio.FormatTable:
 		headers := ibctlholdings.HoldingsOverviewHeaders()
-		rows := make([][]string, 0, len(result.Holdings)+1)
+		rows := make([][]string, 0, len(result.Holdings))
 		for _, h := range result.Holdings {
-			rows = append(rows, ibctlholdings.HoldingOverviewToRow(h))
+			rows = append(rows, ibctlholdings.HoldingOverviewToTableRow(h))
 		}
-		// Append a totals row summing MKT VAL USD and UNRLZD P&L USD.
+		// Build the totals row aligned to the same columns as the data.
 		totalMktVal, totalPnL := ibctlholdings.ComputeTotals(result.Holdings)
 		totalsRow := make([]string, len(headers))
 		totalsRow[0] = "TOTAL"
 		totalsRow[6] = totalMktVal
 		totalsRow[7] = totalPnL
-		rows = append(rows, totalsRow)
-		return cliio.WriteTable(writer, headers, rows)
+		return cliio.WriteTableWithTotals(writer, headers, rows, totalsRow)
 	case cliio.FormatCSV:
 		headers := ibctlholdings.HoldingsOverviewHeaders()
 		records := make([][]string, 0, len(result.Holdings)+1)

internal/ibctl/ibctlconfig/ibctlconfig.go

@@ -66,6 +66,7 @@ activity_statements_dir: ~/Documents/ibkr-statements
 #     category: EQUITY
 #     type: STOCK
 #     sector: TECH
+#     geo: US
 `
 
 // ExternalConfigV1 is the YAML-serializable configuration file structure for version v1.
@@ -98,6 +99,8 @@ type ExternalSymbolConfigV1 struct {
 	Type string `yaml:"type"`
 	// Sector is the sector classification (e.g., "TECH").
 	Sector string `yaml:"sector"`
+	// Geo is the geographic classification (e.g., "US", "INTL").
+	Geo string `yaml:"geo"`
 }
 
 // Config is the validated runtime configuration derived from the config file.
@@ -137,6 +140,8 @@ type SymbolConfig struct {
 	Type string
 	// Sector is the sector classification (e.g., "TECH").
 	Sector string
+	// Geo is the geographic classification (e.g., "US", "INTL").
+	Geo string
 }
 
 // NewConfigV1 validates an ExternalConfigV1 and returns a runtime Config.
@@ -204,6 +209,7 @@ func NewConfigV1(externalConfig ExternalConfigV1) (*Config, error) {
 			Category: s.Category,
 			Type:     s.Type,
 			Sector:   s.Sector,
+			Geo:      s.Geo,
 		}
 	}
 	return &Config{

internal/ibctl/ibctlholdings/ibctlholdings.go

@@ -58,14 +58,17 @@ type HoldingOverview struct {
 	Type string `json:"type,omitempty"`
 	// Sector is the user-defined sector classification (e.g., "TECH").
 	Sector string `json:"sector,omitempty"`
+	// Geo is the user-defined geographic classification (e.g., "US", "INTL").
+	Geo string `json:"geo,omitempty"`
 }
 
 // HoldingsOverviewHeaders returns the column headers for table/CSV output.
 func HoldingsOverviewHeaders() []string {
-	return []string{"SYMBOL", "CURRENCY", "LAST PRICE", "AVG PRICE", "LAST USD", "AVG USD", "MKT VAL USD", "UNRLZD P&L USD", "POSITION", "CATEGORY", "TYPE", "SECTOR"}
+	return []string{"SYMBOL", "CURRENCY", "LAST PRICE", "AVG PRICE", "LAST USD", "AVG USD", "MKT VAL USD", "UNRLZD P&L USD", "POSITION", "CATEGORY", "TYPE", "SECTOR", "GEO"}
 }
 
-// HoldingOverviewToRow converts a HoldingOverview to a string slice for table/CSV output.
+// HoldingOverviewToRow converts a HoldingOverview to a string slice for CSV output.
+// USD values are kept as raw decimals for machine-readable output.
 func HoldingOverviewToRow(h *HoldingOverview) []string {
 	return []string{
 		h.Symbol,
@@ -80,11 +83,32 @@ func HoldingOverviewToRow(h *HoldingOverview) []string {
 		h.Category,
 		h.Type,
 		h.Sector,
+		h.Geo,
+	}
+}
+
+// HoldingOverviewToTableRow converts a HoldingOverview to a string slice for
+// table display. USD values are rounded to cents with $ prefix and comma separators.
+func HoldingOverviewToTableRow(h *HoldingOverview) []string {
+	return []string{
+		h.Symbol,
+		h.Currency,
+		h.LastPrice,
+		h.AveragePrice,
+		formatUSD(h.LastPriceUSD),
+		formatUSD(h.AveragePriceUSD),
+		formatUSD(h.MarketValueUSD),
+		formatUSD(h.UnrealizedPnLUSD),
+		mathpb.ToString(h.Position),
+		h.Category,
+		h.Type,
+		h.Sector,
+		h.Geo,
 	}
 }
 
 // ComputeTotals sums the MarketValueUSD and UnrealizedPnLUSD across all holdings.
-// Returns formatted strings for the totals row.
+// Returns formatted USD strings for the totals row (rounded to cents with $ prefix).
 func ComputeTotals(holdings []*HoldingOverview) (string, string) {
 	var totalMktValMicros, totalPnLMicros int64
 	for _, h := range holdings {
@@ -99,8 +123,8 @@ func ComputeTotals(holdings []*HoldingOverview) (string, string) {
 			}
 		}
 	}
-	return moneypb.MoneyValueToString(moneypb.MoneyFromMicros("USD", totalMktValMicros)),
-		moneypb.MoneyValueToString(moneypb.MoneyFromMicros("USD", totalPnLMicros))
+	return formatUSD(moneypb.MoneyValueToString(moneypb.MoneyFromMicros("USD", totalMktValMicros))),
+		formatUSD(moneypb.MoneyValueToString(moneypb.MoneyFromMicros("USD", totalPnLMicros)))
 }
 
 // GetHoldingsOverview computes the holdings overview from trade data using FIFO,
@@ -244,6 +268,7 @@ func GetHoldingsOverview(
 			holding.Category = symbolConfig.Category
 			holding.Type = symbolConfig.Type
 			holding.Sector = symbolConfig.Sector
+			holding.Geo = symbolConfig.Geo
 		}
 		holdings = append(holdings, holding)
 	}
@@ -258,3 +283,24 @@ func GetHoldingsOverview(
 		PositionDiscrepancies: discrepancies,
 	}, nil
 }
+
+// *** PRIVATE ***
+
+// formatUSD formats a raw decimal string as a USD value with $ prefix,
+// rounded to cents with comma separators (e.g., "$1,234.56", "-$789.01").
+// Returns empty string for empty input.
+func formatUSD(value string) string {
+	if value == "" {
+		return ""
+	}
+	decimal, err := mathpb.NewDecimal(value)
+	if err != nil {
+		return value
+	}
+	formatted := mathpb.Format(decimal, 2)
+	// Prepend $ after any negative sign.
+	if len(formatted) > 0 && formatted[0] == '-' {
+		return "-$" + formatted[1:]
+	}
+	return "$" + formatted
+}

internal/pkg/cliio/cliio.go

@@ -56,6 +56,32 @@ func WriteTable(writer io.Writer, headers []string, rows [][]string) error {
 	return tw.Flush()
 }
 
+// WriteTableWithTotals writes a table followed by a blank line and a totals row,
+// all through the same tabwriter so columns align between data and totals.
+func WriteTableWithTotals(writer io.Writer, headers []string, rows [][]string, totalsRow []string) error {
+	tw := tabwriter.NewWriter(writer, 0, 0, 2, ' ', 0)
+	// Write header row.
+	if _, err := fmt.Fprintln(tw, strings.Join(headers, "\t")); err != nil {
+		return err
+	}
+	// Write data rows.
+	for _, row := range rows {
+		if _, err := fmt.Fprintln(tw, strings.Join(row, "\t")); err != nil {
+			return err
+		}
+	}
+	// Write a blank separator line with tabs to preserve column alignment.
+	blankRow := make([]string, len(headers))
+	if _, err := fmt.Fprintln(tw, strings.Join(blankRow, "\t")); err != nil {
+		return err
+	}
+	// Write the totals row aligned to the same columns.
+	if _, err := fmt.Fprintln(tw, strings.Join(totalsRow, "\t")); err != nil {
+		return err
+	}
+	return tw.Flush()
+}
+
 // WriteCSVRecords writes CSV records to the writer.
 func WriteCSVRecords(writer io.Writer, records [][]string) error {
 	csvWriter := csv.NewWriter(writer)

internal/pkg/mathpb/mathpb.go

@@ -67,6 +67,68 @@ func ToString(d *mathv1.Decimal) string {
 	return fmt.Sprintf("%s%d.%s", sign, units, decimalStr)
 }
 
+// Format formats a decimal value rounded to the given precision (number of
+// decimal places) with comma separators for the integer portion.
+// Examples with precision=2: 1234567.891 → "1,234,567.89", -42.5 → "-42.50".
+// Examples with precision=0: 1234.5 → "1,235".
+func Format(d *mathv1.Decimal, precision int) string {
+	if d == nil {
+		if precision > 0 {
+			return "0." + strings.Repeat("0", precision)
+		}
+		return "0"
+	}
+	totalMicros := ToMicros(d)
+	negative := totalMicros < 0
+	if negative {
+		totalMicros = -totalMicros
+	}
+	// Compute the divisor for the requested precision.
+	// Micros has 6 decimal places; we need to reduce to the requested precision.
+	// divisor = 10^(6-precision), rounding half = divisor/2.
+	divisor := int64(1)
+	for range 6 - precision {
+		divisor *= 10
+	}
+	// Round to nearest unit at the requested precision.
+	totalMicros = (totalMicros + divisor/2) / divisor
+	// Split into integer and fractional parts at the requested precision.
+	fracDivisor := int64(1)
+	for range precision {
+		fracDivisor *= 10
+	}
+	intPart := totalMicros / fracDivisor
+	fracPart := totalMicros % fracDivisor
+	sign := ""
+	if negative {
+		sign = "-"
+	}
+	if precision == 0 {
+		return sign + addCommas(intPart)
+	}
+	return fmt.Sprintf("%s%s.%0*d", sign, addCommas(intPart), precision, fracPart)
+}
+
+// addCommas inserts comma separators into a non-negative integer (e.g., 1234567 → "1,234,567").
+func addCommas(n int64) string {
+	s := strconv.FormatInt(n, 10)
+	if len(s) <= 3 {
+		return s
+	}
+	var b strings.Builder
+	// Determine how many digits are before the first comma.
+	firstGroup := len(s) % 3
+	if firstGroup == 0 {
+		firstGroup = 3
+	}
+	b.WriteString(s[:firstGroup])
+	for i := firstGroup; i < len(s); i += 3 {
+		b.WriteByte(',')
+		b.WriteString(s[i : i+3])
+	}
+	return b.String()
+}
+
 // ParseToUnitsMicros parses a decimal string (e.g., "123.456789") into units and micros.
 func ParseToUnitsMicros(value string) (int64, int64, error) {
 	if value == "" {