From a941a82fa2a3e0d6beb382ff6795db043683ab3a Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Mon, 22 Sep 2025 04:05:24 -0400
Subject: [PATCH] sync

---
 .../opencode/src/cli/cmd/tui/component/prompt.tsx |  2 +-
 packages/opencode/src/cli/cmd/tui/session.tsx     | 15 +++++++++------
 packages/opencode/src/cli/cmd/tui/tui.tsx         | 10 +++++++++-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt.tsx
index fc9fdf714..e9f8daeac 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt.tsx
@@ -185,7 +185,7 @@ export function Prompt(props: PromptProps) {
               </text>
             </Match>
           </Switch>
-          <text>
+          <text flexShrink={0} wrap={false}>
             <span style={{ fg: Theme.textMuted }}>{local.model.parsed().provider}</span>{" "}
             <span style={{ bold: true }}>{local.model.parsed().model}</span>
           </text>
diff --git a/packages/opencode/src/cli/cmd/tui/session.tsx b/packages/opencode/src/cli/cmd/tui/session.tsx
index c2f614ded..831d092cd 100644
--- a/packages/opencode/src/cli/cmd/tui/session.tsx
+++ b/packages/opencode/src/cli/cmd/tui/session.tsx
@@ -49,7 +49,7 @@ export function Session() {
   })
 
   return (
-    <box paddingTop={1} paddingBottom={1} paddingLeft={2} paddingRight={2} flexGrow={1} maxHeight="100%">
+    <box paddingTop={1} paddingBottom={1} paddingLeft={2} paddingRight={2} flexGrow={1}>
       <Show when={session()}>
         <box paddingLeft={1} paddingRight={1} {...SplitBorder} borderColor={Theme.backgroundElement}>
           <text>
@@ -76,6 +76,7 @@ export function Session() {
           stickyStart="bottom"
           paddingTop={1}
           paddingBottom={1}
+          height={45}
         >
           <For each={messages()}>
             {(message) => (
@@ -209,14 +210,16 @@ function ToolPart(props: { part: ToolPart; message: AssistantMessage }) {
 
     const metadata = props.part.state.status === "pending" ? {} : (props.part.state.metadata ?? {})
     const input = props.part.state.input
+    const container = ToolRegistry.container(props.part.tool)
 
-    const container: BoxProps =
-      ToolRegistry.container(props.part.tool) === "block"
+    const style: BoxProps =
+      container === "block"
         ? {
             border: ["left"] as const,
             paddingTop: 1,
             paddingBottom: 1,
             paddingLeft: 2,
+            marginTop: 1,
             gap: 1,
             backgroundColor: Theme.backgroundPanel,
             customBorderChars: SplitBorder.customBorderChars,
@@ -228,7 +231,7 @@ function ToolPart(props: { part: ToolPart; message: AssistantMessage }) {
 
     return (
       <box
-        {...container}
+        {...style}
         renderAfter={function () {
           resize(this as BoxRenderable)
         }}
@@ -366,10 +369,10 @@ ToolRegistry.register<typeof WriteTool>({
           Wrote {props.input.filePath}
         </ToolTitle>
         <box flexDirection="row">
-          <box>
+          <box flexShrink={0}>
             <For each={numbers()}>{(value) => <text style={{ fg: Theme.textMuted }}>{value}</text>}</For>
           </box>
-          <box paddingLeft={1}>
+          <box paddingLeft={1} flexGrow={1}>
             <text>{code()}</text>
           </box>
         </box>
diff --git a/packages/opencode/src/cli/cmd/tui/tui.tsx b/packages/opencode/src/cli/cmd/tui/tui.tsx
index 0dd91726c..8b364636d 100644
--- a/packages/opencode/src/cli/cmd/tui/tui.tsx
+++ b/packages/opencode/src/cli/cmd/tui/tui.tsx
@@ -66,6 +66,7 @@ export const TuiCommand = cmd({
       () => {
         const renderer = useRenderer()
         useKeyboard(async (evt) => {
+          if (!evt.name) return
           if (evt.name === "c" && evt.ctrl) {
             await Instance.disposeAll()
             renderer.destroy()
@@ -91,6 +92,7 @@ export const TuiCommand = cmd({
         targetFps: 60,
         gatherStats: false,
         exitOnCtrlC: false,
+        useKittyKeyboard: true,
       },
     )
   },
@@ -145,7 +147,13 @@ function App() {
           </Match>
         </Switch>
       </box>
-      <box height={1} backgroundColor={Theme.backgroundPanel} flexDirection="row" justifyContent="space-between">
+      <box
+        height={1}
+        backgroundColor={Theme.backgroundPanel}
+        flexDirection="row"
+        justifyContent="space-between"
+        flexShrink={0}
+      >
         <box flexDirection="row">
           <box flexDirection="row" backgroundColor={Theme.backgroundElement} paddingLeft={1} paddingRight={1}>
             <text fg={Theme.textMuted}>open</text>