Compare commits
15
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7dc3d553c | ||
|
|
264db5127d | ||
|
|
c71e63905b | ||
|
|
0fc124ac22 | ||
|
|
6858798b14 | ||
|
|
c3ad730677 | ||
|
|
0dcfcbfb6f | ||
|
|
31789df35c | ||
|
|
8e45241ddc | ||
|
|
78e9004624 | ||
|
|
2dcea91a63 | ||
|
|
d240b543eb | ||
|
|
1a35ec064c | ||
|
|
204691772c | ||
|
|
15e3f1dd29 |
@@ -56,17 +56,19 @@ public class GaugeControl : FrameworkElement
|
||||
CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
|
||||
new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
|
||||
14, new SolidColorBrush(textColor), dpi);
|
||||
dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
|
||||
|
||||
var sub = new FormattedText(
|
||||
"Updated\nnow",
|
||||
"used",
|
||||
CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
|
||||
new Typeface("Segoe UI"), 7,
|
||||
new Typeface("Segoe UI"), 8,
|
||||
new SolidColorBrush(subColor), dpi)
|
||||
{
|
||||
TextAlignment = TextAlignment.Center
|
||||
};
|
||||
dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2));
|
||||
|
||||
var totalHeight = pctText.Height + 2 + sub.Height;
|
||||
var startY = cy - totalHeight / 2;
|
||||
dc.DrawText(pctText, new Point(cx - pctText.Width / 2, startY));
|
||||
dc.DrawText(sub, new Point(cx - sub.Width / 2, startY + pctText.Height + 2));
|
||||
}
|
||||
|
||||
private static void DrawArc(DrawingContext dc, double cx, double cy, double r,
|
||||
|
||||
@@ -99,8 +99,8 @@ public partial class LoginWindow : Window
|
||||
return;
|
||||
}
|
||||
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
||||
const rawU=JSON.stringify(u).slice(0,300);
|
||||
window.chrome.webview.postMessage({email:e,orgId:id,usage:u,debug:'src:'+orgSrc+'|ukeys:'+Object.keys(u||{}).join(',')+'|raw:'+rawB});
|
||||
const rawU=JSON.stringify(u).slice(0,400);
|
||||
window.chrome.webview.postMessage({email:e,orgId:id,usage:u,debug:'src:'+orgSrc+'|ukeys:'+Object.keys(u||{}).join(',')+'|rawU:'+rawU+'|rawB:'+rawB});
|
||||
}catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
|
||||
|
||||
await Browser.CoreWebView2.ExecuteScriptAsync(script);
|
||||
|
||||
+9
-2
@@ -21,8 +21,9 @@ public class AgentLimit
|
||||
|
||||
public class UsageResponse
|
||||
{
|
||||
[JsonPropertyName("claude_ai_default_5h")] public WindowData? FiveHour { get; set; }
|
||||
[JsonPropertyName("claude_ai_default")] public WindowData? SevenDay { get; set; }
|
||||
[JsonPropertyName("five_hour")] public WindowData? FiveHour { get; set; }
|
||||
[JsonPropertyName("seven_day")] public WindowData? SevenDay { get; set; }
|
||||
[JsonPropertyName("extra_usage")] public ExtraUsage? ExtraUsage { get; set; }
|
||||
}
|
||||
|
||||
public class WindowData
|
||||
@@ -31,6 +32,12 @@ public class WindowData
|
||||
[JsonPropertyName("resets_at")] public string? ResetsAt { get; set; }
|
||||
}
|
||||
|
||||
public class ExtraUsage
|
||||
{
|
||||
[JsonPropertyName("is_enabled")] public bool IsEnabled { get; set; }
|
||||
[JsonPropertyName("currency")] public string? Currency { get; set; }
|
||||
}
|
||||
|
||||
public class BootstrapResponse
|
||||
{
|
||||
[JsonPropertyName("account")] public AccountInfo? Account { get; set; }
|
||||
|
||||
@@ -66,16 +66,7 @@
|
||||
|
||||
<!-- Cards scroll area -->
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
||||
<StackPanel Margin="0,4,0,4">
|
||||
<Border x:Name="DebugBanner" Visibility="Collapsed"
|
||||
Background="{DynamicResource CardBrush}"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
CornerRadius="6" Margin="12,4,12,4" Padding="12,8">
|
||||
<TextBlock x:Name="DebugBannerText" FontSize="10" FontFamily="Consolas"
|
||||
Foreground="{DynamicResource SecondaryBrush}" TextWrapping="Wrap"/>
|
||||
</Border>
|
||||
<StackPanel x:Name="CardsPanel"/>
|
||||
</StackPanel>
|
||||
<StackPanel x:Name="CardsPanel" Margin="0,4,0,4"/>
|
||||
</ScrollViewer>
|
||||
</DockPanel>
|
||||
|
||||
@@ -194,10 +185,6 @@
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<TextBlock x:Name="DebugText" FontSize="10" Foreground="{DynamicResource SecondaryBrush}"
|
||||
TextWrapping="Wrap" Margin="0,12,0,0" FontFamily="Consolas"
|
||||
Visibility="Collapsed"/>
|
||||
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</DockPanel>
|
||||
|
||||
+128
-15
@@ -55,6 +55,13 @@ public partial class PopupWindow : Window
|
||||
CardsPanel.Children.Clear();
|
||||
foreach (var limit in VM.Limits)
|
||||
CardsPanel.Children.Add(BuildCard(limit));
|
||||
|
||||
var fiveHour = VM.Limits.FirstOrDefault(l => l.Window == WindowKind.FiveHour);
|
||||
if (fiveHour != null && fiveHour.BurnHistory.Count > 0)
|
||||
CardsPanel.Children.Add(BuildDiarySection(fiveHour));
|
||||
|
||||
if (VM.ExtraUsage?.IsEnabled == true)
|
||||
CardsPanel.Children.Add(BuildExtraUsageSection());
|
||||
}
|
||||
|
||||
private static UIElement BuildCard(AgentLimit limit)
|
||||
@@ -180,12 +187,132 @@ public partial class PopupWindow : Window
|
||||
return section;
|
||||
}
|
||||
|
||||
private static UIElement BuildDiarySection(AgentLimit limit)
|
||||
{
|
||||
var text = (SolidColorBrush)Application.Current.Resources["TextBrush"];
|
||||
var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
|
||||
var border = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
|
||||
|
||||
var samples = limit.BurnHistory.Count;
|
||||
var avgBurn = limit.BurnRate;
|
||||
|
||||
var subtitle = new TextBlock
|
||||
{
|
||||
Text = $"{samples} samples · {avgBurn:F1}%/h avg burn rate",
|
||||
FontSize = 11,
|
||||
Foreground = secondary,
|
||||
Margin = new Thickness(16, 0, 16, 6),
|
||||
};
|
||||
|
||||
var sparkline = new SparklineControl
|
||||
{
|
||||
Height = 32,
|
||||
Margin = new Thickness(8, 8, 8, 8),
|
||||
LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
|
||||
Data = limit.BurnHistory,
|
||||
};
|
||||
|
||||
var card = new Border
|
||||
{
|
||||
Background = (SolidColorBrush)Application.Current.Resources["CardBrush"],
|
||||
CornerRadius = new CornerRadius(6),
|
||||
BorderBrush = border,
|
||||
BorderThickness = new Thickness(1),
|
||||
Margin = new Thickness(12, 0, 12, 0),
|
||||
Child = sparkline,
|
||||
};
|
||||
|
||||
var sectionLabel = new TextBlock
|
||||
{
|
||||
Text = "SESSION DIARY",
|
||||
Style = (Style)Application.Current.Resources["HeaderText"],
|
||||
Margin = new Thickness(16, 12, 16, 6),
|
||||
};
|
||||
|
||||
var section = new StackPanel();
|
||||
section.Children.Add(sectionLabel);
|
||||
section.Children.Add(subtitle);
|
||||
section.Children.Add(card);
|
||||
return section;
|
||||
}
|
||||
|
||||
private UIElement BuildExtraUsageSection()
|
||||
{
|
||||
var text = (SolidColorBrush)Application.Current.Resources["TextBrush"];
|
||||
var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
|
||||
var border = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
|
||||
var accent = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
|
||||
|
||||
var overage = VM.Overage;
|
||||
var prepaid = VM.Prepaid;
|
||||
var currency = VM.ExtraUsage?.Currency ?? overage?.Currency ?? "$";
|
||||
|
||||
var spent = overage?.UsedCredits ?? 0;
|
||||
var limit = overage?.MonthlyCreditLimit ?? 0;
|
||||
var balance = prepaid?.Amount ?? 0;
|
||||
|
||||
UIElement MakeRow(string label, string value)
|
||||
{
|
||||
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 };
|
||||
Grid.SetColumn(lbl, 0);
|
||||
Grid.SetColumn(val, 1);
|
||||
row.Children.Add(lbl);
|
||||
row.Children.Add(val);
|
||||
return row;
|
||||
}
|
||||
|
||||
var contentPanel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
|
||||
contentPanel.Children.Add(MakeRow("Spent", $"{currency}{spent:F2}"));
|
||||
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)
|
||||
{
|
||||
var pct = Math.Min(spent / limit * 100, 100);
|
||||
contentPanel.Children.Add(new ProgressBar
|
||||
{
|
||||
Value = pct, Maximum = 100, Height = 4,
|
||||
Margin = new Thickness(0, 6, 0, 0),
|
||||
Foreground = accent,
|
||||
Background = new SolidColorBrush(Color.FromArgb(20, 0, 0, 0)),
|
||||
BorderThickness = new Thickness(0),
|
||||
});
|
||||
}
|
||||
|
||||
var card = new Border
|
||||
{
|
||||
Background = (SolidColorBrush)Application.Current.Resources["CardBrush"],
|
||||
CornerRadius = new CornerRadius(6),
|
||||
BorderBrush = border,
|
||||
BorderThickness = new Thickness(1),
|
||||
Margin = new Thickness(12, 0, 12, 0),
|
||||
Child = contentPanel,
|
||||
};
|
||||
|
||||
var sectionLabel = new TextBlock
|
||||
{
|
||||
Text = "EXTRA USAGE CREDITS",
|
||||
Style = (Style)Application.Current.Resources["HeaderText"],
|
||||
Margin = new Thickness(16, 12, 16, 6),
|
||||
};
|
||||
|
||||
var section = new StackPanel();
|
||||
section.Children.Add(sectionLabel);
|
||||
section.Children.Add(card);
|
||||
return section;
|
||||
}
|
||||
|
||||
// ── State updates ────────────────────────────────────────────────
|
||||
|
||||
private void OnVmChanged(string? prop)
|
||||
{
|
||||
if (prop is nameof(UsageViewModel.Limits) or nameof(UsageViewModel.IsLoading)
|
||||
or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage))
|
||||
or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage)
|
||||
or nameof(UsageViewModel.ExtraUsage) or nameof(UsageViewModel.Overage) or nameof(UsageViewModel.Prepaid))
|
||||
{
|
||||
RebuildCards();
|
||||
UpdateFooter();
|
||||
@@ -283,20 +410,6 @@ public partial class PopupWindow : Window
|
||||
|
||||
SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
|
||||
SignInButton.Content = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
|
||||
|
||||
var dbg = AppSettings.Default.DebugInfo;
|
||||
if (!string.IsNullOrEmpty(dbg))
|
||||
{
|
||||
DebugText.Text = dbg;
|
||||
DebugText.Visibility = Visibility.Visible;
|
||||
DebugBannerText.Text = dbg;
|
||||
DebugBanner.Visibility = Visibility.Visible;
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugText.Visibility = Visibility.Collapsed;
|
||||
DebugBanner.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
}
|
||||
|
||||
// ── Event handlers ───────────────────────────────────────────────
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
## What's new in beta.29
|
||||
|
||||
- Fix: org ID is now correctly read from b.account.memberships[0].organization.uuid — bootstrap nests memberships inside account, not at the root
|
||||
- This was preventing usage limits from loading for all accounts
|
||||
## What's new in beta.34
|
||||
- Add: Session Diary section showing 5h burn rate history sparkline
|
||||
- Add: Extra Usage Credits section showing spent/limit/balance (when enabled)
|
||||
|
||||
+27
-16
@@ -24,6 +24,7 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
private DateTime? _lastUpdated;
|
||||
private OverageSpendLimit? _overage;
|
||||
private PrepaidCredits? _prepaid;
|
||||
private ExtraUsage? _extraUsage;
|
||||
|
||||
private readonly Dictionary<string, List<double>> _burnHistory = [];
|
||||
private const int MaxHistorySamples = 24;
|
||||
@@ -37,6 +38,7 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
public DateTime? LastUpdated { get => _lastUpdated; set => Set(ref _lastUpdated, value); }
|
||||
public OverageSpendLimit? Overage { get => _overage; set => Set(ref _overage, value); }
|
||||
public PrepaidCredits? Prepaid { get => _prepaid; set => Set(ref _prepaid, value); }
|
||||
public ExtraUsage? ExtraUsage { get => _extraUsage; set => Set(ref _extraUsage, value); }
|
||||
|
||||
private int _refreshInterval = 120;
|
||||
public int RefreshInterval
|
||||
@@ -95,14 +97,12 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
return;
|
||||
}
|
||||
|
||||
// Try HttpClient first (fast path) — may be rejected by server CORS/header checks
|
||||
var (limits, overage, prepaid, email, orgId, ok) = hasCookies
|
||||
// HttpClient refresh — WebView2 is NOT used here to avoid spawning a heavy
|
||||
// browser process every refresh cycle (causes memory accumulation).
|
||||
// SaveAndClose at login time is responsible for fetching live data via WebView2.
|
||||
var (limits, overage, prepaid, extraUsage, email, orgId, ok) = hasCookies
|
||||
? await TryHttpRefreshAsync(cookies)
|
||||
: ([], null, null, null, null, false);
|
||||
|
||||
// Fall back to WebView2 (uses the shared browser session, not HttpClient)
|
||||
if (!ok)
|
||||
(limits, email, orgId) = await TryWebView2RefreshAsync();
|
||||
: ([], null, null, null, null, null, false);
|
||||
|
||||
// Fill in any blanks from cached values saved at login time
|
||||
if (string.IsNullOrEmpty(email)) email = AppSettings.Default.Email;
|
||||
@@ -131,7 +131,7 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
if (limits.Count > 0) { Limits = limits; Overage = overage; Prepaid = prepaid; }
|
||||
if (limits.Count > 0) { Limits = limits; Overage = overage; Prepaid = prepaid; ExtraUsage = extraUsage; }
|
||||
if (!string.IsNullOrEmpty(email)) UserEmail = email;
|
||||
IsSignedIn = true;
|
||||
ErrorMessage = null;
|
||||
@@ -149,7 +149,7 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, string?, string?, bool)>
|
||||
private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, ExtraUsage?, string?, string?, bool)>
|
||||
TryHttpRefreshAsync(List<(string Name, string Value, string Domain, string Path)> cookies)
|
||||
{
|
||||
try
|
||||
@@ -167,7 +167,7 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
orgId = AppSettings.Default.OrgId;
|
||||
|
||||
if (string.IsNullOrEmpty(orgId))
|
||||
return ([], null, null, email, orgId, true);
|
||||
return ([], null, null, null, email, orgId, true);
|
||||
|
||||
AppSettings.Default.OrgId = orgId;
|
||||
AppSettings.Default.Save();
|
||||
@@ -177,9 +177,9 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
|
||||
await Task.WhenAll(ut, ot, pt);
|
||||
|
||||
return (BuildLimits(ut.Result), ot.Result, pt.Result, email, orgId, true);
|
||||
return (BuildLimits(ut.Result), ot.Result, pt.Result, ut.Result?.ExtraUsage, email, orgId, true);
|
||||
}
|
||||
catch { return ([], null, null, null, null, false); }
|
||||
catch { return ([], null, null, null, null, null, false); }
|
||||
}
|
||||
|
||||
private static async Task<(List<AgentLimit>, string?, string?)> TryWebView2RefreshAsync()
|
||||
@@ -269,9 +269,10 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
if (!string.IsNullOrEmpty(email)) UserEmail = email;
|
||||
if (limits.Count > 0) Limits = limits;
|
||||
// Always show cards — real data if available, placeholders if not
|
||||
Limits = limits.Count > 0 ? limits : LoadPlaceholderLimits();
|
||||
IsSignedIn = true;
|
||||
ErrorMessage = limits.Count == 0 ? "Signed in — refreshing data…" : null;
|
||||
ErrorMessage = null;
|
||||
LastUpdated = limits.Count > 0 ? DateTime.Now : LastUpdated;
|
||||
});
|
||||
}
|
||||
@@ -324,6 +325,14 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
http.DefaultRequestHeaders.Add("User-Agent",
|
||||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
|
||||
"(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36");
|
||||
http.DefaultRequestHeaders.Add("Origin", "https://claude.ai");
|
||||
http.DefaultRequestHeaders.Add("Referer", "https://claude.ai/");
|
||||
http.DefaultRequestHeaders.Add("sec-fetch-dest", "empty");
|
||||
http.DefaultRequestHeaders.Add("sec-fetch-mode", "cors");
|
||||
http.DefaultRequestHeaders.Add("sec-fetch-site", "same-origin");
|
||||
http.DefaultRequestHeaders.Add("sec-ch-ua", "\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\"");
|
||||
http.DefaultRequestHeaders.Add("sec-ch-ua-mobile", "?0");
|
||||
http.DefaultRequestHeaders.Add("sec-ch-ua-platform", "\"Windows\"");
|
||||
var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
|
||||
http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
|
||||
return http;
|
||||
@@ -464,16 +473,18 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
return $"{diff.Hours}h {diff.Minutes}m";
|
||||
}
|
||||
|
||||
private void LoadPlaceholders()
|
||||
private static List<AgentLimit> LoadPlaceholderLimits()
|
||||
{
|
||||
var now = DateTime.Now;
|
||||
Limits =
|
||||
return
|
||||
[
|
||||
new() { Window = WindowKind.FiveHour, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddHours(1) },
|
||||
new() { Window = WindowKind.SevenDay, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddDays(7) },
|
||||
];
|
||||
}
|
||||
|
||||
private void LoadPlaceholders() => Limits = LoadPlaceholderLimits();
|
||||
|
||||
private void LoadBurnHistory()
|
||||
{
|
||||
try
|
||||
|
||||
Reference in New Issue
Block a user