Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/acp_thread/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ gpui.workspace = true
itertools.workspace = true
language.workspace = true
language_model.workspace = true
log.workspace = true
markdown.workspace = true
parking_lot = { workspace = true, optional = true }
image = { workspace = true, optional = true }
Expand Down
3 changes: 3 additions & 0 deletions crates/acp_thread/src/acp_thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,7 @@ pub struct TokenUsage {
pub used_tokens: u64,
pub input_tokens: u64,
pub output_tokens: u64,
pub max_output_tokens: Option<u64>,
}

impl TokenUsage {
Expand Down Expand Up @@ -1953,11 +1954,13 @@ impl AcpThread {
Ok(Err(e)) => {
this.send_task.take();
cx.emit(AcpThreadEvent::Error);
log::error!("Error in run turn: {:?}", e);
Err(e)
}
Ok(Ok(r)) if r.stop_reason == acp::StopReason::MaxTokens => {
this.send_task.take();
cx.emit(AcpThreadEvent::Error);
log::error!("Max tokens reached. Usage: {:?}", this.token_usage);
Err(anyhow!("Max tokens reached"))
}
result => {
Expand Down
4 changes: 4 additions & 0 deletions crates/agent/src/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2736,6 +2736,7 @@ async fn test_truncate_first_message(cx: &mut TestAppContext) {
Some(acp_thread::TokenUsage {
used_tokens: 32_000 + 16_000,
max_tokens: 1_000_000,
max_output_tokens: None,
input_tokens: 32_000,
output_tokens: 16_000,
})
Expand Down Expand Up @@ -2797,6 +2798,7 @@ async fn test_truncate_first_message(cx: &mut TestAppContext) {
Some(acp_thread::TokenUsage {
used_tokens: 40_000 + 20_000,
max_tokens: 1_000_000,
max_output_tokens: None,
input_tokens: 40_000,
output_tokens: 20_000,
})
Expand Down Expand Up @@ -2847,6 +2849,7 @@ async fn test_truncate_second_message(cx: &mut TestAppContext) {
Some(acp_thread::TokenUsage {
used_tokens: 32_000 + 16_000,
max_tokens: 1_000_000,
max_output_tokens: None,
input_tokens: 32_000,
output_tokens: 16_000,
})
Expand Down Expand Up @@ -2903,6 +2906,7 @@ async fn test_truncate_second_message(cx: &mut TestAppContext) {
Some(acp_thread::TokenUsage {
used_tokens: 40_000 + 20_000,
max_tokens: 1_000_000,
max_output_tokens: None,
input_tokens: 40_000,
output_tokens: 20_000,
})
Expand Down
1 change: 1 addition & 0 deletions crates/agent/src/thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1507,6 +1507,7 @@ impl Thread {
let model = self.model.clone()?;
Some(acp_thread::TokenUsage {
max_tokens: model.max_token_count(),
max_output_tokens: model.max_output_tokens(),
used_tokens: usage.total_tokens(),
input_tokens: usage.input_tokens,
output_tokens: usage.output_tokens,
Expand Down