limbo-code 0.1.12__tar.gz → 0.1.13__tar.gz

{limbo_code-0.1.12 → limbo_code-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: limbo-code
-Version: 0.1.12
+Version: 0.1.13
 Summary: A minimal terminal AI coding agent
 Requires-Python: >=3.11
 Requires-Dist: httpx>=0.27
@@ -183,6 +183,23 @@ Optional tool settings:
 bash_enabled = true
 ```
 
+Optional UI settings:
+
+```toml
+[ui]
+kitty_keyboard = "auto"   # auto (default) | enabled | disabled
+```
+
+`kitty_keyboard` controls Textual's kitty keyboard protocol. The default
+`auto` disables it only when Limbo runs inside the **herdr** multiplexer:
+herdr mirrors a pane's `REPORT_ALL_KEYS` request to the host terminal
+(e.g. Ghostty), and Ghostty then encodes IME commits as the physical commit
+key (space) while dropping the composed text — typing Chinese turns into
+spaces (pasting is unaffected). With the protocol disabled, herdr keeps
+IME-compatible host flags and committed IME text arrives as raw UTF-8. Use
+`enabled` to always keep the protocol (e.g. in a direct Ghostty/kitty
+terminal), or `disabled` to force raw/legacy input everywhere.
+
 ### Session storage
 
 Conversations are saved as JSONL files in `~/.limbo/sessions/` so you can

{limbo_code-0.1.12 → limbo_code-0.1.13}/README.md

@@ -169,6 +169,23 @@ Optional tool settings:
 bash_enabled = true
 ```
 
+Optional UI settings:
+
+```toml
+[ui]
+kitty_keyboard = "auto"   # auto (default) | enabled | disabled
+```
+
+`kitty_keyboard` controls Textual's kitty keyboard protocol. The default
+`auto` disables it only when Limbo runs inside the **herdr** multiplexer:
+herdr mirrors a pane's `REPORT_ALL_KEYS` request to the host terminal
+(e.g. Ghostty), and Ghostty then encodes IME commits as the physical commit
+key (space) while dropping the composed text — typing Chinese turns into
+spaces (pasting is unaffected). With the protocol disabled, herdr keeps
+IME-compatible host flags and committed IME text arrives as raw UTF-8. Use
+`enabled` to always keep the protocol (e.g. in a direct Ghostty/kitty
+terminal), or `disabled` to force raw/legacy input everywhere.
+
 ### Session storage
 
 Conversations are saved as JSONL files in `~/.limbo/sessions/` so you can

{limbo_code-0.1.12 → limbo_code-0.1.13}/src/limbo/app.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import argparse
+import os
 import sys
 from pathlib import Path
 
@@ -15,11 +16,24 @@ from limbo.sessions import (
     latest_session,
     load_session,
 )
-from limbo.ui.app import LimboApp
 
 DEFAULT_SESSION_DIR = Path.home() / ".limbo" / "sessions"
 
 
+def _apply_kitty_keyboard_workaround(config) -> None:
+    """Apply the `ui.kitty_keyboard` setting before Textual initializes.
+
+    Textual reads TEXTUAL_DISABLE_KITTY_KEY at import time, so this must run
+    before the first `textual` import. See KittyKeyboardMode for why typing
+    Chinese inside the herdr multiplexer turns into spaces when the kitty
+    keyboard protocol is enabled.
+    """
+    if config.ui.kitty_keyboard.disable_textual_kitty_key(
+        in_herdr=bool(os.environ.get("HERDR_ENV"))
+    ):
+        os.environ["TEXTUAL_DISABLE_KITTY_KEY"] = "1"
+
+
 def main() -> int:
     parser = argparse.ArgumentParser(description="Limbo TUI coding agent")
     parser.add_argument(
@@ -55,6 +69,7 @@ def main() -> int:
     args = parser.parse_args()
 
     config = load_config()
+    _apply_kitty_keyboard_workaround(config)
     if args.model:
         config.llm.model = args.model
     spec = resolve_model(config.llm.model)
@@ -97,6 +112,8 @@ def main() -> int:
         if meta.workdir and Path(meta.workdir).is_dir():
             workdir = Path(meta.workdir)
 
+    from limbo.ui.app import LimboApp  # noqa: I001, PLC0415 - deferred so the kitty keyboard workaround runs first
+
     app = LimboApp(
         workdir=workdir,
         config=config,

{limbo_code-0.1.12 → limbo_code-0.1.13}/src/limbo/config.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import warnings
+from enum import Enum
 from pathlib import Path
 from typing import Any
 
@@ -132,12 +133,45 @@ class ProviderOverride(BaseModel):
     headers: dict[str, str] = Field(default_factory=dict)
 
 
+class KittyKeyboardMode(str, Enum):
+    """How Limbo negotiates Textual's kitty keyboard protocol.
+
+    Textual 8.2.8 requests the kitty keyboard protocol with ``REPORT_ALL_KEYS``.
+    Inside the herdr multiplexer, herdr mirrors that request to the host
+    terminal (e.g. Ghostty), and Ghostty then encodes IME commits as the
+    physical commit key (space) while dropping the composed text — typing
+    Chinese turns into spaces (pasting is unaffected, it bypasses the key
+    encoder). Disabling the protocol makes herdr negotiate IME-compatible host
+    flags so committed IME text arrives as raw UTF-8.
+    """
+
+    # Disable only inside the herdr multiplexer (detected via HERDR_ENV);
+    # keep the protocol everywhere else. Safe default for CJK users.
+    AUTO = "auto"
+    # Always request the kitty keyboard protocol (Textual's default behavior).
+    ENABLED = "enabled"
+    # Never request it — forces raw/legacy terminal input everywhere.
+    DISABLED = "disabled"
+
+    def disable_textual_kitty_key(self, *, in_herdr: bool) -> bool:
+        """Whether Textual's kitty keyboard protocol should be disabled."""
+        return self is KittyKeyboardMode.DISABLED or (
+            self is KittyKeyboardMode.AUTO and in_herdr
+        )
+
+
 class UIConfig(BaseModel):
     # Theme name: built-in "limbo-dark" (default) / "limbo-light", or any
     # Textual built-in theme (e.g. "textual-dark", "dracula", "nord").
     theme: str | None = None
     # Show the startup ASCII-art banner on fresh sessions.
     show_banner: bool = True
+    # Kitty keyboard protocol handling (see KittyKeyboardMode):
+    #   auto     - enable normally, except inside the herdr multiplexer where
+    #              it breaks IME/Chinese input (default)
+    #   enabled  - always request the kitty keyboard protocol
+    #   disabled - never request it (forces raw/legacy terminal input)
+    kitty_keyboard: KittyKeyboardMode = KittyKeyboardMode.AUTO
 
 
 class SafetyConfig(BaseModel):

{limbo_code-0.1.12 → limbo_code-0.1.13}/tests/test_cli.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import os
 import sys
 from pathlib import Path
 from unittest.mock import MagicMock
@@ -9,6 +10,7 @@ from unittest.mock import MagicMock
 import pytest
 
 import limbo.app as app_module
+import limbo.ui.app as ui_app_module
 from limbo.app import main
 from limbo.config import Config
 
@@ -23,7 +25,7 @@ def fake_config(monkeypatch):
 
 def test_cli_passes_session_dir(fake_config, monkeypatch):
     mock_app_class = MagicMock()
-    monkeypatch.setattr(app_module, "LimboApp", mock_app_class)
+    monkeypatch.setattr(ui_app_module, "LimboApp", mock_app_class)
     monkeypatch.setattr(
         sys,
         "argv",
@@ -40,7 +42,7 @@ def test_cli_passes_session_dir(fake_config, monkeypatch):
 
 def test_cli_defaults_session_dir_to_none(fake_config, monkeypatch):
     mock_app_class = MagicMock()
-    monkeypatch.setattr(app_module, "LimboApp", mock_app_class)
+    monkeypatch.setattr(ui_app_module, "LimboApp", mock_app_class)
     monkeypatch.setattr(sys, "argv", ["limbo"])
 
     assert main() == 0
@@ -70,7 +72,7 @@ def test_cli_continue_resumes_latest_for_workdir(fake_config, monkeypatch, tmp_p
     path = _write_session(session_dir, "abc123", project)
 
     mock_app_class = MagicMock()
-    monkeypatch.setattr(app_module, "LimboApp", mock_app_class)
+    monkeypatch.setattr(ui_app_module, "LimboApp", mock_app_class)
     monkeypatch.setattr(
         sys,
         "argv",
@@ -91,7 +93,7 @@ def test_cli_continue_resumes_latest_for_workdir(fake_config, monkeypatch, tmp_p
 
 
 def test_cli_continue_without_sessions_fails(fake_config, monkeypatch, tmp_path, capsys):
-    monkeypatch.setattr(app_module, "LimboApp", MagicMock())
+    monkeypatch.setattr(ui_app_module, "LimboApp", MagicMock())
     monkeypatch.setattr(
         sys,
         "argv",
@@ -118,7 +120,7 @@ def test_cli_resume_by_id_prefix_switches_workdir(
     path = _write_session(session_dir, "def456", project)
 
     mock_app_class = MagicMock()
-    monkeypatch.setattr(app_module, "LimboApp", mock_app_class)
+    monkeypatch.setattr(ui_app_module, "LimboApp", mock_app_class)
     monkeypatch.setattr(
         sys,
         "argv",
@@ -133,7 +135,7 @@ def test_cli_resume_by_id_prefix_switches_workdir(
 
 
 def test_cli_resume_unknown_id_fails(fake_config, monkeypatch, tmp_path, capsys):
-    monkeypatch.setattr(app_module, "LimboApp", MagicMock())
+    monkeypatch.setattr(ui_app_module, "LimboApp", MagicMock())
     monkeypatch.setattr(
         sys,
         "argv",
@@ -151,7 +153,7 @@ def test_cli_resume_ambiguous_id_lists_candidates(
     _write_session(session_dir, "abc1", tmp_path)
     _write_session(session_dir, "abc2", tmp_path)
 
-    monkeypatch.setattr(app_module, "LimboApp", MagicMock())
+    monkeypatch.setattr(ui_app_module, "LimboApp", MagicMock())
     monkeypatch.setattr(
         sys,
         "argv",
@@ -165,7 +167,7 @@ def test_cli_resume_ambiguous_id_lists_candidates(
 
 def test_cli_model_flag_overrides_config(fake_config, monkeypatch):
     mock_app_class = MagicMock()
-    monkeypatch.setattr(app_module, "LimboApp", mock_app_class)
+    monkeypatch.setattr(ui_app_module, "LimboApp", mock_app_class)
     monkeypatch.setattr(sys, "argv", ["limbo", "--model", "glm-4.7"])
 
     assert main() == 0
@@ -173,3 +175,70 @@ def test_cli_model_flag_overrides_config(fake_config, monkeypatch):
     assert fake_config.llm.model == "glm-4.7"
     kwargs = mock_app_class.call_args.kwargs
     assert kwargs["config"].llm.model == "glm-4.7"
+
+
+def _probe_kitty_env(home: Path, herdr: bool) -> str:
+    """Import limbo.app in a subprocess with a controlled HOME + HERDR_ENV and
+    report whether TEXTUAL_DISABLE_KITTY_KEY ended up set."""
+    import subprocess
+    import sys
+
+    probe = (
+        "import os, sys; "
+        "sys.argv = ['limbo']; "
+        "import limbo.app; "
+        "limbo.app.main(); "
+        "print(os.environ.get('TEXTUAL_DISABLE_KITTY_KEY', ''))"
+    )
+    env = os.environ.copy()
+    env["HOME"] = str(home)
+    env.pop("TEXTUAL_DISABLE_KITTY_KEY", None)
+    if herdr:
+        env["HERDR_ENV"] = "1"
+    else:
+        env.pop("HERDR_ENV", None)
+    run = subprocess.run(
+        [sys.executable, "-c", probe],
+        capture_output=True,
+        text=True,
+        env=env,
+        cwd=os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+    )
+    assert run.returncode == 0, run.stderr
+    return run.stdout.strip()
+
+
+def test_kitty_keyboard_config_drives_textual_env(tmp_path):
+    """The `ui.kitty_keyboard` config option decides Textual's
+    TEXTUAL_DISABLE_KITTY_KEY, not raw environment sniffing.
+
+    Without the workaround, Textual's kitty keyboard REPORT_ALL_KEYS request
+    makes herdr mirror report-all to the host terminal (Ghostty), and Ghostty
+    then encodes IME commits as the physical commit key (space) while dropping
+    the composed text — typing Chinese turns into spaces. Pasting is
+    unaffected because it bypasses the key encoder.
+    """
+    home = tmp_path / "home"
+    (home / ".limbo").mkdir(parents=True)
+    config = home / ".limbo" / "config.toml"
+
+    # auto (default) + inside herdr -> disable (the IME fix)
+    config.write_text('[ui]\nkitty_keyboard = "auto"\n')
+    assert _probe_kitty_env(home, herdr=True) == "1"
+    # auto + direct terminal -> keep the kitty keyboard protocol
+    assert _probe_kitty_env(home, herdr=False) == ""
+    # enabled + herdr -> user opted out of the workaround
+    config.write_text('[ui]\nkitty_keyboard = "enabled"\n')
+    assert _probe_kitty_env(home, herdr=True) == ""
+    # disabled everywhere
+    config.write_text('[ui]\nkitty_keyboard = "disabled"\n')
+    assert _probe_kitty_env(home, herdr=False) == "1"
+
+
+def test_kitty_keyboard_config_defaults_to_auto(tmp_path):
+    """Without a config file the default is `auto`: inside herdr the
+    workaround is on, elsewhere the kitty keyboard protocol stays enabled."""
+    home = tmp_path / "home"
+    (home / ".limbo").mkdir(parents=True)
+    assert _probe_kitty_env(home, herdr=True) == "1"
+    assert _probe_kitty_env(home, herdr=False) == ""

{limbo_code-0.1.12 → limbo_code-0.1.13}/tests/test_config.py

@@ -4,7 +4,12 @@ from pathlib import Path
 
 import pytest
 
-from limbo.config import Config, load_config, save_model_to_config
+from limbo.config import (
+    Config,
+    KittyKeyboardMode,
+    load_config,
+    save_model_to_config,
+)
 
 
 def test_default_config():
@@ -218,3 +223,28 @@ def test_save_model_unwritable_path_returns_false(tmp_path):
         assert save_model_to_config("glm-4.7", path) is False
     finally:
         os.chmod(tmp_path, 0o700)
+
+
+def test_kitty_keyboard_default_is_auto():
+    cfg = Config()
+    assert cfg.ui.kitty_keyboard == KittyKeyboardMode.AUTO
+
+
+def test_kitty_keyboard_mode_from_toml(tmp_path):
+    path = tmp_path / "kitty.toml"
+    path.write_text('[ui]\nkitty_keyboard = "disabled"\n')
+    assert load_config(path).ui.kitty_keyboard is KittyKeyboardMode.DISABLED
+
+    path.write_text('[ui]\nkitty_keyboard = "enabled"\n')
+    assert load_config(path).ui.kitty_keyboard is KittyKeyboardMode.ENABLED
+
+
+def test_kitty_keyboard_mode_disable_decision():
+    # auto: disable only inside the herdr multiplexer (IME fix), keep the
+    # kitty keyboard protocol everywhere else.
+    assert KittyKeyboardMode.AUTO.disable_textual_kitty_key(in_herdr=True)
+    assert not KittyKeyboardMode.AUTO.disable_textual_kitty_key(in_herdr=False)
+    # enabled: never disable (opt out of the workaround).
+    assert not KittyKeyboardMode.ENABLED.disable_textual_kitty_key(in_herdr=True)
+    # disabled: always force raw/legacy input.
+    assert KittyKeyboardMode.DISABLED.disable_textual_kitty_key(in_herdr=False)