fix: clarify keybinding conflict warnings

refs #154

4 files changed, 5 insertions, 2 deletions

diff --git a/docs/next/CHANGELOG.md b/docs/next/CHANGELOG.md
index 689cf13b..6b25d5c3 100644
--- a/docs/next/CHANGELOG.md
+++ b/docs/next/CHANGELOG.md
@@ -11,10 +11,12 @@
 - Added native Kiro CLI detection with idle and working state heuristics. (#185)
 
 ### Fixed
+- Keybinding conflict warnings now stay visible and show one readable yellow row per conflicting binding.
 - The Claude Code integration no longer lets subagent completion hooks report durable `working`, preventing delayed recap or subagent completion events from reviving an idle pane. (#198)
 - Remote clients now bridge local clipboard images into the remote pane by staging them as temporary image files and pasting the remote path, so Claude Code image paste works over `herdr --remote`. (#205)
 
 ### Breaking Changes
+- Removed the separate `keys.quit` binding. Use `keys.detach`, which detaches in server mode and exits in `--no-session` mode. The default detach binding is now `prefix+q`.
 - Keybindings now use explicit trigger syntax: `prefix+c` means prefix mode, while `ctrl+alt+c` is direct. Bare printable direct bindings such as `new_tab = "c"` are rejected with diagnostics because they intercept normal typing. The default keymap now gives tmux-style tab actions to `prefix+c`, `prefix+n`/`prefix+p`, and `prefix+1..9`, uses `prefix+w` for workspace navigation, and moves pane focus to `prefix+h/j/k/l`. (#154)
 - The client/server protocol is now version 8. Stop and restart any running v0.5.12 server before attaching with this release.
 
diff --git a/docs/next/README.md b/docs/next/README.md
index 402d7d4e..2e659930 100644
--- a/docs/next/README.md
+++ b/docs/next/README.md
@@ -218,7 +218,7 @@ press `ctrl+b` to enter prefix mode. default actions are prefix-first and tmux-l
 | `prefix+b` | toggle sidebar |
 | `prefix+z` | zoom pane |
 | `prefix+r` | resize mode |
-| `prefix+d` | detach (quit client) |
+| `prefix+q` | detach |
 
 resize mode: `h`/`l` resize width, `j`/`k` resize height, `esc` exit.
 
diff --git a/docs/next/website/src/content/docs/configuration.mdx b/docs/next/website/src/content/docs/configuration.mdx
index bc43d4f0..9df7e41d 100644
--- a/docs/next/website/src/content/docs/configuration.mdx
+++ b/docs/next/website/src/content/docs/configuration.mdx
@@ -76,6 +76,7 @@ The default keymap is prefix-first and avoids direct shortcuts that can steal in
 
 ```toml
 [keys]
+detach = "prefix+q"
 workspace_picker = "prefix+w"
 new_workspace = "prefix+shift+n"
 rename_workspace = "prefix+shift+w"
diff --git a/docs/next/website/src/content/docs/quick-start.mdx b/docs/next/website/src/content/docs/quick-start.mdx
index 9e2452a7..f56048b9 100644
--- a/docs/next/website/src/content/docs/quick-start.mdx
+++ b/docs/next/website/src/content/docs/quick-start.mdx
@@ -43,7 +43,7 @@ Common actions:
 | Next / previous tab | `prefix+n` / `prefix+p` |
 | Workspace navigation | `prefix+w` |
 | New workspace | `prefix+shift+n` |
-| Detach client | `prefix+d` |
+| Detach client | `prefix+q` |
 
 After detaching, run `herdr` again to reattach to the same session.