Adding support for up / down arrows in the command history.

This commit is contained in:
Evan Senter 2025-04-18 17:50:22 +01:00
parent 1bfc62dcc2
commit 3829ac6353
1 changed files with 48 additions and 2 deletions

View File

@ -1,5 +1,5 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect, useMemo } from 'react';
import { Box, Text } from 'ink'; import { Box, Text, useInput } from 'ink';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import os from 'os'; import os from 'os';
@ -25,11 +25,21 @@ const App = ({ directory }: AppProps) => {
const [query, setQuery] = useState(''); const [query, setQuery] = useState('');
const [history, setHistory] = useState<HistoryItem[]>([]); const [history, setHistory] = useState<HistoryItem[]>([]);
const [startupWarnings, setStartupWarnings] = useState<string[]>([]); const [startupWarnings, setStartupWarnings] = useState<string[]>([]);
const [historyIndex, setHistoryIndex] = useState<number>(-1);
const [originalQueryBeforeNav, setOriginalQueryBeforeNav] = useState<string>('');
const { streamingState, submitQuery, initError } = const { streamingState, submitQuery, initError } =
useGeminiStream(setHistory); useGeminiStream(setHistory);
const { elapsedTime, currentLoadingPhrase } = const { elapsedTime, currentLoadingPhrase } =
useLoadingIndicator(streamingState); useLoadingIndicator(streamingState);
const userMessages = useMemo(() => {
return history
.filter((item): item is HistoryItem & { type: 'user'; text: string } =>
item.type === 'user' && typeof item.text === 'string' && item.text.trim() !== ''
)
.map(item => item.text);
}, [history]);
useEffect(() => { useEffect(() => {
try { try {
if (fs.existsSync(warningsFilePath)) { if (fs.existsSync(warningsFilePath)) {
@ -50,6 +60,8 @@ const App = ({ directory }: AppProps) => {
}, []); }, []);
const handleInputSubmit = (value: PartListUnion) => { const handleInputSubmit = (value: PartListUnion) => {
setHistoryIndex(-1);
setOriginalQueryBeforeNav('');
submitQuery(value) submitQuery(value)
.then(() => { .then(() => {
setQuery(''); setQuery('');
@ -84,6 +96,40 @@ const App = ({ directory }: AppProps) => {
); );
const isInputActive = streamingState === StreamingState.Idle && !initError; const isInputActive = streamingState === StreamingState.Idle && !initError;
useInput((input, key) => {
if (!isInputActive || isWaitingForToolConfirmation) {
return;
}
if (key.upArrow) {
if (userMessages.length === 0) return;
if (historyIndex === -1) {
setOriginalQueryBeforeNav(query);
}
const nextIndex = Math.min(historyIndex + 1, userMessages.length - 1);
if (nextIndex !== historyIndex) {
setHistoryIndex(nextIndex);
setQuery(userMessages[userMessages.length - 1 - nextIndex]);
}
} else if (key.downArrow) {
if (historyIndex < 0) return;
const nextIndex = Math.max(historyIndex - 1, -1);
setHistoryIndex(nextIndex);
if (nextIndex === -1) {
setQuery(originalQueryBeforeNav);
} else {
setQuery(userMessages[userMessages.length - 1 - nextIndex]);
}
} else {
if (input || key.backspace || key.delete || key.leftArrow || key.rightArrow) {
if (historyIndex !== -1) {
setHistoryIndex(-1);
setOriginalQueryBeforeNav('');
}
}
}
}, { isActive: isInputActive });
return ( return (
<Box flexDirection="column" padding={1} marginBottom={1} width="100%"> <Box flexDirection="column" padding={1} marginBottom={1} width="100%">
<Header cwd={directory} /> <Header cwd={directory} />