Changed refresh interval to 2 minutes. Better handling of missing credentials file.

JakeSays · JakeSays · commit af6ecd2dbe15 · 2026-04-14T07:59:19.000-06:00
diff --git a/App.axaml.cs b/App.axaml.cs
@@ -19,16 +19,31 @@ public override void OnFrameworkInitializationCompleted()
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
+            if (true || !UsageService.CredentialsFileExists())
+            {
+                var icons = TrayIcon.GetIcons(this);
+                if (icons != null)
+                {
+                    foreach (var icon in icons)
+                    {
+                        icon.IsVisible = false;
+                    }
+                }
+
+                desktop.ShutdownMode = ShutdownMode.OnLastWindowClose;
+                desktop.MainWindow = new NoCredentialsWindow();
+                desktop.MainWindow.Show();
+                base.OnFrameworkInitializationCompleted();
+                return;
+            }
+
             desktop.ShutdownMode = ShutdownMode.OnExplicitShutdown;
             desktop.MainWindow = new MainWindow();
             desktop.MainWindow.Show();
         }
 
         var menu = FindMinimizeMenuItem();
-        if (menu != null)
-        {
-            menu.IsChecked = Settings.MinimizeToTray;
-        }
+        menu?.IsChecked = Settings.MinimizeToTray;
 
         base.OnFrameworkInitializationCompleted();
     }
diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs
@@ -71,7 +71,7 @@ private void OnOpened(object? sender, EventArgs e)
 
         _timer = new DispatcherTimer
         {
-            Interval = TimeSpan.FromMinutes(1)
+            Interval = TimeSpan.FromMinutes(2)
         };
         _timer.Tick += async (_, _) => await PollUsageAsync();
         _timer.Start();
diff --git a/NoCredentialsWindow.axaml b/NoCredentialsWindow.axaml
@@ -0,0 +1,47 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="260"
+        x:Class="ClaudeUsageMonitor.NoCredentialsWindow"
+        Title="Claude Code Usage Monitor"
+        Icon="avares://ClaudeUsageMonitor/Assets/icon.ico"
+        Width="500" Height="260"
+        Background="#1a1a2e"
+        CanResize="False"
+        WindowStartupLocation="CenterScreen">
+
+    <Grid RowDefinitions="Auto,*,Auto" Margin="24">
+        <TextBlock Grid.Row="0"
+                   Text="Claude Code sign-in required"
+                   FontSize="18" FontWeight="Bold"
+                   Foreground="#e0e0f0"
+                   HorizontalAlignment="Center"
+                   Margin="0,0,0,16" />
+
+        <StackPanel Grid.Row="1" VerticalAlignment="Top">
+            <TextBlock Foreground="#b0b0c0"
+                       FontSize="13"
+                       TextWrapping="Wrap">
+                No Claude Code credentials were found.<LineBreak/>
+                <LineBreak/>
+                Claude Code Usage Monitor reuses the OAuth credentials that
+                Claude Code stores on disk. Please run Claude Code and sign in
+                at least once, then relaunch Claude Code Usage Monitor.
+            </TextBlock>
+            <TextBlock Foreground="#b0b0c0"
+                       FontSize="13"
+                       TextWrapping="Wrap"
+                       Margin="0,12,0,0">
+                <Run Text="Expected credentials file: " />
+                <Run x:Name="CredentialsPathRun" FontWeight="Bold" />
+            </TextBlock>
+        </StackPanel>
+
+        <Button Grid.Row="2"
+                Content="Close"
+                HorizontalAlignment="Right"
+                Padding="20,6"
+                Click="OnCloseClicked" />
+    </Grid>
+</Window>
diff --git a/NoCredentialsWindow.axaml.cs b/NoCredentialsWindow.axaml.cs
@@ -0,0 +1,27 @@
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using ClaudeUsageMonitor.Services;
+
+
+namespace ClaudeUsageMonitor;
+
+public partial class NoCredentialsWindow : Window
+{
+    public NoCredentialsWindow()
+    {
+        InitializeComponent();
+        CredentialsPathRun.Text = UsageService.CredentialsFilePath;
+    }
+
+    private void OnCloseClicked(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+    {
+        if (Avalonia.Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+        {
+            desktop.Shutdown();
+        }
+        else
+        {
+            Close();
+        }
+    }
+}
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Claude Code Usage Monitor
 
-A small desktop app that shows your current Claude Code usage limits at a glance. It reads the OAuth credentials that Claude Code already stores on disk, polls Anthropic's usage endpoint once a minute, and renders three gauges: the rolling 5-hour window, the 7-day overall window, and the 7-day Sonnet-specific window.
+A small desktop app that shows your current Claude Code usage limits at a glance. It reads the OAuth credentials that Claude Code already stores on disk, polls Anthropic's usage endpoint once every two minutes, and renders three gauges: the rolling 5-hour window, the 7-day overall window, and the 7-day Sonnet-specific window.
 
 ![Claude Code Usage Monitor](media/ClaudeUsageMonitor.png)
 
diff --git a/Services/UsageService.cs b/Services/UsageService.cs
@@ -26,6 +26,10 @@ public class UsageService : IDisposable
 
     public void Dispose() => _httpClient.Dispose();
 
+    public static bool CredentialsFileExists() => File.Exists(CredentialsPath);
+
+    public static string CredentialsFilePath => CredentialsPath;
+
     public async Task<UsageResponse?> GetUsageAsync()
     {
         await LoadCredentialsAsync();
@@ -43,43 +47,60 @@ public class UsageService : IDisposable
             }
         }
 
-        using var request = new HttpRequestMessage(HttpMethod.Get, UsageUrl);
-        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _credentials.AccessToken);
-        request.Headers.Add("anthropic-beta", "oauth-2025-04-20");
-        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-        var response = await _httpClient.SendAsync(request);
+        var result = await SendUsageRequestAsync();
 
-        if (response.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        if (result.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
             await RefreshTokenAsync();
-
-            using var retryRequest = new HttpRequestMessage(HttpMethod.Get, UsageUrl);
-            retryRequest.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _credentials.AccessToken);
-            retryRequest.Headers.Add("anthropic-beta", "oauth-2025-04-20");
-            retryRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            response = await _httpClient.SendAsync(retryRequest);
+            result = await SendUsageRequestAsync();
         }
 
-        if (response.StatusCode == HttpStatusCode.TooManyRequests)
+        if (result.StatusCode == HttpStatusCode.TooManyRequests)
         {
-            var retryAfter = response.Headers.RetryAfter?.Delta
-                             ?? (response.Headers.RetryAfter?.Date - DateTimeOffset.UtcNow)
-                             ?? TimeSpan.FromMinutes(5);
-            if (retryAfter <= TimeSpan.Zero)
+            await RefreshTokenAsync();
+            result = await SendUsageRequestAsync();
+
+            if (result.StatusCode == HttpStatusCode.TooManyRequests)
             {
-                retryAfter = TimeSpan.FromMinutes(5);
+                var retryAfter = result.RetryAfter ?? TimeSpan.FromMinutes(5);
+                if (retryAfter <= TimeSpan.Zero)
+                {
+                    retryAfter = TimeSpan.FromMinutes(5);
+                }
+                throw new RateLimitedException(retryAfter);
             }
-            throw new RateLimitedException(retryAfter);
         }
 
-        response.EnsureSuccessStatusCode();
+        if (!result.IsSuccess)
+        {
+            throw new HttpRequestException(
+                $"Usage request failed with status {(int) result.StatusCode} {result.StatusCode}");
+        }
 
-        var json = await response.Content.ReadAsStringAsync();
-        return JsonSerializer.Deserialize(json, UsageJsonContext.Default.UsageResponse);
+        return JsonSerializer.Deserialize(result.Body, UsageJsonContext.Default.UsageResponse);
     }
 
+    private async Task<UsageRequestResult> SendUsageRequestAsync()
+    {
+        using var request = new HttpRequestMessage(HttpMethod.Get, UsageUrl);
+        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _credentials!.AccessToken);
+        request.Headers.Add("anthropic-beta", "oauth-2025-04-20");
+        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        using var response = await _httpClient.SendAsync(request);
+        var body = await response.Content.ReadAsStringAsync();
+        var retryAfter = response.Headers.RetryAfter?.Delta
+                         ?? (response.Headers.RetryAfter?.Date - DateTimeOffset.UtcNow);
+
+        return new UsageRequestResult(response.StatusCode, response.IsSuccessStatusCode, body, retryAfter);
+    }
+
+    private readonly record struct UsageRequestResult(
+        HttpStatusCode StatusCode,
+        bool IsSuccess,
+        string Body,
+        TimeSpan? RetryAfter);
+
     private async Task LoadCredentialsAsync()
     {
         // Always read fresh from Claude Code's credentials file so we pick up any

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private void OnOpened(object? sender, EventArgs e)`
`71`	`71`
`72`	`72`	`_timer = new DispatcherTimer`
`73`	`73`	`{`
`74`		`- Interval = TimeSpan.FromMinutes(1)`
	`74`	`+ Interval = TimeSpan.FromMinutes(2)`
`75`	`75`	`};`
`76`	`76`	`_timer.Tick += async (_, _) => await PollUsageAsync();`
`77`	`77`	`_timer.Start();`