Compare commits

..
Author SHA1 Message Date
SuperDooper 6858798b14 Release notes for beta.33 2026-05-08 17:01:42 +02:00
SuperDooper c3ad730677 Remove debug banner references from PopupWindow code-behind (beta.33) 2026-05-08 17:01:37 +02:00
SuperDooper 0dcfcbfb6f Remove debug banner from main panel (beta.33) 2026-05-08 17:01:31 +02:00
SuperDooper 31789df35c Fix gauge text centering (beta.33) 2026-05-08 17:01:25 +02:00
SuperDooper 8e45241ddc chore: release notes for beta.32 2026-05-08 16:49:56 +02:00
SuperDooper 78e9004624 fix: correct usage response field names — five_hour/seven_day not claude_ai_default_5h/claude_ai_default 2026-05-08 16:48:46 +02:00
SuperDooper 2dcea91a63 chore: release notes for beta.31 2026-05-08 16:46:17 +02:00
SuperDooper d240b543eb fix: show placeholder cards when signed in but no cached usage data 2026-05-08 16:46:04 +02:00
SuperDooper 1a35ec064c debug: include raw usage API response in debug output 2026-05-08 16:46:03 +02:00
SuperDooper 204691772c chore: release notes for beta.30 2026-05-08 16:35:48 +02:00
SuperDooper 15e3f1dd29 fix: remove WebView2 from periodic refresh (memory), add CORS headers to HttpClient 2026-05-08 16:35:35 +02:00
SuperDooper bcd208684b chore: release notes for beta.29 2026-05-08 16:29:03 +02:00
SuperDooper 2bdbe4943d fix: same org ID path fix in ParseBootstrap and WebView2 refresh script 2026-05-08 16:28:48 +02:00
SuperDooper 1c365a55a8 fix: org ID is at b.account.memberships[0].organization.uuid, not b.memberships 2026-05-08 16:28:47 +02:00
SuperDooper 8b367ee539 chore: release notes for beta.28 2026-05-08 16:24:42 +02:00
SuperDooper 9134b8945d fix: don't wipe existing limits when refresh returns no data 2026-05-08 16:24:31 +02:00
SuperDooper 19b1751e78 debug: wire DebugBanner in InitSettings 2026-05-08 16:24:30 +02:00
SuperDooper a20956cde2 debug: show debug banner on main panel so it's always visible 2026-05-08 16:24:29 +02:00
SuperDooper 659171bf0a debug: capture raw bootstrap JSON in debug field, try account.uuid as org ID fallback 2026-05-08 16:24:28 +02:00
7 changed files with 53 additions and 47 deletions
+7 -5
View File
@@ -56,17 +56,19 @@ public class GaugeControl : FrameworkElement
CultureInfo.CurrentCulture, FlowDirection.LeftToRight, CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal), new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
14, new SolidColorBrush(textColor), dpi); 14, new SolidColorBrush(textColor), dpi);
dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
var sub = new FormattedText( var sub = new FormattedText(
"Updated\nnow", "used",
CultureInfo.CurrentCulture, FlowDirection.LeftToRight, CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
new Typeface("Segoe UI"), 7, new Typeface("Segoe UI"), 8,
new SolidColorBrush(subColor), dpi) new SolidColorBrush(subColor), dpi)
{ {
TextAlignment = TextAlignment.Center 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, private static void DrawArc(DrawingContext dc, double cx, double cy, double r,
+6 -5
View File
@@ -82,9 +82,9 @@ public partial class LoginWindow : Window
const string script = @"(async()=>{try{ const string script = @"(async()=>{try{
const h={headers:{accept:'application/json'}}; const h={headers:{accept:'application/json'}};
const b=await(await fetch('/api/bootstrap',h)).json(); const b=await(await fetch('/api/bootstrap',h)).json();
const bkeys=Object.keys(b||{}).join(','); const rawB=JSON.stringify(b).slice(0,600);
const akeys=Object.keys(b?.account||{}).join(','); let id=b?.account?.memberships?.[0]?.organization?.uuid
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid ||b?.memberships?.[0]?.organization?.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 e=b?.account?.email_address||b?.account?.email||b?.email||null;
let orgSrc='bootstrap'; let orgSrc='bootstrap';
@@ -95,11 +95,12 @@ public partial class LoginWindow : Window
if(!id){ if(!id){
let pu=null; let pu=null;
try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){} 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|bkeys:'+bkeys+'|akeys:'+akeys}); window.chrome.webview.postMessage({email:e,orgId:null,usage:(pu&&!pu.error?pu:null),debug:'no-org|raw:'+rawB});
return; return;
} }
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json(); const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
window.chrome.webview.postMessage({email:e,orgId:id,usage:u,debug:'orgSrc:'+orgSrc+'|bkeys:'+bkeys+'|akeys:'+akeys}); 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)});}})()"; }catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
await Browser.CoreWebView2.ExecuteScriptAsync(script); await Browser.CoreWebView2.ExecuteScriptAsync(script);
+2 -2
View File
@@ -21,8 +21,8 @@ public class AgentLimit
public class UsageResponse public class UsageResponse
{ {
[JsonPropertyName("claude_ai_default_5h")] public WindowData? FiveHour { get; set; } [JsonPropertyName("five_hour")] public WindowData? FiveHour { get; set; }
[JsonPropertyName("claude_ai_default")] public WindowData? SevenDay { get; set; } [JsonPropertyName("seven_day")] public WindowData? SevenDay { get; set; }
} }
public class WindowData public class WindowData
-4
View File
@@ -185,10 +185,6 @@
</Grid> </Grid>
</Border> </Border>
<TextBlock x:Name="DebugText" FontSize="10" Foreground="{DynamicResource SecondaryBrush}"
TextWrapping="Wrap" Margin="0,12,0,0" FontFamily="Consolas"
Visibility="Collapsed"/>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
</DockPanel> </DockPanel>
-11
View File
@@ -283,17 +283,6 @@ public partial class PopupWindow : Window
SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed; SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
SignInButton.Content = VM.IsSignedIn ? "Re-authenticate" : "Sign In"; SignInButton.Content = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
var dbg = AppSettings.Default.DebugInfo;
if (!string.IsNullOrEmpty(dbg))
{
DebugText.Text = dbg;
DebugText.Visibility = Visibility.Visible;
}
else
{
DebugText.Visibility = Visibility.Collapsed;
}
} }
// ── Event handlers ─────────────────────────────────────────────── // ── Event handlers ───────────────────────────────────────────────
+3 -2
View File
@@ -1,3 +1,4 @@
## What's new in beta.27 ## What's new in beta.33
- Fix build error: use WebMessageAsJson (not WebMessageAsString) and post plain JS objects via postMessage - Fix: gauge percentage text is now vertically centered within the dial
- Remove: debug banner no longer appears on the main panel
+35 -18
View File
@@ -95,15 +95,13 @@ public class UsageViewModel : INotifyPropertyChanged
return; return;
} }
// Try HttpClient first (fast path) — may be rejected by server CORS/header checks // 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, email, orgId, ok) = hasCookies var (limits, overage, prepaid, email, orgId, ok) = hasCookies
? await TryHttpRefreshAsync(cookies) ? await TryHttpRefreshAsync(cookies)
: ([], null, null, null, null, false); : ([], null, null, null, null, false);
// Fall back to WebView2 (uses the shared browser session, not HttpClient)
if (!ok)
(limits, email, orgId) = await TryWebView2RefreshAsync();
// Fill in any blanks from cached values saved at login time // Fill in any blanks from cached values saved at login time
if (string.IsNullOrEmpty(email)) email = AppSettings.Default.Email; if (string.IsNullOrEmpty(email)) email = AppSettings.Default.Email;
if (string.IsNullOrEmpty(orgId)) orgId = AppSettings.Default.OrgId; if (string.IsNullOrEmpty(orgId)) orgId = AppSettings.Default.OrgId;
@@ -131,12 +129,8 @@ public class UsageViewModel : INotifyPropertyChanged
await Application.Current.Dispatcher.InvokeAsync(() => await Application.Current.Dispatcher.InvokeAsync(() =>
{ {
Limits = limits; if (limits.Count > 0) { Limits = limits; Overage = overage; Prepaid = prepaid; }
Overage = overage;
Prepaid = prepaid;
if (!string.IsNullOrEmpty(email)) UserEmail = email; if (!string.IsNullOrEmpty(email)) UserEmail = email;
// Trust that cookies / cached auth mean the user IS signed in,
// even if the live fetch failed this cycle.
IsSignedIn = true; IsSignedIn = true;
ErrorMessage = null; ErrorMessage = null;
LastUpdated = DateTime.Now; LastUpdated = DateTime.Now;
@@ -193,7 +187,8 @@ public class UsageViewModel : INotifyPropertyChanged
const string script = @"(async()=>{try{ const string script = @"(async()=>{try{
const h={headers:{accept:'application/json'}}; const h={headers:{accept:'application/json'}};
const b=await(await fetch('/api/bootstrap',h)).json(); const b=await(await fetch('/api/bootstrap',h)).json();
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid let id=b?.account?.memberships?.[0]?.organization?.uuid
||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
||b?.default_organization?.uuid||null; ||b?.default_organization?.uuid||null;
const em=b?.account?.email_address||b?.account?.email||b?.email||null; const em=b?.account?.email_address||b?.account?.email||b?.email||null;
if(!id){ if(!id){
@@ -272,9 +267,10 @@ public class UsageViewModel : INotifyPropertyChanged
await Application.Current.Dispatcher.InvokeAsync(() => await Application.Current.Dispatcher.InvokeAsync(() =>
{ {
if (!string.IsNullOrEmpty(email)) UserEmail = email; 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; IsSignedIn = true;
ErrorMessage = limits.Count == 0 ? "Signed in — refreshing data…" : null; ErrorMessage = null;
LastUpdated = limits.Count > 0 ? DateTime.Now : LastUpdated; LastUpdated = limits.Count > 0 ? DateTime.Now : LastUpdated;
}); });
} }
@@ -327,6 +323,14 @@ public class UsageViewModel : INotifyPropertyChanged
http.DefaultRequestHeaders.Add("User-Agent", http.DefaultRequestHeaders.Add("User-Agent",
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
"(KHTML, like Gecko) Chrome/124.0.0.0 Safari/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}")); var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
http.DefaultRequestHeaders.Add("Cookie", cookieHeader); http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
return http; return http;
@@ -359,8 +363,9 @@ public class UsageViewModel : INotifyPropertyChanged
acct.TryGetProperty("email_address", out var em)) acct.TryGetProperty("email_address", out var em))
email = em.GetString(); email = em.GetString();
// Path 1: memberships[0].organization.uuid // Path 1: account.memberships[0].organization.uuid (Claude.ai personal/pro accounts)
if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0) if (root.TryGetProperty("account", out var acctNode) &&
acctNode.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
{ {
var first = mems[0]; var first = mems[0];
if (first.TryGetProperty("organization", out var org) && if (first.TryGetProperty("organization", out var org) &&
@@ -368,7 +373,17 @@ public class UsageViewModel : INotifyPropertyChanged
orgId = uuid.GetString(); orgId = uuid.GetString();
} }
// Path 2: organizations[0].uuid (flat list on root) // Path 2: memberships[0].organization.uuid (root-level, older API shape)
if (string.IsNullOrEmpty(orgId) &&
root.TryGetProperty("memberships", out var rootMems) && rootMems.GetArrayLength() > 0)
{
var first = rootMems[0];
if (first.TryGetProperty("organization", out var org) &&
org.TryGetProperty("uuid", out var uuid))
orgId = uuid.GetString();
}
// Path 3: organizations[0].uuid (flat list on root)
if (string.IsNullOrEmpty(orgId) && if (string.IsNullOrEmpty(orgId) &&
root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0) root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
{ {
@@ -456,16 +471,18 @@ public class UsageViewModel : INotifyPropertyChanged
return $"{diff.Hours}h {diff.Minutes}m"; return $"{diff.Hours}h {diff.Minutes}m";
} }
private void LoadPlaceholders() private static List<AgentLimit> LoadPlaceholderLimits()
{ {
var now = DateTime.Now; var now = DateTime.Now;
Limits = return
[ [
new() { Window = WindowKind.FiveHour, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddHours(1) }, new() { Window = WindowKind.FiveHour, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddHours(1) },
new() { Window = WindowKind.SevenDay, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddDays(7) }, new() { Window = WindowKind.SevenDay, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddDays(7) },
]; ];
} }
private void LoadPlaceholders() => Limits = LoadPlaceholderLimits();
private void LoadBurnHistory() private void LoadBurnHistory()
{ {
try try