Stage remote terminal launches and replay hydrated buffers

- Carry pending launch context into terminal open
- Delay buffer replay until surface hydration is stable
- Co-authored-by: codex <codex@users.noreply.github.com>

Author: juliusmarminge

apps/mobile/modules/t3-terminal/android/src/main/java/expo/modules/t3terminal/T3TerminalView.kt

@@ -47,10 +47,11 @@ class T3TerminalView(context: Context, appContext: AppContext) : ExpoView(contex
       }
     }
 
-  var fontSize: Float = 12f
+  var fontSize: Float = 10f
     set(value) {
       field = value
       textView.textSize = value
+      inputView.textSize = max(value, 13f)
       emitResize()
     }
 

apps/mobile/modules/t3-terminal/ios/T3TerminalView.swift

@@ -100,23 +100,26 @@ public final class T3TerminalView: ExpoView, UITextFieldDelegate {
     }
   }
 
-  var fontSize: CGFloat = 12 {
+  var fontSize: CGFloat = 10 {
     didSet {
+      guard oldValue != fontSize else { return }
       inputField.font = UIFont.monospacedSystemFont(ofSize: max(fontSize, 13), weight: .regular)
-      resetSurface()
+      refreshSurface()
     }
   }
 
   var appearanceScheme: String = TerminalAppearanceScheme.dark.rawValue {
     didSet {
+      guard oldValue != appearanceScheme else { return }
       appearance = TerminalAppearanceScheme(value: appearanceScheme)
-      updateGhosttyTheme()
+      refreshSurface()
     }
   }
 
   var themeConfig: String = "" {
     didSet {
-      updateGhosttyTheme()
+      guard oldValue != themeConfig else { return }
+      refreshSurface()
     }
   }
 
@@ -353,6 +356,11 @@ public final class T3TerminalView: ExpoView, UITextFieldDelegate {
     setNeedsLayout()
   }
 
+  private func refreshSurface() {
+    resetSurface()
+    createSurfaceIfPossible()
+  }
+
   private func destroySurface() {
     if let surface {
       ghostty_surface_set_write_callback(surface, nil, nil)
@@ -525,19 +533,6 @@ public final class T3TerminalView: ExpoView, UITextFieldDelegate {
     terminalViewport.backgroundColor = backgroundColorValue
   }
 
-  private func updateGhosttyTheme() {
-    guard let app, let surface else { return }
-    guard let config = ghostty_config_new() else { return }
-    loadThemeConfig(into: config)
-    ghostty_config_finalize(config)
-    ghostty_app_update_config(app, config)
-    ghostty_surface_update_config(surface, config)
-    ghostty_app_set_color_scheme(app, appearance.ghosttyColorScheme)
-    ghostty_surface_set_color_scheme(surface, appearance.ghosttyColorScheme)
-    ghostty_config_free(config)
-    redrawSurface()
-  }
-
   private func loadThemeConfig(into config: ghostty_config_t) {
     guard let path = writeThemeConfigFile() else { return }
     path.withCString { cString in

apps/mobile/src/features/threads/ThreadRouteScreen.tsx

@@ -18,11 +18,10 @@ import { connectionTone } from "../connection/connectionTone";
 
 import { useRemoteCatalog } from "../../state/use-remote-catalog";
 import {
-  getEnvironmentClient,
   useRemoteConnectionStatus,
   useRemoteEnvironmentState,
 } from "../../state/use-remote-environment-registry";
-import { terminalSessionManager, useKnownTerminalSessions } from "../../state/use-terminal-session";
+import { useKnownTerminalSessions } from "../../state/use-terminal-session";
 import { useSelectedThreadDetail } from "../../state/use-thread-detail";
 import { useThreadSelection } from "../../state/use-thread-selection";
 import { GitActionProgressOverlay } from "./GitActionProgressOverlay";
@@ -31,7 +30,10 @@ import {
   nextTerminalId,
   resolveProjectScriptTerminalId,
 } from "./terminalMenu";
-import { resolvePreferredThreadWorktreePath } from "./terminalLaunchContext";
+import {
+  resolvePreferredThreadWorktreePath,
+  stagePendingTerminalLaunch,
+} from "./terminalLaunchContext";
 import { ThreadDetailScreen } from "./ThreadDetailScreen";
 import { ThreadGitControls } from "./ThreadGitControls";
 import { ThreadNavigationDrawer } from "./ThreadNavigationDrawer";
@@ -166,11 +168,6 @@ export function ThreadRouteScreen() {
         return;
       }
 
-      const client = getEnvironmentClient(selectedThread.environmentId);
-      if (!client) {
-        return;
-      }
-
       const targetTerminalId = resolveProjectScriptTerminalId({
         existingTerminalIds: terminalMenuSessions.map((session) => session.terminalId),
         hasRunningTerminal: terminalMenuSessions.some(
@@ -189,23 +186,20 @@ export function ThreadRouteScreen() {
         project: { cwd: selectedThreadProject.workspaceRoot },
         worktreePath: preferredWorktreePath,
       });
-      const snapshot = await client.terminal.open({
-        threadId: selectedThread.id,
-        terminalId: targetTerminalId,
-        cwd,
-        worktreePath: preferredWorktreePath,
-        env,
+      stagePendingTerminalLaunch({
+        target: {
+          environmentId: selectedThread.environmentId,
+          threadId: selectedThread.id,
+          terminalId: targetTerminalId,
+        },
+        launch: {
+          cwd,
+          worktreePath: preferredWorktreePath,
+          env,
+          initialInput: `${script.command}\r`,
+        },
       });
 
-      terminalSessionManager.syncSnapshot(
-        { environmentId: selectedThread.environmentId },
-        snapshot,
-      );
-      await client.terminal.write({
-        threadId: selectedThread.id,
-        terminalId: targetTerminalId,
-        data: `${script.command}\r`,
-      });
       void router.push(buildThreadTerminalRoutePath(selectedThread, targetTerminalId));
     },
     [

apps/mobile/src/features/threads/ThreadTerminalRouteScreen.test.ts

@@ -12,14 +12,16 @@ describe("resolveTerminalRouteBootstrap", () => {
         requestedTerminalId: null,
         currentTerminalId: "default",
         runningTerminalId: "term-2",
+        currentTerminalStatus: "closed",
+        hasCurrentTerminalHydration: false,
       }),
     ).toEqual({
       kind: "redirect",
       terminalId: "term-2",
     });
   });
 
-  it("hydrates the current running terminal instead of skipping open", () => {
+  it("hydrates the current running terminal when client state is not hydrated yet", () => {
     expect(
       resolveTerminalRouteBootstrap({
         hasThread: true,
@@ -28,13 +30,15 @@ describe("resolveTerminalRouteBootstrap", () => {
         requestedTerminalId: null,
         currentTerminalId: "default",
         runningTerminalId: "default",
+        currentTerminalStatus: "running",
+        hasCurrentTerminalHydration: false,
       }),
     ).toEqual({
       kind: "open",
     });
   });
 
-  it("opens explicit terminal routes once so they replay existing history", () => {
+  it("opens explicit terminal routes when the session still needs hydration", () => {
     expect(
       resolveTerminalRouteBootstrap({
         hasThread: true,
@@ -43,6 +47,8 @@ describe("resolveTerminalRouteBootstrap", () => {
         requestedTerminalId: "term-2",
         currentTerminalId: "term-2",
         runningTerminalId: "term-2",
+        currentTerminalStatus: "running",
+        hasCurrentTerminalHydration: false,
       }),
     ).toEqual({
       kind: "open",
@@ -58,6 +64,42 @@ describe("resolveTerminalRouteBootstrap", () => {
         requestedTerminalId: null,
         currentTerminalId: "default",
         runningTerminalId: "default",
+        currentTerminalStatus: "running",
+        hasCurrentTerminalHydration: true,
+      }),
+    ).toEqual({
+      kind: "idle",
+    });
+  });
+
+  it("stays idle when the current running terminal is already hydrated in client state", () => {
+    expect(
+      resolveTerminalRouteBootstrap({
+        hasThread: true,
+        hasWorkspaceRoot: true,
+        hasOpened: false,
+        requestedTerminalId: null,
+        currentTerminalId: "default",
+        runningTerminalId: "default",
+        currentTerminalStatus: "running",
+        hasCurrentTerminalHydration: true,
+      }),
+    ).toEqual({
+      kind: "idle",
+    });
+  });
+
+  it("stays idle for explicit running terminal routes that already have hydrated output", () => {
+    expect(
+      resolveTerminalRouteBootstrap({
+        hasThread: true,
+        hasWorkspaceRoot: true,
+        hasOpened: false,
+        requestedTerminalId: "term-2",
+        currentTerminalId: "term-2",
+        runningTerminalId: "term-2",
+        currentTerminalStatus: "running",
+        hasCurrentTerminalHydration: true,
       }),
     ).toEqual({
       kind: "idle",