Skip to content

Add labeled weekly usage trend #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheBeems merged 2 commits into from
Jul 16, 2026
Merged

Add labeled weekly usage trend #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b78eb22
Add labeled weekly usage trend
TheBeems Jul 16, 2026
66f6ffc
Link weekly trend changelog to PR #13
TheBeems Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ Each entry links to the commit or pull request that introduced the change.

## [Unreleased]

### Added

- The weekly usage dashboard now combines observed remaining allowance, a dashed reset projection, and locally observed daily quota consumption in one seven-day trend chart. ([PR #13](https://github.com/TheBeems/CodexUsageDock/pull/13))

### Changed

- The weekly trend chart now labels its 0–100% vertical scale and localized quota-window weekdays without relying on unsupported SVG text. ([PR #13](https://github.com/TheBeems/CodexUsageDock/pull/13))

## [0.5.2] - 2026-07-16

### Fixed
Expand Down
201 changes: 200 additions & 1 deletion CodexUsageDock.Tests/UsageDataTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Globalization;
using System.Text.Json;
using System.Xml.Linq;
using Microsoft.CommandPalette.Extensions;
using Microsoft.CommandPalette.Extensions.Toolkit;
using Xunit;
Expand All @@ -7,6 +9,14 @@
public sealed class UsageDataTests
{
private static readonly TimeSpan AsyncTestTimeout = TimeSpan.FromSeconds(5);
private static readonly XNamespace Svg = "http://www.w3.org/2000/svg";

private static XDocument ParseSvg(string imageUrl)
{
const string Prefix = "data:image/svg+xml;utf8,";
Assert.StartsWith(Prefix, imageUrl, StringComparison.Ordinal);
return XDocument.Parse(Uri.UnescapeDataString(imageUrl[Prefix.Length..]));
}

[Fact]
public void SettingsDefaultToShowingAllDockUsageInformation()
Expand All @@ -31,7 +41,7 @@
}

[Fact]
public void ClassifyWindows_RecognizesWeeklyWindowWhenItIsPrimary()

Check warning on line 44 in CodexUsageDock.Tests/UsageDataTests.cs

View workflow job for this annotation

GitHub Actions / validate 

Remove the underscores from member name CodexUsageDock.Tests.UsageDataTests.ClassifyWindows_RecognizesWeeklyWindowWhenItIsPrimary() (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1707)
{
var weekly = new RateLimitWindow(3, 10080, DateTimeOffset.Now.AddDays(7));

Expand All @@ -51,7 +61,7 @@
}

[Fact]
public void Summary_UsesWeeklyWindowWhenFiveHourWindowIsInactive()

Check warning on line 64 in CodexUsageDock.Tests/UsageDataTests.cs

View workflow job for this annotation

GitHub Actions / validate 

Remove the underscores from member name CodexUsageDock.Tests.UsageDataTests.Summary_UsesWeeklyWindowWhenFiveHourWindowIsInactive() (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1707)
{
var now = new DateTimeOffset(2026, 7, 12, 14, 0, 0, TimeSpan.Zero);
var snapshot = CodexUsageSnapshot.Loading with
Expand All @@ -68,7 +78,7 @@
}

[Fact]
public void MissingFiveHourWindow_CanBeDescribedAsInactive()

Check warning on line 81 in CodexUsageDock.Tests/UsageDataTests.cs

View workflow job for this annotation

GitHub Actions / validate 

Remove the underscores from member name CodexUsageDock.Tests.UsageDataTests.MissingFiveHourWindow_CanBeDescribedAsInactive() (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1707)
{
var text = CodexUsageDockPage.FormatWindow("5-hour window", null, DateTimeOffset.Now, "Currently inactive");

Expand All @@ -77,7 +87,7 @@
}

[Fact]
public void AppServerWorkingDirectory_IsNeverInheritedFromSystem32ForBareCommand()

Check warning on line 90 in CodexUsageDock.Tests/UsageDataTests.cs

View workflow job for this annotation

GitHub Actions / validate 

Remove the underscores from member name CodexUsageDock.Tests.UsageDataTests.AppServerWorkingDirectory_IsNeverInheritedFromSystem32ForBareCommand() (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1707)
{
var workingDirectory = CodexAppServerReader.GetSafeWorkingDirectory("codex.exe");

Expand Down Expand Up @@ -195,6 +205,8 @@
Assert.Contains("\"type\": \"Image\"", main.TemplateJson, StringComparison.Ordinal);
Assert.Contains("Allowance used", main.TemplateJson, StringComparison.Ordinal);
Assert.Contains("Window elapsed", main.TemplateJson, StringComparison.Ordinal);
Assert.Contains("weeklyTrendAvailable", main.TemplateJson, StringComparison.Ordinal);
Assert.Contains("Solid: remaining allowance", main.TemplateJson, StringComparison.Ordinal);
Assert.Same(Assert.Single(page.GetContent()), Assert.Single(page.GetContent()));
}

Expand All @@ -218,7 +230,11 @@
now,
isLoading: false,
[new UsageHistoryEntry(now.AddMinutes(-30), 90), new UsageHistoryEntry(now, 80)],
[new UsageHistoryEntry(now.AddHours(-12), 99), new UsageHistoryEntry(now, 98)],
[
new UsageHistoryEntry(now.AddHours(-12), 99),
new UsageHistoryEntry(now.AddMinutes(-10), 98.01),
new UsageHistoryEntry(now, 98),
],
TimeSpan.FromMinutes(1));
var details = CodexUsageDockPage.FormatDetailsBody(snapshot, now);
using var mainData = JsonDocument.Parse(main);
Expand All @@ -235,6 +251,9 @@
Assert.StartsWith("data:image/svg+xml;utf8,", root.GetProperty("fiveHourElapsedBarUrl").GetString(), StringComparison.Ordinal);
Assert.StartsWith("data:image/svg+xml;utf8,", root.GetProperty("weeklyUsedBarUrl").GetString(), StringComparison.Ordinal);
Assert.StartsWith("data:image/svg+xml;utf8,", root.GetProperty("weeklyElapsedBarUrl").GetString(), StringComparison.Ordinal);
Assert.True(root.GetProperty("weeklyTrendAvailable").GetBoolean());
Assert.StartsWith("data:image/svg+xml;utf8,", root.GetProperty("weeklyTrendChartUrl").GetString(), StringComparison.Ordinal);
Assert.Contains("Solid line and points are observed", root.GetProperty("weeklyTrendChartAlt").GetString(), StringComparison.Ordinal);
Assert.Equal("On track", root.GetProperty("fiveHourPaceStatus").GetString());
Assert.Equal("Comfortably on track", root.GetProperty("weeklyPaceStatus").GetString());
Assert.Contains("Projected at reset", root.GetProperty("fiveHourProjection").GetString(), StringComparison.Ordinal);
Expand Down Expand Up @@ -321,6 +340,186 @@
Assert.DoesNotContain("NaN", bar, StringComparison.Ordinal);
}

[Fact]
public void WeeklyTrendChartRendersObservedForecastAndDailyUse()
{
var windowStart = new DateTimeOffset(2026, 7, 10, 9, 0, 0, TimeSpan.Zero);
var reset = windowStart.AddDays(7);
var now = windowStart.AddDays(2).AddHours(6);
var chart = WeeklyUsageTrendChartRenderer.Create(
[
new UsageHistoryEntry(windowStart.AddMinutes(10), 100),
new UsageHistoryEntry(windowStart.AddHours(4), 95),
new UsageHistoryEntry(windowStart.AddDays(1).AddHours(4), 88),
new UsageHistoryEntry(now, 80),
],
new RateLimitWindow(20, 10080, reset),
now,
TimeSpan.FromDays(2),
new UsageTrendForecast(reset, 60, false));

var result = Assert.IsType<WeeklyUsageTrendChart>(chart);
var svg = ParseSvg(result.ImageUrl);
var root = svg.Root;
Assert.NotNull(root);
var lines = root!.Descendants(Svg + "polyline").ToArray();

Assert.Equal($"0 0 {UsageDashboardCard.BarWidth} {WeeklyUsageTrendChartRenderer.Height}", root.Attribute("viewBox")?.Value);
Assert.Contains(lines, line => line.Attribute("stroke-dasharray") is null);
Assert.Contains(lines, line => line.Attribute("stroke-dasharray")?.Value == "5 4");
Assert.True(root.Descendants(Svg + "rect").Count(rect => rect.Attribute("data-series")?.Value == "daily-use") >= 2);
Assert.Contains("Solid line and points are observed", result.AltText, StringComparison.Ordinal);
Assert.DoesNotContain("NaN", result.ImageUrl, StringComparison.Ordinal);
Assert.DoesNotContain("Infinity", result.ImageUrl, StringComparison.Ordinal);
}

[Fact]
public void WeeklyTrendChartBreaksGapsAndExcludesUnobservedDailyUse()
{
var windowStart = new DateTimeOffset(2026, 7, 10, 9, 0, 0, TimeSpan.Zero);
var reset = windowStart.AddDays(7);
var now = windowStart.AddDays(1).AddHours(1);
var chart = WeeklyUsageTrendChartRenderer.Create(
[
new UsageHistoryEntry(windowStart.AddMinutes(1), 100),
new UsageHistoryEntry(windowStart.AddMinutes(5), 90),
new UsageHistoryEntry(windowStart.AddDays(1).AddMinutes(1), 60),
new UsageHistoryEntry(windowStart.AddDays(1).AddMinutes(5), 50),
],
new RateLimitWindow(50, 10080, reset),
now,
TimeSpan.FromMinutes(15),
new UsageTrendForecast(reset, 0, false));

var result = Assert.IsType<WeeklyUsageTrendChart>(chart);
var svg = ParseSvg(result.ImageUrl);
var root = svg.Root;
Assert.NotNull(root);
var observedLines = root!.Descendants(Svg + "polyline")
.Where(line => line.Attribute("stroke-dasharray") is null)
.ToArray();
var observedBarHeight = root.Descendants(Svg + "rect")
.Where(bar => bar.Attribute("data-series")?.Value == "daily-use")
.Sum(bar => double.Parse(bar.Attribute("height")!.Value, System.Globalization.CultureInfo.InvariantCulture));

Assert.Equal(2, observedLines.Length);
Assert.InRange(observedBarHeight, 5.3, 5.5);
}

[Fact]
public void WeeklyTrendChartRendersHostSafeLocalizedAxisLabels()
{
var culture = CultureInfo.GetCultureInfo("nl-NL");
var windowStart = new DateTimeOffset(2026, 7, 13, 9, 0, 0, TimeSpan.Zero);
var reset = windowStart.AddDays(7);
var now = windowStart.AddDays(1);
var chart = WeeklyUsageTrendChartRenderer.Create(
[
new UsageHistoryEntry(windowStart.AddMinutes(1), 100),
new UsageHistoryEntry(now, 90),
],
new RateLimitWindow(10, 10080, reset),
now,
TimeSpan.FromDays(2),
forecast: null,
culture: culture);

var result = Assert.IsType<WeeklyUsageTrendChart>(chart);
var svg = ParseSvg(result.ImageUrl);
var root = Assert.IsType<XElement>(svg.Root);
var verticalLabels = root.Descendants(Svg + "g")
.Where(group => group.Attribute("data-axis")?.Value == "vertical")
.Select(group => group.Attribute("data-axis-label")!.Value)
.ToArray();
var horizontalLabels = root.Descendants(Svg + "g")
.Where(group => group.Attribute("data-axis")?.Value == "horizontal")
.Select(group => group.Attribute("data-axis-label")!.Value)
.ToArray();

Assert.Equal(["100%", "50%", "0%"], verticalLabels);
Assert.Equal(["ma", "di", "wo", "do", "vr", "za", "zo"], horizontalLabels);
Assert.Equal(["MA", "DI", "WO", "DO", "VR", "ZA", "ZO"], root.Descendants(Svg + "g")
.Where(group => group.Attribute("data-axis")?.Value == "horizontal")
.Select(group => group.Attribute("data-rendered-label")!.Value));
Assert.Empty(root.Descendants(Svg + "text"));
Assert.All(root.Descendants(Svg + "g").Where(group => group.Attribute("data-axis") is not null), group =>
Assert.NotEmpty(group.Descendants(Svg + "rect")));
Assert.Contains("vertical scale is remaining allowance", result.AltText, StringComparison.Ordinal);
}

[Fact]
public void WeeklyTrendChartKeepsIsolatedObservationsAsPoints()
{
var windowStart = new DateTimeOffset(2026, 7, 10, 9, 0, 0, TimeSpan.Zero);
var reset = windowStart.AddDays(7);
var now = windowStart.AddDays(1);
var chart = WeeklyUsageTrendChartRenderer.Create(
[
new UsageHistoryEntry(windowStart.AddMinutes(1), 100),
new UsageHistoryEntry(now, 80),
],
new RateLimitWindow(20, 10080, reset),
now,
TimeSpan.FromMinutes(15),
forecast: null);

var result = Assert.IsType<WeeklyUsageTrendChart>(chart);
var svg = ParseSvg(result.ImageUrl);

Assert.Empty(svg.Descendants(Svg + "polyline"));
Assert.Equal(2, svg.Descendants(Svg + "circle").Count());
}

[Fact]
public void WeeklyTrendChartOmitsForecastWithoutAProjection()
{
var windowStart = new DateTimeOffset(2026, 7, 10, 9, 0, 0, TimeSpan.Zero);
var reset = windowStart.AddDays(7);
var now = windowStart.AddHours(1);
var chart = WeeklyUsageTrendChartRenderer.Create(
[
new UsageHistoryEntry(windowStart.AddMinutes(1), 100),
new UsageHistoryEntry(now, 95),
],
new RateLimitWindow(5, 10080, reset),
now,
TimeSpan.FromMinutes(15),
forecast: null);

var result = Assert.IsType<WeeklyUsageTrendChart>(chart);
var svg = ParseSvg(result.ImageUrl);

Assert.DoesNotContain(svg.Descendants(Svg + "polyline"), line => line.Attribute("stroke-dasharray") is not null);
Assert.Contains("Forecast is unavailable", result.AltText, StringComparison.Ordinal);
}

[Fact]
public void WeeklyTrendChartBoundsMinuteHistory()
{
var windowStart = new DateTimeOffset(2026, 7, 10, 9, 0, 0, TimeSpan.Zero);
var reset = windowStart.AddDays(7);
var now = reset.AddMinutes(-1);
var samples = Enumerable.Range(0, 10080)
.Select(index => new UsageHistoryEntry(
windowStart.AddMinutes(index),
100 - index * 50d / 10079d))
.ToArray();
var chart = WeeklyUsageTrendChartRenderer.Create(
samples,
new RateLimitWindow(50, 10080, reset),
now,
TimeSpan.FromMinutes(15),
forecast: null);

var result = Assert.IsType<WeeklyUsageTrendChart>(chart);
var svg = ParseSvg(result.ImageUrl);
var observed = Assert.Single(svg.Descendants(Svg + "polyline"));
var points = observed.Attribute("points")!.Value.Split(' ', StringSplitOptions.RemoveEmptyEntries);

Assert.InRange(points.Length, 2, WeeklyUsageTrendChartRenderer.MaximumRenderedPoints);
Assert.True(result.ImageUrl.Length < 50000);
}

[Fact]
public void UsagePaceWarnsWhenAllowanceRunsFarAheadOfElapsedTime()
{
Expand Down Expand Up @@ -414,7 +613,7 @@
}

[Fact]
public void ParseResetCredits_UsesAvailableCountAndExpiryDetails()

Check warning on line 616 in CodexUsageDock.Tests/UsageDataTests.cs

View workflow job for this annotation

GitHub Actions / validate 

Remove the underscores from member name CodexUsageDock.Tests.UsageDataTests.ParseResetCredits_UsesAvailableCountAndExpiryDetails() (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1707)
{
using var json = JsonDocument.Parse("""
{
Expand All @@ -437,7 +636,7 @@
}

[Fact]
public void ParseResetCredits_PreservesCountWhenDetailsAreNull()

Check warning on line 639 in CodexUsageDock.Tests/UsageDataTests.cs

View workflow job for this annotation

GitHub Actions / validate 

Remove the underscores from member name CodexUsageDock.Tests.UsageDataTests.ParseResetCredits_PreservesCountWhenDetailsAreNull() (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1707)
{
using var json = JsonDocument.Parse("""{ "rateLimitResetCredits": { "availableCount": 3, "credits": null } }""");

Expand Down Expand Up @@ -529,7 +728,7 @@
}

[Fact]
public void ParseCredits_HandlesBalanceAndUnlimitedAccounts()

Check warning on line 731 in CodexUsageDock.Tests/UsageDataTests.cs

View workflow job for this annotation

GitHub Actions / validate 

Remove the underscores from member name CodexUsageDock.Tests.UsageDataTests.ParseCredits_HandlesBalanceAndUnlimitedAccounts() (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1707)
{
using var result = JsonDocument.Parse("{}");
using var balanceLimits = JsonDocument.Parse("""{ "credits": { "hasCredits": true, "unlimited": false, "balance": "10.00" } }""");
Expand Down Expand Up @@ -571,7 +770,7 @@
[InlineData(null, null, "-- resets")]
[InlineData(0, null, "0 resets")]
[InlineData(2, "10.00", "2 resets · 10.00")]
public void DockSummary_FormatsAvailableData(int? resetCount, string? balance, string expected)

Check warning on line 773 in CodexUsageDock.Tests/UsageDataTests.cs

View workflow job for this annotation

GitHub Actions / validate 

Remove the underscores from member name CodexUsageDock.Tests.UsageDataTests.DockSummary_FormatsAvailableData(int?, string?, string) (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1707)
{
var snapshot = new CodexUsageSnapshot(
null,
Expand Down Expand Up @@ -632,7 +831,7 @@
}

[Fact]
public void DetailFormatter_ReportsMissingExpiryRows()

Check warning on line 834 in CodexUsageDock.Tests/UsageDataTests.cs

View workflow job for this annotation

GitHub Actions / validate 

Remove the underscores from member name CodexUsageDock.Tests.UsageDataTests.DetailFormatter_ReportsMissingExpiryRows() (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1707)
{
var resets = new RateLimitResetCredits(
2,
Expand All @@ -658,7 +857,7 @@
}

[Fact]
public void DashboardSummary_WarnsWhenPrimaryLimitIsLow()

Check warning on line 860 in CodexUsageDock.Tests/UsageDataTests.cs

View workflow job for this annotation

GitHub Actions / validate 

Remove the underscores from member name CodexUsageDock.Tests.UsageDataTests.DashboardSummary_WarnsWhenPrimaryLimitIsLow() (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1707)
{
var now = new DateTimeOffset(2026, 7, 12, 14, 0, 0, TimeSpan.Zero);
var snapshot = new CodexUsageSnapshot(
Expand Down
Loading