diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e6e9fa43..698bd521b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Docs: https://docs.clawd.bot ### Fixes - Doctor: avoid re-adding WhatsApp ack reaction config when only legacy auth files exist. (#1087) — thanks @YuriNachos. - CLI: add WSL2/systemd unavailable hints in daemon status/doctor output. +- Status: show both usage windows with reset hints when usage data is available. (#1101) — thanks @rhjoh. ## 2026.1.16-2 diff --git a/README.md b/README.md index ca985e004..132419141 100644 --- a/README.md +++ b/README.md @@ -478,20 +478,21 @@ Thanks to all clawtributors: xadenryan Tobias Bischoff juanpablodlc hsrvc magimetal meaningfool NicholasSpisak abhisekbasu1 claude jamesgroat Hyaxia dantelex daveonkels radek-paclt mteam88 Eng. Juan Combetto dbhurley Mariano Belinky julianengel benithors timolins nachx639 sreekaransrinath gupsammy cristip73 nachoiacovino Vasanth Rao Naik Sabavat cpojer lc0rp scald - andranik-sahakyan davidguttman sleontenko sircrumpet peschee rafaelreis-r ratulsarna thewilloftheshadow lutr0 gumadeiras - emanuelst KristijanJovanovski CashWilliams rdev osolmaz kiranjd adityashaw2 sebslight sheeek onutc - manuelhettich minghinmatthewlam myfunc buddyh mcinteerj timkrase gerardward2007 obviyus tosh-hamburg azade-c - bjesuiter danielz1z Josh Phillips roshanasingh4 YuriNachos superman32432432 Yurii Chukhlib antons austinm911 blacksmith-sh[bot] - grp06 HeimdallStrategy imfing jalehman jarvis-medmatic kkarimi mahmoudashraf93 petter-b pkrmf RandyVentures - dan-dr erikpr1994 jonasjancarik Keith the Silly Goose L36 Server Marc mitschabaude-bot neist chrisrodz Friederike Seiler - gabriel-trigo iamadig Kit koala73 manmal ngutman ogulcancelik pasogott petradonka rubyrunsstuff - VACInc wes-davis zats Chris Taylor Django Navarro evalexpr henrino3 oswalpalash pcty-nextgen-service-account Syhids - tyler6204 Aaron Konyer adam91holt erik-agens fcatuhe ivanrvpereira jayhickey jeffersonwarrior jeffersonwarrior Jonathan D. Rhyne (DJ-D) - jverdi mickahouan mjrussell mkbehr p6l-richard philipp-spiess robaxelsen Sash Catanzarite VAC zknicker - alejandro maza andrewting19 Asleep123 bolismauro cash-echo-bot Clawd conhecendocontato Drake Thomsen gtsifrikas HazAT - hrdwdmrbl hugobarauna Jamie Openshaw Jarvis Jefferson Nunn kitze levifig Lloyd longmaba loukotal - martinpucik Miles mrdbstn MSch Mustafa Tag Eldeen ndraiman nexty5870 prathamdby reeltimeapps RLTCmpe - Rolf Fredheim Rony Kelner Samrat Jha siraht snopoke suminhthanh The Admiral thesash Ubuntu voidserf - wstock Zach Knickerbocker Alphonse-arianee Azade carlulsoe ddyo Erik latitudeki5223 Manuel Maly Mourad Boustani - pcty-nextgen-ios-builder Quentin Randy Torres ronak-guliani William Stock + andranik-sahakyan davidguttman sleontenko sircrumpet peschee rafaelreis-r ratulsarna thewilloftheshadow lutr0 danielz1z + gumadeiras emanuelst KristijanJovanovski CashWilliams rdev osolmaz kiranjd adityashaw2 sebslight sheeek + artuskg onutc manuelhettich minghinmatthewlam myfunc buddyh connorshea mcinteerj timkrase gerardward2007 + obviyus tosh-hamburg azade-c roshanasingh4 bjesuiter Josh Phillips YuriNachos zerone0x superman32432432 Yurii Chukhlib + antons austinm911 blacksmith-sh[bot] dan-dr grp06 HeimdallStrategy imfing jalehman jarvis-medmatic kkarimi + mahmoudashraf93 petter-b pkrmf RandyVentures erikpr1994 jonasjancarik Keith the Silly Goose L36 Server Marc mitschabaude-bot + neist tyler6204 chrisrodz Friederike Seiler gabriel-trigo iamadig Kit koala73 manmal ngutman + ogulcancelik pasogott petradonka rubyrunsstuff VACInc wes-davis zats Chris Taylor Django Navarro evalexpr + henrino3 mkbehr oswalpalash pcty-nextgen-service-account Syhids Aaron Konyer adam91holt erik-agens fcatuhe ivanrvpereira + jayhickey jeffersonwarrior jeffersonwarrior Jonathan D. Rhyne (DJ-D) jverdi mickahouan mjrussell p6l-richard philipp-spiess robaxelsen + Sash Catanzarite sibbl VAC zknicker alejandro maza andrewting19 Asleep123 bolismauro cash-echo-bot Clawd + conhecendocontato Dimitrios Ploutarchos Drake Thomsen gtsifrikas HazAT hrdwdmrbl hugobarauna Jamie Openshaw Jarvis Jefferson Nunn + kitze levifig Lloyd longmaba loukotal martinpucik Miles mrdbstn MSch Mustafa Tag Eldeen + ndraiman nexty5870 prathamdby reeltimeapps RLTCmpe Rolf Fredheim Rony Kelner Samrat Jha siraht snopoke + suminhthanh The Admiral thesash Ubuntu voidserf wstock Zach Knickerbocker Alphonse-arianee Azade carlulsoe + ddyo Erik latitudeki5223 Manuel Maly Mourad Boustani pcty-nextgen-ios-builder Quentin Randy Torres rhjoh ronak-guliani + William Stock

diff --git a/scripts/clawtributors-map.json b/scripts/clawtributors-map.json index 319ce2339..1cd820b30 100644 --- a/scripts/clawtributors-map.json +++ b/scripts/clawtributors-map.json @@ -8,7 +8,8 @@ "latitudeki5223", "longmaba", "manmal", - "thesash" + "thesash", + "rhjoh" ], "seedCommit": "d6863f87", "placeholderAvatar": "assets/avatar-placeholder.svg", diff --git a/src/auto-reply/reply.triggers.trigger-handling.filters-usage-summary-current-model-provider.test.ts b/src/auto-reply/reply.triggers.trigger-handling.filters-usage-summary-current-model-provider.test.ts index 01e4449c8..f236f88ee 100644 --- a/src/auto-reply/reply.triggers.trigger-handling.filters-usage-summary-current-model-provider.test.ts +++ b/src/auto-reply/reply.triggers.trigger-handling.filters-usage-summary-current-model-provider.test.ts @@ -104,7 +104,12 @@ describe("trigger handling", () => { { provider: "anthropic", displayName: "Anthropic", - windows: [], + windows: [ + { + label: "5h", + usedPercent: 20, + }, + ], }, ], }); diff --git a/src/auto-reply/reply/commands-status.ts b/src/auto-reply/reply/commands-status.ts index 67081a209..2249f9fc6 100644 --- a/src/auto-reply/reply/commands-status.ts +++ b/src/auto-reply/reply/commands-status.ts @@ -14,7 +14,7 @@ import type { ClawdbotConfig } from "../../config/config.js"; import type { SessionEntry, SessionScope } from "../../config/sessions.js"; import { logVerbose } from "../../globals.js"; import { - formatUsageSummaryLine, + formatUsageWindowSummary, loadProviderUsageSummary, resolveUsageProviderId, } from "../../infra/provider-usage.js"; @@ -148,11 +148,15 @@ export async function buildStatusReply(params: { providers: [currentUsageProvider], agentDir: statusAgentDir, }); - const summaryLine = formatUsageSummaryLine(usageSummary, { - now: Date.now(), - maxProviders: 1, - }); - if (summaryLine) usageLine = summaryLine; + const usageEntry = usageSummary.providers[0]; + if (usageEntry && !usageEntry.error && usageEntry.windows.length > 0) { + const summaryLine = formatUsageWindowSummary(usageEntry, { + now: Date.now(), + maxWindows: 2, + includeResets: true, + }); + if (summaryLine) usageLine = `📊 Usage: ${summaryLine}`; + } } catch { usageLine = null; }