From 82a2da47bbbec65a3b11014cab920a081caaea9f Mon Sep 17 00:00:00 2001
From: gsxdsm <gsxdsm@users.noreply.github.com>
Date: Wed, 11 Feb 2026 23:51:15 -0800
Subject: [PATCH] fix: Keep terminal view out of the way of the keyboard on
 mobile views (#398)

---
 .../ui/src/components/layout/MainLayout.tsx     |  7 +++++++
 .../components/terminal/TerminalViewport.tsx    | 17 ++++++++++++++++-
 .../ui/src/components/views/TerminalView.tsx    |  6 +++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/components/layout/MainLayout.tsx b/packages/ui/src/components/layout/MainLayout.tsx
index 677d6b1a..22ccc007 100644
--- a/packages/ui/src/components/layout/MainLayout.tsx
+++ b/packages/ui/src/components/layout/MainLayout.tsx
@@ -206,6 +206,13 @@ export const MainLayout: React.FC = () => {
             if (!active) {
                 return null;
             }
+            const explicitTargetId = active.getAttribute('data-keyboard-avoid-target-id');
+            if (explicitTargetId) {
+                const explicitTarget = document.getElementById(explicitTargetId);
+                if (explicitTarget instanceof HTMLElement) {
+                    return explicitTarget;
+                }
+            }
             const markedTarget = active.closest('[data-keyboard-avoid]') as HTMLElement | null;
             if (markedTarget) {
                 // data-keyboard-avoid="none" opts out of translateY avoidance entirely.
diff --git a/packages/ui/src/components/terminal/TerminalViewport.tsx b/packages/ui/src/components/terminal/TerminalViewport.tsx
index 3cc7cd89..f7337ead 100644
--- a/packages/ui/src/components/terminal/TerminalViewport.tsx
+++ b/packages/ui/src/components/terminal/TerminalViewport.tsx
@@ -65,11 +65,24 @@ interface TerminalViewportProps {
   className?: string;
   enableTouchScroll?: boolean;
   autoFocus?: boolean;
+  keyboardAvoidTargetId?: string;
 }
 
 const TerminalViewport = React.forwardRef<TerminalController, TerminalViewportProps>(
   (
-    { sessionKey, chunks, onInput, onResize, theme, fontFamily, fontSize, className, enableTouchScroll, autoFocus = true },
+    {
+      sessionKey,
+      chunks,
+      onInput,
+      onResize,
+      theme,
+      fontFamily,
+      fontSize,
+      className,
+      enableTouchScroll,
+      autoFocus = true,
+      keyboardAvoidTargetId,
+    },
     ref
   ) => {
     const containerRef = React.useRef<HTMLDivElement>(null);
@@ -1443,6 +1456,7 @@ const TerminalViewport = React.forwardRef<TerminalController, TerminalViewportPr
                 tabIndex={-1}
                 enterKeyHint="send"
                 data-terminal-hidden-input="true"
+                data-keyboard-avoid-target-id={keyboardAvoidTargetId}
                 aria-label="Terminal input"
                 aria-hidden="true"
                 style={{
@@ -1470,6 +1484,7 @@ const TerminalViewport = React.forwardRef<TerminalController, TerminalViewportPr
                 tabIndex={-1}
                 enterKeyHint="send"
                 data-terminal-hidden-input="true"
+                data-keyboard-avoid-target-id={keyboardAvoidTargetId}
                 aria-label="Terminal input"
                 aria-hidden="true"
                 style={{
diff --git a/packages/ui/src/components/views/TerminalView.tsx b/packages/ui/src/components/views/TerminalView.tsx
index 0dcf2101..f79979a0 100644
--- a/packages/ui/src/components/views/TerminalView.tsx
+++ b/packages/ui/src/components/views/TerminalView.tsx
@@ -137,6 +137,7 @@ export const TerminalView: React.FC = () => {
     const [isFatalError, setIsFatalError] = React.useState(false);
     const [activeModifier, setActiveModifier] = React.useState<Modifier | null>(null);
     const [isRestarting, setIsRestarting] = React.useState(false);
+    const keyboardAvoidTargetId = React.useId();
 
     const streamCleanupRef = React.useRef<(() => void) | null>(null);
     const activeTerminalIdRef = React.useRef<string | null>(null);
@@ -890,7 +891,7 @@ export const TerminalView: React.FC = () => {
 
     return (
         <div className="flex h-full flex-col overflow-hidden bg-[var(--surface-background)]">
-            <div className="px-5 py-2 text-xs bg-[var(--surface-background)]">
+            <div className="sticky top-0 z-20 shrink-0 bg-[var(--surface-background)] px-5 py-2 text-xs">
                 {enableTabs && directoryTerminalState ? (
                     <div className="mt-2 pl-1 pr-1 flex items-center gap-2">
                         <div className="min-w-0 flex-1 overflow-x-auto pb-1">
@@ -962,6 +963,7 @@ export const TerminalView: React.FC = () => {
             <div
                 className="relative flex-1 overflow-hidden"
                 style={{ backgroundColor: xtermTheme.background }}
+                id={keyboardAvoidTargetId}
                 data-keyboard-avoid="true"
             >
                 <div className="h-full w-full box-border pl-7 pr-5 pt-3 pb-4">
@@ -981,6 +983,7 @@ export const TerminalView: React.FC = () => {
                                 fontSize={terminalFontSize}
                                 enableTouchScroll={hasTouchInput}
                                 autoFocus={isTerminalVisible}
+                                keyboardAvoidTargetId={keyboardAvoidTargetId}
                             />
                         ) : (
                             <ScrollableOverlay outerClassName="h-full" className="h-full w-full" disableHorizontal>
@@ -998,6 +1001,7 @@ export const TerminalView: React.FC = () => {
                                     fontSize={terminalFontSize}
                                     enableTouchScroll={hasTouchInput}
                                     autoFocus={isTerminalVisible}
+                                    keyboardAvoidTargetId={keyboardAvoidTargetId}
                                 />
                             </ScrollableOverlay>
                         )