feat(mma): Finalize Orchestrator Integration and fix all regressions

This commit is contained in:
2026-02-27 18:31:14 -05:00
parent 8438f69197
commit 3b2d82ed0d
27 changed files with 706 additions and 297 deletions

View File

@@ -19,12 +19,12 @@ class TestGeminiCliAdapter(unittest.TestCase):
def test_send_starts_subprocess_with_correct_args(self, mock_popen):
"""
Verify that send(message) correctly starts the subprocess with
--output-format stream-json and the provided message via stdin.
--output-format stream-json and the provided message via stdin using communicate.
"""
# Setup mock process with a minimal valid JSONL termination
process_mock = MagicMock()
process_mock.stdout = io.StringIO(json.dumps({"type": "result", "usage": {}}) + "\n")
process_mock.stdin = MagicMock()
stdout_content = json.dumps({"type": "result", "usage": {}}) + "\n"
process_mock.communicate.return_value = (stdout_content, "")
process_mock.poll.return_value = 0
process_mock.wait.return_value = 0
mock_popen.return_value = process_mock
@@ -44,9 +44,8 @@ class TestGeminiCliAdapter(unittest.TestCase):
# Message should NOT be in cmd now
self.assertNotIn(message, cmd)
# Verify message was written to stdin
process_mock.stdin.write.assert_called_once_with(message)
process_mock.stdin.close.assert_called_once()
# Verify message was sent via communicate
process_mock.communicate.assert_called_once_with(input=message)
# Check process configuration
self.assertEqual(kwargs.get('stdout'), subprocess.PIPE)
@@ -60,16 +59,15 @@ class TestGeminiCliAdapter(unittest.TestCase):
and returns the combined text.
"""
jsonl_output = [
json.dumps({"type": "message", "text": "The quick brown "}),
json.dumps({"type": "message", "text": "fox jumps."}),
json.dumps({"type": "message", "role": "model", "text": "The quick brown "}),
json.dumps({"type": "message", "role": "model", "text": "fox jumps."}),
json.dumps({"type": "result", "usage": {"prompt_tokens": 5, "candidates_tokens": 5}})
]
stdout_content = "\n".join(jsonl_output) + "\n"
process_mock = MagicMock()
process_mock.stdout = io.StringIO(stdout_content)
# Mock poll sequence: running, running, finished
process_mock.poll.side_effect = [None, None, 0]
process_mock.communicate.return_value = (stdout_content, "")
process_mock.poll.return_value = 0
process_mock.wait.return_value = 0
mock_popen.return_value = process_mock
@@ -85,16 +83,16 @@ class TestGeminiCliAdapter(unittest.TestCase):
by continuing to read until the final 'result' event.
"""
jsonl_output = [
json.dumps({"type": "message", "text": "Calling tool..."}),
json.dumps({"type": "message", "role": "assistant", "text": "Calling tool..."}),
json.dumps({"type": "tool_use", "name": "read_file", "args": {"path": "test.txt"}}),
json.dumps({"type": "message", "text": "\nFile read successfully."}),
json.dumps({"type": "message", "role": "assistant", "text": "\nFile read successfully."}),
json.dumps({"type": "result", "usage": {}})
]
stdout_content = "\n".join(jsonl_output) + "\n"
process_mock = MagicMock()
process_mock.stdout = io.StringIO(stdout_content)
process_mock.poll.side_effect = [None, None, None, 0]
process_mock.communicate.return_value = (stdout_content, "")
process_mock.poll.return_value = 0
process_mock.wait.return_value = 0
mock_popen.return_value = process_mock
@@ -118,8 +116,8 @@ class TestGeminiCliAdapter(unittest.TestCase):
stdout_content = "\n".join(jsonl_output) + "\n"
process_mock = MagicMock()
process_mock.stdout = io.StringIO(stdout_content)
process_mock.poll.side_effect = [None, 0]
process_mock.communicate.return_value = (stdout_content, "")
process_mock.poll.return_value = 0
process_mock.wait.return_value = 0
mock_popen.return_value = process_mock