The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(desktop): keep the measured context reading beside an agentless breakdown
unsupportedpastelsd4fcea44cd7c
diff --git a/apps/desktop/src/app/shell/hooks/use-statusbar-items.test.tsx b/apps/desktop/src/app/shell/hooks/use-statusbar-items.test.tsxindex 65d4ffd8645..2c02e1868dc 100644--- a/apps/desktop/src/app/shell/hooks/use-statusbar-items.test.tsx+++ b/apps/desktop/src/app/shell/hooks/use-statusbar-items.test.tsx@@ -9,12 +9,14 @@ import { $layoutTree, noteActiveTreeGroup } from '@/components/pane-shell/tree/simport { en } from '@/i18n/en'import { createClientSessionState } from '@/lib/chat-runtime'import type * as DesktopFs from '@/lib/desktop-fs'+import { usageContextLabel } from '@/lib/statusbar'import { $freeTierStatus } from '@/store/free-tier'import { INTERFACE_MODES, setInterfaceMode } from '@/store/interface-mode'import { markOnboardingDecided, setOnboardingSurfaceActive } from '@/store/onboarding-presence'import {$connection,$currentCwd,+ $currentUsage,$selectedStoredSessionId,$sessions,$sessionStartedAt,@@ -23,9 +25,9 @@ import {} from '@/store/session'import { $focusedTreePaneId as $focusedTreePaneIdMock } from '@/store/session-focus'import { $sessionStates, $sessionTiles } from '@/store/session-states'-import { $statusbarVisible } from '@/store/statusbar-prefs'+import { $statusbarVisible, setStatusbarItemVisible } from '@/store/statusbar-prefs'import { $desktopVersion, $updateStatus } from '@/store/updates'-import type { FreeTierStatus } from '@/types/hermes'+import type { ContextBreakdown, FreeTierStatus, UsageStats } from '@/types/hermes'import { useStatusbarItems } from './use-statusbar-items'@@ -449,3 +451,89 @@ describe('free-tier Sign in in every interface mode', () => {expect(signInChipVisible()).toBe(true)})})++describe('context meter beside an agentless breakdown', () => {+ const agentless: ContextBreakdown = {+ categories: [{ color: '#888', id: 'system_prompt', label: 'System prompt', tokens: 3_200 }],+ context_estimated: false,+ context_max: 0,+ context_percent: 0,+ context_source: 'provider_usage',+ context_used: 0,+ estimated_total: 3_200,+ model: ''+ }++ const measured: UsageStats = {+ calls: 1,+ context_max: 100_000,+ context_percent: 40,+ context_used: 40_000,+ input: 100,+ output: 10,+ total: 110+ }++ async function contextItem(sessionUsage: UsageStats) {+ setStatusbarItemVisible('context-usage', true)+ setActiveSessionId('s1')+ $currentUsage.set(measured)+ $sessionStates.set({ s1: { ...createClientSessionState(), usage: sessionUsage } as never })++ const requestGateway = vi.fn(async (method: string) =>+ method === 'session.context_breakdown' ? agentless : undefined+ ) as never++ const { result } = renderHook(+ () =>+ useStatusbarItems({+ agentsOpen: false,+ changeSessionCwd: async () => {},+ chatOpen: true,+ commandCenterOpen: false,+ extraLeftItems: [],+ extraRightItems: [],+ freshDraftReady: false,+ gatewayState: 'ready',+ inferenceStatus: null,+ openAgents: () => {},+ openCommandCenterSection: () => {},+ requestGateway,+ statusSnapshot: null,+ toggleCommandCenter: () => {}+ }),+ { wrapper }+ )++ await act(async () => {+ for (let i = 0; i < 5; i++) {+ await Promise.resolve()+ }+ })++ return result.current.statusbarItems.find(entry => entry.id === 'context-usage')+ }++ afterEach(() => {+ setActiveSessionId(null)+ $currentUsage.set({ calls: 0, input: 0, output: 0, total: 0 })+ $sessionStates.set({})+ })++ it("keeps the session's measured reading and still hands the popover the categories", async () => {+ const item = await contextItem(measured)++ expect(item?.label).toBe(usageContextLabel(measured))+ expect(item?.detail).toBeDefined()++ const panel = item?.menuContent++ expect(isValidElement<{ breakdown: ContextBreakdown | null }>(panel) && panel.props.breakdown).toBe(agentless)+ })++ it("never borrows another session's reading from the global usage", async () => {+ const item = await contextItem({ calls: 0, input: 0, output: 0, total: 0 })++ expect(item?.label).not.toBe(usageContextLabel(measured))+ })+})diff --git a/apps/desktop/src/app/shell/hooks/use-statusbar-items.tsx b/apps/desktop/src/app/shell/hooks/use-statusbar-items.tsxindex f1ca004ec67..ae53cc1fe8a 100644--- a/apps/desktop/src/app/shell/hooks/use-statusbar-items.tsx+++ b/apps/desktop/src/app/shell/hooks/use-statusbar-items.tsx@@ -331,20 +331,27 @@ export function useStatusbarItems({// and the store merges rather than replaces, so the PREVIOUS session's gauge// numbers survive the switch. Mid-turn useContextBreakdown returns null (the// snapshot is pre-turn), so the streamed usage carries the gauge.- const gaugeUsage = useMemo<UsageStats>(- () =>- contextBreakdown- ? {- ...currentUsage,- context_estimated: contextBreakdown.context_estimated,- context_source: contextBreakdown.context_source,- context_max: contextBreakdown.context_max,- context_percent: contextBreakdown.context_percent,- context_used: contextBreakdown.context_used- }- : currentUsage,- [contextBreakdown, currentUsage]- )+ //+ // An agentless breakdown (no resident agent) knows no window: it carries+ // categories for the popover but zeroed header figures. The header then+ // stays this session's own streamed reading — never the merged global,+ // which can still hold the previous session's numbers.+ const gaugeUsage = useMemo<UsageStats>(() => {+ if (!contextBreakdown) {+ return currentUsage+ }++ const reading = contextBreakdown.context_max > 0 ? contextBreakdown : (focusedUsage ?? EMPTY_USAGE)++ return {+ ...currentUsage,+ context_estimated: reading.context_estimated,+ context_source: reading.context_source,+ context_max: reading.context_max,+ context_percent: reading.context_percent,+ context_used: reading.context_used+ }+ }, [contextBreakdown, currentUsage, focusedUsage])const contextUsage = useMemo(() => usageContextLabel(gaugeUsage), [gaugeUsage])const contextBar = useMemo(() => contextBarLabel(gaugeUsage), [gaugeUsage])