Fix couple of small issues.

Author: beacoder

python_agent_harness/client.py

@@ -300,6 +300,8 @@ def _payload(
             "messages": msgs,
             "stream": stream,
         }
+        if stream:
+            payload["stream_options"] = {"include_usage": True}
         if tools:
             payload["tools"] = [t.to_api() for t in tools]
         if temperature is not None:

python_agent_harness/tools/bash.py

@@ -60,6 +60,7 @@ def _execute(self, command: str, ctx: ToolContext) -> str | PendingToolResult:
             proc = subprocess.Popen(
                 command,
                 shell=True,
+                stdin=subprocess.DEVNULL,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT,
                 text=True,

tests/test_client.py

@@ -75,14 +75,16 @@ def test_reasoning_content_streamed_and_captured(self):
 
     def test_streaming_default_sends_stream_true(self):
         """The default mode is streaming: the request body must carry
-        stream=True unless the caller opts out."""
+        stream=True plus stream_options requesting usage chunks."""
         fake_openai_server.reset_state()
         c = make_client()
         try:
             c.chat([Message(role="user", content="hi")])
         finally:
             c.close()
-        self.assertIs(fake_openai_server.REQUEST_BODIES[-1]["stream"], True)
+        body = fake_openai_server.REQUEST_BODIES[-1]
+        self.assertIs(body["stream"], True)
+        self.assertEqual(body["stream_options"], {"include_usage": True})
 
 
 class TestClientNonStreaming(unittest.TestCase):
@@ -114,13 +116,16 @@ def test_sync_chat_returns_full_response(self):
 
     def test_sync_chat_sends_stream_false(self):
         """Non-streaming mode must send stream=False in the payload
-        (and not ask for text/event-stream)."""
+        (and not ask for text/event-stream); stream_options must be
+        absent since OpenAI-style backends reject it when not streaming."""
         c = make_client()
         try:
             c.chat([Message(role="user", content="hi")], stream=False)
         finally:
             c.close()
-        self.assertIs(fake_openai_server.REQUEST_BODIES[-1]["stream"], False)
+        body = fake_openai_server.REQUEST_BODIES[-1]
+        self.assertIs(body["stream"], False)
+        self.assertNotIn("stream_options", body)
 
     def test_sync_chat_tool_calls_and_reasoning(self):
         """stream=False parses content, reasoning_content, tool_calls

tests/test_tools_misc.py

@@ -333,6 +333,23 @@ def test_communicate_failure_delivered_as_error(self):
         self.assertIsInstance(result, PendingToolResult)
         self.assertIn("Error: Bash failed", result.wait())
 
+    def test_popen_gets_devnull_stdin(self):
+        """Bash must not inherit the harness's stdin: commands that read
+        stdin would steal keystrokes from the TUI."""
+        import subprocess
+
+        from python_agent_harness.tools.bash import Bash
+
+        fake = mock.Mock()
+        fake.communicate.return_value = ("", None)
+        with mock.patch(
+            "python_agent_harness.tools.bash.subprocess.Popen", return_value=fake
+        ) as popen:
+            result = Bash().run({"command": "echo hi"}, ToolContext())
+        result.wait()
+        kwargs = popen.call_args.kwargs
+        self.assertIs(kwargs["stdin"], subprocess.DEVNULL)
+
 
 if __name__ == "__main__":
     unittest.main()