feat: enhance daemon dispatching, device readiness fallback, and live streaming UI
- Admin Console & Task Queue: add cancellation, session startup progress endpoints, and support ingress metadata - Diagnostics & Runtime: enhance ADB probe to prefer unlocked devices and synchronize with readiness engine - MCP Server: dispatch tasks through Artemis Daemon scheduler with fallback to standalone runner, improve action overlays - Showcase UI: improve session auto-selection with pinning support, render startup progress, and refine stream styling - CLI & Makefile: expose server lifecycle commands (restart, stop, status) - Configuration: ignore runtime server state file in .gitignore
This commit is contained in:
somew1nd committed
1 parent
57655266cc
commit
8fdecf23d7
33 files changed
+1315
-293
No files matched your search
@@ -59,6 +59,33 @@ async def test_cancelled_event_stream_reaps_queue_waiter():
|
||||
assert _pending_queue_get_tasks() == queue_tasks_before
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_stream_events_active_session_replay():
|
||||
"""Verify stream_events with default 'active' replays running session info and steps."""
|
||||
state.is_shutting_down = False
|
||||
state.shutdown_event.clear()
|
||||
state.active_session_id = "replay-sess-123"
|
||||
state.current_goal = "Replay Goal"
|
||||
state.current_profile = "flash"
|
||||
|
||||
with patch("apps.admin_console.database.repositories.step_repository.step_repo") as mock_step_repo:
|
||||
mock_step_repo.get_session_steps.return_value = [
|
||||
{"step_number": 1, "description": "Step 1", "status": "completed"}
|
||||
]
|
||||
response = await stream_events()
|
||||
iterator = response.body_iterator
|
||||
first_event = await anext(iterator)
|
||||
assert "Subscribed to session active" in first_event
|
||||
second_event = await anext(iterator)
|
||||
assert "session_started" in second_event
|
||||
assert "replay-sess-123" in second_event
|
||||
third_event = await anext(iterator)
|
||||
assert "step_recorded" in third_event
|
||||
assert "Step 1" in third_event
|
||||
await iterator.aclose()
|
||||
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_windows_sigint_is_ignored_while_task_is_active():
|
||||
state.current_process = MagicMock(returncode=None)
|
||||
|
||||
@@ -74,3 +74,41 @@ async def test_run_task_enqueues_when_device_is_unlocked(monkeypatch):
|
||||
|
||||
assert result["status"] == "started"
|
||||
enqueue_tasks.assert_awaited_once()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_run_task_switches_to_unlocked_device_and_syncs_engine(monkeypatch):
|
||||
"""When default device is locked, run_task should enqueue on verified fallback and update engine."""
|
||||
unlocked_probe = ProbeResult(
|
||||
id="android_adb",
|
||||
category=ProbeCategory.DEVICE,
|
||||
title="Device / Emulator Connected",
|
||||
status=ProbeStatus.PASS,
|
||||
is_blocker=True,
|
||||
summary="Connected",
|
||||
description="Ready.",
|
||||
metadata={
|
||||
"installed": True,
|
||||
"submission_probe": True,
|
||||
"active_device": {"serial": "emulator-5556", "is_locked": False},
|
||||
},
|
||||
)
|
||||
run_probe = AsyncMock(return_value=unlocked_probe)
|
||||
enqueue_tasks = AsyncMock(return_value={"status": "started", "tasks": []})
|
||||
monkeypatch.setattr(
|
||||
tasks.readiness_engine, "run_device_submission_probe", run_probe
|
||||
)
|
||||
monkeypatch.setattr(tasks.task_queue_service, "enqueue_tasks", enqueue_tasks)
|
||||
monkeypatch.setattr(tasks.readiness_engine, "get_active_device_serial", lambda: "device-locked-1")
|
||||
set_active_mock = AsyncMock()
|
||||
monkeypatch.setattr(tasks.readiness_engine, "set_active_device_serial", set_active_mock)
|
||||
|
||||
result = await tasks.run_task(RunRequest(goal="Run on any ready device"))
|
||||
|
||||
assert result["status"] == "started"
|
||||
enqueue_tasks.assert_awaited_once()
|
||||
# Check that device_serial passed to enqueue_tasks is the verified unlocked device
|
||||
_, kwargs = enqueue_tasks.call_args
|
||||
assert kwargs.get("device_serial") == "emulator-5556"
|
||||
set_active_mock.assert_called_once_with("emulator-5556")
|
||||
|
||||
@@ -607,3 +607,198 @@ def test_darwin_terminate_process_tree_preserves_direct_child_for_asyncio():
|
||||
for call_args in mock_wait_procs.call_args_list:
|
||||
procs_waited = call_args[0][0]
|
||||
assert parent not in procs_waited
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_enqueue_tasks_unified_ingress():
|
||||
"""Verify enqueue_tasks correctly propagates ingress, custom session_id, and conversation_id."""
|
||||
with patch.object(TaskQueueService, "ensure_worker_running"):
|
||||
res = await task_queue_service.enqueue_tasks(
|
||||
["Test unified goal"],
|
||||
profile="flash",
|
||||
ingress="mcp",
|
||||
session_id="custom-mcp-session-123",
|
||||
conversation_id="conv-456",
|
||||
)
|
||||
assert res["status"] in ("started", "queued")
|
||||
assert len(res["tasks"]) == 1
|
||||
task = res["tasks"][0]
|
||||
assert task["session_id"] == "custom-mcp-session-123"
|
||||
assert task["ingress"] == "mcp"
|
||||
assert task["conversation_id"] == "conv-456"
|
||||
assert task["goal"] == "Test unified goal"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_queue_worker_notifies_conversation():
|
||||
"""Verify queue_worker calls notify() when conversation_id is attached to task."""
|
||||
executed_cmds = []
|
||||
|
||||
async def fake_subprocess_exec(*args, **kwargs):
|
||||
executed_cmds.append(list(args))
|
||||
proc = MagicMock()
|
||||
proc.pid = 99999
|
||||
proc.wait = AsyncMock(return_value=0)
|
||||
proc.returncode = 0
|
||||
return proc
|
||||
|
||||
with (
|
||||
patch("asyncio.create_subprocess_exec", side_effect=fake_subprocess_exec),
|
||||
patch("apps.admin_console.services.task_queue_service.media_service"),
|
||||
patch("mcp_server.notifiers.notify") as mock_notify,
|
||||
patch("apps.admin_console.services.task_queue_service.session_repo") as mock_repo,
|
||||
):
|
||||
mock_repo.get_running_session_id.return_value = None
|
||||
|
||||
await task_queue_service.enqueue_tasks(
|
||||
["Notify goal"],
|
||||
profile="flash",
|
||||
ingress="mcp",
|
||||
conversation_id="conv-789",
|
||||
device_serial="test-mock-serial",
|
||||
)
|
||||
|
||||
for _ in range(30):
|
||||
if mock_notify.called and len(state.queue_items) == 0:
|
||||
break
|
||||
await asyncio.sleep(0.05)
|
||||
|
||||
mock_notify.assert_called_once()
|
||||
kwargs = mock_notify.call_args[1]
|
||||
assert kwargs["conversation_id"] == "conv-789"
|
||||
assert "Notify goal" in kwargs["message"]
|
||||
|
||||
task = state.worker_task
|
||||
if task and not task.done():
|
||||
task.cancel()
|
||||
try:
|
||||
await task
|
||||
except (asyncio.CancelledError, Exception):
|
||||
pass
|
||||
|
||||
|
||||
def test_stop_tasks_by_session_id_targets_correct_task_among_multiple():
|
||||
"""Stopping by session_id terminates only the targeted owner among multiple concurrent devices."""
|
||||
owner_a = DeviceLockOwner(
|
||||
pid=11111,
|
||||
process_created_at=100.0,
|
||||
token="token-a",
|
||||
device_id="device-a",
|
||||
description="Task on device A",
|
||||
acquired_at="2026-08-24T00:00:00+00:00",
|
||||
session_id="session-a",
|
||||
ingress="cli",
|
||||
)
|
||||
owner_b = DeviceLockOwner(
|
||||
pid=22222,
|
||||
process_created_at=200.0,
|
||||
token="token-b",
|
||||
device_id="device-b",
|
||||
description="Task on device B",
|
||||
acquired_at="2026-08-24T00:00:00+00:00",
|
||||
session_id="session-b",
|
||||
ingress="mcp",
|
||||
)
|
||||
|
||||
with (
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.DeviceExecutionLock.get_active_owners",
|
||||
return_value={"device_a": owner_a, "device_b": owner_b},
|
||||
),
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.DeviceExecutionLock.is_active_owner",
|
||||
return_value=True,
|
||||
),
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.DeviceExecutionLock.cleanup_stale_locks"
|
||||
) as cleanup_locks,
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.process_supervisor.terminate_tree_verified",
|
||||
return_value=True,
|
||||
) as terminate_verified,
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.session_repo.update_session_status"
|
||||
) as update_status,
|
||||
patch("mcp_server.utils.trace_store.update_trace_status") as update_trace,
|
||||
):
|
||||
# Explicitly stop session-b
|
||||
assert task_queue_service.stop_tasks(clear_all=False, session_id="session-b") is True
|
||||
|
||||
# Only session-b's process (22222) should be terminated
|
||||
terminate_verified.assert_called_once_with(22222, 200.0)
|
||||
cleanup_locks.assert_called_once_with("device-b")
|
||||
update_status.assert_called_once()
|
||||
assert update_status.call_args[0][0] == "session-b"
|
||||
assert update_status.call_args[0][1] == "cancelled"
|
||||
update_trace.assert_called_once_with(
|
||||
"session-b",
|
||||
"cancelled",
|
||||
error="Task stopped from the Artemis frontend.",
|
||||
)
|
||||
|
||||
|
||||
def test_stop_tasks_by_device_id_targets_specific_device():
|
||||
"""Stopping by device_id targets the active task on that specific device."""
|
||||
owner_a = DeviceLockOwner(
|
||||
pid=33333,
|
||||
process_created_at=300.0,
|
||||
token="token-a",
|
||||
device_id="pixel-8",
|
||||
description="Task on Pixel 8",
|
||||
acquired_at="2026-08-24T00:00:00+00:00",
|
||||
session_id="session-pixel8",
|
||||
ingress="sdk",
|
||||
)
|
||||
|
||||
with (
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.DeviceExecutionLock.get_active_owners",
|
||||
return_value={"pixel_8": owner_a},
|
||||
),
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.DeviceExecutionLock.is_active_owner",
|
||||
return_value=True,
|
||||
),
|
||||
patch("apps.admin_console.services.task_queue_service.DeviceExecutionLock.cleanup_stale_locks"),
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.process_supervisor.terminate_tree_verified",
|
||||
return_value=True,
|
||||
) as terminate_verified,
|
||||
patch("apps.admin_console.services.task_queue_service.session_repo.update_session_status"),
|
||||
):
|
||||
assert task_queue_service.stop_tasks(clear_all=False, device_id="pixel-8") is True
|
||||
terminate_verified.assert_called_once_with(33333, 300.0)
|
||||
|
||||
|
||||
def test_stop_tasks_queued_item_by_session_id():
|
||||
"""Stopping a queued task by session_id cancels its reservation and removes it from queue."""
|
||||
state.queue_items = [
|
||||
{"session_id": "queue-1", "goal": "Goal 1", "status": "pending", "queue_ticket": "ticket-1"},
|
||||
{"session_id": "queue-2", "goal": "Goal 2", "status": "pending", "queue_ticket": "ticket-2"},
|
||||
]
|
||||
|
||||
with (
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.DeviceExecutionLock.get_active_owners",
|
||||
return_value={},
|
||||
),
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.DeviceExecutionLock.get_active_owner",
|
||||
return_value=None,
|
||||
),
|
||||
patch(
|
||||
"apps.admin_console.services.task_queue_service.DeviceExecutionLock.cancel_reservation",
|
||||
return_value=True,
|
||||
) as cancel_res,
|
||||
patch("apps.admin_console.services.task_queue_service.session_repo.update_session_status") as update_status,
|
||||
):
|
||||
assert task_queue_service.stop_tasks(clear_all=False, session_id="queue-1") is True
|
||||
cancel_res.assert_called_once_with("ticket-1")
|
||||
# queue-2 should remain in queue
|
||||
assert len(state.queue_items) == 1
|
||||
update_status.assert_called_once()
|
||||
assert update_status.call_args[0][0] == "queue-1"
|
||||
assert update_status.call_args[0][1] == "cancelled"
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user