惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

Google DeepMind News
Google DeepMind News
博客园 - 司徒正美
WordPress大学
WordPress大学
爱范儿
爱范儿
小众软件
小众软件
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
罗磊的独立博客
博客园_首页
V
V2EX
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
T
Tailwind CSS Blog
大猫的无限游戏
大猫的无限游戏
The Cloudflare Blog
MyScale Blog
MyScale Blog
IT之家
IT之家
H
Help Net Security
Blog — PlanetScale
Blog — PlanetScale
Microsoft Security Blog
Microsoft Security Blog
H
Hackread – Cybersecurity News, Data Breaches, AI and More
Recent Announcements
Recent Announcements
F
Fortinet All Blogs
The GitHub Blog
The GitHub Blog
Y
Y Combinator Blog
人人都是产品经理
人人都是产品经理

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
refactor(usage): add precise token buckets for Usage Mosa...
konanok · 2026-04-30 · via Recent Commits to openclaw:main

@@ -39,6 +39,7 @@ import type {

3939

SessionMessageCounts,

4040

SessionModelUsage,

4141

SessionUtcQuarterHourMessageCounts,

42+

SessionUtcQuarterHourTokenUsage,

4243

SessionToolUsage,

4344

SessionUsageTimePoint,

4445

SessionUsageTimeSeries,

@@ -59,6 +60,7 @@ export type {

5960

SessionMessageCounts,

6061

SessionModelUsage,

6162

SessionUtcQuarterHourMessageCounts,

63+

SessionUtcQuarterHourTokenUsage,

6264

SessionToolUsage,

6365

SessionUsageTimePoint,

6466

SessionUsageTimeSeries,

@@ -170,6 +172,14 @@ const formatDayKey = (date: Date): string =>

170172

const formatUtcDayKey = (date: Date): string =>

171173

`${date.getUTCFullYear()}-${String(date.getUTCMonth() + 1).padStart(2, "0")}-${String(date.getUTCDate()).padStart(2, "0")}`;

172174175+

const getUtcQuarterHourBucketKey = (

176+

date: Date,

177+

): { date: string; quarterIndex: number; key: string } => {

178+

const quarterIndex = Math.floor((date.getUTCHours() * 60 + date.getUTCMinutes()) / 15);

179+

const utcDayKey = formatUtcDayKey(date);

180+

return { date: utcDayKey, quarterIndex, key: `${utcDayKey}::${quarterIndex}` };

181+

};

182+173183

/**

174184

* Accumulate message-level counts into a bucket (daily or UTC quarter-hour).

175185

* Avoids duplicating the same logic for both daily and quarter-hour message counts.

@@ -217,15 +227,29 @@ const computeLatencyStats = (values: number[]): SessionLatencyStats | undefined

217227

};

218228

};

219229230+

const computeUsageTokenTotals = (usage: NormalizedUsage) => {

231+

const input = usage.input ?? 0;

232+

const output = usage.output ?? 0;

233+

const cacheRead = usage.cacheRead ?? 0;

234+

const cacheWrite = usage.cacheWrite ?? 0;

235+

const componentTotal = input + output + cacheRead + cacheWrite;

236+

return {

237+

input,

238+

output,

239+

cacheRead,

240+

cacheWrite,

241+

componentTotal,

242+

totalTokens: usage.total ?? componentTotal,

243+

};

244+

};

245+220246

const applyUsageTotals = (totals: CostUsageTotals, usage: NormalizedUsage) => {

221-

totals.input += usage.input ?? 0;

222-

totals.output += usage.output ?? 0;

223-

totals.cacheRead += usage.cacheRead ?? 0;

224-

totals.cacheWrite += usage.cacheWrite ?? 0;

225-

const totalTokens =

226-

usage.total ??

227-

(usage.input ?? 0) + (usage.output ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);

228-

totals.totalTokens += totalTokens;

247+

const usageTotals = computeUsageTokenTotals(usage);

248+

totals.input += usageTotals.input;

249+

totals.output += usageTotals.output;

250+

totals.cacheRead += usageTotals.cacheRead;

251+

totals.cacheWrite += usageTotals.cacheWrite;

252+

totals.totalTokens += usageTotals.totalTokens;

229253

};

230254231255

const applyCostBreakdown = (totals: CostUsageTotals, costBreakdown: CostBreakdown | undefined) => {

@@ -608,6 +632,7 @@ export async function loadSessionCostSummary(params: {

608632

const dailyMap = new Map<string, { tokens: number; cost: number }>();

609633

const dailyMessageMap = new Map<string, SessionDailyMessageCounts>();

610634

const utcQuarterHourMessageMap = new Map<string, SessionUtcQuarterHourMessageCounts>();

635+

const utcQuarterHourTokenMap = new Map<string, SessionUtcQuarterHourTokenUsage>();

611636

const dailyLatencyMap = new Map<string, number[]>();

612637

const dailyModelUsageMap = new Map<string, SessionDailyModelUsage>();

613638

const messageCounts: SessionMessageCounts = {

@@ -709,14 +734,10 @@ export async function loadSessionCostSummary(params: {

709734

dailyMessageMap.set(dayKey, daily);

710735711736

// Per-quarter-hour message counts for precise hourly stats (UTC-based)

712-

const quarterIndex = Math.floor(

713-

(entry.timestamp.getUTCHours() * 60 + entry.timestamp.getUTCMinutes()) / 15,

714-

);

715-

const utcDayKey = formatUtcDayKey(entry.timestamp);

716-

const quarterKey = `${utcDayKey}::${quarterIndex}`;

717-

const utcQuarterHour = utcQuarterHourMessageMap.get(quarterKey) ?? {

718-

date: utcDayKey,

719-

quarterIndex,

737+

const quarterBucket = getUtcQuarterHourBucketKey(entry.timestamp);

738+

const utcQuarterHour = utcQuarterHourMessageMap.get(quarterBucket.key) ?? {

739+

date: quarterBucket.date,

740+

quarterIndex: quarterBucket.quarterIndex,

720741

total: 0,

721742

user: 0,

722743

assistant: 0,

@@ -725,7 +746,7 @@ export async function loadSessionCostSummary(params: {

725746

errors: 0,

726747

};

727748

accumulateMessageCounts(utcQuarterHour, entry, errorStopReasons);

728-

utcQuarterHourMessageMap.set(quarterKey, utcQuarterHour);

749+

utcQuarterHourMessageMap.set(quarterBucket.key, utcQuarterHour);

729750

}

730751731752

if (!entry.usage) {

@@ -741,11 +762,11 @@ export async function loadSessionCostSummary(params: {

741762742763

if (entry.timestamp) {

743764

const dayKey = formatDayKey(entry.timestamp);

744-

const entryTokens =

745-

(entry.usage.input ?? 0) +

746-

(entry.usage.output ?? 0) +

747-

(entry.usage.cacheRead ?? 0) +

748-

(entry.usage.cacheWrite ?? 0);

765+

const entryTokenTotals = computeUsageTokenTotals(entry.usage);

766+

// Preserve the legacy dailyBreakdown token basis until daily metrics are

767+

// refactored separately. The precise quarter-hour bucket below uses

768+

// entryTokenTotals.totalTokens so Usage Mosaic matches session totals.

769+

const entryTokens = entryTokenTotals.componentTotal;

749770

const entryCost =

750771

entry.costBreakdown?.total ??

751772

(entry.costBreakdown

@@ -755,6 +776,25 @@ export async function loadSessionCostSummary(params: {

755776

(entry.costBreakdown.cacheWrite ?? 0)

756777

: (entry.costTotal ?? 0));

757778779+

const quarterBucket = getUtcQuarterHourBucketKey(entry.timestamp);

780+

const utcQuarterHourToken = utcQuarterHourTokenMap.get(quarterBucket.key) ?? {

781+

date: quarterBucket.date,

782+

quarterIndex: quarterBucket.quarterIndex,

783+

input: 0,

784+

output: 0,

785+

cacheRead: 0,

786+

cacheWrite: 0,

787+

totalTokens: 0,

788+

totalCost: 0,

789+

};

790+

utcQuarterHourToken.input += entryTokenTotals.input;

791+

utcQuarterHourToken.output += entryTokenTotals.output;

792+

utcQuarterHourToken.cacheRead += entryTokenTotals.cacheRead;

793+

utcQuarterHourToken.cacheWrite += entryTokenTotals.cacheWrite;

794+

utcQuarterHourToken.totalTokens += entryTokenTotals.totalTokens;

795+

utcQuarterHourToken.totalCost += entryCost;

796+

utcQuarterHourTokenMap.set(quarterBucket.key, utcQuarterHourToken);

797+758798

const existing = dailyMap.get(dayKey) ?? { tokens: 0, cost: 0 };

759799

dailyMap.set(dayKey, {

760800

tokens: existing.tokens + entryTokens,

@@ -815,6 +855,10 @@ export async function loadSessionCostSummary(params: {

815855

utcQuarterHourMessageMap.values(),

816856

).toSorted((a, b) => a.date.localeCompare(b.date) || a.quarterIndex - b.quarterIndex);

817857858+

const utcQuarterHourTokenUsage: SessionUtcQuarterHourTokenUsage[] = Array.from(

859+

utcQuarterHourTokenMap.values(),

860+

).toSorted((a, b) => a.date.localeCompare(b.date) || a.quarterIndex - b.quarterIndex);

861+818862

const dailyLatency: SessionDailyLatency[] = Array.from(dailyLatencyMap.entries())

819863

.map(([date, values]) => {

820864

const stats = computeLatencyStats(values);

@@ -865,6 +909,9 @@ export async function loadSessionCostSummary(params: {

865909

utcQuarterHourMessageCounts: utcQuarterHourMessageCounts.length

866910

? utcQuarterHourMessageCounts

867911

: undefined,

912+

utcQuarterHourTokenUsage: utcQuarterHourTokenUsage.length

913+

? utcQuarterHourTokenUsage

914+

: undefined,

868915

dailyLatency: dailyLatency.length ? dailyLatency : undefined,

869916

dailyModelUsage: dailyModelUsage.length ? dailyModelUsage : undefined,

870917

messageCounts,

@@ -901,11 +948,9 @@ export async function loadSessionUsageTimeSeries(params: {

901948

return;

902949

}

903950904-

const input = entry.usage.input ?? 0;

905-

const output = entry.usage.output ?? 0;

906-

const cacheRead = entry.usage.cacheRead ?? 0;

907-

const cacheWrite = entry.usage.cacheWrite ?? 0;

908-

const totalTokens = entry.usage.total ?? input + output + cacheRead + cacheWrite;

951+

const { input, output, cacheRead, cacheWrite, totalTokens } = computeUsageTokenTotals(

952+

entry.usage,

953+

);

909954

const cost = entry.costTotal ?? 0;

910955911956

cumulativeTokens += totalTokens;