riched 0.6.0__tar.gz → 0.6.2__tar.gz

{riched-0.6.0 → riched-0.6.2}/AGENTS.md

@@ -1,7 +1,7 @@
 # Repository Guidelines
 
-- check if a hotkey is bounded with Ghostty built-in hotkey before adding any new key binding, ask user for fallback hotkey in addition to the target hotkey.  Add startup detection for the target hotkey, display fallback if Ghostty does not unbound the target hotkey.
-- riched only supports Ghostty on macOS. For every new hotkey or fallback, verify the real Ghostty/Textual terminal path, not only Textual Pilot's synthetic key name. Use `ghostty +list-keybinds --default` to check Ghostty interception, then inspect Textual's ANSI mapping with `uv run python` when the key uses Ctrl punctuation or other ambiguous terminal sequences. Add e2e coverage for both the requested human spelling and the real Textual key name when they differ, for example `ctrl+right_square_bracket` for real terminal Ctrl+]. Do not use fallbacks that collapse to `escape` or another existing semantic key; Ctrl+[ is Escape in terminal input and must not be used as a distinct fallback.
+- check if a hotkey is bounded with Ghostty built-in hotkey before adding any new key binding. Add startup detection for Ghostty-conflicted hotkeys and document any alternative hotkeys as alternatives.
+- riched only supports Ghostty on macOS. For every new hotkey or alternative, verify the real Ghostty/Textual terminal path, not only Textual Pilot's synthetic key name. Use `ghostty +list-keybinds --default` to check Ghostty interception, then inspect Textual's ANSI mapping with `uv run python` when the key uses Ctrl punctuation or other ambiguous terminal sequences. Add e2e coverage for both the requested human spelling and the real Textual key name when they differ, for example `ctrl+right_square_bracket` for real terminal Ctrl+]. Do not use alternatives that collapse to `escape` or another existing semantic key; Ctrl+[ is Escape in terminal input and must not be used as a distinct alternative.
 
 ## Project Structure & Module Organization
 
@@ -20,15 +20,15 @@ This repository is a uv-managed Python project for `riched`, a Textual TUI edito
 
 Use Python 3.12-compatible code with type hints, `from __future__ import annotations`, `Path`, and small focused helpers. Use 4-space indentation. Keep constants in `UPPER_SNAKE_CASE`, classes in `PascalCase`, functions and methods in `snake_case`, and private helpers prefixed with `_`. Prefer Textual widgets and events over manual terminal control. Keep comments brief and only for non-obvious behavior.
 
-Keep key bindings in `src/riched/bindings.yaml`, not hardcoded in Python. The F1 hotkey popup is generated from this YAML and displays one user-facing key per binding, preferring `cmd` aliases over `super`.
+Keep key bindings in `src/riched/bindings.yaml`, not hardcoded in Python. The F1 hotkey popup is generated from this YAML and displays user-facing keys from the binding metadata, preferring `cmd` aliases over `super`.
 
-When changing app-level key bindings, test both file-open and no-buffer/directory-start states. For Command-key regressions, verify both Textual names (`cmd+...` and terminal-normalized `super+...`) because Pilot can pass for synthetic keys while a real terminal path or missing app state still breaks. For fallback-key regressions, verify the real Ghostty/Textual key name in addition to the displayed fallback label; Pilot can synthesize impossible keys such as `ctrl+[` even though real Ghostty/macOS terminal input arrives as `escape`. Do not patch Command-key behavior by adding Python-side hardcoded fallbacks; add aliases to `bindings.yaml` and e2e coverage instead.
+When changing app-level key bindings, test both file-open and no-buffer/directory-start states. For Command-key regressions, verify both Textual names (`cmd+...` and terminal-normalized `super+...`) because Pilot can pass for synthetic keys while a real terminal path or missing app state still breaks. For alternative-key regressions, verify the real Ghostty/Textual key name in addition to the displayed alternative label; Pilot can synthesize impossible keys such as `ctrl+[` even though real Ghostty/macOS terminal input arrives as `escape`. Do not patch Command-key behavior by adding Python-side hardcoded alternatives; add aliases to `bindings.yaml` and e2e coverage instead.
 
 ## Testing Guidelines
 
 Only add end-to-end tests in `tests/`; do not create unit tests. Tests use Textual's Pilot harness and should be named `test_<behavior>`. Keep each test focused on user-visible behavior such as file open/save, dirty prompts, file tree switching, quick-open search/indexing, or syntax highlighting. Use temporary files as existing tests do.
 
-For hotkey e2e tests, cover the YAML-declared preferred key, terminal-normalized aliases, and fallback key. If the real terminal key name differs from the user-facing label, cover the real Textual name too. Before accepting a fallback, confirm it can be produced distinctly by Ghostty on macOS; Ctrl punctuation is especially risky because some combinations are control bytes with legacy meanings.
+For hotkey e2e tests, cover the YAML-declared preferred key, terminal-normalized aliases, and any alternative keys. If the real terminal key name differs from the user-facing label, cover the real Textual name too. Before accepting an alternative, confirm it can be produced distinctly by Ghostty on macOS; Ctrl punctuation is especially risky because some combinations are control bytes with legacy meanings.
 
 ## Commit & Pull Request Guidelines
 

{riched-0.6.0 → riched-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: riched
-Version: 0.6.0
+Version: 0.6.2
 Summary: A Rich library powered editor(hence the name riched) that implements VS Code keybindings in TUI
 Project-URL: Repository, https://github.com/hoishing/riched
 Requires-Python: >=3.12
@@ -90,16 +90,18 @@ Editor shortcuts:
 The `⌥⇧F` shortcut formats the current buffer with external formatter CLIs:
 
 - Python files use `ruff`.
+- TOML files use `taplo`.
+- XML files use `prettier` with `@prettier/plugin-xml`.
 - Other supported source/config formats use `prettier`.
 
-Install both tools and make sure they are on `PATH` before using the shortcut:
+Install the required tools before using the shortcut:
 
 ```sh
-bun add --global prettier
-uv tool install ruff
+bun add --global prettier @prettier/plugin-xml
+brew install ruff taplo
 ```
 
-Files unsupported by both tools are left unchanged and `riched` shows a warning.
+Files unsupported by these tools are left unchanged and `riched` shows a warning.
 
 ## Limitations
 
@@ -111,9 +113,9 @@ Files unsupported by both tools are left unchanged and `riched` shows a warning.
 
 - some hotkeys are bounded by Ghostty by default. eg. `⌘Enter`, `⌘⇧Enter`, `⌘⇧V`, `⌘[`, `⌘]`, `⌘⇧P`, `⌘W`, `⌘Q`...etc
 - `riched` detects conflicted shortcuts at startup.
-- Conflicted shortcuts are hidden from the footer until they are unbound in Ghostty config.
+- Conflicted shortcuts are hidden from the footer until they are unbound in Ghostty config, unless the command has another available alternative.
 - The key bindings popup marks conflicted shortcuts with `⚠️` and shows a Ghostty config reminder.
-- `⌘⇧P` always has the `F1` fallback
+- `⌘⇧P` and `F1` are alternative hotkeys for the command palette.
 
 ### Unbind Ghostty default keybindings
 
@@ -134,7 +136,7 @@ keybind = super+enter=unbind
 keybind = super+shift+enter=unbind
 ```
 
-`⌘⇧P` already works through the `F1` fallback. To use `⌘⇧P` directly, also add:
+The command palette can still be opened with `F1`. To use `⌘⇧P` directly, also add:
 
 ```conf
 keybind = super+shift+p=unbind

{riched-0.6.0 → riched-0.6.2}/README.md

@@ -79,16 +79,18 @@ Editor shortcuts:
 The `⌥⇧F` shortcut formats the current buffer with external formatter CLIs:
 
 - Python files use `ruff`.
+- TOML files use `taplo`.
+- XML files use `prettier` with `@prettier/plugin-xml`.
 - Other supported source/config formats use `prettier`.
 
-Install both tools and make sure they are on `PATH` before using the shortcut:
+Install the required tools before using the shortcut:
 
 ```sh
-bun add --global prettier
-uv tool install ruff
+bun add --global prettier @prettier/plugin-xml
+brew install ruff taplo
 ```
 
-Files unsupported by both tools are left unchanged and `riched` shows a warning.
+Files unsupported by these tools are left unchanged and `riched` shows a warning.
 
 ## Limitations
 
@@ -100,9 +102,9 @@ Files unsupported by both tools are left unchanged and `riched` shows a warning.
 
 - some hotkeys are bounded by Ghostty by default. eg. `⌘Enter`, `⌘⇧Enter`, `⌘⇧V`, `⌘[`, `⌘]`, `⌘⇧P`, `⌘W`, `⌘Q`...etc
 - `riched` detects conflicted shortcuts at startup.
-- Conflicted shortcuts are hidden from the footer until they are unbound in Ghostty config.
+- Conflicted shortcuts are hidden from the footer until they are unbound in Ghostty config, unless the command has another available alternative.
 - The key bindings popup marks conflicted shortcuts with `⚠️` and shows a Ghostty config reminder.
-- `⌘⇧P` always has the `F1` fallback
+- `⌘⇧P` and `F1` are alternative hotkeys for the command palette.
 
 ### Unbind Ghostty default keybindings
 
@@ -123,7 +125,7 @@ keybind = super+enter=unbind
 keybind = super+shift+enter=unbind
 ```
 
-`⌘⇧P` already works through the `F1` fallback. To use `⌘⇧P` directly, also add:
+The command palette can still be opened with `F1`. To use `⌘⇧P` directly, also add:
 
 ```conf
 keybind = super+shift+p=unbind

{riched-0.6.0 → riched-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "riched"
-version = "0.6.0"
+version = "0.6.2"
 description = "A Rich library powered editor(hence the name riched) that implements VS Code keybindings in TUI"
 readme = "README.md"
 requires-python = ">=3.12"

{riched-0.6.0 → riched-0.6.2}/src/riched/app.py

@@ -30,7 +30,7 @@ from .keybindings import (
     DEFAULT_BINDINGS,
     app_binding_display_key,
     display_key_with_symbols,
-    ghostty_app_hotkey_conflicts,
+    ghostty_conflicted_hotkey_triggers,
 )
 from .quick_open import (
     MAX_QUICK_OPEN_INDEX_FILES,
@@ -66,10 +66,7 @@ class RichedFooter(Footer):
     """Footer that shows app bindings and omits blocked bindings."""
 
     def _hide_binding(self, binding: Binding) -> bool:
-        return (
-            not self.app.get_key_display(binding)
-            and binding.action in self.app._ghostty_app_hotkey_conflicts
-        )
+        return not self.app.get_key_display(binding)
 
     def compose(self) -> ComposeResult:
         if not self._bindings_ready:
@@ -304,7 +301,9 @@ class RichedApp(App):
         self._quick_open_limited = False
         self._quick_open_generation = 0
         self._quick_open_screen: QuickOpenScreen | None = None
-        self._ghostty_app_hotkey_conflicts = ghostty_app_hotkey_conflicts()
+        self._ghostty_conflicted_hotkey_triggers = (
+            ghostty_conflicted_hotkey_triggers()
+        )
 
     def _save_theme(self, theme: str) -> None:
         try:
@@ -343,7 +342,7 @@ class RichedApp(App):
         key = app_binding_display_key(
             binding.action,
             binding.key,
-            conflicted_actions=self._ghostty_app_hotkey_conflicts,
+            conflicted_triggers=self._ghostty_conflicted_hotkey_triggers,
         )
         return display_key_with_symbols(key)
 
@@ -622,7 +621,9 @@ class RichedApp(App):
 
     def action_show_keys_popup(self) -> None:
         self.push_screen(
-            KeysHelpScreen(conflicted_actions=self._ghostty_app_hotkey_conflicts)
+            KeysHelpScreen(
+                conflicted_triggers=self._ghostty_conflicted_hotkey_triggers
+            )
         )
 
     async def action_toggle_markdown_preview(self) -> None:
@@ -681,9 +682,13 @@ class RichedApp(App):
 
         result = format_text(self.path, editor.text)
         if result.missing_tool is not None:
+            detail = (
+                "Install it and ensure Prettier can load it."
+                if result.missing_tool.startswith("@")
+                else "Install it and ensure it is on PATH."
+            )
             self.notify(
-                f"`{result.missing_tool}` is required for formatting. "
-                "Install it and ensure it is on PATH.",
+                f"`{result.missing_tool}` is required for formatting. {detail}",
                 severity="warning",
             )
             return

{riched-0.6.0 → riched-0.6.2}/src/riched/bindings.yaml

@@ -7,7 +7,9 @@ app:
       description: Command palette
       key: cmd+shift+p,shift+cmd+p,super+shift+p,shift+super+p,f1
       preferred_key: cmd+shift+p,shift+cmd+p,super+shift+p,shift+super+p
-      fallback_key: f1
+      display_keys:
+        - cmd+shift+p
+        - f1
     - name: toggle_file_tree
       description: Toggle file tree
       key: cmd+b,super+b
@@ -40,6 +42,7 @@ editor:
     preferred_key: alt+shift+f,shift+alt+f
     action: format_document
     description: Format document
+    category: App
   - key: cmd+enter,super+enter
     preferred_key: cmd+enter,super+enter
     action: insert_line_below

{riched-0.6.0 → riched-0.6.2}/src/riched/formatting.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+import os
 import subprocess
 from dataclasses import dataclass
 from pathlib import Path
@@ -9,6 +10,12 @@ from typing import Callable
 
 FORMAT_TIMEOUT_SECONDS = 10.0
 PYTHON_SUFFIXES = {".py", ".pyi"}
+TOML_SUFFIXES = {".toml"}
+XML_SUFFIXES = {".xml"}
+PRETTIER_XML_PLUGIN = "@prettier/plugin-xml"
+PRETTIER_XML_PLUGIN_ENTRYPOINT = Path(
+    "@prettier/plugin-xml/src/plugin.js"
+)
 
 
 @dataclass(frozen=True)
@@ -37,6 +44,10 @@ def format_text(
     suffix = path.suffix.lower()
     if suffix in PYTHON_SUFFIXES:
         return _format_with_ruff(path, text, run_command, find_binary)
+    if suffix in TOML_SUFFIXES:
+        return _format_with_taplo(path, text, run_command, find_binary)
+    if suffix in XML_SUFFIXES:
+        return _format_with_prettier_xml(path, text, run_command, find_binary)
     return _format_with_prettier(path, text, run_command, find_binary)
 
 
@@ -79,14 +90,60 @@ def _format_with_prettier(
     )
 
 
+def _format_with_taplo(
+    path: Path,
+    text: str,
+    run_command: RunCommand,
+    find_binary: FindBinary,
+) -> FormatResult:
+    taplo = find_binary("taplo")
+    if taplo is None:
+        return FormatResult(missing_tool="taplo")
+    return _run_formatter(
+        [taplo, "format", "--stdin-filepath", str(path), "-"],
+        text,
+        run_command,
+    )
+
+
+def _format_with_prettier_xml(
+    path: Path,
+    text: str,
+    run_command: RunCommand,
+    find_binary: FindBinary,
+) -> FormatResult:
+    prettier = find_binary("prettier")
+    if prettier is None:
+        return FormatResult(missing_tool="prettier")
+
+    plugin_arg = f"--plugin={_prettier_xml_plugin_path(prettier)}"
+    file_info = _prettier_file_info(prettier, path, run_command, plugin_arg)
+    if file_info is False:
+        return FormatResult(unsupported=True)
+    if isinstance(file_info, FormatResult):
+        return file_info
+
+    return _run_formatter(
+        [prettier, plugin_arg, "--stdin-filepath", str(path)],
+        text,
+        run_command,
+        missing_tool=PRETTIER_XML_PLUGIN,
+    )
+
+
 def _prettier_file_info(
     prettier: str,
     path: Path,
     run_command: RunCommand,
+    plugin_arg: str | None = None,
 ) -> bool | FormatResult:
+    command = [prettier]
+    if plugin_arg is not None:
+        command.append(plugin_arg)
+    command.extend(["--file-info", str(path)])
     try:
         result = run_command(
-            [prettier, "--file-info", str(path)],
+            command,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
@@ -99,6 +156,11 @@ def _prettier_file_info(
         return FormatResult(error=f"Prettier failed: {exc}")
 
     if result.returncode != 0:
+        if plugin_arg is not None and _missing_node_package(
+            result,
+            PRETTIER_XML_PLUGIN,
+        ):
+            return FormatResult(missing_tool=PRETTIER_XML_PLUGIN)
         message = _command_error_message("Prettier", result)
         return FormatResult(error=message)
 
@@ -110,10 +172,39 @@ def _prettier_file_info(
     return bool(info.get("inferredParser")) and not bool(info.get("ignored"))
 
 
+def _prettier_xml_plugin_path(prettier: str) -> str:
+    for directory in _node_module_roots(prettier):
+        plugin = directory / PRETTIER_XML_PLUGIN_ENTRYPOINT
+        if plugin.exists():
+            return os.fspath(plugin)
+    return PRETTIER_XML_PLUGIN
+
+
+def _node_module_roots(prettier: str) -> list[Path]:
+    roots: list[Path] = []
+    cwd_root = Path.cwd() / "node_modules"
+    roots.append(cwd_root)
+
+    try:
+        resolved_prettier = Path(prettier).resolve()
+    except OSError:
+        resolved_prettier = Path(prettier)
+    for parent in resolved_prettier.parents:
+        if parent.name == "node_modules":
+            roots.append(parent)
+            break
+
+    bun_global = Path.home() / ".bun/install/global/node_modules"
+    roots.append(bun_global)
+    return list(dict.fromkeys(roots))
+
+
 def _run_formatter(
     command: list[str],
     text: str,
     run_command: RunCommand,
+    *,
+    missing_tool: str | None = None,
 ) -> FormatResult:
     tool = Path(command[0]).name.capitalize()
     try:
@@ -132,6 +223,8 @@ def _run_formatter(
         return FormatResult(error=f"{tool} failed: {exc}")
 
     if result.returncode != 0:
+        if missing_tool is not None and _missing_node_package(result, missing_tool):
+            return FormatResult(missing_tool=missing_tool)
         return FormatResult(error=_command_error_message(tool, result))
     return FormatResult(text=result.stdout)
 
@@ -141,3 +234,15 @@ def _command_error_message(tool: str, result: subprocess.CompletedProcess[str])
     if not detail:
         detail = f"exit code {result.returncode}"
     return f"{tool} failed: {detail}"
+
+
+def _missing_node_package(
+    result: subprocess.CompletedProcess[str],
+    package: str,
+) -> bool:
+    detail = f"{result.stderr}\n{result.stdout}"
+    return package in detail and (
+        "Cannot find package" in detail
+        or "Cannot find module" in detail
+        or "MODULE_NOT_FOUND" in detail
+    )

{riched-0.6.0 → riched-0.6.2}/src/riched/keybindings.py

@@ -22,6 +22,15 @@ KEY_MODIFIER_SYMBOLS = {
     "option": "⌥",
     "shift": "⇧",
 }
+KEY_MODIFIER_ORDER = {
+    "ctrl": 0,
+    "control": 0,
+    "super": 1,
+    "cmd": 1,
+    "alt": 2,
+    "option": 2,
+    "shift": 3,
+}
 
 
 @dataclass(frozen=True)
@@ -78,18 +87,23 @@ def _build_item_bindings(items: list[dict[str, Any]]) -> list[Binding]:
 
 
 def binding_help_groups(
-    conflicted_actions: set[str] | None = None,
+    conflicted_triggers: set[str] | None = None,
 ) -> list[KeyBindingHelpGroup]:
-    conflicted_actions = conflicted_actions or set()
+    conflicted_triggers = conflicted_triggers or set()
     groups: list[KeyBindingHelpGroup] = []
 
+    categorized_app_items = [
+        item
+        for item in BINDING_SPEC["editor"]
+        if item.get("help", True) and item.get("category") == "App"
+    ]
     app_rows = tuple(
         (
             _help_display_key(item),
             item.get("description") or item["name"],
-            _help_conflicted(item, conflicted_actions),
+            _help_conflicted(item, conflicted_triggers),
         )
-        for item in BINDING_SPEC["app"]["commands"]
+        for item in [*BINDING_SPEC["app"]["commands"], *categorized_app_items]
     )
     groups.append(KeyBindingHelpGroup("App", app_rows))
 
@@ -97,10 +111,10 @@ def binding_help_groups(
         (
             _help_display_key(item),
             item.get("description") or item["action"],
-            _help_conflicted(item, conflicted_actions),
+            _help_conflicted(item, conflicted_triggers),
         )
         for item in BINDING_SPEC["editor"]
-        if item.get("help", True)
+        if item.get("help", True) and item.get("category") != "App"
     )
     groups.append(KeyBindingHelpGroup("Editor", editor_rows))
 
@@ -122,40 +136,45 @@ def app_binding_display_key(
     action: str,
     key: str,
     *,
-    conflicted_actions: set[str] | None = None,
+    conflicted_triggers: set[str] | None = None,
 ) -> str:
+    conflicted_triggers = conflicted_triggers or set()
     item = _app_command_or_none(action)
     if item is None:
         return display_key(key)
-    if conflicted_actions is not None and action in conflicted_actions:
-        fallback = item.get("fallback_key")
-        if fallback:
-            return display_key(fallback)
-        return ""
-    return display_key(item.get("preferred_key") or key)
+    for display_key_candidate in _item_display_keys(item):
+        display = display_key(display_key_candidate)
+        if not _display_key_conflicted(display, conflicted_triggers):
+            return display
+    return ""
 
 
 def _help_conflicted(
     item: dict[str, Any],
-    conflicted_actions: set[str],
+    conflicted_triggers: set[str],
 ) -> bool:
-    action = item.get("name") or item.get("action")
-    return bool(
-        action in conflicted_actions
-        and item.get("preferred_key")
-        and not item.get("fallback_key")
+    return any(
+        _display_key_conflicted(display_key(key), conflicted_triggers)
+        for key in _item_display_keys(item)
     )
 
 
 def _help_display_key(item: dict[str, Any]) -> str:
-    preferred = item.get("preferred_key")
-    fallback = item.get("fallback_key")
-    if preferred and fallback:
-        return (
-            f"{display_key_with_symbols(display_key(preferred))} / "
-            f"{display_key_with_symbols(display_key(fallback))}"
-        )
-    return display_key_with_symbols(display_key(item["key"]))
+    return " / ".join(
+        display_key_with_symbols(display_key(key))
+        for key in _item_display_keys(item)
+    )
+
+
+def _item_display_keys(item: dict[str, Any]) -> list[str]:
+    display_keys = item.get("display_keys")
+    if isinstance(display_keys, list):
+        return [str(key) for key in display_keys]
+    return [str(item.get("preferred_key") or item["key"])]
+
+
+def _display_key_conflicted(key: str, conflicted_triggers: set[str]) -> bool:
+    return bool(_hotkey_conflict_triggers(key) & conflicted_triggers)
 
 
 def _app_command_or_none(action: str) -> dict[str, Any] | None:
@@ -209,7 +228,7 @@ def _display_base_key(key: str) -> str:
     return base_key.title()
 
 
-def ghostty_app_hotkey_conflicts(
+def ghostty_conflicted_hotkey_triggers(
     env: Mapping[str, str] | None = None,
     run_command: Callable[..., CompletedProcess[str]] = run,
     find_binary: Callable[[str], str | None] = which,
@@ -217,11 +236,11 @@ def ghostty_app_hotkey_conflicts(
     triggers = _ghostty_conflict_triggers()
     env = environ if env is None else env
     if env.get("TERM_PROGRAM") != "ghostty" and env.get("TERM") != "xterm-ghostty":
-        return set(triggers.values())
+        return set(triggers)
 
     ghostty = _ghostty_binary(find_binary)
     if ghostty is None:
-        return set(triggers.values())
+        return set(triggers)
 
     try:
         result = run_command(
@@ -233,14 +252,14 @@ def ghostty_app_hotkey_conflicts(
             check=False,
         )
     except Exception:
-        return set(triggers.values())
+        return set(triggers)
     if result.returncode != 0:
-        return set(triggers.values())
+        return set(triggers)
     conflicted_triggers = _ghostty_config_conflicted_triggers(
         result.stdout,
-        set(triggers),
+        triggers,
     )
-    return {triggers[trigger] for trigger in conflicted_triggers}
+    return conflicted_triggers
 
 
 def ghostty_markdown_preview_hotkey_conflicted(
@@ -248,7 +267,7 @@ def ghostty_markdown_preview_hotkey_conflicted(
     run_command: Callable[..., CompletedProcess[str]] = run,
     find_binary: Callable[[str], str | None] = which,
 ) -> bool:
-    return "toggle_markdown_preview" in ghostty_app_hotkey_conflicts(
+    return "super+shift+v" in ghostty_conflicted_hotkey_triggers(
         env,
         run_command,
         find_binary,
@@ -262,25 +281,38 @@ def _ghostty_binary(find_binary: Callable[[str], str | None]) -> str | None:
     return find_binary("ghostty")
 
 
-def _ghostty_conflict_triggers() -> dict[str, str]:
-    triggers: dict[str, str] = {}
+def _ghostty_conflict_triggers() -> set[str]:
+    triggers: set[str] = set()
     for item in [*APP_COMMANDS, *BINDING_SPEC["editor"]]:
         preferred_key = item.get("preferred_key")
         if not preferred_key:
             continue
-        action = item.get("name") or item.get("action")
-        if not action:
-            continue
         for candidate in preferred_key.split(","):
-            trigger = candidate.strip()
-            if "cmd" in trigger:
-                continue
-            if "super" in trigger or "alt" in trigger:
-                triggers[trigger] = action
-                break
+            triggers.update(_hotkey_conflict_triggers(candidate.strip()))
     return triggers
 
 
+def _hotkey_conflict_triggers(key: str) -> set[str]:
+    parts = key.split("+")
+    if "cmd" in parts:
+        return {
+            _canonical_hotkey_trigger(
+                "+".join("super" if part == "cmd" else part for part in parts)
+            )
+        }
+    if "super" in parts or "alt" in parts:
+        return {_canonical_hotkey_trigger(key)}
+    return set()
+
+
+def _canonical_hotkey_trigger(key: str) -> str:
+    parts = key.split("+")
+    modifiers = [part for part in parts[:-1] if part in KEY_MODIFIER_ORDER]
+    base_parts = [part for part in parts if part not in KEY_MODIFIER_ORDER]
+    ordered_modifiers = sorted(modifiers, key=lambda part: KEY_MODIFIER_ORDER[part])
+    return "+".join([*ordered_modifiers, *base_parts])
+
+
 def _ghostty_config_conflicted_triggers(
     config: str,
     triggers: set[str],
@@ -296,7 +328,7 @@ def _ghostty_config_conflicted_triggers(
         if key.strip() != "keybind":
             continue
         trigger, _, action = value.partition("=")
-        trigger = trigger.strip()
+        trigger = _canonical_hotkey_trigger(trigger.strip())
         if trigger not in triggers:
             continue
         if action.strip() != "unbind":

{riched-0.6.0 → riched-0.6.2}/src/riched/screens.py

@@ -354,16 +354,16 @@ class KeysHelpScreen(_DismissOnCloseScreen, ModalScreen[None]):
     }
     """
 
-    def __init__(self, conflicted_actions: set[str] | None = None) -> None:
+    def __init__(self, conflicted_triggers: set[str] | None = None) -> None:
         super().__init__()
-        self._conflicted_actions = conflicted_actions or set()
+        self._conflicted_triggers = conflicted_triggers or set()
 
     def compose(self) -> ComposeResult:
         has_warnings = False
         with Vertical(id="dialog"):
             yield Label("Key Bindings")
             with Vertical(id="bindings-list"):
-                for group in binding_help_groups(self._conflicted_actions):
+                for group in binding_help_groups(self._conflicted_triggers):
                     with Vertical(classes="binding-group"):
                         yield Static(group.title, classes="binding-title")
                         for key, description, conflicted in group.rows:

{riched-0.6.0 → riched-0.6.2}/tests/helpers.py

@@ -46,7 +46,7 @@ def _make_app(
     path: Path,
     root: Path | None = None,
     markdown_preview_hotkey_conflicted: bool | None = None,
-    ghostty_app_hotkey_conflicts: set[str] | None = None,
+    ghostty_conflicted_hotkey_triggers: set[str] | None = None,
 ):
     cls = type(
         "ConfiguredRichedApp",
@@ -54,15 +54,15 @@ def _make_app(
         {"BINDINGS": mod.build_bindings()},
     )
     app = cls(path, root or path.parent)
-    if ghostty_app_hotkey_conflicts is not None:
-        app._ghostty_app_hotkey_conflicts = ghostty_app_hotkey_conflicts
+    if ghostty_conflicted_hotkey_triggers is not None:
+        app._ghostty_conflicted_hotkey_triggers = ghostty_conflicted_hotkey_triggers
     if markdown_preview_hotkey_conflicted is not None:
-        conflicts = set(app._ghostty_app_hotkey_conflicts)
+        conflicts = set(app._ghostty_conflicted_hotkey_triggers)
         if markdown_preview_hotkey_conflicted:
-            conflicts.add("toggle_markdown_preview")
+            conflicts.add("super+shift+v")
         else:
-            conflicts.discard("toggle_markdown_preview")
-        app._ghostty_app_hotkey_conflicts = conflicts
+            conflicts.discard("super+shift+v")
+        app._ghostty_conflicted_hotkey_triggers = conflicts
     return app
 
 

{riched-0.6.0 → riched-0.6.2}/tests/test_command_palette.py

@@ -17,6 +17,16 @@ def _system_commands(app) -> dict[str, object]:
     return {command.title: command for command in app.get_system_commands(app.screen)}
 
 
+def _key_help_groups(app) -> dict[str, list[tuple[str, str]]]:
+    return {
+        group.children[0].content: [
+            (row.children[0].content, row.children[1].content)
+            for row in group.query(".binding-row")
+        ]
+        for group in app.screen.query(".binding-group")
+    }
+
+
 async def test_command_palette_button_is_hidden() -> None:
     app = _palette_app()
     async with app.run_test() as pilot:
@@ -72,7 +82,7 @@ async def test_command_palette_items_are_sorted_alphabetically() -> None:
 
 
 async def test_keys_help_includes_command_palette_binding() -> None:
-    app = _palette_app(ghostty_app_hotkey_conflicts=set())
+    app = _palette_app(ghostty_conflicted_hotkey_triggers=set())
     async with app.run_test() as pilot:
         await pilot.pause()
 
@@ -93,8 +103,33 @@ async def test_keys_help_includes_command_palette_binding() -> None:
         )
 
 
+async def test_keys_help_shows_format_document_under_app() -> None:
+    app = _palette_app(ghostty_conflicted_hotkey_triggers=set())
+    async with app.run_test() as pilot:
+        await pilot.pause()
+
+        app.action_show_keys_popup()
+        await pilot.pause()
+
+        groups = _key_help_groups(app)
+        assert ("⌥⇧F", "Format document") in groups["App"]
+        assert ("⌥⇧F", "Format document") not in groups["Editor"]
+
+
+async def test_keys_help_warns_for_conflicted_command_palette_alternative() -> None:
+    app = _palette_app(ghostty_conflicted_hotkey_triggers={"super+shift+p"})
+    async with app.run_test() as pilot:
+        await pilot.pause()
+
+        app.action_show_keys_popup()
+        await pilot.pause()
+
+        rows = _key_help_rows(app)
+        assert ("⚠️ ⌘⇧P / F1", "Command palette") in rows
+
+
 async def test_keys_help_warns_for_ghostty_conflicted_format_document() -> None:
-    app = _palette_app(ghostty_app_hotkey_conflicts={"format_document"})
+    app = _palette_app(ghostty_conflicted_hotkey_triggers={"alt+shift+f"})
     async with app.run_test() as pilot:
         await pilot.pause()
 

{riched-0.6.0 → riched-0.6.2}/tests/test_footer.py

@@ -5,7 +5,7 @@ from subprocess import CompletedProcess
 from textual.widgets import Footer
 
 from .helpers import _file_app, _footer_labels, _temporary_env
-from riched.keybindings import ghostty_app_hotkey_conflicts
+from riched.keybindings import ghostty_conflicted_hotkey_triggers
 
 
 def _footer_app(**kwargs):
@@ -14,7 +14,7 @@ def _footer_app(**kwargs):
 
 def _conflicts_from_config(*lines: str) -> set[str]:
     config = "\n".join(lines)
-    return ghostty_app_hotkey_conflicts(
+    return ghostty_conflicted_hotkey_triggers(
         env={"TERM_PROGRAM": "ghostty"},
         run_command=lambda *args, **kwargs: CompletedProcess(
             args[0],
@@ -27,7 +27,7 @@ def _conflicts_from_config(*lines: str) -> set[str]:
 
 
 async def test_footer_uses_macos_modifier_symbols_with_preferred_markdown_preview() -> None:
-    app = _footer_app(ghostty_app_hotkey_conflicts=set())
+    app = _footer_app(ghostty_conflicted_hotkey_triggers=set())
     async with app.run_test() as pilot:
         await pilot.pause()
         footer = app.query_one(Footer)
@@ -47,8 +47,8 @@ async def test_footer_uses_macos_modifier_symbols_with_preferred_markdown_previe
         assert not footer.query(".-command-palette")
 
 
-async def test_footer_uses_command_palette_fallback_for_ghostty_conflict() -> None:
-    app = _footer_app(ghostty_app_hotkey_conflicts={"command_palette"})
+async def test_footer_uses_command_palette_alternative_for_ghostty_conflict() -> None:
+    app = _footer_app(ghostty_conflicted_hotkey_triggers={"super+shift+p"})
     async with app.run_test() as pilot:
         await pilot.pause()
         footer = app.query_one(Footer)
@@ -58,7 +58,7 @@ async def test_footer_uses_command_palette_fallback_for_ghostty_conflict() -> No
 
 async def test_footer_uses_command_palette_preferred_when_ghostty_unbound() -> None:
     app = _footer_app(
-        ghostty_app_hotkey_conflicts=_conflicts_from_config(
+        ghostty_conflicted_hotkey_triggers=_conflicts_from_config(
             "keybind = super+shift+,=reload_config",
             "keybind = super+shift+v=toggle_quick_terminal",
         )
@@ -95,7 +95,7 @@ async def test_footer_hides_markdown_preview_outside_ghostty() -> None:
 
 async def test_footer_uses_markdown_preview_preferred_when_ghostty_unbound() -> None:
     app = _footer_app(
-        ghostty_app_hotkey_conflicts=_conflicts_from_config(
+        ghostty_conflicted_hotkey_triggers=_conflicts_from_config(
             "keybind = super+shift+,=reload_config",
             "keybind = super+shift+v=unbind",
         )

{riched-0.6.0 → riched-0.6.2}/tests/test_formatting.py

@@ -28,8 +28,22 @@ exit 2
     _write_executable(
         bin_dir / "prettier",
         """#!/bin/sh
+plugin=
+case "$1" in
+--plugin=*)
+  plugin=xml
+  shift
+  ;;
+esac
 if [ "$1" = "--file-info" ]; then
   case "$2" in
+    *.xml)
+      if [ "$plugin" = "xml" ]; then
+        printf '{ "ignored": false, "inferredParser": "xml" }\\n'
+      else
+        printf '{ "ignored": false, "inferredParser": null }\\n'
+      fi
+      ;;
     *.json|*.js) printf '{ "ignored": false, "inferredParser": "json" }\\n' ;;
     *) printf '{ "ignored": false, "inferredParser": null }\\n' ;;
   esac
@@ -41,10 +55,42 @@ if [ "$1" = "--stdin-filepath" ]; then
     exit 2
   fi
   cat >/dev/null
+  if [ "$plugin" = "xml" ]; then
+    printf '<root>\\n  <child />\\n</root>\\n'
+    exit 0
+  fi
   printf '{ "a": 1 }\\n'
   exit 0
 fi
 exit 2
+""",
+    )
+    _write_executable(
+        bin_dir / "taplo",
+        """#!/bin/sh
+if [ "$1" = "format" ]; then
+  cat >/dev/null
+  printf 'name = "riched"\\n'
+  exit 0
+fi
+exit 2
+""",
+    )
+    return bin_dir
+
+
+def _missing_xml_plugin_bin(tmp: Path) -> Path:
+    bin_dir = _formatter_bin(tmp)
+    _write_executable(
+        bin_dir / "prettier",
+        """#!/bin/sh
+case "$1" in
+--plugin=*)
+  printf "Cannot find package '@prettier/plugin-xml'\\n" >&2
+  exit 1
+  ;;
+esac
+exit 2
 """,
     )
     return bin_dir
@@ -75,6 +121,30 @@ async def test_format_document_uses_prettier_for_supported_files() -> None:
             assert path.read_text() == '{"a":1}'
 
 
+async def test_format_document_uses_taplo_for_toml() -> None:
+    tmp, path, app = _file_app("config.toml", 'name="riched"')
+    bin_dir = _formatter_bin(tmp)
+    with _temporary_env(PATH=f"{bin_dir}{os.pathsep}{os.environ.get('PATH', '')}"):
+        async with app.run_test() as pilot:
+            await pilot.pause()
+            editor = _editor(app)
+            await _press(pilot, "alt+shift+f")
+            assert editor.text == 'name = "riched"\n'
+            assert path.read_text() == 'name="riched"'
+
+
+async def test_format_document_uses_prettier_xml_plugin_for_xml() -> None:
+    tmp, path, app = _file_app("document.xml", "<root><child/></root>")
+    bin_dir = _formatter_bin(tmp)
+    with _temporary_env(PATH=f"{bin_dir}{os.pathsep}{os.environ.get('PATH', '')}"):
+        async with app.run_test() as pilot:
+            await pilot.pause()
+            editor = _editor(app)
+            await _press(pilot, "alt+shift+f")
+            assert editor.text == "<root>\n  <child />\n</root>\n"
+            assert path.read_text() == "<root><child/></root>"
+
+
 async def test_format_document_unsupported_file_notifies_without_change() -> None:
     tmp, _, app = _file_app("notes.txt", "plain text")
     bin_dir = _formatter_bin(tmp)
@@ -115,6 +185,50 @@ async def test_format_document_missing_formatter_notifies_without_change() -> No
             ]
 
 
+async def test_format_document_missing_taplo_notifies_without_change() -> None:
+    tmp, _, app = _file_app("config.toml", 'name="riched"')
+    empty_bin = tmp / "empty-bin"
+    empty_bin.mkdir()
+    notifications: list[tuple[str, str | None]] = []
+    app.notify = lambda message, **kwargs: notifications.append(
+        (str(message), kwargs.get("severity"))
+    )
+    with _temporary_env(PATH=str(empty_bin)):
+        async with app.run_test() as pilot:
+            await pilot.pause()
+            editor = _editor(app)
+            await _press(pilot, "alt+shift+f")
+            assert editor.text == 'name="riched"'
+            assert notifications == [
+                (
+                    "`taplo` is required for formatting. Install it and ensure it is on PATH.",
+                    "warning",
+                )
+            ]
+
+
+async def test_format_document_missing_xml_plugin_notifies_without_change() -> None:
+    tmp, _, app = _file_app("document.xml", "<root><child/></root>")
+    bin_dir = _missing_xml_plugin_bin(tmp)
+    notifications: list[tuple[str, str | None]] = []
+    app.notify = lambda message, **kwargs: notifications.append(
+        (str(message), kwargs.get("severity"))
+    )
+    with _temporary_env(PATH=f"{bin_dir}{os.pathsep}{os.environ.get('PATH', '')}"):
+        async with app.run_test() as pilot:
+            await pilot.pause()
+            editor = _editor(app)
+            await _press(pilot, "alt+shift+f")
+            assert editor.text == "<root><child/></root>"
+            assert notifications == [
+                (
+                    "`@prettier/plugin-xml` is required for formatting. "
+                    "Install it and ensure Prettier can load it.",
+                    "warning",
+                )
+            ]
+
+
 async def test_format_document_formatter_failure_notifies_without_change() -> None:
     tmp, _, app = _file_app("format-fail.js", "const value={a:1}")
     bin_dir = _formatter_bin(tmp)

{riched-0.6.0 → riched-0.6.2}/tests/test_markdown_preview.py

@@ -118,7 +118,7 @@ async def test_keys_help_includes_markdown_preview_binding() -> None:
         "README.md",
         "# Title",
         root_is_tmp=True,
-        ghostty_app_hotkey_conflicts=set(),
+        ghostty_conflicted_hotkey_triggers=set(),
     )
     async with app.run_test() as pilot:
         await pilot.pause()
@@ -135,7 +135,7 @@ async def test_keys_help_warns_for_ghostty_conflicted_markdown_preview() -> None
         "README.md",
         "# Title",
         root_is_tmp=True,
-        ghostty_app_hotkey_conflicts={"toggle_markdown_preview"},
+        ghostty_conflicted_hotkey_triggers={"super+shift+v"},
     )
     async with app.run_test() as pilot:
         await pilot.pause()

{riched-0.6.0 → riched-0.6.2}/uv.lock

@@ -131,7 +131,7 @@ wheels = [
 
 [[package]]
 name = "riched"
-version = "0.6.0"
+version = "0.6.2"
 source = { editable = "." }
 dependencies = [
     { name = "pyyaml" },