didericis/bot-bottle
1
0
Fork 0
Code Issues 7 Pull Requests 15 Actions Packages Projects Releases Wiki Activity

Fix Shift+Enter not working in macos-container TUI #246

Merged
didericis merged 4 commits from fix-macos-container-shift-enter into main 2026-06-22 23:42:25 -04:00
Conversation 0 Commits 4 Files Changed 4
+323 -9
didericis-claude commented 2026-06-22 21:53:48 -04:00
Collaborator
Copy Link
Copy Source

Closes #245.

Summary

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.

Two changes land together:

  1. pty_forward.py — a new 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.

  2. --env TERM=<host> — retained from the first attempt: without TERM inside the container session, Claude Code cannot determine which modifier-key protocol to enable (modifyOtherKeys, kitty keyboard protocol) even with raw mode correctly set.

Changed files:

Closes #245. ## Summary 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. Two changes land together: 1. **`pty_forward.py`** — a new 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. 2. **`--env TERM=<host>`** — retained from the first attempt: without `TERM` inside the container session, Claude Code cannot determine which modifier-key protocol to enable (`modifyOtherKeys`, kitty keyboard protocol) even with raw mode correctly set. Changed files: - [`bot_bottle/backend/macos_container/pty_forward.py`](https://gitea.dideric.is/didericis/bot-bottle/src/commit/1c11110da529846b991561a50761ed1b4cbc785f/bot_bottle/backend/macos_container/pty_forward.py) — new raw-mode wrapper - [`bot_bottle/backend/macos_container/bottle.py`](https://gitea.dideric.is/didericis/bot-bottle/src/commit/1c11110da529846b991561a50761ed1b4cbc785f/bot_bottle/backend/macos_container/bottle.py) — `agent_argv` wraps TTY execs with `pty_forward.py` and forwards `TERM` - [`tests/unit/test_macos_container_bottle.py`](https://gitea.dideric.is/didericis/bot-bottle/src/commit/1c11110da529846b991561a50761ed1b4cbc785f/tests/unit/test_macos_container_bottle.py) — updated argv assertions - [`tests/unit/test_macos_container_pty_forward.py`](https://gitea.dideric.is/didericis/bot-bottle/src/commit/1c11110da529846b991561a50761ed1b4cbc785f/tests/unit/test_macos_container_pty_forward.py) — 8 new tests covering argv parsing, non-TTY fallback, and raw-mode setup/restore
didericis-claude added 1 commit 2026-06-22 21:53:49 -04:00
fix(macos-container): forward TERM env var in container exec --tty
lint / lint (push) Successful in 1m41s
Details
test / unit (pull_request) Successful in 36s
Details
test / integration (pull_request) Successful in 21s
Details
25ca14a8a2 
Without TERM, Claude Code inside the container cannot determine which
modifier-key protocol to enable (modifyOtherKeys / kitty). The inner
PTY session has no terminal-type context, so Shift+Enter and Enter
produce identical byte sequences (\r), making them indistinguishable.

Pass the host TERM via --env TERM=<value> on every container exec
--interactive --tty call, falling back to xterm-256color when TERM
is not set on the host. Non-TTY exec paths are unaffected.

Closes #245
didericis added 1 commit 2026-06-22 22:30:57 -04:00
fix(macos-container): set host terminal to raw mode for container exec
lint / lint (push) Failing after 1m42s
Details
test / unit (pull_request) Successful in 33s
Details
test / integration (pull_request) Successful in 19s
Details
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.
didericis added 1 commit 2026-06-22 22:57:38 -04:00
fix(macos-container): forward terminal capability env
lint / lint (push) Failing after 1m48s
Details
test / unit (pull_request) Successful in 34s
Details
test / integration (pull_request) Successful in 20s
Details
31b29631b6
didericis added 1 commit 2026-06-22 23:02:11 -04:00
test(macos-container): satisfy pyright mock typing
test / unit (pull_request) Successful in 33s
Details
test / integration (pull_request) Successful in 18s
Details
lint / lint (push) Successful in 1m35s
Details
test / unit (push) Successful in 31s
Details
test / integration (push) Successful in 15s
Details
Update Quality Badges / update-badges (push) Successful in 1m20s
Details
d314ccf455
didericis merged commit d314ccf455 into main 2026-06-22 23:42:25 -04:00
didericis deleted branch fix-macos-container-shift-enter 2026-06-22 23:42:25 -04:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
Compat/Breaking
Breaking change that won't be backward compatible
 Kind/Bug
Something is not working
 Kind/Documentation
Documentation changes
 Kind/Enhancement
Improve existing functionality
 Kind/Feature
New functionality
 Kind/Security
This is security issue
 Kind/Testing
Issue or pull request related to testing
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Low
4
The priority is low
Priority
Medium
3
The priority is medium
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Abandoned
3
Somebody has started to work on this but abandoned work
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
didericis-claude (didericis (claude)) didericis-codex (didericis (codex)) didericis-gemma (gemma) didericis
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: didericis/bot-bottle#246
Delete Branch "fix-macos-container-shift-enter"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?