fix(macos-container): set host terminal to raw mode for container exec
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:
@@ -4,11 +4,16 @@ from __future__ import annotations
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
from typing import Callable, cast
|
||||
|
||||
from ...agent_provider import PromptMode, prompt_args
|
||||
from .. import Bottle, ExecResult
|
||||
from ..terminal import exec_shell_script
|
||||
from . import pty_forward as _pty_forward
|
||||
|
||||
|
||||
_PTY_FORWARD_SCRIPT = _pty_forward.__file__
|
||||
|
||||
|
||||
class MacosContainerBottle(Bottle):
|
||||
@@ -45,18 +50,25 @@ class MacosContainerBottle(Bottle):
|
||||
argv=full_argv,
|
||||
)
|
||||
)
|
||||
cmd = ["container", "exec"]
|
||||
container_exec = ["container", "exec"]
|
||||
if tty:
|
||||
cmd.extend(["--interactive", "--tty"])
|
||||
container_exec.extend(["--interactive", "--tty"])
|
||||
# Forward TERM so Claude Code can enable modifier-key protocols
|
||||
# (e.g. modifyOtherKeys). Without it the inner PTY session has no
|
||||
# TERM and Shift+Enter is indistinguishable from plain Enter.
|
||||
# (e.g. modifyOtherKeys / kitty protocol). Without it the inner
|
||||
# PTY session has no terminal-type context and Shift+Enter is
|
||||
# indistinguishable from plain Enter.
|
||||
term = os.environ.get("TERM", "xterm-256color")
|
||||
cmd.extend(["--env", f"TERM={term}"])
|
||||
container_exec.extend(["--env", f"TERM={term}"])
|
||||
if self.agent_workdir and self.agent_workdir != "/home/node":
|
||||
cmd.extend(["--workdir", self.agent_workdir])
|
||||
cmd.extend([self.name, self.agent_command, *full_argv])
|
||||
return cmd
|
||||
container_exec.extend(["--workdir", self.agent_workdir])
|
||||
container_exec.extend([self.name, self.agent_command, *full_argv])
|
||||
if tty:
|
||||
# Wrap with the raw-mode forwarder: container exec does not put
|
||||
# the host terminal into raw mode itself, so the line discipline
|
||||
# buffers modifier-key sequences until CR. The wrapper sets raw
|
||||
# mode before exec and restores it on exit.
|
||||
return [sys.executable, _PTY_FORWARD_SCRIPT, "--", *container_exec]
|
||||
return container_exec
|
||||
|
||||
def exec_agent(self, argv: list[str], *, tty: bool = True) -> int:
|
||||
agent_argv = self.agent_argv(argv, tty=tty)
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
"""Host-side raw-mode wrapper for `container exec --interactive --tty`.
|
||||
|
||||
Apple's `container exec --interactive --tty` does not set the host terminal to
|
||||
raw mode before starting its I/O relay. Without raw mode the kernel line
|
||||
discipline buffers modifier-key escape sequences (e.g. Shift+Enter in
|
||||
modifyOtherKeys mode produces \\x1b[13;2~) until a carriage-return arrives, so
|
||||
they never reach Claude Code inside the container.
|
||||
|
||||
This module sets the host terminal to raw mode, spawns the inner argv (the
|
||||
container exec command), and restores the original terminal attributes on
|
||||
exit. When stdin is not a TTY (piped invocations, CI) it falls through to a
|
||||
bare subprocess.run so callers do not need to special-case non-interactive
|
||||
contexts.
|
||||
|
||||
Usage (the `--` separator is the API contract — everything after it is the
|
||||
inner command):
|
||||
|
||||
python pty_forward.py -- container exec --interactive --tty <name> <cmd>
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import termios
|
||||
import tty
|
||||
|
||||
|
||||
def main(argv: list[str]) -> int:
|
||||
"""Entry point. ``argv`` shape: ``-- <inner-argv...>``."""
|
||||
if len(argv) < 2 or argv[0] != "--":
|
||||
sys.stderr.write(
|
||||
"usage: python pty_forward.py -- <container-exec-argv...>\n"
|
||||
)
|
||||
return 2
|
||||
inner = argv[1:]
|
||||
|
||||
try:
|
||||
fd = sys.stdin.fileno()
|
||||
except OSError:
|
||||
return subprocess.run(inner, check=False).returncode
|
||||
|
||||
if not os.isatty(fd):
|
||||
return subprocess.run(inner, check=False).returncode
|
||||
|
||||
try:
|
||||
old = termios.tcgetattr(fd)
|
||||
except termios.error:
|
||||
return subprocess.run(inner, check=False).returncode
|
||||
|
||||
try:
|
||||
tty.setraw(fd)
|
||||
return subprocess.run(inner, check=False).returncode
|
||||
finally:
|
||||
termios.tcsetattr(fd, termios.TCSADRAIN, old)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main(sys.argv[1:]))
|
||||
Reference in New Issue
Block a user