From 25ca14a8a2b96f158fbdb4e71be121e6c0ddbac2 Mon Sep 17 00:00:00 2001
From: claude <eric+claude@dideric.is>
Date: Tue, 23 Jun 2026 01:53:14 +0000
Subject: [PATCH] fix(macos-container): forward TERM env var in container exec
 --tty

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
---
 bot_bottle/backend/macos_container/bottle.py |  6 ++++
 tests/unit/test_macos_container_bottle.py    | 31 ++++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/bot_bottle/backend/macos_container/bottle.py b/bot_bottle/backend/macos_container/bottle.py
index 6919046..aa50cc0 100644
--- a/bot_bottle/backend/macos_container/bottle.py
+++ b/bot_bottle/backend/macos_container/bottle.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import os
 import subprocess
 from typing import Callable, cast
 
@@ -47,6 +48,11 @@ class MacosContainerBottle(Bottle):
         cmd = ["container", "exec"]
         if tty:
             cmd.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.
+            term = os.environ.get("TERM", "xterm-256color")
+            cmd.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])
diff --git a/tests/unit/test_macos_container_bottle.py b/tests/unit/test_macos_container_bottle.py
index 04e1315..d650814 100644
--- a/tests/unit/test_macos_container_bottle.py
+++ b/tests/unit/test_macos_container_bottle.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 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
 
 
@@ -16,12 +17,15 @@ class TestMacosContainerBottle(unittest.TestCase):
             None,
             agent_command="codex",
         )
+        with patch.dict(bottle_mod.os.environ, {"TERM": "xterm-256color"}, clear=False):
+            argv = bottle.agent_argv(["run"])
         self.assertEqual(
             [
                 "container", "exec", "--interactive", "--tty",
+                "--env", "TERM=xterm-256color",
                 "bot-bottle-dev-abc", "codex", "run",
             ],
-            bottle.agent_argv(["run"]),
+            argv,
         )
 
     def test_agent_argv_includes_workdir(self):
@@ -31,15 +35,38 @@ class TestMacosContainerBottle(unittest.TestCase):
             None,
             agent_workdir="/home/node/workspace",
         )
+        with patch.dict(bottle_mod.os.environ, {"TERM": "xterm-256color"}, clear=False):
+            argv = bottle.agent_argv([])
         self.assertEqual(
             [
                 "container", "exec", "--interactive", "--tty",
+                "--env", "TERM=xterm-256color",
                 "--workdir", "/home/node/workspace",
                 "bot-bottle-dev-abc", "claude",
             ],
-            bottle.agent_argv([]),
+            argv,
         )
 
+    def test_agent_argv_uses_host_term_value(self):
+        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):
+        bottle = MacosContainerBottle("bot-bottle-dev-abc", lambda: None, None)
+        env_without_term = {k: v for k, v in bottle_mod.os.environ.items() if k != "TERM"}
+        with patch.object(bottle_mod.os, "environ", env_without_term):
+            argv = bottle.agent_argv([])
+        self.assertIn("TERM=xterm-256color", argv)
+
+    def test_agent_argv_no_tty_omits_term(self):
+        bottle = MacosContainerBottle("bot-bottle-dev-abc", lambda: None, None)
+        argv = bottle.agent_argv([], tty=False)
+        self.assertNotIn("--tty", argv)
+        self.assertNotIn("--env", argv)
+
     def test_exec_pipes_script_to_shell(self):
         bottle = MacosContainerBottle("bot-bottle-dev-abc", lambda: None, None)
         with patch("bot_bottle.backend.macos_container.bottle.subprocess.run") as run: