fix(ack): close Orca terminals after worker completion

This commit is contained in:
2026-09-19 19:49:23 +08:00
parent 147b63aae6
commit 38c4c7f91d
5 changed files with 258 additions and 10 deletions
+72
View File
@@ -208,6 +208,70 @@ class MainTests(unittest.TestCase):
self.assertEqual(exit_code, 2)
self.assertIn("error", payload)
def test_apply_closes_completed_role_receipt_terminal(self) -> None:
completed_task = task("T-1", "fixed_by_dev")
completed_task["dispatch"]["developer"] = {"receiptId": "WR-1"}
board_data = board(
[
{
"id": "WR-1",
"binding": {"handle": "term_dev"},
"createdFor": {"taskId": "T-1", "role": "developer"},
}
],
[completed_task],
)
with (
mock.patch.object(
reclaim_workers, "load_authoritative_board", return_value=(Path("/repo"), board_data)
),
mock.patch.object(
reclaim_workers, "resolve_executable", return_value=Path("/trusted/orca")
),
mock.patch.object(reclaim_workers, "close_terminal") as close,
):
buffer = io.StringIO()
with contextlib.redirect_stdout(buffer):
exit_code = reclaim_workers.main(
[
"--project-root",
"/repo",
"--completed-task-id",
"T-1",
"--completed-role",
"developer",
"--apply",
]
)
payload = json.loads(buffer.getvalue())
self.assertEqual(exit_code, 0)
close.assert_called_once_with(Path("/trusted/orca"), "term_dev")
self.assertEqual(payload["handles"][0]["decision"], "close-completed-role")
self.assertTrue(payload["handles"][0]["closed"])
def test_completed_role_rejects_unfinished_task(self) -> None:
completed_task = task("T-1", "dispatched")
completed_task["dispatch"]["developer"] = {"receiptId": "WR-1"}
board_data = board([], [completed_task])
with mock.patch.object(
reclaim_workers, "load_authoritative_board", return_value=(Path("/repo"), board_data)
):
buffer = io.StringIO()
with contextlib.redirect_stdout(buffer):
exit_code = reclaim_workers.main(
[
"--project-root",
"/repo",
"--completed-task-id",
"T-1",
"--completed-role",
"developer",
]
)
payload = json.loads(buffer.getvalue())
self.assertEqual(exit_code, 2)
self.assertIn("当前是 'dispatched'", payload["error"])
class CloseTerminalTests(unittest.TestCase):
def test_close_verifies_show_close_and_live_list(self) -> None:
@@ -233,6 +297,14 @@ class CloseTerminalTests(unittest.TestCase):
):
reclaim_workers.close_terminal(Path("/trusted/orca"), "term_1")
def test_close_treats_already_closed_handle_as_success(self) -> None:
responses = [
reclaim_workers.LaunchError("terminal handle not found"),
{"ok": True, "result": {"terminals": [{"handle": "term_2"}]}},
]
with mock.patch.object(reclaim_workers, "run_json", side_effect=responses):
reclaim_workers.close_terminal(Path("/trusted/orca"), "term_1")
if __name__ == "__main__":
unittest.main()
+14
View File
@@ -92,6 +92,20 @@ class AckSkillContentTests(unittest.TestCase):
self.assertIn("failed_retest", kickoff)
self.assertIn("leftover", kickoff)
def test_coordinator_reclaims_role_terminal_after_success(self) -> None:
skill = (REPO_ROOT / "skills" / "ack" / "SKILL.md").read_text(
encoding="utf-8"
)
adapter = (
REPO_ROOT / "skills" / "ack" / "references" / "orca-adapter.md"
).read_text(encoding="utf-8")
self.assertIn("--completed-task-id", skill)
self.assertIn("--completed-role", skill)
self.assertIn("--completed-role developer", adapter)
self.assertIn("--completed-role test", adapter)
self.assertIn("orca terminal close --tab", adapter)
def test_environment_failures_are_reported_without_consuming_retest_rounds(self) -> None:
skill = (REPO_ROOT / "skills" / "ack" / "SKILL.md").read_text(
encoding="utf-8"