tamfis-code 0.6.5__tar.gz → 0.6.8__tar.gz

{tamfis_code-0.6.5/tamfis_code.egg-info → tamfis_code-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamfis-code
-Version: 0.6.5
+Version: 0.6.8
 Summary: TamfisGPT Code -- portable subscription-backed terminal coding agent with local tools, PTY, plans, queues, and approvals
 Project-URL: Homepage, https://github.com/tamfitronics/tamfis-code
 Project-URL: Repository, https://github.com/tamfitronics/tamfis-code

{tamfis_code-0.6.5 → tamfis_code-0.6.8}/USAGE_INSTALL_RELEASE.md

@@ -32,7 +32,7 @@ mutation ledger on the local machine.
 
 ## Interactive queue controls
 
-While a task is running, press `Ctrl+T` to open `queue next>`. The submitted
+While a task is running, press `Ctrl+Y` to open `queue next>`. The submitted
 line is echoed with a durable queue ID, then applied at the next safe model
 round boundary. Multiple queued updates are processed in order. A second
 terminal can enqueue the same session with:

{tamfis_code-0.6.5 → tamfis_code-0.6.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tamfis-code"
-version = "0.6.5"
+version = "0.6.8"
 description = "TamfisGPT Code -- portable subscription-backed terminal coding agent with local tools, PTY, plans, queues, and approvals"
 readme = "README.md"
 requires-python = ">=3.10"

{tamfis_code-0.6.5 → tamfis_code-0.6.8}/tamfis_code/__init__.py

@@ -17,7 +17,7 @@ See docs/REMOTE_AGENT_MASTER_SPEC.md, Phase 21, for the original --remote
 architecture's spec.
 """
 
-__version__ = "0.6.5"
+__version__ = "0.6.8"
 
 # Bumped whenever a CLI release requires a minimum backend Remote API
 # contract version. Only meaningful for --remote; the standalone path has no

{tamfis_code-0.6.5 → tamfis_code-0.6.8}/tamfis_code/interactive.py

@@ -111,7 +111,7 @@ $ <command>            explicit shell command
 /mode <name>         switch mode: manual | accept-edits | auto | plan
 Shift+Tab            cycle mode without typing a command (shown in the prompt as [mode]);
                      also works while a task is already running, not just at this prompt
-Ctrl+T               while a task is running: open the "queue next" input editor
+Ctrl+Y               while a task is running: open the "queue next" input editor (configurable)
 /model               show the active model route
 /model list [route]  list coding models (route: hf or openrouter)
 /model auto          restore Hugging Face -> OpenRouter automatic routing
@@ -373,9 +373,9 @@ async def run_interactive(
     console.print(
         "[dim]Type /help for commands. Paste up to 1,000,000 characters; Alt+Enter adds a newline. "
         "Shift+Tab cycles mode (manual/accept-edits/auto/plan) -- works while a task is running too, "
-        "not just at this prompt. Ctrl+T opens a visible `queue next>` editor while a task is running; "
+        "not just at this prompt. Ctrl+Y opens a visible `queue next>` editor while a task is running; "
         "your submitted text is acknowledged with a queue id and applied at the next safe round boundary. "
-        "Ctrl+D or Ctrl+C exits.[/dim]\n"
+        "The queue shortcut defaults to Ctrl+Y (Ctrl+T is reserved by Termius); Ctrl+D or Ctrl+C exits.[/dim]\n"
     )
 
     CONFIG_DIR.mkdir(parents=True, exist_ok=True)
@@ -990,7 +990,7 @@ async def run_interactive(
                     "/mode auto           auto-approves everything, never prompts (server safeguards still apply)\n"
                     "/mode plan           read-only: propose without executing\n"
                     "Shift+Tab            cycle manual -> accept-edits -> auto -> plan without typing a command\n"
-                    "                     (also works mid-task, not just here); Ctrl+T mid-task queues a follow-up\n"
+                    "                     (also works mid-task, not just here); Ctrl+Y mid-task queues a follow-up\n"
                     "Other raw policy values also work directly (--approval-only, no short alias): safe, workspace,\n"
                     "read-only, plan-only, suggest, full-auto, and 'never' -- note 'never' means DENY everything\n"
                     "(the opposite of what it sounds like; it is not a synonym for 'auto').[/dim]"

{tamfis_code-0.6.5 → tamfis_code-0.6.8}/tamfis_code/live_input.py

@@ -9,7 +9,7 @@ just when an approval prompt happens to be showing:
   runner.py's approval-gate Shift+Tab handler (`_prompt`'s own binding)
   already read from and write to, so this is not a second, competing mode
   concept, just another writer of the same value.
-- Ctrl+T opens a real line editor for the next instruction and queues it
+- Ctrl+Y opens a real line editor for the next instruction and queues it
   through the on-disk queue a second
   terminal's `tamfis-code queue "..."` already used
   (runner_local.py's `_claim_live_queued_instructions` polls it at the top
@@ -50,7 +50,25 @@ except ImportError:  # Windows -- no termios/tty; this feature just disables its
     _TTY_AVAILABLE = False
 
 _SHIFT_TAB = b"\x1b[Z"
-_CTRL_T = b"\x14"
+# Ctrl+T is reserved by Termius for opening a new terminal. Keep the queue
+# shortcut on Ctrl+Y by default, while allowing an operator to choose a local
+# key explicitly when another terminal client owns it.
+_CTRL_T = b"\x14"  # legacy/exported test constant; no longer the default
+_CTRL_Y = b"\x19"
+_QUEUE_KEY_ENV = "TAMFIS_CODE_QUEUE_KEY"
+
+
+def queue_key_bytes() -> tuple[bytes, str]:
+    value = os.environ.get(_QUEUE_KEY_ENV, "ctrl-y").strip().lower().replace(" ", "")
+    if value in {"ctrl-t", "^t"}:
+        return _CTRL_T, "Ctrl+T"
+    if value in {"ctrl-y", "^y", ""}:
+        return _CTRL_Y, "Ctrl+Y"
+    # Single control letters are convenient for terminal clients without
+    # reliable multi-key escape support: ctrl-a through ctrl-z.
+    if value.startswith("ctrl-") and len(value) == 6 and "a" <= value[-1] <= "z":
+        return bytes([ord(value[-1]) - ord("a") + 1]), f"Ctrl+{value[-1].upper()}"
+    return _CTRL_Y, "Ctrl+Y"
 _ESCAPE_PREFIXES = (b"\x1b", b"\x1b[")
 
 
@@ -127,10 +145,11 @@ class LiveInputListener:
         buf = bytes(self._buf)
         # os.read() is allowed to return more than one byte. A keypress can
         # therefore arrive together with terminal noise or a paste prefix;
-        # equality-only matching silently discarded Ctrl+T in that case and
+        # equality-only matching silently discarded the queue control byte in that case and
         # made the in-task editor appear broken. Consume the control byte
         # wherever it occurs, while keeping the editor single-flight.
-        if _CTRL_T in buf:
+        queue_key, _ = queue_key_bytes()
+        if queue_key in buf:
             self._buf.clear()
             if self._interject_task is None or self._interject_task.done():
                 self._interject_task = asyncio.ensure_future(self._interject())

{tamfis_code-0.6.5 → tamfis_code-0.6.8}/tamfis_code/render.py

@@ -411,9 +411,18 @@ class StreamRenderer:
         label = f"{mode_tag}[bold]{verb}…[/bold] [dim]({' · '.join(detail_parts)})[/dim]"
         self._spinner.update(text=Text.from_markup(label))
         tip = _current_tip(elapsed)
-        if not self._plan_steps and not tip:
+        if not self._plan_steps and not tip and self.live_input_listener is None:
             return self._spinner
         lines = []
+        if self.live_input_listener is not None:
+            # The ordinary REPL editor is suspended while the agent owns the
+            # terminal, but the input affordance must remain visible. Ctrl+T
+            # opens the coordinated editor without competing with Rich Live;
+            # this footer is rebuilt on every refresh and therefore never
+            # disappears behind the spinner or plan rows.
+            from .live_input import queue_key_bytes
+            _, queue_label = queue_key_bytes()
+            lines.append(f"  [cyan]Input:[/cyan] {queue_label} queue next> · Ctrl+C/Ctrl+D exit")
         if tip:
             lines.append(f"  [dim]{tip}[/dim]")
         for step in self._plan_steps:

{tamfis_code-0.6.5 → tamfis_code-0.6.8/tamfis_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamfis-code
-Version: 0.6.5
+Version: 0.6.8
 Summary: TamfisGPT Code -- portable subscription-backed terminal coding agent with local tools, PTY, plans, queues, and approvals
 Project-URL: Homepage, https://github.com/tamfitronics/tamfis-code
 Project-URL: Repository, https://github.com/tamfitronics/tamfis-code

{tamfis_code-0.6.5 → tamfis_code-0.6.8}/tests/test_live_input.py

@@ -8,7 +8,7 @@ from rich.console import Console
 
 from tamfis_code import state as state_module
 from tamfis_code.config import Config, next_mode_in_cycle
-from tamfis_code.live_input import LiveInputListener, _CTRL_T, _SHIFT_TAB
+from tamfis_code.live_input import LiveInputListener, _CTRL_T, _CTRL_Y, _SHIFT_TAB
 from tamfis_code.render import StreamRenderer
 
 
@@ -144,7 +144,7 @@ class CtrlTInjectsFollowUpTests(_StatePatchMixin, unittest.IsolatedAsyncioTestCa
             cfg = _config("ask")
             listener = LiveInputListener(session_id=1, renderer=renderer, cli_config=cfg)
             with patch.object(listener, "_interject", side_effect=_noop) as mocked:
-                listener._buf = bytearray(_CTRL_T)
+                listener._buf = bytearray(_CTRL_Y)
                 listener._dispatch()
                 self.assertEqual(bytes(listener._buf), b"")
                 await asyncio.sleep(0)  # let the scheduled task actually run
@@ -161,7 +161,7 @@ class CtrlTInjectsFollowUpTests(_StatePatchMixin, unittest.IsolatedAsyncioTestCa
                 await gate.wait()
 
             with patch.object(listener, "_interject", side_effect=_blocked) as mocked:
-                listener._buf = bytearray(_CTRL_T)
+                listener._buf = bytearray(_CTRL_Y)
                 listener._dispatch()
                 await asyncio.sleep(0)
                 listener._buf = bytearray(_CTRL_T)
@@ -180,7 +180,7 @@ class CtrlTInjectsFollowUpTests(_StatePatchMixin, unittest.IsolatedAsyncioTestCa
             cfg = _config("ask")
             listener = LiveInputListener(session_id=1, renderer=renderer, cli_config=cfg)
             with patch.object(listener, "_interject", new_callable=AsyncMock) as mocked:
-                listener._buf = bytearray(b"x" + _CTRL_T + b"y")
+                listener._buf = bytearray(b"x" + _CTRL_Y + b"y")
                 listener._dispatch()
                 await asyncio.sleep(0)
                 mocked.assert_awaited_once()

{tamfis_code-0.6.5 → tamfis_code-0.6.8}/tests/test_tamfis_code_render.py

@@ -181,6 +181,18 @@ class StreamRendererTests(unittest.TestCase):
         self.assertNotIn("Tip:", output)
         renderer.finish()
 
+    def test_running_status_keeps_live_input_affordance_visible(self):
+        console = Console(file=StringIO(), no_color=True, width=200, force_terminal=True)
+        renderer = StreamRenderer(console)
+        try:
+            renderer.live_input_listener = object()
+            console.print(renderer._build_status())
+            output = console.file.getvalue()
+            self.assertIn("Ctrl+Y queue next>", output)
+            self.assertIn("Ctrl+C/Ctrl+D exit", output)
+        finally:
+            renderer.finish()
+
     def test_all_tips_reference_real_commands_only(self):
         # Every tip must name a command that actually exists in cli.py's
         # registered command set (or a real REPL slash command) -- this