Merge pull request #31081 from NousResearch/bb/tui-skinny-status-rule

fix(tui): keep status rule one-line in skinny terminals
This commit is contained in:
ethernet
2026-05-25 01:24:29 -04:00
committed by GitHub
2 changed files with 61 additions and 4 deletions
+29 -4
View File
@@ -1,4 +1,4 @@
import { Box, type ScrollBoxHandle, Text } from '@hermes/ink'
import { Box, type ScrollBoxHandle, stringWidth, Text } from '@hermes/ink'
import { useStore } from '@nanostores/react'
import { type ReactNode, type RefObject, useEffect, useMemo, useRef, useState } from 'react'
import unicodeSpinners from 'unicode-animations'
@@ -150,6 +150,23 @@ function ctxBar(pct: number | undefined, w = 10) {
return '█'.repeat(filled) + '░'.repeat(w - filled)
}
export function statusRuleWidths(cols: number, cwdLabel: string) {
const width = Math.max(1, Math.floor(cols || 1))
const desiredSeparatorWidth = width >= 24 ? 3 : 1
const minLeftWidth = width >= 24 ? 8 : 1
const maxRightWidth = Math.max(0, width - desiredSeparatorWidth - minLeftWidth)
if (!cwdLabel || maxRightWidth <= 0) {
return { leftWidth: width, rightWidth: 0, separatorWidth: 0 }
}
const rightWidth = Math.max(0, Math.min(stringWidth(cwdLabel), maxRightWidth))
const separatorWidth = rightWidth > 0 ? desiredSeparatorWidth : 0
const leftWidth = Math.max(1, width - separatorWidth - rightWidth)
return { leftWidth, rightWidth, separatorWidth }
}
function SpawnHud({ t }: { t: Theme }) {
// Tight HUD that only appears when the session is actually fanning out.
// Colour escalates to warn/error as depth or concurrency approaches the cap.
@@ -297,7 +314,7 @@ export function StatusRule({
: ''
const bar = usage.context_max ? ctxBar(pct) : ''
const leftWidth = Math.max(12, cols - cwdLabel.length - 3)
const { leftWidth, rightWidth, separatorWidth } = statusRuleWidths(cols, cwdLabel)
return (
<Box height={1}>
@@ -349,8 +366,16 @@ export function StatusRule({
</Text>
</Box>
<Text color={t.color.border}> </Text>
<Text color={t.color.label}>{cwdLabel}</Text>
{rightWidth > 0 ? (
<>
<Text color={t.color.border}>{separatorWidth >= 3 ? ' ─ ' : ' '}</Text>
<Box flexShrink={0} width={rightWidth}>
<Text color={t.color.label} wrap="truncate-end">
{cwdLabel}
</Text>
</Box>
</>
) : null}
</Box>
)
}