vrr/qwen-code
2
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2026-04-30 04:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 24

Merge remote-tracking branch 'origin/main' into feat/ask-user-question-tool

Browse source
This commit is contained in:
tanzhenxin 2026-03-08 23:05:32 +08:00
commit 2e91f0a4cd
122 changed files with 8126 additions and 6309 deletions
Download patch file Download diff file Expand all files Collapse all files

38
packages/cli/src/ui/components/messages/AskUserQuestionDialog.test.tsx
View file

@ -130,7 +130,7 @@ describe('<AskUserQuestionDialog />', () => {
expect(output).toContain('Switch tabs');
});
it('renders multi-select with checkboxes and submit option', () => {
it('renders multi-select with checkboxes', () => {
const details = createConfirmationDetails({
questions: [createSingleQuestion({ multiSelect: true })],
});
@ -145,8 +145,8 @@ describe('<AskUserQuestionDialog />', () => {
const output = lastFrame();
expect(output).toContain('[ ]');
expect(output).toContain('Submit');
expect(output).toContain('Space/Enter: Toggle');
expect(output).toContain('Space: Toggle');
expect(output).toContain('Enter: Confirm');
});
});
@ -322,29 +322,7 @@ describe('<AskUserQuestionDialog />', () => {
unmount();
});
it('toggles options with Enter', async () => {
const onConfirm = vi.fn();
const details = createConfirmationDetails({
questions: [createSingleQuestion({ multiSelect: true })],
});
const { stdin, lastFrame, unmount } = renderWithProviders(
<AskUserQuestionDialog
confirmationDetails={details}
onConfirm={onConfirm}
/>,
);
await wait();
// Enter to toggle first option
stdin.write('\r');
await wait();
expect(lastFrame()).toContain('[✓]');
unmount();
});
it('selects option with Space and submits for multi-select question', async () => {
it('submits multi-select with Space to toggle then Enter to confirm', async () => {
const onConfirm = vi.fn();
const details = createConfirmationDetails({
questions: [createSingleQuestion({ multiSelect: true })],
@ -362,13 +340,7 @@ describe('<AskUserQuestionDialog />', () => {
stdin.write(' ');
await wait();
// Move to "Submit" option (3 options + custom input + submit)
for (let i = 0; i < 4; i++) {
stdin.write('\u001B[B');
await wait();
}
// Space on submit option should submit selected values
// Enter to confirm and submit
stdin.write('\r');
await wait();

68
packages/cli/src/ui/components/messages/AskUserQuestionDialog.tsx
View file

@ -57,13 +57,8 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
? null
: confirmationDetails.questions[currentQuestionIndex];
const isMultiSelect = currentQuestion?.multiSelect ?? false;
// Multi-select: options + custom input + submit; Single-select: options + custom input
const totalOptions = currentQuestion
? currentQuestion.options.length + (isMultiSelect ? 2 : 1)
: 2;
const submitOptionIndex = currentQuestion
? currentQuestion.options.length + 1
: -1;
// Options + custom input ("Other")
const totalOptions = currentQuestion ? currentQuestion.options.length + 1 : 2;
// Check if the custom input option is selected
const isCustomInputSelected =
@ -246,9 +241,6 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
}));
}
}
if (selectedIndex === submitOptionIndex) {
handleMultiSelectSubmit();
}
return;
}
@ -266,32 +258,13 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
return;
}
// Handle multi-select
// Handle multi-select: Enter advances to next question / submits
if (isMultiSelect && currentQuestion) {
// Custom input is handled by TextInput's onSubmit
if (selectedIndex === currentQuestion.options.length) {
return;
}
// Submit option
if (selectedIndex === submitOptionIndex) {
handleMultiSelectSubmit();
return;
}
// Toggle predefined option (same as Space)
if (selectedIndex < currentQuestion.options.length) {
const option = currentQuestion.options[selectedIndex];
if (option) {
const current = multiSelectedOptions[currentQuestionIndex] ?? [];
const isChecked = current.includes(option.label);
const updated = isChecked
? current.filter((l) => l !== option.label)
: [...current, option.label];
setMultiSelectedOptions((prev) => ({
...prev,
[currentQuestionIndex]: updated,
}));
}
}
handleMultiSelectSubmit();
return;
}
@ -450,7 +423,7 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
)}
{/* Question */}
<Box marginBottom={1}>
<Box flexDirection="column" marginBottom={1}>
{!hasMultipleQuestions && (
<Box marginBottom={1}>
<Text color={theme.text.accent} bold>
@ -572,23 +545,6 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
</Box>
)}
</Box>
{/* Submit option for multi-select */}
{isMultiSelect && (
<Box>
<Text
color={
selectedIndex === submitOptionIndex
? theme.text.accent
: theme.text.primary
}
bold={selectedIndex === submitOptionIndex}
>
{selectedIndex === submitOptionIndex ? '❯ ' : ' '}
{submitOptionIndex + 1}. {t('Submit')}
</Text>
</Box>
)}
</Box>
{/* Help text */}
@ -596,11 +552,17 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
<Box>
<Text dimColor>
{hasMultipleQuestions
? t(
'↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel',
)
? isMultiSelect
? t(
'↑/↓: Navigate | ←/→: Switch tabs | Space: Toggle | Enter: Confirm | Esc: Cancel',
)
: t(
'↑/↓: Navigate | ←/→: Switch tabs | Enter: Select | Esc: Cancel',
)
: isMultiSelect
? t('↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel')
? t(
'↑/↓: Navigate | Space: Toggle | Enter: Confirm | Esc: Cancel',
)
: t('↑/↓: Navigate | Enter: Select | Esc: Cancel')}
</Text>
</Box>