fix(macos-container): set host terminal to raw mode for container exec
lint / lint (push) Failing after 1m42s
test / unit (pull_request) Successful in 33s
test / integration (pull_request) Successful in 19s

Apple's container exec --interactive --tty does not put the host
terminal into raw mode before starting its I/O relay.  In cooked
(canonical) mode the kernel line discipline buffers modifier-key
escape sequences — e.g. Shift+Enter in modifyOtherKeys mode generates
\x1b[13;2~ — until a carriage-return arrives, so they never reach
Claude Code inside the container.

Add pty_forward.py, a stdlib-only wrapper (modelled on the existing
smolmachines pty_resize.py) that sets the host terminal to raw mode
via tty.setraw(), spawns the container exec command, and restores the
original terminal attributes on exit.  Falls back to a bare
subprocess.run when stdin is not a TTY (piped invocations, CI) or
when termios operations fail.

Also retain the --env TERM=<host> forwarding from the previous commit:
without TERM inside the container session, Claude Code cannot determine
which modifier-key protocol to enable even with raw mode correctly set.

Non-TTY exec paths (bottle.exec, cp_in) are unaffected.
This commit is contained in:
2026-06-23 02:30:46 +00:00
parent 25ca14a8a2
commit 1c11110da5
4 changed files with 224 additions and 12 deletions
+8 -4
View File
@@ -2,15 +2,16 @@
from __future__ import annotations
import sys
import unittest
from unittest.mock import patch
from bot_bottle.backend.macos_container import bottle as bottle_mod
from bot_bottle.backend.macos_container.bottle import MacosContainerBottle
from bot_bottle.backend.macos_container.bottle import MacosContainerBottle, _PTY_FORWARD_SCRIPT
class TestMacosContainerBottle(unittest.TestCase):
def test_agent_argv_uses_container_exec(self):
def test_agent_argv_uses_pty_forward_and_container_exec(self):
bottle = MacosContainerBottle(
"bot-bottle-dev-abc",
lambda: None,
@@ -21,6 +22,7 @@ class TestMacosContainerBottle(unittest.TestCase):
argv = bottle.agent_argv(["run"])
self.assertEqual(
[
sys.executable, _PTY_FORWARD_SCRIPT, "--",
"container", "exec", "--interactive", "--tty",
"--env", "TERM=xterm-256color",
"bot-bottle-dev-abc", "codex", "run",
@@ -39,6 +41,7 @@ class TestMacosContainerBottle(unittest.TestCase):
argv = bottle.agent_argv([])
self.assertEqual(
[
sys.executable, _PTY_FORWARD_SCRIPT, "--",
"container", "exec", "--interactive", "--tty",
"--env", "TERM=xterm-256color",
"--workdir", "/home/node/workspace",
@@ -51,7 +54,6 @@ class TestMacosContainerBottle(unittest.TestCase):
bottle = MacosContainerBottle("bot-bottle-dev-abc", lambda: None, None)
with patch.dict(bottle_mod.os.environ, {"TERM": "screen-256color"}, clear=False):
argv = bottle.agent_argv([])
self.assertIn("--env", argv)
self.assertIn("TERM=screen-256color", argv)
def test_agent_argv_term_falls_back_to_xterm_256color(self):
@@ -61,11 +63,13 @@ class TestMacosContainerBottle(unittest.TestCase):
argv = bottle.agent_argv([])
self.assertIn("TERM=xterm-256color", argv)
def test_agent_argv_no_tty_omits_term(self):
def test_agent_argv_no_tty_omits_wrapper_and_tty_flags(self):
bottle = MacosContainerBottle("bot-bottle-dev-abc", lambda: None, None)
argv = bottle.agent_argv([], tty=False)
self.assertNotIn("--tty", argv)
self.assertNotIn("--env", argv)
self.assertNotIn(_PTY_FORWARD_SCRIPT, argv)
self.assertEqual(["container", "exec", "bot-bottle-dev-abc", "claude"], argv)
def test_exec_pipes_script_to_shell(self):
bottle = MacosContainerBottle("bot-bottle-dev-abc", lambda: None, None)