releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 24 Wiki Activity

feat(worker): expose usage/model-usage hub surface and persist run model

Browse Source 
Adds GetUsageSnapshot/GetModelUsage/GetTaskUsage to WorkerHub (backed by a
shared UsageSnapshotBuilder), a UsageUpdated broadcast fired after every
UsageMonitorService poll cycle, and records the resolved model on each
task_runs row so per-model/per-task usage can be reported from history.
This commit is contained in:
mika kuns
2026-08-05 12:37:50 +02:00
parent 519ea5a8e0
commit d4cd202460
11 changed files with 650 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ClaudeDo.Worker.Tests/Usage/UsageMonitorServiceTests.cs
+42 -7
View File
@@ -1,12 +1,18 @@
using ClaudeDo.Worker.Config;
using ClaudeDo.Worker.Hub;
using ClaudeDo.Worker.Tests.Infrastructure;
using ClaudeDo.Worker.Usage;
using ClaudeDo.Worker.Usage.Interfaces;
using Microsoft.Extensions.Logging.Abstractions;
namespace ClaudeDo.Worker.Tests.Usage;
public sealed class UsageMonitorServiceTests
public sealed class UsageMonitorServiceTests : IDisposable
{
private readonly DbFixture _db = new();
public void Dispose() => _db.Dispose();
private sealed class FakeClient : IUsageClient
{
public Queue<Func<UsageSnapshot>> Results { get; } = new();
@@ -20,15 +26,31 @@ public sealed class UsageMonitorServiceTests
}
}
private sealed class FakeGate : IUsageGate
{
public Task<UsageGateDecision> EvaluateAsync(CancellationToken ct = default) =>
Task.FromResult(new UsageGateDecision(false, null));
}
private static UsageSnapshot MakeSnapshot() => new(new UsageBucket(1, null), null, [], DateTime.UtcNow);
private (UsageMonitorService Service, UsageState State, CapturingHubContext Hub) CreateService(FakeClient client, WorkerConfig? cfg = null)
{
var state = new UsageState();
var config = cfg ?? new WorkerConfig();
var builder = new UsageSnapshotBuilder(state, new FakeGate(), _db.CreateFactory(), config);
var hubContext = new CapturingHubContext();
var broadcaster = new HubBroadcaster(hubContext);
var service = new UsageMonitorService(client, state, config, NullLogger<UsageMonitorService>.Instance, builder, broadcaster);
return (service, state, hubContext);
}
[Fact]
public async Task TickAsync_Success_UpdatesState()
{
var client = new FakeClient();
client.Results.Enqueue(MakeSnapshot);
var state = new UsageState();
var service = new UsageMonitorService(client, state, new WorkerConfig(), NullLogger<UsageMonitorService>.Instance);
var (service, state, _) = CreateService(client);
await service.TickAsync(CancellationToken.None);
@@ -41,8 +63,7 @@ public sealed class UsageMonitorServiceTests
{
var client = new FakeClient();
client.Results.Enqueue(() => throw new InvalidOperationException("network unreachable"));
var state = new UsageState();
var service = new UsageMonitorService(client, state, new WorkerConfig(), NullLogger<UsageMonitorService>.Instance);
var (service, state, _) = CreateService(client);
await service.TickAsync(CancellationToken.None);
@@ -56,8 +77,7 @@ public sealed class UsageMonitorServiceTests
var client = new FakeClient();
client.Results.Enqueue(MakeSnapshot);
client.Results.Enqueue(() => throw new InvalidOperationException("down"));
var state = new UsageState();
var service = new UsageMonitorService(client, state, new WorkerConfig(), NullLogger<UsageMonitorService>.Instance);
var (service, state, _) = CreateService(client);
await service.TickAsync(CancellationToken.None);
await service.TickAsync(CancellationToken.None);
@@ -65,4 +85,19 @@ public sealed class UsageMonitorServiceTests
Assert.NotNull(state.Snapshot);
Assert.Equal("down", state.LastError);
}
[Fact]
public async Task TickAsync_BroadcastsUsageUpdated_OnSuccessAndFailure()
{
var client = new FakeClient();
client.Results.Enqueue(MakeSnapshot);
client.Results.Enqueue(() => throw new InvalidOperationException("down"));
var (service, _, hubContext) = CreateService(client);
await service.TickAsync(CancellationToken.None);
await service.TickAsync(CancellationToken.None);
var calls = hubContext.Proxy.Calls.Where(c => c.Method == "UsageUpdated").ToList();
Assert.Equal(2, calls.Count);
}
}
tests/ClaudeDo.Worker.Tests/Usage/UsageSnapshotBuilderTests.cs
+145
View File
@@ -0,0 +1,145 @@
using ClaudeDo.Data.Repositories;
using ClaudeDo.Worker.Config;
using ClaudeDo.Worker.Tests.Infrastructure;
using ClaudeDo.Worker.Usage;
using ClaudeDo.Worker.Usage.Interfaces;
namespace ClaudeDo.Worker.Tests.Usage;
public sealed class UsageSnapshotBuilderTests : IDisposable
{
private readonly DbFixture _db = new();
public void Dispose() => _db.Dispose();
private sealed class FakeGate : IUsageGate
{
private readonly UsageGateDecision _decision;
public FakeGate(UsageGateDecision decision) => _decision = decision;
public Task<UsageGateDecision> EvaluateAsync(CancellationToken ct = default) => Task.FromResult(_decision);
}
private async Task SetThresholdsAsync(int fiveHourPct, int sevenDayPct)
{
using var ctx = _db.CreateContext();
var repo = new AppSettingsRepository(ctx);
var settings = await repo.GetAsync();
settings.UsageGateFiveHourPct = fiveHourPct;
settings.UsageGateSevenDayPct = sevenDayPct;
await repo.UpdateAsync(settings);
}
private UsageSnapshotBuilder CreateBuilder(UsageState state, UsageGateDecision decision, WorkerConfig? cfg = null) =>
new(state, new FakeGate(decision), _db.CreateFactory(), cfg ?? new WorkerConfig());
[Fact]
public async Task Maps_buckets_limits_thresholds_and_gate_state()
{
await SetThresholdsAsync(70, 85);
var fiveHourReset = DateTimeOffset.UtcNow.AddHours(2);
var sevenDayReset = DateTimeOffset.UtcNow.AddDays(3);
var limit = new UsageLimitRow("session", "default", 42.5, "warn", fiveHourReset, "sonnet", true);
var snapshot = new UsageSnapshot(
new UsageBucket(55.5, fiveHourReset),
new UsageBucket(88.8, sevenDayReset),
new[] { limit },
DateTime.UtcNow);
var state = new UsageState();
state.ReportSuccess(snapshot);
var builder = CreateBuilder(state, new UsageGateDecision(true, "5h-Limit 90% >= 70%"));
var dto = await builder.BuildAsync();
Assert.Equal(55.5, dto.FiveHourPercent);
Assert.Equal(fiveHourReset, dto.FiveHourResetsAt);
Assert.Equal(88.8, dto.SevenDayPercent);
Assert.Equal(sevenDayReset, dto.SevenDayResetsAt);
Assert.Equal(70, dto.FiveHourThresholdPct);
Assert.Equal(85, dto.SevenDayThresholdPct);
Assert.True(dto.IsGateBlocked);
Assert.Equal("5h-Limit 90% >= 70%", dto.GateReason);
Assert.Equal(snapshot.FetchedAtUtc, dto.FetchedAtUtc);
Assert.False(dto.IsStale);
Assert.Null(dto.LastError);
var mappedLimit = Assert.Single(dto.Limits);
Assert.Equal(limit.Kind, mappedLimit.Kind);
Assert.Equal(limit.Group, mappedLimit.Group);
Assert.Equal(limit.Percent, mappedLimit.Percent);
Assert.Equal(limit.Severity, mappedLimit.Severity);
Assert.Equal(limit.ResetsAt, mappedLimit.ResetsAt);
Assert.Equal(limit.ScopeModelDisplayName, mappedLimit.ScopeModelDisplayName);
Assert.Equal(limit.IsActive, mappedLimit.IsActive);
}
[Fact]
public async Task No_snapshot_yields_null_percents_stale_and_not_blocked()
{
await SetThresholdsAsync(80, 90);
var state = new UsageState();
var builder = CreateBuilder(state, new UsageGateDecision(false, null));
var dto = await builder.BuildAsync();
Assert.Null(dto.FiveHourPercent);
Assert.Null(dto.SevenDayPercent);
Assert.Empty(dto.Limits);
Assert.Null(dto.FetchedAtUtc);
Assert.True(dto.IsStale);
Assert.False(dto.IsGateBlocked);
}
[Fact]
public async Task Snapshot_older_than_4x_poll_interval_is_stale()
{
await SetThresholdsAsync(80, 90);
var cfg = new WorkerConfig { UsagePollIntervalSeconds = 60 };
var state = new UsageState();
state.ReportSuccess(new UsageSnapshot(
new UsageBucket(10, null), null, Array.Empty<UsageLimitRow>(),
DateTime.UtcNow.AddSeconds(-4 * 60)));
var builder = CreateBuilder(state, new UsageGateDecision(false, null), cfg);
var dto = await builder.BuildAsync();
Assert.True(dto.IsStale);
}
[Fact]
public async Task Fresh_snapshot_is_not_stale()
{
await SetThresholdsAsync(80, 90);
var cfg = new WorkerConfig { UsagePollIntervalSeconds = 60 };
var state = new UsageState();
state.ReportSuccess(new UsageSnapshot(
new UsageBucket(10, null), null, Array.Empty<UsageLimitRow>(),
DateTime.UtcNow));
var builder = CreateBuilder(state, new UsageGateDecision(false, null), cfg);
var dto = await builder.BuildAsync();
Assert.False(dto.IsStale);
}
[Fact]
public async Task Failed_last_poll_marks_stale_even_with_fresh_snapshot()
{
await SetThresholdsAsync(80, 90);
var state = new UsageState();
state.ReportSuccess(new UsageSnapshot(
new UsageBucket(10, null), null, Array.Empty<UsageLimitRow>(), DateTime.UtcNow));
state.ReportFailure("boom", DateTime.UtcNow);
var builder = CreateBuilder(state, new UsageGateDecision(false, null));
var dto = await builder.BuildAsync();
Assert.True(dto.IsStale);
Assert.Equal("boom", dto.LastError);
}
}