Skip to content

fix(tui): allow session interrupt (ESC) when dialog is open #27917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ranxianglei wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −2
Open

fix(tui): allow session interrupt (ESC) when dialog is open #27917

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ export function Prompt(props: PromptProps) {
enabled: status().type !== "idle",
run: () => {
if (auto()?.visible) return
if (!input.focused) return
// TODO: this should be its own command
if (store.mode === "shell") {
setStore("mode", "normal")
Expand Down Expand Up @@ -628,6 +627,14 @@ export function Prompt(props: PromptProps) {
commands: promptCommands(),
}))

// session.interrupt must always be reachable, even when a dialog is open.
// Without this, pressing ESC when a permission prompt is showing would only
// dismiss the dialog — the model then retries the tool and re-opens it,
// trapping the user in an infinite dialog loop.
useBindings(() => ({
bindings: tuiConfig.keybinds.gather("prompt.interrupt", ["session.interrupt"]),
}))

useBindings(() => ({
enabled: command.matcher,
bindings: tuiConfig.keybinds.gather("prompt.palette", [
Expand All @@ -637,7 +644,6 @@ export function Prompt(props: PromptProps) {
"prompt.stash",
"prompt.stash.pop",
"prompt.stash.list",
"session.interrupt",
"workspace.set",
]),
}))
Expand Down
Loading