@pellux/goodvibes-tui 0.19.27 → 0.19.29

package/src/input/onboarding/onboarding-wizard.ts

@@ -4,11 +4,39 @@ import { STEP_ORDER } from './onboarding-wizard-constants.ts';
 import { buildOnboardingApplyRequest } from './onboarding-wizard-apply.ts';
 import { buildOnboardingWizardSteps } from './onboarding-wizard-steps.ts';
 import { buildDefaultDerivedState, clamp, cloneSelection, getRuntimeDerivedState, maskValue, modelSelectionLabel, normalizeText } from './onboarding-wizard-helpers.ts';
-import { defaultReviewUserMarker as defaultReviewUserMarkerForController, getBooleanFieldValue as getBooleanFieldValueForController, getDefaultAdminUsername as getDefaultAdminUsernameForController, getNumberFieldValue as getNumberFieldValueForController, getPortFieldValue as getPortFieldValueForController, getSelectedSecretMedium as getSelectedSecretMediumForController, getSharedIpDefault as getSharedIpDefaultForController, getSharedIpHostDefault as getSharedIpHostDefaultForController, getStringFieldValue as getStringFieldValueForController, hasAdminAuthUser as hasAdminAuthUserForController, hasBootstrapCredentialPresent as hasBootstrapCredentialPresentForController, hasSelectedInboundExternalSurface as hasSelectedInboundExternalSurfaceForController, hasServerCapabilitiesSelected as hasServerCapabilitiesSelectedForController, isCapabilitySelected as isCapabilitySelectedForController, isRequiredExternalSetupField as isRequiredExternalSetupFieldForController, parseIntegerFieldValue as parseIntegerFieldValueForController, requiresAuthBootstrap as requiresAuthBootstrapForController, selectAllServerCapabilities as selectAllServerCapabilitiesForController, selectLocalTuiOnly as selectLocalTuiOnlyForController, setCapabilityValue as setCapabilityValueForController, shouldEnableBrowserSurface as shouldEnableBrowserSurfaceForController, shouldEnableHttpListener as shouldEnableHttpListenerForController, shouldExposeControlPlaneNetwork as shouldExposeControlPlaneNetworkForController, shouldExposeHttpListenerNetworkFields as shouldExposeHttpListenerNetworkFieldsForController, toggleCapability as toggleCapabilityForController } from './onboarding-wizard-rules.ts';
+import {
+  clearExternalSurfaces as clearExternalSurfacesForController,
+  getBooleanFieldValue as getBooleanFieldValueForController,
+  getDefaultAdminUsername as getDefaultAdminUsernameForController,
+  getNumberFieldValue as getNumberFieldValueForController,
+  getPortFieldValue as getPortFieldValueForController,
+  getSelectedSecretMedium as getSelectedSecretMediumForController,
+  getSharedIpDefault as getSharedIpDefaultForController,
+  getSharedIpHostDefault as getSharedIpHostDefaultForController,
+  getStringFieldValue as getStringFieldValueForController,
+  hasAdminAuthUser as hasAdminAuthUserForController,
+  hasBootstrapCredentialPresent as hasBootstrapCredentialPresentForController,
+  hasLocalAuthUser as hasLocalAuthUserForController,
+  hasSelectedInboundExternalSurface as hasSelectedInboundExternalSurfaceForController,
+  hasServerCapabilitiesSelected as hasServerCapabilitiesSelectedForController,
+  isCapabilitySelected as isCapabilitySelectedForController,
+  isRequiredExternalSetupField as isRequiredExternalSetupFieldForController,
+  parseIntegerFieldValue as parseIntegerFieldValueForController,
+  requiresAuthBootstrap as requiresAuthBootstrapForController,
+  selectAllExternalSurfaces as selectAllExternalSurfacesForController,
+  selectAllServerCapabilities as selectAllServerCapabilitiesForController,
+  selectLocalTuiOnly as selectLocalTuiOnlyForController,
+  setCapabilityValue as setCapabilityValueForController,
+  shouldEnableBrowserSurface as shouldEnableBrowserSurfaceForController,
+  shouldEnableHttpListener as shouldEnableHttpListenerForController,
+  shouldExposeControlPlaneNetwork as shouldExposeControlPlaneNetworkForController,
+  shouldExposeHttpListenerNetworkFields as shouldExposeHttpListenerNetworkFieldsForController,
+  toggleCapability as toggleCapabilityForController,
+} from './onboarding-wizard-rules.ts';
 import { ensureSelectionVisible as ensureSelectionVisibleForController, getBlockingFieldLabels as getBlockingFieldLabelsForController, getCapabilitySelectionState as getCapabilitySelectionStateForController, getCompletedFieldCount as getCompletedFieldCountForController, getCompletedToggleCount as getCompletedToggleCountForController, getCurrentCapabilities as getCurrentCapabilitiesForController, getFieldById as getFieldByIdForController, getFieldValidationError as getFieldValidationErrorForController, getStepFieldCount as getStepFieldCountForController, getToggleFieldCount as getToggleFieldCountForController, hasExistingAccessState as hasExistingAccessStateForController, isFieldDirty as isFieldDirtyForController, isFieldDirtyByDefinition as isFieldDirtyByDefinitionForController, isFieldSatisfied as isFieldSatisfiedForController, isStepDirty as isStepDirtyForController, recalculateDirtyState as recalculateDirtyStateForController, reconcileStateWithCurrentDefinitions as reconcileStateWithCurrentDefinitionsForController, reconcileStepCursor as reconcileStepCursorForController, resetValuesFromCurrentDefinitions as resetValuesFromCurrentDefinitionsForController } from './onboarding-wizard-state.ts';
-import type { MutableModelSelectionMap, OnboardingWizardAction, OnboardingWizardFieldDefinition, OnboardingWizardFieldWindow, OnboardingWizardMode, OnboardingWizardModelSelection, OnboardingWizardRuntimeHydration, OnboardingWizardSnapshot, OnboardingWizardStepDefinition, OnboardingWizardStepId } from './onboarding-wizard-types.ts';
+import type { MutableModelSelectionMap, OnboardingWizardAction, OnboardingWizardApplyFeedback, OnboardingWizardFieldDefinition, OnboardingWizardFieldWindow, OnboardingWizardMode, OnboardingWizardModelSelection, OnboardingWizardRuntimeHydration, OnboardingWizardSnapshot, OnboardingWizardStepDefinition, OnboardingWizardStepId } from './onboarding-wizard-types.ts';
 
-export type { OnboardingWizardAcknowledgementFieldDefinition, OnboardingWizardAction, OnboardingWizardActionFieldDefinition, OnboardingWizardChecklistFieldDefinition, OnboardingWizardFieldDefinition, OnboardingWizardFieldKind, OnboardingWizardFieldWindow, OnboardingWizardMaskedFieldDefinition, OnboardingWizardMode, OnboardingWizardModelPickerFieldDefinition, OnboardingWizardModelSelection, OnboardingWizardRadioFieldDefinition, OnboardingWizardRadioOption, OnboardingWizardRuntimeHydration, OnboardingWizardSnapshot, OnboardingWizardStatusFieldDefinition, OnboardingWizardStepDefinition, OnboardingWizardStepId, OnboardingWizardTextFieldDefinition } from './onboarding-wizard-types.ts';
+export type { OnboardingWizardAcknowledgementFieldDefinition, OnboardingWizardAction, OnboardingWizardActionFieldDefinition, OnboardingWizardApplyFeedback, OnboardingWizardApplyFeedbackSeverity, OnboardingWizardChecklistFieldDefinition, OnboardingWizardExternalSurfaceStepId, OnboardingWizardFieldDefinition, OnboardingWizardFieldKind, OnboardingWizardFieldWindow, OnboardingWizardMaskedFieldDefinition, OnboardingWizardMode, OnboardingWizardModelPickerFieldDefinition, OnboardingWizardModelSelection, OnboardingWizardRadioFieldDefinition, OnboardingWizardRadioOption, OnboardingWizardRuntimeHydration, OnboardingWizardSnapshot, OnboardingWizardStatusFieldDefinition, OnboardingWizardStepDefinition, OnboardingWizardStepId, OnboardingWizardTextFieldDefinition } from './onboarding-wizard-types.ts';
 export { getOnboardingWizardBodyRows, getOnboardingWizardVisibleFieldCount } from './onboarding-wizard-helpers.ts';
 
 export class OnboardingWizardController {
@@ -30,6 +58,7 @@ export class OnboardingWizardController {
   public editingFieldId: string | null = null;
   public editBuffer = '';
   public hydrationError: string | null = null;
+  public applyFeedback: OnboardingWizardApplyFeedback | null = null;
 
   public readonly baselineToggleState = new Map<string, boolean>();
   public readonly baselineRadioState = new Map<string, string>();
@@ -40,7 +69,9 @@ export class OnboardingWizardController {
   public runtimeDerived: OnboardingStepDerivationState = buildDefaultDerivedState();
 
   public get steps(): readonly OnboardingWizardStepDefinition[] {
-    return buildOnboardingWizardSteps(this);
+    const steps = buildOnboardingWizardSteps(this);
+    this.ensureNavigationStateLength(steps.length);
+    return steps;
   }
 
   public get currentStep(): OnboardingWizardStepDefinition {
@@ -59,6 +90,11 @@ export class OnboardingWizardController {
     this.resetValuesFromCurrentDefinitions();
   }
 
+  private ensureNavigationStateLength(stepCount: number): void {
+    while (this.scrollOffsets.length < stepCount) this.scrollOffsets.push(0);
+    while (this.selectedFieldIndices.length < stepCount) this.selectedFieldIndices.push(0);
+  }
+
   public open(mode: OnboardingWizardMode = 'new'): void {
     this.mode = mode;
     this.active = true;
@@ -67,6 +103,7 @@ export class OnboardingWizardController {
     this.stepIndex = 0;
     this.pendingModelPickerTarget = null;
     this.pendingAction = null;
+    this.applyFeedback = null;
     this.editingFieldId = null;
     this.editBuffer = '';
     this.scrollOffsets.fill(0);
@@ -80,6 +117,7 @@ export class OnboardingWizardController {
     this.hydrationError = null;
     this.pendingModelPickerTarget = null;
     this.pendingAction = null;
+    this.applyFeedback = null;
     this.cancelEdit();
   }
 
@@ -143,6 +181,7 @@ export class OnboardingWizardController {
       editBuffer: this.editBuffer,
       hydrationPending: this.hydrationPending,
       hydrationError: this.hydrationError,
+      applyFeedback: this.applyFeedback,
       hydration: this.captureHydratedState(),
     };
   }
@@ -156,10 +195,13 @@ export class OnboardingWizardController {
     this.stepIndex = clamp(snapshot.stepIndex, 0, Math.max(0, this.steps.length - 1));
     this.pendingModelPickerTarget = snapshot.pendingModelPickerTarget;
     this.pendingAction = snapshot.pendingAction;
+    this.applyFeedback = snapshot.applyFeedback;
     this.dirtyStepIds.clear();
     for (const stepId of snapshot.dirtyStepIds) this.dirtyStepIds.add(stepId);
 
-    for (let index = 0; index < this.scrollOffsets.length; index += 1) {
+    const navigationLength = Math.max(this.steps.length, snapshot.scrollOffsets.length, this.scrollOffsets.length);
+    this.ensureNavigationStateLength(navigationLength);
+    for (let index = 0; index < navigationLength; index += 1) {
       this.scrollOffsets[index] = snapshot.scrollOffsets[index] ?? 0;
       this.selectedFieldIndices[index] = snapshot.selectedFieldIndices[index] ?? 0;
     }
@@ -186,6 +228,7 @@ export class OnboardingWizardController {
   public beginRuntimeHydration(): void {
     this.hydrationPending = true;
     this.hydrationError = null;
+    this.applyFeedback = null;
     this.stepIndex = 0;
     this.pendingModelPickerTarget = null;
     this.pendingAction = null;
@@ -195,6 +238,7 @@ export class OnboardingWizardController {
   public finishRuntimeHydration(): void {
     this.hydrationPending = false;
     this.hydrationError = null;
+    this.applyFeedback = null;
     this.stepIndex = clamp(this.stepIndex, 0, Math.max(0, this.steps.length - 1));
     this.reconcileStepCursor(this.stepIndex);
   }
@@ -202,6 +246,12 @@ export class OnboardingWizardController {
   public failRuntimeHydration(message: string): void {
     this.hydrationPending = false;
     this.hydrationError = message;
+    this.applyFeedback = {
+      severity: 'error',
+      title: 'Current settings could not load',
+      summary: message,
+      messages: [message],
+    };
     this.stepIndex = 0;
     this.pendingModelPickerTarget = null;
     this.pendingAction = null;
@@ -307,6 +357,14 @@ export class OnboardingWizardController {
     this.pendingAction = null;
   }
 
+  public setApplyFeedback(feedback: OnboardingWizardApplyFeedback): void {
+    this.applyFeedback = feedback;
+  }
+
+  public clearApplyFeedback(): void {
+    this.applyFeedback = null;
+  }
+
   public consumePendingAction(): OnboardingWizardAction | null {
     const action = this.pendingAction;
     this.pendingAction = null;
@@ -323,6 +381,7 @@ export class OnboardingWizardController {
       this.toggleCapability(field.capabilityId);
       this.pendingModelPickerTarget = null;
       this.pendingAction = null;
+      this.applyFeedback = null;
       this.recalculateDirtyState();
       return;
     }
@@ -332,6 +391,7 @@ export class OnboardingWizardController {
       this.toggleState.set(field.id, !current);
       this.pendingModelPickerTarget = null;
       this.pendingAction = null;
+      this.applyFeedback = null;
       this.recalculateDirtyState();
       return;
     }
@@ -345,6 +405,7 @@ export class OnboardingWizardController {
       this.radioState.set(field.id, next.id);
       this.pendingModelPickerTarget = null;
       this.pendingAction = null;
+      this.applyFeedback = null;
       this.recalculateDirtyState();
       return;
     }
@@ -360,6 +421,7 @@ export class OnboardingWizardController {
         this.selectAllServerCapabilities();
         this.pendingAction = null;
         this.pendingModelPickerTarget = null;
+        this.applyFeedback = null;
         this.recalculateDirtyState();
         return;
       }
@@ -368,6 +430,25 @@ export class OnboardingWizardController {
         this.selectLocalTuiOnly();
         this.pendingAction = null;
         this.pendingModelPickerTarget = null;
+        this.applyFeedback = null;
+        this.recalculateDirtyState();
+        return;
+      }
+
+      if (field.action === 'select-all-external-surfaces') {
+        this.selectAllExternalSurfaces();
+        this.pendingAction = null;
+        this.pendingModelPickerTarget = null;
+        this.applyFeedback = null;
+        this.recalculateDirtyState();
+        return;
+      }
+
+      if (field.action === 'clear-external-surfaces') {
+        this.clearExternalSurfaces();
+        this.pendingAction = null;
+        this.pendingModelPickerTarget = null;
+        this.applyFeedback = null;
         this.recalculateDirtyState();
         return;
       }
@@ -380,6 +461,7 @@ export class OnboardingWizardController {
     this.pendingModelPickerTarget = field.target;
     this.pendingAction = null;
     this.touchedActionFields.add(field.id);
+    this.applyFeedback = null;
   }
 
   public beginEdit(fieldId: string): void {
@@ -391,12 +473,21 @@ export class OnboardingWizardController {
     this.editBuffer = this.textState.get(field.id) ?? field.defaultValue;
   }
 
+  public beginSelectedTextInput(initialText: string): boolean {
+    const field = this.getSelectedField();
+    if (!field || (field.kind !== 'text' && field.kind !== 'masked')) return false;
+    this.beginEdit(field.id);
+    this.editBuffer = initialText;
+    return true;
+  }
+
   public commitEdit(): void {
     const fieldId = this.editingFieldId;
     if (fieldId === null) return;
     const field = this.getFieldById(fieldId);
     if (field && (field.kind === 'text' || field.kind === 'masked')) {
       this.textState.set(fieldId, this.editBuffer);
+      this.applyFeedback = null;
       this.recalculateDirtyState();
     }
     this.editingFieldId = null;
@@ -418,6 +509,21 @@ export class OnboardingWizardController {
     this.editBuffer = this.editBuffer.slice(0, -1);
   }
 
+  public clearEditingValue(): void {
+    if (this.editingFieldId === null) return;
+    this.editBuffer = '';
+  }
+
+  public clearSelectedTextField(): boolean {
+    const field = this.getSelectedField();
+    if (!field || (field.kind !== 'text' && field.kind !== 'masked')) return false;
+    this.textState.set(field.id, '');
+    if (this.editingFieldId === field.id) this.editBuffer = '';
+    this.applyFeedback = null;
+    this.recalculateDirtyState();
+    return true;
+  }
+
   public setFieldValue(fieldId: string, value: boolean | string): void {
     const field = this.getFieldById(fieldId);
     if (!field) return;
@@ -426,6 +532,7 @@ export class OnboardingWizardController {
       if (typeof value === 'boolean') {
         if (field.kind === 'checklist' && field.capabilityId) this.setCapabilityValue(field.capabilityId, value);
         else this.toggleState.set(fieldId, value);
+        this.applyFeedback = null;
         this.recalculateDirtyState();
       }
       return;
@@ -434,6 +541,7 @@ export class OnboardingWizardController {
     if (field.kind === 'radio') {
       if (typeof value === 'string' && field.options.some((option) => option.id === value)) {
         this.radioState.set(fieldId, value);
+        this.applyFeedback = null;
         this.recalculateDirtyState();
       }
       return;
@@ -443,6 +551,7 @@ export class OnboardingWizardController {
       if (typeof value === 'string') {
         this.textState.set(fieldId, value);
         if (this.editingFieldId === fieldId) this.editBuffer = value;
+        this.applyFeedback = null;
         this.recalculateDirtyState();
       }
     }
@@ -498,11 +607,15 @@ export class OnboardingWizardController {
 
     if (field.kind === 'text') {
       const value = normalizeText(this.getFieldValue(field) as string);
+      if (value.length === 0 && field.required === true) return 'Missing';
+      if (value.length === 0 && this.isRequiredExternalSetupField(field.id)) return 'Not set';
       return value.length > 0 ? value : field.placeholder;
     }
 
     if (field.kind === 'masked') {
       const value = normalizeText(this.getFieldValue(field) as string);
+      if (value.length === 0 && field.required === true) return 'Missing';
+      if (value.length === 0 && this.isRequiredExternalSetupField(field.id)) return 'Not set';
       return value.length > 0 ? maskValue(value) : field.placeholder;
     }
 
@@ -521,6 +634,7 @@ export class OnboardingWizardController {
       enabled: selection.enabled ?? true,
     });
     this.pendingModelPickerTarget = null;
+    this.applyFeedback = null;
     this.recalculateDirtyState();
   }
 
@@ -538,6 +652,7 @@ export class OnboardingWizardController {
     this.baselineModelSelectionState.clear();
     for (const [key, value] of this.modelSelectionState) this.baselineModelSelectionState.set(key, cloneSelection(value));
     this.dirtyStepIds.clear();
+    this.applyFeedback = null;
   }
 
   public getSharedIpDefault(enabled: { readonly controlPlane: boolean; readonly httpListener: boolean; readonly web: boolean }): boolean {
@@ -548,10 +663,11 @@ export class OnboardingWizardController {
     return getSharedIpHostDefaultForController(this, enabled);
   }
 
-  public defaultReviewUserMarker(): boolean { return defaultReviewUserMarkerForController(this); }
   public toggleCapability(capabilityId: OnboardingStep1CapabilityId): void { toggleCapabilityForController(this, capabilityId); }
   public selectAllServerCapabilities(): void { selectAllServerCapabilitiesForController(this); }
   public selectLocalTuiOnly(): void { selectLocalTuiOnlyForController(this); }
+  public selectAllExternalSurfaces(): void { selectAllExternalSurfacesForController(this); }
+  public clearExternalSurfaces(): void { clearExternalSurfacesForController(this); }
   public setCapabilityValue(capabilityId: OnboardingStep1CapabilityId, selected: boolean): void { setCapabilityValueForController(this, capabilityId, selected); }
   public isCapabilitySelected(capabilityId: OnboardingStep1CapabilityId): boolean { return isCapabilitySelectedForController(this, capabilityId); }
   public hasServerCapabilitiesSelected(): boolean { return hasServerCapabilitiesSelectedForController(this); }
@@ -564,6 +680,7 @@ export class OnboardingWizardController {
   public shouldExposeControlPlaneNetwork(): boolean { return shouldExposeControlPlaneNetworkForController(this); }
   public requiresAuthBootstrap(): boolean { return requiresAuthBootstrapForController(this); }
   public hasAdminAuthUser(): boolean { return hasAdminAuthUserForController(this); }
+  public hasLocalAuthUser(): boolean { return hasLocalAuthUserForController(this); }
   public hasBootstrapCredentialPresent(): boolean { return hasBootstrapCredentialPresentForController(this); }
   public getDefaultAdminUsername(): string { return getDefaultAdminUsernameForController(this); }
   public getBooleanFieldValue(fieldId: string, fallback: boolean): boolean { return getBooleanFieldValueForController(this, fieldId, fallback); }

package/src/input/settings-modal-types.ts

@@ -2,7 +2,7 @@ import type { ConfigSetting } from '@pellux/goodvibes-sdk/platform/config/schema
 import type { ProviderAuthFreshness, ProviderAuthRoute } from '@pellux/goodvibes-sdk/platform/runtime/provider-accounts/registry';
 import type { FeatureFlag, FlagState } from '@pellux/goodvibes-sdk/platform/runtime/feature-flags/types';
 
-export type SettingsCategory = 'display' | 'ui' | 'provider' | 'subscriptions' | 'behavior' | 'storage' | 'permissions' | 'mcp' | 'sandbox' | 'danger' | 'tools' | 'flags' | 'network';
+export type SettingsCategory = 'display' | 'ui' | 'provider' | 'subscriptions' | 'behavior' | 'storage' | 'permissions' | 'mcp' | 'sandbox' | 'surfaces' | 'danger' | 'tools' | 'flags' | 'network';
 
 export const SETTINGS_CATEGORIES: SettingsCategory[] = [
   'display',
@@ -14,6 +14,7 @@ export const SETTINGS_CATEGORIES: SettingsCategory[] = [
   'permissions',
   'mcp',
   'sandbox',
+  'surfaces',
   'danger',
   'tools',
   'flags',

package/src/input/settings-modal.ts

@@ -519,6 +519,8 @@ export class SettingsModal {
         cat = 'tools';
       } else if (rawCat === 'controlPlane' || rawCat === 'httpListener' || rawCat === 'web') {
         cat = 'network';
+      } else if (rawCat === 'surfaces') {
+        cat = 'surfaces';
       } else {
         cat = rawCat as SettingsCategory;
       }
@@ -746,6 +748,8 @@ export class SettingsModal {
         if (isRestartKey && previousValue !== value) {
           this.lastSaveTriggeredRestart = 'web';
         }
+      } else if (rawCat === 'surfaces') {
+        cat = 'surfaces';
       } else {
         cat = rawCat as SettingsCategory;
       }

package/src/main.ts

@@ -177,6 +177,7 @@ async function main() {
   };
 
   const getViewportHeight = (): number => {
+    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);
@@ -258,7 +259,8 @@ async function main() {
     stdout.removeListener('resize', resizeHandler);
     process.removeListener('SIGINT', sigintHandler);
     process.removeListener('unhandledRejection', unhandledRejectionHandler);
-    stdout.write(PASTE_DISABLE + KEYBOARD_EXT_DISABLE + MOUSE_DISABLE + CURSOR_SHOW + (cli.flags.noAltScreen ? '' : ALT_SCREEN_EXIT));
+    const exitScreen = cli.flags.noAltScreen ? CLEAR_SCREEN : CLEAR_SCREEN + ALT_SCREEN_EXIT;
+    stdout.write(PASTE_DISABLE + KEYBOARD_EXT_DISABLE + MOUSE_DISABLE + CURSOR_SHOW + exitScreen);
     stdin.setRawMode(false);
     process.exit(0);
   };
@@ -550,19 +552,23 @@ async function main() {
       composerPendingRisk: composerState.pendingRisk,
     }).lines;
 
+    const onboardingOwnsScreen = input.onboardingWizard.active;
+    const shellHeaderLines = onboardingOwnsScreen ? [] : headerLines;
+    const shellFooterLines = onboardingOwnsScreen ? [] : footerLines;
+    const panelWidth = !onboardingOwnsScreen && panelManager.isVisible() && panelManager.getAllOpen().length > 0
+      ? panelManager.getRightWidth(width)
+      : 0;
     const shellLayout = createShellLayout({
       width,
       height,
-      headerHeight: headerLines.length,
-      footerHeight: footerLines.length,
-      panelWidth: panelManager.isVisible() && panelManager.getAllOpen().length > 0
-        ? panelManager.getRightWidth(width)
-        : 0,
+      headerHeight: shellHeaderLines.length,
+      footerHeight: shellFooterLines.length,
+      panelWidth,
     });
     const vHeight = shellLayout.body.height;
     const conversationWidth = shellLayout.conversation.width;
     activeConversationWidth = conversationWidth;
-    const hasPanelWorkspace = panelManager.isVisible() && panelManager.getAllOpen().length > 0;
+    const hasPanelWorkspace = !onboardingOwnsScreen && panelManager.isVisible() && panelManager.getAllOpen().length > 0;
     conversation.setSplashSuppressed(hasPanelWorkspace);
 
     // Flush pending renders after updating the width provider and splash posture
@@ -626,27 +632,29 @@ async function main() {
     });
 
     // Panel composite data
-    const panelComposite = buildPanelCompositeData(
-      panelManager,
-      input,
-      shellLayout.panel?.width ?? 0,
-      shellLayout.panel?.height ?? vHeight,
-    );
+    const panelComposite = onboardingOwnsScreen
+      ? { panelData: undefined, panelWidth: 0 }
+      : buildPanelCompositeData(
+        panelManager,
+        input,
+        shellLayout.panel?.width ?? 0,
+        shellLayout.panel?.height ?? vHeight,
+      );
 
     compositor.composite({
       width, height,
-      header: headerLines,
+      header: shellHeaderLines,
       viewport,
-      footer: footerLines,
-      selection: {
+      footer: shellFooterLines,
+      selection: onboardingOwnsScreen ? undefined : {
         isCellSelected: (col, row) => selection.isCellSelected(col, row),
         scrollTop,
         lineCount: conversation.history.getLineCount(),
       },
-      search: input.searchManager.active ? {
+      search: !onboardingOwnsScreen && input.searchManager.active ? {
         manager: input.searchManager,
         scrollTop,
-        viewportStartY: 2,
+        viewportStartY: shellHeaderLines.length,
       } : undefined,
       panel: panelComposite.panelData,
       panelWidth: panelComposite.panelWidth,
@@ -674,15 +682,6 @@ async function main() {
     render,
   });
 
-  applyInitialTuiCliState({
-    cli,
-    input,
-    commandRegistry,
-    commandContext,
-    shellPaths: ctx.services.shellPaths,
-    render,
-  });
-
   // --- Streaming speed + tool preview wiring ---
   const refreshGit = () => gitStatusProvider.refresh().then((info) => { lastGitInfoRef.value = info; render(); }).catch(() => { /* non-fatal */ });
   // Refresh git status after each turn completes or after tool results arrive
@@ -728,6 +727,15 @@ async function main() {
   stdin.setEncoding('utf8');
   stdout.write((cli.flags.noAltScreen ? '' : ALT_SCREEN_ENTER) + CLEAR_SCREEN + CURSOR_HIDE + MOUSE_ENABLE + KEYBOARD_EXT_ENABLE + PASTE_ENABLE);
 
+  applyInitialTuiCliState({
+    cli,
+    input,
+    commandRegistry,
+    commandContext,
+    shellPaths: ctx.services.shellPaths,
+    render,
+  });
+
   stdin.on('data', (data: string) => {
     const blocking = handleBlockingShellInput({
       data,

package/src/renderer/compositor.ts

@@ -86,11 +86,11 @@ export class Compositor {
     const leftWidth = hasPanel ? Math.max(1, width - panelWidth - 1) : width;
     const sepX = hasPanel ? leftWidth : -1;
 
-    // 1. Draw Header (Rows 0-1) — always full width
+    // 1. Draw Header — always full width
     header.forEach((line, i) => newBuffer.blitLine(i, line));
 
-    // 2. Draw Viewport (Starting at Row 2)
-    const viewportStartY = 2;
+    // 2. Draw Viewport directly after the supplied header.
+    const viewportStartY = header.length;
     const vHeight = Math.max(0, height - header.length - footer.length);
 
     // Calculate the offset for bottom-anchored short history