From 64bb8ed64402e08c509f63bd5bf2dedd7b7a7d79 Mon Sep 17 00:00:00 2001
From: carffuca <carffuca@gmail.com>
Date: Fri, 7 Aug 2026 10:24:42 +0800
Subject: [PATCH] fix(cli): preserve slash command names in narrow terminals

---
 .../ui/components/SuggestionsDisplay.test.tsx | 35 +++++++++++++++++++
 .../src/ui/components/SuggestionsDisplay.tsx  |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/ui/components/SuggestionsDisplay.test.tsx b/packages/cli/src/ui/components/SuggestionsDisplay.test.tsx
index c6959963568..c9a5369510c 100644
--- a/packages/cli/src/ui/components/SuggestionsDisplay.test.tsx
+++ b/packages/cli/src/ui/components/SuggestionsDisplay.test.tsx
@@ -169,6 +169,41 @@ describe('SuggestionsDisplay', () => {
     expect(lines[0]).toMatch(/^ {2}pr/);
     expect(lines[1]).toMatch(/^> issue-to-pr/);
   });
+
+  it('keeps slash command names intact when argument hints overflow', () => {
+    const { lastFrame } = render(
+      <SuggestionsDisplay
+        suggestions={[
+          {
+            label: 'review',
+            value: 'review',
+            argumentHint:
+              '[pr-number|file-path] [--effort low|medium|high] [--comment] [--fix]',
+            sourceBadge: '[Skill]',
+            description: 'Review changed code.',
+          },
+          {
+            label: 'doctor',
+            value: 'doctor',
+            argumentHint:
+              '[memory|cpu-profile|rollback] [--sample] [--snapshot] [--duration]',
+            description: 'Diagnose Qwen Code environment.',
+          },
+        ]}
+        activeIndex={0}
+        isLoading={false}
+        width={120}
+        scrollOffset={0}
+        userInput="/rev"
+        mode="slash"
+      />,
+    );
+
+    const lines = (lastFrame() ?? '').split('\n');
+
+    expect(lines).toContainEqual(expect.stringMatching(/^> review(?: |$)/));
+    expect(lines).toContainEqual(expect.stringMatching(/^ {2}doctor(?: |$)/));
+  });
 });
 
 describe('SuggestionsDisplay tabs', () => {
diff --git a/packages/cli/src/ui/components/SuggestionsDisplay.tsx b/packages/cli/src/ui/components/SuggestionsDisplay.tsx
index 90a9d8878c1..d78183010fa 100644
--- a/packages/cli/src/ui/components/SuggestionsDisplay.tsx
+++ b/packages/cli/src/ui/components/SuggestionsDisplay.tsx
@@ -237,7 +237,7 @@ export function SuggestionsDisplay({
                 : { flexShrink: 1 as const })}
             >
               <Box>
-                {labelElement}
+                <Box flexShrink={0}>{labelElement}</Box>
                 {suggestion.argumentHint && (
                   <Text color={theme.text.secondary}>
                     {' '}