From 9d54cdac088f29970a5c8606a26a2c197acae5ca Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Mon, 22 Sep 2025 22:27:05 -0400
Subject: [PATCH] tui: improve prompt layout and keyboard shortcuts

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

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt.tsx
index 61faa8c6e..e41c0788a 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt.tsx
@@ -200,21 +200,26 @@ export function Prompt(props: PromptProps) {
           </box>
           <box backgroundColor={Theme.backgroundElement} width={1} justifyContent="center" alignItems="center"></box>
         </box>
-        <box paddingLeft={2} paddingRight={1} flexDirection="row" justifyContent="space-between">
-          <Switch>
-            <Match when={working()}>
-              <text>working...</text>
-            </Match>
-            <Match when={true}>
-              <text>
-                enter <span style={{ fg: Theme.textMuted }}>send</span>
-              </text>
-            </Match>
-          </Switch>
+        <box flexDirection="row" justifyContent="space-between">
           <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>
+          <Switch>
+            <Match when={working()}>
+              <box flexDirection="row" gap={1}>
+                <text>
+                  esc <span style={{ fg: Theme.textMuted }}>interrupt</span>
+                </text>
+                <text fg={Theme.textMuted}>working...</text>
+              </box>
+            </Match>
+            <Match when={true}>
+              <text>
+                ctrl+k <span style={{ fg: Theme.textMuted }}>commands</span>
+              </text>
+            </Match>
+          </Switch>
         </box>
       </box>
     </>
diff --git a/packages/opencode/src/cli/cmd/tui/tui.tsx b/packages/opencode/src/cli/cmd/tui/tui.tsx
index ff854f4fb..10655f3b8 100644
--- a/packages/opencode/src/cli/cmd/tui/tui.tsx
+++ b/packages/opencode/src/cli/cmd/tui/tui.tsx
@@ -71,7 +71,6 @@ export const TuiCommand = cmd({
             await Instance.disposeAll()
             renderer.destroy()
             await EventLoop.wait()
-            process.exit(0)
           }
         })
         return (
@@ -111,7 +110,7 @@ function App() {
       return
     }
 
-    if (evt.ctrl && evt.name === "p") {
+    if (evt.ctrl && evt.name === "k") {
       dialog.replace(() => <DialogCommand />)
       return
     }
@@ -164,8 +163,8 @@ function App() {
             <text fg={Theme.textMuted}>{process.cwd().replace(Global.Path.home, "~")}</text>
           </box>
         </box>
-        <box flexDirection="row">
-          <text paddingRight={1} fg={Theme.textMuted}>
+        <box flexDirection="row" flexShrink={0}>
+          <text fg={Theme.textMuted} paddingRight={1}>
             tab
           </text>
           <text fg={local.agent.color(local.agent.current().name)}>┃</text>