From 7b7c37f39691e3e99c5757c57c01a90826bc8cb4 Mon Sep 17 00:00:00 2001
From: Evan Sosenko <razorx@evansosenko.com>
Date: Sun, 22 Mar 2026 23:16:29 -0700
Subject: [PATCH] fix: app_exit keybind ignored when using <leader> (including
 default <leader>q)

---
 packages/opencode/src/cli/cmd/tui/app.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/opencode/src/cli/cmd/tui/app.tsx b/packages/opencode/src/cli/cmd/tui/app.tsx
index 7e883ec0e354..adadf6a762fc 100644
--- a/packages/opencode/src/cli/cmd/tui/app.tsx
+++ b/packages/opencode/src/cli/cmd/tui/app.tsx
@@ -246,6 +246,13 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
       setReady(true)
     })
 
+  useKeyboard((evt) => {
+    if (!keybind.match("app_exit", evt)) return
+    const prompt = promptRef.current?.current
+    if (prompt && prompt.input !== "") return
+    exit()
+  })
+
   useKeyboard((evt) => {
     if (!Flag.OPENCODE_EXPERIMENTAL_DISABLE_COPY_ON_SELECT) return
     const sel = renderer.getSelection()