Fix model selector

Author: virattt

src/cli.ts

@@ -451,36 +451,49 @@ export async function runCli() {
         queueLength: defaultQueue.length(),
       });
     }
-    tui.setFocus(editor);
+    if (!modelSelection.isInSelectionFlow() && !agentRunner.pendingApproval) {
+      tui.setFocus(editor);
+    }
   };
 
   /**
-   * Show an overlay screen using pi-tui's native overlay system.
-   * Does NOT touch the root tree — overlays render on top.
+   * Show a full-screen selection view by replacing the root content.
+   * Used for infrequent user-initiated overlays (model selection, approval).
    */
-  const showScreenOverlay = (
+  const showScreenView = (
     title: string,
     description: string,
     body: any,
     footer?: string,
     focusTarget?: any,
   ) => {
-    if (tui.hasOverlay()) tui.hideOverlay();
-    const screen = createScreen(title, description, body, footer);
-    tui.showOverlay(screen);
+    root.clear();
+    root.addChild(createScreen(title, description, body, footer));
     if (focusTarget) {
       tui.setFocus(focusTarget);
     }
   };
 
+  /**
+   * Restore the main view after an overlay screen closes.
+   */
+  const restoreMainView = () => {
+    root.clear();
+    root.addChild(intro);
+    root.addChild(chatLog);
+    root.addChild(errorText);
+    root.addChild(workingIndicator);
+    root.addChild(spacer);
+    root.addChild(editor);
+    root.addChild(hintBar);
+    root.addChild(debugPanel);
+    updateView();
+  };
+
   const renderSelectionOverlay = () => {
     const state = modelSelection.state;
     if (state.appState === 'idle' && !agentRunner.pendingApproval) {
-      if (tui.hasOverlay()) {
-        tui.hideOverlay();
-        tui.setFocus(editor);
-      }
-      updateView();
+      restoreMainView();
       tui.requestRender();
       return;
     }
@@ -493,15 +506,15 @@ export async function runCli() {
       prompt.onSelect = (decision: ApprovalDecision) => {
         agentRunner.respondToApproval(decision);
       };
-      showScreenOverlay('', '', prompt, undefined, prompt.selector);
+      showScreenView('', '', prompt, undefined, prompt.selector);
       return;
     }
 
     if (state.appState === 'provider_select') {
       const selector = createProviderSelector(modelSelection.provider, (providerId) => {
         void modelSelection.handleProviderSelect(providerId);
       });
-      showScreenOverlay(
+      showScreenView(
         'Select provider',
         'Switch between LLM providers. Applies to this session and future sessions.',
         selector,
@@ -518,7 +531,7 @@ export async function runCli() {
         (modelId) => modelSelection.handleModelSelect(modelId),
         state.pendingProvider,
       );
-      showScreenOverlay(
+      showScreenView(
         `Select model for ${getProviderDisplayName(state.pendingProvider)}`,
         '',
         selector,
@@ -532,7 +545,7 @@ export async function runCli() {
       const input = new ApiKeyInputComponent();
       input.onSubmit = (value) => modelSelection.handleModelInputSubmit(value);
       input.onCancel = () => modelSelection.handleModelInputSubmit(null);
-      showScreenOverlay(
+      showScreenView(
         `Enter model name for ${getProviderDisplayName(state.pendingProvider)}`,
         'Type or paste the model name from openrouter.ai/models',
         input,
@@ -546,7 +559,7 @@ export async function runCli() {
       const selector = createApiKeyConfirmSelector((wantsToSet) =>
         modelSelection.handleApiKeyConfirm(wantsToSet),
       );
-      showScreenOverlay(
+      showScreenView(
         'Set API Key',
         `Would you like to set your ${getProviderDisplayName(state.pendingProvider)} API key?`,
         selector,
@@ -561,7 +574,7 @@ export async function runCli() {
       input.onSubmit = (apiKey) => modelSelection.handleApiKeySubmit(apiKey);
       input.onCancel = () => modelSelection.handleApiKeySubmit(null);
       const apiKeyName = getApiKeyNameForProvider(state.pendingProvider) ?? '';
-      showScreenOverlay(
+      showScreenView(
         `Enter ${getProviderDisplayName(state.pendingProvider)} API Key`,
         apiKeyName ? `(${apiKeyName})` : '',
         input,