comate-cli 0.7.0a6__tar.gz → 0.7.0a7__tar.gz

{comate_cli-0.7.0a6 → comate_cli-0.7.0a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.7.0a6
+Version: 0.7.0a7
 Summary: Comate terminal CLI built on comate-agent-sdk
 Project-URL: Homepage, https://github.com/AndyLee1024/agent-sdk
 Project-URL: Repository, https://github.com/AndyLee1024/agent-sdk

{comate_cli-0.7.0a6 → comate_cli-0.7.0a7}/comate_cli/terminal_agent/tui_parts/input_behavior.py

@@ -5,6 +5,7 @@ from bisect import bisect_right
 from typing import Any
 
 from prompt_toolkit.document import Document
+from prompt_toolkit.keys import Keys
 
 from comate_agent_sdk.agent.chat_session import ChatSessionQueueFullError
 
@@ -229,15 +230,42 @@ class InputBehaviorMixin:
             getattr(self, "_paste_guard_active_until", 0.0)
         )
 
-    def _should_treat_enter_as_pasted_newline(self, buffer: Any) -> bool:
-        if not self._is_paste_guard_active():
+    @staticmethod
+    def _key_press_looks_like_paste_continuation(key_press: Any) -> bool:
+        key = getattr(key_press, "key", None)
+        if isinstance(key, Keys):
+            return False
+        return isinstance(key, str) and len(key) == 1
+
+    def _event_has_queued_paste_continuation(self, event: Any | None) -> bool:
+        if event is None:
             return False
+        try:
+            queued_keys = tuple(event.key_processor.input_queue)
+        except Exception:
+            return False
+        return any(
+            self._key_press_looks_like_paste_continuation(key_press)
+            for key_press in queued_keys
+        )
+
+    def _should_treat_enter_as_pasted_newline(
+        self,
+        buffer: Any,
+        event: Any | None = None,
+    ) -> bool:
         if getattr(buffer, "complete_state", None) is not None:
             return False
+        if not self._is_paste_guard_active():
+            return self._event_has_queued_paste_continuation(event)
         return True
 
-    def _handle_normal_enter_key(self, buffer: Any) -> bool:
-        if not self._should_treat_enter_as_pasted_newline(buffer):
+    def _handle_normal_enter_key(
+        self,
+        buffer: Any,
+        event: Any | None = None,
+    ) -> bool:
+        if not self._should_treat_enter_as_pasted_newline(buffer, event):
             return False
         buffer.insert_text("\n")
         self._extend_paste_guard()

{comate_cli-0.7.0a6 → comate_cli-0.7.0a7}/comate_cli/terminal_agent/tui_parts/key_bindings.py

@@ -411,7 +411,7 @@ class KeyBindingsMixin:
         @bindings.add("enter", filter=normal_mode, eager=True)
         def _enter(event) -> None:
             buffer = event.current_buffer
-            if self._handle_normal_enter_key(buffer):
+            if self._handle_normal_enter_key(buffer, event):
                 return
 
             cs = buffer.complete_state

{comate_cli-0.7.0a6 → comate_cli-0.7.0a7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "comate-cli"
-version = "0.7.0a6"
+version = "0.7.0a7"
 description = "Comate terminal CLI built on comate-agent-sdk"
 readme = "README.md"
 requires-python = ">=3.11"

{comate_cli-0.7.0a6 → comate_cli-0.7.0a7}/tests/test_tui_paste_newline_guard.py

@@ -2,6 +2,10 @@ from __future__ import annotations
 
 import time
 import unittest
+from collections import deque
+
+from prompt_toolkit.key_binding.key_processor import KeyPress
+from prompt_toolkit.keys import Keys
 
 from comate_cli.terminal_agent.tui import TerminalAgentTUI, UIMode
 
@@ -38,6 +42,16 @@ class _FakeInputArea:
         self.buffer = _FakeBuffer(text)
 
 
+class _FakeKeyProcessor:
+    def __init__(self, queued_keys: list[KeyPress]) -> None:
+        self.input_queue = deque(queued_keys)
+
+
+class _FakeEvent:
+    def __init__(self, queued_keys: list[KeyPress]) -> None:
+        self.key_processor = _FakeKeyProcessor(queued_keys)
+
+
 def _build_tui() -> TerminalAgentTUI:
     tui = TerminalAgentTUI.__new__(TerminalAgentTUI)
     tui._ui_mode = UIMode.NORMAL
@@ -155,6 +169,54 @@ class TestTUIPasteNewlineGuard(unittest.TestCase):
         self.assertFalse(handled)
         self.assertEqual(buffer.text, "hello")
 
+    def test_queued_printable_input_after_enter_is_treated_as_paste_newline(
+        self,
+    ) -> None:
+        tui = _build_tui()
+        buffer = _FakeBuffer("line1")
+        event = _FakeEvent([KeyPress("l", "l"), KeyPress("i", "i")])
+
+        handled = tui._handle_normal_enter_key(buffer, event)
+
+        self.assertTrue(handled)
+        self.assertEqual(buffer.text, "line1\n")
+        self.assertTrue(tui._is_paste_guard_active())
+
+    def test_queued_newline_then_text_after_enter_is_treated_as_paste_newline(
+        self,
+    ) -> None:
+        tui = _build_tui()
+        buffer = _FakeBuffer("line1")
+        event = _FakeEvent([KeyPress(Keys.ControlM, "\r"), KeyPress("l", "l")])
+
+        handled = tui._handle_normal_enter_key(buffer, event)
+
+        self.assertTrue(handled)
+        self.assertEqual(buffer.text, "line1\n")
+        self.assertTrue(tui._is_paste_guard_active())
+
+    def test_queued_newline_only_after_enter_does_not_arm_guard(self) -> None:
+        tui = _build_tui()
+        buffer = _FakeBuffer("hello")
+        event = _FakeEvent([KeyPress(Keys.ControlM, "\r")])
+
+        handled = tui._handle_normal_enter_key(buffer, event)
+
+        self.assertFalse(handled)
+        self.assertEqual(buffer.text, "hello")
+        self.assertFalse(tui._is_paste_guard_active())
+
+    def test_queued_non_text_input_after_enter_does_not_arm_guard(self) -> None:
+        tui = _build_tui()
+        buffer = _FakeBuffer("hello")
+        event = _FakeEvent([KeyPress(Keys.Up, "\x1b[A")])
+
+        handled = tui._handle_normal_enter_key(buffer, event)
+
+        self.assertFalse(handled)
+        self.assertEqual(buffer.text, "hello")
+        self.assertFalse(tui._is_paste_guard_active())
+
     def test_completion_menu_enter_is_not_intercepted_by_guard(self) -> None:
         tui = _build_tui()
         buffer = _FakeBuffer("/he")