fix: align usage query formatting

Author: joo

core/cmd/profiles_cmd.go

@@ -9,7 +9,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/clovapi/switcher/internal/desktop"
-	"github.com/clovapi/switcher/internal/usage"
 )
 
 func cmdProfilesGroup() *cobra.Command {
@@ -152,7 +151,7 @@ func cmdProfilesUsage() *cobra.Command {
 				}
 				return fmt.Errorf("usage query failed")
 			}
-			fmt.Printf("Usage for %s:\n%s\n", strings.TrimSpace(result.Vendor), usage.FormatResult(result.Usage))
+			fmt.Printf("Usage for %s:\n%s\n", strings.TrimSpace(result.Vendor), strings.TrimSpace(result.Text))
 			return nil
 		},
 	}

core/internal/buildinfo/buildinfo.go

@@ -4,7 +4,7 @@ import "strings"
 
 // Set at link time via -ldflags (see .goreleaser.yaml).
 var (
-	Version = "dev0.1.69"
+	Version = "dev0.1.71"
 	Commit  = "none"
 	Date    = "unknown"
 )

core/internal/desktop/usage.go

@@ -103,7 +103,7 @@ func QueryVendorUsage(vendorName string) VendorUsageResult {
 			OK:       result.Success,
 			Vendor:   name,
 			Template: "subscription",
-			Text:     usage.FormatResult(result),
+			Text:     strings.TrimSpace(result.Text),
 			Usage:    result,
 			Error:    result.Error,
 		}
@@ -117,7 +117,7 @@ func QueryVendorUsage(vendorName string) VendorUsageResult {
 		OK:       result.Success,
 		Vendor:   name,
 		Template: templateType,
-		Text:     usage.FormatResult(result),
+		Text:     strings.TrimSpace(result.Text),
 		Usage:    result,
 		Error:    result.Error,
 	}

core/internal/usage/balance.go

@@ -142,11 +142,7 @@ func queryDeepSeek(apiKey string) Result {
 			})
 		}
 	}
-	res := Result{Success: true, Kind: "balance"}
-	if len(out) > 0 {
-		res.Data = out
-	}
-	return res
+	return resultWithBalanceData(out)
 }
 
 func queryStepFun(apiKey string) Result {
@@ -169,16 +165,12 @@ func queryStepFun(apiKey string) Result {
 	}
 	balance := parseFloatField(payload, "balance")
 	valid := true
-	return Result{
-		Success: true,
-		Kind:    "balance",
-		Data: []Data{{
-			PlanName:  "StepFun",
-			Remaining: balance,
-			Unit:      "CNY",
-			IsValid:   &valid,
-		}},
-	}
+	return resultWithBalanceData([]Data{{
+		PlanName:  "StepFun",
+		Remaining: balance,
+		Unit:      "CNY",
+		IsValid:   &valid,
+	}})
 }
 
 func querySiliconFlow(apiKey string, cn bool) Result {
@@ -213,16 +205,12 @@ func querySiliconFlow(apiKey string, cn bool) Result {
 	}
 	remaining := parseFloatField(data, "totalBalance")
 	valid := true
-	return Result{
-		Success: true,
-		Kind:    "balance",
-		Data: []Data{{
-			PlanName:  plan,
-			Remaining: remaining,
-			Unit:      unit,
-			IsValid:   &valid,
-		}},
-	}
+	return resultWithBalanceData([]Data{{
+		PlanName:  plan,
+		Remaining: remaining,
+		Unit:      unit,
+		IsValid:   &valid,
+	}})
 }
 
 func queryOpenRouter(apiKey string) Result {
@@ -259,19 +247,15 @@ func queryOpenRouter(apiKey string) Result {
 	if remaining != nil && *remaining <= 0 {
 		invalidMsg = "No credits remaining"
 	}
-	return Result{
-		Success: true,
-		Kind:    "balance",
-		Data: []Data{{
-			PlanName:       "OpenRouter",
-			Remaining:      remaining,
-			Total:          total,
-			Used:           used,
-			Unit:           "USD",
-			IsValid:        &valid,
-			InvalidMessage: invalidMsg,
-		}},
-	}
+	return resultWithBalanceData([]Data{{
+		PlanName:       "OpenRouter",
+		Remaining:      remaining,
+		Total:          total,
+		Used:           used,
+		Unit:           "USD",
+		IsValid:        &valid,
+		InvalidMessage: invalidMsg,
+	}})
 }
 
 func queryNovita(apiKey string) Result {
@@ -303,17 +287,31 @@ func queryNovita(apiKey string) Result {
 	if remaining != nil && *remaining <= 0 {
 		invalidMsg = "No balance remaining"
 	}
-	return Result{
-		Success: true,
-		Kind:    "balance",
-		Data: []Data{{
-			PlanName:       "Novita AI",
-			Remaining:      remaining,
-			Unit:           "USD",
-			IsValid:        &valid,
-			InvalidMessage: invalidMsg,
-		}},
+	return resultWithBalanceData([]Data{{
+		PlanName:       "Novita AI",
+		Remaining:      remaining,
+		Unit:           "USD",
+		IsValid:        &valid,
+		InvalidMessage: invalidMsg,
+	}})
+}
+
+func formatBalanceUsageText(rows []Data) string {
+	parts := make([]string, 0, len(rows))
+	for _, row := range rows {
+		if text := strings.TrimSpace(FormatDataRow(row)); text != "" {
+			parts = append(parts, text)
+		}
 	}
+	return strings.Join(parts, " · ")
+}
+
+func resultWithBalanceData(rows []Data) Result {
+	res := Result{Success: true, Kind: "balance", Text: formatBalanceUsageText(rows)}
+	if len(rows) > 0 {
+		res.Data = rows
+	}
+	return res
 }
 
 // QueryBalance queries vendor account balance when base_url matches a known provider.

core/internal/usage/coding_plan.go

@@ -67,6 +67,21 @@ func extractResetTime(raw any) string {
 	return ""
 }
 
+func formatCodingPlanReset(tierName, raw string) string {
+	resetAt, ok := parseRFC3339ResetTime(raw)
+	if !ok {
+		return ""
+	}
+	switch strings.ToLower(strings.TrimSpace(tierName)) {
+	case tierFiveHour:
+		return formatResetDuration(resetAt.Sub(usageTextNow()))
+	case tierWeeklyLimit:
+		return resetAt.Format("01-02")
+	default:
+		return ""
+	}
+}
+
 func parseZhipuTokenTiers(data map[string]any) []Tier {
 	type row struct {
 		resetMS *int64
@@ -116,7 +131,7 @@ func parseZhipuTokenTiers(data map[string]any) []Tier {
 			if rows[j].resetMS != nil {
 				rightVal = *rows[j].resetMS
 			}
-			if (!leftHas && rightHas) || (leftHas && rightHas && leftVal > rightVal) {
+			if (leftHas && !rightHas) || (leftHas && rightHas && leftVal > rightVal) {
 				rows[i], rows[j] = rows[j], rows[i]
 			}
 		}
@@ -196,7 +211,7 @@ func queryKimiCodingPlan(apiKey string) Result {
 			})
 		}
 	}
-	return Result{Success: true, Kind: "token_plan", Tiers: tiers}
+	return resultWithCodingPlanTiers(tiers)
 }
 
 func queryZhipuCodingPlan(apiKey string) Result {
@@ -229,7 +244,7 @@ func queryZhipuCodingPlan(apiKey string) Result {
 	if data == nil {
 		return Result{Success: false, Kind: "token_plan", Error: "Missing 'data' field in response"}
 	}
-	return Result{Success: true, Kind: "token_plan", Tiers: parseZhipuTokenTiers(data)}
+	return resultWithCodingPlanTiers(parseZhipuTokenTiers(data))
 }
 
 func queryMiniMaxCodingPlan(apiKey string, cn bool) Result {
@@ -297,7 +312,7 @@ func queryMiniMaxCodingPlan(apiKey string, cn bool) Result {
 			}
 		}
 	}
-	return Result{Success: true, Kind: "token_plan", Tiers: tiers}
+	return resultWithCodingPlanTiers(tiers)
 }
 
 // QueryCodingPlan queries token-plan utilization for Kimi / Zhipu / MiniMax coding endpoints.
@@ -350,3 +365,30 @@ func TiersToUsageData(tiers []Tier) []Data {
 	}
 	return out
 }
+
+func formatCodingPlanUsageText(tiers []Tier) string {
+	parts := make([]string, 0, len(tiers))
+	for _, tier := range tiers {
+		name := TierDisplayName(tier.Name)
+		if name == "" {
+			name = strings.TrimSpace(tier.Name)
+		}
+		if name == "" {
+			continue
+		}
+		body := name + " " + formatNumber(tier.Utilization) + "%"
+		if reset := formatCodingPlanReset(tier.Name, tier.ResetsAt); reset != "" {
+			body += "（" + reset + "）"
+		}
+		parts = append(parts, body)
+	}
+	return strings.Join(parts, " · ")
+}
+
+func resultWithCodingPlanTiers(tiers []Tier) Result {
+	res := Result{Success: true, Kind: "token_plan", Text: formatCodingPlanUsageText(tiers), Tiers: tiers}
+	if len(tiers) > 0 {
+		res.Data = TiersToUsageData(tiers)
+	}
+	return res
+}

core/internal/usage/format.go

@@ -86,37 +86,16 @@ func FormatDataRow(row Data) string {
 	return name
 }
 
-func formatTierRow(tier Tier) string {
-	name := TierDisplayName(tier.Name)
-	body := formatNumber(tier.Utilization) + "%"
-	if name == "" {
-		return body
-	}
-	return name + " " + body
-}
-
 // FormatResult renders a complete usage query result as plain text.
 func FormatResult(result Result) string {
+	if text := strings.TrimSpace(result.Text); text != "" {
+		return text
+	}
 	if !result.Success {
 		if err := strings.TrimSpace(result.Error); err != "" {
 			return err
 		}
 		return "usage query failed"
 	}
-	rows := result.Data
-	if len(rows) == 0 && len(result.Tiers) > 0 {
-		parts := make([]string, 0, len(result.Tiers))
-		for _, tier := range result.Tiers {
-			parts = append(parts, formatTierRow(tier))
-		}
-		return strings.Join(parts, " · ")
-	}
-	if len(rows) == 0 {
-		return "no usage details"
-	}
-	parts := make([]string, 0, len(rows))
-	for _, row := range rows {
-		parts = append(parts, FormatDataRow(row))
-	}
-	return strings.Join(parts, " · ")
+	return ""
 }