didericis-claude
1c11110da5
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.
61 lines
1.8 KiB
Python
61 lines
1.8 KiB
Python
"""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:]))
|