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

Merge claudedo/38394081d47048fea82317c6c52e01a5

Browse Source
This commit is contained in:
mika kuns
2026-08-05 16:05:19 +02:00
parent 2a217336e8 7d3d6d7b54
commit 19003e68b6
28 changed files with 1318 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ClaudeDo.Worker/Runner/TaskRunner.cs
+42 -3
View File
@@ -6,6 +6,8 @@ using ClaudeDo.Worker.Config;
using ClaudeDo.Worker.Hub;
using ClaudeDo.Worker.Skills;
using ClaudeDo.Worker.State;
using ClaudeDo.Worker.Usage;
using ClaudeDo.Worker.Usage.Interfaces;
using Microsoft.EntityFrameworkCore;
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
@@ -24,6 +26,7 @@ public sealed class TaskRunner
private readonly TaskRunTokenRegistry _tokens;
private readonly AttachmentStore _attachments;
private readonly ISessionSkillSeeder _skillSeeder;
private readonly ITranscriptUsageReader _usageReader;
public TaskRunner(
IClaudeProcess claude,
@@ -36,7 +39,8 @@ public sealed class TaskRunner
ITaskStateService state,
TaskRunTokenRegistry tokens,
AttachmentStore attachments,
ISessionSkillSeeder skillSeeder)
ISessionSkillSeeder skillSeeder,
ITranscriptUsageReader usageReader)
{
_claude = claude;
_dbFactory = dbFactory;
@@ -49,6 +53,7 @@ public sealed class TaskRunner
_tokens = tokens;
_attachments = attachments;
_skillSeeder = skillSeeder;
_usageReader = usageReader;
}
public async Task RunAsync(TaskEntity task, string slot, CancellationToken ct, bool alreadyClaimed = false)
@@ -364,8 +369,8 @@ public sealed class TaskRunner
run.ErrorMarkdown = result.ErrorMarkdown;
run.ExitCode = result.ExitCode;
run.TurnCount = result.TurnCount;
run.TokensIn = result.TokensIn;
run.TokensOut = result.TokensOut;
if (result.SessionId is not null)
await ApplyUsageAsync(run, taskId, result.SessionId);
run.FinishedAt = DateTime.UtcNow;
using (var context = _dbFactory.CreateDbContext())
@@ -397,6 +402,40 @@ public sealed class TaskRunner
}
}
/// Populates the run's raw token fields from the session transcript (input, output,
/// cache-read, cache-write — the API's "input_tokens" alone is only the uncached
/// remainder and undercounts the real prompt size by orders of magnitude). A resumed
/// session's transcript is cumulative, so the delta against prior runs sharing the same
/// SessionId is stored, not the running total. Any failure here (missing/unreadable
/// transcript) leaves the fields null and must never fail the run itself.
private async Task ApplyUsageAsync(TaskRunEntity run, string taskId, string sessionId)
{
try
{
var totals = await _usageReader.ReadSessionTotalsAsync(sessionId, CancellationToken.None);
if (totals is null) return;
List<TaskRunEntity> priorRuns;
using (var context = _dbFactory.CreateDbContext())
priorRuns = await new TaskRunRepository(context).GetByTaskIdAsync(taskId, CancellationToken.None);
var sameSession = priorRuns.Where(r => r.Id != run.Id && r.SessionId == sessionId).ToList();
var priorInput = sameSession.Sum(r => (long)(r.TokensIn ?? 0));
var priorOutput = sameSession.Sum(r => (long)(r.TokensOut ?? 0));
var priorCacheRead = sameSession.Sum(r => (long)(r.CacheReadTokens ?? 0));
var priorCacheWrite = sameSession.Sum(r => (long)(r.CacheWriteTokens ?? 0));
run.TokensIn = (int)Math.Max(0, totals.InputTokens - priorInput);
run.TokensOut = (int)Math.Max(0, totals.OutputTokens - priorOutput);
run.CacheReadTokens = (int)Math.Max(0, totals.CacheReadTokens - priorCacheRead);
run.CacheWriteTokens = (int)Math.Max(0, totals.CacheCreationTokens - priorCacheWrite);
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Failed to read session usage totals for task {TaskId}, session {SessionId}", taskId, sessionId);
}
}
private async Task HandleSuccess(TaskEntity task, ListEntity list, string slot, WorktreeContext? wtCtx, RunResult result, CancellationToken ct)
{
if (wtCtx is not null)