commit

Author: bufdev

cmd/ibctl/internal/ibctlcmd/holdingsdata.go

@@ -311,48 +311,64 @@ func ComputeYTDTaxSummary(
 	}, nil
 }
 
-// WriteValueSummary writes the portfolio value summary with pregnant (unrealized) tax as formatted text.
+// WriteValueSummary writes the pregnant (unrealized) tax summary as formatted text.
+// Groups gains together, then taxes together, with the total bolded for emphasis.
 func WriteValueSummary(writer io.Writer, summary *ValueSummary, config *ibctlconfig.Config, formatBaseMicros func(int64) string) {
-	writeValueLine(writer, "Portfolio Value", formatBaseMicros(summary.TotalValueMicros))
-	fmt.Fprintln(writer)
+	// Pregnant capital gains and their tax amounts.
 	writeValueLine(writer, "Pregnant STCG", formatBaseMicros(summary.TotalSTCGMicros))
-	writeValueLine(writer, fmt.Sprintf("Pregnant STCG Tax (%.1f%%)", config.TaxRateSTCG*100), formatBaseMicros(summary.STCGTaxMicros))
 	writeValueLine(writer, "Pregnant LTCG", formatBaseMicros(summary.TotalLTCGMicros))
+	writeValueLine(writer, fmt.Sprintf("Pregnant STCG Tax (%.1f%%)", config.TaxRateSTCG*100), formatBaseMicros(summary.STCGTaxMicros))
 	writeValueLine(writer, fmt.Sprintf("Pregnant LTCG Tax (%.1f%%)", config.TaxRateLTCG*100), formatBaseMicros(summary.LTCGTaxMicros))
-	writeValueLine(writer, "Total Pregnant Tax", formatBaseMicros(summary.TotalTaxMicros))
+	fmt.Fprintln(writer)
+	writeBoldValueLine(writer, "Total Pregnant Tax", formatBaseMicros(summary.TotalTaxMicros))
 }
 
 // WriteYTDTaxSummary writes the YTD realized income tax summary as formatted text.
+// Groups income amounts together, then taxes together, with the remaining total bolded.
 func WriteYTDTaxSummary(writer io.Writer, summary *YTDTaxSummary, config *ibctlconfig.Config, formatBaseMicros func(int64) string) {
+	// YTD realized income amounts and their tax amounts.
 	writeValueLine(writer, "YTD Realized Dividends", formatBaseMicros(summary.DividendMicros))
-	writeValueLine(writer, fmt.Sprintf("YTD Realized Dividend Tax (%.1f%%)", config.TaxRateDividend*100), formatBaseMicros(summary.DividendTaxMicros))
 	writeValueLine(writer, "YTD Realized Interest", formatBaseMicros(summary.InterestMicros))
-	writeValueLine(writer, fmt.Sprintf("YTD Realized Interest Tax (%.1f%%)", config.TaxRateInterest*100), formatBaseMicros(summary.InterestTaxMicros))
 	writeValueLine(writer, "YTD Realized STCG", formatBaseMicros(summary.STCGMicros))
-	writeValueLine(writer, fmt.Sprintf("YTD Realized STCG Tax (%.1f%%)", config.TaxRateSTCG*100), formatBaseMicros(summary.STCGTaxMicros))
 	writeValueLine(writer, "YTD Realized LTCG", formatBaseMicros(summary.LTCGMicros))
+	writeValueLine(writer, fmt.Sprintf("YTD Realized Dividend Tax (%.1f%%)", config.TaxRateDividend*100), formatBaseMicros(summary.DividendTaxMicros))
+	writeValueLine(writer, fmt.Sprintf("YTD Realized Interest Tax (%.1f%%)", config.TaxRateInterest*100), formatBaseMicros(summary.InterestTaxMicros))
+	writeValueLine(writer, fmt.Sprintf("YTD Realized STCG Tax (%.1f%%)", config.TaxRateSTCG*100), formatBaseMicros(summary.STCGTaxMicros))
 	writeValueLine(writer, fmt.Sprintf("YTD Realized LTCG Tax (%.1f%%)", config.TaxRateLTCG*100), formatBaseMicros(summary.LTCGTaxMicros))
-	writeValueLine(writer, "YTD Realized Tax Owed", formatBaseMicros(summary.TotalTaxOwedMicros))
-	writeValueLine(writer, "YTD Realized Tax Paid", formatBaseMicros(summary.TaxPaidMicros))
-	writeValueLine(writer, "YTD Realized Tax Remaining", formatBaseMicros(summary.TaxRemainingMicros))
+	fmt.Fprintln(writer)
+	// Tax owed minus paid, with remaining bolded.
+	writeBoldValueLine(writer, "Total YTD Realized Tax Owed", formatBaseMicros(summary.TotalTaxOwedMicros))
+	writeValueLine(writer, "Minus YTD Realized Tax Paid", formatBaseMicros(-summary.TaxPaidMicros))
+	writeBoldValueLine(writer, "Total YTD Realized Tax Remaining", formatBaseMicros(summary.TaxRemainingMicros))
 }
 
-// WriteAfterTaxValue writes the combined after-tax portfolio value.
-// After-tax value = portfolio value - pregnant tax - YTD tax remaining.
+// WriteAfterTaxValue writes the combined after-tax portfolio value with a breakdown
+// showing pregnant tax and YTD realized tax remaining as deductions.
 func WriteAfterTaxValue(writer io.Writer, valueSummary *ValueSummary, ytdSummary *YTDTaxSummary, formatBaseMicros func(int64) string) {
 	afterTaxMicros := valueSummary.TotalValueMicros - valueSummary.TotalTaxMicros - ytdSummary.TaxRemainingMicros
-	writeValueLine(writer, "After-Tax Value", formatBaseMicros(afterTaxMicros))
+	// Portfolio value, deductions, and after-tax total.
+	writeBoldValueLine(writer, "Total Portfolio Value", formatBaseMicros(valueSummary.TotalValueMicros))
+	writeValueLine(writer, "Minus Pregnant Tax", formatBaseMicros(-valueSummary.TotalTaxMicros))
+	writeValueLine(writer, "Minus YTD Realized Tax Remaining", formatBaseMicros(-ytdSummary.TaxRemainingMicros))
+	writeBoldValueLine(writer, "Total After-Tax Value", formatBaseMicros(afterTaxMicros))
 }
 
 // valueLabelWidth is the fixed column width for value summary labels, sized to accommodate
-// the longest label ("YTD Realized Dividend Tax (XX.X%)").
-const valueLabelWidth = 36
+// the longest indented label ("    Minus YTD Realized Tax Remaining:").
+const valueLabelWidth = 40
 
 // writeValueLine writes a single label-value line with consistent column alignment.
 func writeValueLine(writer io.Writer, label string, value string) {
 	fmt.Fprintf(writer, "%-*s %s\n", valueLabelWidth, label+":", value)
 }
 
+// writeBoldValueLine writes a label-value line with the label wrapped in ** markers for emphasis.
+// Builds the bold label first, then pads the result to keep values column-aligned.
+func writeBoldValueLine(writer io.Writer, label string, value string) {
+	boldLabel := "**" + label + ":**"
+	fmt.Fprintf(writer, "%-*s %s\n", valueLabelWidth, boldLabel, value)
+}
+
 // WriteHoldingListTable writes the holding list as a table with securities,
 // cash positions, and a totals row.
 func WriteHoldingListTable(writer io.Writer, holdings []*ibctlholdings.HoldingOverview, baseCurrency string, formatBase func(string) string, formatBaseMicros func(int64) string) error {

internal/ibctl/ibctlmerge/ibctlmerge.go

@@ -453,9 +453,9 @@ func applyAdditionsToPositions(positions []*datav1.Position, additions []ibctlco
 			// New (account, symbol) pair: create a synthetic position so VerifyPositions
 			// doesn't flag it as DiscrepancyTypeComputedOnly.
 			newPos := &datav1.Position{
-				Symbol:        addition.Symbol,
-				AssetCategory: "STK",
-				Quantity:      mathpb.FromMicros(additionQtyMicros),
+				Symbol:         addition.Symbol,
+				AssetCategory:  "STK",
+				Quantity:       mathpb.FromMicros(additionQtyMicros),
 				CostBasisPrice: moneypb.MoneyFromMicros(addition.CurrencyCode, addition.TradePrice),
 				// Use trade price as the market price placeholder; realtime overrides
 				// will replace this if --realtime is used.