feat(cli): show follow-up suggestion in input placeholder

packages/cli/src/config/settingsSchema.ts

@@ -778,7 +778,7 @@ const SETTINGS_SCHEMA = {
         label: 'Enable Follow-up Suggestions',
         category: 'UI',
         requiresRestart: false,
-        default: false,
+        default: true,
         description:
           'Show context-aware follow-up suggestions after task completion. Press Tab or Right Arrow to accept, Enter to accept and submit.',
         showInDialog: true,

packages/cli/src/ui/AppContainer.tsx

@@ -1470,9 +1470,10 @@ export const AppContainer = (props: AppContainerProps) => {
   const speculationRef = useRef<SpeculationState>(IDLE_SPECULATION);
   const suggestionAbortRef = useRef<AbortController | null>(null);
 
-  // Dismiss callback — clears suggestion + aborts in-flight generation/speculation
+  // Dismiss callback — aborts in-flight generation/speculation. Does NOT
+  // clear `promptSuggestion` so the placeholder can restore it when the
+  // buffer becomes empty again (user types then deletes).
   const dismissPromptSuggestion = useCallback(() => {
-    setPromptSuggestion(null);
     suggestionAbortRef.current?.abort();
     suggestionAbortRef.current = null;
   }, []);
@@ -2207,9 +2208,10 @@ export const AppContainer = (props: AppContainerProps) => {
     settingInputRequests,
   ]);
 
-  // Abort speculation when promptSuggestion is cleared (new turn, feature toggle, or
-  // user-initiated dismiss via typing/paste). InputPrompt calls onPromptSuggestionDismiss
-  // on user input, which clears promptSuggestion, triggering this effect to abort speculation.
+  // Abort speculation when promptSuggestion is cleared (new turn or feature toggle).
+  // promptSuggestion is only cleared when the model responds or the feature is disabled;
+  // user typing/paste no longer dismisses it — the AbortController in InputPrompt handles
+  // that path, so this effect only fires on state changes from non-user-input sources.
   useEffect(() => {
     if (!promptSuggestion && speculationRef.current.status !== 'idle') {
       abortSpeculation(speculationRef.current).catch(() => {});

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

@@ -158,7 +158,9 @@ export const Composer = () => {
           placeholder={
             vimEnabled
               ? '  ' + t("Press 'i' for INSERT mode and 'Esc' for NORMAL mode.")
-              : '  ' + t('Type your message or @path/to/file')
+              : uiState.promptSuggestion
+                ? '  ' + uiState.promptSuggestion
+                : '  ' + t('Type your message or @path/to/file')
           }
           promptSuggestion={uiState.promptSuggestion}
           onPromptSuggestionDismiss={uiState.dismissPromptSuggestion}

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

@@ -452,6 +452,77 @@ describe('InputPrompt', () => {
         unmount();
       }
     });
+
+    // Regression for #5145: the `promptSuggestion` prop fallback path must work
+    // when `followup.state.suggestion` is null (e.g. after user typed and
+    // deleted — the followup controller was dismissed but the placeholder
+    // text is still available via the prop).
+    describe('promptSuggestion prop fallback (when followup.state.suggestion is null)', () => {
+      it('accepts promptSuggestion via Tab when followup.state.suggestion is null', async () => {
+        vi.useFakeTimers();
+        const { stdin, unmount } = renderWithProviders(
+          <InputPrompt {...props} promptSuggestion="commit this" />,
+        );
+        try {
+          await advanceTimers(SUGGESTION_VISIBLE_WAIT_MS);
+
+          act(() => {
+            stdin.write('\t');
+          });
+          await flush();
+
+          // Tab should insert the suggestion text into the buffer
+          expect(mockBuffer.insert).toHaveBeenCalledWith('commit this');
+        } finally {
+          vi.useRealTimers();
+          unmount();
+        }
+      });
+
+      it('accepts promptSuggestion via Right arrow when followup.state.suggestion is null', async () => {
+        vi.useFakeTimers();
+        const { stdin, unmount } = renderWithProviders(
+          <InputPrompt {...props} promptSuggestion="commit this" />,
+        );
+        try {
+          await advanceTimers(SUGGESTION_VISIBLE_WAIT_MS);
+
+          act(() => {
+            stdin.write('\x1b[C'); // right arrow
+          });
+          await flush();
+
+          // Right arrow should insert the suggestion text into the buffer
+          expect(mockBuffer.insert).toHaveBeenCalledWith('commit this');
+        } finally {
+          vi.useRealTimers();
+          unmount();
+        }
+      });
+
+      it('submits promptSuggestion via Enter when followup.state.suggestion is null', async () => {
+        vi.useFakeTimers();
+        const { stdin, unmount } = renderWithProviders(
+          <InputPrompt {...props} promptSuggestion="commit this" />,
+        );
+        try {
+          await advanceTimers(SUGGESTION_VISIBLE_WAIT_MS);
+
+          act(() => {
+            stdin.write('\r');
+          });
+          await flush();
+
+          expect(props.onSubmit).toHaveBeenCalledWith('commit this');
+          // Enter path must NOT call buffer.insert — it passes text directly to
+          // handleSubmitAndClear.
+          expect(mockBuffer.insert).not.toHaveBeenCalled();
+        } finally {
+          vi.useRealTimers();
+          unmount();
+        }
+      });
+    });
   });
 
   // Regression for #4171: `onTabConsumerChange` (consumed by AppContainer
@@ -478,6 +549,25 @@ describe('InputPrompt', () => {
       unmount();
     });
 
+    // Regression for #5145: `hasTabConsumer` must be true when ONLY
+    // `promptSuggestion` prop is set (followup.state.suggestion is null),
+    // so Windows Tab approval-mode cycling is blocked even before the
+    // followup controller's debounce fires.
+    it('reports true immediately when promptSuggestion prop is set (no followup debounce needed)', async () => {
+      const onTabConsumerChange = vi.fn();
+      const { unmount } = renderWithProviders(
+        <InputPrompt
+          {...props}
+          promptSuggestion="commit this"
+          onTabConsumerChange={onTabConsumerChange}
+        />,
+      );
+      // Must report true immediately — no need to wait for followup debounce
+      // because `hasTabConsumer` includes `Boolean(promptSuggestion)`.
+      expect(onTabConsumerChange).toHaveBeenCalledWith(true);
+      unmount();
+    });
+
     it('reports true while mid-input ghost text offers an accept', async () => {
       mockCommandCompletion.midInputGhostText = {
         text: 'ile.txt',

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

@@ -646,7 +646,10 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
       if (key.paste) {
         // Dismiss follow-up suggestion when user starts typing/pasting
-        if (buffer.text.length === 0 && followup.state.isVisible) {
+        if (
+          buffer.text.length === 0 &&
+          (followup.state.isVisible || promptSuggestion)
+        ) {
           followup.dismiss();
           onPromptSuggestionDismiss?.();
         }
@@ -987,10 +990,18 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         !showCompletionSuggestions &&
         !reverseSearchActive &&
         !commandSearchActive &&
-        followup.state.isVisible &&
-        followup.state.suggestion
+        (followup.state.isVisible || promptSuggestion) &&
+        (followup.state.suggestion ?? promptSuggestion)
       ) {
-        followup.accept('tab');
+        // If followup state has a suggestion, use the normal accept path.
+        // Otherwise use `promptSuggestion` directly (e.g. after user typed
+        // and deleted — the followup controller was dismissed but the
+        // placeholder text is still available).
+        if (followup.state.suggestion) {
+          followup.accept('tab');
+        } else if (promptSuggestion) {
+          buffer.insert(promptSuggestion);
+        }
         return true;
       }
 
@@ -1000,10 +1011,14 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         !key.ctrl &&
         !key.meta &&
         buffer.text.length === 0 &&
-        followup.state.isVisible &&
-        followup.state.suggestion
+        (followup.state.isVisible || promptSuggestion) &&
+        (followup.state.suggestion ?? promptSuggestion)
       ) {
-        followup.accept('right');
+        if (followup.state.suggestion) {
+          followup.accept('right');
+        } else if (promptSuggestion) {
+          buffer.insert(promptSuggestion);
+        }
         return true;
       }
 
@@ -1242,10 +1257,10 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         // Accept and submit prompt suggestion on Enter when input is truly empty
         if (
           buffer.text.length === 0 &&
-          followup.state.isVisible &&
-          followup.state.suggestion
+          (followup.state.isVisible || promptSuggestion) &&
+          (followup.state.suggestion ?? promptSuggestion)
         ) {
-          const text = followup.state.suggestion;
+          const text = followup.state.suggestion ?? promptSuggestion!;
           // Skip onAccept (buffer.insert) — we pass the text directly to
           // handleSubmitAndClear which clears the buffer synchronously.
           // Without skipOnAccept the microtask in accept() would re-insert
@@ -1344,7 +1359,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       // Dismiss follow-up suggestion only on printable character input
       if (
         buffer.text.length === 0 &&
-        followup.state.isVisible &&
+        (followup.state.isVisible || promptSuggestion) &&
         key.sequence &&
         key.sequence.length === 1 &&
         !key.ctrl &&
@@ -1426,6 +1441,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       setBgSelectedIndex,
       followup,
       onPromptSuggestionDismiss,
+      promptSuggestion,
       exportCompletion,
       isHistoryRestoredText,
       showCompletionSuggestions,
@@ -1581,6 +1597,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   const hasTabConsumer =
     shouldShowSuggestions ||
     (followup.state.isVisible && Boolean(followup.state.suggestion)) ||
+    Boolean(promptSuggestion) ||
     Boolean(completion.midInputGhostText?.acceptText);
 
   // Narrow signal — autocomplete dropdown only. Composer hides Footer /
@@ -1679,8 +1696,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         onKeypress={handleInput}
         showCursor={showCursor}
         placeholder={
-          followup.state.isVisible && followup.state.suggestion
-            ? followup.state.suggestion
+          (followup.state.isVisible || promptSuggestion) &&
+          (followup.state.suggestion ?? promptSuggestion)
+            ? (followup.state.suggestion ?? promptSuggestion ?? undefined)
             : placeholder
         }
         prefix={prefixNode}

packages/vscode-ide-companion/schemas/settings.schema.json

@@ -257,7 +257,7 @@
         "enableFollowupSuggestions": {
           "description": "Show context-aware follow-up suggestions after task completion. Press Tab or Right Arrow to accept, Enter to accept and submit.",
           "type": "boolean",
-          "default": false
+          "default": true
         },
         "enableCacheSharing": {
           "description": "Use cache-aware forked queries for suggestion generation. Reduces cost on providers that support prefix caching (experimental).",