fix(cli): correct 'esc to cancel' position and restore duration display (#18534)

This commit is contained in:
N. Taylor Mullen
2026-02-09 13:44:39 -08:00
committed by GitHub
parent 1b98c1f806
commit a3e5b564f7

View File

@@ -5,7 +5,7 @@
*/
import { useState } from 'react';
import { Box, Text, useIsScreenReaderEnabled } from 'ink';
import { Box, useIsScreenReaderEnabled } from 'ink';
import { LoadingIndicator } from './LoadingIndicator.js';
import { StatusDisplay } from './StatusDisplay.js';
import { ApprovalModeIndicator } from './ApprovalModeIndicator.js';
@@ -30,7 +30,6 @@ import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
import { StreamingState, ToolCallStatus } from '../types.js';
import { ConfigInitDisplay } from '../components/ConfigInitDisplay.js';
import { TodoTray } from './messages/Todo.js';
import { theme } from '../semantic-colors.js';
export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
const config = useConfig();
@@ -69,9 +68,6 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
!hasPendingActionRequired;
const showApprovalIndicator = !uiState.shellModeActive;
const showRawMarkdownIndicator = !uiState.renderMarkdown;
const showEscToCancelHint =
showLoadingIndicator &&
uiState.streamingState !== StreamingState.WaitingForConfirmation;
return (
<Box
@@ -93,11 +89,6 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
<TodoTray />
<Box marginTop={1} width="100%" flexDirection="column">
{showEscToCancelHint && (
<Box marginLeft={3}>
<Text color={theme.text.secondary}>esc to cancel</Text>
</Box>
)}
<Box
width="100%"
flexDirection={isNarrow ? 'column' : 'row'}
@@ -127,7 +118,6 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
: uiState.currentLoadingPhrase
}
elapsedTime={uiState.elapsedTime}
showCancelAndTimer={false}
/>
)}
</Box>