feat(cli, webui): add follow-up suggestions feature

packages/cli/src/config/settingsSchema.ts

@@ -501,6 +501,16 @@ const SETTINGS_SCHEMA = {
           'Show optional feedback dialog after conversations to help improve Qwen performance.',
         showInDialog: true,
       },
+      enableFollowupSuggestions: {
+        type: 'boolean',
+        label: 'Enable Follow-up Suggestions',
+        category: 'UI',
+        requiresRestart: false,
+        default: true,
+        description:
+          'Show context-aware follow-up suggestions after task completion (e.g., "commit this", "run tests"). Press Tab to accept, arrow keys to cycle.',
+        showInDialog: true,
+      },
       accessibility: {
         type: 'object',
         label: 'Accessibility',

packages/cli/src/ui/AppContainer.tsx

@@ -41,6 +41,8 @@ import {
   Storage,
   SessionEndReason,
   SessionStartSource,
+  generateFollowupSuggestions,
+  type FollowupSuggestion,
   type PermissionMode,
 } from '@qwen-code/qwen-code-core';
 import { buildResumedHistoryItems } from './utils/resumeHistoryUtils.js';
@@ -85,6 +87,7 @@ import { useIdeTrustListener } from './hooks/useIdeTrustListener.js';
 import { type IdeIntegrationNudgeResult } from './IdeIntegrationNudge.js';
 import { type CommandMigrationNudgeResult } from './CommandFormatMigrationNudge.js';
 import { useCommandMigration } from './hooks/useCommandMigration.js';
+import { extractFollowupSuggestionContext } from './followupHistory.js';
 import { migrateTomlCommands } from '../services/command-migration-tool.js';
 import { type UpdateObject } from './utils/updateCheck.js';
 import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
@@ -735,6 +738,12 @@ export const AppContainer = (props: AppContainerProps) => {
 
   const agentViewState = useAgentViewState();
 
+  // Follow-up suggestions state
+  const [followupSuggestions, setFollowupSuggestions] = useState<
+    FollowupSuggestion[]
+  >([]);
+  const prevStreamingStateRef = useRef<StreamingState>(StreamingState.Idle);
+
   // Auto-accept indicator — disabled on agent tabs (agents handle their own)
   const showAutoAcceptIndicator = useAutoAcceptIndicator({
     config,
@@ -935,6 +944,49 @@ export const AppContainer = (props: AppContainerProps) => {
     geminiClient,
   ]);
 
+  // Generate follow-up suggestions when streaming completes
+  const followupSuggestionsEnabled =
+    settings.merged.ui?.enableFollowupSuggestions !== false;
+
+  useEffect(() => {
+    // Clear suggestions when a new turn starts (Idle → Responding)
+    if (
+      prevStreamingStateRef.current === StreamingState.Idle &&
+      streamingState === StreamingState.Responding
+    ) {
+      setFollowupSuggestions([]);
+    }
+
+    // Skip suggestion generation if feature is disabled
+    if (!followupSuggestionsEnabled) {
+      prevStreamingStateRef.current = streamingState;
+      return;
+    }
+
+    // Only trigger when transitioning from Responding to Idle
+    if (
+      prevStreamingStateRef.current === StreamingState.Responding &&
+      streamingState === StreamingState.Idle
+    ) {
+      const history = historyManager.history;
+      const context = extractFollowupSuggestionContext(history);
+
+      if (context) {
+        const result = generateFollowupSuggestions(context);
+        if (result.shouldShow && result.suggestions.length > 0) {
+          setFollowupSuggestions(result.suggestions);
+        } else {
+          setFollowupSuggestions([]);
+        }
+      } else {
+        setFollowupSuggestions([]);
+      }
+    }
+
+    prevStreamingStateRef.current = streamingState;
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- only run on streamingState transitions
+  }, [streamingState, followupSuggestionsEnabled]);
+
   const [idePromptAnswered, setIdePromptAnswered] = useState(false);
   const [currentIDE, setCurrentIDE] = useState<IdeInfo | null>(null);
 
@@ -1574,6 +1626,8 @@ export const AppContainer = (props: AppContainerProps) => {
       isFeedbackDialogOpen,
       // Per-task token tracking
       taskStartTokens,
+      // Follow-up suggestions
+      followupSuggestions,
     }),
     [
       isThemeDialogOpen,
@@ -1677,6 +1731,8 @@ export const AppContainer = (props: AppContainerProps) => {
       isFeedbackDialogOpen,
       // Per-task token tracking
       taskStartTokens,
+      // Follow-up suggestions
+      followupSuggestions,
     ],
   );
 

packages/cli/src/ui/components/Composer.tsx

@@ -110,6 +110,7 @@ export const Composer = () => {
               ? '  ' + t("Press 'i' for INSERT mode and 'Esc' for NORMAL mode.")
               : '  ' + t('Type your message or @path/to/file')
           }
+          followupSuggestions={uiState.followupSuggestions}
         />
       )}
 

packages/cli/src/ui/components/InputPrompt.test.tsx

@@ -211,6 +211,92 @@ describe('InputPrompt', () => {
 
   const wait = (ms = 50) => new Promise((resolve) => setTimeout(resolve, ms));
 
+  describe('follow-up suggestions', () => {
+    it('accepts the visible follow-up suggestion on tab when the buffer is empty', async () => {
+      const { stdin, unmount } = renderWithProviders(
+        <InputPrompt
+          {...props}
+          followupSuggestions={[{ text: 'commit this', priority: 100 }]}
+        />,
+      );
+      await wait(350);
+
+      stdin.write('\t');
+      await wait();
+
+      expect(mockBuffer.insert).toHaveBeenCalledWith('commit this');
+      unmount();
+    });
+
+    it('does not accept a follow-up suggestion while command completion is active', async () => {
+      mockCommandCompletion.showSuggestions = true;
+      mockCommandCompletion.suggestions = [
+        {
+          value: '/clear',
+          label: '/clear',
+          description: 'Clear screen',
+        },
+      ] as UseCommandCompletionReturn['suggestions'];
+
+      const { stdin, unmount } = renderWithProviders(
+        <InputPrompt
+          {...props}
+          followupSuggestions={[{ text: 'commit this', priority: 100 }]}
+        />,
+      );
+      await wait(350);
+
+      stdin.write('\t');
+      await wait();
+
+      expect(mockBuffer.insert).not.toHaveBeenCalledWith('commit this');
+      expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalled();
+      unmount();
+    });
+
+    it('cycles to the next follow-up suggestion with the right arrow key', async () => {
+      const { stdin, unmount } = renderWithProviders(
+        <InputPrompt
+          {...props}
+          followupSuggestions={[
+            { text: 'commit this', priority: 100 },
+            { text: 'review changes', priority: 90 },
+          ]}
+        />,
+      );
+      await wait(350);
+
+      stdin.write('\u001B[C');
+      await wait();
+      stdin.write('\t');
+      await wait();
+
+      expect(mockBuffer.insert).toHaveBeenCalledWith('review changes');
+      unmount();
+    });
+
+    it('cycles to the previous follow-up suggestion with the left arrow key', async () => {
+      const { stdin, unmount } = renderWithProviders(
+        <InputPrompt
+          {...props}
+          followupSuggestions={[
+            { text: 'commit this', priority: 100 },
+            { text: 'review changes', priority: 90 },
+          ]}
+        />,
+      );
+      await wait(350);
+
+      stdin.write('\u001B[D');
+      await wait();
+      stdin.write('\t');
+      await wait();
+
+      expect(mockBuffer.insert).toHaveBeenCalledWith('review changes');
+      unmount();
+    });
+  });
+
   it('should call shellHistory.getPreviousCommand on up arrow in shell mode', async () => {
     props.shellModeActive = true;
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);