fix(cli): switch @ completion category tabs with bare arrow keys #8576
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -382,6 +382,12 @@ export const InputPrompt: React.FC<InputPromptProps> = ({ | |
| ); | ||
| const showCompletionSuggestions = | ||
| completion.showSuggestions && !isHistoryRestoredText; | ||
| const categoryTabsVisible = | ||
| !exportCompletion.suggestionDisplayProps && | ||
| !commandSearchActive && | ||
| !reverseSearchActive && | ||
| !isAttachmentMode && | ||
| (completion.availableCategories?.length ?? 0) > 2; | ||
|
|
||
| // Ref so renderLineWithHighlighting (stable useCallback) can access fresh ghost text | ||
| const midInputGhostTextRef = useRef<{ | ||
|
|
@@ -1081,6 +1087,21 @@ export const InputPrompt: React.FC<InputPromptProps> = ({ | |
| return true; | ||
| } | ||
|
|
||
| // The visible category tabs own the bare arrows, including in Vim mode. | ||
| // All other states fall through to their existing input owner. | ||
| if (showCompletionSuggestions && categoryTabsVisible) { | ||
|
Comment on lines
+1090
to
+1092
Collaborator
There was a problem hiding this comment. [Critical] Consuming bare Left/Right here — before Suggested fix direction: when this block consumes an arrow while vim is active, clear vim's pending operator/count first (expose a reset from 中文说明[Critical] 在此处—— 修复方向建议：当此分支在 vim 激活时消费方向键时，先清除 vim 的待命操作符/计数（从 — qwen3.8-max via Qwen Code /review (v0.21.8) |
||
| if (keyMatchers[Command.COMPLETION_TAB_RIGHT](key)) { | ||
| completion.switchCategory(1); | ||
| setExpandedSuggestionIndex(-1); | ||
| return true; | ||
| } | ||
| if (keyMatchers[Command.COMPLETION_TAB_LEFT](key)) { | ||
| completion.switchCategory(-1); | ||
| setExpandedSuggestionIndex(-1); | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| if (vimHandleInput && vimHandleInput(key)) { | ||
| return true; | ||
| } | ||
|
|
@@ -1442,23 +1463,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({ | |
| } | ||
|
|
||
| if (showCompletionSuggestions) { | ||
| if (completion.suggestions.length > 1) { | ||
| const isCompletionUpKey = keyMatchers[Command.COMPLETION_UP](key); | ||
| const isCompletionDownKey = keyMatchers[Command.COMPLETION_DOWN](key); | ||
|
|
@@ -1907,6 +1911,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({ | |
| exportCompletion, | ||
| isHistoryRestoredText, | ||
| showCompletionSuggestions, | ||
| categoryTabsVisible, | ||
| voiceInput, | ||
| targetDir, | ||
| ], | ||
|
|
@@ -2308,11 +2313,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({ | |
| : completion.activeCategory | ||
| } | ||
| availableCategories={ | ||
| categoryTabsVisible ? completion.availableCategories : undefined | ||
| } | ||
|
Comment on lines
2315
to
2317
Collaborator
There was a problem hiding this comment. [Suggestion] Suggested fix: reset the completion category to 中文说明[Suggestion] 修复建议：进入附件模式时将补全分类重置为 — qwen3.8-max via Qwen Code /review (v0.21.8) |
||
| onHoverIndex={ | ||
| suggestionsFromExport ? undefined : handleSuggestionHover | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -187,12 +187,10 @@ export function SuggestionsDisplay({ | |
| </Box> | ||
| ); | ||
| })} | ||
| {/* Bare ←/→: the original Ctrl+←/→ was unreachable because terminals | ||
| and macOS Mission Control intercept it (#8069). */} | ||
| <Box marginLeft={2}> | ||
| <Text color={theme.text.secondary}>{t('(←/→ to switch)')}</Text> | ||
|
Collaborator
There was a problem hiding this comment. [Suggestion] 中文说明[Suggestion] — qwen3.8-max via Qwen Code /review (v0.21.5) |
||
| </Box> | ||
| </Box> | ||
| )} | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[Suggestion] The PR says "Closes #8069", but #8069 was already closed on 2026-07-31 by merged PR #8074 (the Ctrl+Tab alternative this PR removes). The live gap this PR actually fixes — Ctrl+Tab being intercepted by Warp — is tracked in still-OPEN issue #8330, and the complementary mouse-click fix is open PR #8395; neither is referenced. — Concrete cost: after merge, #8330 stays open with no cross-reference, "Closes #8069" is a no-op link, and two open PRs touching the same picker files (#8395, #8576) are not connected anywhere, risking conflicting review/merge decisions. Suggested fix: update the PR description, e.g. "Addresses the remaining gap from #8330; complements the mouse-click fix in #8395; #8069 was already closed by #8074".
中文说明
[Suggestion] 本 PR 声明 "Closes #8069"，但 #8069 已于 2026-07-31 被合并的 PR #8074（即本 PR 所移除的 Ctrl+Tab 备选方案）关闭。本 PR 实际修复的活跃缺口——Ctrl+Tab 被 Warp 拦截——记录在仍开放的 issue #8330 中；互补的鼠标点击修复是开放 PR #8395；二者均未被引用。— 具体代价：合并后 #8330 仍然开放且没有交叉引用；"Closes #8069" 成为无效链接；两个触及同一补全选择器文件的开放 PR（#8395、#8576）互不关联，可能导致冲突的评审/合并决定。建议更新 PR 描述，例如 "Addresses the remaining gap from #8330; complements the mouse-click fix in #8395; #8069 was already closed by #8074"。
— qwen3.8-max via Qwen Code /review (v0.21.5)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Accurate — #8069 was already closed by merged PR #8074, and the live gap this PR actually closes is #8330 (Ctrl+Tab intercepted by Warp), with the complementary mouse-click fix in #8395. Updating the PR description is a GitHub write that this automated round cannot perform (it has no GitHub credentials; the workflow owns all GitHub writes), so it must be applied by a maintainer rather than in code. Suggested description wording: "Addresses the remaining gap from #8330; complements the mouse-click fix in #8395; #8069 was already closed by #8074." No code change is required for this finding.
中文说明
确实如此—— #8069 已被合并的 PR #8074 关闭，本 PR 实际修复的活跃缺口是 #8330（Ctrl+Tab 被 Warp 拦截），互补的鼠标点击修复是 #8395。更新 PR 描述属于 GitHub 写操作，本轮自动化无法执行（没有 GitHub 凭据，所有 GitHub 写操作由工作流负责），因此需要由维护者应用而非通过代码完成。建议的描述措辞为："Addresses the remaining gap from #8330; complements the mouse-click fix in #8395; #8069 was already closed by #8074"。该发现无需代码改动。