diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 2f3973fbcc94e2..d4b4f8de44c969 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -2273,6 +2273,19 @@ impl AcpThread {
                     Ok(r) => {
                         Self::flush_streaming_text(&mut this.streaming_text_buffer, cx);
 
+                        if let Some(usage) = &r.usage {
+                            this.update_token_usage(
+                                Some(TokenUsage {
+                                    max_tokens: 0,
+                                    used_tokens: usage.total_tokens,
+                                    input_tokens: usage.input_tokens,
+                                    output_tokens: usage.output_tokens,
+                                    max_output_tokens: None,
+                                }),
+                                cx,
+                            );
+                        }
+
                         if r.stop_reason == acp::StopReason::MaxTokens {
                             this.had_error = true;
                             cx.emit(AcpThreadEvent::Error);
@@ -5257,4 +5270,80 @@ mod tests {
             "session info title update should not propagate back to the connection"
         );
     }
+
+    #[gpui::test]
+    async fn test_token_usage_from_prompt_response(cx: &mut gpui::TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let connection = Rc::new(FakeAgentConnection::new().on_user_message(
+            |_, _, _| {
+                async move {
+                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)
+                        .usage(acp::Usage::new(1500, 1000, 500)))
+                }
+                .boxed_local()
+            },
+        ));
+
+        let thread = cx
+            .update(|cx| {
+                connection.new_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+            })
+            .await
+            .unwrap();
+
+        assert!(
+            thread.read_with(cx, |thread, _| thread.token_usage().cloned()).is_none(),
+            "token_usage should be None before any turn"
+        );
+
+        thread
+            .update(cx, |thread, cx| thread.send_raw("Hello!", cx))
+            .await
+            .unwrap();
+
+        thread.read_with(cx, |thread, _| {
+            let usage = thread.token_usage().expect("token_usage should be set after a turn");
+            assert_eq!(usage.used_tokens, 1500);
+            assert_eq!(usage.input_tokens, 1000);
+            assert_eq!(usage.output_tokens, 500);
+            assert_eq!(usage.max_tokens, 0);
+            assert_eq!(usage.max_output_tokens, None);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_token_usage_absent_when_response_has_no_usage(cx: &mut gpui::TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let connection = Rc::new(FakeAgentConnection::new().on_user_message(
+            |_, _, _| {
+                async move { Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)) }
+                    .boxed_local()
+            },
+        ));
+
+        let thread = cx
+            .update(|cx| {
+                connection.new_session(project, PathList::new(&[Path::new(path!("/test"))]), cx)
+            })
+            .await
+            .unwrap();
+
+        thread
+            .update(cx, |thread, cx| thread.send_raw("Hello!", cx))
+            .await
+            .unwrap();
+
+        thread.read_with(cx, |thread, _| {
+            assert!(
+                thread.token_usage().is_none(),
+                "token_usage should remain None when PromptResponse has no usage"
+            );
+        });
+    }
 }
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 66a211b2f4cf04..33b4977d7cea4e 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -3506,6 +3506,23 @@ impl ThreadView {
     fn render_token_usage(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
         let thread = self.thread.read(cx);
         let usage = thread.token_usage()?;
+
+        if usage.max_tokens == 0 {
+            let label = crate::humanize_token_count(usage.used_tokens);
+            return Some(
+                h_flex()
+                    .id("token_count_label")
+                    .mt_px()
+                    .mr_1()
+                    .child(
+                        Label::new(format!("{label} tokens"))
+                            .size(LabelSize::Small)
+                            .color(Color::Muted),
+                    )
+                    .into_any_element(),
+            );
+        }
+
         let show_split = self.supports_split_token_display(cx);
 
         let progress_color = |ratio: f32| -> Hsla {