From bfd680490fbe9ddcd193428b5f9e234d2e580134 Mon Sep 17 00:00:00 2001
From: Yunfei He <i.heyunfei@gmail.com>
Date: Sat, 30 May 2026 23:32:22 +0800
Subject: [PATCH] refactor(runtime)!: rename useAppContext() to useApp() (full
 Ink alignment) (#73)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#69 added `useAppContext()` as a Vue-native rename of Ink's `useApp()`,
qualified to avoid reading as the Vue application instance. On reflection the
"Context" suffix borrowed the name of an internal grab-bag context and slightly
mislabels the hook — it returns app lifecycle controls, not that context. The
collision worry doesn't hold up: Vue has no `useApp()`, the returned
`{ exit, waitUntilRenderFlush }` is clearly not the Vue app instance, and "App"
in vue-tui already means the `TuiApp` from `createApp()`.

Rename to `useApp()` for full Ink fidelity (same name + same shape), and drop
the now-defunct "App composable" entry from ink-divergences.md — it ceases to
be a divergence.

Internal context cleanup (the grab-bag `AppContext` + the `StdinContext`
duplication) is intentionally out of scope here, tracked separately.

BREAKING CHANGE: `useAppContext()` is renamed to `useApp()`. Replace
`const { exit } = useAppContext()` with `const { exit } = useApp()`.

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
---
 .agents/docs/ink-divergences.md               | 10 -----
 README.md                                     | 12 ++---
 examples/coding-agent/src/App.vue             |  4 +-
 examples/flappy-bird/src/App.vue              |  4 +-
 .../lifecycle/error-handling.test.tsx         |  8 ++--
 .../integration/lifecycle/exit.test.tsx       | 44 +++++++++----------
 .../integration/lifecycle/wait-flush.test.tsx | 16 +++----
 ...exit-on-exit-with-error-value-property.tsx |  4 +-
 .../pty/fixtures/exit-on-exit-with-error.tsx  |  4 +-
 .../pty/fixtures/exit-on-exit-with-result.tsx |  4 +-
 .../exit-on-exit-with-value-object.tsx        |  4 +-
 .../integration/pty/fixtures/exit-on-exit.tsx |  4 +-
 .../fixtures/exit-raw-on-exit-with-error.tsx  |  4 +-
 .../pty/fixtures/exit-raw-on-exit.tsx         |  4 +-
 .../pty/fixtures/exit-with-static.tsx         |  4 +-
 .../fixtures/fullscreen-no-extra-newline.tsx  |  4 +-
 .../pty/fixtures/issue-442-full-height.tsx    |  4 +-
 .../fixtures/issue-450-fixture-helpers.tsx    |  6 +--
 .../use-animation-interactive-false-exit.tsx  |  4 +-
 .../use-animation-non-interactive-exit.tsx    |  4 +-
 .../pty/fixtures/use-input-ctrl-c.tsx         |  4 +-
 .../fixtures/use-input-discrete-priority.tsx  |  4 +-
 .../pty/fixtures/use-input-kitty.tsx          |  4 +-
 .../pty/fixtures/use-input-many.tsx           |  4 +-
 .../pty/fixtures/use-input-multiple.tsx       |  4 +-
 .../integration/pty/fixtures/use-input.tsx    |  4 +-
 .../integration/pty/fixtures/use-paste.tsx    |  6 +--
 .../integration/pty/fixtures/use-stdout.tsx   |  4 +-
 .../integration/public-api.test.ts            |  2 +-
 .../integration/render-to-string.test.tsx     |  6 +--
 packages/runtime/README.md                    |  2 +-
 packages/runtime/src/composables/useApp.ts    | 23 ++++++++++
 .../runtime/src/composables/useAppContext.ts  | 27 ------------
 packages/runtime/src/index.ts                 |  2 +-
 packages/runtime/src/render-to-string.ts      |  2 +-
 packages/runtime/src/render.ts                |  6 +--
 36 files changed, 121 insertions(+), 135 deletions(-)
 create mode 100644 packages/runtime/src/composables/useApp.ts
 delete mode 100644 packages/runtime/src/composables/useAppContext.ts

diff --git a/.agents/docs/ink-divergences.md b/.agents/docs/ink-divergences.md
index 5b7556d..1af8141 100644
--- a/.agents/docs/ink-divergences.md
+++ b/.agents/docs/ink-divergences.md
@@ -31,16 +31,6 @@ deliberate. Divergences fall into a few kinds:
 - **Why:** mirrors Vue's own `createApp` mental model — a Vue developer expects an app
   object they mount, not a one-shot render call.
 
-### App composable — `useAppContext()` instead of `useApp()`
-
-- **Ink:** `useApp()` returns `{ exit, waitUntilRenderFlush }` — stdin/stdout/stderr are
-  separate hooks (`useStdin`/`useStdout`/`useStderr`), not part of it.
-- **vue-tui:** `useAppContext()` returns the same `{ exit, waitUntilRenderFlush }`, with
-  streams on those same peer composables.
-- **Why:** only the name differs — `useApp` reads as "the Vue application instance"
-  (`createApp`, `app.mount`), so vue-tui qualifies it as `useAppContext`. The shape is
-  identical to Ink; a naming divergence, not a surface one.
-
 ### Named type / prop re-exports
 
 - **Ink:** re-exports its component prop types plus a few data/handle types:
diff --git a/README.md b/README.md
index b727872..ca1d5e1 100644
--- a/README.md
+++ b/README.md
@@ -83,11 +83,11 @@ useInput((input) => {
 
 ## Packages
 
-| Package                                                              | Description                                                                                                                                                                                      |
-| -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| [`@vue-tui/runtime`](https://www.npmjs.com/package/@vue-tui/runtime) | The core framework — Vue 3 renderer for the terminal with components (`Box`, `Text`, `Static`, etc.), composables (`useInput`, `useFocus`, `useAppContext`, etc.), and yoga-based flexbox layout |
-| [`@vue-tui/cli`](https://www.npmjs.com/package/@vue-tui/cli)         | Development tool — `vue-tui dev` starts your app with Vite-powered HMR                                                                                                                           |
-| [`@vue-tui/testing`](https://www.npmjs.com/package/@vue-tui/testing) | Test harness — render in an isolated fake terminal, simulate input, assert output frame by frame                                                                                                 |
+| Package                                                              | Description                                                                                                                                                                               |
+| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [`@vue-tui/runtime`](https://www.npmjs.com/package/@vue-tui/runtime) | The core framework — Vue 3 renderer for the terminal with components (`Box`, `Text`, `Static`, etc.), composables (`useInput`, `useFocus`, `useApp`, etc.), and yoga-based flexbox layout |
+| [`@vue-tui/cli`](https://www.npmjs.com/package/@vue-tui/cli)         | Development tool — `vue-tui dev` starts your app with Vite-powered HMR                                                                                                                    |
+| [`@vue-tui/testing`](https://www.npmjs.com/package/@vue-tui/testing) | Test harness — render in an isolated fake terminal, simulate input, assert output frame by frame                                                                                          |
 
 ## Examples
 
@@ -116,7 +116,7 @@ useInput((input) => {
 | `useInput(handler, opts?)` | Handle keyboard input — receives `(input, key)` with modifier and arrow key detection |
 | `useFocus(opts?)`          | Component-level focus — returns `{ isFocused, focus }`                                |
 | `useFocusManager()`        | App-level focus control — `focusNext()`, `focusPrevious()`, `focus(id)`               |
-| `useAppContext()`          | App context — `{ exit(error?), waitUntilRenderFlush() }`                              |
+| `useApp()`                 | App lifecycle — `{ exit(error?), waitUntilRenderFlush() }`                            |
 | `useTerminalSize()`        | Reactive terminal dimensions — `{ columns, rows }`                                    |
 | `useStdin()`               | Access stdin stream and raw mode control                                              |
 | `useStdout()`              | Write directly to stdout                                                              |
diff --git a/examples/coding-agent/src/App.vue b/examples/coding-agent/src/App.vue
index b4a7c76..80c95aa 100644
--- a/examples/coding-agent/src/App.vue
+++ b/examples/coding-agent/src/App.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { shallowRef } from "vue";
-import { Box, Text, Static, useInput, useAppContext } from "@vue-tui/runtime";
+import { Box, Text, Static, useInput, useApp } from "@vue-tui/runtime";
 import { runAgentLoop, type Message, type ToolCall } from "./agent";
 import MessageList from "./components/MessageList.vue";
 
@@ -14,7 +14,7 @@ const pendingCommand = shallowRef("");
 const messages: Message[] = [];
 
 let approvalResolve: ((approved: boolean) => void) | null = null;
-const { exit } = useAppContext();
+const { exit } = useApp();
 
 const autoApprove = process.argv.includes("--yolo");
 
diff --git a/examples/flappy-bird/src/App.vue b/examples/flappy-bird/src/App.vue
index d68c63a..fb3a149 100644
--- a/examples/flappy-bird/src/App.vue
+++ b/examples/flappy-bird/src/App.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onScopeDispose, reactive } from "vue";
 import chalk from "chalk";
-import { Box, Text, useAppContext, useInput } from "@vue-tui/runtime";
+import { Box, Text, useApp, useInput } from "@vue-tui/runtime";
 
 // --- world dimensions ----------------------------------------------------
 
@@ -130,7 +130,7 @@ function renderFrame(w: World): string[] {
 
 // --- component -----------------------------------------------------------
 
-const { exit } = useAppContext();
+const { exit } = useApp();
 const world = reactive<World>(makeWorld(0));
 
 function flap(): void {
diff --git a/packages/runtime-tests/integration/lifecycle/error-handling.test.tsx b/packages/runtime-tests/integration/lifecycle/error-handling.test.tsx
index d717c19..6af23fa 100644
--- a/packages/runtime-tests/integration/lifecycle/error-handling.test.tsx
+++ b/packages/runtime-tests/integration/lifecycle/error-handling.test.tsx
@@ -1,7 +1,7 @@
 import { defineComponent, nextTick, shallowRef } from "vue";
 import { expect, test } from "vite-plus/test";
 import { render } from "@vue-tui/testing";
-import { Box, Text, useAppContext } from "@vue-tui/runtime";
+import { Box, Text, useApp } from "@vue-tui/runtime";
 
 test("setup() throw rejects render()", async () => {
   const Boom = defineComponent(() => {
@@ -32,20 +32,20 @@ test("render-time throw does not prevent unmount", async () => {
   expect(() => unmount()).not.toThrow();
 });
 
-test("useAppContext() called with error rejects waitUntilExit", async () => {
+test("useApp() called with error rejects waitUntilExit", async () => {
   // Mirrors Ink's "exit on exit() with error" fixture test, adapted for
   // render-based testing. Verifies exit(err) rejects the promise cleanly.
   // Also covered by exit.test.tsx "exit(error) rejects waitUntilExit with the error".
   let exitFn!: (err?: Error) => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>running</Text>;
   });
 
   const { waitUntilExit } = await render(App);
 
-  const err = new Error("errored via useAppContext");
+  const err = new Error("errored via useApp");
   exitFn(err);
 
   await expect(waitUntilExit()).rejects.toBe(err);
diff --git a/packages/runtime-tests/integration/lifecycle/exit.test.tsx b/packages/runtime-tests/integration/lifecycle/exit.test.tsx
index a80876c..71dcb1d 100644
--- a/packages/runtime-tests/integration/lifecycle/exit.test.tsx
+++ b/packages/runtime-tests/integration/lifecycle/exit.test.tsx
@@ -2,15 +2,15 @@ import { Writable } from "node:stream";
 import { defineComponent, onMounted, onScopeDispose } from "vue";
 import { expect, test } from "vite-plus/test";
 import { render } from "@vue-tui/testing";
-import { createApp, Text, useAppContext } from "@vue-tui/runtime";
+import { createApp, Text, useApp } from "@vue-tui/runtime";
 import { makeFakeWritable, makeFakeStdin, isWriteBarrierChunk } from "./test-streams.ts";
 
-test("useAppContext() triggers teardown and waitUntilExit resolves", async () => {
+test("useApp() triggers teardown and waitUntilExit resolves", async () => {
   let exitFn!: () => void;
   let disposed = false;
 
   const App = defineComponent(() => {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
     exitFn = exit;
     onScopeDispose(() => {
       disposed = true;
@@ -30,7 +30,7 @@ test("exit(error) rejects waitUntilExit with the error", async () => {
   let exitFn!: (err: Error) => void;
 
   const App = defineComponent(() => {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
     exitFn = exit;
     return () => <Text>x</Text>;
   });
@@ -56,7 +56,7 @@ test("unmount() after exit() is idempotent", async () => {
   let exitFn!: () => void;
 
   const App = defineComponent(() => {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
     exitFn = exit;
     return () => <Text>x</Text>;
   });
@@ -74,7 +74,7 @@ test("exit() called multiple times is idempotent", async () => {
   let exitFn!: () => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>x</Text>;
   });
 
@@ -89,7 +89,7 @@ test("waitUntilExit() resolves with result value passed to exit()", async () =>
   let exitFn!: (errorOrResult?: unknown) => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>hello from vue-tui</Text>;
   });
 
@@ -105,7 +105,7 @@ test("waitUntilExit() resolves with object result value", async () => {
   let exitFn!: (errorOrResult?: unknown) => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>hello</Text>;
   });
 
@@ -119,7 +119,7 @@ test("waitUntilExit() resolves with undefined when exit() called with no args",
   let exitFn!: (errorOrResult?: unknown) => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>hello</Text>;
   });
 
@@ -135,7 +135,7 @@ test("onScopeDispose fires when exit(error) is called", async () => {
   let disposed = false;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     onScopeDispose(() => {
       disposed = true;
     });
@@ -156,7 +156,7 @@ test("exit(error) followed by exit(value) still rejects", async () => {
   let exitFn!: (errorOrResult?: unknown) => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>hello</Text>;
   });
 
@@ -175,7 +175,7 @@ test("exit(value) resolves with the FIRST value when called rapidly twice", asyn
   let exitFn!: (errorOrResult?: unknown) => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>hello</Text>;
   });
 
@@ -194,7 +194,7 @@ test("exit(err1) then exit(err2) rejects with the FIRST error", async () => {
   let exitFn!: (errorOrResult?: unknown) => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>hello</Text>;
   });
 
@@ -215,7 +215,7 @@ test("exit(value) then exit(error) resolves with the FIRST value", async () => {
   let exitFn!: (errorOrResult?: unknown) => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>hello</Text>;
   });
 
@@ -230,7 +230,7 @@ test("exit(value) then exit(error) resolves with the FIRST value", async () => {
 test("exit('late') after app.unmount() is a no-op (unmount value wins)", async () => {
   // isUnmounting parity (Ink parity G33): app.unmount() runs teardown()+
   // resolveExit() without setting exitInitiated. A retained exit() (from
-  // useAppContext()) called AFTER unmount has started teardown must be a
+  // useApp()) called AFTER unmount has started teardown must be a
   // complete no-op — it must not
   // overwrite the resolved exit value. waitUntilExit resolves the original
   // unmount value (undefined), NOT 'late'. Without the teardownStarted guard in
@@ -239,7 +239,7 @@ test("exit('late') after app.unmount() is a no-op (unmount value wins)", async (
   let exitFn!: (errorOrResult?: unknown) => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>hello</Text>;
   });
 
@@ -253,7 +253,7 @@ test("exit('late') after app.unmount() is a no-op (unmount value wins)", async (
 
 test("retained exit() re-entered DURING unmount teardown writes is a no-op", async () => {
   // isUnmounting parity (Ink parity G33), faithful reentrancy: an exit() (from
-  // useAppContext()) captured during setup is invoked re-entrantly from inside the stdout write
+  // useApp()) captured during setup is invoked re-entrantly from inside the stdout write
   // that unmount()'s final commit performs. teardownStarted is already true at
   // that point, so exit("reentrant") is a complete no-op and the original
   // unmount value (undefined) wins. Without the teardownStarted guard the
@@ -279,7 +279,7 @@ test("retained exit() re-entered DURING unmount teardown writes is a no-op", asy
   stdout.isTTY = true;
 
   const App = defineComponent(() => {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
     onMounted(() => {
       exitFn = exit;
     });
@@ -307,7 +307,7 @@ test("single exit('x') resolves with 'x' (control)", async () => {
   let exitFn!: (errorOrResult?: unknown) => void;
 
   const App = defineComponent(() => {
-    exitFn = useAppContext().exit;
+    exitFn = useApp().exit;
     return () => <Text>hello</Text>;
   });
 
@@ -341,7 +341,7 @@ test("waitUntilExit resolves FIRST exit value when duplicate exits happen during
   stdout.columns = 100;
 
   const App = defineComponent(() => {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
     onMounted(() => {
       exit("first");
       setTimeout(() => exit("second"), 0);
@@ -389,7 +389,7 @@ test("waitUntilExit resolves FIRST exit value when exit is re-entered during unm
   stdout.isTTY = true;
 
   const App = defineComponent(() => {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
     onMounted(() => {
       exitFn = exit;
       shouldReenterExit = true;
@@ -438,7 +438,7 @@ test("exit with cross-realm Error resolves after stdout write callback", async (
   const foreignError = vm.runInNewContext("new Error('boom')") as Error;
 
   const App = defineComponent(() => {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
     onMounted(() => {
       setTimeout(() => exit(foreignError), 0);
     });
diff --git a/packages/runtime-tests/integration/lifecycle/wait-flush.test.tsx b/packages/runtime-tests/integration/lifecycle/wait-flush.test.tsx
index ef6f621..c83fee6 100644
--- a/packages/runtime-tests/integration/lifecycle/wait-flush.test.tsx
+++ b/packages/runtime-tests/integration/lifecycle/wait-flush.test.tsx
@@ -1,7 +1,7 @@
 import { defineComponent, nextTick, onMounted, shallowRef } from "vue";
 import { expect, test } from "vite-plus/test";
 import { render } from "@vue-tui/testing";
-import { createApp, Text, useAppContext } from "@vue-tui/runtime";
+import { createApp, Text, useApp } from "@vue-tui/runtime";
 import stripAnsi from "strip-ansi";
 import {
   makeFakeWritable,
@@ -229,7 +229,7 @@ test("waitUntilRenderFlush waits for unmount write callback", async () => {
 test("waitUntilRenderFlush resolves after exit with error", async () => {
   let exitFn!: (err: Error) => void;
   const App = defineComponent(() => {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
     onMounted(() => {
       exitFn = exit as (err: Error) => void;
     });
@@ -248,14 +248,14 @@ test("waitUntilRenderFlush resolves after exit with error", async () => {
   await app.waitUntilRenderFlush();
 });
 
-// useAppContext-level waitUntilRenderFlush tests (Ink parity, ported from Ink
+// useApp-level waitUntilRenderFlush tests (Ink parity, ported from Ink
 // render.tsx "useApp waitUntilRenderFlush …"): waitUntilRenderFlush is reachable
-// from INSIDE a component via useAppContext() — Ink's useApp() returns the same
+// from INSIDE a component via useApp() — Ink's useApp() returns the same
 // { exit, waitUntilRenderFlush } pair. Ink's third "queued in same effect tick"
 // test relies on React `concurrent: true` (concurrent mode is N/A in Vue — see
 // .agents/docs/ink-divergences.md), so only the first two are ported.
 
-test("useAppContext waitUntilRenderFlush resolves after the first frame write callback", async () => {
+test("useApp waitUntilRenderFlush resolves after the first frame write callback", async () => {
   let didInitialWriteCallbackFire = false;
   let didFlushResolve = false;
 
@@ -267,7 +267,7 @@ test("useAppContext waitUntilRenderFlush resolves after the first frame write ca
   });
 
   const App = defineComponent(() => {
-    const { exit, waitUntilRenderFlush } = useAppContext();
+    const { exit, waitUntilRenderFlush } = useApp();
     onMounted(() => {
       void (async () => {
         await waitUntilRenderFlush();
@@ -288,7 +288,7 @@ test("useAppContext waitUntilRenderFlush resolves after the first frame write ca
   expect(didFlushResolve).toBe(true);
 });
 
-test("useAppContext waitUntilRenderFlush waits for state update frame flush", async () => {
+test("useApp waitUntilRenderFlush waits for state update frame flush", async () => {
   let didWorldWriteCallbackFire = false;
   let didFlushResolve = false;
 
@@ -305,7 +305,7 @@ test("useAppContext waitUntilRenderFlush waits for state update frame flush", as
 
   const text = shallowRef("Hello");
   const App = defineComponent(() => {
-    const { exit, waitUntilRenderFlush } = useAppContext();
+    const { exit, waitUntilRenderFlush } = useApp();
     onMounted(() => {
       void (async () => {
         // Settle the initial "Hello" frame first (not delayed by the harness,
diff --git a/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-error-value-property.tsx b/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-error-value-property.tsx
index 6ebf455..8fc1046 100644
--- a/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-error-value-property.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-error-value-property.tsx
@@ -1,8 +1,8 @@
-import { createApp, Text, useAppContext } from "@vue-tui/runtime";
+import { createApp, Text, useApp } from "@vue-tui/runtime";
 import { defineComponent, onMounted } from "vue";
 
 const App = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   onMounted(() => {
     setTimeout(() => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-error.tsx b/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-error.tsx
index 3b3f479..d8cf70f 100644
--- a/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-error.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-error.tsx
@@ -1,9 +1,9 @@
-import { createApp, Text, useAppContext } from "@vue-tui/runtime";
+import { createApp, Text, useApp } from "@vue-tui/runtime";
 import { defineComponent, onMounted, onScopeDispose, shallowRef } from "vue";
 
 const App = defineComponent(() => {
   const counter = shallowRef(0);
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   onMounted(() => {
     setTimeout(() => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-result.tsx b/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-result.tsx
index 9f00b56..4702f64 100644
--- a/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-result.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-result.tsx
@@ -1,8 +1,8 @@
-import { createApp, Text, useAppContext } from "@vue-tui/runtime";
+import { createApp, Text, useApp } from "@vue-tui/runtime";
 import { defineComponent, onMounted } from "vue";
 
 const App = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   onMounted(() => {
     setTimeout(() => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-value-object.tsx b/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-value-object.tsx
index 842669d..c27e2a2 100644
--- a/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-value-object.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/exit-on-exit-with-value-object.tsx
@@ -1,8 +1,8 @@
-import { createApp, Text, useAppContext } from "@vue-tui/runtime";
+import { createApp, Text, useApp } from "@vue-tui/runtime";
 import { defineComponent, onMounted } from "vue";
 
 const App = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   onMounted(() => {
     setTimeout(() => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/exit-on-exit.tsx b/packages/runtime-tests/integration/pty/fixtures/exit-on-exit.tsx
index d2d6a62..ae470dd 100644
--- a/packages/runtime-tests/integration/pty/fixtures/exit-on-exit.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/exit-on-exit.tsx
@@ -1,9 +1,9 @@
-import { createApp, Text, useAppContext } from "@vue-tui/runtime";
+import { createApp, Text, useApp } from "@vue-tui/runtime";
 import { defineComponent, onMounted, onScopeDispose, shallowRef } from "vue";
 
 const App = defineComponent(() => {
   const counter = shallowRef(0);
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   onMounted(() => {
     setTimeout(exit, 500);
diff --git a/packages/runtime-tests/integration/pty/fixtures/exit-raw-on-exit-with-error.tsx b/packages/runtime-tests/integration/pty/fixtures/exit-raw-on-exit-with-error.tsx
index 5af67d7..ae5917c 100644
--- a/packages/runtime-tests/integration/pty/fixtures/exit-raw-on-exit-with-error.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/exit-raw-on-exit-with-error.tsx
@@ -1,8 +1,8 @@
-import { createApp, Text, useAppContext, useStdin } from "@vue-tui/runtime";
+import { createApp, Text, useApp, useStdin } from "@vue-tui/runtime";
 import { defineComponent, onMounted } from "vue";
 
 const App = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
   const { setRawMode } = useStdin();
 
   onMounted(() => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/exit-raw-on-exit.tsx b/packages/runtime-tests/integration/pty/fixtures/exit-raw-on-exit.tsx
index 391c722..5f34008 100644
--- a/packages/runtime-tests/integration/pty/fixtures/exit-raw-on-exit.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/exit-raw-on-exit.tsx
@@ -1,8 +1,8 @@
-import { createApp, Text, useAppContext, useStdin } from "@vue-tui/runtime";
+import { createApp, Text, useApp, useStdin } from "@vue-tui/runtime";
 import { defineComponent, onMounted } from "vue";
 
 const App = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
   const { setRawMode } = useStdin();
 
   onMounted(() => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/exit-with-static.tsx b/packages/runtime-tests/integration/pty/fixtures/exit-with-static.tsx
index 1e8198a..713956b 100644
--- a/packages/runtime-tests/integration/pty/fixtures/exit-with-static.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/exit-with-static.tsx
@@ -1,8 +1,8 @@
-import { createApp, Static, Text, useAppContext } from "@vue-tui/runtime";
+import { createApp, Static, Text, useApp } from "@vue-tui/runtime";
 import { defineComponent, onMounted } from "vue";
 
 const App = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   onMounted(() => {
     exit(new Error("errored"));
diff --git a/packages/runtime-tests/integration/pty/fixtures/fullscreen-no-extra-newline.tsx b/packages/runtime-tests/integration/pty/fixtures/fullscreen-no-extra-newline.tsx
index fed89b3..ef86544 100644
--- a/packages/runtime-tests/integration/pty/fixtures/fullscreen-no-extra-newline.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/fullscreen-no-extra-newline.tsx
@@ -1,9 +1,9 @@
 import process from "node:process";
-import { Box, Text, createApp, useAppContext } from "@vue-tui/runtime";
+import { Box, Text, createApp, useApp } from "@vue-tui/runtime";
 import { defineComponent, h, onMounted, onScopeDispose } from "vue";
 
 const Fullscreen = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   onMounted(() => {
     const timer = setTimeout(() => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/issue-442-full-height.tsx b/packages/runtime-tests/integration/pty/fixtures/issue-442-full-height.tsx
index 072c4d6..42514a1 100644
--- a/packages/runtime-tests/integration/pty/fixtures/issue-442-full-height.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/issue-442-full-height.tsx
@@ -1,9 +1,9 @@
 import process from "node:process";
-import { Box, Text, createApp, useAppContext } from "@vue-tui/runtime";
+import { Box, Text, createApp, useApp } from "@vue-tui/runtime";
 import { defineComponent, h, onMounted, onScopeDispose } from "vue";
 
 const App = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   onMounted(() => {
     const timer = setTimeout(() => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/issue-450-fixture-helpers.tsx b/packages/runtime-tests/integration/pty/fixtures/issue-450-fixture-helpers.tsx
index fe59628..09c3c00 100644
--- a/packages/runtime-tests/integration/pty/fixtures/issue-450-fixture-helpers.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/issue-450-fixture-helpers.tsx
@@ -1,5 +1,5 @@
 import process from "node:process";
-import { Box, Static, Text, createApp, useAppContext } from "@vue-tui/runtime";
+import { Box, Static, Text, createApp, useApp } from "@vue-tui/runtime";
 import { Fragment, defineComponent, h, onMounted, onScopeDispose, shallowRef, watch } from "vue";
 
 type RerenderFixtureOptions = {
@@ -18,7 +18,7 @@ const Issue450RerenderFixtureComponent = defineComponent(
     heightForFrame: (rows: number, frameCount: number) => number;
     rows: number;
   }) => {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
     const frameCount = shallowRef(0);
     let timer: ReturnType<typeof setTimeout> | undefined;
 
@@ -102,7 +102,7 @@ type InitialFixtureOptions = {
 
 const Issue450InitialFixtureComponent = defineComponent(
   (props: { renderedMarker: string; lineCount: number; linePrefix: string }) => {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
 
     onMounted(() => {
       const timer = setTimeout(() => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/use-animation-interactive-false-exit.tsx b/packages/runtime-tests/integration/pty/fixtures/use-animation-interactive-false-exit.tsx
index 854f553..53bf36c 100644
--- a/packages/runtime-tests/integration/pty/fixtures/use-animation-interactive-false-exit.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/use-animation-interactive-false-exit.tsx
@@ -1,9 +1,9 @@
-import { Text, createApp, useAnimation, useAppContext } from "@vue-tui/runtime";
+import { Text, createApp, useAnimation, useApp } from "@vue-tui/runtime";
 import { defineComponent, h, watch } from "vue";
 
 const Spinner = defineComponent(() => {
   const { frame } = useAnimation({ interval: 8 });
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   watch(frame, (value) => {
     if (value >= 3) {
diff --git a/packages/runtime-tests/integration/pty/fixtures/use-animation-non-interactive-exit.tsx b/packages/runtime-tests/integration/pty/fixtures/use-animation-non-interactive-exit.tsx
index 897bd98..0088cb8 100644
--- a/packages/runtime-tests/integration/pty/fixtures/use-animation-non-interactive-exit.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/use-animation-non-interactive-exit.tsx
@@ -1,9 +1,9 @@
-import { Text, createApp, useAnimation, useAppContext } from "@vue-tui/runtime";
+import { Text, createApp, useAnimation, useApp } from "@vue-tui/runtime";
 import { defineComponent, h, watch } from "vue";
 
 const Spinner = defineComponent(() => {
   const { frame } = useAnimation({ interval: 8 });
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   watch(frame, (value) => {
     if (value >= 3) {
diff --git a/packages/runtime-tests/integration/pty/fixtures/use-input-ctrl-c.tsx b/packages/runtime-tests/integration/pty/fixtures/use-input-ctrl-c.tsx
index b9e9a49..a08315f 100644
--- a/packages/runtime-tests/integration/pty/fixtures/use-input-ctrl-c.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/use-input-ctrl-c.tsx
@@ -1,9 +1,9 @@
 import process from "node:process";
-import { createApp, useInput, useAppContext } from "@vue-tui/runtime";
+import { createApp, useInput, useApp } from "@vue-tui/runtime";
 import { defineComponent, onMounted } from "vue";
 
 const UserInput = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   useInput((input, key) => {
     if (input === "c" && key.ctrl) {
diff --git a/packages/runtime-tests/integration/pty/fixtures/use-input-discrete-priority.tsx b/packages/runtime-tests/integration/pty/fixtures/use-input-discrete-priority.tsx
index 8e249c4..42daf5f 100644
--- a/packages/runtime-tests/integration/pty/fixtures/use-input-discrete-priority.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/use-input-discrete-priority.tsx
@@ -1,5 +1,5 @@
 import process from "node:process";
-import { createApp, Box, Text, useInput, useAppContext } from "@vue-tui/runtime";
+import { createApp, Box, Text, useInput, useApp } from "@vue-tui/runtime";
 import { computed, defineComponent, h, onMounted, shallowRef, watch } from "vue";
 
 /**
@@ -11,7 +11,7 @@ import { computed, defineComponent, h, onMounted, shallowRef, watch } from "vue"
  * processed before the deferred state catches up.
  */
 const App = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
   const query = shallowRef("abcde");
   const deferredQuery = shallowRef("abcde");
   let done = false;
diff --git a/packages/runtime-tests/integration/pty/fixtures/use-input-kitty.tsx b/packages/runtime-tests/integration/pty/fixtures/use-input-kitty.tsx
index 3cfa15e..8aba171 100644
--- a/packages/runtime-tests/integration/pty/fixtures/use-input-kitty.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/use-input-kitty.tsx
@@ -1,5 +1,5 @@
 import process from "node:process";
-import { createApp, useInput, useAppContext } from "@vue-tui/runtime";
+import { createApp, useInput, useApp } from "@vue-tui/runtime";
 import { defineComponent, onMounted } from "vue";
 
 const KittyInput = defineComponent({
@@ -7,7 +7,7 @@ const KittyInput = defineComponent({
     test: { type: String, default: undefined },
   },
   setup(props) {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
 
     onMounted(() => {
       process.stdout.write("__READY__");
diff --git a/packages/runtime-tests/integration/pty/fixtures/use-input-many.tsx b/packages/runtime-tests/integration/pty/fixtures/use-input-many.tsx
index c04581d..79191ea 100644
--- a/packages/runtime-tests/integration/pty/fixtures/use-input-many.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/use-input-many.tsx
@@ -1,5 +1,5 @@
 import process from "node:process";
-import { createApp, Text, useInput, useAppContext } from "@vue-tui/runtime";
+import { createApp, Text, useInput, useApp } from "@vue-tui/runtime";
 import { defineComponent, h, onMounted } from "vue";
 
 // Detect MaxListenersExceededWarning
@@ -15,7 +15,7 @@ const InputHandler = defineComponent(() => {
 });
 
 const App = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   onMounted(() => {
     setTimeout(exit, 100);
diff --git a/packages/runtime-tests/integration/pty/fixtures/use-input-multiple.tsx b/packages/runtime-tests/integration/pty/fixtures/use-input-multiple.tsx
index a9f106a..c9f1830 100644
--- a/packages/runtime-tests/integration/pty/fixtures/use-input-multiple.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/use-input-multiple.tsx
@@ -1,9 +1,9 @@
 import process from "node:process";
-import { createApp, Text, useInput, useAppContext } from "@vue-tui/runtime";
+import { createApp, Text, useInput, useApp } from "@vue-tui/runtime";
 import { defineComponent, h, onMounted, shallowRef } from "vue";
 
 const App = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
   const input = shallowRef("");
 
   const handleInput = (char: string) => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/use-input.tsx b/packages/runtime-tests/integration/pty/fixtures/use-input.tsx
index 761afc1..2c7153c 100644
--- a/packages/runtime-tests/integration/pty/fixtures/use-input.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/use-input.tsx
@@ -1,5 +1,5 @@
 import process from "node:process";
-import { createApp, useInput, useAppContext } from "@vue-tui/runtime";
+import { createApp, useInput, useApp } from "@vue-tui/runtime";
 import { defineComponent, onMounted } from "vue";
 
 const UserInput = defineComponent({
@@ -7,7 +7,7 @@ const UserInput = defineComponent({
     test: { type: String, default: undefined },
   },
   setup(props) {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
     let rapidDownArrowCount = 0;
     let rapidTimeout: ReturnType<typeof setTimeout> | undefined;
 
diff --git a/packages/runtime-tests/integration/pty/fixtures/use-paste.tsx b/packages/runtime-tests/integration/pty/fixtures/use-paste.tsx
index 18f3ed5..f630b81 100644
--- a/packages/runtime-tests/integration/pty/fixtures/use-paste.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/use-paste.tsx
@@ -1,5 +1,5 @@
 import process from "node:process";
-import { createApp, useAppContext, useInput, usePaste } from "@vue-tui/runtime";
+import { createApp, useApp, useInput, usePaste } from "@vue-tui/runtime";
 import { defineComponent, onMounted } from "vue";
 
 const PasteDemo = defineComponent({
@@ -7,7 +7,7 @@ const PasteDemo = defineComponent({
     test: { type: String, default: undefined },
   },
   setup(props) {
-    const { exit } = useAppContext();
+    const { exit } = useApp();
 
     usePaste((text) => {
       if (props.test === "basic" && text === "hello world") {
@@ -41,7 +41,7 @@ const PasteDemo = defineComponent({
 });
 
 const MultipleHooksDemo = defineComponent(() => {
-  const { exit } = useAppContext();
+  const { exit } = useApp();
   let receivedCount = 0;
 
   const onPaste = (text: string) => {
diff --git a/packages/runtime-tests/integration/pty/fixtures/use-stdout.tsx b/packages/runtime-tests/integration/pty/fixtures/use-stdout.tsx
index 83cf939..97a4a08 100644
--- a/packages/runtime-tests/integration/pty/fixtures/use-stdout.tsx
+++ b/packages/runtime-tests/integration/pty/fixtures/use-stdout.tsx
@@ -1,9 +1,9 @@
-import { createApp, Text, useStdout, useAppContext } from "@vue-tui/runtime";
+import { createApp, Text, useStdout, useApp } from "@vue-tui/runtime";
 import { defineComponent, h, onMounted } from "vue";
 
 const WriteToStdout = defineComponent(() => {
   const { write } = useStdout();
-  const { exit } = useAppContext();
+  const { exit } = useApp();
 
   onMounted(() => {
     write("Hello from vue-tui to stdout\n");
diff --git a/packages/runtime-tests/integration/public-api.test.ts b/packages/runtime-tests/integration/public-api.test.ts
index ea66ee7..8325021 100644
--- a/packages/runtime-tests/integration/public-api.test.ts
+++ b/packages/runtime-tests/integration/public-api.test.ts
@@ -13,7 +13,7 @@ test("public API exposes documented members", () => {
     "Static",
     "Transform",
     // Composables
-    "useAppContext",
+    "useApp",
     "useInput",
     "useFocus",
     "useFocusManager",
diff --git a/packages/runtime-tests/integration/render-to-string.test.tsx b/packages/runtime-tests/integration/render-to-string.test.tsx
index 675cbe8..8a0d973 100644
--- a/packages/runtime-tests/integration/render-to-string.test.tsx
+++ b/packages/runtime-tests/integration/render-to-string.test.tsx
@@ -10,7 +10,7 @@ import {
   Static,
   Transform,
   useInput,
-  useAppContext,
+  useApp,
   useFocus,
   useFocusManager,
   useStdin,
@@ -65,9 +65,9 @@ describe("renderToString", () => {
     expect(output).toContain("with input");
   });
 
-  test("useAppContext does not throw in renderToString", () => {
+  test("useApp does not throw in renderToString", () => {
     const App = defineComponent(() => {
-      const { exit } = useAppContext();
+      const { exit } = useApp();
       // exit is a function but calling it is a no-op
       void exit;
       return () => <Text>with exit</Text>;
diff --git a/packages/runtime/README.md b/packages/runtime/README.md
index 25a80ef..eb3dee2 100644
--- a/packages/runtime/README.md
+++ b/packages/runtime/README.md
@@ -73,7 +73,7 @@ useInput((input) => {
 | `useInput(handler, opts?)` | Keyboard input — `(input, key)` with modifier and arrow key detection |
 | `useFocus(opts?)`          | Component-level focus — returns `{ isFocused, focus }`                |
 | `useFocusManager()`        | App-level focus — `focusNext()`, `focusPrevious()`, `focus(id)`       |
-| `useAppContext()`          | App context — `{ exit(error?), waitUntilRenderFlush() }`              |
+| `useApp()`                 | App lifecycle — `{ exit(error?), waitUntilRenderFlush() }`            |
 | `useTerminalSize()`        | Reactive terminal dimensions — `{ columns, rows }`                    |
 | `useAnimation(opts?)`      | Frame-based animation loop — returns `{ frame, time, delta, reset }`  |
 | `useBoxMetrics(ref)`       | Reactive layout metrics — `{ width, height, left, top, hasMeasured }` |
diff --git a/packages/runtime/src/composables/useApp.ts b/packages/runtime/src/composables/useApp.ts
new file mode 100644
index 0000000..70a3c69
--- /dev/null
+++ b/packages/runtime/src/composables/useApp.ts
@@ -0,0 +1,23 @@
+import { inject } from "vue";
+import { AppContextKey } from "../context.ts";
+
+/**
+ * Returns app-level lifecycle controls for a component inside the render tree:
+ *
+ * - `exit(error?)` — end the app. Pass an `Error` to reject `app.waitUntilExit()`
+ *   (and any awaiter); pass any other value to resolve with it as the result;
+ *   call with no args to resolve with `undefined`.
+ * - `waitUntilRenderFlush()` — resolve once the next frame has been committed and
+ *   flushed to the output stream.
+ *
+ * Mirrors Ink's `useApp()`. Streams are reached through the dedicated peer
+ * composables (`useStdin`, `useStdout`, `useStderr`), exactly as in Ink.
+ */
+export function useApp(): {
+  exit: (errorOrResult?: unknown) => void;
+  waitUntilRenderFlush: () => Promise<void>;
+} {
+  const ctx = inject(AppContextKey);
+  if (!ctx) throw new Error("useApp() must be called inside a vue-tui render tree");
+  return { exit: ctx.exit, waitUntilRenderFlush: ctx.waitUntilRenderFlush };
+}
diff --git a/packages/runtime/src/composables/useAppContext.ts b/packages/runtime/src/composables/useAppContext.ts
deleted file mode 100644
index 6bf45b5..0000000
--- a/packages/runtime/src/composables/useAppContext.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { inject } from "vue";
-import { AppContextKey } from "../context.ts";
-
-/**
- * Returns the app-level context for a component inside the render tree:
- *
- * - `exit(error?)` — end the app. Pass an `Error` to reject `app.waitUntilExit()`
- *   (and any awaiter); pass any other value to resolve with it as the result;
- *   call with no args to resolve with `undefined`.
- * - `waitUntilRenderFlush()` — resolve once the next frame has been committed and
- *   flushed to the output stream.
- *
- * Mirrors Ink's `useApp()` (which returns `{ exit, waitUntilRenderFlush }`). It
- * is named `useAppContext` rather than `useApp` to avoid colliding with Vue's
- * own "App" mental model (`createApp`, the Vue application instance) — the same
- * Vue-native-naming choice vue-tui makes with `createApp()` vs Ink's `render()`.
- * Streams remain on their dedicated peer composables (`useStdin`, `useStdout`,
- * `useStderr`), exactly as in Ink.
- */
-export function useAppContext(): {
-  exit: (errorOrResult?: unknown) => void;
-  waitUntilRenderFlush: () => Promise<void>;
-} {
-  const ctx = inject(AppContextKey);
-  if (!ctx) throw new Error("useAppContext() must be called inside a vue-tui render tree");
-  return { exit: ctx.exit, waitUntilRenderFlush: ctx.waitUntilRenderFlush };
-}
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index 5bf4bcf..c595a6f 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -14,7 +14,7 @@ export { Spacer } from "./components/Spacer.ts";
 export { Static, type StaticProps } from "./components/Static.ts";
 export { Transform, type TransformProps } from "./components/Transform.ts";
 
-export { useAppContext } from "./composables/useAppContext.ts";
+export { useApp } from "./composables/useApp.ts";
 export { useInput, type Key, type UseInputOptions } from "./composables/useInput.ts";
 export { usePaste, type UsePasteOptions } from "./composables/usePaste.ts";
 export { useFocus, type UseFocusOptions } from "./composables/useFocus.ts";
diff --git a/packages/runtime/src/render-to-string.ts b/packages/runtime/src/render-to-string.ts
index e9fe457..8500d81 100644
--- a/packages/runtime/src/render-to-string.ts
+++ b/packages/runtime/src/render-to-string.ts
@@ -46,7 +46,7 @@ export interface RenderToStringOptions {
  * starting a persistent terminal application.
  *
  * Terminal-specific composables (`useInput`, `useStdin`, `useStdout`,
- * `useStderr`, `useAppContext`, `useFocus`, `useFocusManager`) return default
+ * `useStderr`, `useApp`, `useFocus`, `useFocusManager`) return default
  * no-op values since there is no terminal session. They will not throw, but
  * they will not function as in a live terminal.
  *
diff --git a/packages/runtime/src/render.ts b/packages/runtime/src/render.ts
index c32d2a6..e34fbe3 100644
--- a/packages/runtime/src/render.ts
+++ b/packages/runtime/src/render.ts
@@ -545,7 +545,7 @@ export function createApp(root: Component, rootProps?: RootProps | null): TuiApp
         //
         // teardownStarted mirrors Ink's `isUnmounting` half of that guard:
         // app.unmount() runs teardown()+resolveExit() WITHOUT setting
-        // exitInitiated, so a retained exit() (from useAppContext()) called re-entrantly DURING
+        // exitInitiated, so a retained exit() (from useApp()) called re-entrantly DURING
         // unmount teardown (or any exit() after unmount) would otherwise pass
         // the exitInitiated check, overwrite pendingExitResult/pendingExitError
         // and queue a microtask — letting that late value win over the unmount.
@@ -960,7 +960,7 @@ export function createApp(root: Component, rootProps?: RootProps | null): TuiApp
     // Auto-cleanup on process exit (process.exit, event-loop drain, uncaught
     // exception — anything that fires Node's 'exit' event). teardown() is
     // sync and idempotent, safe to call from this hook. If the user already
-    // called unmount() / exit() (via useAppContext()), this is a no-op.
+    // called unmount() / exit() (via useApp()), this is a no-op.
     const exitListener = () => teardown();
     process.on("exit", exitListener);
     mountedExitListener = exitListener;
@@ -1032,7 +1032,7 @@ export function createApp(root: Component, rootProps?: RootProps | null): TuiApp
   };
 
   // Hoisted so the injected appContext (built inside mount()) can expose the
-  // SAME implementation via useAppContext().waitUntilRenderFlush — both the
+  // SAME implementation via useApp().waitUntilRenderFlush — both the
   // TuiApp handle and the in-tree composable resolve identically.
   async function waitUntilRenderFlush(): Promise<void> {
     // Flush any pending OR scheduled render. Gating on hasPending() alone