diff --git a/acp_adapter/server.py b/acp_adapter/server.py index 11064a1e4..6d582f674 100644 --- a/acp_adapter/server.py +++ b/acp_adapter/server.py @@ -460,6 +460,14 @@ class HermesACPAgent(acp.Agent): thought_tokens=usage_data.get("reasoning_tokens"), cached_read_tokens=usage_data.get("cached_tokens"), ) + elif any(result.get(key) is not None for key in ("prompt_tokens", "completion_tokens", "total_tokens")): + usage = Usage( + input_tokens=result.get("prompt_tokens", 0), + output_tokens=result.get("completion_tokens", 0), + total_tokens=result.get("total_tokens", 0), + thought_tokens=result.get("reasoning_tokens"), + cached_read_tokens=result.get("cache_read_tokens"), + ) stop_reason = "cancelled" if state.cancel_event and state.cancel_event.is_set() else "end_turn" return PromptResponse(stop_reason=stop_reason, usage=usage) diff --git a/tests/acp/test_server.py b/tests/acp/test_server.py index 504274e2e..f256f9896 100644 --- a/tests/acp/test_server.py +++ b/tests/acp/test_server.py @@ -410,6 +410,37 @@ class TestPrompt: update = last_call[1].get("update") or last_call[0][1] assert update.session_update == "agent_message_chunk" + @pytest.mark.asyncio + async def test_prompt_populates_usage_from_top_level_run_conversation_fields(self, agent): + """ACP should map top-level token fields into PromptResponse.usage.""" + new_resp = await agent.new_session(cwd=".") + state = agent.session_manager.get_session(new_resp.session_id) + + state.agent.run_conversation = MagicMock(return_value={ + "final_response": "usage attached", + "messages": [], + "prompt_tokens": 123, + "completion_tokens": 45, + "total_tokens": 168, + "reasoning_tokens": 7, + "cache_read_tokens": 11, + }) + + mock_conn = MagicMock(spec=acp.Client) + mock_conn.session_update = AsyncMock() + agent._conn = mock_conn + + prompt = [TextContentBlock(type="text", text="show usage")] + resp = await agent.prompt(prompt=prompt, session_id=new_resp.session_id) + + assert isinstance(resp, PromptResponse) + assert resp.usage is not None + assert resp.usage.input_tokens == 123 + assert resp.usage.output_tokens == 45 + assert resp.usage.total_tokens == 168 + assert resp.usage.thought_tokens == 7 + assert resp.usage.cached_read_tokens == 11 + @pytest.mark.asyncio async def test_prompt_cancelled_returns_cancelled_stop_reason(self, agent): """If cancel is called during prompt, stop_reason should be 'cancelled'."""