Clarify AppHost/App naming

benchmarks/highlight-prefetch.ts

@@ -5,7 +5,7 @@ import React from "react";
 import { testRender } from "@opentui/react/test-utils";
 import { parseDiffFromFile } from "@pierre/diffs";
 import { act } from "react";
-import { App } from "../src/ui/App";
+import { AppHost } from "../src/ui/App";
 import type { AppBootstrap, DiffFile } from "../src/core/types";
 
 function createDiffFile(index: number, marker: string): DiffFile {
@@ -94,7 +94,7 @@ function frameHasHighlightedMarker(
   });
 }
 
-const setup = await testRender(React.createElement(App, { bootstrap: createBootstrap() }), {
+const setup = await testRender(React.createElement(AppHost, { bootstrap: createBootstrap() }), {
   width: 240,
   height: 24,
 });

benchmarks/large-stream.ts

@@ -4,7 +4,7 @@ import { performance } from "perf_hooks";
 import React from "react";
 import { testRender } from "@opentui/react/test-utils";
 import { act } from "react";
-import { App } from "../src/ui/App";
+import { AppHost } from "../src/ui/App";
 import {
   createLargeSplitStreamBootstrap,
   DEFAULT_FILE_COUNT,
@@ -69,7 +69,7 @@ async function destroyRenderer(setup: BenchmarkRenderer) {
 
 async function measureFirstFrameMs(notesPerFile: number) {
   const setup = await testRender(
-    React.createElement(App, {
+    React.createElement(AppHost, {
       bootstrap: createLargeSplitStreamBootstrap({ notesPerFile }),
     }),
     VIEWPORT,
@@ -87,7 +87,7 @@ async function measureFirstFrameMs(notesPerFile: number) {
 
 async function measureScrollTicksMs(notesPerFile: number) {
   const setup = await testRender(
-    React.createElement(App, {
+    React.createElement(AppHost, {
       bootstrap: createLargeSplitStreamBootstrap({ notesPerFile }),
     }),
     VIEWPORT,

src/main.tsx

@@ -7,7 +7,7 @@ import { pagePlainText } from "./core/pager";
 import { shutdownSession } from "./core/shutdown";
 import { prepareStartupPlan } from "./core/startup";
 import { resolveStartupUpdateNotice } from "./core/updateNotice";
-import { App } from "./ui/App";
+import { AppHost } from "./ui/App";
 import { HunkHostClient } from "./mcp/client";
 import { serveHunkMcpServer } from "./mcp/server";
 import { createInitialSessionSnapshot, createSessionRegistration } from "./mcp/sessionRegistration";
@@ -74,7 +74,7 @@ async function main() {
 
   // The app owns the full alternate screen session from this point on.
   root.render(
-    <App
+    <AppHost
       bootstrap={bootstrap}
       hostClient={hostClient}
       onQuit={shutdown}

src/ui/App.tsx

@@ -58,7 +58,7 @@ function clamp(value: number, min: number, max: number) {
   return Math.min(Math.max(value, min), max);
 }
 
-/** Preserve the active shell view settings when rebuilding the current input. */
+/** Preserve the active app view settings when rebuilding the current input. */
 function withCurrentViewOptions(
   input: CliInput,
   view: {
@@ -85,7 +85,7 @@ function withCurrentViewOptions(
 }
 
 /** Orchestrate global app state, layout, navigation, and pane coordination. */
-function AppShell({
+function App({
   bootstrap,
   hostClient,
   noticeText,
@@ -98,7 +98,7 @@ function AppShell({
   onQuit?: () => void;
   onReloadSession: (
     nextInput: CliInput,
-    options?: { resetShell?: boolean; sourcePath?: string },
+    options?: { resetApp?: boolean; sourcePath?: string },
   ) => Promise<ReloadedSessionResult>;
 }) {
   const FILES_MIN_WIDTH = 22;
@@ -227,7 +227,7 @@ function AppShell({
   }, [maxFilesPaneWidth, showFilesPane]);
 
   useEffect(() => {
-    // Force an intermediate redraw when shell geometry or row-wrapping changes so pane relayout
+    // Force an intermediate redraw when app geometry or row-wrapping changes so pane relayout
     // feels immediate after toggling split/stack or line wrapping.
     renderer.intermediateRender();
   }, [renderer, resolvedLayout, showFilesPane, terminal.height, terminal.width, wrapLines]);
@@ -353,7 +353,7 @@ function AppShell({
     setWrapLines((current) => !current);
   };
 
-  /** Toggle the sidebar, forcing it open on narrower layouts when the shell can still fit both panes. */
+  /** Toggle the sidebar, forcing it open on narrower layouts when the app can still fit both panes. */
   const toggleSidebar = () => {
     if (sidebarVisible && (responsiveLayout.showFilesPane || forceSidebarOpen)) {
       setSidebarVisible(false);
@@ -385,7 +385,7 @@ function AppShell({
   const canRefreshCurrentInput = canReloadInput(bootstrap.input);
   const watchEnabled = Boolean(bootstrap.input.options.watch && canRefreshCurrentInput);
 
-  /** Rebuild the current diff source while preserving the active shell view options. */
+  /** Rebuild the current diff source while preserving the active app view options. */
   const refreshCurrentInput = useCallback(async () => {
     if (!canRefreshCurrentInput) {
       return;
@@ -400,7 +400,7 @@ function AppShell({
       wrapLines,
     });
 
-    await onReloadSession(nextInput, { resetShell: false });
+    await onReloadSession(nextInput, { resetApp: false });
   }, [
     bootstrap.input,
     canRefreshCurrentInput,
@@ -470,7 +470,7 @@ function AppShell({
     };
   }, [bootstrap.input, refreshCurrentInput, watchEnabled]);
 
-  /** Leave the app through the shell-owned shutdown path. */
+  /** Leave the app through the shared shutdown path. */
   const requestQuit = useCallback(() => {
     onQuit();
   }, [onQuit]);
@@ -1045,8 +1045,8 @@ function AppShell({
   );
 }
 
-/** Keep one live Hunk window mounted while allowing daemon-driven session reloads. */
-export function App({
+/** Keep one live Hunk app mounted while allowing daemon-driven session reloads. */
+export function AppHost({
   bootstrap,
   hostClient,
   onQuit = () => process.exit(0),
@@ -1058,14 +1058,14 @@ export function App({
   startupNoticeResolver?: () => Promise<UpdateNotice | null>;
 }) {
   const [activeBootstrap, setActiveBootstrap] = useState(bootstrap);
-  const [shellVersion, setShellVersion] = useState(0);
+  const [appVersion, setAppVersion] = useState(0);
   const startupNoticeText = useStartupUpdateNotice({
     enabled: !bootstrap.input.options.pager,
     resolver: startupNoticeResolver,
   });
 
   const reloadSession = useCallback(
-    async (nextInput: CliInput, options?: { resetShell?: boolean; sourcePath?: string }) => {
+    async (nextInput: CliInput, options?: { resetApp?: boolean; sourcePath?: string }) => {
       const runtimeInput = resolveRuntimeCliInput(nextInput);
       const configuredInput = resolveConfiguredCliInput(runtimeInput, {
         cwd: options?.sourcePath,
@@ -1086,8 +1086,8 @@ export function App({
       }
 
       setActiveBootstrap(nextBootstrap);
-      if (options?.resetShell !== false) {
-        setShellVersion((current) => current + 1);
+      if (options?.resetApp !== false) {
+        setAppVersion((current) => current + 1);
       }
 
       return {
@@ -1104,8 +1104,8 @@ export function App({
   );
 
   return (
-    <AppShell
-      key={shellVersion}
+    <App
+      key={appVersion}
       bootstrap={activeBootstrap}
       hostClient={hostClient}
       noticeText={startupNoticeText}

src/ui/components/chrome/ModalFrame.tsx

@@ -3,7 +3,7 @@ import type { ReactNode } from "react";
 import { fitText, padText } from "../../lib/text";
 import type { AppTheme } from "../../themes";
 
-/** Render a centered framed modal shell that other dialogs can reuse. */
+/** Render a centered framed modal container that other dialogs can reuse. */
 export function ModalFrame({
   children,
   height,

src/ui/hooks/useHunkSessionBridge.ts

@@ -39,7 +39,7 @@ export function useHunkSessionBridge({
   openAgentNotes: () => void;
   reloadSession: (
     nextInput: CliInput,
-    options?: { resetShell?: boolean; sourcePath?: string },
+    options?: { resetApp?: boolean; sourcePath?: string },
   ) => Promise<ReloadedSessionResult>;
   selectedFile: DiffFile | undefined;
   selectedHunkIndex: number;

src/ui/lib/appMenus.ts

@@ -29,7 +29,7 @@ export interface BuildAppMenusOptions {
   wrapLines: boolean;
 }
 
-/** Build the top-level app menus from the current shell state and actions. */
+/** Build the top-level app menus from the current app state and actions. */
 export function buildAppMenus({
   activeThemeId,
   canRefreshCurrentInput,

src/ui/lib/files.ts

@@ -53,7 +53,7 @@ export function mergeFileAnnotationsByFileId<T extends AgentAnnotation>(
   });
 }
 
-/** Apply the shell's file filter query to the visible review stream. */
+/** Apply the app's file filter query to the visible review stream. */
 export function filterReviewFiles(files: DiffFile[], query: string): DiffFile[] {
   const trimmedQuery = query.trim().toLowerCase();
   if (!trimmedQuery) {

src/ui/lib/responsive.ts

@@ -11,7 +11,7 @@ export interface ResponsiveLayout {
   showFilesPane: boolean;
 }
 
-/** Bucket terminal widths into the viewport classes the shell layout cares about. */
+/** Bucket terminal widths into the viewport classes the app layout cares about. */
 function resolveResponsiveViewport(viewportWidth: number): ResponsiveViewport {
   if (viewportWidth >= FULL_VIEWPORT_MIN_WIDTH) {
     return "full";

src/ui/lib/sidebar.ts

@@ -1,4 +1,4 @@
-/** Clamp a dragged sidebar width into the shell's allowed range. */
+/** Clamp a dragged sidebar width into the app layout's allowed range. */
 export function resizeSidebarWidth(
   startWidth: number,
   dragOriginX: number,