@pellux/goodvibes-tui 0.26.0 → 0.28.0

package/src/input/handler-interactions.ts

@@ -5,6 +5,7 @@ import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, handleBlockCopy,
 import { clearModalStack, handleEscape, modalOpened } from './handler-modal-stack.ts';
 import { openOnboardingWizardState, type OpenOnboardingWizardOptions } from './handler-ui-state.ts';
 import type { InputHandlerLike as InputHandler } from './handler-types.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export function openOnboardingWizardForHandler(
   handler: InputHandler,
@@ -49,7 +50,7 @@ export async function hydrateOnboardingWizardFromRuntimeForHandler(handler: Inpu
       handler.requestRender();
     } catch (error) {
       if (!handler.onboardingWizard.active || hydrationSerial !== handler.onboardingHydrationSerial) return;
-      const message = error instanceof Error ? error.message : String(error);
+      const message = summarizeError(error);
       handler.onboardingWizard.failRuntimeHydration(message);
       handler.commandContext?.print?.(`Onboarding runtime snapshot failed: ${message}`);
       handler.requestRender();

package/src/input/handler-modal-routes.ts

@@ -3,6 +3,7 @@ import type { SelectionResult, SelectionAction } from './selection-modal.ts';
 import type { CommandContext } from './command-registry.ts';
 import { openTtsProviderPicker, openTtsVoicePicker } from './tts-settings-actions.ts';
 import { isTextBackspace } from './delete-key-policy.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 type SelectionRouteState = {
   selectionModal: {
@@ -285,7 +286,7 @@ function consumeSettingsPickerRequest(state: SettingsRouteState): void {
       return;
     }
     void openTtsVoicePicker(state.commandContext).catch((error: unknown) => {
-      state.commandContext?.print(`Unable to list TTS voices: ${error instanceof Error ? error.message : String(error)}`);
+      state.commandContext?.print(`Unable to list TTS voices: ${summarizeError(error)}`);
       state.requestRender();
     });
     return;

package/src/input/handler-onboarding-cloudflare.ts

@@ -22,6 +22,7 @@ import {
   getCloudflareSetupSource,
   shouldShowCloudflareStep,
 } from './onboarding/onboarding-wizard-cloudflare.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 type CloudflareOnboardingAction = Extract<OnboardingWizardAction,
   | 'cloudflare-token-requirements'
@@ -44,7 +45,7 @@ function normalizeCloudflareActionError(error: unknown): string {
   if (error instanceof CloudflareDaemonRouteError) {
     return `${error.message} (HTTP ${error.status}, ${error.code})`;
   }
-  return error instanceof Error ? error.message : String(error);
+  return summarizeError(error);
 }
 
 function setCloudflareWizardStatusForHandler(

package/src/input/handler-onboarding.ts

@@ -1,6 +1,6 @@
 import { createOAuthLocalListener } from '@pellux/goodvibes-sdk/platform/config';
 import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
-import { openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils';
+import { summarizeError, openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils';
 import { getProviderIdFromModel } from '../config/provider-model.ts';
 import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
 import { OnboardingWizardController, type OnboardingWizardAction, type OnboardingWizardApplyFeedback } from './onboarding/onboarding-wizard.ts';
@@ -258,7 +258,7 @@ export async function handleOnboardingActionForHandler(handler: InputHandler, ac
           deleteWizardProgress(handler.uiServices.environment.shellPaths);
         } catch (markerError) {
           handler.commandContext?.print?.(
-            `Onboarding check marker could not be written: ${markerError instanceof Error ? markerError.message : String(markerError)}`,
+            `Onboarding check marker could not be written: ${summarizeError(markerError)}`,
           );
         }
         const activationVerification = await handler.restartOnboardingExternalServicesIfNeeded(request);
@@ -275,7 +275,7 @@ export async function handleOnboardingActionForHandler(handler: InputHandler, ac
         severity: 'error',
         title: 'Apply failed',
         summary: 'The wizard could not persist these settings. No service restart was attempted.',
-        messages: [error instanceof Error ? error.message : String(error)],
+        messages: [summarizeError(error)],
       });
       return;
     } finally {
@@ -346,7 +346,7 @@ export async function refreshOnboardingHydrationForHandler(handler: InputHandler
       handler.requestRender();
     } catch (error) {
       if (!handler.onboardingWizard.active || hydrationSerial !== handler.onboardingHydrationSerial) return;
-      const message = error instanceof Error ? error.message : String(error);
+      const message = summarizeError(error);
       handler.onboardingWizard.failRuntimeHydration(message);
       handler.requestRender();
     }
@@ -405,7 +405,7 @@ export async function handleOpenAiSubscriptionStartForHandler(handler: InputHand
       listener?.close();
       handler.commandContext?.print?.([
         'OpenAI subscription sign-in could not start.',
-        `  ${error instanceof Error ? error.message : String(error)}`,
+        `  ${summarizeError(error)}`,
       ].join('\n'));
       handler.requestRender();
     } finally {
@@ -449,7 +449,7 @@ export async function completeOpenAiSubscriptionFromListenerForHandler(
     } catch (error) {
       handler.commandContext?.print?.([
         'OpenAI subscription listener could not complete automatically.',
-        `  listener: ${error instanceof Error ? error.message : String(error)}`,
+        `  listener: ${summarizeError(error)}`,
         'Paste the callback code or URL into the OpenAI callback field to finish in onboarding.',
       ].join('\n'));
       handler.requestRender();
@@ -501,7 +501,7 @@ export async function handleOpenAiSubscriptionFinishForHandler(handler: InputHan
     } catch (error) {
       handler.commandContext?.print?.([
         'OpenAI subscription sign-in could not finish.',
-        `  ${error instanceof Error ? error.message : String(error)}`,
+        `  ${summarizeError(error)}`,
       ].join('\n'));
       handler.requestRender();
     } finally {
@@ -663,7 +663,7 @@ export async function restartOnboardingExternalServicesIfNeededForHandler(handle
       return [{
         id: 'runtime:activation-restart',
         status: 'fail',
-        message: `Background services could not restart: ${error instanceof Error ? error.message : String(error)}`,
+        message: `Background services could not restart: ${summarizeError(error)}`,
         target: 'service',
       }];
     }

package/src/input/handler-picker-routes.ts

@@ -98,13 +98,22 @@ export function handleModelPickerToken(state: ModelPickerRouteState, token: Inpu
         if (capModel) {
           const rawInput = state.modelPicker.contextCapQuery.trim();
           const parsedCap = rawInput.length > 0 ? parseInt(rawInput, 10) : null;
-          const validCap = parsedCap !== null && parsedCap > 0 && parsedCap <= 10_000_000 ? parsedCap : null;
-          const effort = state.commandContext?.session.runtime.reasoningEffort ?? 'medium';
-          const handled = state.onModelPickerCommit?.() ?? false;
-          if (!handled) state.commandContext?.completeModelSelection?.({ model: capModel, effort, contextCap: validCap, target: state.modelPicker.target });
+          if (parsedCap !== null && (parsedCap <= 0 || parsedCap > 10_000_000)) {
+            // Non-empty but out of valid range — surface notice; keep picker open for correction.
+            state.modelPicker.contextCapError = 'Context cap must be 1–10,000,000';
+          } else {
+            state.modelPicker.contextCapError = null;
+            const validCap = parsedCap !== null && parsedCap > 0 && parsedCap <= 10_000_000 ? parsedCap : null;
+            const effort = state.commandContext?.session.runtime.reasoningEffort ?? 'medium';
+            const handled = state.onModelPickerCommit?.() ?? false;
+            if (!handled) state.commandContext?.completeModelSelection?.({ model: capModel, effort, contextCap: validCap, target: state.modelPicker.target });
+            state.modelPicker.close();
+            if (state.modalStack[state.modalStack.length - 1] === 'modelPicker') state.modalStack.pop();
+          }
+        } else {
+          state.modelPicker.close();
+          if (state.modalStack[state.modalStack.length - 1] === 'modelPicker') state.modalStack.pop();
         }
-        state.modelPicker.close();
-        if (state.modalStack[state.modalStack.length - 1] === 'modelPicker') state.modalStack.pop();
       }
     } else if (token.logicalName === 'up') {
       if (state.modelPicker.focusPane === 'targets') {
@@ -158,14 +167,10 @@ export function handleModelPickerToken(state: ModelPickerRouteState, token: Inpu
     if (state.modelPicker.mode === 'contextCap') {
       if (token.value.length === 1) state.modelPicker.appendContextCapChar(token.value);
     } else if ((state.modelPicker.mode === 'model' || state.modelPicker.mode === 'provider') && state.modelPicker.searchFocused) {
+      // When search is focused every printable char — including space — goes to the query.
+      // The space=context-cap shortcut remains active only in the non-search branch below.
       const ch = token.value;
-      if (ch === ' ' && state.modelPicker.mode === 'model') {
-        const selected = state.modelPicker.getSelected();
-        if (selected && state.modelPicker.isLocalModel(selected)) state.modelPicker.enterContextCapMode(selected);
-        else if (ch.length === 1 && ch >= ' ') state.modelPicker.appendChar(ch);
-      } else if (ch.length === 1 && ch >= ' ') {
-        state.modelPicker.appendChar(ch);
-      }
+      if (ch.length === 1 && ch >= ' ') state.modelPicker.appendChar(ch);
     } else if (token.value === ' ' && state.modelPicker.mode === 'model') {
       const selected = state.modelPicker.getSelected();
       if (selected && state.modelPicker.isLocalModel(selected)) state.modelPicker.enterContextCapMode(selected);

package/src/input/handler-ui-state.ts

@@ -345,7 +345,7 @@ export function handleHistorySearchToken(state: HistorySearchRouteState, token:
     if (token.logicalName === 'escape' || (token.ctrl && token.logicalName === 'g')) {
       state.prompt = state.historySearch.cancel();
       state.cursorPos = state.prompt.length;
-    } else if (token.logicalName === 'return') {
+    } else if (token.logicalName === 'enter' || token.logicalName === 'return') {
       state.prompt = state.historySearch.accept();
       state.cursorPos = state.prompt.length;
     } else if (token.logicalName === 'backspace') {
@@ -354,6 +354,10 @@ export function handleHistorySearchToken(state: HistorySearchRouteState, token:
       state.historySearch.stepOlder();
     } else if (token.ctrl && token.logicalName === 's') {
       state.historySearch.stepNewer();
+    } else if (token.logicalName === 'up') {
+      state.historySearch.stepOlder();
+    } else if (token.logicalName === 'down') {
+      state.historySearch.stepNewer();
     }
   }
 

package/src/input/keybindings.ts

@@ -38,6 +38,7 @@ export type KeyAction =
   | 'panel-close-all'
   | 'panel-tab-next'
   | 'panel-tab-prev'
+  | 'panel-focus-toggle'
   | 'history-search'
   | 'search'
   | 'block-copy'
@@ -69,6 +70,7 @@ export const ACTION_DESCRIPTIONS: Record<KeyAction, string> = {
   'panel-close-all':         'Close all open panels',
   'panel-tab-next':        'Next workspace panel tab',
   'panel-tab-prev':        'Previous workspace panel tab',
+  'panel-focus-toggle':    'Switch keyboard focus between top and bottom pane',
   'history-search':        'Reverse input history search',
   'search':                'Toggle conversation search',
   'block-copy':            'Copy nearest block to clipboard',
@@ -101,6 +103,9 @@ export const DEFAULT_KEYBINDINGS: Record<KeyAction, KeyCombo[]> = {
   'panel-close-all':         [{ key: 'x', ctrl: true, shift: true }],
   'panel-tab-next':        [{ key: ']', ctrl: true }],
   'panel-tab-prev':        [{ key: '[', ctrl: true }],
+  // Ctrl+G: toggle keyboard focus between the top and bottom panes. Ctrl+G is
+  // otherwise unbound in the default table.
+  'panel-focus-toggle':    [{ key: 'g', ctrl: true }],
   'history-search':        [{ key: 'r', ctrl: true }],
   'search':                [{ key: 'f', ctrl: true }],
   'block-copy':            [{ key: 'y', ctrl: true }],

package/src/input/model-picker.ts

@@ -92,6 +92,8 @@ export class ModelPickerModal {
   public contextCapPendingModel: ModelDefinition | null = null;
   /** Current input string in contextCap mode. */
   public contextCapQuery = '';
+  /** Validation error from the last context cap commit (e.g. out-of-range value); null when no error. */
+  public contextCapError: string | null = null;
 
   // ── Search / filter ─────────────────────────────────────────────────────────────────────────────
   /** Current search query string (empty = no filter). */
@@ -215,6 +217,7 @@ export class ModelPickerModal {
     this.previousMode = 'model';
     this.contextCapPendingModel = model;
     this.contextCapQuery = '';
+    this.contextCapError = null;
     this.mode = 'contextCap';
   }
 
@@ -245,6 +248,7 @@ export class ModelPickerModal {
     this.query = '';
     this.categoryFilter = 'all';
     this.capabilityFilter = 'none';
+    this.availableOnly = true;
     const filtered = this.getFilteredModels();
     const idx = filtered.findIndex(m => m.id === currentModelId);
     this.selectedIndex = idx >= 0 ? idx : 0;
@@ -310,6 +314,7 @@ export class ModelPickerModal {
     this.pendingModel = null;
     this.contextCapPendingModel = null;
     this.contextCapQuery = '';
+    this.contextCapError = null;
     this.searchFocused = false;
     this.selectedIndex = 0;
     this.scrollOffset = 0;

package/src/input/panel-integration-actions.ts

@@ -41,6 +41,16 @@ export function handlePanelIntegrationAction(
 ): boolean {
   if (!activePanel) return false;
 
+  // Prefer the panel's own integration hook when it provides one. Panels migrated
+  // onto the formal hook opt out of the instanceof routing below.
+  if (activePanel.handlePanelIntegrationAction) {
+    const consumed = activePanel.handlePanelIntegrationAction(key, {
+      panelManager,
+      executeCommand: commandContext?.executeCommand,
+    });
+    if (consumed) return true;
+  }
+
   if ((key === 'enter' || key === 'return' || key === 'right') && activePanel instanceof FileExplorerPanel) {
     const filePath = activePanel.getFocusedFilePath();
     if (!filePath) return false;

package/src/input/tts-settings-actions.ts

@@ -1,6 +1,7 @@
 import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config';
 import type { CommandContext } from './command-registry.ts';
 import type { SelectionItem } from './selection-modal.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 function getStreamingTtsProviders(ctx: CommandContext): Array<{ id: string; label: string; capabilities: readonly string[] }> {
   const registry = ctx.platform.voiceProviderRegistry;
@@ -94,7 +95,7 @@ export async function openTtsVoicePicker(ctx: CommandContext, providerArg?: stri
     });
     return true;
   } catch (error) {
-    ctx.print(`Unable to list TTS voices: ${error instanceof Error ? error.message : String(error)}`);
+    ctx.print(`Unable to list TTS voices: ${summarizeError(error)}`);
     return true;
   }
 }

package/src/main.ts

@@ -29,7 +29,6 @@ import { applyConversationOverlays } from './renderer/conversation-overlays.ts';
 import { buildPanelCompositeData } from './renderer/panel-composite.ts';
 import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import { registerBuiltinPanels } from './panels/builtin-panels.ts';
-import { renderPanelTabBar } from './renderer/panel-tab-bar.ts';
 import { bootstrapRuntime } from './runtime/bootstrap.ts';
 import type { BootstrapContext } from './runtime/bootstrap.ts';
 import type { HITLMode } from '@pellux/goodvibes-sdk/platform/state';
@@ -52,6 +51,7 @@ import { renderToolCallBlock } from './renderer/tool-call.ts';
 import { wireSpokenTurnRuntime } from './audio/spoken-turn-wiring.ts';
 import { attachSpokenTurnModelRouting, createSpokenTurnInputOptions } from './audio/spoken-turn-model-routing.ts';
 import { allowTerminalWrite, installTuiTerminalOutputGuard } from './runtime/terminal-output-guard.ts';
+import { installProcessLifecycle } from './runtime/process-lifecycle.ts';
 import { buildCommandArgsHint } from './input/command-args-hint.ts';
 import { summarizeRunningAgents } from './renderer/process-summary.ts';
 import { formatUserFacingErrorLine } from './core/format-user-error.ts';
@@ -165,6 +165,9 @@ async function main() {
 
   let scrollTop = 0;
   let scrollLocked = true;
+  // Cached from the overlay-aware clamp the renderer computes (conversation-layout) each
+  // frame so scroll() clamps against exactly what is displayed, not a footer estimate.
+  let lastMaxScroll: number | null = null;
   // Stream and tool-timer state; mutated by wireStreamEventMetrics handlers, read during render.
   const streamMetrics: StreamMetrics = {
     startTime: 0,
@@ -187,18 +190,23 @@ async function main() {
     if (input.onboardingWizard.active) return stdout.rows || 24;
     const promptLines: number = input.getVisiblePromptLineCount(getPromptContentWidth());
     const currentModel = providerRegistry.getCurrentModel();
-    return (stdout.rows || 24) - 2 - estimateShellFooterHeight(promptLines, currentModel.contextWindow);
+    const contextWindow = providerRegistry.getContextWindowForModel(currentModel);
+    return (stdout.rows || 24) - 2 - estimateShellFooterHeight(promptLines, contextWindow);
   };
 
   const scroll = (delta: number) => {
-    const vHeight = getViewportHeight();
-    const maxScroll = Math.max(0, conversation.history.getLineCount() - vHeight);
+    // Prefer the last clamp the renderer computed (overlay- and real-footer-aware).
+    // The footer estimate is only a fallback for the pre-first-render frame.
+    const maxScroll = lastMaxScroll ?? Math.max(0, conversation.history.getLineCount() - getViewportHeight());
     scrollTop = Math.max(0, Math.min(scrollTop + delta, maxScroll));
     // Re-lock if user scrolled to bottom, otherwise unlock
     scrollLocked = scrollTop >= maxScroll;
   };
 
   const scrollToEnd = (vHeight: number) => {
+    // Respect a manual scroll-up by the user: only auto-follow the tail when parked at the
+    // bottom (scrollLocked). submitInput re-locks on new input so turns resume following.
+    if (!scrollLocked) return;
     scrollTop = Math.max(0, conversation.history.getLineCount() - vHeight);
   };
 
@@ -207,59 +215,31 @@ async function main() {
   let stopSpokenOutputForExit: (() => void) | null = null;
   let recoveryPending = false;
 
-  const sigintHandler = (): void => input.feed('\x03');
-  let _unhandledRejectionCount = 0;
-  let _unhandledRejectionWindowStart = Date.now();
-  const unhandledRejectionHandler = (reason: unknown): void => {
-    const now = Date.now();
-    if (now - _unhandledRejectionWindowStart > 10000) {
-      _unhandledRejectionCount = 0;
-      _unhandledRejectionWindowStart = now;
-    }
-    _unhandledRejectionCount++;
-    const msg = reason instanceof Error ? reason.message : String(reason);
-    if (_unhandledRejectionCount > 3) {
-      logger.error('CRITICAL: cascading unhandled rejections — consider restarting', {
-        count: _unhandledRejectionCount,
-        windowMs: now - _unhandledRejectionWindowStart,
-        error: String(reason),
-      });
-      systemMessageRouter.high(
-        `[Critical] Multiple errors detected (${_unhandledRejectionCount} in 10s). If the issue persists, please restart. Latest: ${msg}`
-      );
-    } else {
-      const formatted = formatUserFacingErrorLine(reason);
-      systemMessageRouter.high(`[Error] ${formatted}`);
-      logger.error('unhandledRejection', { error: String(reason) });
-    }
-    render();
-  };
-  const resizeHandler = (): void => {
-    input.setContentWidth(getPromptContentWidth());
-    compositor.resetDiff();
-    render();
-  };
-
-  const exitApp = (): void => {
-    stopSpokenOutputForExit?.();
-    unsubs.forEach(fn => fn());
-    const snapshot = conversation.toJSON() as { messages: Array<import('./core/conversation.ts').ConversationMessageSnapshot>; timestamp?: number };
-    ctx.shutdown({ ...snapshot, ...buildPersistedSessionContext(snapshot.messages, conversation.getTitleSource(), buildSessionContinuityHints()) }).catch((err) => {
-      logger.debug('ctx.shutdown error during exitApp (non-fatal)', { error: summarizeError(err) });
-    });
-    if (recoveryInterval !== null) { clearInterval(recoveryInterval); recoveryInterval = null; }
-    deleteRecoveryFile({ homeDirectory });
-    stdin.removeAllListeners('data');
-    stdout.removeListener('resize', resizeHandler);
-    process.removeListener('SIGINT', sigintHandler);
-    process.removeListener('unhandledRejection', unhandledRejectionHandler);
-    const exitScreen = cli.flags.noAltScreen ? CLEAR_SCREEN : CLEAR_SCREEN + ALT_SCREEN_EXIT;
-    allowTerminalWrite(() => stdout.write(PASTE_DISABLE + KEYBOARD_EXT_DISABLE + MOUSE_DISABLE + CURSOR_SHOW + exitScreen));
-    terminalOutputGuard.dispose();
-    stdin.setRawMode(false);
-    process.exit(0);
-  };
-
+  const lifecycle = installProcessLifecycle({
+    stdin,
+    stdout,
+    ctx,
+    noAltScreen: cli.flags.noAltScreen,
+    ansi: { CLEAR_SCREEN, ALT_SCREEN_EXIT, PASTE_DISABLE, KEYBOARD_EXT_DISABLE, MOUSE_DISABLE, CURSOR_SHOW },
+    getInput: () => input,
+    render: () => render(),
+    getPromptContentWidth,
+    getTerminalOutputGuard: () => terminalOutputGuard,
+    buildSessionContinuityHints,
+    unsubs,
+    getRecoveryInterval: () => recoveryInterval,
+    setRecoveryInterval: (value) => { recoveryInterval = value; },
+    getStopSpokenOutputForExit: () => stopSpokenOutputForExit,
+  });
+  const {
+    exitApp,
+    resizeHandler,
+    sigintHandler,
+    unhandledRejectionHandler,
+    uncaughtExceptionHandler,
+    terminationSignalHandler,
+    exitListener,
+  } = lifecycle;
   commandContext.exit = exitApp;
 
   const spokenTurns = wireSpokenTurnRuntime({
@@ -456,6 +436,9 @@ async function main() {
 
     // Cache the current model for consistent values across the entire render frame
     const currentModel = providerRegistry.getCurrentModel();
+    // Resolve the effective context window (provider_api / configured_cap overrides) once,
+    // so the footer meter, footer-height, and context inspector agree with the Tokens panel.
+    const contextWindow = providerRegistry.getContextWindowForModel(currentModel);
     const sessionSnapshot = uiServices.readModels.session.getSnapshot();
     const agentSnapshot = uiServices.readModels.agents.getSnapshot();
 
@@ -481,7 +464,7 @@ async function main() {
     const maintenanceStatus = evaluateSessionMaintenance({
       configManager,
       currentTokens: orchestrator.lastInputTokens,
-      contextWindow: currentModel.contextWindow,
+      contextWindow,
       sessionMemoryCount: ctx.services.sessionMemoryStore.list().length,
     });
     const contextStatusHint = buildContextStatusHint({
@@ -505,7 +488,7 @@ async function main() {
       toolCount: toolRegistry.list().length,
       workingDir,
       provider: runtime.provider,
-      contextWindow: currentModel.contextWindow,
+      contextWindow,
       contextStatusHint,
       // behavior.autoCompactThreshold is stored as a percent integer (e.g. 80);
       // the meter expects a fraction [0..1]. Clamp to [0,1] to guard nonsense values.
@@ -586,6 +569,7 @@ async function main() {
       overlayRows,
     });
     scrollTop = conversationViewport.nextScrollTop;
+    lastMaxScroll = conversationViewport.maxScroll;
     let viewport = conversationViewport.viewport;
 
     if (orchestrator.isThinking) {
@@ -628,7 +612,7 @@ async function main() {
       keybindingsManager: ctx.services.keybindingsManager,
       conversationWidth,
       viewportHeight: vHeight,
-      contextWindow: currentModel.contextWindow,
+      contextWindow,
     });
 
     // Panel composite data
@@ -732,6 +716,14 @@ async function main() {
     }
   });
 
+  // Register terminal-restoring crash/termination handlers BEFORE entering raw mode so a
+  // throw during terminal setup or the initial render still restores the terminal; the
+  // 'exit' listener is the final safety net for any process.exit path.
+  process.on('uncaughtException', uncaughtExceptionHandler);
+  process.on('SIGTERM', terminationSignalHandler);
+  process.on('SIGHUP', terminationSignalHandler);
+  process.on('exit', exitListener);
+
   // --- Terminal setup ---
   stdin.setRawMode(true);
   stdin.resume();