fix(macos-container): forward terminal capability env

tests/unit/test_macos_container_bottle.py

@@ -18,13 +18,13 @@ class TestMacosContainerBottle(unittest.TestCase):
             None,
             agent_command="codex",
         )
-        with patch.dict(bottle_mod.os.environ, {"TERM": "xterm-256color"}, clear=False):
+        with patch.dict(bottle_mod.os.environ, {}, clear=True):
             argv = bottle.agent_argv(["run"])
         self.assertEqual(
             [
                 sys.executable, _PTY_FORWARD_SCRIPT, "--",
                 "container", "exec", "--interactive", "--tty",
-                "--env", "TERM=xterm-256color",
+                "--env", "TERM",
                 "bot-bottle-dev-abc", "codex", "run",
             ],
             argv,
@@ -37,31 +37,45 @@ class TestMacosContainerBottle(unittest.TestCase):
             None,
             agent_workdir="/home/node/workspace",
         )
-        with patch.dict(bottle_mod.os.environ, {"TERM": "xterm-256color"}, clear=False):
+        with patch.dict(bottle_mod.os.environ, {}, clear=True):
             argv = bottle.agent_argv([])
         self.assertEqual(
             [
                 sys.executable, _PTY_FORWARD_SCRIPT, "--",
                 "container", "exec", "--interactive", "--tty",
-                "--env", "TERM=xterm-256color",
+                "--env", "TERM",
                 "--workdir", "/home/node/workspace",
                 "bot-bottle-dev-abc", "claude",
             ],
             argv,
         )
 
-    def test_agent_argv_uses_host_term_value(self):
+    def test_agent_argv_forwards_terminal_env_names_without_values(self):
         bottle = MacosContainerBottle("bot-bottle-dev-abc", lambda: None, None)
-        with patch.dict(bottle_mod.os.environ, {"TERM": "screen-256color"}, clear=False):
+        with patch.dict(
+            bottle_mod.os.environ,
+            {
+                "TERM": "screen-256color",
+                "TERM_PROGRAM": "WezTerm",
+                "WEZTERM_PANE": "pane-id",
+                "SHELL": "/bin/zsh",
+            },
+            clear=True,
+        ):
             argv = bottle.agent_argv([])
-        self.assertIn("TERM=screen-256color", argv)
+        self.assertIn("TERM", argv)
+        self.assertIn("TERM_PROGRAM", argv)
+        self.assertIn("WEZTERM_PANE", argv)
+        self.assertNotIn("SHELL", argv)
+        self.assertNotIn("TERM=screen-256color", argv)
+        self.assertNotIn("TERM_PROGRAM=WezTerm", argv)
+        self.assertNotIn("WEZTERM_PANE=pane-id", argv)
 
-    def test_agent_argv_term_falls_back_to_xterm_256color(self):
+    def test_agent_argv_always_forwards_term_name(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):
+        with patch.dict(bottle_mod.os.environ, {}, clear=True):
             argv = bottle.agent_argv([])
-        self.assertIn("TERM=xterm-256color", argv)
+        self.assertIn("TERM", argv)
 
     def test_agent_argv_no_tty_omits_wrapper_and_tty_flags(self):
         bottle = MacosContainerBottle("bot-bottle-dev-abc", lambda: None, None)

tests/unit/test_macos_container_pty_forward.py

@@ -42,7 +42,9 @@ class TestArgvParsing(unittest.TestCase):
             run.return_value.returncode = 0
             rc = pty_forward.main(["--", "container", "exec"])
         self.assertEqual(0, rc)
-        run.assert_called_once_with(["container", "exec"], check=False)
+        run.assert_called_once()
+        self.assertEqual(["container", "exec"], run.call_args.args[0])
+        self.assertFalse(run.call_args.kwargs["check"])
 
 
 class TestNonTtyFallback(unittest.TestCase):
@@ -57,10 +59,12 @@ class TestNonTtyFallback(unittest.TestCase):
                 ["--", "container", "exec", "--interactive", "--tty", "c", "claude"]
             )
         self.assertEqual(42, rc)
-        run.assert_called_once_with(
+        run.assert_called_once()
+        self.assertEqual(
             ["container", "exec", "--interactive", "--tty", "c", "claude"],
-            check=False,
+            run.call_args.args[0],
         )
+        self.assertFalse(run.call_args.kwargs["check"])
 
     def test_fileno_error_runs_inner_directly(self):
         bad_stdin = MagicMock()
@@ -71,7 +75,9 @@ class TestNonTtyFallback(unittest.TestCase):
         ):
             run.return_value.returncode = 0
             rc = pty_forward.main(["--", "container", "exec"])
-        run.assert_called_once_with(["container", "exec"], check=False)
+        run.assert_called_once()
+        self.assertEqual(["container", "exec"], run.call_args.args[0])
+        self.assertFalse(run.call_args.kwargs["check"])
         self.assertEqual(0, rc)
 
 
@@ -128,9 +134,26 @@ class TestRawModeSetupAndRestore(unittest.TestCase):
             rc = pty_forward.main(["--", "container", "exec"])
 
         setraw.assert_not_called()
-        run.assert_called_once_with(["container", "exec"], check=False)
+        run.assert_called_once()
+        self.assertEqual(["container", "exec"], run.call_args.args[0])
+        self.assertFalse(run.call_args.kwargs["check"])
         self.assertEqual(0, rc)
 
+    def test_inner_run_sets_term_default_without_mutating_process_env(self):
+        with (
+            patch.dict(pty_forward.os.environ, {}, clear=True),
+            patch.object(pty_forward.subprocess, "run") as run,
+        ):
+            run.return_value.returncode = 0
+            rc = pty_forward._run_inner(["container", "exec"])
+
+            self.assertNotIn("TERM", pty_forward.os.environ)
+
+        self.assertEqual(0, rc)
+        child_env = run.call_args.kwargs["env"]
+        self.assertEqual(["TERM"], sorted(child_env.keys()))
+        self.assertEqual("xterm-256color", child_env["TERM"])
+
 
 if __name__ == "__main__":
     unittest.main()