Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/renderer/src/components/status-bar/StatusBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ import { formatWindowLabel } from '@/lib/window-label-formatter'
import { markLiveCodexSessionsForRestart } from '@/lib/codex-session-restart'
import { UpdateStatusSegment } from './UpdateStatusSegment'
import { isStatusBarItemAvailable } from './status-bar-agent-gating'
import { getVisibleUsageProvider, isUsageEmptyState } from './status-bar-provider-visibility'
import {
getVisibleUsageProvider,
isProviderConfigured,
isUsageEmptyState
} from './status-bar-provider-visibility'
import { StatusBarUsageEmptyCta } from './StatusBarUsageEmptyCta'
import { UsagePercentageDisplayChangeNotice } from './UsagePercentageDisplayChangeNotice'
import { shouldOpenStatusBarContextMenu } from './status-bar-context-menu-policy'
Expand Down Expand Up @@ -1983,19 +1987,19 @@ function StatusBarInner({ floatingTerminalOpen }: StatusBarProps): React.JSX.Ele
const showClaude =
visibleClaude !== null &&
statusBarItems.includes('claude') &&
isStatusBarItemAvailable('claude', detectedAgentIds)
isStatusBarItemAvailable('claude', detectedAgentIds, isProviderConfigured(claude))
const showCodex =
visibleCodex !== null &&
statusBarItems.includes('codex') &&
isStatusBarItemAvailable('codex', detectedAgentIds)
isStatusBarItemAvailable('codex', detectedAgentIds, isProviderConfigured(codex))
const showGemini =
visibleGemini !== null &&
statusBarItems.includes('gemini') &&
isStatusBarItemAvailable('gemini', detectedAgentIds)
isStatusBarItemAvailable('gemini', detectedAgentIds, isProviderConfigured(gemini))
const showKimi =
visibleKimi !== null &&
statusBarItems.includes('kimi') &&
isStatusBarItemAvailable('kimi', detectedAgentIds)
isStatusBarItemAvailable('kimi', detectedAgentIds, isProviderConfigured(kimi))
const showAntigravity =
visibleAntigravity !== null &&
statusBarItems.includes('antigravity') &&
Expand All @@ -2006,7 +2010,7 @@ function StatusBarInner({ floatingTerminalOpen }: StatusBarProps): React.JSX.Ele
const showGrok =
visibleGrok !== null &&
statusBarItems.includes('grok') &&
isStatusBarItemAvailable('grok', detectedAgentIds)
isStatusBarItemAvailable('grok', detectedAgentIds, isProviderConfigured(grok))
// Why: OpenCode Go is a web/cookie-auth provider, not a CLI on PATH, so
// detection-gating doesn't apply.
const visibleOpencodeGo = getVisibleUsageProvider('opencode-go', opencodeGo, usageSettings)
Expand Down Expand Up @@ -2246,7 +2250,7 @@ function StatusBarInner({ floatingTerminalOpen }: StatusBarProps): React.JSX.Ele
/>
</DropdownMenuTrigger>
<DropdownMenuContent className="min-w-0 w-fit" sideOffset={0} align="start">
{isStatusBarItemAvailable('claude', detectedAgentIds) && (
{isStatusBarItemAvailable('claude', detectedAgentIds, isProviderConfigured(claude)) && (
<DropdownMenuCheckboxItem
checked={statusBarItems.includes('claude')}
onCheckedChange={() => {
Expand All @@ -2258,7 +2262,7 @@ function StatusBarInner({ floatingTerminalOpen }: StatusBarProps): React.JSX.Ele
{translate('auto.components.status.bar.StatusBar.3885eb74d8', 'Claude Usage')}
</DropdownMenuCheckboxItem>
)}
{isStatusBarItemAvailable('codex', detectedAgentIds) && (
{isStatusBarItemAvailable('codex', detectedAgentIds, isProviderConfigured(codex)) && (
<DropdownMenuCheckboxItem
checked={statusBarItems.includes('codex')}
onCheckedChange={() => {
Expand All @@ -2270,7 +2274,7 @@ function StatusBarInner({ floatingTerminalOpen }: StatusBarProps): React.JSX.Ele
{translate('auto.components.status.bar.StatusBar.c0909c686e', 'Codex Usage')}
</DropdownMenuCheckboxItem>
)}
{isStatusBarItemAvailable('gemini', detectedAgentIds) && (
{isStatusBarItemAvailable('gemini', detectedAgentIds, isProviderConfigured(gemini)) && (
<DropdownMenuCheckboxItem
checked={statusBarItems.includes('gemini')}
onCheckedChange={() => {
Expand Down Expand Up @@ -2307,7 +2311,7 @@ function StatusBarInner({ floatingTerminalOpen }: StatusBarProps): React.JSX.Ele
<OpenCodeGoIcon size={14} />
{translate('auto.components.status.bar.StatusBar.8c86cd77b0', 'OpenCode Go Usage')}
</DropdownMenuCheckboxItem>
{isStatusBarItemAvailable('kimi', detectedAgentIds) && (
{isStatusBarItemAvailable('kimi', detectedAgentIds, isProviderConfigured(kimi)) && (
<DropdownMenuCheckboxItem
checked={statusBarItems.includes('kimi')}
onCheckedChange={() => {
Expand All @@ -2329,7 +2333,7 @@ function StatusBarInner({ floatingTerminalOpen }: StatusBarProps): React.JSX.Ele
<MiniMaxIcon size={14} />
{translate('auto.components.status.bar.StatusBar.3bbf140864', 'MiniMax Usage')}
</DropdownMenuCheckboxItem>
{isStatusBarItemAvailable('grok', detectedAgentIds) && (
{isStatusBarItemAvailable('grok', detectedAgentIds, isProviderConfigured(grok)) && (
<DropdownMenuCheckboxItem
checked={statusBarItems.includes('grok')}
onCheckedChange={() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,9 @@ describe('isStatusBarItemAvailable', () => {
expect(isStatusBarItemAvailable('antigravity', ['antigravity'])).toBe(true)
expect(isStatusBarItemAvailable('grok', ['grok'])).toBe(true)
})

it('lets live provider evidence override a cached negative PATH result', () => {
expect(isStatusBarItemAvailable('codex', [], true)).toBe(true)
expect(isStatusBarItemAvailable('codex', [], false)).toBe(false)
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ const CLI_GATED_ITEMS: ReadonlySet<StatusBarItem> = new Set([

export function isStatusBarItemAvailable(
id: StatusBarItem,
detectedAgentIds: TuiAgent[] | null
detectedAgentIds: TuiAgent[] | null,
hasProviderEvidence = false
): boolean {
if (!CLI_GATED_ITEMS.has(id)) {
return true
}
if (detectedAgentIds === null) {
return true
}
return detectedAgentIds.includes(id as TuiAgent)
// Why: PATH detection is a cached negative snapshot. A later successful
// usage fetch proves a CLI was installed mid-session and must win over it.
return hasProviderEvidence || detectedAgentIds.includes(id as TuiAgent)
}
Loading