fix(models): preserve cache usage categories and receipt sources
This commit is contained in:
@@ -520,7 +520,7 @@ export class Runtime {
|
||||
let requestEvent;
|
||||
const externalEngine = !!run.worker?.engine;
|
||||
if (externalEngine) { planned.record.engineStepOnly = true; planned.record.engine = 'deepseek-workbench'; }
|
||||
let response, requestStarted = false, responseAccounted = externalEngine;
|
||||
let response, finalAttemptUsage = null, requestStarted = false, responseAccounted = externalEngine;
|
||||
try {
|
||||
signal.throwIfAborted(); checkBudget(run.record, task);
|
||||
if (run.worker) sealWorkerDispatch(this.store, session, run.worker, run.record, planned.record);
|
||||
@@ -528,6 +528,7 @@ export class Runtime {
|
||||
requestStarted = true;
|
||||
const progressHandler = progress => {
|
||||
if (progress.consumption) {
|
||||
finalAttemptUsage = progress.consumption.usage ?? null;
|
||||
this.store.recordConsumption(session, run.record, { ...progress.consumption, requestId: planned.record.id }, planned.record.tokenReservation?.reservedTokens??planned.record.estimatedInputTokens + config.maxOutputTokens);
|
||||
responseAccounted = true;
|
||||
if (run.worker) { planned.record.workerUsageAccounted = true; this.store.save(session); }
|
||||
@@ -585,7 +586,7 @@ export class Runtime {
|
||||
}
|
||||
} catch (error) {
|
||||
if (requestEvent?.stream && requestEvent.stream.status !== 'completed') { requestEvent.stream.status = signal.aborted ? 'interrupted' : 'incomplete'; requestEvent.phase = signal.aborted ? 'interrupted' : 'failed'; requestEvent.finishedAt = now(); }
|
||||
this.requestPlanner().finish(session, planned.record, { error: Object.assign(new Error(this.provider.redact(error.message ?? String(error))), { name: signal.aborted ? 'AbortError' : error.name }), attempts: planned.record.requestAttempts });
|
||||
this.requestPlanner().finish(session, planned.record, { error: Object.assign(new Error(this.provider.redact(error.message ?? String(error))), { name: signal.aborted ? 'AbortError' : error.name }), attempts: planned.record.requestAttempts, usage: finalAttemptUsage });
|
||||
if (run.worker && requestStarted && !responseAccounted) {
|
||||
this.store.recordResponse(session, run.record, null, planned.record.tokenReservation?.reservedTokens??planned.record.estimatedInputTokens + config.maxOutputTokens);
|
||||
planned.record.workerUsageAccounted = true;
|
||||
|
||||
Reference in New Issue
Block a user