fix: correct extra_usage credit unit (/100), add space in currency, Unlimited label, fetch overage/prepaid at login

windows/LoginWindow.xaml.cs

@@ -82,11 +82,13 @@ public partial class LoginWindow : Window
             const string script = @"(async()=>{try{
                 const h={headers:{accept:'application/json'}};
                 const b=await(await fetch('/api/bootstrap',h)).json();
-                const rawB=JSON.stringify(b).slice(0,600);
+                const org0=b?.account?.memberships?.[0]?.organization;
-                let id=b?.account?.memberships?.[0]?.organization?.uuid
+                let id=org0?.uuid||b?.memberships?.[0]?.organization?.uuid
-                        ||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
+                        ||b?.organizations?.[0]?.uuid||b?.default_organization?.uuid||null;
-                        ||b?.default_organization?.uuid||null;
                 const e=b?.account?.email_address||b?.account?.email||b?.email||null;
+                const caps=org0?.capabilities||[];
+                const capStr=caps.find(c=>typeof c==='string'&&c.startsWith('claude_'))||null;
+                const planLabel=capStr?(capStr.slice(7,8).toUpperCase()+capStr.slice(8).toLowerCase()):null;
                 let orgSrc='bootstrap';
                 if(!id){
                     try{const ol=await(await fetch('/api/organizations',h)).json();
@@ -95,12 +97,15 @@ public partial class LoginWindow : Window
                 if(!id){
                     let pu=null;
                     try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
-                    window.chrome.webview.postMessage({email:e,orgId:null,usage:(pu&&!pu.error?pu:null),debug:'no-org|raw:'+rawB});
+                    window.chrome.webview.postMessage({email:e,orgId:null,planLabel,usage:(pu&&!pu.error?pu:null),debug:'no-org'});
                     return;
                 }
-                const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
+                const [u,ov,pp]=await Promise.all([
-                const rawU=JSON.stringify(u).slice(0,400);
+                    fetch('/api/organizations/'+id+'/usage',h).then(r=>r.json()).catch(()=>null),
-                window.chrome.webview.postMessage({email:e,orgId:id,usage:u,debug:'src:'+orgSrc+'|ukeys:'+Object.keys(u||{}).join(',')+'|rawU:'+rawU+'|rawB:'+rawB});
+                    fetch('/api/organizations/'+id+'/overage_spend_limit',h).then(r=>r.ok?r.json():null).catch(()=>null),
+                    fetch('/api/organizations/'+id+'/prepaid/credits',h).then(r=>r.ok?r.json():null).catch(()=>null)
+                ]);
+                window.chrome.webview.postMessage({email:e,orgId:id,planLabel,usage:u,overage:ov,prepaid:pp,debug:'src:'+orgSrc+'|plan:'+(planLabel||'none')});
             }catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
 
             await Browser.CoreWebView2.ExecuteScriptAsync(script);
@@ -123,6 +128,16 @@ public partial class LoginWindow : Window
                 if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
                     AppSettings.Default.UsageJson = us.GetRawText();
 
+                if (root.TryGetProperty("planLabel", out var pl) && pl.ValueKind == JsonValueKind.String
+                    && !string.IsNullOrEmpty(pl.GetString()))
+                    AppSettings.Default.PlanLabel = pl.GetString()!;
+
+                if (root.TryGetProperty("overage", out var ov) && ov.ValueKind == JsonValueKind.Object)
+                    AppSettings.Default.OverageJson = ov.GetRawText();
+
+                if (root.TryGetProperty("prepaid", out var pp) && pp.ValueKind == JsonValueKind.Object)
+                    AppSettings.Default.PrepaidJson = pp.GetRawText();
+
                 if (root.TryGetProperty("debug", out var dbg) && dbg.ValueKind == JsonValueKind.String)
                     AppSettings.Default.DebugInfo = dbg.GetString() ?? "";
                 else if (root.TryGetProperty("error", out var err))

windows/Models.cs

@@ -34,8 +34,10 @@ public class WindowData
 
 public class ExtraUsage
 {
-    [JsonPropertyName("is_enabled")] public bool    IsEnabled { get; set; }
+    [JsonPropertyName("is_enabled")]    public bool    IsEnabled    { get; set; }
-    [JsonPropertyName("currency")]   public string? Currency  { get; set; }
+    [JsonPropertyName("currency")]      public string? Currency     { get; set; }
+    [JsonPropertyName("used_credits")]  public double? UsedCredits  { get; set; }
+    [JsonPropertyName("monthly_limit")] public double? MonthlyLimit { get; set; }
 }
 
 public class BootstrapResponse

windows/PopupWindow.xaml.cs

@@ -247,17 +247,23 @@ public partial class PopupWindow : Window
         var prepaid  = VM.Prepaid;
         var currency = VM.ExtraUsage?.Currency ?? overage?.Currency ?? "$";
 
-        var spent   = overage?.UsedCredits         ?? 0;
+        // Fall back to extra_usage fields when the overage/prepaid endpoints return nothing.
-        var limit   = overage?.MonthlyCreditLimit  ?? 0;
+        // extra_usage.used_credits is in cents (e.g. 5231 = EUR 52.31); overage endpoint
-        var balance = prepaid?.Amount              ?? 0;
+        // already returns the value in currency units, so only divide for the fallback path.
+        var spent   = overage?.UsedCredits        ?? (VM.ExtraUsage?.UsedCredits  / 100.0) ?? 0;
+        var limit   = overage?.MonthlyCreditLimit ?? VM.ExtraUsage?.MonthlyLimit ?? 0;
+        var balance = prepaid?.Amount             ?? 0;
+        // Show "Unlimited" when no limit is configured (null monthly_limit)
+        bool unlimited = overage?.MonthlyCreditLimit == null && VM.ExtraUsage?.MonthlyLimit == null;
 
-        UIElement MakeRow(string label, string value)
+        UIElement MakeRow(string label, string value, bool highlight = false)
         {
             var row = new Grid { Margin = new Thickness(0, 3, 0, 3) };
             row.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
             row.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
             var lbl = new TextBlock { Text = label, FontSize = 12, Foreground = secondary };
-            var val = new TextBlock { Text = value, FontSize = 12, FontWeight = FontWeights.Medium, Foreground = text };
+            var val = new TextBlock { Text = value, FontSize = 12, FontWeight = FontWeights.Medium,
+                                      Foreground = highlight ? new SolidColorBrush(Color.FromRgb(0x4C, 0xAF, 0x50)) : text };
             Grid.SetColumn(lbl, 0);
             Grid.SetColumn(val, 1);
             row.Children.Add(lbl);
@@ -266,9 +272,10 @@ public partial class PopupWindow : Window
         }
 
         var contentPanel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
-        contentPanel.Children.Add(MakeRow("Spent",   $"{currency}{spent:F2}"));
+        contentPanel.Children.Add(MakeRow("Spent",   $"{currency} {spent:F2}", spent > 0));
-        if (limit   > 0) contentPanel.Children.Add(MakeRow("Limit",   $"{currency}{limit:F2}"));
+        if (unlimited)    contentPanel.Children.Add(MakeRow("Limit",   "Unlimited"));
-        if (balance > 0) contentPanel.Children.Add(MakeRow("Balance", $"{currency}{balance:F2}"));
+        else if (limit > 0) contentPanel.Children.Add(MakeRow("Limit", $"{currency} {limit:F2}"));
+        if (balance > 0)  contentPanel.Children.Add(MakeRow("Balance", $"{currency} {balance:F2}"));
 
         if (limit > 0)
         {

windows/UsageViewModel.cs

@@ -147,7 +147,15 @@ public class UsageViewModel : INotifyPropertyChanged
 
             await Application.Current.Dispatcher.InvokeAsync(() =>
             {
-                if (limits.Count > 0) { Limits = limits; Overage = overage; Prepaid = prepaid; ExtraUsage = extraUsage; }
+                if (limits.Count > 0)
+                {
+                    Limits    = limits;
+                    Overage   = overage;
+                    Prepaid   = prepaid;
+                    // Only clear ExtraUsage if the API explicitly disables it; keep cached value
+                    // if the HTTP endpoint omits the field (it often does for non-browser clients)
+                    if (extraUsage != null) ExtraUsage = extraUsage;
+                }
                 if (!string.IsNullOrEmpty(planLabel)) PlanLabel = planLabel;
                 if (!string.IsNullOrEmpty(email)) UserEmail = email;
                 IsSignedIn   = true;
@@ -220,10 +228,12 @@ public class UsageViewModel : INotifyPropertyChanged
             AppSettings.Default.Save();
 
             var usageUrl  = $"https://claude.ai/api/organizations/{orgId}/usage";
-            var ut = http.GetAsync(usageUrl);
+            var ut  = http.GetAsync(usageUrl);
-            var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
+            var ot  = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
-            var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
+            var pt  = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
-            await Task.WhenAll(ut, ot, pt);
+            // Fetch org details as a fallback source for capabilities (bootstrap omits them via HttpClient)
+            var odt = http.GetAsync($"https://claude.ai/api/organizations/{orgId}");
+            await Task.WhenAll(ut, ot, pt, odt);
 
             var usageResp = ut.Result;
             if (!usageResp.IsSuccessStatusCode)
@@ -232,6 +242,32 @@ public class UsageViewModel : INotifyPropertyChanged
             var usageJson = await usageResp.Content.ReadAsStringAsync();
             var usage     = JsonSerializer.Deserialize<UsageResponse>(usageJson, JsonOpts);
 
+            // Try org endpoint for capabilities if bootstrap didn't return them
+            if (string.IsNullOrEmpty(planLabel) && odt.Result.IsSuccessStatusCode)
+            {
+                try
+                {
+                    var orgJson = await odt.Result.Content.ReadAsStringAsync();
+                    using var orgDoc = JsonDocument.Parse(orgJson);
+                    if (orgDoc.RootElement.TryGetProperty("capabilities", out var orgCaps) &&
+                        orgCaps.ValueKind == JsonValueKind.Array)
+                    {
+                        foreach (var cap in orgCaps.EnumerateArray())
+                        {
+                            var s = cap.GetString() ?? "";
+                            if (s.StartsWith("claude_", StringComparison.OrdinalIgnoreCase))
+                            {
+                                var name = s.Substring("claude_".Length);
+                                if (name.Length > 0)
+                                    planLabel = char.ToUpper(name[0]) + name.Substring(1).ToLower();
+                                break;
+                            }
+                        }
+                    }
+                }
+                catch { /* best-effort */ }
+            }
+
             // Persist fresh usage so cache reflects live data
             AppSettings.Default.UsageJson = usageJson;
             if (!string.IsNullOrEmpty(planLabel)) AppSettings.Default.PlanLabel = planLabel;